diff options
| author | Jack Yu <jackyu@google.com> | 2015-07-23 19:20:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 19:20:17 +0000 |
| commit | 8ac962a778f64bdd07e938d4e993f48615d3bc9e (patch) | |
| tree | bb3b67880a20b18cfe1d15e871488c0e5dafc09b /telephony | |
| parent | 22a824fe4f4c7a1a1de26b0d0f7650ca06d5217f (diff) | |
| parent | e21722a3daf0562bb7711d3dd38657b5a348ce4e (diff) | |
| download | frameworks_base-8ac962a778f64bdd07e938d4e993f48615d3bc9e.zip frameworks_base-8ac962a778f64bdd07e938d4e993f48615d3bc9e.tar.gz frameworks_base-8ac962a778f64bdd07e938d4e993f48615d3bc9e.tar.bz2 | |
am e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev
* commit 'e21722a3daf0562bb7711d3dd38657b5a348ce4e':
Allow carriers to force disable ETWS/CMAS test messages.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index e861668..e9c41a1 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); |