Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev

Browse Source
This commit is contained in:
Fyodor Kupolov
2015-06-18 23:16:42 +00:00
committed by Android (Google) Code Review
parent 0b00db8eeb d24e4eafdb
commit 7e603d6994
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -2143,7 +2143,7 @@ public class TelephonyManager {
try { try {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony != null) if (telephony != null)
return telephony.getMergedSubscriberIds(); return telephony.getMergedSubscriberIds(mContext.getOpPackageName());
} catch (RemoteException ex) { } catch (RemoteException ex) {
} catch (NullPointerException ex) { } catch (NullPointerException ex) {
} }

2
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -795,7 +795,7 @@ interface ITelephony {
*/ */
String getLine1AlphaTagForDisplay(int subId, String callingPackage); String getLine1AlphaTagForDisplay(int subId, String callingPackage);
String[] getMergedSubscriberIds(); String[] getMergedSubscriberIds(String callingPackage);
/** /**
* Override the operator branding for the current ICCID. * Override the operator branding for the current ICCID.