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

Commit 6baf6a0b authored by Andreas Miko's avatar Andreas Miko Committed by Android (Google) Code Review
Browse files

Merge "Fix modeOnCanceled for LOCKSCREEN <=> AOD transitions" into main

parents 877a4fdb b28af72b

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt

+2 −1
Original line number Diff line number Diff line
@@ -357,7 +357,8 @@ constructor( 
                from = KeyguardState.LOCKSCREEN,

                modeOnCanceledFromStartedStep = { startedStep ->

                    if (

                        startedStep.to == KeyguardState.AOD && startedStep.from == KeyguardState.AOD

                        transitionInteractor.asleepKeyguardState.value == KeyguardState.AOD &&

                            startedStep.from == KeyguardState.AOD

                    ) {

                        TransitionModeOnCanceled.REVERSE

                    } else {