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

Commit 51b3c7b6 authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Pregrant non-system preloaded apps" am: 86ba6546 am: 21d92f04 am: c7d9a972 

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



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

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

+17 −5
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ import com.android.server.pm.KnownPackages; 
import com.android.server.pm.permission.LegacyPermissionManagerInternal.PackagesProvider;

import com.android.server.pm.permission.LegacyPermissionManagerInternal.SyncAdapterPackagesProvider;



import libcore.util.HexEncoding;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -126,6 +128,7 @@ final class DefaultPermissionGrantPolicy { 
    private static final String ATTR_NAME = "name";

    private static final String ATTR_FIXED = "fixed";

    private static final String ATTR_WHITELISTED = "whitelisted";

    private static final String ATTR_CERT = "cert";



    private static final Set<String> PHONE_PERMISSIONS = new ArraySet<>();
@@ -1438,7 +1441,7 @@ final class DefaultPermissionGrantPolicy { 
        final int exceptionCount = mGrantExceptions.size();

        for (int i = 0; i < exceptionCount; i++) {

            String packageName = mGrantExceptions.keyAt(i);

            PackageInfo pkg = pm.getSystemPackageInfo(packageName);

            PackageInfo pkg = pm.getPackageInfo(packageName);

            List<DefaultPermissionGrant> permissionGrants = mGrantExceptions.valueAt(i);

            final int permissionGrantCount = permissionGrants.size();

            for (int j = 0; j < permissionGrantCount; j++) {
@@ -1556,12 +1559,12 @@ final class DefaultPermissionGrantPolicy { 
            }

            if (TAG_EXCEPTION.equals(parser.getName())) {

                String packageName = parser.getAttributeValue(null, ATTR_PACKAGE);

                String cert = parser.getAttributeValue(null, ATTR_CERT);



                List<DefaultPermissionGrant> packageExceptions =

                        outGrantExceptions.get(packageName);

                if (packageExceptions == null) {

                    // The package must be on the system image

                    PackageInfo packageInfo = pm.getSystemPackageInfo(packageName);

                    PackageInfo packageInfo = pm.getPackageInfo(packageName);



                    if (packageInfo == null) {

                        Log.w(TAG, "No such package:" + packageName);
@@ -1569,8 +1572,8 @@ final class DefaultPermissionGrantPolicy { 
                        continue;

                    }



                    if (!pm.isSystemPackage(packageInfo)) {

                        Log.w(TAG, "Unknown system package:" + packageName);

                    if (!isSystemOrCertificateMatchingPackage(packageInfo, cert)) {

                        Log.w(TAG, "Not system or certificate-matching package: " + packageName);

                        XmlUtils.skipCurrentTag(parser);

                        continue;

                    }
@@ -1625,6 +1628,15 @@ final class DefaultPermissionGrantPolicy { 
        }

    }



    private boolean isSystemOrCertificateMatchingPackage(PackageInfo pi, String cert) {

        if (cert == null) {

            return pi.applicationInfo.isSystemApp();

        }



        return mContext.getPackageManager().hasSigningCertificate(pi.packageName, HexEncoding.

                decode(cert.replace(":", "")), PackageManager.CERT_INPUT_SHA256);

    }



    private static boolean doesPackageSupportRuntimePermissions(PackageInfo pkg) {

        return pkg.applicationInfo != null

                && pkg.applicationInfo.targetSdkVersion > Build.VERSION_CODES.LOLLIPOP_MR1;