diff options
author | Narayan Kamath <narayan@google.com> | 2014-05-02 17:53:33 +0100 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2014-05-16 12:53:16 +0100 |
commit | ed5fd384b7401fbb6143eb7107cbfe9af46116be (patch) | |
tree | 780846c68198c834a78a948df45df57a155fb85e /include/input | |
parent | b66ee6c32d87961d5b9f0be97b5fdccb928fd453 (diff) | |
download | frameworks_native-ed5fd384b7401fbb6143eb7107cbfe9af46116be.zip frameworks_native-ed5fd384b7401fbb6143eb7107cbfe9af46116be.tar.gz frameworks_native-ed5fd384b7401fbb6143eb7107cbfe9af46116be.tar.bz2 |
Change InputMessage.motion.pointerSize to a uint32_t.
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.
(cherry-picked from bc6001b026069714177526eb1120b0011d6f2a51)
Change-Id: I28e87050478920a54132efbbb8138076ebad1409
Diffstat (limited to 'include/input')
-rw-r--r-- | include/input/InputTransport.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/input/InputTransport.h b/include/input/InputTransport.h index 609b679..8ffdfca 100644 --- a/include/input/InputTransport.h +++ b/include/input/InputTransport.h @@ -86,7 +86,7 @@ struct InputMessage { float yOffset; float xPrecision; float yPrecision; - size_t pointerCount; + uint32_t pointerCount; struct Pointer { PointerProperties properties; PointerCoords coords; @@ -234,7 +234,7 @@ public: float yPrecision, nsecs_t downTime, nsecs_t eventTime, - size_t pointerCount, + uint32_t pointerCount, const PointerProperties* pointerProperties, const PointerCoords* pointerCoords); @@ -360,7 +360,7 @@ private: void initializeFrom(const InputMessage* msg) { eventTime = msg->body.motion.eventTime; idBits.clear(); - for (size_t i = 0; i < msg->body.motion.pointerCount; i++) { + for (uint32_t i = 0; i < msg->body.motion.pointerCount; i++) { uint32_t id = msg->body.motion.pointers[i].properties.id; idBits.markBit(id); idToIndex[id] = i; |