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

Commit fe7497a6 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Register frame callbacks for sync right before draw" into udc-qpr-dev am: 92c44a50 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23773376



Change-Id: I96704c3eaa392a1c51a66ab5f07b0bc264347a58
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6e5b43d 92c44a50

core/java/android/view/ViewRootImpl.java

+33 −25
Original line number Diff line number Diff line
@@ -3820,7 +3820,7 @@ public final class ViewRootImpl implements ViewParent, 
                }

                mPendingTransitions.clear();

            }

            if (!performDraw() && mActiveSurfaceSyncGroup != null) {

            if (!performDraw(mActiveSurfaceSyncGroup) && mActiveSurfaceSyncGroup != null) {

                mActiveSurfaceSyncGroup.markSyncReady();

            }

        }
@@ -4583,6 +4583,10 @@ public final class ViewRootImpl implements ViewParent, 
        });

    }



    /**

     * These callbacks check if the draw failed for any reason and apply

     * those transactions directly so they don't get stuck forever.

     */

    private void registerCallbackForPendingTransactions() {

        Transaction t = new Transaction();

        t.merge(mPendingTransaction);
@@ -4611,7 +4615,7 @@ public final class ViewRootImpl implements ViewParent, 
        });

    }



    private boolean performDraw() {

    private boolean performDraw(@Nullable SurfaceSyncGroup surfaceSyncGroup) {

        mLastPerformDrawSkippedReason = null;

        if (mAttachInfo.mDisplayState == Display.STATE_OFF && !mReportNextDraw) {

            mLastPerformDrawSkippedReason = "screen_off";
@@ -4621,7 +4625,7 @@ public final class ViewRootImpl implements ViewParent, 
            return false;

        }



        final boolean fullRedrawNeeded = mFullRedrawNeeded || mActiveSurfaceSyncGroup != null;

        final boolean fullRedrawNeeded = mFullRedrawNeeded || surfaceSyncGroup != null;

        mFullRedrawNeeded = false;



        mIsDrawing = true;
@@ -4629,22 +4633,12 @@ public final class ViewRootImpl implements ViewParent, 


        addFrameCommitCallbackIfNeeded();



        boolean usingAsyncReport = isHardwareEnabled() && mActiveSurfaceSyncGroup != null;

        if (usingAsyncReport) {

            registerCallbacksForSync(mSyncBuffer, mActiveSurfaceSyncGroup);

        } else if (mHasPendingTransactions) {

            // These callbacks are only needed if there's no sync involved and there were calls to

            // applyTransactionOnDraw. These callbacks check if the draw failed for any reason and

            // apply those transactions directly so they don't get stuck forever.

            registerCallbackForPendingTransactions();

        }

        mHasPendingTransactions = false;

        boolean usingAsyncReport;



        try {

            boolean canUseAsync = draw(fullRedrawNeeded, usingAsyncReport && mSyncBuffer);

            if (usingAsyncReport && !canUseAsync) {

            usingAsyncReport = draw(fullRedrawNeeded, surfaceSyncGroup, mSyncBuffer);

            if (mAttachInfo.mThreadedRenderer != null && !usingAsyncReport) {

                mAttachInfo.mThreadedRenderer.setFrameCallback(null);

                usingAsyncReport = false;

            }

        } finally {

            mIsDrawing = false;
@@ -4682,10 +4676,12 @@ public final class ViewRootImpl implements ViewParent, 
            }



            if (mSurfaceHolder != null && mSurface.isValid()) {

                final SurfaceSyncGroup surfaceSyncGroup = mActiveSurfaceSyncGroup;

                SurfaceCallbackHelper sch = new SurfaceCallbackHelper(() ->

                        mHandler.post(() -> surfaceSyncGroup.markSyncReady()));

                mActiveSurfaceSyncGroup = null;

                usingAsyncReport = true;

                SurfaceCallbackHelper sch = new SurfaceCallbackHelper(() -> {

                    if (surfaceSyncGroup != null) {

                        surfaceSyncGroup.markSyncReady();

                    }

                });



                SurfaceHolder.Callback callbacks[] = mSurfaceHolder.getCallbacks();
@@ -4696,8 +4692,9 @@ public final class ViewRootImpl implements ViewParent, 
                }

            }

        }

        if (mActiveSurfaceSyncGroup != null && !usingAsyncReport) {

            mActiveSurfaceSyncGroup.markSyncReady();



        if (surfaceSyncGroup != null && !usingAsyncReport) {

            surfaceSyncGroup.markSyncReady();

        }

        if (mPerformContentCapture) {

            performContentCaptureInitialReport();
@@ -4790,7 +4787,8 @@ public final class ViewRootImpl implements ViewParent, 
        }

    }



    private boolean draw(boolean fullRedrawNeeded, boolean forceDraw) {

    private boolean draw(boolean fullRedrawNeeded,

            @Nullable SurfaceSyncGroup activeSyncGroup, boolean syncBuffer) {

        Surface surface = mSurface;

        if (!surface.isValid()) {

            return false;
@@ -4934,9 +4932,19 @@ public final class ViewRootImpl implements ViewParent, 
                    mAttachInfo.mThreadedRenderer.setTargetHdrSdrRatio(mRenderHdrSdrRatio);

                }



                if (forceDraw) {

                if (activeSyncGroup != null) {

                    registerCallbacksForSync(syncBuffer, activeSyncGroup);

                    if (syncBuffer) {

                        mAttachInfo.mThreadedRenderer.forceDrawNextFrame();

                    }

                } else if (mHasPendingTransactions) {

                    // Register a calback if there's no sync involved but there were calls to

                    // applyTransactionOnDraw. If there is a sync involved, the sync callback will

                    // handle merging the pending transaction.

                    registerCallbackForPendingTransactions();

                }

                mHasPendingTransactions = false;



                mAttachInfo.mThreadedRenderer.draw(mView, mAttachInfo, this);

            } else {

                // If we get here with a disabled & requested hardware renderer, something went