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>
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index a56ac9d..0ec7023 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 @@
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 @@
if (((scanFlags & SCAN_AS_PRIVILEGED) == 0)
&& !pkg.isPrivileged()
&& (pkg.getSharedUserId() != null)
- && !skipVendorPrivilegeScan) {
+ && !skipVendorPrivilegeScan
+ && !pkg.isLeavingSharedUid()) {
SharedUserSetting sharedUserSetting = null;
synchronized (mPm.mLock) {
try {