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

Commit 846c3f4f authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "Fix regression breaking SurfaceView in docked." into nyc-dev

parents f89c0125 fd2bd1b3

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);

        }