Merge "Only set KeyEvent long press flag when repeat count equals 1." (82c67db3) · Commits · e / os / android_frameworks_base

services/input/InputDispatcher.cpp

+6 −4

Original line number	Diff line number	Diff line
		@@ -699,10 +699,6 @@ InputDispatcher::KeyEntry* InputDispatcher::synthesizeKeyRepeatLocked(
		// mKeyRepeatState.lastKeyEntry in addition to the one we return.
		entry->refCount += 1;

		if (entry->repeatCount == 1) {
		entry->flags \|= AKEY_EVENT_FLAG_LONG_PRESS;
		}

		mKeyRepeatState.nextRepeatTime = currentTime + keyRepeatDelay;
		return entry;
		}
		@@ -752,6 +748,12 @@ bool InputDispatcher::dispatchKeyLocked(
		resetKeyRepeatLocked();
		}

		if (entry->repeatCount == 1) {
		entry->flags \|= AKEY_EVENT_FLAG_LONG_PRESS;
		} else {
		entry->flags &= ~AKEY_EVENT_FLAG_LONG_PRESS;
		}

		entry->dispatchInProgress = true;
		resetTargetsLocked();