summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-05-16 12:08:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-16 12:08:06 +0000
commitcfba3bf1606dfdb1daf1be1c19176180660ae19d (patch)
tree376ecbf1c4f3565a6743c12763175f55b47947ad /include
parentfc1b9fa3178d1452629d75e2afa1a9d72f03fc1c (diff)
parentc9fcaf3751af078ad730913304431197e4d1ae80 (diff)
downloadframeworks_native-cfba3bf1606dfdb1daf1be1c19176180660ae19d.zip
frameworks_native-cfba3bf1606dfdb1daf1be1c19176180660ae19d.tar.gz
frameworks_native-cfba3bf1606dfdb1daf1be1c19176180660ae19d.tar.bz2
am c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit 'c9fcaf3751af078ad730913304431197e4d1ae80': 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;