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

Merge "Don't run the WebView preparation if using the same non-replaced package" into nyc-dev

Browse Source
This commit is contained in:
Gustav Sennton
2016-04-13 14:54:53 +00:00
committed by Android (Google) Code Review
parent 9e5922cf73 2198a53ea4
commit 5352dda479
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,8 +245,16 @@ public class WebViewUpdateServiceImpl {
synchronized(mLock) { synchronized(mLock) {
try { try {
newPackage = findPreferredWebViewPackage(); newPackage = findPreferredWebViewPackage();
if (mCurrentWebViewPackage != null) if (mCurrentWebViewPackage != null) {
oldProviderName = mCurrentWebViewPackage.packageName; oldProviderName = mCurrentWebViewPackage.packageName;
if (changedState == WebViewUpdateService.PACKAGE_CHANGED
&& newPackage.packageName.equals(oldProviderName)) {
// If we don't change package name we should only rerun the
// preparation phase if the current package has been replaced
// (not if it has been enabled/disabled).
return;
}
}
// Only trigger update actions if the updated package is the one // Only trigger update actions if the updated package is the one
// that will be used, or the one that was in use before the // that will be used, or the one that was in use before the
// update, or if we haven't seen a valid WebView package before. // update, or if we haven't seen a valid WebView package before.