Merge "[flexiglass] Adds CUI marker when locking and entering AOD" into main

2 files changed, 11 insertions, 11 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
index 23be5c52ab5c..c61530c3dbcc 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
@@ -163,10 +163,6 @@ constructor(
     }
 
     private fun bindJankViewModel() {
-        if (SceneContainerFlag.isEnabled) {
-            return
-        }
-
         jankHandle?.dispose()
         jankHandle =
             KeyguardJankBinder.bind(
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardJankBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardJankBinder.kt
index 0cb684a1aabe..38263be33c82 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardJankBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardJankBinder.kt
@@ -30,6 +30,7 @@ import com.android.systemui.keyguard.shared.model.TransitionState
 import com.android.systemui.keyguard.shared.model.TransitionStep
 import com.android.systemui.keyguard.ui.viewmodel.KeyguardJankViewModel
 import com.android.systemui.lifecycle.repeatWhenAttached
+import com.android.systemui.scene.shared.flag.SceneContainerFlag
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.DisposableHandle
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -79,15 +80,18 @@ object KeyguardJankBinder {
                     }
                 }
 
-                launch {
-                    viewModel.lockscreenToAodTransition.collect {
-                        processStep(it, CUJ_LOCKSCREEN_TRANSITION_TO_AOD)
+                // The following is already done in KeyguardTransitionAnimationCallbackImpl.
+                if (!SceneContainerFlag.isEnabled) {
+                    launch {
+                        viewModel.lockscreenToAodTransition.collect {
+                            processStep(it, CUJ_LOCKSCREEN_TRANSITION_TO_AOD)
+                        }
                     }
-                }
 
-                launch {
-                    viewModel.aodToLockscreenTransition.collect {
-                        processStep(it, CUJ_LOCKSCREEN_TRANSITION_FROM_AOD)
+                    launch {
+                        viewModel.aodToLockscreenTransition.collect {
+                            processStep(it, CUJ_LOCKSCREEN_TRANSITION_FROM_AOD)
+                        }
                     }
                 }
             }