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

Commit da081218 authored by Hiroto Tarui's avatar Hiroto Tarui Committed by Brad Ebinger
Browse files

Add CarrierConfig to use WFC home network mode in roaming network 

Add a config whether the carrier will use the WFC home network mode in
roaming netork.

Test: manual - Checked that use the WFC mode according to CarrierConfig
value.
Bug: 79666081

Change-Id: I19fd3818c97db2565e13c5272c5307deef1331d1
parent f163c211

telephony/java/android/telephony/CarrierConfigManager.java

+21 −5
Original line number Original line Diff line number Diff line
@@ -1812,16 +1812,31 @@ public class CarrierConfigManager { 




    /**

    /**

     * Determine whether user can change Wi-Fi Calling preference in roaming.

     * Determine whether user can change Wi-Fi Calling preference in roaming.

     * {@code false} - roaming preference {@link KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT} is

     * {@code false} - roaming preference cannot be changed by user independently. If

     *                 the same as home preference {@link KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT}

     *                 {@link #KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL} is false,

     *                 and cannot be changed.

     *                 {@link #KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT} is used as the default

     * {@code true}  - roaming preference can be changed by user independently.

     *                 value. If {@link #KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL} is

     *

     *                 true, roaming preference is the same as home preference and

     *                 {@link #KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT} is used as the default value.

     * {@code true}  - roaming preference can be changed by user independently if

     *                 {@link #KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL} is false. If

     *                 {@link #KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL} is true, this

     *                 configuration is ignored and roaming preference cannot be changed.

     * @hide

     * @hide

     */

     */

    public static final String KEY_EDITABLE_WFC_ROAMING_MODE_BOOL =

    public static final String KEY_EDITABLE_WFC_ROAMING_MODE_BOOL =

            "editable_wfc_roaming_mode_bool";

            "editable_wfc_roaming_mode_bool";





    /**

     * Flag specifying whether the carrier will use the WFC home network mode in roaming network.

     * {@code false} - roaming preference can be selected separately from the home preference.

     * {@code true}  - roaming preference is the same as home preference and

     *                 {@link #KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT} is used as the default value.

     * @hide

     */

    public static final String KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL =

            "use_wfc_home_network_mode_in_roaming_network_bool";



    /**

    /**

     * Carrier specified WiFi networks.

     * Carrier specified WiFi networks.

     * @hide

     * @hide
@@ -2911,6 +2926,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL, false);

        sDefaults.putBoolean(KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL, false);

        sDefaults.putStringArray(KEY_FILTERED_CNAP_NAMES_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_FILTERED_CNAP_NAMES_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);

        sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false);

        sDefaults.putBoolean(KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL, false);

        sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);

        sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false);

        sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);

        sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1);

        sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1);