diff options
| author | 2024-01-29 02:10:08 +0000 | |
|---|---|---|
| committer | 2024-01-29 02:10:08 +0000 | |
| commit | bcf8db1747608fcb484c32ec4cb89e63e7d28a4c (patch) | |
| tree | 35ec6ad8de00626e7ff6eccc16388f8c09a6e165 | |
| parent | 0075bc7fc575873c1ecd60d7c841b1ed887bc7e6 (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: Ie5043d46ef79a95887423aa44d0f33b5e62c3b61
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 { |