From fe9aa2706ff9e5059d5e2737d751122fb5d692b9 Mon Sep 17 00:00:00 2001
From: John Wang <johnwang@google.com>
Date: Thu, 16 Jun 2011 16:30:02 -0700
Subject: Revert "Do not merge. Return null id for Non-phone device."

This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42
---
 telephony/java/android/telephony/TelephonyManager.java | 4 ----
 1 file changed, 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) {
-- 
cgit v1.1