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

Commit 9777b1fe authored by Svet Ganov's avatar Svet Ganov Committed by Android Git Automerger
Browse files

am f12fb43c: am 7ca0c42d: am fc2bc7f1: Merge "Check signatures of privileged... 

am f12fb43c: am 7ca0c42d: am fc2bc7f1: Merge "Check signatures of privileged persistent apps for granting defailt  permissions" into mnc-dev

* commit 'f12fb43c':
  Check signatures of privileged persistent apps for granting defailt  permissions
parents df8db14e f12fb43c

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

+12 −7
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ final class DefaultPermissionGrantPolicy { 


        synchronized (mService.mPackages) {

            for (PackageParser.Package pkg : mService.mPackages.values()) {

                if (!isSysComponentOrPersistentPrivApp(pkg)

                if (!isSysComponentOrPersistentPlatformSignedPrivApp(pkg)

                        || !doesPackageSupportRuntimePermissions(pkg)) {

                    continue;

                }
@@ -683,7 +683,7 @@ final class DefaultPermissionGrantPolicy { 
    private PackageParser.Package getSystemPackageLPr(String packageName) {

        PackageParser.Package pkg = getPackageLPr(packageName);

        if (pkg != null && pkg.isSystemApp()) {

            return !isSysComponentOrPersistentPrivApp(pkg) ? pkg : null;

            return !isSysComponentOrPersistentPlatformSignedPrivApp(pkg) ? pkg : null;

        }

        return null;

    }
@@ -732,11 +732,16 @@ final class DefaultPermissionGrantPolicy { 
        }

    }



    private static boolean isSysComponentOrPersistentPrivApp(PackageParser.Package pkg) {

        return UserHandle.getAppId(pkg.applicationInfo.uid) < FIRST_APPLICATION_UID

                || ((pkg.applicationInfo.privateFlags

                & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) != 0

                && (pkg.applicationInfo.flags & ApplicationInfo.FLAG_PERSISTENT) != 0);

    private boolean isSysComponentOrPersistentPlatformSignedPrivApp(PackageParser.Package pkg) {

        if (UserHandle.getAppId(pkg.applicationInfo.uid) < FIRST_APPLICATION_UID) {

            return true;

        }

        if ((pkg.applicationInfo.privateFlags & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) == 0

                || (pkg.applicationInfo.flags & ApplicationInfo.FLAG_PERSISTENT) == 0) {

            return false;

        }

        return PackageManagerService.compareSignatures(mService.mPlatformPackage.mSignatures,

                pkg.mSignatures) == PackageManager.SIGNATURE_MATCH;

    }



    private static boolean doesPackageSupportRuntimePermissions(PackageParser.Package pkg) {