Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c7f3694 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11853201 from e6312915 to 24Q3-release

Change-Id: Ie771da35d51cf7d233c19e0131cd3c36eb0aa45a
parents ac4cbd57 e6312915
Loading
Loading
Loading
Loading
+9 −13
Original line number Diff line number Diff line
@@ -277,9 +277,6 @@ public class DatagramDispatcher extends Handler {
                        mDatagramController.updateSendStatus(argument.subId, argument.datagramType,
                                SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS,
                                getPendingDatagramCount(), error);
                        mControllerMetricsStats.reportOutgoingDatagramSuccessCount(
                                argument.datagramType, mIsDemoMode);
                        mSessionMetricsStats.addCountOfSuccessfulOutgoingDatagram();
                        startWaitForSimulatedPollDatagramsDelayTimer(request);
                        if (getPendingDatagramCount() > 0) {
                            // Send response for current datagram
@@ -306,9 +303,6 @@ public class DatagramDispatcher extends Handler {
                        // after updating datagram transfer state internally.
                        argument.callback.accept(error);
                        // Abort sending all the pending datagrams
                        mControllerMetricsStats.reportOutgoingDatagramFailCount(
                                argument.datagramType, mIsDemoMode);
                        mSessionMetricsStats.addCountOfFailedOutgoingDatagram();
                        abortSendingPendingDatagrams(argument.subId,
                                SatelliteManager.SATELLITE_RESULT_REQUEST_ABORTED);
                    }
@@ -550,8 +544,6 @@ public class DatagramDispatcher extends Handler {
                pendingDatagramsMap.entrySet()) {
            SendSatelliteDatagramArgument argument = entry.getValue();
            reportSendDatagramCompleted(argument, errorCode);
            mControllerMetricsStats.reportOutgoingDatagramFailCount(argument.datagramType,
                    mIsDemoMode);
            argument.callback.accept(errorCode);
        }

@@ -610,6 +602,15 @@ public class DatagramDispatcher extends Handler {
                                ? (System.currentTimeMillis() - argument.datagramStartTime) : 0)
                        .setIsDemoMode(mIsDemoMode)
                        .build());
        if (resultCode == SatelliteManager.SATELLITE_RESULT_SUCCESS) {
            mControllerMetricsStats.reportOutgoingDatagramSuccessCount(argument.datagramType,
                    mIsDemoMode);
            mSessionMetricsStats.addCountOfSuccessfulOutgoingDatagram();
        } else {
            mControllerMetricsStats.reportOutgoingDatagramFailCount(argument.datagramType,
                    mIsDemoMode);
            mSessionMetricsStats.addCountOfFailedOutgoingDatagram();
        }
    }

    /**
@@ -733,9 +734,6 @@ public class DatagramDispatcher extends Handler {
                    0, SatelliteManager.SATELLITE_RESULT_SUCCESS);
            abortSendingPendingDatagrams(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,
                    SATELLITE_RESULT_NOT_REACHABLE);
            mControllerMetricsStats.reportOutgoingDatagramFailCount(argument.datagramType,
                    mIsDemoMode);
            mSessionMetricsStats.addCountOfFailedOutgoingDatagram();
        }
    }

@@ -798,8 +796,6 @@ public class DatagramDispatcher extends Handler {

            // Log metrics about the outgoing datagram
            reportSendDatagramCompleted(argument, SATELLITE_RESULT_MODEM_TIMEOUT);
            mControllerMetricsStats.reportOutgoingDatagramFailCount(argument.datagramType,
                    mIsDemoMode);
            // Remove current datagram from pending map.
            if (SatelliteServiceUtils.isSosMessage(argument.datagramType)) {
                mPendingEmergencyDatagramsMap.remove(argument.datagramId);
+2 −1
Original line number Diff line number Diff line
@@ -439,7 +439,8 @@ public class SatelliteSOSMessageRecommender extends Handler {
            ServiceState serviceState = phone.getServiceState();
            if (serviceState != null) {
                int state = serviceState.getState();
                if ((state == STATE_IN_SERVICE || state == STATE_EMERGENCY_ONLY)
                if ((state == STATE_IN_SERVICE || state == STATE_EMERGENCY_ONLY
                        || serviceState.isEmergencyOnly())
                        && !serviceState.isUsingNonTerrestrialNetwork()) {
                    logv("isCellularAvailable true");
                    return true;
+4 −5
Original line number Diff line number Diff line
@@ -237,10 +237,7 @@ public class DatagramDispatcherTest extends TelephonyTest {

            clearInvocations(mMockSatelliteModemInterface);
            clearInvocations(mMockDatagramController);
            mResultListener.clear();

            clearInvocations(mMockSatelliteModemInterface);
            clearInvocations(mMockDatagramController);
            clearInvocations(mMockSessionMetricsStats);
            mResultListener.clear();
            doReturn(true).when(mMockDatagramController)
                    .needsWaitingForSatelliteConnected(eq(datagramType));
@@ -282,6 +279,7 @@ public class DatagramDispatcherTest extends TelephonyTest {

            clearInvocations(mMockSatelliteModemInterface);
            clearInvocations(mMockDatagramController);
            clearInvocations(mMockSessionMetricsStats);
            mResultListener.clear();
            mDatagramDispatcherUT.sendSatelliteDatagram(SUB_ID, datagramType, mDatagram,
                    true, mResultListener::offer);
@@ -356,6 +354,7 @@ public class DatagramDispatcherTest extends TelephonyTest {
        verify(mMockSessionMetricsStats, times(1)).addCountOfSuccessfulOutgoingDatagram();
        clearInvocations(mMockSatelliteModemInterface);
        clearInvocations(mMockDatagramController);
        clearInvocations(mMockSessionMetricsStats);
        mResultListener.clear();

        // No response for the send request from modem
@@ -385,7 +384,7 @@ public class DatagramDispatcherTest extends TelephonyTest {
                any(SatelliteDatagram.class), anyBoolean(), anyBoolean(), any(Message.class));
        verify(mMockSatelliteModemInterface).abortSendingSatelliteDatagrams(any(Message.class));
        assertThat(mResultListener.peek()).isEqualTo(SATELLITE_RESULT_MODEM_TIMEOUT);
        verify(mMockSessionMetricsStats, never()).addCountOfFailedOutgoingDatagram();
        verify(mMockSessionMetricsStats, times(1)).addCountOfFailedOutgoingDatagram();
    }

    @Test