Snap for 11938003 from 7fb74d5598f594306b2f4de1671792a910283710 to 24Q3-release (73c2f40c) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java

+13 −21

Original line number	Diff line number	Diff line
		@@ -275,12 +275,19 @@ public class DatagramDispatcher extends Handler {
		mPendingNonEmergencyDatagramsMap.remove(argument.datagramId);
		}

		if (error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
		if (error == SATELLITE_RESULT_SUCCESS) {
		// Update send status for current datagram
		mDatagramController.updateSendStatus(argument.subId, argument.datagramType,
		SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS,
		getPendingDatagramCount(), error);
		startWaitForSimulatedPollDatagramsDelayTimer(request);
		} else {
		// Update send status
		mDatagramController.updateSendStatus(argument.subId, argument.datagramType,
		SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED,
		getPendingDatagramCount(), error);
		}

		if (getPendingDatagramCount() > 0) {
		// Send response for current datagram
		argument.callback.accept(error);
		@@ -294,21 +301,6 @@ public class DatagramDispatcher extends Handler {
		// Send response for current datagram
		argument.callback.accept(error);
		}
		} else {
		// Update send status
		mDatagramController.updateSendStatus(argument.subId, argument.datagramType,
		SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED,
		getPendingDatagramCount(), error);
		mDatagramController.updateSendStatus(argument.subId, argument.datagramType,
		SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE,
		0, SatelliteManager.SATELLITE_RESULT_SUCCESS);
		// Send response for current datagram
		// after updating datagram transfer state internally.
		argument.callback.accept(error);
		// Abort sending all the pending datagrams
		abortSendingPendingDatagrams(argument.subId,
		SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED);
		}
		}
		break;
		}