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

Commit 611b3dd5 authored by Gustav Sennton's avatar Gustav Sennton Committed by android-build-merger
Browse files

Merge "Disable fallback webview package before downgrading it." into nyc-dev 

am: 0a786cff

* commit '0a786cff':
  Disable fallback webview package before downgrading it.

Change-Id: Iba88c272ed693103d756e9a5d94c6a37d03f084b
parents 7507efdd 0a786cff

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

+11 −8
Original line number Diff line number Diff line
@@ -184,16 +184,19 @@ public class SystemImpl implements SystemInterface { 


    @Override

    public void uninstallAndDisablePackageForAllUsers(Context context, String packageName) {

        context.getPackageManager().deletePackage(packageName,

                new IPackageDeleteObserver.Stub() {

        enablePackageForAllUsers(context, packageName, false);

        try {

            PackageManager pm = AppGlobals.getInitialApplication().getPackageManager();

            if (pm.getApplicationInfo(packageName, 0).isUpdatedSystemApp()) {

                pm.deletePackage(packageName, new IPackageDeleteObserver.Stub() {

                        public void packageDeleted(String packageName, int returnCode) {

                // Ignore returnCode since the deletion could fail, e.g. we might be trying

                // to delete a non-updated system-package (and we should still disable the

                // package)

                            enablePackageForAllUsers(context, packageName, false);

                        }

                    }, PackageManager.DELETE_SYSTEM_APP | PackageManager.DELETE_ALL_USERS);

            }

        } catch (NameNotFoundException e) {

        }

    }



    @Override

    public void enablePackageForAllUsers(Context context, String packageName, boolean enable) {