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

Commit 5137d26c authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Transition to current state after icon timers expire" into tm-qpr-dev am: 92f5216f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/20391959



Change-Id: I8748aadc944ae4d0648aa4babefa2dc80abc22f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eba3709e 92f5216f

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) {