diff options
| author | 2024-01-29 19:18:06 +0000 | |
|---|---|---|
| committer | 2024-01-29 19:18:06 +0000 | |
| commit | cc4e77312ce210f59b746bc7be9bc322c122e176 (patch) | |
| tree | e5581d8099427f83e8e06eb87651165602aeabdd | |
| parent | 36de1cab148126366d6aff8bb7ca873a5dccf3d8 (diff) | |
| parent | 1bb65191b20d7d456d52832a0600fd1d16fd4ed6 (diff) | |
Stop marking apps as privileged if they are not signed properly. am: e336c7d7c9 am: 1bb65191b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25842163
Change-Id: I106c2a8eeb57a89a3a0aedd61dc533967fbff7d3
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 a56ac9de6ebe..0ec70238ff64 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -4373,7 +4373,9 @@ final class InstallPackageHelper { private void assertPackageWithSharedUserIdIsPrivileged(AndroidPackage pkg) throws PackageManagerException { - if (!pkg.isPrivileged() && (pkg.getSharedUserId() != null)) { + if (!pkg.isPrivileged() + && (pkg.getSharedUserId() != null) + && !pkg.isLeavingSharedUid()) { SharedUserSetting sharedUserSetting = null; try { sharedUserSetting = mPm.mSettings.getSharedUserLPw(pkg.getSharedUserId(), @@ -4407,7 +4409,8 @@ final class InstallPackageHelper { if (((scanFlags & SCAN_AS_PRIVILEGED) == 0) && !pkg.isPrivileged() && (pkg.getSharedUserId() != null) - && !skipVendorPrivilegeScan) { + && !skipVendorPrivilegeScan + && !pkg.isLeavingSharedUid()) { SharedUserSetting sharedUserSetting = null; synchronized (mPm.mLock) { try { |