drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.

Browse Source 
Merge commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b' into gingerbread

* commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b':
  Change CDMAPhone.getDeviceId to return MEID or ESN.
This commit is contained in:
Wink Saville
2010-08-20 16:34:16 -07:00
committed by Android Git Automerger
parent d6f7f22568 3158cf689f
commit b2cc86da29
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/TelephonyManager.java
View File

@ -177,7 +177,7 @@ public class TelephonyManager {
/** /**
* Returns the unique device ID, for example, the IMEI for GSM and the MEID * 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: * <p>Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}

9
telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
View File

@ -447,9 +447,14 @@ public class CDMAPhone extends PhoneBase {
return mMeid; return mMeid;
} }
//returns MEID in CDMA //returns MEID or ESN in CDMA
public String getDeviceId() { public String getDeviceId() {
return getMeid(); String id = getMeid();
if ((id == null) || id.matches("^0*$")) {
Log.d(LOG_TAG, "getDeviceId(): MEID is not initialized use ESN");
id = getEsn();
}
return id;
} }
public String getDeviceSvn() { public String getDeviceSvn() {