Merge "Update feature flag" into main (db3015f1) · Commits · e / os / android_frameworks_opt_telephony

flags/data.aconfig

+3 −15

Original line number	Diff line number	Diff line
		@@ -23,29 +23,17 @@ flag {
		}
		}

		# 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"

src/java/com/android/internal/telephony/data/AutoDataSwitchController.java

+18 −27

Original line number	Diff line number	Diff line
		@@ -683,7 +683,6 @@ public class AutoDataSwitchController extends Handler {
		}

		DataEvaluation internetEvaluation;
		if (sFeatureFlags.autoDataSwitchUsesDataEnabled()) {
		if (!defaultDataPhone.isUserDataEnabled()) {
		mPhoneSwitcherCallback.onRequireImmediatelySwitchToPhone(DEFAULT_PHONE_INDEX,
		EVALUATION_REASON_DATA_SETTINGS_CHANGED);
		@@ -700,15 +699,6 @@ public class AutoDataSwitchController extends Handler {
		.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;
		}
		}

		boolean backToDefault = false;
		boolean isForPerformance = false;
		@@ -937,14 +927,15 @@ public class AutoDataSwitchController extends Handler {
		* @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;
		}

		/**

tests/telephonytests/src/com/android/internal/telephony/data/AutoDataSwitchControllerTest.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -193,9 +193,8 @@ public class AutoDataSwitchControllerTest extends TelephonyTest {
		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