Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f41b242 authored by Gustav Sennton's avatar Gustav Sennton Committed by android-build-merger
Browse files

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

am: 5352dda4

* commit '5352dda4':
  Don't run the WebView preparation if using the same non-replaced package

Change-Id: I7f018b862bb8426481fe34dd25fbb401a4bf96fd
parents db67ea8b 5352dda4

services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java

+9 −1
Original line number Diff line number Diff line
@@ -245,8 +245,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.