Merge "s/enforece/enforce/" into sc-dev (006b746b) · Commits · e / os / android_frameworks_base

telephony/common/com/android/internal/telephony/TelephonyPermissions.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -571,7 +571,7 @@ public final class TelephonyPermissions {
		*
		* @throws SecurityException if the caller does not have the required permission/privileges
		*/
		public static void enforeceCallingOrSelfReadPhoneStatePermissionOrCarrierPrivilege(
		public static void enforceCallingOrSelfReadPhoneStatePermissionOrCarrierPrivilege(
		Context context, int subId, String message) {
		if (context.checkCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE)
		== PERMISSION_GRANTED) {
		@@ -591,7 +591,7 @@ public final class TelephonyPermissions {
		*
		* @throws SecurityException if the caller does not have the required permission/privileges
		*/
		public static void enforeceCallingOrSelfReadPrivilegedPhoneStatePermissionOrCarrierPrivilege(
		public static void enforceCallingOrSelfReadPrivilegedPhoneStatePermissionOrCarrierPrivilege(
		Context context, int subId, String message) {
		if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		== PERMISSION_GRANTED) {
		@@ -613,7 +613,7 @@ public final class TelephonyPermissions {
		*
		* @throws SecurityException if the caller does not have the required permission/privileges
		*/
		public static void enforeceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege(
		public static void enforceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege(
		Context context, int subId, String message) {
		if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		== PERMISSION_GRANTED) {