From 261cc401871eddc73bd0af80864a5eb21b7c9e97 Mon Sep 17 00:00:00 2001
From: Sam Dubey <dubeyshubham@google.com>
Date: Thu, 10 Nov 2022 07:46:34 +0000
Subject: Disable inernal app before running tests

Debuggable reamdump data collection dialog is triggering up while
running tests. These are causing flakes. While a better fix would be
figuring out why these are triaggered, the wm tests should be
independent of internal apps which an end user of Android won't see.

Test: Forrest
Bug: 258578781
Bug: 239384214
Change-Id: Ia4c0c670fe3e35f84640787cb8fce70e74edb264
---
 libs/WindowManager/Shell/tests/flicker/AndroidTest.xml | 4 +++-
 tests/FlickerTests/AndroidTest.xml                     | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml b/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml
index 2d6e8f54b6b6..08913c6fde53 100644
--- a/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml
+++ b/libs/WindowManager/Shell/tests/flicker/AndroidTest.xml
@@ -13,6 +13,8 @@
         <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" />
+        <!-- disable betterbug as it's log collection dialogues cause flakes in e2e tests -->
+        <option name="run-command" value="pm disable com.google.android.internal.betterbug" />
         <!-- ensure lock screen mode is swipe -->
         <option name="run-command" value="locksettings set-disabled false" />
         <!-- restart launcher to activate TAPL -->
@@ -34,4 +36,4 @@
         <option name="collect-on-run-ended-only" value="true" />
         <option name="clean-up" value="true" />
     </metrics_collector>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/FlickerTests/AndroidTest.xml b/tests/FlickerTests/AndroidTest.xml
index d91aa1ebe8f5..a7d6a018c9c7 100644
--- a/tests/FlickerTests/AndroidTest.xml
+++ b/tests/FlickerTests/AndroidTest.xml
@@ -15,6 +15,8 @@
         <option name="run-command" value="cmd window tracing frame" />
         <!-- ensure lock screen mode is swipe -->
         <option name="run-command" value="locksettings set-disabled false" />
+        <!-- disable betterbug as it's log collection dialogues cause flakes in e2e tests -->
+        <option name="run-command" value="pm disable com.google.android.internal.betterbug" />
         <!-- 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>
-- 
cgit v1.2.3-59-g8ed1b