Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7cc

Browse Source 
am: 5d7bb383b8

* commit '5d7bb383b85aeaa60abeb6e3ad7ba854d6c40b37':
  Check permissions on getDeviceId.
This commit is contained in:
Robert Greenwalt
2015-12-17 15:13:36 -08:00
committed by android-build-merger
parent 132814f20d 5d7bb383b8
commit 50843b1708
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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) {

2
telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl
View File

@@ -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.