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

Commit bcf8db17 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: Ie5043d46ef79a95887423aa44d0f33b5e62c3b61
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0075bc7f 06775341

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -4742,7 +4742,9 @@ final class InstallPackageHelper { 




    private void assertPackageWithSharedUserIdIsPrivileged(AndroidPackage pkg)

    private void assertPackageWithSharedUserIdIsPrivileged(AndroidPackage pkg)

            throws PackageManagerException {

            throws PackageManagerException {

        if (!AndroidPackageUtils.isPrivileged(pkg) && (pkg.getSharedUserId() != null)) {

        if (!AndroidPackageUtils.isPrivileged(pkg)

                && (pkg.getSharedUserId() != null)

                && !pkg.isLeavingSharedUser()) {

            SharedUserSetting sharedUserSetting = null;

            SharedUserSetting sharedUserSetting = null;

            try {

            try {

                synchronized (mPm.mLock) {

                synchronized (mPm.mLock) {
@@ -4783,7 +4785,8 @@ final class InstallPackageHelper { 
        if (((scanFlags & SCAN_AS_PRIVILEGED) == 0)

        if (((scanFlags & SCAN_AS_PRIVILEGED) == 0)

                && !AndroidPackageUtils.isPrivileged(pkg)

                && !AndroidPackageUtils.isPrivileged(pkg)

                && (pkg.getSharedUserId() != null)

                && (pkg.getSharedUserId() != null)

                && !skipVendorPrivilegeScan) {

                && !skipVendorPrivilegeScan

                && !pkg.isLeavingSharedUser()) {

            SharedUserSetting sharedUserSetting = null;

            SharedUserSetting sharedUserSetting = null;

            synchronized (mPm.mLock) {

            synchronized (mPm.mLock) {

                try {

                try {