summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorVinu Deokaran <vinud@codeaurora.org>2014-12-16 10:52:52 -0500
committerWale Ogunwale <ogunwale@google.com>2015-10-12 16:00:54 +0000
commit6be61a98fccbadfdcfcefe9aa51d90bfb6c13901 (patch)
tree34858c65b2a334585c8bd8ff8f395b125852ae1f /services
parentac3b53a734df0ec994d6068b7c0331da1fa0aa80 (diff)
downloadframeworks_base-6be61a98fccbadfdcfcefe9aa51d90bfb6c13901.zip
frameworks_base-6be61a98fccbadfdcfcefe9aa51d90bfb6c13901.tar.gz
frameworks_base-6be61a98fccbadfdcfcefe9aa51d90bfb6c13901.tar.bz2
wm: call displayReady for all built in displays when system is ready.
When system has more than one built in display, displayReady needs to be called for all built in displays when window manager is ready. Otherwise, some system services, such as presentation, mediarouter, etc, won't work on these displays. Bug: 24103683 Change-Id: Ibf08074eff555c14a318236bd06e7b4855503140
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java9
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 e903e4f..71bbdb6 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);
}
@@ -7641,7 +7642,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();