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

Commit f5823329 authored by Vineeta Srivastava's avatar Vineeta Srivastava Committed by Android (Google) Code Review
Browse files

Merge "Return IMEI as device id if carrier config requires it." into nyc-mr1-dev

parents 2345d2e2 cd2d7521

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+6 −0
Original line number Diff line number Diff line
@@ -1356,6 +1356,12 @@ public class GsmCdmaPhone extends Phone { 
        if (isPhoneTypeGsm()) {

            return mImei;

        } else {

            CarrierConfigManager configManager = (CarrierConfigManager)

                    mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

            boolean force_imei = configManager.getConfigForSubId(getSubId())

                    .getBoolean(CarrierConfigManager.KEY_FORCE_IMEI_BOOL);

            if (force_imei) return mImei;



            String id = getMeid();

            if ((id == null) || id.matches("^0*$")) {

                loge("getDeviceId(): MEID is not initialized use ESN");