Delete TouchState::deviceId
We are doing per-device pointer tracking now, so this CL helps remove
the assumptions around having a single active device.
For now, the behaviour is preserved. In the future, we will not need to
check the currently active device at the TouchState level.
Bug: 211379801
Test: m inputflinger_tests && $ANDROID_HOST_OUT/nativetest64/inputflinger_tests/inputflinger_tests
Change-Id: Ie13e9c93eefc04c2955de3b8a06c9c2da28c9d72
diff --git a/services/inputflinger/dispatcher/TouchState.h b/services/inputflinger/dispatcher/TouchState.h
index a2a9f75..1bda0fb 100644
--- a/services/inputflinger/dispatcher/TouchState.h
+++ b/services/inputflinger/dispatcher/TouchState.h
@@ -29,8 +29,6 @@
namespace inputdispatcher {
struct TouchState {
- // 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;
@@ -43,6 +41,9 @@
void reset();
void clearWindowsWithoutPointers();
+ std::set<int32_t> getActiveDeviceIds() const;
+
+ bool hasTouchingPointers(int32_t device) const;
void removeTouchingPointer(int32_t deviceId, int32_t pointerId);
void removeTouchingPointerFromWindow(int32_t deviceId, int32_t pointerId,
const sp<android::gui::WindowInfoHandle>& windowHandle);