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

Commit 8b9f4545 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by android-build-merger
Browse files

Merge "Merge "Add carrier config for exit hysteresis time" into qt-qpr1-dev... 

Merge "Merge "Add carrier config for exit hysteresis time" into qt-qpr1-dev am: 3010c401" into qt-qpr1-dev-plus-aosp
am: f17298b3

Change-Id: I411cf70136c2acb8e2b2cf8abdcd6848a6647813
parents 5453cbe8 f17298b3

telephony/java/android/telephony/CarrierConfigManager.java

+11 −1
Original line number Diff line number Diff line
@@ -2718,11 +2718,19 @@ public class CarrierConfigManager { 


    /**

     * Controls hysteresis time in milli seconds for which OpportunisticNetworkService

     * will wait before switching data to a network.

     * will wait before switching data to an opportunistic network.

     */

    public static final String KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG =

            "opportunistic_network_data_switch_hysteresis_time_long";



    /**

     * Controls hysteresis time in milli seconds for which OpportunisticNetworkService

     * will wait before switching data from opportunistic network to primary network.

     * @hide

     */

    public static final String KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_EXIT_HYSTERESIS_TIME_LONG =

            "opportunistic_network_data_switch_exit_hysteresis_time_long";



    /**

     * Indicates zero or more emergency number prefix(es), because some carrier requires

     * if users dial an emergency number address with a specific prefix, the combination of the
@@ -3484,6 +3492,8 @@ public class CarrierConfigManager { 
        sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_ENTRY_OR_EXIT_HYSTERESIS_TIME_LONG, 10000);

        /* Default value is 10 seconds. */

        sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_HYSTERESIS_TIME_LONG, 10000);

        /* Default value is 3 seconds. */

        sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_EXIT_HYSTERESIS_TIME_LONG, 3000);

        sDefaults.putAll(Gps.getDefaults());

        sDefaults.putAll(Wifi.getDefaults());

        sDefaults.putIntArray(KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY,