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 76 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);
+        return new WebViewChromium(this, webView, privateAccess, mShouldDisableThreadChecking);
+    }
+
+    // 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";
+        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)
+                    || packageInfo.versionCode < 866001861) {

[Torne, 2016/08/17 10:43:07]

This condition doesn't work as intended; it will always disable thread checks if
the versionCode is less than 866001861 regardless of whether the device is M or
not.

You could do this as:
if (packageInfo.versionCode < (Build.VERSION.SDK_INT < Build.VERSION_CODES.M ?
864021756 : 866001861))

but it may be more clear to just expand it out to a nested if or something?

[Changwan Ryu, 2016/08/17 14:07:41]

Good catch! Fixed now.

+                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;
     }
 
     @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;
     }
 }