Don't run the WebView preparation if using the same non-replaced package

Whenever all primary WebView packages become disabled or uninstalled the
fallback will be enabled and then used. The enabling causes an intent to
be broadcasted and that intent then causes WebViewUpdateService to rerun
its WebView preparation phase.
With this CL we ignore intents for changing the enabled-state of the
current WebView package if we will still use the same WebView package.
The only time we should rerun the preparation logic when the package
is the same (if it has the same name) is if it has been replaced by a
new version.

Bug: 27899444
Change-Id: Iea029e9f854e31b25b1803048c470fb6732e5d0f

1 files changed, 9 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java
index cd976e753a0a..487bc0f4f9ed 100644
--- a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java
+++ b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java
@@ -243,8 +243,16 @@ public class WebViewUpdateServiceImpl {
                     synchronized(mLock) {
                         try {
                             newPackage = findPreferredWebViewPackage();
-                            if (mCurrentWebViewPackage != null)
+                            if (mCurrentWebViewPackage != null) {
                                 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
                             // 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.