diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-16 12:13:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-16 12:13:49 +0000 |
| commit | 0c42f3bb33ae4bc467d39e2f15cfff795409508b (patch) | |
| tree | 438d04e9cad00df08f825eee5dcb1567cea5833a /libs | |
| parent | 8b2e7c4aaa1198a0a2d4fe1effd03f889e5d3130 (diff) | |
| parent | 2c125876208c6b7173ef561316843d64ae1599e2 (diff) | |
| download | frameworks_base-0c42f3bb33ae4bc467d39e2f15cfff795409508b.zip frameworks_base-0c42f3bb33ae4bc467d39e2f15cfff795409508b.tar.gz frameworks_base-0c42f3bb33ae4bc467d39e2f15cfff795409508b.tar.bz2 | |
am 2c125876: am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '2c125876208c6b7173ef561316843d64ae1599e2':
Change InputMessage.motion.pointerSize to a uint32_t.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/input/InputDispatcher.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/input/InputDispatcher.cpp b/libs/input/InputDispatcher.cpp index 22d1871..f594df2 100644 --- a/libs/input/InputDispatcher.cpp +++ b/libs/input/InputDispatcher.cpp @@ -1962,7 +1962,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); } @@ -1975,7 +1975,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; |