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

Commit eba967bb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "The secondary timer rule checked by wrong state." am: 3bc768cf 

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

Change-Id: Ia72bf4aeeb138418ef74d8582bcc6d0df381ef29
parents 02d23418 3bc768cf

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

+4 −5
Original line number Diff line number Diff line
@@ -767,19 +767,18 @@ public class NetworkTypeController extends StateMachine { 
    }



    private void transitionWithSecondaryTimerTo(IState destState) {

        String destName = destState.getName();

        OverrideTimerRule rule = mOverrideTimerRules.get(mPrimaryTimerState);

        if (rule != null && rule.getSecondaryTimer(destName) > 0) {

        String currentName = getCurrentState().getName();

        OverrideTimerRule rule = mOverrideTimerRules.get(mPrimaryTimerState);

        if (rule != null && rule.getSecondaryTimer(currentName) > 0) {

            if (DBG) log("Secondary timer started for state: " + currentName);

            mSecondaryTimerState = currentName;

            mPreviousState = currentName;

            mIsSecondaryTimerActive = true;

            sendMessageDelayed(EVENT_SECONDARY_TIMER_EXPIRED, destState,

                    rule.getSecondaryTimer(destName) * 1000);

                    rule.getSecondaryTimer(currentName) * 1000);

        }

        mIsPrimaryTimerActive = false;

        transitionTo(destState);

        transitionTo(getCurrentState());

    }



    private void transitionToCurrentState() {