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

Merge "s/enforece/enforce/" am: 271d82e966

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665799

Change-Id: I6ded5e66c7f0e969af01a8a23df200f42bb76da0
This commit is contained in:
Nathan Harold
2021-04-08 21:49:22 +00:00
committed by Automerger Merge Worker
parent af31a081dc 271d82e966
commit fa9eca97b7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -525,7 +525,7 @@ public final class TelephonyPermissions {
* *
* @throws SecurityException if the caller does not have the required permission/privileges * @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) { Context context, int subId, String message) {
if (context.checkCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE) if (context.checkCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE)
== PERMISSION_GRANTED) { == PERMISSION_GRANTED) {
@@ -545,7 +545,7 @@ public final class TelephonyPermissions {
* *
* @throws SecurityException if the caller does not have the required permission/privileges * @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) { Context context, int subId, String message) {
if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
== PERMISSION_GRANTED) { == PERMISSION_GRANTED) {
@@ -567,7 +567,7 @@ public final class TelephonyPermissions {
* *
* @throws SecurityException if the caller does not have the required permission/privileges * @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) { Context context, int subId, String message) {
if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) if (context.checkCallingOrSelfPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
== PERMISSION_GRANTED) { == PERMISSION_GRANTED) {