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
2013-08-12 18:11:31 -07:00
parent aad6212810 ddbfdfa530
commit 72d29c2d0d
1 changed files with 1 additions and 1 deletions
--- 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());
    }

    /**