diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-08-15 13:09:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-15 13:09:08 -0700 |
| commit | b2a85b69ce98a312c450849dfd18bd1f878b5d66 (patch) | |
| tree | 7b918488ab5291135995255070e5562141923be9 | |
| parent | 154aa355f0ed0374a4b4db222419639ec1a385fe (diff) | |
| parent | abb4d446a10b2defd342b1a2fa6462b52b82cdef (diff) | |
| download | frameworks_base-b2a85b69ce98a312c450849dfd18bd1f878b5d66.zip frameworks_base-b2a85b69ce98a312c450849dfd18bd1f878b5d66.tar.gz frameworks_base-b2a85b69ce98a312c450849dfd18bd1f878b5d66.tar.bz2 | |
Merge "Fix blocked event handling in InputDispatcher. Bug: 5161854"
| -rw-r--r-- | services/input/InputDispatcher.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp index 22372cf..cbdfe8c 100644 --- a/services/input/InputDispatcher.cpp +++ b/services/input/InputDispatcher.cpp @@ -666,6 +666,9 @@ void InputDispatcher::releaseInboundEventLocked(EventEntry* entry) { #endif setInjectionResultLocked(entry, INPUT_EVENT_INJECTION_FAILED); } + if (entry == mNextUnblockedEvent) { + mNextUnblockedEvent = NULL; + } entry->release(); } |