Prevent thread assertion for HTC mail apk

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package com.android.webview.chromium;
 
 import android.Manifest;
 import android.app.ActivityManager;
 import android.content.ComponentCallbacks2;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Looper;
 import android.os.Process;
 import android.os.StrictMode;
 import android.util.Log;
 import android.webkit.CookieManager;
 import android.webkit.GeolocationPermissions;
 import android.webkit.WebStorage;
 import android.webkit.WebView;
@@ skipping 29 matching lines @@
 import org.chromium.base.TraceEvent;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.content.browser.ContentViewStatics;
 import org.chromium.net.NetworkChangeNotifier;
 import org.chromium.ui.base.ResourceBundle;
 
 import java.io.File;
+import java.lang.reflect.Field;
 import java.util.Queue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 
 /**
  * Entry point to the WebView. The system framework talks to this class to get instances of the
  * implementation classes.
  */
@@ skipping 27 matching lines @@
                 return;
             }
 
             Runnable task = mQueue.poll();
             while (task != null) {
                 task.run();
                 task = mQueue.poll();
             }
         }
 
-        private Queue<Runnable> mQueue;
+        private final Queue<Runnable> mQueue;
     }
 
     private final WebViewChromiumRunQueue mRunQueue = new WebViewChromiumRunQueue();
 
     private <T> T runBlockingFuture(FutureTask<T> task) {
         if (!hasStarted()) throw new RuntimeException("Must be started before we block!");
         if (ThreadUtils.runningOnUiThread()) {
             throw new IllegalStateException("This method should only be called off the UI thread");
         }
         mRunQueue.addTask(task);
@@ skipping 36 matching lines @@
     private WebStorageAdapter mWebStorage;
     private WebViewDatabaseAdapter mWebViewDatabase;
     private AwDevToolsServer mDevToolsServer;
 
     // Read/write protected by mLock.
     private boolean mStarted;
 
     private SharedPreferences mWebViewPrefs;
     private WebViewDelegate mWebViewDelegate;
 
+    private boolean mShouldDisableThreadChecking;
+
     /**
      * Entry point for newer versions of Android.
      */
     public static WebViewChromiumFactoryProvider create(android.webkit.WebViewDelegate delegate) {
         return new WebViewChromiumFactoryProvider(delegate);
     }
 
     /**
      * Constructor called by the API 21 version of {@link WebViewFactory} and earlier.
      */
@@ skipping 44 matching lines @@
             // The WebView package has been downgraded since we last ran in this application.
             // Delete the WebView data directory's contents.
             String dataDir = PathUtils.getDataDirectory(ContextUtils.getApplicationContext());
             Log.i(TAG, "WebView package downgraded from " + lastVersion + " to " + currentVersion
                             + "; deleting contents of " + dataDir);
             deleteContents(new File(dataDir));
         }
         if (lastVersion != currentVersion) {
             mWebViewPrefs.edit().putInt(VERSION_CODE_PREF, currentVersion).apply();
         }
+
+        mShouldDisableThreadChecking =
+                shouldDisableThreadChecking(ContextUtils.getApplicationContext());
         // Now safe to use WebView data directory.
     }
 
     private static boolean isBuildDebuggable() {
         return !Build.TYPE.equals("user");
     }
 
     /**
      * Both versionCodes should be from a WebView provider package implemented by Chromium.
      * VersionCodes from other kinds of packages won't make any sense in this method.
@@ skipping 233 matching lines @@
                         return AwContentsClient.parseFileChooserResult(resultCode, intent);
                     }
                 };
             }
         }
         return mStaticMethods;
     }
 
     @Override
     public WebViewProvider createWebView(WebView webView, WebView.PrivateAccess privateAccess) {
-        return new WebViewChromium(this, webView, privateAccess);
+        WebViewChromium webViewChromium = new WebViewChromium(this, webView, privateAccess,
+                mShouldDisableThreadChecking);
+        // XXX: this does not get applied before WebView's sEnforceThreadChecking is set.
+        if (mShouldDisableThreadChecking) disableThreadChecking();
+        return webViewChromium;
+    }
+
+    // Check this as a workaround for https://crbug.com/622151.
+    private boolean shouldDisableThreadChecking(Context context) {
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) return false;
+        final String htcMailPackageId = "com.htc.android.mail";

[sgurun-gerrit only, 2016/08/25 23:41:02]

Sorry but I don't think we should create a precedent in our code by adding some
specialization for one APK. We should first make sure this is the right fix by
addressing Torne's comments and even then, I am not happy about it.

is this change temporary? (I very much hope so).

If not, can we do it in a different way. even a hidden api that can be called
via reflection is better, IMO.

+        if (!htcMailPackageId.equals(context.getPackageName())) return false;
+        try {
+            PackageInfo packageInfo =
+                    context.getPackageManager().getPackageInfo(htcMailPackageId, 0);
+            if (packageInfo == null) return false;
+
+            // These values are provided by HTC.
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M
+                    && packageInfo.versionCode >= 864021756) return false;
+            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.M
+                    && packageInfo.versionCode >= 866001861) return false;
+
+            Log.w(TAG, "Disabling thread check in WebView (http://crbug.com/622151). "
+                    + "APK name: " + htcMailPackageId + ", versionCode: "
+                    + packageInfo.versionCode);
+            return true;
+        } catch (NameNotFoundException e) {
+            // Ignore this exception and return false.
+        }
+        return false;
+    }
+
+    // This is a workaround for https://crbug.com/622151.
+    // In HTC's email app, InputConnection.setComposingText() will call WebView.evaluateJavaScript,
+    // and thread assertion will occur. We turn off WebView thread assertion for this app.
+    private void disableThreadChecking() {
+        try {
+            Class<?> webViewClass = Class.forName("android.webkit.WebView");
+            Field field = webViewClass.getDeclaredField("sEnforceThreadChecking");
+            field.setAccessible(true);
+            field.setBoolean(null, false);
+            field.setAccessible(false);
+        } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException
+                | IllegalArgumentException e) {
+            Log.w(TAG, "Failed to disable thread checking.");
+        }
     }
 
     @Override
     public GeolocationPermissions getGeolocationPermissions() {
         synchronized (mLock) {
             if (mGeolocationPermissions == null) {
                 ensureChromiumStartedLocked(true);
                 AwGeolocationPermissions awGelocationPermissions = ThreadUtils.runningOnUiThread()
                         ? getBrowserContextOnUiThread().getGeolocationPermissions()
                         : runOnUiThreadBlocking(new Callable<AwGeolocationPermissions>() {
@@ skipping 65 matching lines @@
                 mWebViewDatabase = new WebViewDatabaseAdapter(this, awDatabase);
             }
         }
         return mWebViewDatabase;
     }
 
     WebViewDelegate getWebViewDelegate() {
         return mWebViewDelegate;
     }
 }