diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-06-17 15:34:03 -0700 |
|---|---|---|
| committer | Fyodor Kupolov <fkupolov@google.com> | 2015-06-17 15:34:03 -0700 |
| commit | d24e4eafdb3e42de5a8fd080fcd50ebf4c7bcb71 (patch) | |
| tree | bfea28cfe1b65cb65483832540d8093fc37120e1 /telephony/java | |
| parent | d1419ed29a694dffc98e9f352f952b805c6e0583 (diff) | |
| download | frameworks_base-d24e4eafdb3e42de5a8fd080fcd50ebf4c7bcb71.zip frameworks_base-d24e4eafdb3e42de5a8fd080fcd50ebf4c7bcb71.tar.gz frameworks_base-d24e4eafdb3e42de5a8fd080fcd50ebf4c7bcb71.tar.bz2 | |
OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds
Bug: 21726452
Bug: 21878243
Change-Id: I390386e28d8f948b8672a212ac413dfa61e54a15
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 2 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 8291a30..c6fadda 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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) { } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index c253b4f..44754ab 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -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. |