Merge "Fixing possible race condition."

2011-02-06 09:06:35 -08:00
parent c94a99987d 06e57b5d46
commit bb2e1ef87f
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 {