Merge "[Dual Shade] Fix KeyguardSecurityContainerControllerTest for DualShade." into main (a8395c2d) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt

+5 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ import com.android.systemui.scene.shared.model.FakeSceneDataSource
		import com.android.systemui.scene.shared.model.Overlays
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.scene.shared.model.fakeSceneDataSource
		import com.android.systemui.shade.domain.interactor.enableSingleShade
		import com.android.systemui.statusbar.policy.ConfigurationController
		import com.android.systemui.statusbar.policy.DevicePostureController
		import com.android.systemui.statusbar.policy.DeviceProvisionedController
		@@ -92,6 +93,7 @@ import com.android.systemui.util.time.FakeSystemClock
		import com.android.systemui.window.domain.interactor.windowRootViewBlurInteractor
		import com.google.common.truth.Truth
		import junit.framework.Assert
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.flow.MutableStateFlow
		import kotlinx.coroutines.flow.flowOf
		import kotlinx.coroutines.test.runCurrent
		@@ -114,6 +116,7 @@ import org.mockito.Mockito.spy
		import org.mockito.Mockito.verify
		import org.mockito.MockitoAnnotations

		@OptIn(ExperimentalCoroutinesApi::class)
		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@RunWithLooper
		@@ -869,6 +872,8 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() {
		@EnableSceneContainer
		fun dismissesKeyguard_whenSceneChangesToGone() =
		kosmos.testScope.runTest {
		kosmos.enableSingleShade()
		runCurrent()
		// Collect sceneInteractor.currentOverlays so that show/hideOverlay receive updated
		// overlay state during validation
		val currentOverlays by collectLastValue(sceneInteractor.currentOverlays)