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

Commit f1a69729 authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Skip carrier priv check for trusted UIDs" into rvc-dev

parents fcb77e88 12a3f5cf

core/java/android/content/pm/PackageManager.java

+1 −1
Original line number Diff line number Diff line
@@ -8171,7 +8171,7 @@ public abstract class PackageManager { 
    private static final PropertyInvalidatedCache<PackageInfoQuery, PackageInfo>

            sPackageInfoCache =

            new PropertyInvalidatedCache<PackageInfoQuery, PackageInfo>(

                    16, PermissionManager.CACHE_KEY_PACKAGE_INFO) {

                    32, PermissionManager.CACHE_KEY_PACKAGE_INFO) {

                @Override

                protected PackageInfo recompute(PackageInfoQuery query) {

                    return getPackageInfoAsUserUncached(

telephony/common/com/android/internal/telephony/TelephonyPermissions.java

+4 −0
Original line number Diff line number Diff line
@@ -623,6 +623,10 @@ public final class TelephonyPermissions { 
    }



    private static int getCarrierPrivilegeStatus(Context context, int subId, int uid) {

        if (uid == Process.SYSTEM_UID || uid == Process.PHONE_UID) {

            // Skip the check if it's one of these special uids

            return TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS;

        }

        final long identity = Binder.clearCallingIdentity();

        try {

            TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(