diff options
| author | Anton Hansson <hansson@google.com> | 2020-01-16 09:25:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-01-16 09:25:42 +0000 |
| commit | 85bb7887958053ecaae1891e3cc31e49b766f734 (patch) | |
| tree | 2a4f4ab0435a77215d6db04625da7bd7e1d8034c | |
| parent | 3950a24dca1569da8ca08b96d5b16bba5daacb88 (diff) | |
| parent | 0153dfa3605a468593fa7004ed81967c503b5539 (diff) | |
Merge "Revert "Add method to enforce READ_PRECISE_PHONE_STATE permission""
| -rw-r--r-- | telephony/common/com/android/internal/telephony/TelephonyPermissions.java | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java index 5beb06d8595a..c8e2b8962072 100644 --- a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java +++ b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java @@ -562,7 +562,7 @@ public final class TelephonyPermissions { } if (DBG) { - Log.d(LOG_TAG, "No READ_PRIVILEGED_PHONE_STATE permission, " + Log.d(LOG_TAG, "No READ_PRIVILEDED_PHONE_STATE permission, " + "check carrier privilege next."); } @@ -570,33 +570,6 @@ public final class TelephonyPermissions { } /** - * 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. * * @throws SecurityException if the caller does not have the required privileges |