am 58ca6d4c: Merge "Set the webview-classic-workarounds for targetSDk < KLP" into klp-dev

* commit '58ca6d4c0f3ea5d35d313ac13915a5a6b5c1ce9e':
  Set the webview-classic-workarounds for targetSDk < KLP

1 files changed, 5 insertions, 0 deletions

diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index 5fd2660..1d4da42 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -157,6 +157,11 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
             cl.appendSwitch("testing-webview-gl-mode");
         }
 
+        Context context = ActivityThread.currentApplication();
+        if (context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.KITKAT) {
+            cl.appendSwitch("enable-webview-classic-workarounds");
+        }
+
         // We don't need to extract any paks because for WebView, they are
         // in the system image.
         ResourceExtractor.setMandatoryPaksToExtract("");