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

Commit 7a384469 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by Android (Google) Code Review
Browse files

Merge "Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."" into mnc-dev

parents 7f7f4c1b 1da27cad

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

+2 −2
Original line number Diff line number Diff line
@@ -367,10 +367,10 @@ public class PhoneSubInfo { 


    private boolean checkReadPhoneState(String callingPackage, String message) {

        try {

            mContext.enforceCallingPermission(

            mContext.enforceCallingOrSelfPermission(

                    android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, message);



            // SKIP checking run-time OP_READ_PHONE_STATE since using PRIVILEGED

            // SKIP checking run-time OP_READ_PHONE_STATE since self or using PRIVILEGED

            return true;

        } catch (SecurityException e) {

            mContext.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,

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

+2 −2
Original line number Diff line number Diff line
@@ -208,10 +208,10 @@ public class SubscriptionController extends ISub.Stub { 
     */

    private boolean canReadPhoneState(String callingPackage, String message) {

        try {

            mContext.enforceCallingPermission(

            mContext.enforceCallingOrSelfPermission(

                    android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, message);



            // SKIP checking run-time permission since using PRIVILEDGED permission

            // SKIP checking run-time permission since self or using PRIVILEDGED permission

            return true;

        } catch (SecurityException e) {

            mContext.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,