Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c37bc914 authored by Linus Tufvesson's avatar Linus Tufvesson
Browse files

Hide SAW subwindows 

.. when top window is hidden through Window#setHideOverlayWindows

Bug: 333491197
Test: atest CtsWindowManagerDeviceWindow:HideOverlayWindowsTest
Flag: EXEMPT securityfix
Change-Id: If19240f5aec2e048de80d75cbbdc00be47622d7f
parent 1d9fb990

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

+3 −2
Original line number Diff line number Diff line
@@ -3092,12 +3092,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;

        }