summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-07-16 16:25:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-16 16:25:13 -0700
commit5b45b1c274d448a304188d07cb54ac5d2668f203 (patch)
tree3188928e1f76fb11cfe099402bf1c7052192fbae /include
parent955f1551b6164daa101f4a0cd04171f4884536e3 (diff)
parent7b8df313f714d6e8d536e0f8bbe5496fe9a6c26d (diff)
downloadframeworks_base-5b45b1c274d448a304188d07cb54ac5d2668f203.zip
frameworks_base-5b45b1c274d448a304188d07cb54ac5d2668f203.tar.gz
frameworks_base-5b45b1c274d448a304188d07cb54ac5d2668f203.tar.bz2
am 7b8df313: am 00ba8844: Fix individual pointer id up/down reporting.
Merge commit '7b8df313f714d6e8d536e0f8bbe5496fe9a6c26d' * commit '7b8df313f714d6e8d536e0f8bbe5496fe9a6c26d': Fix individual pointer id up/down reporting.
Diffstat (limited to 'include')
-rw-r--r--include/ui/InputReader.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/ui/InputReader.h b/include/ui/InputReader.h
index 85a0084..14bea65 100644
--- a/include/ui/InputReader.h
+++ b/include/ui/InputReader.h
@@ -286,7 +286,8 @@ private:
int32_t keyEventAction, int32_t keyEventFlags);
void dispatchTouches(nsecs_t when, InputDevice* device, uint32_t policyFlags);
void dispatchTouch(nsecs_t when, InputDevice* device, uint32_t policyFlags,
- InputDevice::TouchData* touch, BitSet32 idBits, int32_t motionEventAction);
+ InputDevice::TouchData* touch, BitSet32 idBits, uint32_t changedId,
+ int32_t motionEventAction);
// display
void resetDisplayProperties();