Merge "Fixed the data switch issue" into main (578bb132) · Commits · e / os / android_frameworks_opt_telephony

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

+21 −10

Original line number	Diff line number	Diff line
		@@ -1394,9 +1394,15 @@ public class DataNetwork extends StateMachine {
		}
		case EVENT_DETACH_ALL_NETWORK_REQUESTS: {
		for (TelephonyNetworkRequest networkRequest : mAttachedNetworkRequestList) {
		networkRequest.setState(TelephonyNetworkRequest.REQUEST_STATE_UNSATISFIED);
		// Check if the network request still belongs to this network, because
		// during data switch, the network request can be attached to other network
		// on a different SIM.
		if (networkRequest.getAttachedNetwork() == DataNetwork.this) {
		networkRequest.setState(
		TelephonyNetworkRequest.REQUEST_STATE_UNSATISFIED);
		networkRequest.setAttachedNetwork(null);
		}
		}
		log("All network requests detached.");
		mAttachedNetworkRequestList.clear();
		break;
		@@ -2141,14 +2147,19 @@ public class DataNetwork extends StateMachine {
		private void onDetachNetworkRequest(@NonNull TelephonyNetworkRequest networkRequest,
		boolean shouldRetry) {
		mAttachedNetworkRequestList.remove(networkRequest);
		// Check if the network request still belongs to this network, because
		// during data switch, the network request can be attached to other network
		// on a different SIM.
		if (networkRequest.getAttachedNetwork() == DataNetwork.this) {
		networkRequest.setState(TelephonyNetworkRequest.REQUEST_STATE_UNSATISFIED);
		networkRequest.setAttachedNetwork(null);

		if (shouldRetry) {
		// Inform DataNetworkController that a network request was detached and should be
		// scheduled to retry.
		mDataNetworkCallback.invokeFromExecutor(
		() -> mDataNetworkCallback.onRetryUnsatisfiedNetworkRequest(networkRequest));
		mDataNetworkCallback.invokeFromExecutor(() ->
		mDataNetworkCallback.onRetryUnsatisfiedNetworkRequest(networkRequest));
		}
		}

		if (mAttachedNetworkRequestList.isEmpty()) {