diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-07-08 19:10:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-08 19:10:17 -0700 |
| commit | d8a6271bb1da4ee2a8ae126b532f1b5f302decb8 (patch) | |
| tree | 5de91054c0b6d73707104eb6ae30d0c612e94665 /native/android/input.cpp | |
| parent | 2a57917a5cc10cbfea9a2f7ed7b040ce80c6705b (diff) | |
| parent | 49159f0748c704e53a7bd754f26113d9ab844a97 (diff) | |
| download | frameworks_base-d8a6271bb1da4ee2a8ae126b532f1b5f302decb8.zip frameworks_base-d8a6271bb1da4ee2a8ae126b532f1b5f302decb8.tar.gz frameworks_base-d8a6271bb1da4ee2a8ae126b532f1b5f302decb8.tar.bz2 | |
am 49159f07: am 74bf59b4: Merge "Add new glue code for writing native apps." into gingerbread
Merge commit '49159f0748c704e53a7bd754f26113d9ab844a97'
* commit '49159f0748c704e53a7bd754f26113d9ab844a97':
Add new glue code for writing native apps.
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 015a1ce..89d53e2 100644 --- a/native/android/input.cpp +++ b/native/android/input.cpp @@ -186,9 +186,9 @@ float AMotionEvent_getHistoricalSize(AInputEvent* motion_event, size_t pointer_i } void AInputQueue_attachLooper(AInputQueue* queue, ALooper* looper, - ALooper_callbackFunc callback, void* data) { + ALooper_callbackFunc* callback, void* data) { queue->setPollLoop(static_cast<android::PollLoop*>(looper)); - ALooper_setCallback(looper, queue->getConsumer().getChannel()->getReceivePipeFd(), + ALooper_addFd(looper, queue->getConsumer().getChannel()->getReceivePipeFd(), POLLIN, callback, data); } |