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

Commit fd2bd1b3 authored by Robert Carr's avatar Robert Carr
Browse files

Fix regression breaking SurfaceView in docked. 

We don't need to subtract the insets again when
we are laying out in the attached window frame,
as pf will already have them subtracted.

Bug: 27687126
Change-Id: If9c093c5a811ceb7b62bd27a1dd17742b04d898e
parent cff10250

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

+4 −2
Original line number Diff line number Diff line
@@ -734,8 +734,10 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
            layoutYDiff = !mInsetFrame.isEmpty() ? mInsetFrame.top - mContainingFrame.top : 0;

            layoutContainingFrame = !mInsetFrame.isEmpty() ? mInsetFrame : mContainingFrame;

            subtractInsets(mDisplayFrame, layoutContainingFrame, df);

            if (!layoutInParentFrame()) {

                subtractInsets(mContainingFrame, layoutContainingFrame, pf);

                subtractInsets(mInsetFrame, layoutContainingFrame, pf);

            }

            layoutDisplayFrame = df;

            layoutDisplayFrame.intersect(layoutContainingFrame);

        }