Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2809aa3 authored by Nathan Harold's avatar Nathan Harold Committed by Automerger Merge Worker
Browse files

Merge "s/enforece/enforce/" am: 271d82e9 am: fa9eca97 

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

Change-Id: I74171acabde4a219d89681b27b0780b8726f7e58
parents 1dce7fe5 fa9eca97

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -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) {