Merge changes Ic933a355,I50efebe9 (e49d3b90) · Commits · e / os / android_frameworks_opt_telephony

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -2372,9 +2372,11 @@ public class DataNetwork extends StateMachine {
		mFailCause = getFailCauseFromDataCallResponse(resultCode, response);
		validateDataCallResponse(response);
		if (mFailCause == DataFailCause.NONE) {
		if (mDataNetworkController.isNetworkInterfaceExisting(response.getInterfaceName())) {
		logl("Interface " + response.getInterfaceName() + " already existing. Silently "
		+ "tear down now.");
		DataNetwork dataNetwork = mDataNetworkController.getDataNetworkByInterface(
		response.getInterfaceName());
		if (dataNetwork != null) {
		logl("Interface " + response.getInterfaceName() + " has been already used by "
		+ dataNetwork + ". Silently tear down now.");
		// If this is a pre-5G data setup, that means APN database has some problems. For
		// example, different APN settings have the same APN name.
		if (response.getTrafficDescriptors().isEmpty()) {

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

+53 −35

Original line number	Diff line number	Diff line
		@@ -1897,11 +1897,6 @@ public class DataNetworkController extends Handler {
		return dataEvaluation;
		}

		if (mDataRetryManager.isAnyHandoverRetryScheduled(dataNetwork)) {
		dataEvaluation.addDataDisallowedReason(DataDisallowedReason.RETRY_SCHEDULED);
		return dataEvaluation;
		}

		// If enhanced handover check is enabled, perform extra checks.
		if (mDataConfigManager.isEnhancedIwlanHandoverCheckEnabled()) {
		int targetTransport = DataUtils.getTargetTransport(dataNetwork.getTransport());
		@@ -2153,16 +2148,19 @@ public class DataNetworkController extends Handler {
		}

		/**
		* Check if there are existing networks having the same interface name.
		* Get data network by interface name.
		*
		* @param interfaceName The interface name to check.
		* @return {@code true} if the existing network has the same interface name.
		* @param interfaceName The network interface name.
		* @return The data network if found.
		*/
		public boolean isNetworkInterfaceExisting(@NonNull String interfaceName) {
		@Nullable
		DataNetwork getDataNetworkByInterface(@NonNull String interfaceName) {
		return mDataNetworkList.stream()
		.filter(dataNetwork -> !dataNetwork.isDisconnecting())
		.anyMatch(dataNetwork -> interfaceName.equals(
		dataNetwork.getLinkProperties().getInterfaceName()));
		.filter(dataNetwork -> interfaceName.equals(
		dataNetwork.getLinkProperties().getInterfaceName()))
		.findFirst()
		.orElse(null);
		}

		/**
		@@ -2744,7 +2742,7 @@ public class DataNetworkController extends Handler {
		logl("onDataNetworkHandoverRetry: Start handover " + dataNetwork + " to "
		+ AccessNetworkConstants.transportTypeToString(preferredTransport)
		+ ", " + dataHandoverRetryEntry);
		dataNetwork.startHandover(preferredTransport, dataHandoverRetryEntry);
		tryHandoverDataNetwork(dataNetwork, preferredTransport, dataHandoverRetryEntry);
		}

		/**
		@@ -3031,30 +3029,50 @@ public class DataNetworkController extends Handler {
		continue;
		}

		tryHandoverDataNetwork(dataNetwork, preferredTransport, null/handoverRetryEntry/);
		}
		}
		}

		/**
		* Perform data network handover if condition allows, otherwise tear down the network to allow
		* new network setup on the target transport.
		*
		* @param dataNetwork The network on which the handover occurs
		* @param targetTransport The target transport of the handover
		* @param dataHandoverRetryEntry {@code null} if the handover attempt is not due to scheduled
		* retry
		*/
		private void tryHandoverDataNetwork(@NonNull DataNetwork dataNetwork,
		@TransportType int targetTransport,
		@Nullable DataHandoverRetryEntry dataHandoverRetryEntry) {
		if (dataHandoverRetryEntry == null // This handover is a new request
		&& mDataRetryManager.isAnyHandoverRetryScheduled(dataNetwork)) {
		log("tryHandoverDataNetwork: retry scheduled for" + dataNetwork
		+ ", ignore this attempt");
		return;
		}
		DataEvaluation dataEvaluation = evaluateDataNetworkHandover(dataNetwork);
		log("onEvaluatePreferredTransport: " + dataEvaluation + ", " + dataNetwork);
		log("tryHandoverDataNetwork: " + dataEvaluation + ", " + dataNetwork);
		if (!dataEvaluation.containsDisallowedReasons()) {
		logl("Start handover " + dataNetwork + " to "
		+ AccessNetworkConstants.transportTypeToString(preferredTransport));
		dataNetwork.startHandover(preferredTransport, null);
		+ AccessNetworkConstants.transportTypeToString(targetTransport));
		dataNetwork.startHandover(targetTransport, dataHandoverRetryEntry);
		} else if (dataEvaluation.containsAny(DataDisallowedReason.NOT_ALLOWED_BY_POLICY,
		DataDisallowedReason.NOT_IN_SERVICE,
		DataDisallowedReason.VOPS_NOT_SUPPORTED)) {
		logl("onEvaluatePreferredTransport: Handover not allowed. Tear "
		+ "down " + dataNetwork + " so a new network can be setup on "
		+ AccessNetworkConstants.transportTypeToString(preferredTransport)
		+ ".");
		logl("tryHandoverDataNetwork: Handover not allowed. Tear down"
		+ dataNetwork + " so a new network can be setup on "
		+ AccessNetworkConstants.transportTypeToString(targetTransport));
		tearDownGracefully(dataNetwork,
		DataNetwork.TEAR_DOWN_REASON_HANDOVER_NOT_ALLOWED);
		} else if (dataEvaluation.containsAny(DataDisallowedReason.ILLEGAL_STATE,
		DataDisallowedReason.RETRY_SCHEDULED)) {
		logl("onEvaluatePreferredTransport: Handover not allowed. " + dataNetwork
		logl("tryHandoverDataNetwork: Handover not allowed. " + dataNetwork
		+ " will remain on " + AccessNetworkConstants.transportTypeToString(
		dataNetwork.getTransport()));
		} else {
		loge("onEvaluatePreferredTransport: Unexpected handover evaluation result.");
		}
		}
		loge("tryHandoverDataNetwork: Unexpected handover evaluation result.");
		}
		}

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -2283,9 +2283,26 @@ public class DataNetworkControllerTest extends TelephonyTest {
		assertThat(dataNetwork.getTransport()).isEqualTo(
		AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

		// Set target transport OOS
		serviceStateChanged(TelephonyManager.NETWORK_TYPE_UNKNOWN,
		NetworkRegistrationInfo.REGISTRATION_STATE_HOME, /* data */
		NetworkRegistrationInfo.REGISTRATION_STATE_HOME, /* voice */
		NetworkRegistrationInfo.REGISTRATION_STATE_NOT_REGISTERED_OR_SEARCHING, /* iwlan */
		null);
		setSuccessfulSetupDataResponse(mMockedWlanDataServiceManager, 1);

		processAllFutureMessages();
		// Verify that data network is still on cellular
		assertThat(dataNetwork.getTransport()).isEqualTo(
		AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

		// Set target transport back to service
		serviceStateChanged(TelephonyManager.NETWORK_TYPE_UNKNOWN,
		NetworkRegistrationInfo.REGISTRATION_STATE_HOME, /* data */
		NetworkRegistrationInfo.REGISTRATION_STATE_HOME, /* voice */
		NetworkRegistrationInfo.REGISTRATION_STATE_HOME, /* iwlan */
		null);
		processAllFutureMessages();

		dataNetwork = getDataNetworks().get(0);
		// Verify that data network is handovered to IWLAN