From 1e5d80319593539790613d9abff2b6c7bf161c6d Mon Sep 17 00:00:00 2001 From: Gustav Sennton Date: Thu, 25 Feb 2016 12:26:36 +0000 Subject: [PATCH] Trigger the webview update logic when receiving PACKAGE_CHANGED intents. Since which WebView implementation we use depends on whether the different webview packages are enabled or disabled we should listen to changes to the enabled-state of our webview packages (to keep the webview implementation up to date). Bug: 27340150 Change-Id: Ie384a48424c9138150ddcc9f7bfaf7b82a911f16 --- .../android/server/webkit/WebViewUpdateService.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateService.java b/services/core/java/com/android/server/webkit/WebViewUpdateService.java index bc5d73fed4c82..9c770e1fdd27d 100644 --- a/services/core/java/com/android/server/webkit/WebViewUpdateService.java +++ b/services/core/java/com/android/server/webkit/WebViewUpdateService.java @@ -125,16 +125,12 @@ public class WebViewUpdateService extends SystemService { updateFallbackState(context, intent); - // TODO(gsennton) for now don't update WebView on PACKAGE_CHANGED as this will - // change the current behaviour even more, instead do this in a follow-up. - if (intent.getAction().equals(Intent.ACTION_PACKAGE_CHANGED)) return; - for (WebViewProviderInfo provider : WebViewFactory.getWebViewPackages()) { String webviewPackage = "package:" + provider.packageName; if (webviewPackage.equals(intent.getDataString())) { boolean updateWebView = false; - boolean removedOldPackage = false; + boolean removedOrChangedOldPackage = false; String oldProviderName = null; PackageInfo newPackage = null; synchronized(WebViewUpdateService.this) { @@ -152,7 +148,7 @@ public class WebViewUpdateService extends SystemService { || mCurrentWebViewPackage == null; // We removed the old package if we received an intent to remove // or replace the old package. - removedOldPackage = + removedOrChangedOldPackage = provider.packageName.equals(oldProviderName); if (updateWebView) { onWebViewProviderChanged(newPackage); @@ -162,7 +158,8 @@ public class WebViewUpdateService extends SystemService { "relro with " + e); } } - if(updateWebView && !removedOldPackage && oldProviderName != null) { + if(updateWebView && !removedOrChangedOldPackage + && oldProviderName != null) { // If the provider change is the result of adding or replacing a // package that was not the previous provider then we must kill // packages dependent on the old package ourselves. The framework