am d08e4300: am 7efe9f67: am 5923d161: Merge "wm: call displayReady for all... (83fce9fc) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -597,6 +597,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;
		@@ -870,8 +871,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);
		}

		@@ -7003,7 +7004,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();