diff options
| author | John Wang <johnwang@google.com> | 2011-06-16 17:14:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-16 17:14:28 -0700 |
| commit | e21217af6480c45212517a68b2b6e583c4dc27c9 (patch) | |
| tree | d649715f7d4d36fc3fc1b7706ce4d4ca831b393b | |
| parent | 769bf5d59ef1b6a9bce9d64d9761def735d6af65 (diff) | |
| parent | c6b32054c67901b0627ad99e4bd8b15c5cc2fb90 (diff) | |
| download | frameworks_base-e21217af6480c45212517a68b2b6e583c4dc27c9.zip frameworks_base-e21217af6480c45212517a68b2b6e583c4dc27c9.tar.gz frameworks_base-e21217af6480c45212517a68b2b6e583c4dc27c9.tar.bz2 | |
am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
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) { |