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

Commit cfa9b703 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles)
Browse files

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
parent 4734fb5e

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.R;

    public static final int MINIMUM_SUPPORTED_SDK = Build.VERSION_CODES.S;



    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
@@ -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";