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

Commit f660ec2f authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Merge "Check satellite enabled condition when request modem to report ntn... 

Merge "Check satellite enabled condition when request modem to report ntn signal strength" into 24D1-dev
parents 98dea6c7 53dfdfbb

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

+5 −3
Original line number Diff line number Diff line
@@ -1305,10 +1305,9 @@ public class SatelliteController extends Handler { 
                if (SATELLITE_RESULT_SUCCESS != evaluateOemSatelliteRequestAllowed(true)) {

                    return;

                }

                if (mShouldReportNtnSignalStrength.get() == shouldReport) {

                if (!isSatelliteEnabled() || mShouldReportNtnSignalStrength.get() == shouldReport) {

                    if (DBG) {

                        logd("CMD_UPDATE_NTN_SIGNAL_STRENGTH_REPORTING : modem state matches the "

                                + "expected state, return.");

                        logd("CMD_UPDATE_NTN_SIGNAL_STRENGTH_REPORTING: ignore request.");

                    }

                    return;

                }
@@ -2976,6 +2975,9 @@ public class SatelliteController extends Handler { 
        } else {

            loge(caller + ": mSatelliteSessionController is not initialized yet");

        }

        if (!enabled) {

            mShouldReportNtnSignalStrength.set(false);

        }

    }



    private void registerForSatelliteProvisionStateChanged() {

tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java

+18 −0
Original line number Diff line number Diff line
@@ -2366,6 +2366,24 @@ public class SatelliteControllerTest extends TelephonyTest { 
        doReturn(true).when(mMockSatelliteModemInterface).isSatelliteServiceSupported();

        provisionSatelliteService();

        setUpResponseForStartSendingNtnSignalStrength(expectedResult);



        // but it is ignored because satellite is disabled

        setUpResponseForRequestIsSatelliteEnabled(false, SATELLITE_RESULT_SUCCESS);

        verifySatelliteEnabled(false, SATELLITE_RESULT_SUCCESS);

        sendCmdStartSendingNtnSignalStrengthChangedEvent(true);

        processAllMessages();

        verify(mMockSatelliteModemInterface, never())

                .startSendingNtnSignalStrength(any(Message.class));



        // after satellite is enabled, startSendingNtnSignalStrength() is requested normally

        resetSatelliteControllerUT();

        reset(mMockSatelliteModemInterface);

        doReturn(true).when(mMockSatelliteModemInterface).isSatelliteServiceSupported();

        provisionSatelliteService();

        setUpResponseForStartSendingNtnSignalStrength(expectedResult);

        setUpResponseForRequestIsSatelliteEnabled(true, SATELLITE_RESULT_SUCCESS);

        verifySatelliteEnabled(true, SATELLITE_RESULT_SUCCESS);

        processAllMessages();

        sendCmdStartSendingNtnSignalStrengthChangedEvent(true);

        processAllMessages();

        verify(mMockSatelliteModemInterface, times(1))