ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am f8b34319: am 043bd36b: Merge "Only log dropped input when disabled for the first event." into mnc-dev

Browse Source 
* commit 'f8b34319a4c1ccce63b5a8e4732f162d228085cb':
  Only log dropped input when disabled for the first event.
This commit is contained in:
Michael Wright 2015-06-10 17:47:58 +00:00 committed by Android Git Automerger
commit a393c62f22
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/inputflinger/InputDispatcher.cpp
View File

@ -201,7 +201,8 @@ static void dumpRegion(String8& dump, const Region& region) {
InputDispatcher::InputDispatcher(const sp<InputDispatcherPolicyInterface>& policy) : InputDispatcher::InputDispatcher(const sp<InputDispatcherPolicyInterface>& policy) :
mPolicy(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), mNextUnblockedEvent(NULL),
mDispatchEnabled(false), mDispatchFrozen(false), mInputFilterEnabled(false), mDispatchEnabled(false), mDispatchFrozen(false), mInputFilterEnabled(false),
mInputTargetWaitCause(INPUT_TARGET_WAIT_CAUSE_NONE) { mInputTargetWaitCause(INPUT_TARGET_WAIT_CAUSE_NONE) {
@ -397,6 +398,7 @@ void InputDispatcher::dispatchOnceInnerLocked(nsecs_t* nextWakeupTime) {
if (dropReason != DROP_REASON_NOT_DROPPED) { if (dropReason != DROP_REASON_NOT_DROPPED) {
dropInboundEventLocked(mPendingEvent, dropReason); dropInboundEventLocked(mPendingEvent, dropReason);
} }
mLastDropReason = dropReason;
releasePendingEventLocked(); releasePendingEventLocked();
*nextWakeupTime = LONG_LONG_MIN; // force next poll to wake up immediately *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"; reason = "inbound event was dropped because the policy consumed it";
break; break;
case DROP_REASON_DISABLED: 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"; reason = "inbound event was dropped because input dispatch is disabled";
break; break;
case DROP_REASON_APP_SWITCH: case DROP_REASON_APP_SWITCH:

2
services/inputflinger/InputDispatcher.h
View File

@ -857,6 +857,8 @@ private:
Queue<EventEntry> mRecentQueue; Queue<EventEntry> mRecentQueue;
Queue<CommandEntry> mCommandQueue; Queue<CommandEntry> mCommandQueue;
DropReason mLastDropReason;
void dispatchOnceInnerLocked(nsecs_t* nextWakeupTime); void dispatchOnceInnerLocked(nsecs_t* nextWakeupTime);
// Enqueues an inbound event. Returns true if mLooper->wake() should be called. // Enqueues an inbound event. Returns true if mLooper->wake() should be called.