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

* commit '229d3a0cbce70db82003705abf6844deec136d20': Make getDeviceId return null for Non-phone device.
2011-06-09 11:25:50 -07:00
parent 1fdc061e99 229d3a0cbc
commit 3fa5f37346
1 changed files with 4 additions and 0 deletions
--- 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) {