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

Commit fe07ee91 authored by Michele Berionne's avatar Michele Berionne Committed by android-build-merger
Browse files

Merge "Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING" am:... 

Merge "Remove @hide annotation from KEY_CARRIER_CONFIG_VERSION_STRING" am: ac9e1f55 am: e4176ca2
am: eda9958c

Change-Id: Ief7fe2af1bc4bbf6b6028d5a801c1929c5f7a3a6
parents a5abb4a7 eda9958c

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43355,6 +43355,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array";

    field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";

    field public static final java.lang.String KEY_CARRIER_CALL_SCREENING_APP_STRING = "call_screening_app";

    field public static final java.lang.String KEY_CARRIER_CONFIG_VERSION_STRING = "carrier_config_version_string";

    field public static final java.lang.String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings";

    field public static final java.lang.String KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT = "carrier_default_wfc_ims_mode_int";

    field public static final java.lang.String KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT = "carrier_default_wfc_ims_roaming_mode_int";

telephony/java/android/telephony/CarrierConfigManager.java

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ public class CarrierConfigManager { 
     * Specifies a value that identifies the version of the carrier configuration that is

     * currently in use. This string is displayed on the UI.

     * The format of the string is not specified.

     * @hide

     */

    public static final String KEY_CARRIER_CONFIG_VERSION_STRING =

            "carrier_config_version_string";