commit 4381f6421ca408d1dc66430ddfb107c5011bfe25
author Adam Powell <adamp@google.com> Wed Jun 08 16:54:50 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 08 16:54:50 2011 -0700
tree 3856c6060c8af1544d35c1112ef0900dad4bec7b
parent cea03df201dc6659654234bc5fbfebf1b6a06e42
parent 1a4678b93f3f0e6ecff0280481af51470e6b0194

Merge "Public styles for action bar tabs" into honeycomb-mr2

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 5a417b3..3af9462 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -192,6 +192,10 @@
      *   {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
      */
     public String getDeviceId() {
+        if (!isVoiceCapable()) {
+            return null;
+        }
+
         try {
             return getSubscriberInfo().getDeviceId();
         } catch (RemoteException ex) {