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

Commit ca84670e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update the last frame in the first layout"

parents fb3fdce2 f64e1343

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

+4 −2
Original line number Diff line number Diff line
@@ -669,10 +669,12 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
            getDisplayPolicy().layoutWindowLw(w, null, mDisplayFrames);

            w.mLayoutSeq = mLayoutSeq;



            // If this is the first layout, we need to initialize the last inset values as

            // otherwise we'd immediately cause an unnecessary resize.

            // If this is the first layout, we need to initialize the last frames and inset values,

            // as otherwise we'd immediately cause an unnecessary resize.

            if (firstLayout) {

                w.updateLastFrames();

                w.updateLastInsetValues();

                w.updateLocationInParentDisplayIfNeeded();

            }



            if (w.mActivityRecord != null) {

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

+2 −3
Original line number Diff line number Diff line
@@ -2337,9 +2337,8 @@ public class WindowManagerService extends IWindowManager.Stub 


            win.setLastReportedMergedConfiguration(mergedConfiguration);



            // Update the last frames and inset values here because the values are sent back to the

            // client. The last values represent the last client state.

            win.updateLastFrames();

            // Update the last inset values here because the values are sent back to the client.

            // The last inset values represent the last client state

            win.updateLastInsetValues();



            win.getCompatFrame(outFrame);