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

Commit 74320710 authored by Patrick Baumann's avatar Patrick Baumann Committed by android-build-merger
Browse files

Merge "Cleans up userId loop in clearPackageStateForUser" into qt-dev am: 662eb71d 

am: 3405f7d9

Change-Id: I23a430c450691596627b6779f8c4bb58e9dc030f
parents 32866527 3405f7d9

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

+6 −6
Original line number Diff line number Diff line
@@ -10234,7 +10234,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;










@@ -18611,7 +18611,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;















            }










@@ -19338,6 +19338,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) {









@@ -19346,11 +19348,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);