Merge "Add carrier config for exit hysteresis time" into qt-qpr1-dev (3010c401) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -2678,11 +2678,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
		@@ -3428,6 +3436,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,