InputDispatcher: Allow spy window to receive entire gesture after pilfer
After a spy window pilfers pointers, it should be albe to receive any
new pointers within its touchable bounds.
Bug: 217376964
Test: atest inputflinger_tests
Change-Id: Iab8360f2f8e3db978cf6c68f19a538b28f7dfac1
diff --git a/services/inputflinger/dispatcher/TouchState.h b/services/inputflinger/dispatcher/TouchState.h
index e154ed3..9efb280 100644
--- a/services/inputflinger/dispatcher/TouchState.h
+++ b/services/inputflinger/dispatcher/TouchState.h
@@ -29,17 +29,24 @@
namespace inputdispatcher {
struct TouchState {
- bool down;
- bool split;
- int32_t deviceId; // id of the device that is currently down, others are rejected
- uint32_t source; // source of the device that is current down, others are rejected
- int32_t displayId; // id to the display that currently has a touch, others are rejected
+ bool down = false;
+ bool split = false;
+ bool preventNewTargets = false;
+
+ // id of the device that is currently down, others are rejected
+ int32_t deviceId = -1;
+ // source of the device that is current down, others are rejected
+ uint32_t source = 0;
+ // id to the display that currently has a touch, others are rejected
+ int32_t displayId = ADISPLAY_ID_NONE;
+
std::vector<TouchedWindow> windows;
- TouchState();
- ~TouchState();
+ TouchState() = default;
+ ~TouchState() = default;
+ TouchState& operator=(const TouchState&) = default;
+
void reset();
- void copyFrom(const TouchState& other);
void addOrUpdateWindow(const sp<android::gui::WindowInfoHandle>& windowHandle,
int32_t targetFlags, BitSet32 pointerIds);
void removeWindowByToken(const sp<IBinder>& token);