diff options
| author | Stuart Scott <stuartscott@google.com> | 2015-01-29 02:13:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-29 02:13:35 +0000 |
| commit | d31cafb369c48a41bc149833659fad894e7bf59f (patch) | |
| tree | 3f3951cc4b990356cb35c4edc4553d4c2b83e286 /telephony/java/android | |
| parent | 448080dcbc771c71623b4a360fb4b51ecddfb973 (diff) | |
| parent | cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b (diff) | |
| download | frameworks_base-d31cafb369c48a41bc149833659fad894e7bf59f.zip frameworks_base-d31cafb369c48a41bc149833659fad894e7bf59f.tar.gz frameworks_base-d31cafb369c48a41bc149833659fad894e7bf59f.tar.bz2 | |
am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236
automerge: cf8ae79
* commit 'cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b':
Change getDeviceId to take phoneId.
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 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) { |