diff options
| author | 2013-08-12 18:11:31 -0700 | |
|---|---|---|
| committer | 2013-08-12 18:11:31 -0700 | |
| commit | 72d29c2d0d062122710e4d3d4eed68f04be3b275 (patch) | |
| tree | 2e3633a0f6e2d7ea33d9a9fa60a9bd7c906612a5 | |
| parent | aad62128100f0c1562f9c61a721b703480ed3772 (diff) | |
| parent | ddbfdfa530a02e75402ff9c570c4420b94811b8e (diff) | |
am ddbfdfa5: Merge "fix race condition when a new display is added" into klp-dev
* commit 'ddbfdfa530a02e75402ff9c570c4420b94811b8e':
fix race condition when a new display is added
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 07e1e12cf39f..8de2fb0e91ff 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -10746,7 +10746,7 @@ public class WindowManagerService extends IWindowManager.Stub if (display == null) { throw new IllegalArgumentException("getDisplayContent: display must not be null"); } - newDisplayContentLocked(display); + getDisplayContentLocked(display.getDisplayId()); } /** |