Fix LG Email workaround criteria.

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;
@@ skipping 46 matching lines @@
 import org.chromium.base.PathService;
 import org.chromium.base.PathUtils;
 import org.chromium.base.ThreadUtils;
 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.NativeLibraries;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.content.browser.ContentViewStatics;
+import org.chromium.content.browser.input.LGEmailActionModeWorkaround;
 import org.chromium.net.NetworkChangeNotifier;
 
 import java.io.File;
 import java.util.Queue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ skipping 472 matching lines @@
     @Override
     public WebViewProvider createWebView(WebView webView, WebView.PrivateAccess privateAccess) {
         return new WebViewChromium(this, webView, privateAccess, mShouldDisableThreadChecking);
     }
 
     // Workaround for IME thread crashes on grandfathered OEM apps.
     private boolean shouldDisableThreadChecking(Context context) {
         String appName = context.getPackageName();
         int versionCode = PackageUtils.getPackageVersion(context, appName);
         int appTargetSdkVersion = context.getApplicationInfo().targetSdkVersion;
+        if (versionCode == -1) return false;
 
         boolean shouldDisable = false;
 
         // crbug.com/651706
         final String lgeMailPackageId = "com.lge.email";
         if (lgeMailPackageId.equals(appName)) {
-            // The version code is provided by LGE.
-            if (versionCode == -1 || versionCode >= 67700000) return false;
+            if (appTargetSdkVersion > Build.VERSION_CODES.N) return false;
+            // This is the last broken version shipped on LG V20/NRD90M.
+            if (versionCode > LGEmailActionModeWorkaround.LGEmailWorkaroundMaxVersion) return false;
             shouldDisable = true;
         }
 
         // crbug.com/655759
         // Also want to cover ".att" variant suffix package name.
         final String yahooMailPackageId = "com.yahoo.mobile.client.android.mail";
         if (appName.startsWith(yahooMailPackageId)) {
             if (appTargetSdkVersion > Build.VERSION_CODES.M) return false;
-            if (versionCode == -1 || versionCode > 1315849) return false;
+            if (versionCode > 1315849) return false;
             shouldDisable = true;
         }
 
         // crbug.com/622151
         final String htcMailPackageId = "com.htc.android.mail";
         if (htcMailPackageId.equals(appName)) {
             if (appTargetSdkVersion > Build.VERSION_CODES.M) return false;
-            if (versionCode == -1) return false;
             // This value is provided by HTC.
             if (versionCode >= 866001861) return false;
             shouldDisable = true;
         }
 
         if (shouldDisable) {
             Log.w(TAG, "Disabling thread check in WebView. "
                             + "APK name: " + appName + ", versionCode: " + versionCode
                             + ", targetSdkVersion: " + appTargetSdkVersion);
         }
@@ skipping 75 matching lines @@
     WebViewDelegate getWebViewDelegate() {
         return mWebViewDelegate;
     }
 
     // The method to support unreleased Android.
     WebViewContentsClientAdapter createWebViewContentsClientAdapter(WebView webView,
             Context context) {
         return new WebViewContentsClientAdapter(webView, context, mWebViewDelegate);
     }
 }