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

Commit 512251c8 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by android-build-merger
Browse files

Merge "Only updateBoundsSurface when surface size has changed." into qt-dev am: fd979ca3 

am: 96af8617

Change-Id: Ibe8f098897b1b66e5cfb4c78b15fbe2f6c372140
parents d3c430fb 96af8617

core/java/android/view/ViewRootImpl.java

+4 −2
Original line number Diff line number Diff line
@@ -2234,6 +2234,8 @@ public final class ViewRootImpl implements ViewParent, 


        final boolean isViewVisible = viewVisibility == View.VISIBLE;

        final boolean windowRelayoutWasForced = mForceNextWindowRelayout;

        boolean surfaceSizeChanged = false;



        if (mFirst || windowShouldResize || insetsChanged ||

                viewVisibilityChanged || params != null || mForceNextWindowRelayout) {

            mForceNextWindowRelayout = false;
@@ -2312,7 +2314,7 @@ public final class ViewRootImpl implements ViewParent, 
                final boolean cutoutChanged = !mPendingDisplayCutout.equals(

                        mAttachInfo.mDisplayCutout);

                final boolean outsetsChanged = !mPendingOutsets.equals(mAttachInfo.mOutsets);

                final boolean surfaceSizeChanged = (relayoutResult

                surfaceSizeChanged = (relayoutResult

                        & WindowManagerGlobal.RELAYOUT_RES_SURFACE_RESIZED) != 0;

                surfaceChanged |= surfaceSizeChanged;

                final boolean alwaysConsumeSystemBarsChanged =
@@ -2595,7 +2597,7 @@ public final class ViewRootImpl implements ViewParent, 
            maybeHandleWindowMove(frame);

        }



        if (surfaceChanged) {

        if (surfaceSizeChanged) {

            updateBoundsSurface();

        }