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

Commit b2d7f31b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Call stopP2pSmsInactivityTimer in PowerOff and Transferring state" into main

parents cfdc6a45 5f732156

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

+2 −2
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ public class SatelliteSessionController extends StateMachine { 
            unbindService();

            stopNbIotInactivityTimer();

            stopEsosInactivityTimer();

            stopNbIotInactivityTimer();

            stopP2pSmsInactivityTimer();

            endUserInactivity();

            DemoSimulator.getInstance().onSatelliteModeOff();

            notifyStateChangedEvent(SatelliteManager.SATELLITE_MODEM_STATE_OFF);
@@ -1067,7 +1067,7 @@ public class SatelliteSessionController extends StateMachine { 
            if (DBG) plogd("Entering TransferringState");

            stopNbIotInactivityTimer();

            stopEsosInactivityTimer();

            stopNbIotInactivityTimer();

            stopP2pSmsInactivityTimer();



            mPreviousState = mCurrentState;

            mCurrentState = SATELLITE_MODEM_STATE_DATAGRAM_TRANSFERRING;