diff options
| author | John Wang <johnwang@google.com> | 2011-06-07 15:37:09 -0700 |
|---|---|---|
| committer | John Wang <johnwang@google.com> | 2011-06-08 13:10:22 -0700 |
| commit | cea03df201dc6659654234bc5fbfebf1b6a06e42 (patch) | |
| tree | e6548a335d176a9949ff35a10288e6c4c59457db /telephony/java/android | |
| parent | 25bd8abce993e17b382ea5c29a1cb68dd095cf45 (diff) | |
| download | frameworks_base-cea03df201dc6659654234bc5fbfebf1b6a06e42.zip frameworks_base-cea03df201dc6659654234bc5fbfebf1b6a06e42.tar.gz frameworks_base-cea03df201dc6659654234bc5fbfebf1b6a06e42.tar.bz2 | |
Do not merge. Return null id for Non-phone device.
For non-phone device, i.e. tablet doesn't have voice capability,
getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.
This behavior is suggested by developer scheme
http://android-developers.blogspot.com/2011/03/identifying-app-installations.html
and enforced by CTS testGetDeviceId.
bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
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 5a417b3..3af9462 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -192,6 +192,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) { |