diff options
| author | Torne (Richard Coles) <torne@google.com> | 2020-08-05 16:42:56 -0400 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2020-08-05 16:44:34 -0400 |
| commit | cfa9b7033c711d720f395e0ac387bfc65bb6fd70 (patch) | |
| tree | 2cda28b326e74c3db839b61a7767ef983abf1014 /core/java/android | |
| parent | 4734fb5e1b86cf2cc17c020aa8639910ccb5465d (diff) | |
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
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/webkit/UserPackage.java | 2 | ||||
| -rw-r--r-- | 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 556b24c94b36..cef6c054bf29 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 8790bbdcd8f7..5fc93443f4b8 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"; |