commit 5923d161d0680a5ea107fa4104b0a6867237ba4a
author Chong Zhang <chz@google.com> Thu Aug 20 19:48:31 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 20 19:48:31 2015 +0000
tree a8b1cce63cf118db00cac9d71ea9e3ec5f0a0434
parent ce4fbb4da675c447ec839deaad05c0e88701bc2c
parent 0d38dc16a6a25c8285224c763fcc45121363b321

Merge "wm: call displayReady for all built in displays when system is ready."

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

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 85b2a41..97a38925 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -639,6 +639,7 @@
     final InputManagerService mInputManager;
     final DisplayManagerInternal mDisplayManagerInternal;
     final DisplayManager mDisplayManager;
+    final Display[] mDisplays;
 
     // Who is holding the screen on.
     Session mHoldingScreenOn;
@@ -851,8 +852,8 @@
 
         mFxSession = new SurfaceSession();
         mDisplayManager = (DisplayManager)context.getSystemService(Context.DISPLAY_SERVICE);
-        Display[] displays = mDisplayManager.getDisplays();
-        for (Display display : displays) {
+        mDisplays = mDisplayManager.getDisplays();
+        for (Display display : mDisplays) {
             createDisplayContentLocked(display);
         }
 
@@ -7599,7 +7600,9 @@
     }
 
     public void displayReady() {
-        displayReady(Display.DEFAULT_DISPLAY);
+        for (Display display : mDisplays) {
+            displayReady(display.getDisplayId());
+        }
 
         synchronized(mWindowMap) {
             final DisplayContent displayContent = getDefaultDisplayContentLocked();