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

Commit f7e2e339 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix uninstall for 'all'"

parents 35fc4484 2678a99a

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

+16 −15
Original line number Diff line number Diff line
@@ -1854,7 +1854,8 @@ class PackageManagerShellCommand extends ShellCommand { 
        if (internal.isApexPackage(packageName)) {

            internal.uninstallApex(

                    packageName, versionCode, translatedUserId, receiver.getIntentSender(), flags);

        } else if ((flags & PackageManager.DELETE_ALL_USERS) != 0) {

        } else {

            if ((flags & PackageManager.DELETE_ALL_USERS) == 0) {

                final PackageInfo info = mInterface.getPackageInfo(packageName,

                        PackageManager.MATCH_STATIC_SHARED_LIBRARIES, translatedUserId);

                if (info == null) {
@@ -1869,7 +1870,7 @@ class PackageManagerShellCommand extends ShellCommand { 
                if (isSystem) {

                    flags |= PackageManager.DELETE_SYSTEM_APP;

                }



            }

            mInterface.getPackageInstaller().uninstall(new VersionedPackage(packageName,

                            versionCode), null /*callerPackageName*/, flags,

                    receiver.getIntentSender(), translatedUserId);