Merge "Report sync complete when VRI won't draw" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
72a26f7912
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user