am 432ab6ac: am 6b497a04: am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."

* commit '432ab6ac04f22a5e4c15aece04117b35bbf8869c':
  Fixing possible race condition.

1 files changed, 1 insertions, 2 deletions

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 6aaee6c9b455..b7a276f76570 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -930,9 +930,8 @@ public class WindowManagerService extends IWindowManager.Stub
                 } catch (InterruptedException e) {
                 }
             }
+            return thr.mService;
         }
-
-        return thr.mService;
     }
 
     static class WMThread extends Thread {