diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java index b3b1cf82b85af..86f6a93ede1ee 100644 --- a/core/java/android/app/UiAutomation.java +++ b/core/java/android/app/UiAutomation.java @@ -1667,7 +1667,9 @@ public final class UiAutomation { 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)); }