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

Commit 5ff07aa6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31510320'] into 25Q1-release. 

Change-Id: I9fcf7f342b42971840a22ee67f95929cde051ac6
parents 33e52116 581a0301

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;