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

Commit e215db31 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix uninstall with keep_data flag on multi-user" into rvc-dev am: 770ba1c9 am: ddb6ae97 

Change-Id: I2f5fd8abe89b11624f3b42d2403b15dda5eef37a
parents 684c079a ddb6ae97

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -18562,9 +18562,10 @@ public class PackageManagerService extends IPackageManager.Stub 
                Slog.d(TAG, "Updating package:" + ps.name + " install state for user:"

                Slog.d(TAG, "Updating package:" + ps.name + " install state for user:"

                        + nextUserId);

                        + nextUserId);

            }

            }







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











                destroyAppDataLIF(pkg, nextUserId,







                destroyAppDataLIF(pkg, nextUserId,











                        FLAG_STORAGE_DE | FLAG_STORAGE_CE | FLAG_STORAGE_EXTERNAL);







                        FLAG_STORAGE_DE | FLAG_STORAGE_CE | FLAG_STORAGE_EXTERNAL);














            }











            clearDefaultBrowserIfNeededForUser(ps.name, nextUserId);







            clearDefaultBrowserIfNeededForUser(ps.name, nextUserId);











            removeKeystoreDataIfNeeded(mInjector.getUserManagerInternal(), nextUserId, ps.appId);







            removeKeystoreDataIfNeeded(mInjector.getUserManagerInternal(), nextUserId, ps.appId);











            clearPackagePreferredActivities(ps.name, nextUserId);







            clearPackagePreferredActivities(ps.name, nextUserId);