Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev

2017-06-16 19:55:07 +00:00
parent 6db4406fbd 32f37ab023
commit 6f87503ed8
1 changed files with 5 additions and 0 deletions
--- 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;