Add flag for auto data switch rat and ss
Bug: 260928808
Test: voice call + data browsing
Change-Id: I17feaab599764eb8408997a9d422fe953ae49e2a
diff --git a/flags/data.aconfig b/flags/data.aconfig
index b1f5ab1..152660b 100644
--- a/flags/data.aconfig
+++ b/flags/data.aconfig
@@ -8,6 +8,13 @@
}
flag {
+ name: "auto_data_switch_rat_ss"
+ namespace: "telephony"
+ description: "Whether switch for better rat and signal strength"
+ bug:"260928808"
+}
+
+flag {
name: "use_alarm_callback"
namespace: "telephony"
description: "Use alarm callback instead of broadcast."
diff --git a/src/java/com/android/internal/telephony/data/AutoDataSwitchController.java b/src/java/com/android/internal/telephony/data/AutoDataSwitchController.java
index e51a6b7..e8cd8f0 100644
--- a/src/java/com/android/internal/telephony/data/AutoDataSwitchController.java
+++ b/src/java/com/android/internal/telephony/data/AutoDataSwitchController.java
@@ -811,7 +811,7 @@
* @return {@code true} If the feature of switching base on RAT and signal strength is enabled.
*/
private boolean isRatSignalStrengthBasedSwitchEnabled() {
- return mScoreTolerance >= 0;
+ return mFlags.autoDataSwitchRatSs() && mScoreTolerance >= 0;
}
/**
diff --git a/tests/telephonytests/src/com/android/internal/telephony/data/AutoDataSwitchControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/data/AutoDataSwitchControllerTest.java
index a2f7462..6462d73 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/data/AutoDataSwitchControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/data/AutoDataSwitchControllerTest.java
@@ -293,6 +293,7 @@
@Test
public void testRoaming_same_roaming_condition_uses_rat_signalStrength() {
+ doReturn(true).when(mFeatureFlags).autoDataSwitchRatSs();
// On primary phone
// 1. Both roaming, user allow roaming on both phone, uses RAT score to decide switch.
prepareIdealUsesNonDdsCondition();
@@ -419,6 +420,7 @@
@Test
public void testOnNonDdsSwitchBackToPrimary_rat_signalStrength() {
+ doReturn(true).when(mFeatureFlags).autoDataSwitchRatSs();
doReturn(PHONE_2).when(mPhoneSwitcher).getPreferredDataPhoneId();
prepareIdealUsesNonDdsCondition();