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

Merge "WebView: pay attention to PACKAGE_CHANGED." into qt-qpr1-dev

Browse Source 
am: 400db4bfef

Change-Id: I5c7c032b1d336b84c4d198312aba4ba121a2fc46
This commit is contained in:
Torne (Richard Coles)
2019-09-11 07:03:58 -07:00
committed by android-build-merger
parent 236ff7f45f 400db4bfef
commit 3c1216c41f
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/webkit/WebViewUpdater.java
View File

@@ -87,19 +87,6 @@ class WebViewUpdater {
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;
}
if (newPackage.packageName.equals(oldProviderName)
&& (newPackage.lastUpdateTime
== mCurrentWebViewPackage.lastUpdateTime)) {
// If the chosen package hasn't been updated, then early-out
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