diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-14 15:27:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-14 15:27:33 -0700 |
| commit | 09340a4bb99507d9b6bfbfc68a450d4d4f354d73 (patch) | |
| tree | 603df9bc5628adab2095e8d90014e71d84690d51 /include/android_runtime/android_app_NativeActivity.h | |
| parent | b3ffc78f3432344702e6f5232067ab624083cad2 (diff) | |
| parent | 4fe6c3e51be77e35f40872cdbca6c80f8f8b7ecb (diff) | |
| download | frameworks_base-09340a4bb99507d9b6bfbfc68a450d4d4f354d73.zip frameworks_base-09340a4bb99507d9b6bfbfc68a450d4d4f354d73.tar.gz frameworks_base-09340a4bb99507d9b6bfbfc68a450d4d4f354d73.tar.bz2 | |
Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
Diffstat (limited to 'include/android_runtime/android_app_NativeActivity.h')
| -rw-r--r-- | include/android_runtime/android_app_NativeActivity.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/android_runtime/android_app_NativeActivity.h b/include/android_runtime/android_app_NativeActivity.h index fdceb84..b49e02a 100644 --- a/include/android_runtime/android_app_NativeActivity.h +++ b/include/android_runtime/android_app_NativeActivity.h @@ -18,6 +18,7 @@ #define _ANDROID_APP_NATIVEACTIVITY_H #include <ui/InputTransport.h> +#include <utils/Looper.h> #include <android/native_activity.h> @@ -69,7 +70,7 @@ public: /* Destroys the consumer and releases its input channel. */ ~AInputQueue(); - void attachLooper(ALooper* looper, int ident, ALooper_callbackFunc* callback, void* data); + void attachLooper(ALooper* looper, int ident, ALooper_callbackFunc callback, void* data); void detachLooper(); @@ -103,7 +104,7 @@ private: void wakeupDispatch(); android::InputConsumer mConsumer; - android::sp<android::PollLoop> mPollLoop; + android::sp<android::Looper> mLooper; int mDispatchKeyRead; int mDispatchKeyWrite; |