From 0153dfa3605a468593fa7004ed81967c503b5539 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Thu, 16 Jan 2020 09:07:47 +0000 Subject: [PATCH] Revert "Add method to enforce READ_PRECISE_PHONE_STATE permission" Revert "Add method to enforce READ_PRECISE_PHONE_STATE permission" Revert submission 1205361-ENFORCE_PRECISE_PERMISSION Reason for revert: Broke many internal targets Reverted Changes: I852098ffb: Add method to enforce READ_PRECISE_PHONE_STATE per... Ib542a5e2f: Add method to enforce READ_PRECISE_PHONE_STATE per... Change-Id: I71413a32c7c2299614ec304eba424024000e0748 --- .../telephony/TelephonyPermissions.java | 29 +------------------ 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java index 5beb06d8595a4..c8e2b8962072a 100644 --- a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java +++ b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java @@ -562,40 +562,13 @@ 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."); } 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. *