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

Commit 1e780ab0 authored by Robert Carr's avatar Robert Carr
Browse files

SurfaceView: Ensure position update listener sets at least once 

If we destroy and recreate a SurfaceView in the same frame its
possible for positionChanged for the new surface to arrive
before positionLost for the old surface. In this case we
won't clear mRtLastReportedPosition, and so we won't set
any position at all on the new surface.

Bug: 229052731
Test: Existing tests pass
Change-Id: I896496afa5b05848f96b20697d33911cae9639a7
parent c98cb446

core/java/android/view/SurfaceView.java

+4 −2
Original line number Diff line number Diff line
@@ -1274,6 +1274,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
    private class SurfaceViewPositionUpdateListener implements RenderNode.PositionUpdateListener {

        private final int mRtSurfaceWidth;

        private final int mRtSurfaceHeight;

        private boolean mRtFirst = true;

        private final SurfaceControl.Transaction mPositionChangedTransaction =

                new SurfaceControl.Transaction();
@@ -1284,14 +1285,15 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 


        @Override

        public void positionChanged(long frameNumber, int left, int top, int right, int bottom) {

            if (mRTLastReportedPosition.left == left

            if (!mRtFirst && (mRTLastReportedPosition.left == left

                    && mRTLastReportedPosition.top == top

                    && mRTLastReportedPosition.right == right

                    && mRTLastReportedPosition.bottom == bottom

                    && mRTLastReportedSurfaceSize.x == mRtSurfaceWidth

                    && mRTLastReportedSurfaceSize.y == mRtSurfaceHeight) {

                    && mRTLastReportedSurfaceSize.y == mRtSurfaceHeight)) {

                return;

            }

            mRtFirst = false;

            try {

                if (DEBUG_POSITION) {

                    Log.d(TAG, String.format(