Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev (5ad37213) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -2471,6 +2471,9 @@ public final class ViewRootImpl implements ViewParent,
		mInLayout = true;

		final View host = mView;
		if (host == null) {
		return;
		}
		if (DEBUG_ORIENTATION \|\| DEBUG_LAYOUT) {
		Log.v(mTag, "Laying out " + host + " to (" +
		host.getMeasuredWidth() + ", " + host.getMeasuredHeight() + ")");
		@@ -2778,6 +2781,8 @@ public final class ViewRootImpl implements ViewParent,
		private void performDraw() {
		if (mAttachInfo.mDisplayState == Display.STATE_OFF && !mReportNextDraw) {
		return;
		} else if (mView == null) {
		return;
		}

		final boolean fullRedrawNeeded = mFullRedrawNeeded;