From d85b2e28c7cc848401d7eac6b51d3b0b169b8079 Mon Sep 17 00:00:00 2001
From: Nataniel Borges <natanieljr@google.com>
Date: Fri, 5 Mar 2021 15:52:05 +0100
Subject: [PATCH] Log WM trace on frame instead of transaction

Logging all transactions of WM lead to logging inconsistent states that are not sent to SF nor visible to the end user. This information increases the flakiness of the test.

Logging only on frame means that the log will only contain the information sent to SF.

Test: atest FlickerTests WMShellFlickerTests
Bug: 167521849
Change-Id: I16624181ebd127482724439fff84d4bca7fe9ab3
---
 libs/WindowManager/Shell/tests/flicker/AndroidTest.xml | 2 ++
 tests/FlickerTests/AndroidTest.xml                     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml b/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml
index f06d57c6c789e..ad4ccc0288ad6 100644
--- a/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml
+++ b/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml
@@ -11,6 +11,8 @@
         <option name="force-skip-system-props" value="true" />
         <!-- set WM tracing verbose level to all -->
         <option name="run-command" value="cmd window tracing level all" />
+        <!-- set WM tracing to frame (avoid incomplete states) -->
+        <option name="run-command" value="cmd window tracing frame" />
         <!-- restart launcher to activate TAPL -->
         <option name="run-command" value="setprop ro.test_harness 1 ; am force-stop com.google.android.apps.nexuslauncher" />
     </target_preparer>
diff --git a/tests/FlickerTests/AndroidTest.xml b/tests/FlickerTests/AndroidTest.xml
index b2719fbcac82c..896ec9ae922c7 100644
--- a/tests/FlickerTests/AndroidTest.xml
+++ b/tests/FlickerTests/AndroidTest.xml
@@ -11,6 +11,8 @@
         <option name="force-skip-system-props" value="true" />
         <!-- set WM tracing verbose level to all -->
         <option name="run-command" value="cmd window tracing level all" />
+        <!-- set WM tracing to frame (avoid incomplete states) -->
+        <option name="run-command" value="cmd window tracing frame" />
         <!-- restart launcher to activate TAPL -->
         <option name="run-command" value="setprop ro.test_harness 1 ; am force-stop com.google.android.apps.nexuslauncher" />
     </target_preparer>