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

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

Revert "Revert "Rename CONNECTED and NOT CONNECTED to IN SERVICE..." 

Revert submission 29140667-revert-28767256-349504154-FALOSHWLSG

Reason for revert: Fixed conflict reason and updated

Reverted changes: /q/submissionid:29140667-revert-28767256-349504154-FALOSHWLSG

Change-Id: I9d1ed8b812fc64847161760fc4b96d306c146a43
parent 77244744

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

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ public class DemoSimulator extends StateMachine { 
                NtnSignalStrength ntnSignalStrength = new NtnSignalStrength();

                ntnSignalStrength.signalStrengthLevel = 0;

                mISatelliteListener.onSatelliteModemStateChanged(

                        SatelliteModemState.SATELLITE_MODEM_STATE_NOT_CONNECTED);

                        SatelliteModemState.SATELLITE_MODEM_STATE_OUT_OF_SERVICE);

                mISatelliteListener.onNtnSignalStrengthChanged(ntnSignalStrength);



                synchronized (mLock) {
@@ -191,7 +191,7 @@ public class DemoSimulator extends StateMachine { 
                NtnSignalStrength ntnSignalStrength = new NtnSignalStrength();

                ntnSignalStrength.signalStrengthLevel = 2;

                mISatelliteListener.onSatelliteModemStateChanged(

                        SatelliteModemState.SATELLITE_MODEM_STATE_CONNECTED);

                        SatelliteModemState.SATELLITE_MODEM_STATE_IN_SERVICE);

                mISatelliteListener.onNtnSignalStrengthChanged(ntnSignalStrength);



                synchronized (mLock) {

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

+2 −2
Original line number Diff line number Diff line
@@ -174,9 +174,9 @@ public class SatelliteServiceUtils { 
                return SatelliteManager.SATELLITE_MODEM_STATE_OFF;

            case SatelliteModemState.SATELLITE_MODEM_STATE_UNAVAILABLE:

                return SatelliteManager.SATELLITE_MODEM_STATE_UNAVAILABLE;

            case SatelliteModemState.SATELLITE_MODEM_STATE_NOT_CONNECTED:

            case SatelliteModemState.SATELLITE_MODEM_STATE_OUT_OF_SERVICE:

                return SatelliteManager.SATELLITE_MODEM_STATE_NOT_CONNECTED;

            case SatelliteModemState.SATELLITE_MODEM_STATE_CONNECTED:

            case SatelliteModemState.SATELLITE_MODEM_STATE_IN_SERVICE:

                return SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED;

            default:

                loge("Received invalid modem state: " + modemState);

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

+3 −3
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class DemoSimulatorTest extends TelephonyTest { 
        moveToNotConnectedState();



        verify(mISatelliteListener).onSatelliteModemStateChanged(

                SatelliteModemState.SATELLITE_MODEM_STATE_NOT_CONNECTED);

                SatelliteModemState.SATELLITE_MODEM_STATE_OUT_OF_SERVICE);

        ArgumentCaptor<NtnSignalStrength> ntnSignalStrength = ArgumentCaptor.forClass(

                NtnSignalStrength.class);

        verify(mISatelliteListener).onNtnSignalStrengthChanged(ntnSignalStrength.capture());
@@ -156,9 +156,9 @@ public class DemoSimulatorTest extends TelephonyTest { 
        moveToConnectedState();



        verify(mISatelliteListener).onSatelliteModemStateChanged(

                SatelliteModemState.SATELLITE_MODEM_STATE_NOT_CONNECTED);

                SatelliteModemState.SATELLITE_MODEM_STATE_OUT_OF_SERVICE);

        verify(mISatelliteListener).onSatelliteModemStateChanged(

                SatelliteModemState.SATELLITE_MODEM_STATE_CONNECTED);

                SatelliteModemState.SATELLITE_MODEM_STATE_IN_SERVICE);

        ArgumentCaptor<NtnSignalStrength> ntnSignalStrength = ArgumentCaptor.forClass(

                NtnSignalStrength.class);

        verify(mISatelliteListener, times(2))

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

+10 −12
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ import static android.telephony.satellite.SatelliteManager.SATELLITE_DATAGRAM_TR 
import static android.telephony.satellite.SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED;

import static android.telephony.satellite.SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_WAITING_TO_CONNECT;



import static com.android.internal.telephony.satellite.SatelliteSessionController.EVENT_SCREEN_OFF_INACTIVITY_TIMER_TIMED_OUT;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;
@@ -576,8 +574,8 @@ public class SatelliteSessionControllerTest extends TelephonyTest { 
        processAllMessages();



        // SatelliteSessionController should move to CONNECTED state

        assertSuccessfulModemStateChangedCallback(

                mTestSatelliteModemStateCallback, SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

        assertSuccessfulModemStateChangedCallback(mTestSatelliteModemStateCallback,

                SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

        assertEquals(STATE_CONNECTED, mTestSatelliteSessionController.getCurrentStateName());

        assertTrue(mTestSatelliteSessionController.isNbIotInactivityTimerStarted());

        verify(mMockDatagramController).onSatelliteModemStateChanged(
@@ -734,8 +732,8 @@ public class SatelliteSessionControllerTest extends TelephonyTest { 
        processAllMessages();



        // SatelliteSessionController should move to CONNECTED state

        assertSuccessfulModemStateChangedCallback(

                mTestSatelliteModemStateCallback, SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

        assertSuccessfulModemStateChangedCallback(mTestSatelliteModemStateCallback,

                SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

        assertEquals(STATE_CONNECTED, mTestSatelliteSessionController.getCurrentStateName());

        verify(mMockDatagramController).onSatelliteModemStateChanged(

                SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);
@@ -760,8 +758,8 @@ public class SatelliteSessionControllerTest extends TelephonyTest { 
        processAllMessages();



        // SatelliteSessionController should move to CONNECTED state

        assertSuccessfulModemStateChangedCallback(

                mTestSatelliteModemStateCallback, SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

        assertSuccessfulModemStateChangedCallback(mTestSatelliteModemStateCallback,

                SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

        assertEquals(STATE_CONNECTED, mTestSatelliteSessionController.getCurrentStateName());

        verify(mMockDatagramController).onSatelliteModemStateChanged(

                SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);
@@ -796,8 +794,8 @@ public class SatelliteSessionControllerTest extends TelephonyTest { 
        processAllMessages();



        // SatelliteSessionController should move to CONNECTED state

        assertSuccessfulModemStateChangedCallback(

                mTestSatelliteModemStateCallback, SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

        assertSuccessfulModemStateChangedCallback(mTestSatelliteModemStateCallback,

                SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

        assertEquals(STATE_CONNECTED, mTestSatelliteSessionController.getCurrentStateName());



        // Wait for timeout
@@ -1243,8 +1241,8 @@ public class SatelliteSessionControllerTest extends TelephonyTest { 
        processAllMessages();



        // SatelliteSessionController should move to CONNECTED state

        assertSuccessfulModemStateChangedCallback(

                mTestSatelliteModemStateCallback, SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

        assertSuccessfulModemStateChangedCallback(mTestSatelliteModemStateCallback,

                SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);

        assertEquals(STATE_CONNECTED, mTestSatelliteSessionController.getCurrentStateName());

        verify(mMockDatagramController).onSatelliteModemStateChanged(

                SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED);