summaryrefslogtreecommitdiffstats
path: root/libs/ui/InputReader.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-10-01 21:49:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-01 21:49:29 -0700
commit0f5f2e4c27612e2cda231473aec0c06838ff3750 (patch)
treee55ea53a7a492f40c19be493b6f063c8603e9b22 /libs/ui/InputReader.cpp
parent2874c3dec4f9ffd59b2be3de62c1148534396828 (diff)
parente11b76d3efb056edea301d53a354d0730adf3520 (diff)
downloadframeworks_base-0f5f2e4c27612e2cda231473aec0c06838ff3750.zip
frameworks_base-0f5f2e4c27612e2cda231473aec0c06838ff3750.tar.gz
frameworks_base-0f5f2e4c27612e2cda231473aec0c06838ff3750.tar.bz2
am e11b76d3: am f6295b35: Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread
Merge commit 'e11b76d3efb056edea301d53a354d0730adf3520' * commit 'e11b76d3efb056edea301d53a354d0730adf3520': Minor logging changes to input dispatcher to help with debugging.
Diffstat (limited to 'libs/ui/InputReader.cpp')
-rw-r--r--libs/ui/InputReader.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/ui/InputReader.cpp b/libs/ui/InputReader.cpp
index 825febc..ea05f5c 100644
--- a/libs/ui/InputReader.cpp
+++ b/libs/ui/InputReader.cpp
@@ -575,6 +575,11 @@ bool InputReader::markSupportedKeyCodes(int32_t deviceId, uint32_t sourceMask, s
}
void InputReader::dump(String8& dump) {
+ mEventHub->dump(dump);
+ dump.append("\n");
+
+ dump.append("Input Reader State:\n");
+
{ // acquire device registry reader lock
RWLock::AutoRLock _rl(mDeviceRegistryLock);
@@ -861,7 +866,6 @@ void KeyboardInputMapper::dump(String8& dump) {
AutoMutex _l(mLock);
dump.append(INDENT2 "Keyboard Input Mapper:\n");
dump.appendFormat(INDENT3 "AssociatedDisplayId: %d\n", mAssociatedDisplayId);
- dump.appendFormat(INDENT3 "Sources: 0x%x\n", mSources);
dump.appendFormat(INDENT3 "KeyboardType: %d\n", mKeyboardType);
dump.appendFormat(INDENT3 "KeyDowns: %d keys currently down\n", mLocked.keyDowns.size());
dump.appendFormat(INDENT3 "MetaState: 0x%0x\n", mLocked.metaState);