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

Commit f33c18e7 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: 06775341 

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



Change-Id: I0000191be2751aeaace1972e8339a1c0f5141a59
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6e71e08 06775341

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

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