Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie6df36eacfe7de48bb2038c9889b9ef419981cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chavi Weingarten
2022-06-07 21:37:51 +00:00
committed by Automerger Merge Worker
parent 1710e1734c 72a26f7912
commit 8ebe22e33b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/ViewRootImpl.java
View File

@@ -3500,7 +3500,9 @@ public final class ViewRootImpl implements ViewParent,
} }
mPendingTransitions.clear(); mPendingTransitions.clear();
} }
performDraw(); if (!performDraw() && mSyncBufferCallback != null) {
mSyncBufferCallback.onBufferReady(null);
}
} }
if (mAttachInfo.mContentCaptureEvents != 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) { if (mAttachInfo.mDisplayState == Display.STATE_OFF && !mReportNextDraw) {
return; return false;
} else if (mView == null) { } else if (mView == null) {
return; return false;
} }
final boolean fullRedrawNeeded = mFullRedrawNeeded || mSyncBufferCallback != null; final boolean fullRedrawNeeded = mFullRedrawNeeded || mSyncBufferCallback != null;
@@ -4331,6 +4333,7 @@ public final class ViewRootImpl implements ViewParent,
if (mPerformContentCapture) { if (mPerformContentCapture) {
performContentCaptureInitialReport(); performContentCaptureInitialReport();
} }
return true;
} }
/** /**