diff options
| author | 2024-09-12 15:35:16 +0000 | |
|---|---|---|
| committer | 2024-09-12 15:35:16 +0000 | |
| commit | 544ef065e5e17bed2ced952b4b6cdfcf2e540836 (patch) | |
| tree | a4f02cb0d31afa2ae3c528e0d7a38d8005fc3488 | |
| parent | 50019da34f2a227883dabbb7fba2145d13bc408c (diff) | |
| parent | 4db4e28c2903b84cb1566691828f519fae128750 (diff) | |
Merge "[flexiglass] Fixes bug where the swipe lockscreen would get skipped" into main
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt b/packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt index b11d8ed9ee3d..c5e0ccccb4d1 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt @@ -280,6 +280,8 @@ constructor( applicationScope.launch { sceneInteractor.currentScene.collectLatest { currentScene -> if (currentScene == Scenes.Lockscreen) { + // Wait for the screen to be on + powerInteractor.isAwake.first { it } // Wait for surface to become visible windowMgrLockscreenVisInteractor.surfaceBehindVisibility.first { it } // Make sure the device is actually unlocked before force-changing the scene |