From a4f2da398837c5eaec5dec13c29e13af3f7185e3 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Wed, 22 Jul 2015 13:36:42 -0700 Subject: [PATCH] Allow carriers to force disable ETWS/CMAS test messages. This feature can be enabled in carrier config XML. When enabled, the user will not see ETWS/CMAS enable/disable option in emergency broadcast preference menu. bug: 22396039 Change-Id: I6ad6fa39852d3b13faeef968a1963b3e0a4a6e61 --- .../java/android/telephony/CarrierConfigManager.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index e8616682436ca..e9c41a1682dac 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -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);