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

Commit 23ad580e authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by android-build-merger
Browse files

Merge "Delete only the target user" into nyc-dev am: 558e38b9 

am: 5ae2d621

* commit '5ae2d621':
  Delete only the target user
parents 830b6e00 5ae2d621

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

+7 −6
Original line number Diff line number Diff line
@@ -14397,7 +14397,6 @@ public class PackageManagerService extends IPackageManager.Stub { 
        if (DEBUG_REMOVE) Slog.d(TAG, "deletePackageLI: " + packageName + " user " + user);















        PackageSetting ps;













        int removeUser = -1;





























        synchronized (mPackages) {















            ps = mSettings.mPackages.get(packageName);









@@ -14412,7 +14411,9 @@ public class PackageManagerService extends IPackageManager.Stub {













                    Slog.d(TAG, "Uninstalled child package:" + packageName + " for user:"















                            + ((user == null) ? UserHandle.USER_ALL : user));















                }













                if (!clearPackageStateForUser(ps, removeUser, outInfo)) {













                final int removedUserId = (user != null) ? user.getIdentifier()













                        : UserHandle.USER_ALL;













                if (!clearPackageStateForUser(ps, removedUserId, outInfo)) {















                    return false;















                }















                markPackageUninstalledForUserLPw(ps, user);









@@ -14438,7 +14439,7 @@ public class PackageManagerService extends IPackageManager.Stub {













                    // we need to do is clear this user's data and save that















                    // it is uninstalled.















                    if (DEBUG_REMOVE) Slog.d(TAG, "Still installed by other users");













                    if (!clearPackageStateForUser(ps, removeUser, outInfo)) {













                    if (!clearPackageStateForUser(ps, user.getIdentifier(), outInfo)) {















                        return false;















                    }















                    scheduleWritePackageRestrictionsLocked(user);









@@ -14455,7 +14456,7 @@ public class PackageManagerService extends IPackageManager.Stub {













                // we need to do is clear this user's data and save that















                // it is uninstalled.















                if (DEBUG_REMOVE) Slog.d(TAG, "Deleting system app");













                if (!clearPackageStateForUser(ps, removeUser, outInfo)) {













                if (!clearPackageStateForUser(ps, user.getIdentifier(), outInfo)) {















                    return false;















                }















                scheduleWritePackageRestrictionsLocked(user);