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

Commit 92f5216f authored by Sarah Chin's avatar Sarah Chin Committed by Android (Google) Code Review
Browse files

Merge "Transition to current state after icon timers expire" into tm-qpr-dev

parents 97d296b0 5e354986

src/java/com/android/internal/telephony/NetworkTypeController.java

+4 −0
Original line number Diff line number Diff line
@@ -1106,6 +1106,8 @@ public class NetworkTypeController extends StateMachine { 
            removeMessages(EVENT_PRIMARY_TIMER_EXPIRED);

            mIsPrimaryTimerActive = false;

            mPrimaryTimerState = "";

            transitionToCurrentState();

            return;

        }



        if (mIsSecondaryTimerActive && !mSecondaryTimerState.equals(currentState)) {
@@ -1117,6 +1119,8 @@ public class NetworkTypeController extends StateMachine { 
            removeMessages(EVENT_SECONDARY_TIMER_EXPIRED);

            mIsSecondaryTimerActive = false;

            mSecondaryTimerState = "";

            transitionToCurrentState();

            return;

        }



        if (mIsPrimaryTimerActive || mIsSecondaryTimerActive) {