diff options
| author | 2024-01-29 02:11:54 +0000 | |
|---|---|---|
| committer | 2024-01-29 02:11:54 +0000 | |
| commit | f33c18e78f84aa4d36eef7357486bd9978022aa3 (patch) | |
| tree | cab0766c2af3a427d4cc4229c5cdad99c31fe8e5 | |
| parent | e6e71e08936558ce7935940e7890a1e48cbdf83a (diff) | |
| parent | 06775341ad7d77410798f95117cbee7a1a02c201 (diff) | |
Stop marking apps as privileged if they are not signed properly. am: 06775341ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25841331
Change-Id: I0000191be2751aeaace1972e8339a1c0f5141a59
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 | 7 |
1 files changed, 5 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 d0304b43215e..f26a9f8f3aed 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -4742,7 +4742,9 @@ final class InstallPackageHelper { private void assertPackageWithSharedUserIdIsPrivileged(AndroidPackage pkg) throws PackageManagerException { - if (!AndroidPackageUtils.isPrivileged(pkg) && (pkg.getSharedUserId() != null)) { + if (!AndroidPackageUtils.isPrivileged(pkg) + && (pkg.getSharedUserId() != null) + && !pkg.isLeavingSharedUser()) { SharedUserSetting sharedUserSetting = null; try { synchronized (mPm.mLock) { @@ -4783,7 +4785,8 @@ final class InstallPackageHelper { if (((scanFlags & SCAN_AS_PRIVILEGED) == 0) && !AndroidPackageUtils.isPrivileged(pkg) && (pkg.getSharedUserId() != null) - && !skipVendorPrivilegeScan) { + && !skipVendorPrivilegeScan + && !pkg.isLeavingSharedUser()) { SharedUserSetting sharedUserSetting = null; synchronized (mPm.mLock) { try { |