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

Merge "Update READ_PHONE_NUMBER security checks" into rvc-dev am: b98be8b6a9 am: 24a7c9277a am: 921a587823

Browse Source 
Change-Id: I265b6f96bfb0ac22635ff0dd704842b5b674dc9b
This commit is contained in:
TreeHugger Robot
2020-03-26 02:06:11 +00:00
committed by Automerger Merge Worker
parent cce409c5f2 921a587823
commit 7b958b0594
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -442,16 +442,40 @@ public final class TelephonyPermissions {
// NOTE(b/73308711): If an app has one of the following AppOps bits explicitly revoked, they
// will be denied access, even if they have another permission and AppOps bit if needed.
// First, check if we can read the phone state and the SDK version is below R.
// First, check if the SDK version is below R
boolean preR = false;
try {
ApplicationInfo info = context.getPackageManager().getApplicationInfoAsUser(
callingPackage, 0, UserHandle.getUserHandleForUid(Binder.getCallingUid()));
if (info.targetSdkVersion <= Build.VERSION_CODES.Q) {
preR = info.targetSdkVersion <= Build.VERSION_CODES.Q;
} catch (PackageManager.NameNotFoundException nameNotFoundException) {
}
if (preR) {
// SDK < R allows READ_PHONE_STATE, READ_PRIVILEGED_PHONE_STATE, or carrier privilege
try {
return checkReadPhoneState(
context, subId, pid, uid, callingPackage, callingFeatureId, message);
} catch (SecurityException readPhoneStateException) {
}
} else {
// SDK >= R allows READ_PRIVILEGED_PHONE_STATE or carrier privilege
try {
context.enforcePermission(
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, pid, uid, message);
// Skip checking for runtime permission since caller has privileged permission
return true;
} catch (SecurityException readPrivilegedPhoneStateException) {
if (SubscriptionManager.isValidSubscriptionId(subId)) {
try {
enforceCarrierPrivilege(context, subId, uid, message);
// Skip checking for runtime permission since caller has carrier privilege
return true;
} catch (SecurityException carrierPrivilegeException) {
}
}
}
} catch (SecurityException | PackageManager.NameNotFoundException e) {
}
// Can be read with READ_SMS too.
try {
context.enforcePermission(android.Manifest.permission.READ_SMS, pid, uid, message);