commit 5994359f3009a3ebfbd37d82bb9a665e9b947851
author Chris Tate <ctate@google.com> Mon Oct 11 20:33:44 2010 -0700
committer Chris Tate <ctate@google.com> Mon Oct 11 20:58:07 2010 -0700
tree e47c94c1f106238a7a1d4311214cfde4deeadf13
parent 26b6df74b9bcc693a5b57347d427b352cdc0541a

Be sure to hold the window manager lock around *Lw() methods

Change-Id: Ia0271df34b084bf1d3dc39373dd66b6afe96c379

services/java/com/android/server/WindowManagerService.java

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 7a9a6a2..8be980f 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -804,7 +804,9 @@
 
                         // stop intercepting input
                         mDragState.unregister();
-                        mInputMonitor.updateInputWindowsLw();
+                        synchronized (mWindowMap) {
+                            mInputMonitor.updateInputWindowsLw();
+                        }
 
                         // free our resources and drop all the object references
                         mDragState.reset();