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

Commit ab790a12 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Add new carrier config for CDMA registered PLMN when not roaming. 

Test: manual
Bug: 80145031
Merged-in: I6533b4097f729df88f287348924563c6f459401c
Change-Id: I6533b4097f729df88f287348924563c6f459401c
(cherry picked from commit 22e89f47)
parent 10cfc617

telephony/java/android/telephony/CarrierConfigManager.java

+23 −1
Original line number Diff line number Diff line
@@ -1018,6 +1018,26 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";



    /**

     * Override the registered PLMN name using #KEY_CDMA_HOME_REGISTERED_PLMN_NAME_STRING.

     *

     * If true, then the registered PLMN name (only for CDMA/CDMA-LTE and only when not roaming)

     * will be #KEY_CDMA_HOME_REGISTERED_PLMN_NAME_STRING. If false, or if phone type is not

     * CDMA/CDMA-LTE or if roaming, then #KEY_CDMA_HOME_REGISTERED_PLMN_NAME_STRING will be ignored.

     * @hide

     */

    public static final String KEY_CDMA_HOME_REGISTERED_PLMN_NAME_OVERRIDE_BOOL =

            "cdma_home_registered_plmn_name_override_bool";



    /**

     * String to identify registered PLMN name in CarrierConfig app. This string overrides

     * registered PLMN name if #KEY_CDMA_HOME_REGISTERED_PLMN_NAME_OVERRIDE_BOOL is true, phone type

     * is CDMA/CDMA-LTE and device is not in roaming state; otherwise, it will be ignored.

     * @hide

     */

    public static final String KEY_CDMA_HOME_REGISTERED_PLMN_NAME_STRING =

            "cdma_home_registered_plmn_name_string";



    /**

     * If this is true, the SIM card (through Customer Service Profile EF file) will be able to

     * prevent manual operator selection. If false, this SIM setting will be ignored and manual
@@ -2078,6 +2098,8 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false);

        sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false);

        sDefaults.putString(KEY_CARRIER_NAME_STRING, "");

        sDefaults.putBoolean(KEY_CDMA_HOME_REGISTERED_PLMN_NAME_OVERRIDE_BOOL, false);

        sDefaults.putString(KEY_CDMA_HOME_REGISTERED_PLMN_NAME_STRING, "");

        sDefaults.putBoolean(KEY_SUPPORT_DIRECT_FDN_DIALING_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_DEFAULT_DATA_ROAMING_ENABLED_BOOL, false);

        sDefaults.putBoolean(KEY_SKIP_CF_FAIL_TO_DISABLE_DIALOG_BOOL, false);