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

Commit 5eef9d48 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android (Google) Code Review
Browse files

Merge "Restore OP_READ_PHONE_STATE check" into mnc-dev

parents 870008cb 6b51863a

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

+2 −5
Original line number Diff line number Diff line
@@ -369,10 +369,7 @@ public class PhoneSubInfo { 
        mContext.enforceCallingOrSelfPermission(

                android.Manifest.permission.READ_PHONE_STATE, message);



        return true;

        // TODO b/21726452 enforce OP_READ_PHONE_STATE once

        // PhoneInterfaceManager.getMergedSubscriberIds got fixed

        // return mAppOps.noteOp(AppOpsManager.OP_READ_PHONE_STATE, Binder.getCallingUid(),

        // callingPackage) == AppOpsManager.MODE_ALLOWED;

        return mAppOps.noteOp(AppOpsManager.OP_READ_PHONE_STATE, Binder.getCallingUid(),

                callingPackage) == AppOpsManager.MODE_ALLOWED;

    }

}