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

Commit bf591b89 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android Git Automerger
Browse files

am 7e603d69: Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev 

* commit '7e603d69':
  OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds
parents 7c74c944 7e603d69

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -2143,7 +2143,7 @@ public class TelephonyManager { 
        try {

            ITelephony telephony = getITelephony();

            if (telephony != null)

                return telephony.getMergedSubscriberIds();

                return telephony.getMergedSubscriberIds(mContext.getOpPackageName());

        } catch (RemoteException ex) {

        } catch (NullPointerException ex) {

        }

telephony/java/com/android/internal/telephony/ITelephony.aidl

+1 −1
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ interface ITelephony { 
     */

    String getLine1AlphaTagForDisplay(int subId, String callingPackage);



    String[] getMergedSubscriberIds();

    String[] getMergedSubscriberIds(String callingPackage);



    /**

     * Override the operator branding for the current ICCID.