diff options
| author | Michael Wright <michaelwr@google.com> | 2015-06-10 17:32:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-10 17:32:41 +0000 |
| commit | f8b34319a4c1ccce63b5a8e4732f162d228085cb (patch) | |
| tree | 7f6a425b7d85dbb4b6b3e93623a1e1aedfe74a9b /services/inputflinger | |
| parent | 78c8a7005c0f4d6c57d3f6be176574408aedf063 (diff) | |
| parent | 043bd36b0d50efa81d010c64009317af160d5fec (diff) | |
| download | frameworks_native-f8b34319a4c1ccce63b5a8e4732f162d228085cb.zip frameworks_native-f8b34319a4c1ccce63b5a8e4732f162d228085cb.tar.gz frameworks_native-f8b34319a4c1ccce63b5a8e4732f162d228085cb.tar.bz2 | |
am 043bd36b: Merge "Only log dropped input when disabled for the first event." into mnc-dev
* commit '043bd36b0d50efa81d010c64009317af160d5fec':
Only log dropped input when disabled for the first event.
Diffstat (limited to 'services/inputflinger')
| -rw-r--r-- | services/inputflinger/InputDispatcher.cpp | 8 | ||||
| -rw-r--r-- | services/inputflinger/InputDispatcher.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp index a87cc77..ffaa7e7 100644 --- a/services/inputflinger/InputDispatcher.cpp +++ b/services/inputflinger/InputDispatcher.cpp @@ -201,7 +201,8 @@ static void dumpRegion(String8& dump, const Region& region) { InputDispatcher::InputDispatcher(const sp<InputDispatcherPolicyInterface>& policy) : mPolicy(policy), - mPendingEvent(NULL), mAppSwitchSawKeyDown(false), mAppSwitchDueTime(LONG_LONG_MAX), + mPendingEvent(NULL), mLastDropReason(DROP_REASON_NOT_DROPPED), + mAppSwitchSawKeyDown(false), mAppSwitchDueTime(LONG_LONG_MAX), mNextUnblockedEvent(NULL), mDispatchEnabled(false), mDispatchFrozen(false), mInputFilterEnabled(false), mInputTargetWaitCause(INPUT_TARGET_WAIT_CAUSE_NONE) { @@ -397,6 +398,7 @@ void InputDispatcher::dispatchOnceInnerLocked(nsecs_t* nextWakeupTime) { if (dropReason != DROP_REASON_NOT_DROPPED) { dropInboundEventLocked(mPendingEvent, dropReason); } + mLastDropReason = dropReason; releasePendingEventLocked(); *nextWakeupTime = LONG_LONG_MIN; // force next poll to wake up immediately @@ -506,7 +508,9 @@ void InputDispatcher::dropInboundEventLocked(EventEntry* entry, DropReason dropR reason = "inbound event was dropped because the policy consumed it"; break; case DROP_REASON_DISABLED: - ALOGI("Dropped event because input dispatch is disabled."); + if (mLastDropReason != DROP_REASON_DISABLED) { + ALOGI("Dropped event because input dispatch is disabled."); + } reason = "inbound event was dropped because input dispatch is disabled"; break; case DROP_REASON_APP_SWITCH: diff --git a/services/inputflinger/InputDispatcher.h b/services/inputflinger/InputDispatcher.h index 9a340c9..80eed56 100644 --- a/services/inputflinger/InputDispatcher.h +++ b/services/inputflinger/InputDispatcher.h @@ -857,6 +857,8 @@ private: Queue<EventEntry> mRecentQueue; Queue<CommandEntry> mCommandQueue; + DropReason mLastDropReason; + void dispatchOnceInnerLocked(nsecs_t* nextWakeupTime); // Enqueues an inbound event. Returns true if mLooper->wake() should be called. |