diff options
| author | 2019-09-15 16:28:15 -0700 | |
|---|---|---|
| committer | 2019-09-15 16:28:15 -0700 | |
| commit | d6b2117fae7ea76dc3ad1ec986271afa7a570e6c (patch) | |
| tree | 26d17270f715209582592f92a0fa9f7228f41c2c | |
| parent | 4700cc1c74616ed76d84685481765fe0a15600a8 (diff) | |
| parent | ffdedd2d1773ea3618deb7f1fa9d3f93ec5359a0 (diff) | |
Merge "Add a carrier config to disable ping test" into qt-qpr1-dev
am: ffdedd2d17
Change-Id: Ibfc95dbe6b3d4b30132e43236758aab92393b21a
| -rwxr-xr-x | telephony/java/android/telephony/CarrierConfigManager.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 71210350639b..f510493d90e5 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2791,6 +2791,14 @@ public class CarrierConfigManager { "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 @@ -3566,6 +3574,7 @@ public class CarrierConfigManager { 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, |