From 8c7a325225054c22bc687a9b7662513796ec0402 Mon Sep 17 00:00:00 2001 From: Patrick Baumann Date: Wed, 30 Sep 2020 16:59:54 +0000 Subject: [PATCH 1/2] Revert "Handling removing tag" This reverts commit 27c28b94283b491c58d5981fc580cd89e5c251c5. Reason for revert: Adding verification method. Bug: 169414761 Change-Id: I7b9d3c786d653a9b00a553e89d7390bcef45c0f2 --- .../java/com/android/server/pm/PackageManagerService.java | 2 -- services/core/java/com/android/server/pm/Settings.java | 4 ---- 2 files changed, 6 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index dd7ef5b02877a..6246b28a3dd6d 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -11115,8 +11115,6 @@ public class PackageManagerService extends IPackageManager.Stub mSettings.addRenamedPackageLPw(parsedPackage.getRealPackage(), originalPkgSetting.name); mTransferredPackages.add(originalPkgSetting.name); - } else { - mSettings.removeRenamedPackageLPw(parsedPackage.getPackageName()); } } if (pkgSetting.sharedUser != null) { diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index a7164f94f66b7..aeea2514d0a49 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -476,10 +476,6 @@ public final class Settings { return mRenamedPackages.put(pkgName, origPkgName); } - void removeRenamedPackageLPw(String pkgName) { - mRenamedPackages.remove(pkgName); - } - public boolean canPropagatePermissionToInstantApp(String permName) { return mPermissions.canPropagatePermissionToInstantApp(permName); } From 50ee8017ea54bc7c2b977e12147727057274f5d9 Mon Sep 17 00:00:00 2001 From: Patrick Baumann Date: Wed, 30 Sep 2020 17:00:13 +0000 Subject: [PATCH 2/2] Handling removing tag This reverts commit I7b9d3c786d653a9b00a553e89d7390bcef45c0f2. Fixes: 169414761 Test: Manual Test: Add package A Test: Verify package A exists Test: Remove A, add package B w/ original-package A Test: Verify package A exists, but codepath is to package B Test: Replace package B w/o original-package A Test: Verify package A removed and package B added Change-Id: I198ca545f4fea3ae9d2328a845cbd9167eedf8da --- .../java/com/android/server/pm/PackageManagerService.java | 4 ++++ services/core/java/com/android/server/pm/Settings.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 6246b28a3dd6d..f191ef4f82cc9 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -3655,6 +3655,8 @@ public class PackageManagerService extends IPackageManager.Stub PackageParser.readConfigUseRoundIcon(mContext.getResources()); mServiceStartWithDelay = SystemClock.uptimeMillis() + (60 * 1000L); + + Slog.i(TAG, "Fix for b/169414761 is applied"); } /** @@ -11115,6 +11117,8 @@ public class PackageManagerService extends IPackageManager.Stub mSettings.addRenamedPackageLPw(parsedPackage.getRealPackage(), originalPkgSetting.name); mTransferredPackages.add(originalPkgSetting.name); + } else { + mSettings.removeRenamedPackageLPw(parsedPackage.getPackageName()); } } if (pkgSetting.sharedUser != null) { diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index aeea2514d0a49..a7164f94f66b7 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -476,6 +476,10 @@ public final class Settings { return mRenamedPackages.put(pkgName, origPkgName); } + void removeRenamedPackageLPw(String pkgName) { + mRenamedPackages.remove(pkgName); + } + public boolean canPropagatePermissionToInstantApp(String permName) { return mPermissions.canPropagatePermissionToInstantApp(permName); }