diff options
| author | 2019-11-19 01:32:30 +0000 | |
|---|---|---|
| committer | 2019-11-19 01:32:30 +0000 | |
| commit | 04b9b718a53ce122cb83e3719fb512a8b76a8cce (patch) | |
| tree | 4ac77f6443cfb1e451bcbcb58741724e0f73ab1a | |
| parent | f2fe7f0b615990ffc72ddb5c6bd9e4ae41956b9a (diff) | |
| parent | 77e638be816e526cb8326754c102285976d2afcc (diff) | |
Merge "deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL"
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 80a3f332a4b0..ca692b05df17 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44064,7 +44064,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 4dad01f9d5c0..c0e03a738fb1 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"; |