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

Commit 2678a99a authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Fix uninstall for 'all' 

Test: Manual. "uninstall" or "uninstall --user all" actually removes the application for all users
Test: atest RoleManagerTest#openDefaultAppListThenHasDefaultApp
Bug: 145561378
Change-Id: I9c879c5f0967804804f588633bb5f1738bd9b2f1
parent ea7ba961

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);