Merge "Cleaned up 24Q2 flags" into main (7ab6db75) · Commits · e / os / android_frameworks_opt_telephony

flags/data.aconfig

+0 −63

Original line number	Diff line number	Diff line
		@@ -34,45 +34,6 @@ flag {
		}
		}

		# OWNER=linggm TARGET=24Q2
		flag {
		name: "use_alarm_callback"
		namespace: "telephony"
		description: "Use alarm callback instead of broadcast."
		bug: "311476875"
		}

		# OWNER=linggm TARGET=24Q2
		flag {
		name: "refine_preferred_data_profile_selection"
		namespace: "telephony"
		description: "Upon internet network connect, refine selection of preferred data profile."
		bug: "311476883"
		}

		# OWNER=linggm TARGET=24Q2
		flag {
		name: "unthrottle_check_transport"
		namespace: "telephony"
		description: "Check transport when unthrottle."
		bug: "303922311"
		}

		# OWNER=linggm TARGET=24Q2
		flag {
		name: "allow_mmtel_in_non_vops"
		namespace: "telephony"
		description: "Allow bring up MMTEL in nonVops area specified by carrier config."
		bug: "241198464"
		}

		# OWNER=jackyu TARGET=24Q2
		flag {
		name: "metered_embb_urlcc"
		namespace: "telephony"
		description: "Force networks that have PRIORITIZE_BANDWIDTH or PRIORITIZE_LATENCY to be metered."
		bug: "301310451"
		}

		# OWNER=sarahchin TARGET=24Q3
		flag {
		@@ -101,14 +62,6 @@ flag {
		bug:"286171724"
		}

		# OWNER=nagendranb TARGET=24Q2
		flag {
		name: "notify_data_activity_changed_with_slot"
		namespace: "telephony"
		description: "notify data activity changed for slot id"
		bug: "309896936"
		}

		# OWNER=qingqi TARGET=24Q3
		flag {
		name: "vonr_enabled_metric"
		@@ -117,14 +70,6 @@ flag {
		bug:"288449751"
		}

		# OWNER=willycwhu TARGET=24Q2
		flag {
		name: "ignore_existing_networks_for_internet_allowed_checking"
		namespace: "telephony"
		description: "Ignore existing networks when checking if internet is allowed"
		bug: "284420611"
		}

		# OWNER=apsankar TARGET=24Q3
		flag {
		name: "data_call_session_stats_captures_cross_sim_calling"
		@@ -133,14 +78,6 @@ flag {
		bug: "313956117"
		}

		# OWNER=jackyu TARGET=24Q2
		flag {
		name: "force_iwlan_mms"
		namespace: "telephony"
		description: "When QNS prefers MMS on IWLAN, MMS will be attempted on IWLAN if it can, even though if existing cellular network already supports MMS."
		bug: "316211526"
		}

		# OWNER=sewook TARGET=24Q3
		flag {
		name: "reconnect_qualified_network"

src/java/com/android/internal/telephony/DefaultPhoneNotifier.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -135,13 +135,9 @@ public class DefaultPhoneNotifier implements PhoneNotifier {

		int subId = sender.getSubId();

		if (mFeatureFlags.notifyDataActivityChangedWithSlot()) {
		int phoneId = sender.getPhoneId();
		mTelephonyRegistryMgr.notifyDataActivityChanged(phoneId, subId,
		sender.getDataActivityState());
		} else {
		mTelephonyRegistryMgr.notifyDataActivityChanged(subId, sender.getDataActivityState());
		}
		}

		@Override

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

+2 −5

Original line number	Diff line number	Diff line
		@@ -643,10 +643,8 @@ public class DataConfigManager extends Handler {
		// Consumer slices are the slices that are allowed to be accessed by regular application to
		// get better performance. They should be metered. This can be turned into configurations in
		// the future.
		if (mFeatureFlags.meteredEmbbUrlcc()) {
		meteredCapabilities.add(NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_BANDWIDTH);
		meteredCapabilities.add(NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_LATENCY);
		}

		return Collections.unmodifiableSet(meteredCapabilities);
		}
		@@ -761,7 +759,6 @@ public class DataConfigManager extends Handler {
		*/
		public boolean allowBringUpNetworkInNonVops(@NetworkRegistrationInfo.RegistrationState
		int regState) {
		if (!mFeatureFlags.allowMmtelInNonVops()) return false;
		int networkType = -1;
		if (regState == NetworkRegistrationInfo.REGISTRATION_STATE_HOME) {
		networkType = CarrierConfigManager.Ims.NETWORK_TYPE_HOME;

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

+15 −25

Original line number	Diff line number	Diff line
		@@ -1310,7 +1310,6 @@ public class DataNetwork extends StateMachine {
		getHandler(), EVENT_VOICE_CALL_ENDED, null);
		}

		if (mFlags.forceIwlanMms()) {
		if (mDataProfile.canSatisfy(NetworkCapabilities.NET_CAPABILITY_MMS)) {
		mAccessNetworksManagerCallback = new AccessNetworksManagerCallback(
		getHandler()::post) {
		@@ -1325,7 +1324,6 @@ public class DataNetwork extends StateMachine {
		};
		mAccessNetworksManager.registerCallback(mAccessNetworksManagerCallback);
		}
		}

		// Only add symmetric code here, for example, registering and unregistering.
		// DefaultState.enter() is the starting point in the life cycle of the DataNetwork,
		@@ -1336,7 +1334,7 @@ public class DataNetwork extends StateMachine {
		@Override
		public void exit() {
		logv("Unregistering all events.");
		if (mFlags.forceIwlanMms() && mAccessNetworksManagerCallback != null) {
		if (mAccessNetworksManagerCallback != null) {
		mAccessNetworksManager.unregisterCallback(mAccessNetworksManagerCallback);
		}

		@@ -2408,14 +2406,7 @@ public class DataNetwork extends StateMachine {
		DataSpecificRegistrationInfo dsri = nri.getDataSpecificInfo();
		// Check if the network is non-VoPS.
		if (dsri != null && dsri.getVopsSupportInfo() != null
		&& !dsri.getVopsSupportInfo().isVopsSupported()
		// Reflect the actual MMTEL if flag on.
		&& (mFlags.allowMmtelInNonVops()
		// Deceive Connectivity service to satisfy an MMTEL request, this should
		// be useless because we reach here if no MMTEL request, then removing
		// MMTEL capability shouldn't have any impacts.
		\|\| !mDataConfigManager.shouldKeepNetworkUpInNonVops(
		nri.getNetworkRegistrationState()))) {
		&& !dsri.getVopsSupportInfo().isVopsSupported()) {
		builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_MMTEL);
		}
		log("updateNetworkCapabilities: dsri=" + dsri);
		@@ -2543,8 +2534,7 @@ public class DataNetwork extends StateMachine {
		// Check if the feature force MMS on IWLAN is enabled. When the feature is enabled, MMS
		// will be attempted on IWLAN if possible, even if existing cellular networks already
		// supports IWLAN.
		if (mFlags.forceIwlanMms() && builder.build()
		.hasCapability(NetworkCapabilities.NET_CAPABILITY_MMS)) {
		if (builder.build().hasCapability(NetworkCapabilities.NET_CAPABILITY_MMS)) {
		// If QNS sets MMS preferred on IWLAN, and it is possible to setup an MMS network on
		// IWLAN, then we need to remove the MMS capability on the cellular network. This will
		// allow the new MMS network to be brought up on IWLAN when MMS network request arrives.

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -1508,9 +1508,7 @@ public class DataNetworkController extends Handler {
		.build(), mPhone, mFeatureFlags);
		// If we don't skip checking existing network, then we should check If one of the
		// existing networks can satisfy the internet request, then internet is allowed.
		if ((!mFeatureFlags.ignoreExistingNetworksForInternetAllowedChecking()
		\|\| !ignoreExistingNetworks)
		&& mDataNetworkList.stream().anyMatch(
		if (!ignoreExistingNetworks && mDataNetworkList.stream().anyMatch(
		dataNetwork -> internetRequest.canBeSatisfiedBy(
		dataNetwork.getNetworkCapabilities()))) {
		return new DataEvaluation(DataEvaluationReason.EXTERNAL_QUERY);