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

Merge "Revert "Revert "Add method to enforce READ_PRECISE_PHONE_STATE p..."" am: 55f9664eb3 am: ba526d50c9

Browse Source 
Change-Id: Ie0809641be9de560d0efb9c3bf4cc8289b043300
This commit is contained in:
Automerger Merge Worker
2020-01-17 22:09:49 +00:00
parent 9f280c19b4 ba526d50c9
commit a4ba1c1a47
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,13 +562,40 @@ public final class TelephonyPermissions {
}
if (DBG) {
Log.d(LOG_TAG, "No READ_PRIVILEDED_PHONE_STATE permission, "
Log.d(LOG_TAG, "No READ_PRIVILEGED_PHONE_STATE permission, "
+ "check carrier privilege next.");
}
enforceCallingOrSelfCarrierPrivilege(context, subId, message);
}
/**
* Ensure the caller (or self, if not processing an IPC) has
* {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE} or
* {@link android.Manifest.permission#READ_PRECISE_PHONE_STATE} or carrier privileges.
*
* @throws SecurityException if the caller does not have the required permission/privileges
*/
public static void enforeceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege(
Context context, int subId, String message) {
if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
== PERMISSION_GRANTED) {
return;
}
if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PRECISE_PHONE_STATE)
== PERMISSION_GRANTED) {
return;
}
if (DBG) {
Log.d(LOG_TAG, "No READ_PRIVILEGED_PHONE_STATE nor READ_PRECISE_PHONE_STATE permission"
+ ", check carrier privilege next.");
}
enforceCallingOrSelfCarrierPrivilege(context, subId, message);
}
/**
* Make sure the caller (or self, if not processing an IPC) has carrier privileges.
*