diff options
| author | Wink Saville <wink@google.com> | 2010-08-20 16:37:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-20 16:37:21 -0700 |
| commit | d90348796829f3d3a443e73ea3b3f2f9e79071c2 (patch) | |
| tree | 04ea401e1a58eba8fb101761a17694c1b39fe9df /telephony/java/android | |
| parent | b13c9bc5219ca85c36507fb3a8d5923e3de974b6 (diff) | |
| parent | b2cc86da29452769ff6210f1dfef4b51aac1d75e (diff) | |
| download | frameworks_base-d90348796829f3d3a443e73ea3b3f2f9e79071c2.zip frameworks_base-d90348796829f3d3a443e73ea3b3f2f9e79071c2.tar.gz frameworks_base-d90348796829f3d3a443e73ea3b3f2f9e79071c2.tar.bz2 | |
am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e' into gingerbread-plus-aosp
* commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e':
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 aa916e0..27e08d4 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} |