Merge "Unset mNextDrawUseBlastSync if VRI won't draw" (b929fb19) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+19 −4

Original line number	Diff line number	Diff line
		@@ -3150,6 +3150,8 @@ public final class ViewRootImpl implements ViewParent,

		mImeFocusController.onTraversal(hasWindowFocus, mWindowAttributes);

		final boolean wasReportNextDraw = mReportNextDraw;

		// Remember if we must report the next draw.
		if ((relayoutResult & WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME) != 0) {
		reportNextDraw();
		@@ -3177,12 +3179,25 @@ public final class ViewRootImpl implements ViewParent,
		if (isViewVisible) {
		// Try again
		scheduleTraversals();
		} else if (mPendingTransitions != null && mPendingTransitions.size() > 0) {
		} else {
		if (mPendingTransitions != null && mPendingTransitions.size() > 0) {
		for (int i = 0; i < mPendingTransitions.size(); ++i) {
		mPendingTransitions.get(i).endChangingAnimations();
		}
		mPendingTransitions.clear();
		}

		// We may never draw since it's not visible. Report back that we're finished
		// drawing.
		if (!wasReportNextDraw && mReportNextDraw) {
		mReportNextDraw = false;
		pendingDrawFinished();
		}
		}

		// We were unable to draw this traversal. Unset this flag since we'll block without
		// ever being able to draw again
		mNextDrawUseBlastSync = false;
		}

		if (mAttachInfo.mContentCaptureEvents != null) {