Merge "Fix test" into androidx-main

ggfan · Jul 28, 2021 · 4998a68 · 4998a68
2 parents 0469523 + 87a0157
commit 4998a68
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/window/window/src/androidTest/java/androidx/window/layout/WindowInfoRepositoryImplTest.kt b/window/window/src/androidTest/java/androidx/window/layout/WindowInfoRepositoryImplTest.kt
@@ -90,13 +90,15 @@ public class WindowInfoRepositoryImplTest {
                     WindowMetricsCalculatorCompat,
                     FakeWindowBackend()
                 )
+                activity.resetLayoutCounter()
                 activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
                 activity.waitForLayout()
                 testScope.launch {
                     repo.currentWindowMetrics.collect { collector.accept(it) }
                 }
             }
             scenario.onActivity { activity ->
+                activity.resetLayoutCounter()
                 activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
                 activity.waitForLayout()
             }