commit 89e486a5817ba51a49aeb8e98c0b56dd0a46409d
author Siarhei Vishniakou <svv@google.com> Wed May 31 00:48:33 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 31 00:48:33 2023 +0000
tree 1105e8be58c6a513347d38adc8b3c349e4422054
parent 2d4a0efdd08064dcdd05f92a58ee924e65d02b07
parent 4fd86737ad11137d19343965f0287099445fad3a

Ensure dispatcher is idle before checking policy state am: 4fd86737ad

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23414764

Change-Id: I7fc58c715a9a47d9961170b4c9aa1d77f891b77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/inputflinger/tests/InputDispatcher_test.cpp

diff --git a/services/inputflinger/tests/InputDispatcher_test.cpp b/services/inputflinger/tests/InputDispatcher_test.cpp
index e6b73af..d506285 100644
--- a/services/inputflinger/tests/InputDispatcher_test.cpp
+++ b/services/inputflinger/tests/InputDispatcher_test.cpp
@@ -4592,6 +4592,7 @@
     window->consumeKeyDown(ADISPLAY_ID_DEFAULT);
 
     // Should have poked user activity
+    mDispatcher->waitForIdle();
     mFakePolicy->assertUserActivityPoked();
 }
 
@@ -4613,6 +4614,7 @@
     window->consumeKeyDown(ADISPLAY_ID_DEFAULT);
 
     // Should have poked user activity
+    mDispatcher->waitForIdle();
     mFakePolicy->assertUserActivityNotPoked();
 }
 
@@ -4696,6 +4698,7 @@
             AllOf(WithMotionAction(ACTION_DOWN), WithDisplayId(ADISPLAY_ID_DEFAULT)));
 
     // Should have poked user activity
+    mDispatcher->waitForIdle();
     mFakePolicy->assertUserActivityPoked();
 }