Resolve merge conflicts of 5fb2496fe40a99d154a6e625d946818f44b684bc to master (969eb21e) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -2006,6 +2006,7 @@ public class WindowManagerService extends IWindowManager.Stub

		int attrChanges = 0;
		int flagChanges = 0;
		int privateFlagChanges = 0;
		if (attrs != null) {
		displayPolicy.adjustWindowParamsLw(win, attrs, pid, uid);
		// if they don't have the permission, mask out the status bar bits
		@@ -2034,6 +2035,7 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		flagChanges = win.mAttrs.flags ^ attrs.flags;
		privateFlagChanges = win.mAttrs.privateFlags ^ attrs.privateFlags;
		attrChanges = win.mAttrs.copyFrom(attrs);
		if ((attrChanges & (WindowManager.LayoutParams.LAYOUT_CHANGED
		\| WindowManager.LayoutParams.SYSTEM_UI_VISIBILITY_CHANGED)) != 0) {
		@@ -2050,7 +2052,7 @@ public class WindowManagerService extends IWindowManager.Stub
		win.getDisplayContent().getDisplayId());
		}

		if ((flagChanges & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS) != 0) {
		if ((privateFlagChanges & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS) != 0) {
		updateNonSystemOverlayWindowsVisibilityIfNeeded(
		win, win.mWinAnimator.getShown());
		}
		@@ -7543,7 +7545,7 @@ public class WindowManagerService extends IWindowManager.Stub
		return;
		}
		final boolean systemAlertWindowsHidden = !mHidingNonSystemOverlayWindows.isEmpty();
		if (surfaceShown) {
		if (surfaceShown && win.hideNonSystemOverlayWindowsWhenVisible()) {
		if (!mHidingNonSystemOverlayWindows.contains(win)) {
		mHidingNonSystemOverlayWindows.add(win);
		}