summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-03-18 18:52:40 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-18 18:52:40 -0700
commite3d0022be8363411f27dc493d45b966be6d31efe (patch)
tree3122042c587c8ffa050a756c31090d4e509435e8
parent90a948b084020d33b1376ce3b34505ebabdfe1ef (diff)
parente325e9ada7be366468199157234a16d7606a0abe (diff)
downloadframeworks_base-e3d0022be8363411f27dc493d45b966be6d31efe.zip
frameworks_base-e3d0022be8363411f27dc493d45b966be6d31efe.tar.gz
frameworks_base-e3d0022be8363411f27dc493d45b966be6d31efe.tar.bz2
Merge "Fix an incorrect NDK function prototype."
-rw-r--r--native/include/android/input.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/native/include/android/input.h b/native/include/android/input.h
index 86be54a..953ee10 100644
--- a/native/include/android/input.h
+++ b/native/include/android/input.h
@@ -657,7 +657,8 @@ int64_t AMotionEvent_getHistoricalEventTime(AInputEvent* motion_event,
* and views.
* Whole numbers are pixels; the value may have a fraction for input devices
* that are sub-pixel precise. */
-float AMotionEvent_getHistoricalRawX(const AInputEvent* motion_event, size_t pointer_index);
+float AMotionEvent_getHistoricalRawX(const AInputEvent* motion_event, size_t pointer_index,
+ size_t history_index);
/* Get the historical raw Y coordinate of this event for the given pointer index that
* occurred between this event and the previous motion event.
@@ -666,7 +667,8 @@ float AMotionEvent_getHistoricalRawX(const AInputEvent* motion_event, size_t poi
* and views.
* Whole numbers are pixels; the value may have a fraction for input devices
* that are sub-pixel precise. */
-float AMotionEvent_getHistoricalRawY(const AInputEvent* motion_event, size_t pointer_index);
+float AMotionEvent_getHistoricalRawY(const AInputEvent* motion_event, size_t pointer_index,
+ size_t history_index);
/* Get the historical X coordinate of this event for the given pointer index that
* occurred between this event and the previous motion event.