commit ddbfdfa530a02e75402ff9c570c4420b94811b8e
author keunyoung <keunyoung@google.com> Tue Aug 13 00:07:22 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 13 00:08:15 2013 +0000
tree d6f68f98c91f68531ef7bb854961c07ab218f712
parent 51b4a40ef505962becb450f9f1b3170b11082dcb
parent 1eb0637f2a17362476a8876b4437f8a0c0783b86

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

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

diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 07e1e12..8de2fb0 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -10746,7 +10746,7 @@
         if (display == null) {
             throw new IllegalArgumentException("getDisplayContent: display must not be null");
         }
-        newDisplayContentLocked(display);
+        getDisplayContentLocked(display.getDisplayId());
     }
 
     /**