Prevent thread assertion for HTC mail apk

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.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.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Picture;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.net.http.SslCertificate;
 import android.os.Build;
@@ skipping 34 matching lines @@
 import org.chromium.android_webview.AwPrintDocumentAdapter;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.ResourcesContextWrapperFactory;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.content.browser.SmartClipProvider;
 import org.chromium.content_public.browser.NavigationHistory;
 
 import java.io.BufferedWriter;
 import java.io.File;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * This class is the delegate to which WebViewProxy forwards all API calls.
  *
  * Most of the actual functionality is implemented by AwContents (or ContentViewCore within
  * it). This class also contains WebView-specific APIs that require the creation of other
  * adapters (otherwise org.chromium.content would depend on the webview.chromium package)
  * and a small set of no-op deprecated APIs.
  */
 @SuppressWarnings("deprecation")
@@ skipping 17 matching lines @@
     private AwContents mAwContents;
     // Non-null if this webview is using the GL accelerated draw path.
     private DrawGLFunctor mGLfunctor;
 
     private final WebView.HitTestResult mHitTestResult;
 
     private final int mAppTargetSdkVersion;
 
     private WebViewChromiumFactoryProvider mFactory;
 
+    private static volatile AtomicBoolean sShouldAvoidThreadCheckingForHtcMail;

[aelias_OOO_until_Jul13, 2016/08/12 07:49:57]

Reading
https://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/package...,
it seems like the recommended way to use atomics is:

private final AtomicBoolean sIsHtcMail = new AtomicBoolean(false);

[Changwan Ryu, 2016/08/12 08:40:30]

Done.

+
     private static boolean sRecordWholeDocumentEnabledByApi = false;
     static void enableSlowWholeDocumentDraw() {
         sRecordWholeDocumentEnabledByApi = true;
     }
 
     // This does not touch any global / non-threadsafe state, but note that
     // init is ofter called right after and is NOT threadsafe.
     public WebViewChromium(WebViewChromiumFactoryProvider factory, WebView webView,
             WebView.PrivateAccess webViewPrivate) {
         mWebView = webView;
@@ skipping 13 matching lines @@
     }
 
     // WebViewProvider methods --------------------------------------------------------------------
 
     @Override
     // BUG=6790250 |javaScriptInterfaces| was only ever used by the obsolete DumpRenderTree
     // so is ignored. TODO: remove it from WebViewProvider.
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void init(final Map<String, Object> javaScriptInterfaces,
             final boolean privateBrowsing) {
+        avoidThreadCheckingForHtcMail(mWebView);

[aelias_OOO_until_Jul13, 2016/08/12 07:49:57]

Please restructure this to look like:

sIsHtcMail.set(isHtcMail(mWebView));
if (isHtcMail.get()) disableThreadChecking(mWebView);

[Changwan Ryu, 2016/08/12 08:40:30]

Done.

         if (privateBrowsing) {
             mFactory.startYourEngines(true);
             final String msg = "Private browsing is not supported in WebView.";
             if (mAppTargetSdkVersion >= Build.VERSION_CODES.KITKAT) {
                 throw new IllegalArgumentException(msg);
             } else {
                 Log.w(TAG, msg);
                 TextView warningLabel = new TextView(mContext);
                 warningLabel.setText(mContext.getString(
                         org.chromium.android_webview.R.string.private_browsing_warning));
@@ skipping 43 matching lines @@
                     // Intentionally irreversibly disable the webview instance, so that private
                     // user data cannot leak through misuse of a non-privateBrowing WebView
                     // instance. Can't just null out mAwContents as we never null-check it
                     // before use.
                     destroy();
                 }
             }
         });
     }
 
