commit bb2e1ef87fe4c5123340035766c759155e6bb90c
author Dianne Hackborn <hackbod@android.com> Sun Feb 06 09:06:35 2011 -0800
committer Android Code Review <code-review@android.com> Sun Feb 06 09:06:35 2011 -0800
tree 6b0625171227e583202926cbebd0f756768a87fd
parent c94a99987d8a49ea599c22ffad0e61db591963e0
parent 06e57b5d46c87e9dd7bca1386b63b3a8522f51ef

Merge "Fixing possible race condition."

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

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index f605c11..5b236a7 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -522,9 +522,8 @@
                 } catch (InterruptedException e) {
                 }
             }
+            return thr.mService;
         }
-
-        return thr.mService;
     }
 
     static class WMThread extends Thread {