Merge "Add a carrier config to specify validation timeout for data switch." (464fbf71) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -2880,6 +2880,16 @@ public class CarrierConfigManager {
		public static final String KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN =
		"always_show_primary_signal_bar_in_opportunistic_network_boolean";

		/**
		* Upon data switching between subscriptions within a carrier group, if switch depends on
		* validation result, this value defines customized value of how long we wait for validation
		* success before we fail and revoke the switch.
		* Time out is in milliseconds.
		* @hide
		*/
		public static final String KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG =
		"data_switch_validation_timeout_long";

		/**
		* GPS configs. See android.hardware.gnss@1.0 IGnssConfiguration.
		* @hide
		@@ -3666,6 +3676,7 @@ public class CarrierConfigManager {
		sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY,
		new int[] {4 /* BUSY */});
		sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false);
		sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG, 2000);
		}

		/**