From 67aa352d9e8c66882cd946b5cfc0d5a608357f0b Mon Sep 17 00:00:00 2001
From: mincheli <mincheli@google.com>
Date: Tue, 25 May 2021 14:42:32 +0800
Subject: [PATCH] Fixes MagnificationModeSwitchTest flaky test failure

There might be two thread remove same token at the same time.
Change the main looper as testlooper to ensure only main thread
calling MessageQueue#RemoveSyncBarrier().

Bug: 188890599
Test: atest MagnificationModeSwitchTest --iteration
Change-Id: I3cb6fc5a9ce2a66dd2db4bcabbd23eda462dee21
---
 .../systemui/accessibility/MagnificationModeSwitchTest.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java
index 936ec8021f5e7..d18997438d597 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java
@@ -69,6 +69,7 @@ import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.ImageView;
 
+import androidx.test.filters.FlakyTest;
 import androidx.test.filters.SmallTest;
 
 import com.android.internal.graphics.SfVsyncFrameCallbackProvider;
@@ -88,8 +89,9 @@ import org.mockito.MockitoAnnotations;
 import java.util.List;
 
 @SmallTest
+@FlakyTest(bugId = 188890599)
 @RunWith(AndroidTestingRunner.class)
-@TestableLooper.RunWithLooper
+@TestableLooper.RunWithLooper(setAsMainLooper = true)
 public class MagnificationModeSwitchTest extends SysuiTestCase {
 
     private static final float FADE_IN_ALPHA = 1f;