commit 229d3a0cbce70db82003705abf6844deec136d20
author John Wang <johnwang@google.com> Tue Jun 07 15:56:19 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 07 15:56:19 2011 -0700
tree 99b98b041cf9e9455afe9da993f2a841cf8eb81e
parent 816e5b72190787f2b6136925c172a00ebcbe4077
parent fc94d45fc209dbcfdf7f57e0c04c581e1e51988b

am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE

* commit 'fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
  Make getDeviceId return null for Non-phone device.

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index acbf08b..36e0202 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -191,6 +191,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) {