commit | 6a431eed218a65ead4e8e900368676dd9395b936 | [log] [tgz] |
---|---|---|
author | Robert Greenwalt <rgreenwalt@google.com> | Fri Dec 04 11:51:49 2015 -0800 |
committer | The Android Automerger <android-build@google.com> | Fri Jan 22 13:37:14 2016 -0800 |
tree | 054ffae8a24ecd4ca9978e845fdbf7146aaff81b | |
parent | 6a278db4c4a144829353e81420f28dcf2105f767 [diff] |
Check permissions on getDeviceId. This needs the package name passed in, so the aidl changes. bug:25778215 Change-Id: I72f3456a2774a7ad5104424daea9e046ee9c6360
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 @@ 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 @@ * 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.