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

Commit 34dd69fd authored by Yunfan Chen's avatar Yunfan Chen Committed by Tiger Huang
Browse files

Remove FLAG_FULLSCREEN 

The flag can be safely removed because the requested visibilities are
now up-to-dated.

Bug: 155413635
Test: DisplayPolicyLayoutTests DisplayPolicyTests
Test: manuel test the camera app
Change-Id: If0ea6e45c391f14a3ae3bd420a9e65a75b1c27b1
parent e1833c6c

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

+3 −7
Original line number Original line Diff line number Diff line
@@ -2071,8 +2071,7 @@ public class DisplayPolicy { 
        // the cutout safe zone.

        // the cutout safe zone.

        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 boolean requestedFullscreen = (fl & FLAG_FULLSCREEN) != 0

            final boolean requestedFullscreen = !win.getRequestedVisibility(ITYPE_STATUS_BAR);

                    || !win.getRequestedVisibility(ITYPE_STATUS_BAR);

            final boolean requestedHideNavigation =

            final boolean requestedHideNavigation =

                    !win.getRequestedVisibility(ITYPE_NAVIGATION_BAR);

                    !win.getRequestedVisibility(ITYPE_NAVIGATION_BAR);
@@ -2374,7 +2373,7 @@ public class DisplayPolicy { 
                topIsFullscreen = topAppHidesStatusBar;

                topIsFullscreen = topAppHidesStatusBar;

                // The subtle difference between the window for mTopFullscreenOpaqueWindowState

                // The subtle difference between the window for mTopFullscreenOpaqueWindowState

                // and mTopIsFullscreen is that mTopIsFullscreen is set only if the window

                // and mTopIsFullscreen is that mTopIsFullscreen is set only if the window

                // has the FLAG_FULLSCREEN set.  Not sure if there is another way that to be the

                // requests to hide the status bar.  Not sure if there is another way that to be the

                // case though.

                // case though.

                if (!topIsFullscreen || mDisplayContent.getDefaultTaskDisplayArea()

                if (!topIsFullscreen || mDisplayContent.getDefaultTaskDisplayArea()

                        .isStackVisible(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY)) {

                        .isStackVisible(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY)) {
@@ -2418,10 +2417,7 @@ public class DisplayPolicy { 
        if (mTopFullscreenOpaqueWindowState == null || mForceShowSystemBars) {

        if (mTopFullscreenOpaqueWindowState == null || mForceShowSystemBars) {

            return false;

            return false;

        }

        }

        final LayoutParams attrs = mTopFullscreenOpaqueWindowState.getAttrs();

        return !mTopFullscreenOpaqueWindowState.getRequestedVisibility(ITYPE_STATUS_BAR);

        final int fl = attrs.flags;

        return (fl & LayoutParams.FLAG_FULLSCREEN) != 0

                || !mTopFullscreenOpaqueWindowState.getRequestedVisibility(ITYPE_STATUS_BAR);

    }

    }





    /**

    /**