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

Commit 6a5e92cd authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Android (Google) Code Review
Browse files

Merge "Correct EuiccController#switchToSubscription permission check."

parents e8101aaa 7d4c0f0b

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

+4 −2
Original line number Diff line number Diff line
@@ -1259,12 +1259,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
@@ -958,7 +958,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);

    }
@@ -967,7 +967,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) {