Merge "Add a carrier config to disable ping test" (5582ff9d) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -2790,6 +2790,14 @@ public class CarrierConfigManager {
		public static final String KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_EXIT_HYSTERESIS_TIME_LONG =
		"opportunistic_network_data_switch_exit_hysteresis_time_long";

		/**
		* Controls whether to do ping test before switching data to opportunistic network.
		* This carrier config is used to disable this feature.
		* @hide
		*/
		public static final String KEY_PING_TEST_BEFORE_DATA_SWITCH_BOOL =
		"ping_test_before_data_switch_bool";

		/**
		* Controls time in milli seconds until DcTracker reevaluates 5G connection state.
		* @hide
		@@ -3572,6 +3580,7 @@ public class CarrierConfigManager {
		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.putBoolean(KEY_PING_TEST_BEFORE_DATA_SWITCH_BOOL, true);
		/* Default value is 1 hour. */
		sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000);
		sDefaults.putAll(Gps.getDefaults());