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

Merge "Instant app uninstallation fix."

Browse Source
This commit is contained in:
Alex Buynytskyy
2022-02-09 05:39:36 +00:00
committed by Android (Google) Code Review
parent 5c86554260 3e084b0c43
commit 2981683fbf
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/DeletePackageHelper.java
View File

@@ -222,8 +222,12 @@ final class DeletePackageHelper {
deleteFlags | PackageManager.DELETE_CHATTY, info, true);
}
if (res && pkg != null) {
final boolean packageInstalledForSomeUsers;
synchronized (mPm.mLock) {
packageInstalledForSomeUsers = mPm.mPackages.get(pkg.getPackageName()) != null;
}
mPm.mInstantAppRegistry.onPackageUninstalled(pkg, uninstalledPs,
info.mRemovedUsers);
info.mRemovedUsers, packageInstalledForSomeUsers);
}
synchronized (mPm.mLock) {
if (res) {

4
services/core/java/com/android/server/pm/InstantAppRegistry.java
View File

@@ -444,14 +444,14 @@ public class InstantAppRegistry implements Watchable, Snappable {
}
public void onPackageUninstalled(@NonNull AndroidPackage pkg, @NonNull PackageSetting ps,
@NonNull int[] userIds) {
@NonNull int[] userIds, boolean packageInstalledForSomeUsers) {
if (ps == null) {
return;
}
synchronized (mLock) {
for (int userId : userIds) {
if (ps.getInstalled(userId)) {
if (packageInstalledForSomeUsers && ps.getInstalled(userId)) {
continue;
}