Merge "Update feature flag" into main
diff --git a/flags/data.aconfig b/flags/data.aconfig
index 1993b90..48ab438 100644
--- a/flags/data.aconfig
+++ b/flags/data.aconfig
@@ -23,29 +23,17 @@
}
}
-# OWNER=linggm TARGET=24Q3
+# OWNER=linggm TARGET=25Q2
flag {
- name: "auto_data_switch_allow_roaming"
+ name: "auto_data_switch_enhanced"
namespace: "telephony"
- description: "Allow using roaming network as target if user allows it from settings."
+ description: "Ramp up RAT signal strength based auto data switch"
bug: "287132491"
metadata {
purpose: PURPOSE_BUGFIX
}
}
-# OWNER=linggm TARGET=24Q3
-flag {
- name: "auto_data_switch_uses_data_enabled"
- namespace: "telephony"
- description: "Separately consider the backup phone's data allowed and data enabled."
- bug: "338552223"
- metadata {
- purpose: PURPOSE_BUGFIX
- }
-}
-
-
# OWNER=sarahchin TARGET=24Q3
flag {
name: "slicing_additional_error_codes"
diff --git a/src/java/com/android/internal/telephony/data/AutoDataSwitchController.java b/src/java/com/android/internal/telephony/data/AutoDataSwitchController.java
index 7486b61..cef3559 100644
--- a/src/java/com/android/internal/telephony/data/AutoDataSwitchController.java
+++ b/src/java/com/android/internal/telephony/data/AutoDataSwitchController.java
@@ -683,31 +683,21 @@
}
DataEvaluation internetEvaluation;
- if (sFeatureFlags.autoDataSwitchUsesDataEnabled()) {
- if (!defaultDataPhone.isUserDataEnabled()) {
- mPhoneSwitcherCallback.onRequireImmediatelySwitchToPhone(DEFAULT_PHONE_INDEX,
- EVALUATION_REASON_DATA_SETTINGS_CHANGED);
- log(debugMessage.append(
- ", immediately back to default as user turns off default").toString());
- return;
- } else if (!(internetEvaluation = backupDataPhone.getDataNetworkController()
- .getInternetEvaluation(false/*ignoreExistingNetworks*/))
- .isSubsetOf(DataEvaluation.DataDisallowedReason.NOT_IN_SERVICE)) {
- mPhoneSwitcherCallback.onRequireImmediatelySwitchToPhone(
- DEFAULT_PHONE_INDEX, EVALUATION_REASON_DATA_SETTINGS_CHANGED);
- log(debugMessage.append(
- ", immediately back to default because backup ")
- .append(internetEvaluation).toString());
- return;
- }
- } else {
- if (!defaultDataPhone.isUserDataEnabled() || !backupDataPhone.isDataAllowed()) {
- mPhoneSwitcherCallback.onRequireImmediatelySwitchToPhone(DEFAULT_PHONE_INDEX,
- EVALUATION_REASON_DATA_SETTINGS_CHANGED);
- log(debugMessage.append(
- ", immediately back to default as user turns off settings").toString());
- return;
- }
+ if (!defaultDataPhone.isUserDataEnabled()) {
+ mPhoneSwitcherCallback.onRequireImmediatelySwitchToPhone(DEFAULT_PHONE_INDEX,
+ EVALUATION_REASON_DATA_SETTINGS_CHANGED);
+ log(debugMessage.append(
+ ", immediately back to default as user turns off default").toString());
+ return;
+ } else if (!(internetEvaluation = backupDataPhone.getDataNetworkController()
+ .getInternetEvaluation(false/*ignoreExistingNetworks*/))
+ .isSubsetOf(DataEvaluation.DataDisallowedReason.NOT_IN_SERVICE)) {
+ mPhoneSwitcherCallback.onRequireImmediatelySwitchToPhone(
+ DEFAULT_PHONE_INDEX, EVALUATION_REASON_DATA_SETTINGS_CHANGED);
+ log(debugMessage.append(
+ ", immediately back to default because backup ")
+ .append(internetEvaluation).toString());
+ return;
}
boolean backToDefault = false;
@@ -937,14 +927,15 @@
* @return {@code true} If the feature of switching base on RAT and signal strength is enabled.
*/
private boolean isRatSignalStrengthBasedSwitchEnabled() {
- return mScoreTolerance >= 0 && mAutoDataSwitchPerformanceStabilityTimeThreshold >= 0;
+ return mScoreTolerance >= 0 && mAutoDataSwitchPerformanceStabilityTimeThreshold >= 0
+ && sFeatureFlags.autoDataSwitchEnhanced();
}
/**
* @return {@code true} If the feature of switching to roaming non DDS is enabled.
*/
private boolean isNddsRoamingEnabled() {
- return sFeatureFlags.autoDataSwitchAllowRoaming() && mAllowNddsRoaming;
+ return mAllowNddsRoaming;
}
/**
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 d3f3050..ae8c18e 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/data/AutoDataSwitchControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/data/AutoDataSwitchControllerTest.java
@@ -193,9 +193,8 @@
mScheduledEventsToExtras = getPrivateField(mAutoDataSwitchControllerUT,
"mScheduledEventsToExtras", Map.class);
- doReturn(true).when(mFeatureFlags).autoDataSwitchAllowRoaming();
doReturn(true).when(mFeatureFlags).carrierEnabledSatelliteFlag();
- doReturn(true).when(mFeatureFlags).autoDataSwitchUsesDataEnabled();
+ doReturn(true).when(mFeatureFlags).autoDataSwitchEnhanced();
}
@After