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

Commit 77244744 authored by Satish Yalla's avatar Satish Yalla Committed by Android (Google) Code Review
Browse files

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

Revert submission 28767256-349504154

Reason for revert: Droidmonitor created revert due to b/364747476. Will be verifying through ABTD before submission.


Reverted changes: /q/submissionid:28767256-349504154

Change-Id: I22be1835a551e3e317cd6f64c97250e2bb022ad3
parent 119213f6

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_OUT_OF_SERVICE);

                        SatelliteModemState.SATELLITE_MODEM_STATE_NOT_CONNECTED);

                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_IN_SERVICE);

                        SatelliteModemState.SATELLITE_MODEM_STATE_CONNECTED);

                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_OUT_OF_SERVICE:

            case SatelliteModemState.SATELLITE_MODEM_STATE_NOT_CONNECTED:

                return SatelliteManager.SATELLITE_MODEM_STATE_NOT_CONNECTED;

            case SatelliteModemState.SATELLITE_MODEM_STATE_IN_SERVICE:

            case SatelliteModemState.SATELLITE_MODEM_STATE_CONNECTED:

                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_OUT_OF_SERVICE);

                SatelliteModemState.SATELLITE_MODEM_STATE_NOT_CONNECTED);

        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_OUT_OF_SERVICE);

                SatelliteModemState.SATELLITE_MODEM_STATE_NOT_CONNECTED);

        verify(mISatelliteListener).onSatelliteModemStateChanged(

                SatelliteModemState.SATELLITE_MODEM_STATE_IN_SERVICE);

                SatelliteModemState.SATELLITE_MODEM_STATE_CONNECTED);

        ArgumentCaptor<NtnSignalStrength> ntnSignalStrength = ArgumentCaptor.forClass(

                NtnSignalStrength.class);

        verify(mISatelliteListener, times(2))

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

+12 −10
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 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;
@@ -574,8 +576,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(
@@ -732,8 +734,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);
@@ -758,8 +760,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);
@@ -794,8 +796,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
@@ -1241,8 +1243,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);