From c393eb6cf5f5685d4dc1ddaa04136475536acccf Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Wed, 30 Jun 2010 14:41:59 -0700 Subject: [PATCH] Fix injection of specially intercepted keys like HOME. This change mainly unwinds a premature optimization in the dispatch pipeline. To test HOME injection, run 'adb shell input keyevent 3'. Change-Id: I1c4b7377c205da7c898014b8b07fc6dc1d46e4dd --- include/ui/Input.h | 3 --- include/ui/InputReader.h | 4 ---- libs/ui/InputReader.cpp | 4 ---- 3 files changed, 11 deletions(-) diff --git a/include/ui/Input.h b/include/ui/Input.h index 214f587c7..a2e0ba06a 100644 --- a/include/ui/Input.h +++ b/include/ui/Input.h @@ -87,9 +87,6 @@ enum { // Indicates that the screen was dim when the event was received and the event // should brighten the device. POLICY_FLAG_BRIGHT_HERE = 0x20000000, - - // Indicates that the dispatcher should call back into the policy before dispatching. */ - POLICY_FLAG_INTERCEPT_DISPATCH = 0x40000000, }; /* diff --git a/include/ui/InputReader.h b/include/ui/InputReader.h index 8f6777d10..781da356a 100644 --- a/include/ui/InputReader.h +++ b/include/ui/InputReader.h @@ -371,10 +371,6 @@ public: // The input dispatcher should add POLICY_FLAG_BRIGHT_HERE to the policy flags it // passes through the dispatch pipeline. ACTION_BRIGHT_HERE = 0x00000008, - - // The input dispatcher should add POLICY_FLAG_INTERCEPT_DISPATCH to the policy flags - // it passed through the dispatch pipeline. - ACTION_INTERCEPT_DISPATCH = 0x00000010 }; /* Describes a virtual key. */ diff --git a/libs/ui/InputReader.cpp b/libs/ui/InputReader.cpp index 217c59703..899027c9b 100644 --- a/libs/ui/InputReader.cpp +++ b/libs/ui/InputReader.cpp @@ -1639,10 +1639,6 @@ bool InputReader::applyStandardInputDispatchPolicyActions(nsecs_t when, *policyFlags |= POLICY_FLAG_BRIGHT_HERE; } - if (policyActions & InputReaderPolicyInterface::ACTION_INTERCEPT_DISPATCH) { - *policyFlags |= POLICY_FLAG_INTERCEPT_DISPATCH; - } - return policyActions & InputReaderPolicyInterface::ACTION_DISPATCH; }