commit 6f87503ed88a6942ecf8d231c28f1b19d5c60eb2
author Rob Carr <racarr@google.com> Fri Jun 16 19:55:07 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 16 19:55:12 2017 +0000
tree 3151ff79b0c3334e558993b55349900cc607d623
parent 6db4406fbd35ace78bc97f77844bd060bfef0af7
parent 32f37ab0237df02dc1cb3b342860699587800db7

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

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 2605b4a..fd950db 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -2471,6 +2471,9 @@
         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 @@
     private void performDraw() {
         if (mAttachInfo.mDisplayState == Display.STATE_OFF && !mReportNextDraw) {
             return;
+        } else if (mView == null) {
+            return;
         }
 
         final boolean fullRedrawNeeded = mFullRedrawNeeded;