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 am: 5d7bb383b8

Browse Source 
am: 50843b1708

* commit '50843b1708f7662f9be661001125d91e0ef544d7':
  Check permissions on getDeviceId.
This commit is contained in:
Robert Greenwalt
2015-12-18 18:41:23 +00:00
committed by android-build-merger
parent 6b9e5bf0c2 50843b1708
commit 15912efe72
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(); 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.