diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-03-07 18:12:25 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-03-07 18:12:25 -0800 |
| commit | 8ecd5a5276f4f725c167b887e799c20a9a27e16e (patch) | |
| tree | 5ebcc2601a4e1b31bb306eb770fc19f55e8a37ee /telephony/java | |
| parent | f04180a1273c4b88be51eaa2df3623ce65bf1571 (diff) | |
| parent | 6a431eed218a65ead4e8e900368676dd9395b936 (diff) | |
| download | frameworks_base-8ecd5a5276f4f725c167b887e799c20a9a27e16e.zip frameworks_base-8ecd5a5276f4f725c167b887e799c20a9a27e16e.tar.gz frameworks_base-8ecd5a5276f4f725c167b887e799c20a9a27e16e.tar.bz2 | |
Merge tag 'android-6.0.1_r17' into HEAD
Android 6.0.1 release 17
Ticket: CYNGNOS-1854
Diffstat (limited to 'telephony/java')
| -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 0c52783..12c039e 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -739,7 +739,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. |