Merge "Move nulling of nextFrameCallback" into pi-dev

am: e4e9ee7951

Change-Id: If988240d948266118a9441ee356ff384b4ff53b5
This commit is contained in:
Jorim Jaggi
2018-06-07 17:16:11 -07:00
committed by android-build-merger

View File

@@ -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