summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2015-12-17 23:01:33 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-12-17 23:01:33 +0000
commit064eb2a7cc8b811671682018b82c2b63064971ef (patch)
tree5a1d9e50b54b9772ef8f79ef02ca7248f9777d61 /telephony/java
parentcf91b45c05358c81ddaccf3ddd4b1ea6d5295faa (diff)
parentef58df63d6ba9d56620b6a440f15d0e07c842a44 (diff)
downloadframeworks_base-064eb2a7cc8b811671682018b82c2b63064971ef.zip
frameworks_base-064eb2a7cc8b811671682018b82c2b63064971ef.tar.gz
frameworks_base-064eb2a7cc8b811671682018b82c2b63064971ef.tar.bz2
Merge "Check permissions on getDeviceId." into mnc-dr-dev
am: ef58df63d6 * commit 'ef58df63d6ba9d56620b6a440f15d0e07c842a44': Check permissions on getDeviceId.
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java2
-rw-r--r--telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl2
2 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 6b1b6296..7276980 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -766,7 +766,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.