From 5994359f3009a3ebfbd37d82bb9a665e9b947851 Mon Sep 17 00:00:00 2001
From: Chris Tate <ctate@google.com>
Date: Mon, 11 Oct 2010 20:33:44 -0700
Subject: [PATCH] Be sure to hold the window manager lock around *Lw() methods

Change-Id: Ia0271df34b084bf1d3dc39373dd66b6afe96c379
---
 services/java/com/android/server/WindowManagerService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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