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

Commit 8ebe22e3 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 

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



Change-Id: Ie6df36eacfe7de48bb2038c9889b9ef419981cb5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1710e173 72a26f79

core/java/android/view/ViewRootImpl.java

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

                mPendingTransitions.clear();

            }

            performDraw();

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

                mSyncBufferCallback.onBufferReady(null);

            }

        }



        if (mAttachInfo.mContentCaptureEvents != null) {
@@ -4243,11 +4245,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;
@@ -4331,6 +4333,7 @@ public final class ViewRootImpl implements ViewParent, 
        if (mPerformContentCapture) {

            performContentCaptureInitialReport();

        }

        return true;

    }



    /**