summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcodeworkx <daniel.hillenbrand@codeworkx.de>2012-07-08 10:40:02 +0400
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-07-08 10:40:02 +0400
commit293c5f13e497f7d399e3b8e136d0a00ff653bc37 (patch)
treeb82e9b1d413acf426b2f0aac6e8ba925751ed236
parent38220edd314d82c269132a735c89ac22c3472893 (diff)
parent6b07b7231aee8059536be70b8237aa04f9fbded8 (diff)
downloadframeworks_base-293c5f13e497f7d399e3b8e136d0a00ff653bc37.zip
frameworks_base-293c5f13e497f7d399e3b8e136d0a00ff653bc37.tar.gz
frameworks_base-293c5f13e497f7d399e3b8e136d0a00ff653bc37.tar.bz2
Merge "input: fix recents opening when waking the device with the home button without lockscreen" into ics
-rw-r--r--services/input/InputDispatcher.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp
index 652166d..0dad55a 100644
--- a/services/input/InputDispatcher.cpp
+++ b/services/input/InputDispatcher.cpp
@@ -265,7 +265,7 @@ void InputDispatcher::dispatchOnceInnerLocked(nsecs_t* nextWakeupTime) {
// Reset the key repeat timer whenever we disallow key events, even if the next event
// is not a key. This is to ensure that we abort a key repeat if the device is just coming
// out of sleep.
- if (!mPolicy->isKeyRepeatEnabled()) {
+ if (!mPolicy->isKeyRepeatEnabled() || !mDispatchEnabled) {
resetKeyRepeatLocked();
}