commit c4e6b4d603c5ff03468df6ff9a38517017bab3c4
author Pablo Gamito <pablogamito@google.com> Wed Aug 24 08:32:27 2022 +0000
committer Pablo Gamito <pablogamito@google.com> Wed Aug 24 08:33:05 2022 +0000
tree 07f35ea768ece1f7879351e2f83c52231f3f2fd9
parent 06942ef8fb8985fdd8396eb7f0bad009ee14f981

Disable FaaS

Test: N/A
Change-Id: I78628401d6f7dbaf042e8f1a667a1c66a4d7a156

libraries/flicker/src/com/android/server/wm/flicker/FlickerBlockJUnit4ClassRunner.kt

diff --git a/libraries/flicker/src/com/android/server/wm/flicker/FlickerBlockJUnit4ClassRunner.kt b/libraries/flicker/src/com/android/server/wm/flicker/FlickerBlockJUnit4ClassRunner.kt
index d47cb06..5a05c02 100644
--- a/libraries/flicker/src/com/android/server/wm/flicker/FlickerBlockJUnit4ClassRunner.kt
+++ b/libraries/flicker/src/com/android/server/wm/flicker/FlickerBlockJUnit4ClassRunner.kt
@@ -380,7 +380,7 @@
 
             val isFlickerServiceCompatible = TestClass(testClass).annotations
                 .filterIsInstance<FlickerServiceCompatible>().firstOrNull() != null
-            if (isFlickerServiceCompatible) {
+            if (IS_FAAS_ENABLED && isFlickerServiceCompatible) {
                 flickerTestParameter.enableFaas()
             }
 

libraries/flicker/src/com/android/server/wm/flicker/FlickerTestParameterFactory.kt

diff --git a/libraries/flicker/src/com/android/server/wm/flicker/FlickerTestParameterFactory.kt b/libraries/flicker/src/com/android/server/wm/flicker/FlickerTestParameterFactory.kt
index 9499100..ec0db8c 100644
--- a/libraries/flicker/src/com/android/server/wm/flicker/FlickerTestParameterFactory.kt
+++ b/libraries/flicker/src/com/android/server/wm/flicker/FlickerTestParameterFactory.kt
@@ -18,6 +18,7 @@
 
 import android.view.Surface
 import android.view.WindowManagerPolicyConstants
+import com.android.server.wm.flicker.helpers.IS_FAAS_ENABLED
 
 /**
  * Factory for creating JUnit4 compatible tests based on the flicker DSL
@@ -84,7 +85,7 @@
             FlickerTestParameter.START_ROTATION to startRotation,
             FlickerTestParameter.END_ROTATION to endRotation,
             FlickerTestParameter.REPETITIONS to repetitions,
-            FlickerTestParameter.FAAS_ENABLED to faasEnabled
+            FlickerTestParameter.FAAS_ENABLED to (faasEnabled && IS_FAAS_ENABLED)
         )
     )