From cfa9b7033c711d720f395e0ac387bfc65bb6fd70 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Wed, 5 Aug 2020 16:42:56 -0400 Subject: [PATCH] Enable new S APIs for WebView. Make WebViewFactory create the *ForS version of the WebView factory provider, and require that WebView implementations target at least S to be valid. Test: atest CtsWebkitTestCases Change-Id: I21a1dc9a9084c1086bba52921bd19ba968544a9c --- core/java/android/webkit/UserPackage.java | 2 +- core/java/android/webkit/WebViewFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/webkit/UserPackage.java b/core/java/android/webkit/UserPackage.java index 556b24c94b363..cef6c054bf29b 100644 --- a/core/java/android/webkit/UserPackage.java +++ b/core/java/android/webkit/UserPackage.java @@ -34,7 +34,7 @@ public class UserPackage { private final UserInfo mUserInfo; private final PackageInfo mPackageInfo; - public static final int MINIMUM_SUPPORTED_SDK = Build.VERSION_CODES.R; + public static final int MINIMUM_SUPPORTED_SDK = Build.VERSION_CODES.S; public UserPackage(UserInfo user, PackageInfo packageInfo) { this.mUserInfo = user; diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index 8790bbdcd8f7c..5fc93443f4b8c 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -47,7 +47,7 @@ public final class WebViewFactory { // 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.WebViewChromiumFactoryProviderForR"; + "com.android.webview.chromium.WebViewChromiumFactoryProviderForS"; private static final String CHROMIUM_WEBVIEW_FACTORY_METHOD = "create";