diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-10-27 22:18:43 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2010-10-27 22:18:43 -0700 |
| commit | 88e7b31ba1447e98f65e4d2939dbf66268c75e35 (patch) | |
| tree | 3a0a704cb26ccd2cc397506a54e637637b718107 /include/ui | |
| parent | a80d256d04146cfc0a56a0e08666c53728df596a (diff) | |
| parent | df3cccf3dc6b59ec4a45d80fb483022360e13830 (diff) | |
| download | frameworks_base-88e7b31ba1447e98f65e4d2939dbf66268c75e35.zip frameworks_base-88e7b31ba1447e98f65e4d2939dbf66268c75e35.tar.gz frameworks_base-88e7b31ba1447e98f65e4d2939dbf66268c75e35.tar.bz2 | |
resolved conflicts for merge of df3cccf3 to master
Change-Id: I425496a9fc4e9cbc50ad6938e9dccb14827d9558
Diffstat (limited to 'include/ui')
| -rw-r--r-- | include/ui/InputDispatcher.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/ui/InputDispatcher.h b/include/ui/InputDispatcher.h index 738f62a..a5591ba 100644 --- a/include/ui/InputDispatcher.h +++ b/include/ui/InputDispatcher.h @@ -1046,6 +1046,9 @@ private: // Splitting motion events across windows. MotionEntry* splitMotionEvent(const MotionEntry* originalMotionEntry, BitSet32 pointerIds); + // Reset and drop everything the dispatcher is doing. + void resetAndDropEverythingLocked(const char* reason); + // Dump state. void dumpDispatchStateLocked(String8& dump); void logDispatchStateLocked(); |