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

Commit 229aa29f authored by Betty Chang's avatar Betty Chang Committed by Android (Google) Code Review
Browse files

Merge "[Telephony Mainline] Add permission check for ACCESS_MESSAGES_ON_ICC"

parents 22aae164 ea3b5ba1

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

+10 −0
Original line number Diff line number Diff line
@@ -247,6 +247,14 @@ public class IccSmsInterfaceManager { 
                Manifest.permission.SEND_SMS, message);

    }



    /**

     * Enforce the permission for access messages on ICC

     */

    private void enforceAccessMessageOnICC(String message) {

        mContext.enforceCallingOrSelfPermission(

                Manifest.permission.ACCESS_MESSAGES_ON_ICC, message);

    }



    /**

     * Update the specified message on the Icc.

     *
@@ -266,6 +274,7 @@ public class IccSmsInterfaceManager { 
                " status=" + status + " ==> " +

                "("+ Arrays.toString(pdu) + ")");

        enforceReceiveAndSend("Updating message on Icc");

        enforceAccessMessageOnICC("Updating message on Icc");

        if (mAppOps.noteOp(AppOpsManager.OPSTR_WRITE_ICC_SMS, Binder.getCallingUid(),

                callingPackage) != AppOpsManager.MODE_ALLOWED) {

            return false;
@@ -359,6 +368,7 @@ public class IccSmsInterfaceManager { 
        mContext.enforceCallingOrSelfPermission(

                Manifest.permission.RECEIVE_SMS,

                "Reading messages from Icc");

        enforceAccessMessageOnICC("Reading messages from Icc");

        if (mAppOps.noteOp(AppOpsManager.OPSTR_READ_ICC_SMS, Binder.getCallingUid(),

                callingPackage) != AppOpsManager.MODE_ALLOWED) {

            return new ArrayList<SmsRawData>();