diff options
| author | 2022-07-28 21:50:43 +0000 | |
|---|---|---|
| committer | 2022-07-28 21:50:43 +0000 | |
| commit | 6791ba8ce560ce0c05e0882ff23a1b2c98f991a0 (patch) | |
| tree | 8db10637ff3c23ccfff8da9fe7df143c853c4bc2 | |
| parent | 58b0f9d6b5eaf47ca379cae9b05ae19d32a53bce (diff) | |
| parent | bb2e856381057e86bb2dc2908a4c2d06aab793bf (diff) | |
Merge "Ignore sharedUserId when package already left shared UID" into tm-dev am: bb2e856381
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19295566
Change-Id: I4e3e083d5e86c94c913201946b6a50580ecb8be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/InstallPackageHelper.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index e90a5db39d71..7da5f51bcbc2 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -3701,8 +3701,9 @@ final class InstallPackageHelper { parsedPackage.getPackageName()); boolean ignoreSharedUserId = false; - if (installedPkgSetting == null) { - // We can directly ignore sharedUserSetting for new installs + if (installedPkgSetting == null || !installedPkgSetting.hasSharedUser()) { + // Directly ignore sharedUserSetting for new installs, or if the app has + // already left shared UID ignoreSharedUserId = parsedPackage.isLeavingSharedUid(); } |