resolve merge conflicts of 76ce8e5 to stage-aosp-master am: ed935c32f4 am: ef57a0d629 (671cb4ba) · Commits · e / os / android_frameworks_base

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

+30 −34

Original line number	Diff line number	Diff line
		@@ -1462,7 +1462,7 @@ class WindowSurfacePlacer {
		mObscured = true;
		}

		if (w.mHasSurface) {
		if (w.mHasSurface && canBeSeen) {
		if ((attrFlags&FLAG_KEEP_SCREEN_ON) != 0) {
		mHoldScreen = w.mSession;
		mHoldScreenWindow = w;
		@@ -1485,14 +1485,11 @@ class WindowSurfacePlacer {
		}

		final int type = attrs.type;
		if (canBeSeen
		&& (type == TYPE_SYSTEM_DIALOG
		\|\| type == TYPE_SYSTEM_ERROR
		\|\| (attrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0)) {
		if (type == TYPE_SYSTEM_DIALOG \|\| type == TYPE_SYSTEM_ERROR
		\|\| (attrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0) {
		mSyswin = true;
		}

		if (canBeSeen) {
		// This function assumes that the contents of the default display are
		// processed first before secondary displays.
		final DisplayContent displayContent = w.getDisplayContent();
		@@ -1524,7 +1521,6 @@ class WindowSurfacePlacer {
		}
		}
		}
		}

		private void updateAllDrawnLocked(DisplayContent displayContent) {
		// See if any windows have been drawn, so they (and others