Merge "ViewRootImpl: Guard against null in performMeasure" into oc-dev (4bc839e2) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2401,6 +2401,9 @@ public final class ViewRootImpl implements ViewParent,
	}		}

	private void performMeasure(int childWidthMeasureSpec, int childHeightMeasureSpec) {		private void performMeasure(int childWidthMeasureSpec, int childHeightMeasureSpec) {
			if (mView == null) {
			return;
			}
	Trace.traceBegin(Trace.TRACE_TAG_VIEW, "measure");		Trace.traceBegin(Trace.TRACE_TAG_VIEW, "measure");
	try {		try {
	mView.measure(childWidthMeasureSpec, childHeightMeasureSpec);		mView.measure(childWidthMeasureSpec, childHeightMeasureSpec);