diff options
| author | Stuart Scott <stuartscott@google.com> | 2015-01-28 12:35:43 -0800 |
|---|---|---|
| committer | Stuart Scott <stuartscott@google.com> | 2015-01-28 13:06:12 -0800 |
| commit | d456ec4be1d2310c498dda2c7319562754ad643e (patch) | |
| tree | 46f03fa8ace2e4d22fbcb523a5387e8ab0c14249 /telephony/java/android | |
| parent | cefcd81bdb47ca3196fe487e684880d70ff8073c (diff) | |
| download | frameworks_base-d456ec4be1d2310c498dda2c7319562754ad643e.zip frameworks_base-d456ec4be1d2310c498dda2c7319562754ad643e.tar.gz frameworks_base-d456ec4be1d2310c498dda2c7319562754ad643e.tar.bz2 | |
Change getDeviceId to take phoneId.
bug:18827144
Change-Id: I32196f842504e63f4ddd45401e83e73afae81ad5
Diffstat (limited to 'telephony/java/android')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index fe717dd..9bc1909 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) { |