summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-06-29 12:17:20 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-06-29 12:17:20 -0700
commit78676fdee839e3a885502b500c4720325de4f81f (patch)
tree7c4db0fc94505652fcc5997ea249dab0018c4921 /libs
parentf79d3b8539dae3784f0a95093e332202b5bc5521 (diff)
parent9c7f8186aea675628894b8f3844f83e791870859 (diff)
downloadframeworks_native-78676fdee839e3a885502b500c4720325de4f81f.zip
frameworks_native-78676fdee839e3a885502b500c4720325de4f81f.tar.gz
frameworks_native-78676fdee839e3a885502b500c4720325de4f81f.tar.bz2
Merge "Update native activity & event APIs to follow correct conventions." into gingerbread
Diffstat (limited to 'libs')
-rw-r--r--libs/ui/InputTransport.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ui/InputTransport.cpp b/libs/ui/InputTransport.cpp
index f56537a..25def3c 100644
--- a/libs/ui/InputTransport.cpp
+++ b/libs/ui/InputTransport.cpp
@@ -691,7 +691,7 @@ void InputConsumer::populateMotionEvent(MotionEvent* motionEvent) const {
} // namespace android
-// --- input_queue_t ---
+// --- AInputQueue ---
using android::InputEvent;
using android::InputChannel;
@@ -699,13 +699,13 @@ using android::InputConsumer;
using android::sp;
using android::status_t;
-input_queue_t::input_queue_t(const sp<InputChannel>& channel) :
+AInputQueue::AInputQueue(const sp<InputChannel>& channel) :
mConsumer(channel) {
}
-input_queue_t::~input_queue_t() {
+AInputQueue::~AInputQueue() {
}
-status_t input_queue_t::consume(InputEvent** event) {
+status_t AInputQueue::consume(InputEvent** event) {
return mConsumer.consume(&mInputEventFactory, event);
}