summaryrefslogtreecommitdiff
path: root/services/input/PointerController.cpp
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2011-05-13 12:14:27 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-05-13 12:14:27 -0700
commit65f47d88107b2e34e4bab1f5208bff3f73ce4e8a (patch)
treef78d55c1374dc07e571eed2c1ad638c5fd4ba325 /services/input/PointerController.cpp
parent5684d6bc7e768e905d163cd94b92c977f15c6d89 (diff)
parentfe9f8ab03a63b1037f07dd85799fbea80ec6adaa (diff)
Merge "Add initial API for stylus and mouse buttons."
Diffstat (limited to 'services/input/PointerController.cpp')
-rw-r--r--services/input/PointerController.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/input/PointerController.cpp b/services/input/PointerController.cpp
index ffef72057703..b87c98dbc0b9 100644
--- a/services/input/PointerController.cpp
+++ b/services/input/PointerController.cpp
@@ -137,7 +137,7 @@ void PointerController::move(float deltaX, float deltaY) {
setPositionLocked(mLocked.pointerX + deltaX, mLocked.pointerY + deltaY);
}
-void PointerController::setButtonState(uint32_t buttonState) {
+void PointerController::setButtonState(int32_t buttonState) {
#if DEBUG_POINTER_UPDATES
LOGD("Set button state 0x%08x", buttonState);
#endif
@@ -148,7 +148,7 @@ void PointerController::setButtonState(uint32_t buttonState) {
}
}
-uint32_t PointerController::getButtonState() const {
+int32_t PointerController::getButtonState() const {
AutoMutex _l(mLock);
return mLocked.buttonState;