commit 12638b96ae0dda2d476050aa9e232b0a8f040ded
author Sooraj Sasindran <sasindran@google.com> Fri Sep 13 10:40:32 2019 -0700
committer Sooraj Sasindran <sasindran@google.com> Sat Sep 14 01:39:05 2019 +0000
tree 7d441d39e752c32a5127fcb9b3e202dbf321e775
parent af18cb56bff6d46c145f089449a9f56fc75ad0b7

Add a carrier config to disable ping test

Add a carrier config to disable ping test before data
switch to opportunistic network.

Bug: 141003010
Test: make
Merged-In: I56835e5b416685fbcf2ab2729aa6a039c7f11806
Change-Id: I56835e5b416685fbcf2ab2729aa6a039c7f11806

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 67f346f..8b3b237 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -2751,6 +2751,14 @@
             "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";
+
+    /**
      * Indicates zero or more emergency number prefix(es), because some carrier requires
      * if users dial an emergency number address with a specific prefix, the combination of the
      * prefix and the address is also a valid emergency number to dial. For example, an emergency
@@ -3509,6 +3517,7 @@
         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);
         sDefaults.putAll(Gps.getDefaults());
         sDefaults.putAll(Wifi.getDefaults());
         sDefaults.putIntArray(KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY,