am 4b20d402: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev

* commit '4b20d40218a25adcad21cc135a3103b4e04940f3':
  Only mark repeated keys as PASS_TO_USER if the original key was.
This commit is contained in:
Michael Wright 2014-09-26 05:10:08 +00:00 committed by Android Git Automerger
commit 2344006b6e

View File

@ -653,8 +653,8 @@ InputDispatcher::KeyEntry* InputDispatcher::synthesizeKeyRepeatLocked(nsecs_t cu
KeyEntry* entry = mKeyRepeatState.lastKeyEntry; KeyEntry* entry = mKeyRepeatState.lastKeyEntry;
// Reuse the repeated key entry if it is otherwise unreferenced. // Reuse the repeated key entry if it is otherwise unreferenced.
uint32_t policyFlags = (entry->policyFlags & POLICY_FLAG_RAW_MASK) uint32_t policyFlags = entry->policyFlags &
| POLICY_FLAG_PASS_TO_USER | POLICY_FLAG_TRUSTED; (POLICY_FLAG_RAW_MASK | POLICY_FLAG_PASS_TO_USER | POLICY_FLAG_TRUSTED);
if (entry->refCount == 1) { if (entry->refCount == 1) {
entry->recycle(); entry->recycle();
entry->eventTime = currentTime; entry->eventTime = currentTime;