Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hall Liu
2020-07-13 23:33:07 +00:00
committed by Android (Google) Code Review
parent fcb77e88ab 12a3f5cfdc
commit f1a6972937
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/pm/PackageManager.java
View File

@@ -8171,7 +8171,7 @@ public abstract class PackageManager {
private static final PropertyInvalidatedCache<PackageInfoQuery, PackageInfo> private static final PropertyInvalidatedCache<PackageInfoQuery, PackageInfo>
sPackageInfoCache = sPackageInfoCache =
new PropertyInvalidatedCache<PackageInfoQuery, PackageInfo>( new PropertyInvalidatedCache<PackageInfoQuery, PackageInfo>(
16, PermissionManager.CACHE_KEY_PACKAGE_INFO) { 32, PermissionManager.CACHE_KEY_PACKAGE_INFO) {
@Override @Override
protected PackageInfo recompute(PackageInfoQuery query) { protected PackageInfo recompute(PackageInfoQuery query) {
return getPackageInfoAsUserUncached( return getPackageInfoAsUserUncached(

4
telephony/common/com/android/internal/telephony/TelephonyPermissions.java
View File

@@ -623,6 +623,10 @@ public final class TelephonyPermissions {
} }
private static int getCarrierPrivilegeStatus(Context context, int subId, int uid) { 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(); final long identity = Binder.clearCallingIdentity();
try { try {
TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService( TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(