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

Commit 1f107f15 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by android-build-merger
Browse files

Merge "Always re-enable the fallback WebView if needed." into qt-dev am: 4c510c08 

am: 39cc8ee1

Change-Id: I61571c0ae961d35366e0c30197eb1138609b10d1
parents 899b78de 39cc8ee1

services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java

+16 −0
Original line number Diff line number Diff line
@@ -82,6 +82,22 @@ public class WebViewUpdateServiceImpl { 
    void prepareWebViewInSystemServer() {

        migrateFallbackStateOnBoot();

        mWebViewUpdater.prepareWebViewInSystemServer();

        if (getCurrentWebViewPackage() == null) {

            // We didn't find a valid WebView implementation. Try explicitly re-enabling the

            // fallback package for all users in case it was disabled, even if we already did the

            // one-time migration before. If this actually changes the state, WebViewUpdater will

            // see the PackageManager broadcast shortly and try again.

            WebViewProviderInfo[] webviewProviders = mSystemInterface.getWebViewPackages();

            WebViewProviderInfo fallbackProvider = getFallbackProvider(webviewProviders);

            if (fallbackProvider != null) {

                Slog.w(TAG, "No valid provider, trying to enable " + fallbackProvider.packageName);

                mSystemInterface.enablePackageForAllUsers(mContext, fallbackProvider.packageName,

                                                          true);

            } else {

                Slog.e(TAG, "No valid provider and no fallback available.");

            }

        }



        boolean multiProcessEnabled = isMultiProcessEnabled();

        mSystemInterface.notifyZygote(multiProcessEnabled);

        if (multiProcessEnabled) {