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

Commit 5ba48b52 authored by Yunfan Chen's avatar Yunfan Chen Committed by Android (Google) Code Review
Browse files

Merge "Revert the fullscreen flag check removal for layout with cutout"

parents 6ca9a6fd cde75c55

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -2128,8 +2128,8 @@ public class DisplayPolicy { 
        if (cutoutMode != LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS) {

        if (cutoutMode != LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS) {

            final boolean attachedInParent = attached != null && !layoutInScreen;

            final boolean attachedInParent = attached != null && !layoutInScreen;

            final InsetsState requestedInsetsState = win.getRequestedInsetsState();

            final InsetsState requestedInsetsState = win.getRequestedInsetsState();

            final boolean requestedFullscreen =

            final boolean requestedFullscreen = (fl & FLAG_FULLSCREEN) != 0

                    !requestedInsetsState.getSourceOrDefaultVisibility(ITYPE_STATUS_BAR);

                    || !requestedInsetsState.getSourceOrDefaultVisibility(ITYPE_STATUS_BAR);

            final boolean requestedHideNavigation =

            final boolean requestedHideNavigation =

                    !requestedInsetsState.getSourceOrDefaultVisibility(ITYPE_NAVIGATION_BAR);

                    !requestedInsetsState.getSourceOrDefaultVisibility(ITYPE_NAVIGATION_BAR);