Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix uninstall with keep_data flag on multi-user" into rvc-dev

Browse Source
This commit is contained in:
Zimuzo Ezeozue
2020-03-06 08:08:19 +00:00
committed by Android (Google) Code Review
parent d7944d6573 e394c1952a
commit 770ba1c98e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/pm/PackageManagerService.java
View File

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