Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2

2011-06-16 16:47:18 -07:00
parent 2f04883ff8 fe9aa2706f
commit c826f92e6f
1 changed files with 0 additions and 4 deletions
--- 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) {