commit 94fcf47e93ff10bd7cbc3d66a7d92ae7a086f2c6
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 15 14:23:04 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 15 14:23:04 2016 +0000
tree 9ad59d5401444d31631e33eaa67f15f3cca60e0d
parent 7d7bf0f588675ba1c6c463942ad04e9cbfff5bdf
parent 6db5879c8715b8397b831b23eab154f2a0f512f9

Merge "Fix signature for MotionEvent#setButtonState"

include/input/Input.h

diff --git a/include/input/Input.h b/include/input/Input.h
index 55787e7..cfcafab 100644
--- a/include/input/Input.h
+++ b/include/input/Input.h
@@ -398,7 +398,7 @@
 
     inline int32_t getButtonState() const { return mButtonState; }
 
-    inline int32_t setButtonState(int32_t buttonState) { mButtonState = buttonState; }
+    inline void setButtonState(int32_t buttonState) { mButtonState = buttonState; }
 
     inline int32_t getActionButton() const { return mActionButton; }