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

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

Merge "Add carrier config to report IMEI on CDMA phone." into nyc-mr1-dev

parents 7703ce2d 276f4d64

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -788,6 +788,13 @@ public class CarrierConfigManager { 
    /** @hide */

    public static final int CDMA_ROAMING_MODE_ANY = 2;



    /**

     * Report IMEI as device id even if it's a CDMA/LTE phone.

     *

     * @hide

     */

    public static final String KEY_FORCE_IMEI_BOOL = "force_imei_bool";



    /**

     * The families of Radio Access Technologies that will get clustered and ratcheted,

     * ie, we will report transitions up within the family, but not down until we change
@@ -995,6 +1002,7 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_MMS_USER_AGENT_STRING, "");

        sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true);

        sDefaults.putBoolean(KEY_USE_RCS_PRESENCE_BOOL, false);

        sDefaults.putBoolean(KEY_FORCE_IMEI_BOOL, false);

        sDefaults.putInt(KEY_CDMA_ROAMING_MODE_INT, CDMA_ROAMING_MODE_RADIO_DEFAULT);



        // Carrier Signalling Receivers