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

Commit 1260a6a8 authored by Sungcheol Ahn's avatar Sungcheol Ahn Committed by Android (Google) Code Review
Browse files

Merge "Google contribution item #12 - subitem #1 [VZW-Skylo] Check previous... 

Merge "Google contribution item #12 - subitem #1 [VZW-Skylo] Check previous state when request to disable TN scan is completed" into main
parents 0b478f29 67a07af8

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

+31 −1
Original line number Diff line number Diff line
@@ -188,6 +188,8 @@ public class SatelliteSessionController extends StateMachine { 
    @Nullable private DeviceStateMonitor mDeviceStateMonitor;

    @NonNull private SessionMetricsStats mSessionMetricsStats;

    @NonNull private FeatureFlags mFeatureFlags;

    @SatelliteManager.SatelliteModemState private int mModemStateFromController =

            SATELLITE_MODEM_STATE_UNKNOWN;

    @NonNull private AlarmManager mAlarmManager;

    private final AlarmManager.OnAlarmListener mAlarmListener = new AlarmManager.OnAlarmListener() {

        @Override
@@ -382,6 +384,10 @@ public class SatelliteSessionController extends StateMachine { 
     */

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    public void onSatelliteModemStateChanged(@SatelliteManager.SatelliteModemState int state) {

        if (mFeatureFlags.carrierRoamingNbIotNtn()) {

            plogd("onSatelliteModemStateChanged from SatelliteController : " + state);

            mModemStateFromController = state;

        }

        sendMessage(EVENT_SATELLITE_MODEM_STATE_CHANGED, state);

    }
@@ -998,8 +1004,16 @@ public class SatelliteSessionController extends StateMachine { 
                    int error = SatelliteServiceUtils.getSatelliteError(

                            result, "DisableCellularModemWhileSatelliteModeIsOnDone");

                    if (error == SatelliteManager.SATELLITE_RESULT_SUCCESS) {

                        if (mFeatureFlags.carrierRoamingNbIotNtn()

                                && mModemStateFromController == SATELLITE_MODEM_STATE_CONNECTED) {

                            ploge("mPreviousState : " + mPreviousState

                                    + " mModemStateFromController : "

                                    + mModemStateFromController + " I->C");

                            transitionTo(mConnectedState);

                        } else {

                            transitionTo(mNotConnectedState);

                        }

                    }

                    mIsDisableCellularModemInProgress = false;

                } else {

                    ploge("DisableCellularModemWhileSatelliteModeIsOn is not in progress");
@@ -1659,6 +1673,13 @@ public class SatelliteSessionController extends StateMachine { 
        }

        mIsScreenOn = screenOn;



        if (mSatelliteController.getRequestIsEmergency()) {

            if (DBG) logd("handleEventScreenStateChanged: Emergency mode");

            // This is for coexistence

            // emergency mode can be set after registerForScreenStateChanged() called for P2P-sms

            return;

        }



        if (!screenOn) {

            // Screen off, start timer

            int timeoutMillis = getScreenOffInactivityTimeoutDurationSec() * 1000;
@@ -1813,6 +1834,15 @@ public class SatelliteSessionController extends StateMachine { 
    }



    private void handleEventScreenOffInactivityTimerTimedOut() {

        if (mSatelliteController.getRequestIsEmergency()) {

            loge("handleEventScreenOffInactivityTimerTimedOut: Emergency mode");

            /* This is for coexistence

             * mIsEmergency can be set after

             * EVENT_SCREEN_OFF_INACTIVITY_TIMER_TIMED_OUT timer started

             */

            return;

        }



        plogd("handleEventScreenOffInactivityTimerTimedOut: request disable satellite");



        mSatelliteController.requestSatelliteEnabled(