Add outside targets explicitly
Before this CL, the action of adding outside targets was a by-product of
finding the touched window.
In this CL, the change is made to add these targets explicitly. This
simplifies some of the code and allows us to stop generating targets for
cases where isDown is false.
Eventually, we may consider adding the outside targets back into touch
state to unify the security checks.
Bug: 211379801
Test: atest inputflinger_tests
Change-Id: I1373c28d306e154dac8b35879bb7d0497d1ff832
diff --git a/services/inputflinger/dispatcher/InputDispatcher.h b/services/inputflinger/dispatcher/InputDispatcher.h
index 9cd1666..ad05525 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.h
+++ b/services/inputflinger/dispatcher/InputDispatcher.h
@@ -242,9 +242,12 @@
// to transfer focus to a new application.
std::shared_ptr<EventEntry> mNextUnblockedEvent GUARDED_BY(mLock);
- std::pair<sp<android::gui::WindowInfoHandle>, std::vector<InputTarget>>
- findTouchedWindowAtLocked(int32_t displayId, float x, float y, bool isStylus = false,
- bool ignoreDragWindow = false) const REQUIRES(mLock);
+ sp<android::gui::WindowInfoHandle> findTouchedWindowAtLocked(
+ int32_t displayId, float x, float y, bool isStylus = false,
+ bool ignoreDragWindow = false) const REQUIRES(mLock);
+ std::vector<InputTarget> findOutsideTargetsLocked(
+ int32_t displayId, const sp<android::gui::WindowInfoHandle>& touchedWindow) const
+ REQUIRES(mLock);
std::vector<sp<android::gui::WindowInfoHandle>> findTouchedSpyWindowsAtLocked(
int32_t displayId, float x, float y, bool isStylus) const REQUIRES(mLock);