From 448b51d41d1311b24d2d94a1b7ccf1636ba61665 Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Thu, 31 Oct 2019 15:06:19 -0700 Subject: Add a carrier config to specify validation timeout for data switch. Bug: 142884903 Test: manual test Change-Id: Id8dc2da05efdf4dd53d03b133cc9f47efd196e02 Merged-In: Id8dc2da05efdf4dd53d03b133cc9f47efd196e02 --- telephony/java/android/telephony/CarrierConfigManager.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index e458ae6b1d3d..e9249df2a691 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2832,6 +2832,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 @@ -3613,6 +3623,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); } /** -- cgit v1.2.3-59-g8ed1b