Merge change Iad66a274 into eclair

* changes:
  Fix race condition in WindowManagerService.disableKeyguard()

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

@@ -3971,7 +3971,9 @@ public class WindowManagerService extends IWindowManager.Stub
             != PackageManager.PERMISSION_GRANTED) {
             throw new SecurityException("Requires DISABLE_KEYGUARD permission");
         }
-        mKeyguardDisabled.acquire(token, tag);
+        synchronized (mKeyguardDisabled) {
+            mKeyguardDisabled.acquire(token, tag);
+        }
     }
 
     public void reenableKeyguard(IBinder token) {