summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2010-08-20 16:24:02 -0700
committerWink Saville <wink@google.com>2010-08-20 16:24:02 -0700
commit3158cf689f4994ec53c3b727f9b6ad7751a5551b (patch)
treef2ffc3b94cceea67b58c2e99374d81e1e0b2c10c /telephony/java/android
parent11a72482a0cdc45ceaf4ca83957e682381455aee (diff)
downloadframeworks_base-3158cf689f4994ec53c3b727f9b6ad7751a5551b.zip
frameworks_base-3158cf689f4994ec53c3b727f9b6ad7751a5551b.tar.gz
frameworks_base-3158cf689f4994ec53c3b727f9b6ad7751a5551b.tar.bz2
Change CDMAPhone.getDeviceId to return MEID or ESN.
This allows devices with only ESN's to work. bug: 2938223 Change-Id: I33939151c59f598b939e73d98f1178669d6ceb75
Diffstat (limited to 'telephony/java/android')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 4ee9560..278e8ca 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}