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

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

Merge "Cleans up userId loop in clearPackageStateForUser" into qt-dev

parents a0d2d202 b3ba162c

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

+6 −6
Original line number Diff line number Diff line
@@ -10213,7 +10213,7 @@ public class PackageManagerService extends IPackageManager.Stub 
        }

    }













    private void destroyAppProfilesLIF(PackageParser.Package pkg, int userId) {













    private void destroyAppProfilesLIF(PackageParser.Package pkg) {















        if (pkg == null) {















            Slog.wtf(TAG, "Package was null!", new Throwable());















            return;










@@ -18590,7 +18590,7 @@ public class PackageManagerService extends IPackageManager.Stub













            }















            destroyAppDataLIF(resolvedPkg, UserHandle.USER_ALL,















                    StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE);













            destroyAppProfilesLIF(resolvedPkg, UserHandle.USER_ALL);













            destroyAppProfilesLIF(resolvedPkg);















            if (outInfo != null) {















                outInfo.dataRemoved = true;















            }










@@ -19317,6 +19317,8 @@ public class PackageManagerService extends IPackageManager.Stub













            pkg = mPackages.get(ps.name);















        }



























        destroyAppProfilesLIF(pkg);



























        final int[] userIds = (userId == UserHandle.USER_ALL) ? sUserManager.getUserIds()















                : new int[] {userId};















        for (int nextUserId : userIds) {









@@ -19325,11 +19327,9 @@ public class PackageManagerService extends IPackageManager.Stub













                        + nextUserId);















            }



























            destroyAppDataLIF(pkg, userId,













            destroyAppDataLIF(pkg, nextUserId,















                    StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE);













            destroyAppProfilesLIF(pkg, userId);













            clearDefaultBrowserIfNeededForUser(ps.name, userId);













            removeKeystoreDataIfNeeded(nextUserId, ps.appId);













            clearDefaultBrowserIfNeededForUser(ps.name, nextUserId);















            synchronized (mPackages) {















                if (clearPackagePreferredActivitiesLPw(ps.name, nextUserId)) {















                    scheduleWritePackageRestrictionsLocked(nextUserId);