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

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

Merge "s/enforece/enforce/" am: 6919d233 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1665720

Change-Id: Ie9ee8fb6b3980a69d88403d7d8615d02149bbca7
parents 9cdd52b3 6919d233

src/java/com/android/internal/telephony/SmsPermissions.java

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public class SmsPermissions { 
        // Allow it to the default SMS app always.

        if (!isCallerDefaultSmsPackage(callingPackage)) {

            TelephonyPermissions

                        .enforeceCallingOrSelfReadPrivilegedPhoneStatePermissionOrCarrierPrivilege(

                        .enforceCallingOrSelfReadPrivilegedPhoneStatePermissionOrCarrierPrivilege(

                                mContext, mPhone.getSubId(), message);

        }

        return true;

tests/telephonytests/src/com/android/internal/telephony/TelephonyPermissionsTest.java

+7 −7
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ public class TelephonyPermissionsTest { 
     */

    @Test

    public void

    testEnforeceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege_noPermissions()

    testEnforceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege_noPermissions()

            throws Exception {

        // revoke permission READ_PRIVILEGED_PHONE_STATE

        when(mMockContext.checkCallingOrSelfPermission(
@@ -485,7 +485,7 @@ public class TelephonyPermissionsTest { 
                PackageManager.PERMISSION_DENIED);

        try {

            TelephonyPermissions

                    .enforeceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege(

                    .enforceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege(

                    mMockContext, SUB_ID, MSG);

            fail("Should have thrown SecurityException");

        } catch (SecurityException se) {
@@ -499,7 +499,7 @@ public class TelephonyPermissionsTest { 
     */

    @Test

    public void

    testEnforeceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege_withPermissions()

    testEnforceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege_withPermissions()

            throws Exception {

        // grant READ_PRIVILEGED_PHONE_STATE permission

        when(mMockContext.checkCallingOrSelfPermission(
@@ -507,7 +507,7 @@ public class TelephonyPermissionsTest { 
                PackageManager.PERMISSION_GRANTED);

        try {

            TelephonyPermissions

                    .enforeceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege(

                    .enforceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege(

                    mMockContext, SUB_ID, MSG);

        } catch (SecurityException se) {

            fail();
@@ -524,7 +524,7 @@ public class TelephonyPermissionsTest { 
                PackageManager.PERMISSION_GRANTED);

        try {

            TelephonyPermissions

                    .enforeceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege(

                    .enforceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege(

                    mMockContext, SUB_ID, MSG);

        } catch (SecurityException se) {

            fail();
@@ -536,7 +536,7 @@ public class TelephonyPermissionsTest { 
     */

    @Test

    public void

    testEnforeceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege_withPrivileges()

    testEnforceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege_withPrivileges()

            throws Exception {

        // revoke permission READ_PRIVILEGED_PHONE_STATE

        when(mMockContext.checkCallingOrSelfPermission(
@@ -554,7 +554,7 @@ public class TelephonyPermissionsTest { 
                TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);

        try {

            TelephonyPermissions

                    .enforeceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege(

                    .enforceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege(

                    mMockContext, SUB_ID, MSG);

        } catch (SecurityException se) {

            fail("Should NOT throw SecurityException");