diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 2605b4a2e50c3..fd950dbffb4bb 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -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;