Reland "Reject inconsistent globally injected events" --try 2
This reverts commit f7f93f5fd5afa40858ac492402ec6cc85fe89275.
Reason for revert: fixed tests
Changes: the test for inconsistent sequence needed to be updated because
the injection will now always fail.
Original description:
The dispatcher currently crashes when certain inconsistent input events
are injected. This is affecting test stability negatively.
In this CL, we reject globally-injected inconsistent events. That may cause
some test flakiness, but should eliminate the crashes due to dispatcher
reaching bad state later.
Unfortunately, we can't currently reject all inconsistent injected
events. In the case of targeted injection, it is common for the caller
to leave pointers dangling. Since the injection happens into the
caller-owned windows only, at the end of those tests the windows get
cleaned up, so the dispatcher is still in a good state.
The eventual goal is to completely get rid of injection. Meanwhile,
however, this should help avoid at least some of the crashes.
Bug: 369935405
Flag: EXEMPT bugfix
Test: atest inputflinger_tests
Change-Id: Ic778677a63e544feadf01f3cc47b08ec3b207297
diff --git a/services/inputflinger/dispatcher/InputDispatcher.h b/services/inputflinger/dispatcher/InputDispatcher.h
index 78cbf1e..fade853 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.h
+++ b/services/inputflinger/dispatcher/InputDispatcher.h
@@ -299,6 +299,10 @@
// Event injection and synchronization.
std::condition_variable mInjectionResultAvailable;
+ bool shouldRejectInjectedMotionLocked(const MotionEvent& motion, DeviceId deviceId,
+ ui::LogicalDisplayId displayId,
+ std::optional<gui::Uid> targetUid, int32_t flags)
+ REQUIRES(mLock);
void setInjectionResult(const EventEntry& entry,
android::os::InputEventInjectionResult injectionResult);
void transformMotionEntryForInjectionLocked(MotionEntry&,