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

Commit b507a182 authored by Fyodor Kupolov's avatar Fyodor Kupolov
Browse files

Temporarily remove app ops check OP_READ_PHONE_STATE 

It causes runtime crashes on certain devices.
PhoneInterfaceManager.getMergedSubscriberIds should clearCallingIdentity
before calling TelephonyManager.

Bug: 21726452
Bug: 21878243
Change-Id: I92a9dbe1c9f64bf67a3c872e7f1ba15a41c36a1e
parent e8bec333

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

+5 −4
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ public class PhoneSubInfo { 
     * Retrieves the alpha identifier for line 1.

     */

    public String getLine1AlphaTag(String callingPackage) {

        mContext.enforceCallingOrSelfPermission(READ_PHONE_STATE, "Requires READ_PHONE_STATE");

        if (!checkReadPhoneState(callingPackage, "Requires READ_PHONE_STATE")) {

            return null;

        }
@@ -200,7 +199,6 @@ public class PhoneSubInfo { 
        if (!checkReadPhoneState(callingPackage, "Requires READ_PHONE_STATE")) {

            return null;

        }

        mContext.enforceCallingOrSelfPermission(READ_PHONE_STATE, "Requires READ_PHONE_STATE");

        return mPhone.getVoiceMailAlphaTag();

    }
@@ -371,7 +369,10 @@ public class PhoneSubInfo { 
        mContext.enforceCallingOrSelfPermission(

                android.Manifest.permission.READ_PHONE_STATE, message);



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

                callingPackage) == AppOpsManager.MODE_ALLOWED;

        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;

    }

}