diff options
| author | John Wang <johnwang@google.com> | 2011-06-16 16:50:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-16 16:50:05 -0700 |
| commit | c6b32054c67901b0627ad99e4bd8b15c5cc2fb90 (patch) | |
| tree | 5d439fc0d9cdfcb2f893a4a99916cff6b49baa3f | |
| parent | 9a73c4d3a9c7ce02f80b078ca9ba5106234ecd9c (diff) | |
| parent | c826f92e6f90f4157afd4ed69c6907ff768a0d6b (diff) | |
| download | frameworks_base-c6b32054c67901b0627ad99e4bd8b15c5cc2fb90.zip frameworks_base-c6b32054c67901b0627ad99e4bd8b15c5cc2fb90.tar.gz frameworks_base-c6b32054c67901b0627ad99e4bd8b15c5cc2fb90.tar.bz2 | |
am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
Revert "Do not merge. Return null id for Non-phone device."
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 36e0202..acbf08b 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -191,10 +191,6 @@ public class TelephonyManager { * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} */ public String getDeviceId() { - if (!isVoiceCapable()) { - return null; - } - try { return getSubscriberInfo().getDeviceId(); } catch (RemoteException ex) { |