Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20b10157 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Stop marking apps as privileged if they are not signed properly. am: e336c7d7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25842163



Change-Id: Ib601463504a9cf9c123b40d82a7511a6c833cdee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 627c16f2 e336c7d7

services/core/java/com/android/server/pm/InstallPackageHelper.java

+5 −2
Original line number Diff line number Diff line
@@ -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 {