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

Commit ef1814d8 authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Correct EuiccController#switchToSubscription permission check. 

Replace checkCallingPermission with checkCallingOrSelfPermission.

Bug: 128699741
Test: Manual - turn off active eSIM profile through Settings and
make sure it's switched off.

Change-Id: I976a8a5a0fa2e2106bc3cb6bc12dccbbdf292a50
Merged-In: I976a8a5a0fa2e2106bc3cb6bc12dccbbdf292a50
parent 0f704579

src/java/com/android/internal/telephony/euicc/EuiccController.java

+4 −2
Original line number Diff line number Diff line
@@ -1249,12 +1249,14 @@ public class EuiccController extends IEuiccController.Stub { 
    }



    private boolean callerCanReadPhoneStatePrivileged() {

        return mContext.checkCallingPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

        return mContext.checkCallingOrSelfPermission(

                Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

                == PackageManager.PERMISSION_GRANTED;

    }



    private boolean callerCanWriteEmbeddedSubscriptions() {

        return mContext.checkCallingPermission(Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS)

        return mContext.checkCallingOrSelfPermission(

                Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS)

                == PackageManager.PERMISSION_GRANTED;

    }

}

tests/telephonytests/src/com/android/internal/telephony/euicc/EuiccControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ public class EuiccControllerTest extends TelephonyTest { 
        doReturn(hasPhoneStatePrivileged

                ? PackageManager.PERMISSION_GRANTED : PackageManager.PERMISSION_DENIED)

                .when(mContext)

                .checkCallingPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE);

                .checkCallingOrSelfPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE);

        when(mTelephonyManager.getPhoneCount()).thenReturn(1);

        setHasCarrierPrivilegesOnActiveSubscription(hasCarrierPrivileges);

    }
@@ -966,7 +966,7 @@ public class EuiccControllerTest extends TelephonyTest { 
        doReturn(hasPermission

                ? PackageManager.PERMISSION_GRANTED : PackageManager.PERMISSION_DENIED)

                .when(mContext)

                .checkCallingPermission(Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS);

                .checkCallingOrSelfPermission(Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS);

    }



    private void setHasMasterClearPermission(boolean hasPermission) {