commit 747467e1e89620cbf775276b32fe8d7f6278b1fc
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 14 23:56:53 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 14 23:56:53 2023 +0000
tree 9ad08bf225a7b1b7fe2be8cc13302b17621b8846
parent 3bc5925fd0dad6c3d2661a3a6c2c0601ef9d8511
parent a5eacc0ac48cdf3fc5c78b0cdca6a301f1cda607

Merge "Fix UiAutomation to correctly wait for idleness"

core/java/android/app/UiAutomation.java

diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java
index b3b1cf8..86f6a93 100644
--- a/core/java/android/app/UiAutomation.java
+++ b/core/java/android/app/UiAutomation.java
@@ -1667,7 +1667,9 @@
                         if (isGenerationChangedLocked()) {
                             return;
                         }
-                        mLastEventTimeMillis = event.getEventTime();
+                        // It is not guaranteed that the accessibility framework sends events by the
+                        // order of event timestamp.
+                        mLastEventTimeMillis = Math.max(mLastEventTimeMillis, event.getEventTime());
                         if (mWaitingForEventDelivery) {
                             mEventQueue.add(AccessibilityEvent.obtain(event));
                         }