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

Commit 72d45fcf 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 am: c3cdcd3b 

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



Change-Id: I21adcf3f66f703b0069a2adb804bdf0cd2347e55
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c04e1a1f c3cdcd3b

core/java/android/view/ViewRootImpl.java

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

                mPendingTransitions.clear();

            }

            performDraw();

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

                mSyncBufferCallback.onBufferReady(null);

            }

        }



        if (mAttachInfo.mContentCaptureEvents != null) {
@@ -4247,11 +4249,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;
@@ -4335,6 +4337,7 @@ public final class ViewRootImpl implements ViewParent, 
        if (mPerformContentCapture) {

            performContentCaptureInitialReport();

        }

        return true;

    }



    /**