+    private boolean shouldAvoidThreadCheckingForHtcMail(View view) {

[aelias_OOO_until_Jul13, 2016/08/12 07:49:57]

Please rename this to isHtcMail and delete all lines in the method that touch
the atomic.

[Changwan Ryu, 2016/08/12 08:40:30]

Done.

+        if (sShouldAvoidThreadCheckingForHtcMail != null) {
+            return sShouldAvoidThreadCheckingForHtcMail.get();
+        }
+        if (mAppTargetSdkVersion > Build.VERSION_CODES.M) return false;
+        final String htcMailPackageId = "com.htc.android.mail";
+        if (view.getClass().getName() == null
+                || !view.getClass().getName().startsWith(htcMailPackageId)) {
+            sShouldAvoidThreadCheckingForHtcMail = new AtomicBoolean(false);
+            return false;
+        }
+
+        try {
+            PackageInfo packageInfo =
+                    view.getContext().getPackageManager().getPackageInfo(htcMailPackageId, 0);
+            // These values are provided by HTC.
+            if ((mAppTargetSdkVersion < Build.VERSION_CODES.M
+                    && packageInfo.versionCode < 864021756)
+                    || packageInfo.versionCode < 866001861) {
+                sShouldAvoidThreadCheckingForHtcMail = new AtomicBoolean(true);
+                return true;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        sShouldAvoidThreadCheckingForHtcMail = new AtomicBoolean(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 avoidThreadCheckingForHtcMail(View view) {

[aelias_OOO_until_Jul13, 2016/08/12 07:49:57]

Please rename to disableThreadChecking and remove the first line.

[Changwan Ryu, 2016/08/12 08:40:30]

Done.

+        if (!shouldAvoidThreadCheckingForHtcMail(view)) return;
+
+        for (Class<?> webViewClass = view.getClass();
+                webViewClass != null;
+                webViewClass = webViewClass.getSuperclass()) {
+            String name = webViewClass.getName();
+            if (name != null && name.contains("WebView")) {
+                try {
+                    Field field = webViewClass.getDeclaredField("sEnforceThreadChecking");
+                    field.setAccessible(true);
+                    field.setBoolean(null, false);
+                    field.setAccessible(false);
+                    Log.w(TAG, "We are turning off thread check for this apk.");

[aelias_OOO_until_Jul13, 2016/08/12 07:49:57]

This log is a bit low on detail, I'd suggest printing out the detected APK name
and version code and link to http://crbug.com/622151.  Maybe you can put the log
next to the place detecting the APK instead (I don't think this reflection
failing is a real concern).

[Changwan Ryu, 2016/08/12 08:40:30]

Added log in isHtcMail() and removed this one.

+                } catch (NoSuchFieldException | IllegalAccessException
+                        | IllegalArgumentException e) {
+                    e.printStackTrace();
+                }
+                return;
+            }
+        }
+    }
+
     private void initForReal() {
         AwContentsStatics.setRecordFullDocument(sRecordWholeDocumentEnabledByApi
                 || mAppTargetSdkVersion < Build.VERSION_CODES.LOLLIPOP);
 
         mAwContents = new AwContents(mFactory.getBrowserContextOnUiThread(), mWebView, mContext,
                 new InternalAccessAdapter(), new WebViewNativeDrawGLFunctorFactory(),
                 mContentsClientAdapter, mWebSettings.getAwSettings());
 
         if (mAppTargetSdkVersion >= Build.VERSION_CODES.KITKAT) {
             // On KK and above, favicons are automatically downloaded as the method
@@ skipping 322 matching lines @@
                 @Override
                 public void run() {
                     mAwContents.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, historyUrl);
                 }
             });
             return;
         }
         mAwContents.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, historyUrl);
     }
 
-    public void evaluateJavaScript(String script, ValueCallback<String> resultCallback) {
+    public void evaluateJavaScript(
+            final String script, final ValueCallback<String> resultCallback) {
+        if (shouldAvoidThreadCheckingForHtcMail(mWebView)) {

[aelias_OOO_until_Jul13, 2016/08/12 07:49:57]

Please check sIsHtcMail.get() directly here.

[Changwan Ryu, 2016/08/12 08:40:30]

Done.

+            // This is a workaround for https://crbug.com/622151.
+            ThreadUtils.postOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    evaluateJavaScriptInternal(script, resultCallback);
+                }
+            });
+        } else {
+            evaluateJavaScriptInternal(script, resultCallback);
+        }
+    }
+
+    private void evaluateJavaScriptInternal(String script, ValueCallback<String> resultCallback) {
         checkThread();
         mAwContents.evaluateJavaScript(script, resultCallback);
     }
 
     @Override
     public void saveWebArchive(String filename) {
         saveWebArchive(filename, false, null);
     }
 
     @Override
@@ skipping 1673 matching lines @@
         mAwContents.extractSmartClipData(x, y, width, height);
     }
 
     // Implements SmartClipProvider
     @Override
     public void setSmartClipResultHandler(final Handler resultHandler) {
         checkThread();
         mAwContents.setSmartClipResultHandler(resultHandler);
     }
 }