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

Commit 614958a4 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "The secondary timer rule checked by wrong state." into rvc-dev am: f7a65efc 

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

Change-Id: I7330b5969ae44212beae0efa3523a98162db95f9
parents bb540b05 f7a65efc

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

+4 −5
Original line number Diff line number Diff line
@@ -810,19 +810,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() {