diff options
| author | Dianne Hackborn <hackbod@android.com> | 2011-02-07 07:33:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-07 07:33:38 -0800 |
| commit | 4b7c1cacca252f735d23f7e01885214630d83f32 (patch) | |
| tree | 75463e63d0cf4052d6edf62b6e649064b4d53ab5 /services | |
| parent | d2a996173e53e7b38ff9b703cc5986d9715508a1 (diff) | |
| parent | bb2e1ef87fe4c5123340035766c759155e6bb90c (diff) | |
| download | frameworks_base-4b7c1cacca252f735d23f7e01885214630d83f32.zip frameworks_base-4b7c1cacca252f735d23f7e01885214630d83f32.tar.gz frameworks_base-4b7c1cacca252f735d23f7e01885214630d83f32.tar.bz2 | |
am bb2e1ef8: Merge "Fixing possible race condition."
* commit 'bb2e1ef87fe4c5123340035766c759155e6bb90c':
Fixing possible race condition.
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/WindowManagerService.java | 3 |
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 51d6035..667b544 100644 --- 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 { |