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

Commit 7398055e authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Copy rects such that we don't modify state" into qt-dev 

am: 1c1c65ee

Change-Id: Id0f05d010b38952026465dfc709b0054d929f20f
parents d800ccad 1c1c65ee

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

+4 −2
Original line number Diff line number Diff line
@@ -1726,14 +1726,16 @@ public class DisplayPolicy { 


            // In case we forced the window to draw behind the navigation bar, restrict df/of to

            // DF.RestrictedOverscan to simulate old compat behavior.

            final Rect parentDisplayFrame = attached.getDisplayFrameLw();

            final Rect parentOverscan = attached.getOverscanFrameLw();

            Rect parentDisplayFrame = attached.getDisplayFrameLw();

            Rect parentOverscan = attached.getOverscanFrameLw();

            final WindowManager.LayoutParams attachedAttrs = attached.mAttrs;

            if ((attachedAttrs.privateFlags & PRIVATE_FLAG_FORCE_DRAW_BAR_BACKGROUNDS) != 0

                    && (attachedAttrs.flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) == 0

                    && (attachedAttrs.systemUiVisibility

                            & SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) == 0) {

                parentOverscan = new Rect(parentOverscan);

                parentOverscan.intersect(displayFrames.mRestrictedOverscan);

                parentDisplayFrame = new Rect(parentDisplayFrame);

                parentDisplayFrame.intersect(displayFrames.mRestrictedOverscan);

            }