diff options
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 8 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index a07d10c..339fc6d 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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) { diff --git a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl index eec5333..c91a59c 100644 --- a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl +++ b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl @@ -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. |