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

Merge "Trigger the webview update logic when receiving PACKAGE_CHANGED intents." into nyc-dev

Browse Source
This commit is contained in:
Gustav Sennton
2016-02-25 15:34:23 +00:00
committed by Android (Google) Code Review
parent 596e1d3b7a 1e5d803195
commit ef417514e7
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/webkit/WebViewUpdateService.java
View File

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