From 77e638be816e526cb8326754c102285976d2afcc Mon Sep 17 00:00:00 2001 From: Chen Xu Date: Fri, 15 Nov 2019 14:59:22 -0800 Subject: deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL. This is only used for cellbroadcast receiver and move to resource overlay show_test_settings Bug: 141579944 Bug: 62016498 Bug: 141772296 Test: Build Change-Id: I64762d9d7e5857dd2a9da1de4fa99e505a034887 --- api/current.txt | 2 +- telephony/java/android/telephony/CarrierConfigManager.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index 98f35ee96eec..4065308de1a9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44059,7 +44059,7 @@ package android.telephony { field public static final String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings"; field public static final String KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT = "carrier_default_wfc_ims_mode_int"; field public static final String KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT = "carrier_default_wfc_ims_roaming_mode_int"; - field public static final String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL = "carrier_force_disable_etws_cmas_test_bool"; + field @Deprecated public static final String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL = "carrier_force_disable_etws_cmas_test_bool"; field public static final String KEY_CARRIER_IMS_GBA_REQUIRED_BOOL = "carrier_ims_gba_required_bool"; field public static final String KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL = "carrier_instant_lettering_available_bool"; field public static final String KEY_CARRIER_INSTANT_LETTERING_ENCODING_STRING = "carrier_instant_lettering_encoding_string"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index e9249df2a691..adaf08645b1a 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -809,7 +809,9 @@ public class CarrierConfigManager { /** * 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. + * @deprecated moved to cellbroadcastreceiver resource show_test_settings */ + @Deprecated public static final String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL = "carrier_force_disable_etws_cmas_test_bool"; -- cgit v1.2.3-59-g8ed1b