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/sensor.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/sensor.cpp')
| -rw-r--r-- | native/android/sensor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/native/android/sensor.cpp b/native/android/sensor.cpp index db534e0..cf7635d 100644 --- a/native/android/sensor.cpp +++ b/native/android/sensor.cpp @@ -60,12 +60,12 @@ ASensor const* ASensorManager_getDefaultSensor(ASensorManager* manager, int type } ASensorEventQueue* ASensorManager_createEventQueue(ASensorManager* manager, - ALooper* looper, ALooper_callbackFunc* callback, void* data) + ALooper* looper, int ident, ALooper_callbackFunc* callback, void* data) { sp<SensorEventQueue> queue = static_cast<SensorManager*>(manager)->createEventQueue(); if (queue != 0) { - ALooper_addFd(looper, queue->getFd(), POLLIN, callback, data); + ALooper_addFd(looper, queue->getFd(), ident, POLLIN, callback, data); queue->looper = looper; queue->incStrong(manager); } |