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

Commit 8ac962a7 authored by Jack Yu's avatar Jack Yu Committed by Android Git Automerger
Browse files

am e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev 

* commit 'e21722a3':
  Allow carriers to force disable ETWS/CMAS test messages.
parents 22a824fe e21722a3

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -273,6 +273,14 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";



    /**

     * The default flag specifying whether ETWS/CMAS test setting is forcibly disabled in

     * Settings->More->Emergency broadcasts menu even though developer options is turned on.

     * @hide

     */

    public static final String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL =

            "carrier_force_disable_etws_cmas_test_bool";



    /* The following 3 fields are related to carrier visual voicemail. */



    /**
@@ -381,6 +389,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CARRIER_VOLTE_AVAILABLE_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_VT_AVAILABLE_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, true);

        sDefaults.putBoolean(KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL, true);