commit 00ba884436dc8b222ad850c73c936d87bf4e84de
author Jeff Brown <jeffbrown@google.com> Fri Jul 16 15:01:56 2010 -0700
committer Jeff Brown <jeffbrown@google.com> Fri Jul 16 15:11:24 2010 -0700
tree ca4d18c6f004cf59a54508fa4e99f01f81e8753e
parent e068b46408f3ff390b47dc78ccf10fab76883051

Fix individual pointer id up/down reporting.

Fix a minor threading bug in InputManager dump.

Change-Id: Ic2eecf7df5a8dc9f40561fcb03ebe58a2c073778

services/jni/com_android_server_InputManager.cpp

diff --git a/services/jni/com_android_server_InputManager.cpp b/services/jni/com_android_server_InputManager.cpp
index f19f1ec..0992b33 100644
--- a/services/jni/com_android_server_InputManager.cpp
+++ b/services/jni/com_android_server_InputManager.cpp
@@ -410,7 +410,11 @@
 String8 NativeInputManager::dump() {
     String8 dump;
     dump.append("Native Input Dispatcher State:\n");
-    dumpDispatchStateLd(dump);
+
+    { // acquire lock
+        AutoMutex _l(mDisplayLock);
+        dumpDispatchStateLd(dump);
+    } // release lock
     return dump;
 }
 
@@ -984,8 +988,8 @@
 
         mTempTouchedWallpaperChannels.clear();
 
-        if (hadFocusedWindow && ! mFocusedWindow
-                || mFocusedWindow && ! mFocusedWindow->visible) {
+        if ((hadFocusedWindow && ! mFocusedWindow)
+                || (mFocusedWindow && ! mFocusedWindow->visible)) {
             preemptInputDispatch();
         }