From 2fce8b0e8321e60196f2f534e5405bebf57efe62 Mon Sep 17 00:00:00 2001 From: Richard Coles Date: Tue, 13 Oct 2020 19:24:00 +0000 Subject: [PATCH] Reland "Enable new S APIs for WebView."" This reverts commit 039e10f76a1c3f2e2c095449577715bd87d98350. New WebView binary has now been dropped, fixing the strict mode issue that necessitated a revert. Change-Id: I86644e8a216c7087d7a00294d2b7f9ddb1705968 --- 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";