diff options
| author | Wink Saville <wink@google.com> | 2010-08-24 10:16:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 10:16:42 -0700 |
| commit | b422ca809c92e3136bdf1f3820c4d59c61bc8e57 (patch) | |
| tree | 8c4a67acc46915e984d48f41be570be6032d88ab /telephony/java/android | |
| parent | 0fc1b793b68d4c0ee2eafad6618dea0f2722c2cc (diff) | |
| parent | d90348796829f3d3a443e73ea3b3f2f9e79071c2 (diff) | |
| download | frameworks_base-b422ca809c92e3136bdf1f3820c4d59c61bc8e57.zip frameworks_base-b422ca809c92e3136bdf1f3820c4d59c61bc8e57.tar.gz frameworks_base-b422ca809c92e3136bdf1f3820c4d59c61bc8e57.tar.bz2 | |
am d9034879: am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2'
* commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2':
Change CDMAPhone.getDeviceId to return MEID or ESN.
Diffstat (limited to 'telephony/java/android')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 92bed8d..2370add 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -177,7 +177,7 @@ public class TelephonyManager { /** * Returns the unique device ID, for example, the IMEI for GSM and the MEID - * for CDMA phones. Return null if device ID is not available. + * or ESN for CDMA phones. Return null if device ID is not available. * * <p>Requires Permission: * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} |