commit 6baf6a0bfbdcf32d25c10f8880f8589f7b6c48f4
author Andreas Miko <amiko@google.com> Thu Mar 07 11:09:47 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 07 11:09:47 2024 +0000
tree 4e12768d7f093640aa64db20f73fcf85be9a8c61
parent 877a4fdb77250ee20f09572f904e3026a4611132
parent b28af72bdba5c5178ae9e03a82328a785138378b

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

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

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt
index bcad332..12b27eb 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt
@@ -357,7 +357,8 @@
                 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 {