From 3098cf2ea2d119a5630aa66e617f1f31de38cf17 Mon Sep 17 00:00:00 2001 From: Gustav Sennton Date: Tue, 10 Nov 2015 03:33:09 +0000 Subject: Trigger WebView relro creation when new provider package installed. Previously, the switching of WebView providers was only triggered when a WebView provider package was replaced. The new channels (e.g. Dev/Beta) do not exist in the system image which means that we might install a new WebView provider package without having to replace an existing one (which before this change meant we didn't trigger the WebView updating service). Change-Id: I0933cb5cfc05c64dd950e0b405ede918c2791798 --- .../java/com/android/server/webkit/WebViewUpdateService.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateService.java b/services/core/java/com/android/server/webkit/WebViewUpdateService.java index ac79b36f7005..97713fc2407a 100644 --- a/services/core/java/com/android/server/webkit/WebViewUpdateService.java +++ b/services/core/java/com/android/server/webkit/WebViewUpdateService.java @@ -54,6 +54,15 @@ public class WebViewUpdateService extends SystemService { @Override public void onReceive(Context context, Intent intent) { + // When a package is replaced we will receive two intents, one representing the + // removal of the old package and one representing the addition of the new + // package. We here ignore the intent representing the removed package to make + // sure we don't change WebView provider twice. + if (intent.getAction().equals(Intent.ACTION_PACKAGE_REMOVED) + && intent.getExtras().getBoolean(Intent.EXTRA_REPLACING)) { + return; + } + for (String packageName : WebViewFactory.getWebViewPackageNames()) { String webviewPackage = "package:" + packageName; @@ -73,7 +82,8 @@ public class WebViewUpdateService extends SystemService { } }; IntentFilter filter = new IntentFilter(); - filter.addAction(Intent.ACTION_PACKAGE_REPLACED); + filter.addAction(Intent.ACTION_PACKAGE_ADDED); + filter.addAction(Intent.ACTION_PACKAGE_REMOVED); filter.addDataScheme("package"); getContext().registerReceiver(mWebViewUpdatedReceiver, filter); -- cgit v1.2.3-59-g8ed1b