diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-12-17 22:52:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-12-17 22:52:58 +0000 |
| commit | ef58df63d6ba9d56620b6a440f15d0e07c842a44 (patch) | |
| tree | 9fd3bd29bb43853a8f60d133a0ccedb52440d38f /telephony | |
| parent | 40d1ab91d2a0ed1f066b6a8de821c9c4c70ca512 (diff) | |
| parent | d8231b9f37b8a4b9eb160c7e8aae0105c978fc11 (diff) | |
| download | frameworks_base-ef58df63d6ba9d56620b6a440f15d0e07c842a44.zip frameworks_base-ef58df63d6ba9d56620b6a440f15d0e07c842a44.tar.gz frameworks_base-ef58df63d6ba9d56620b6a440f15d0e07c842a44.tar.bz2 | |
Merge "Check permissions on getDeviceId." into mnc-dr-dev
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 2 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/IPhoneSubInfo.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 65caf56..2e25ec7 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -726,7 +726,7 @@ public class TelephonyManager { IPhoneSubInfo info = getSubscriberInfo(); if (info == null) return null; - return info.getDeviceIdForPhone(slotId); + return info.getDeviceIdForPhone(slotId, mContext.getOpPackageName()); } catch (RemoteException ex) { return null; } catch (NullPointerException ex) { diff --git a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl index ed85392..dc2b297 100644 --- a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl +++ b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl @@ -36,7 +36,7 @@ interface IPhoneSubInfo { * Retrieves the unique device ID of a phone for the device, e.g., IMEI * for GSM phones. */ - String getDeviceIdForPhone(int phoneId); + String getDeviceIdForPhone(int phoneId, String callingPackage); /** * Retrieves the IMEI. |