diff options
| author | 2015-10-12 16:09:46 +0000 | |
|---|---|---|
| committer | 2015-10-12 16:09:46 +0000 | |
| commit | 0416695348eae12cae0baa5adee65004d0caabe5 (patch) | |
| tree | e1f2a0c1a2468706b72521e5e0fe23fceaf4d995 | |
| parent | ef2f659641d3eec9129ad726176c27818cc9d4d0 (diff) | |
| parent | 6be61a98fccbadfdcfcefe9aa51d90bfb6c13901 (diff) | |
am 6be61a98: wm: call displayReady for all built in displays when system is ready.
* commit '6be61a98fccbadfdcfcefe9aa51d90bfb6c13901':
wm: call displayReady for all built in displays when system is ready.
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 2166e7e8a843..69ba7241f4a0 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -642,6 +642,7 @@ public class WindowManagerService extends IWindowManager.Stub final InputManagerService mInputManager; final DisplayManagerInternal mDisplayManagerInternal; final DisplayManager mDisplayManager; + final Display[] mDisplays; // Who is holding the screen on. Session mHoldingScreenOn; @@ -915,8 +916,8 @@ public class WindowManagerService extends IWindowManager.Stub 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); } @@ -7635,7 +7636,9 @@ public class WindowManagerService extends IWindowManager.Stub } public void displayReady() { - displayReady(Display.DEFAULT_DISPLAY); + for (Display display : mDisplays) { + displayReady(display.getDisplayId()); + } synchronized(mWindowMap) { final DisplayContent displayContent = getDefaultDisplayContentLocked(); |