Merge "fix race condition when a new display is added" into klp-dev

2013-08-13 00:07:22 +00:00
parent 51b4a40ef5 1eb0637f2a
commit ddbfdfa530
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());
    }

    /**