From 039e10f76a1c3f2e2c095449577715bd87d98350 Mon Sep 17 00:00:00 2001 From: Nate Fischer Date: Fri, 2 Oct 2020 18:32:59 +0000 Subject: [PATCH] Revert "Enable new S APIs for WebView." This reverts commit cfa9b7033c711d720f395e0ac387bfc65bb6fd70. Reason for revert: WebView M85+ has a strictmode violation Bug: 169877920 Change-Id: I46a26c16d83debc548217538200c6736ab8abeae --- 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 cef6c054bf29b..556b24c94b363 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.S; + public static final int MINIMUM_SUPPORTED_SDK = Build.VERSION_CODES.R; 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 5fc93443f4b8c..8790bbdcd8f7c 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.WebViewChromiumFactoryProviderForS"; + "com.android.webview.chromium.WebViewChromiumFactoryProviderForR"; private static final String CHROMIUM_WEBVIEW_FACTORY_METHOD = "create";