Merge "Report sync complete when VRI won't draw" into tm-dev (72a26f79) · Commits · e / os / android_frameworks_base

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;
		}

		/**