diff options
| author | John Wang <johnwang@google.com> | 2011-06-16 16:30:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-16 16:30:02 -0700 |
| commit | fe9aa2706ff9e5059d5e2737d751122fb5d692b9 (patch) | |
| tree | 61551a3b6e8fe17af45b20a223a43e4bb2c83bb6 | |
| parent | cea03df201dc6659654234bc5fbfebf1b6a06e42 (diff) | |
| download | frameworks_base-fe9aa2706ff9e5059d5e2737d751122fb5d692b9.zip frameworks_base-fe9aa2706ff9e5059d5e2737d751122fb5d692b9.tar.gz frameworks_base-fe9aa2706ff9e5059d5e2737d751122fb5d692b9.tar.bz2 | |
Revert "Do not merge. Return null id for Non-phone device."
This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42
| -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 3af9462..5a417b3 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -192,10 +192,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) { |