From d24e4eafdb3e42de5a8fd080fcd50ebf4c7bcb71 Mon Sep 17 00:00:00 2001 From: Fyodor Kupolov Date: Wed, 17 Jun 2015 15:34:03 -0700 Subject: OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds Bug: 21726452 Bug: 21878243 Change-Id: I390386e28d8f948b8672a212ac413dfa61e54a15 --- telephony/java/android/telephony/TelephonyManager.java | 2 +- 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 8291a3051dec..c6faddae7fbf 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 c253b4f22407..44754abe5010 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. -- cgit v1.2.3-59-g8ed1b