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

Browse Source
This commit is contained in:
Robert Greenwalt
2015-12-17 22:52:58 +00:00
committed by Android (Google) Code Review
parent 40d1ab91d2 d8231b9f37
commit ef58df63d6
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

@@ -726,7 +726,7 @@ public class TelephonyManager {
IPhoneSubInfo info = getSubscriberInfo(); IPhoneSubInfo info = getSubscriberInfo();
if (info == null) if (info == null)
return null; return null;
return info.getDeviceIdForPhone(slotId); return info.getDeviceIdForPhone(slotId, mContext.getOpPackageName());
} catch (RemoteException ex) { } catch (RemoteException ex) {
return null; return null;
} catch (NullPointerException ex) { } 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 * Retrieves the unique device ID of a phone for the device, e.g., IMEI
* for GSM phones. * for GSM phones.
*/ */
String getDeviceIdForPhone(int phoneId); String getDeviceIdForPhone(int phoneId, String callingPackage);
/** /**
* Retrieves the IMEI. * Retrieves the IMEI.