Revert "Do not merge. Return null id for Non-phone device."

This reverts commit cea03df201 Change-Id: I68470e729d9304f1c27473a71334e1b0de99ff01
2011-06-16 16:30:02 -07:00
parent e2474bc711
commit f9ab96f9d3
1 changed files with 0 additions and 4 deletions
--- 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) {