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

Commit 550006b8 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL" 

am: 04b9b718

Change-Id: I53213519b7702400713c9446e9b36a24f4e1fddf
parents 26071064 04b9b718

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

telephony/java/android/telephony/CarrierConfigManager.java

+2 −0
Original line number Diff line number Diff line
@@ -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";