am bb2e1ef8: Merge "Fixing possible race condition."

* commit 'bb2e1ef87fe4c5123340035766c759155e6bb90c': Fixing possible race condition.
2011-02-07 07:33:38 -08:00
parent d2a996173e bb2e1ef87f
commit 4b7c1cacca
1 changed files with 1 additions and 2 deletions
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -522,9 +522,8 @@ public class WindowManagerService extends IWindowManager.Stub
                } catch (InterruptedException e) {
                }
            }
+            return thr.mService;
        }
-
-        return thr.mService;
    }

    static class WMThread extends Thread {