Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3158cf68 authored by Wink Saville's avatar Wink Saville
Browse files

Change CDMAPhone.getDeviceId to return MEID or ESN. 

This allows devices with only ESN's to work.

bug: 2938223
Change-Id: I33939151c59f598b939e73d98f1178669d6ceb75
parent 11a72482

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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}

telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java

+7 −2
Original line number Diff line number Diff line
@@ -430,9 +430,14 @@ public class CDMAPhone extends PhoneBase { 
        return mMeid;

    }



    //returns MEID in CDMA

    //returns MEID or ESN in CDMA

    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() {