From e40dc61e872b9124fae28eb8791e09ceeb4fb0e9 Mon Sep 17 00:00:00 2001
From: Jackal Guo <jackalguo@google.com>
Date: Thu, 27 Feb 2020 14:43:29 +0800
Subject: [PATCH] Fix AccessibilityManagerServiceTest

AccessibilityServiceConnection would send a message, and notify all
IAccessibilityServiceClient in the main thread. The message may not
be sent immediately. Using waitForIdleSync before verify to ensure
the target method is invoked.

Bug: 150345707
Test: atest FrameworksServicesTests:com.android.server.accessibility
Test: atest --rerun-until-failure 100 \
      AccessibilityManagerServiceTest#testOnSystemActionsChanged
Change-Id: I6a796772e00f55d6523e1f12703c17b0fd931f9c
---
 .../server/accessibility/AccessibilityManagerServiceTest.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java
index 9a7d6ea52d983..7ce0296f36913 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java
@@ -189,6 +189,7 @@ public class AccessibilityManagerServiceTest extends AndroidTestCase {
     public void testOnSystemActionsChanged() throws Exception {
         setupAccessibilityServiceConnection();
         mA11yms.notifySystemActionsChangedLocked(mUserState);
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
         verify(mMockServiceClient).onSystemActionsChanged();
     }
 }