diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-07 18:52:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-07 18:52:06 -0700 |
| commit | 347262622b86410ff8a4ff3530ab3688b6a20b21 (patch) | |
| tree | f596d33ff54ab5169a7c52e19319b63d0e200e63 /include/android_runtime | |
| parent | 7dea769319701f4e883fc448507967b806b9b245 (diff) | |
| parent | a1205f07a6f0c745e8f42f16fe38c06af04143c7 (diff) | |
| download | frameworks_base-347262622b86410ff8a4ff3530ab3688b6a20b21.zip frameworks_base-347262622b86410ff8a4ff3530ab3688b6a20b21.tar.gz frameworks_base-347262622b86410ff8a4ff3530ab3688b6a20b21.tar.bz2 | |
am a1205f07: am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread
Merge commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7'
* commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7':
Modify native ALooper to take an explicit ident.
Diffstat (limited to 'include/android_runtime')
| -rw-r--r-- | include/android_runtime/android_app_NativeActivity.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/android_runtime/android_app_NativeActivity.h b/include/android_runtime/android_app_NativeActivity.h index c388ba8..fdceb84 100644 --- a/include/android_runtime/android_app_NativeActivity.h +++ b/include/android_runtime/android_app_NativeActivity.h @@ -69,7 +69,7 @@ public: /* Destroys the consumer and releases its input channel. */ ~AInputQueue(); - void attachLooper(ALooper* looper, ALooper_callbackFunc* callback, void* data); + void attachLooper(ALooper* looper, int ident, ALooper_callbackFunc* callback, void* data); void detachLooper(); |