diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-07 16:38:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-07 16:38:45 -0700 |
| commit | a1205f07a6f0c745e8f42f16fe38c06af04143c7 (patch) | |
| tree | d81c4f25faa7e710d0529484f9bd39a2fcf28571 /native/android/input.cpp | |
| parent | 000ef46f5b0f84d08342711b00e8de560ea504af (diff) | |
| parent | 2d3739d479d67ba736cefbdd6087a11eadfb14ea (diff) | |
| download | frameworks_base-a1205f07a6f0c745e8f42f16fe38c06af04143c7.zip frameworks_base-a1205f07a6f0c745e8f42f16fe38c06af04143c7.tar.gz frameworks_base-a1205f07a6f0c745e8f42f16fe38c06af04143c7.tar.bz2 | |
am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread
Merge commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea' into gingerbread-plus-aosp
* commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea':
Modify native ALooper to take an explicit ident.
Diffstat (limited to 'native/android/input.cpp')
| -rw-r--r-- | native/android/input.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/native/android/input.cpp b/native/android/input.cpp index 379960a..c79f913 100644 --- a/native/android/input.cpp +++ b/native/android/input.cpp @@ -246,8 +246,8 @@ float AMotionEvent_getHistoricalOrientation(AInputEvent* motion_event, size_t po void AInputQueue_attachLooper(AInputQueue* queue, ALooper* looper, - ALooper_callbackFunc* callback, void* data) { - queue->attachLooper(looper, callback, data); + int ident, ALooper_callbackFunc* callback, void* data) { + queue->attachLooper(looper, ident, callback, data); } void AInputQueue_detachLooper(AInputQueue* queue) { |