commit 295c5a1372e4dcc3c2da37ecff33e4446926577f
author Shimi Zhang <ctzsm@google.com> Thu Dec 14 19:03:30 2017 -0800
committer Shimi Zhang <ctzsm@google.com> Thu Dec 21 16:05:16 2017 -0800
tree 6edb5039f5711d8d2f417c9ce8bc11a588ffa540
parent 5bbc3eeb8b4f261ac93a8cee9c87c8aca5a5dde2

Switch to WebViewChromiumFactoryProviderForP

Bug: 70688155
Test: Flash device to make sure WebView providers are in developer options.
Change-Id: I6fbaa0bd7769da4a83b42a378cb80cf3497294a2

core/java/android/webkit/UserPackage.java

diff --git a/core/java/android/webkit/UserPackage.java b/core/java/android/webkit/UserPackage.java
index 63519a6..03ff0ca 100644
--- a/core/java/android/webkit/UserPackage.java
+++ b/core/java/android/webkit/UserPackage.java
@@ -34,7 +34,7 @@
     private final UserInfo mUserInfo;
     private final PackageInfo mPackageInfo;
 
-    public static final int MINIMUM_SUPPORTED_SDK = Build.VERSION_CODES.O_MR1;
+    public static final int MINIMUM_SUPPORTED_SDK = Build.VERSION_CODES.P;
 
     public UserPackage(UserInfo user, PackageInfo packageInfo) {
         this.mUserInfo = user;

core/java/android/webkit/WebViewFactory.java

diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java
index e3efad0..b3522ec 100644
--- a/core/java/android/webkit/WebViewFactory.java
+++ b/core/java/android/webkit/WebViewFactory.java
@@ -47,7 +47,7 @@
     // visible for WebViewZygoteInit to look up the class by reflection and call preloadInZygote.
     /** @hide */
     private static final String CHROMIUM_WEBVIEW_FACTORY =
-            "com.android.webview.chromium.WebViewChromiumFactoryProviderForOMR1";
+            "com.android.webview.chromium.WebViewChromiumFactoryProviderForP";
 
     private static final String CHROMIUM_WEBVIEW_FACTORY_METHOD = "create";