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

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

Browse Source 
* commit '7e603d69947566bd17ac76820fde59ac9fd11c0c':
  OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds
This commit is contained in:
Fyodor Kupolov
2015-06-18 23:23:59 +00:00
committed by Android Git Automerger
parent 732415fef9 7e603d6994
commit af4e05a2ee
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 {
ITelephony telephony = getITelephony();
if (telephony != null)
return telephony.getMergedSubscriberIds();
return telephony.getMergedSubscriberIds(mContext.getOpPackageName());
} catch (RemoteException 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[] getMergedSubscriberIds();
String[] getMergedSubscriberIds(String callingPackage);
/**
* Override the operator branding for the current ICCID.