Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always re-enable the fallback WebView if needed." into qt-dev

Browse Source 
am: 4c510c08da

Change-Id: Ie935a947113b360d97a2d5af938b92d53190308c
This commit is contained in:
Torne (Richard Coles)
2019-06-13 10:47:13 -07:00
committed by android-build-merger
parent a0c0e2f8c9 4c510c08da
commit 39cc8ee150
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java
View File

@@ -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) {