commit bf85bd6961ae3492d0ef5507dcaa3af0da95eec3
author Nataniel Borges <natanieljr@google.com> Wed Dec 06 16:56:48 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 06 16:56:48 2023 +0000
tree fb1fe148b6618ed5b973fa2da3985c6eb1239be1
parent e2d61b7b6f46447249deed2326a52122f5c10e28
parent 48ae6b90fcb701d2d73db28fde084498b6ab65c6

Merge "In some cases launcher is not ready at test creation, in computeTestMethods" into main

tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt

diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt
index ad272a0..ce92eac 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt
@@ -40,10 +40,9 @@
 constructor(
     protected val flicker: LegacyFlickerTest,
     protected val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation(),
-    protected val tapl: LauncherInstrumentation = LauncherInstrumentation()
 ) {
-    init {
-        tapl.setExpectedRotationCheckEnabled(true)
+    protected val tapl: LauncherInstrumentation by lazy {
+        LauncherInstrumentation().also { it.expectedRotationCheckEnabled = true }
     }
 
     private val logTag = this::class.java.simpleName