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."
2011-06-16 16:50:05 -07:00
parent 9a73c4d3a9 c826f92e6f
commit c6b32054c6
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) {