Merge "Hide SAW subwindows" into sc-v2-dev (e9e162b0) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -3348,12 +3348,13 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		}

		void setForceHideNonSystemOverlayWindowIfNeeded(boolean forceHide) {
		final int baseType = getBaseType();
		if (mSession.mCanAddInternalSystemWindow
		\|\| (!isSystemAlertWindowType(mAttrs.type) && mAttrs.type != TYPE_TOAST)) {
		\|\| (!isSystemAlertWindowType(baseType) && baseType != TYPE_TOAST)) {
		return;
		}

		if (mAttrs.type == TYPE_APPLICATION_OVERLAY && mAttrs.isSystemApplicationOverlay()
		if (baseType == TYPE_APPLICATION_OVERLAY && mAttrs.isSystemApplicationOverlay()
		&& mSession.mCanCreateSystemApplicationOverlay) {
		return;
		}