Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 283b3572 authored by Michael Bai's avatar Michael Bai Committed by Automerger Merge Worker
Browse files

Merge "WebView: Load Android T specific WebView" into tm-dev am: b6a560c1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16938211

Change-Id: I8b9b4c6c8f706840e25a84e5fb4fc6d357af69cb
parents 5e1e9979 b6a560c1

core/java/android/webkit/UserPackage.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/java/android/webkit/WebViewFactory.java

+1 −1
Original line number Diff line number Diff line
@@ -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";