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

Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev

Browse Source 
automerge: f4e5236

* commit 'f4e52360613d20dc8176ce8a37cb05ad904fad0d':
  Change getDeviceId to take phoneId.
This commit is contained in:
Stuart Scott
2015-01-29 01:58:53 +00:00
committed by android-build-merger
parent 820d5c52b7 f4e5236061
commit 8d702000a7
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -640,13 +640,9 @@ public class TelephonyManager {
*/
/** {@hide} */
public String getDeviceId(int slotId) {
// FIXME methods taking slot id should not use subscription, instead us Uicc directly
int[] subId = SubscriptionManager.getSubId(slotId);
if (subId == null || subId.length == 0) {
return null;
}
// FIXME this assumes phoneId == slotId
try {
return getSubscriberInfo().getDeviceIdForSubscriber(subId[0]);
return getSubscriberInfo().getDeviceIdForPhone(slotId);
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {

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

@@ -33,10 +33,10 @@ interface IPhoneSubInfo {
String getNaiForSubscriber(int subId);
/**
* Retrieves the unique device ID of a subId for the device, e.g., IMEI
* Retrieves the unique device ID of a phone for the device, e.g., IMEI
* for GSM phones.
*/
String getDeviceIdForSubscriber(int subId);
String getDeviceIdForPhone(int phoneId);
/**
* Retrieves the IMEI.