diff options
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 4 | 
1 files changed, 4 insertions, 0 deletions
| diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index acbf08bf2237..36e02029c776 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -191,6 +191,10 @@ 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) { |