summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-05-02 17:53:33 +0100
committerNarayan Kamath <narayan@google.com>2014-05-16 12:55:48 +0100
commit844a4c81ff39a30396b470f0a6ba3834b1810781 (patch)
tree41d9b8f84088fa782fa0132da4e1c40283a0d050
parent402120a2236b294dff9a51461cb22400a6ef67f6 (diff)
downloadbase-844a4c81ff39a30396b470f0a6ba3834b1810781.tar.gz
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 commit bc6001b026069714177526eb1120b0011d6f2a51) Change-Id: Ide6bb4dc05cc92a7ae8833e615e8ebb2353255a6
-rw-r--r--services/input/InputDispatcher.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp
index 06a57d5952d0..0da8489897be 100644
--- a/services/input/InputDispatcher.cpp
+++ b/services/input/InputDispatcher.cpp
@@ -1968,7 +1968,7 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime,
xOffset = dispatchEntry->xOffset * scaleFactor;
yOffset = dispatchEntry->yOffset * scaleFactor;
if (scaleFactor != 1.0f) {
- for (size_t i = 0; i < motionEntry->pointerCount; i++) {
+ for (uint32_t i = 0; i < motionEntry->pointerCount; i++) {
scaledCoords[i] = motionEntry->pointerCoords[i];
scaledCoords[i].scale(scaleFactor);
}
@@ -1981,7 +1981,7 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime,
// We don't want the dispatch target to know.
if (dispatchEntry->targetFlags & InputTarget::FLAG_ZERO_COORDS) {
- for (size_t i = 0; i < motionEntry->pointerCount; i++) {
+ for (uint32_t i = 0; i < motionEntry->pointerCount; i++) {
scaledCoords[i].clear();
}
usingCoords = scaledCoords;