commit 2e732956adffbdf37374115d52646ddae9498a96
author Michael Wright <michaelwr@google.com> Wed Sep 24 13:26:59 2014 -0700
committer Michael Wright <michaelwr@google.com> Thu Sep 25 13:20:20 2014 -0700
tree 5f18b9f5b8b8164e6614f7ed5c7fb886fd17fcbc
parent 5105960d49bfa86efeeea8f87c87aa96b5771c37

Only mark repeated keys as PASS_TO_USER if the original key was.

Bug: 17629695
Change-Id: Ic569aba4149c6cc321c2cf8aede7c5e8a1196234

services/inputflinger/InputDispatcher.cpp

diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp
index ce14f99..2b5e744 100644
--- a/services/inputflinger/InputDispatcher.cpp
+++ b/services/inputflinger/InputDispatcher.cpp
@@ -653,8 +653,8 @@
     KeyEntry* entry = mKeyRepeatState.lastKeyEntry;
 
     // Reuse the repeated key entry if it is otherwise unreferenced.
-    uint32_t policyFlags = (entry->policyFlags & POLICY_FLAG_RAW_MASK)
-            | POLICY_FLAG_PASS_TO_USER | POLICY_FLAG_TRUSTED;
+    uint32_t policyFlags = entry->policyFlags &
+            (POLICY_FLAG_RAW_MASK | POLICY_FLAG_PASS_TO_USER | POLICY_FLAG_TRUSTED);
     if (entry->refCount == 1) {
         entry->recycle();
         entry->eventTime = currentTime;