diff options
| author | John Wang <johnwang@google.com> | 2011-06-09 11:25:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-09 11:25:50 -0700 |
| commit | 3fa5f373467054c673c5fd6296adba4c6de41520 (patch) | |
| tree | c308f509083d5bb5512077692d4dca568016cf9b /telephony/java/android | |
| parent | 1fdc061e99a5e3f1d47bf1e2b780abbfe11e6a81 (diff) | |
| parent | 229d3a0cbce70db82003705abf6844deec136d20 (diff) | |
| download | frameworks_base-3fa5f373467054c673c5fd6296adba4c6de41520.zip frameworks_base-3fa5f373467054c673c5fd6296adba4c6de41520.tar.gz frameworks_base-3fa5f373467054c673c5fd6296adba4c6de41520.tar.bz2 | |
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.
Diffstat (limited to 'telephony/java/android')
| -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 66120a1..184d665 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) { |