commit 7e603d69947566bd17ac76820fde59ac9fd11c0c
author Fyodor Kupolov <fkupolov@google.com> Thu Jun 18 23:16:42 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 18 23:17:01 2015 +0000
tree 403950c0b8d7936bd3d45adeecc115165b0e1698
parent 0b00db8eebd3b677c1d9190061d0d97dd672976e
parent d24e4eafdb3e42de5a8fd080fcd50ebf4c7bcb71

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

telephony/java/android/telephony/TelephonyManager.java

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 @@
         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

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 @@
      */
     String getLine1AlphaTagForDisplay(int subId, String callingPackage);
 
-    String[] getMergedSubscriberIds();
+    String[] getMergedSubscriberIds(String callingPackage);
 
     /**
      * Override the operator branding for the current ICCID.