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

Commit 3d48b0e1 authored by Meng Wang's avatar Meng Wang Committed by Gerrit Code Review
Browse files

Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT"

parents 608fa51d 71b6039b

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -41698,6 +41698,8 @@ 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_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";

    field public static final java.lang.String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL = "carrier_force_disable_etws_cmas_test_bool";

    field public static final java.lang.String KEY_CARRIER_IMS_GBA_REQUIRED_BOOL = "carrier_ims_gba_required_bool";

    field public static final java.lang.String KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL = "carrier_instant_lettering_available_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+8 −8
Original line number Diff line number Diff line
@@ -496,19 +496,19 @@ public class CarrierConfigManager { 
            "carrier_wfc_supports_wifi_only_bool";



    /**

     * Default WFC_IMS_MODE for home network   0: WIFI_ONLY

     *                                         1: CELLULAR_PREFERRED

     *                                         2: WIFI_PREFERRED

     * @hide

     * Default mode for WFC over IMS on home network:

     * <ul>

     *   <li>0: Wi-Fi only

     *   <li>1: prefer mobile network

     *   <li>2: prefer Wi-Fi

     * </ul>

     */

    public static final String KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT =

            "carrier_default_wfc_ims_mode_int";



    /**

     * Default WFC_IMS_MODE for roaming

     * See {@link KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT} for valid values.

     *

     * @hide

     * Default mode for WFC over IMS on roaming network.

     * See {@link #KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT} for meaning of values.

     */

    public static final String KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT =

            "carrier_default_wfc_ims_roaming_mode_int";