diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-12-04 11:51:49 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-01-22 13:37:14 -0800 |
| commit | 6a431eed218a65ead4e8e900368676dd9395b936 (patch) | |
| tree | 054ffae8a24ecd4ca9978e845fdbf7146aaff81b /telephony | |
| parent | 6a278db4c4a144829353e81420f28dcf2105f767 (diff) | |
| download | frameworks_base-6a431eed218a65ead4e8e900368676dd9395b936.zip frameworks_base-6a431eed218a65ead4e8e900368676dd9395b936.tar.gz frameworks_base-6a431eed218a65ead4e8e900368676dd9395b936.tar.bz2 | |
Check permissions on getDeviceId.
This needs the package name passed in, so the aidl changes.
bug:25778215
Change-Id: I72f3456a2774a7ad5104424daea9e046ee9c6360
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. |