Add a carrier config to specify validation timeout for data switch.

Bug: 142884903
Test: manual test
Change-Id: Id8dc2da05efdf4dd53d03b133cc9f47efd196e02
Merged-In: Id8dc2da05efdf4dd53d03b133cc9f47efd196e02
This commit is contained in:
Malcolm Chen
2019-10-31 15:06:19 -07:00
parent 87f76cc002
commit 448b51d41d

View File

@@ -2832,6 +2832,16 @@ public class CarrierConfigManager {
public static final String KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN = public static final String KEY_ALWAYS_SHOW_PRIMARY_SIGNAL_BAR_IN_OPPORTUNISTIC_NETWORK_BOOLEAN =
"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. * GPS configs. See android.hardware.gnss@1.0 IGnssConfiguration.
* @hide * @hide
@@ -3613,6 +3623,7 @@ public class CarrierConfigManager {
sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY, sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY,
new int[] {4 /* BUSY */}); new int[] {4 /* BUSY */});
sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false); sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false);
sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG, 2000);
} }
/** /**