From 0643c022edb3d6e5a8f0a32e1344a13d39ec8adb Mon Sep 17 00:00:00 2001 From: Michael Bai Date: Wed, 2 Feb 2022 14:56:56 -0800 Subject: [PATCH] WebView: Load Android T specific WebView Bug: 214742132 Test: Manual test Change-Id: I1ecdc9990663e0e2469c33f86decf8cb0e1136d2 --- 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 5bcfa8bb64390..1da2af4593481 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.TIRAMISU; 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 cf6807e41e8a6..0ef37d14420cf 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -51,7 +51,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.WebViewChromiumFactoryProviderForT"; private static final String CHROMIUM_WEBVIEW_FACTORY_METHOD = "create";