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

core/java/android/view/ViewRootImpl.java

+5 −0

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

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

	final boolean fullRedrawNeeded = mFullRedrawNeeded;		final boolean fullRedrawNeeded = mFullRedrawNeeded;