Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chong Zhang
2015-08-20 19:48:31 +00:00
committed by Gerrit Code Review
parent ce4fbb4da6 0d38dc16a6
commit 5923d161d0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -639,6 +639,7 @@ public class WindowManagerService extends IWindowManager.Stub
final InputManagerService mInputManager; final InputManagerService mInputManager;
final DisplayManagerInternal mDisplayManagerInternal; final DisplayManagerInternal mDisplayManagerInternal;
final DisplayManager mDisplayManager; final DisplayManager mDisplayManager;
final Display[] mDisplays;
// Who is holding the screen on. // Who is holding the screen on.
Session mHoldingScreenOn; Session mHoldingScreenOn;
@@ -851,8 +852,8 @@ public class WindowManagerService extends IWindowManager.Stub
mFxSession = new SurfaceSession(); mFxSession = new SurfaceSession();
mDisplayManager = (DisplayManager)context.getSystemService(Context.DISPLAY_SERVICE); mDisplayManager = (DisplayManager)context.getSystemService(Context.DISPLAY_SERVICE);
Display[] displays = mDisplayManager.getDisplays(); mDisplays = mDisplayManager.getDisplays();
for (Display display : displays) { for (Display display : mDisplays) {
createDisplayContentLocked(display); createDisplayContentLocked(display);
} }
@@ -7599,7 +7600,9 @@ public class WindowManagerService extends IWindowManager.Stub
} }
public void displayReady() { public void displayReady() {
displayReady(Display.DEFAULT_DISPLAY); for (Display display : mDisplays) {
displayReady(display.getDisplayId());
}
synchronized(mWindowMap) { synchronized(mWindowMap) {
final DisplayContent displayContent = getDefaultDisplayContentLocked(); final DisplayContent displayContent = getDefaultDisplayContentLocked();