summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2012-02-06 16:31:05 -0800
committer Jeff Brown <jeffbrown@google.com> 2012-02-13 10:28:41 -0800
commit8b4be56030c3b8c93dfa45bccac7365f90f377ce (patch)
tree18388eb8a60024a2b566e27fb62d39f3f3e69037
parent28b5cf1c33df847d667b8974ba07c4157a49b48a (diff)
Delete premature optimization.
This is part of a series of changes to improve input system pipelining. Bug: 5963420 Change-Id: I5c182f6e17d468bf3033125b2094b2baa5b94e81
-rw-r--r--services/input/InputDispatcher.cpp12
-rw-r--r--services/input/InputDispatcher.h2
2 files changed, 6 insertions, 8 deletions
diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp
index 436831f38d9f..9da709d65abe 100644
--- a/services/input/InputDispatcher.cpp
+++ b/services/input/InputDispatcher.cpp
@@ -2076,19 +2076,19 @@ void InputDispatcher::synthesizeCancelationEventsForConnectionLocked(
nsecs_t currentTime = now();
- mTempCancelationEvents.clear();
+ Vector<EventEntry*> cancelationEvents;
connection->inputState.synthesizeCancelationEvents(currentTime,
- mTempCancelationEvents, options);
+ cancelationEvents, options);
- if (!mTempCancelationEvents.isEmpty()) {
+ if (!cancelationEvents.isEmpty()) {
#if DEBUG_OUTBOUND_EVENT_DETAILS
ALOGD("channel '%s' ~ Synthesized %d cancelation events to bring channel back in sync "
"with reality: %s, mode=%d.",
- connection->getInputChannelName(), mTempCancelationEvents.size(),
+ connection->getInputChannelName(), cancelationEvents.size(),
options.reason, options.mode);
#endif
- for (size_t i = 0; i < mTempCancelationEvents.size(); i++) {
- EventEntry* cancelationEventEntry = mTempCancelationEvents.itemAt(i);
+ for (size_t i = 0; i < cancelationEvents.size(); i++) {
+ EventEntry* cancelationEventEntry = cancelationEvents.itemAt(i);
switch (cancelationEventEntry->type) {
case EventEntry::TYPE_KEY:
logOutboundKeyDetailsLocked("cancel - ",
diff --git a/services/input/InputDispatcher.h b/services/input/InputDispatcher.h
index d6eab5af019b..70d4546ec059 100644
--- a/services/input/InputDispatcher.h
+++ b/services/input/InputDispatcher.h
@@ -814,8 +814,6 @@ private:
Queue<EventEntry> mInboundQueue;
Queue<CommandEntry> mCommandQueue;
- Vector<EventEntry*> mTempCancelationEvents;
-
void dispatchOnceInnerLocked(nsecs_t* nextWakeupTime);
// Enqueues an inbound event. Returns true if mLooper->wake() should be called.