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

Commit 981b2b13 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Move nulling of nextFrameCallback" into pi-dev

am: e4e9ee79

Change-Id: If988240d948266118a9441ee356ff384b4ff53b5
parents 9a971828 e4e9ee79
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -3305,8 +3305,11 @@ public final class ViewRootImpl implements ViewParent,
                }

                useAsyncReport = true;
                mAttachInfo.mThreadedRenderer.draw(mView, mAttachInfo, this, mNextRtFrameCallback);

                // draw(...) might invoke post-draw, which might register the next callback already.
                final FrameDrawingCallback callback = mNextRtFrameCallback;
                mNextRtFrameCallback = null;
                mAttachInfo.mThreadedRenderer.draw(mView, mAttachInfo, this, callback);
            } else {
                // If we get here with a disabled & requested hardware renderer, something went
                // wrong (an invalidate posted right before we destroyed the hardware surface