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

Commit bc4d55d5 authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Automerger Merge Worker
Browse files

Merge "Hide SAW subwindows" into udc-dev am: ca0c29f0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27146225



Change-Id: I88144066588ff0c7a1635fcfaed75cfe18f2539c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac18c3a2 ca0c29f0

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

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

        }