commit 58f8d0f255a41c0f2106cf53a63f5a5d8c861aa6
author Malcolm Chen <refuhoo@google.com> Thu Oct 31 15:06:19 2019 -0700
committer Malcolm Chen <refuhoo@google.com> Fri Nov 01 14:49:12 2019 -0700
tree 29160141ec427a9df968a91a6b01b40a49c7e28b
parent ec1cb01ad4a3c33a1f985265cb6426709867e912

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

Bug: 142884903
Test: manual test
Change-Id: Id8dc2da05efdf4dd53d03b133cc9f47efd196e02

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
old mode 100644
new mode 100755
index b564502..0104464
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -2888,6 +2888,16 @@
             "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
      */
@@ -3674,6 +3684,7 @@
         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);
     }
 
     /**