summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-23 01:48:22 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-08-23 01:48:22 +0000
commit2322b27f4eeaae6da440ee4f0d44e12f01500e74 (patch)
treed88edb4330798fa59259ed18552fbc785268065e
parent1a7ed027bb49bec51884ba80227eba35e3c63115 (diff)
parent1003d40815376859655ab3089f8a93027f44b41f (diff)
Merge "Temporarily disable RAT/signalStrength based auto data switch" into main
-rw-r--r--core/res/res/values/config_telephony.xml2
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/res/res/values/config_telephony.xml b/core/res/res/values/config_telephony.xml
index bda194add759..6bb87f3c4e99 100644
--- a/core/res/res/values/config_telephony.xml
+++ b/core/res/res/values/config_telephony.xml
@@ -73,7 +73,7 @@
CarrierConfigManager#KEY_AUTO_DATA_SWITCH_RAT_SIGNAL_SCORE_STRING_ARRAY.
If 0, the device always switch to the higher score SIM.
If < 0, the network type and signal strength based auto switch is disabled. -->
- <integer name="auto_data_switch_score_tolerance">3000</integer>
+ <integer name="auto_data_switch_score_tolerance">-1</integer>
<java-symbol type="integer" name="auto_data_switch_score_tolerance" />
<!-- Boolean indicating whether the Iwlan data service supports persistence of iwlan ipsec
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 892e46e75827..13e5ff15f1d8 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -10518,7 +10518,7 @@ public class CarrierConfigManager {
auto_data_switch_rat_signal_score_string_bundle.putIntArray(
"eHRPD", new int[]{10, 400, 600, 800, 1000});
auto_data_switch_rat_signal_score_string_bundle.putIntArray(
- "TD_SCDMA", new int[]{1, 100, 500, 1000});
+ "TD_SCDMA", new int[]{1, 50, 100, 500, 1000});
auto_data_switch_rat_signal_score_string_bundle.putIntArray(
"iDEN", new int[]{1, 2, 10, 50, 100});
auto_data_switch_rat_signal_score_string_bundle.putIntArray(
@@ -10536,7 +10536,7 @@ public class CarrierConfigManager {
auto_data_switch_rat_signal_score_string_bundle.putIntArray(
"EvDo_0", new int[]{300, 600, 1000, 1500, 2000});
auto_data_switch_rat_signal_score_string_bundle.putIntArray(
- "1xRTT", new int[]{50, 60, 70, 80});
+ "1xRTT", new int[]{50, 60, 70, 80, 90});
auto_data_switch_rat_signal_score_string_bundle.putIntArray(
"EDGE", new int[]{154, 169, 183, 192, 267});
auto_data_switch_rat_signal_score_string_bundle.putIntArray(