summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-05-06 10:00:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-06 10:00:57 +0000
commit4522f5749d46adec0189c8dfe7f8e80b9ff4ce7e (patch)
treeb3b41970aee0c648377681e5194fd2cbf97afd2d /include
parent6900656b2d0fbfa168e09d0c1b2990ea0608451b (diff)
parentbc6001b026069714177526eb1120b0011d6f2a51 (diff)
downloadframeworks_native-4522f5749d46adec0189c8dfe7f8e80b9ff4ce7e.zip
frameworks_native-4522f5749d46adec0189c8dfe7f8e80b9ff4ce7e.tar.gz
frameworks_native-4522f5749d46adec0189c8dfe7f8e80b9ff4ce7e.tar.bz2
Merge "Change InputMessage.motion.pointerSize to a uint32_t."
Diffstat (limited to 'include')
-rw-r--r--include/input/InputTransport.h6
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;