summaryrefslogtreecommitdiffstats
path: root/telephony/java/com
diff options
context:
space:
mode:
authorFyodor Kupolov <fkupolov@google.com>2015-06-17 15:34:03 -0700
committerFyodor Kupolov <fkupolov@google.com>2015-06-17 15:34:03 -0700
commitd24e4eafdb3e42de5a8fd080fcd50ebf4c7bcb71 (patch)
treebfea28cfe1b65cb65483832540d8093fc37120e1 /telephony/java/com
parentd1419ed29a694dffc98e9f352f952b805c6e0583 (diff)
downloadframeworks_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/com')
-rw-r--r--telephony/java/com/android/internal/telephony/ITelephony.aidl2
1 files changed, 1 insertions, 1 deletions
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.