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

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

Merge "Report sync complete when VRI won't draw" into tm-dev am: 72a26f79... 

Merge "Report sync complete when VRI won't draw" into tm-dev am: 72a26f79 am: 8ebe22e3 am: 78b2a87d

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



Change-Id: I73f58e8896cc89ef38dec94c5b4cc098c3249e9b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50e02d08 78b2a87d

core/java/android/view/ViewRootImpl.java

+7 −4
Original line number Diff line number Diff line
@@ -3503,7 +3503,9 @@ public final class ViewRootImpl implements ViewParent, 
                }

                mPendingTransitions.clear();

            }

            performDraw();

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

                mSyncBufferCallback.onBufferReady(null);

            }

        }



        if (mAttachInfo.mContentCaptureEvents != null) {
@@ -4246,11 +4248,11 @@ public final class ViewRootImpl implements ViewParent, 
        });

    }



    private void performDraw() {

    private boolean performDraw() {

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

            return;

            return false;

        } else if (mView == null) {

            return;

            return false;

        }



        final boolean fullRedrawNeeded = mFullRedrawNeeded || mSyncBufferCallback != null;
@@ -4334,6 +4336,7 @@ public final class ViewRootImpl implements ViewParent, 
        if (mPerformContentCapture) {

            performContentCaptureInitialReport();

        }

        return true;

    }



    /**