From f36375d907dbfcee95f4277ee863380a0e05b246 Mon Sep 17 00:00:00 2001
From: Kevin Lim <kylim@google.com>
Date: Tue, 15 Oct 2024 18:32:35 +0000
Subject: [PATCH] [Tests] Clear MAIN_EXECUTOR in
 NavHandleLongPressInputConsumerTest#tearDown

Attempt at fixing flaky tests

Bug: b/359911511,b/355232772
Flag: EXEMPT Test change
Test: NavHandleLongPressInputConsumerTest
Change-Id: I8ea91f732e91b1a7df4b2e2816dc70e35f14d504
---
 .../inputconsumers/NavHandleLongPressInputConsumerTest.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumerTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumerTest.java
index c18f60476b..98a3607834 100644
--- a/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumerTest.java
+++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumerTest.java
@@ -92,14 +92,15 @@ public class NavHandleLongPressInputConsumerTest {
         when(mTopTaskTracker.getCachedTopTask(anyBoolean())).thenReturn(mTaskInfo);
         when(mDeviceState.getSquaredTouchSlop()).thenReturn(SQUARED_TOUCH_SLOP);
         when(mDelegate.allowInterceptByParent()).thenReturn(true);
-        MAIN_EXECUTOR.getHandler().removeCallbacks(mLongPressRunnable);
         mLongPressTriggered.set(false);
         when(mNavHandleLongPressHandler.getLongPressRunnable(any())).thenReturn(mLongPressRunnable);
         initializeObjectUnderTest();
     }
 
     @After
-    public void tearDown() {
+    public void tearDown() throws Exception {
+        MAIN_EXECUTOR.getHandler().removeCallbacks(mLongPressRunnable);
+        MAIN_EXECUTOR.submit(() -> null).get();
         mContext.onDestroy();
     }