Merge "ViewRootImpl: Guard against null in performMeasure" into oc-dev

am: 4bc839e267 Change-Id: I1bc8741550626747849a13b15e8ec45dbc5d8110
2017-05-16 22:30:15 +00:00
parent 106bf46f25 4bc839e267
commit fc945bf674
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -2401,6 +2401,9 @@ public final class ViewRootImpl implements ViewParent,
    }

    private void performMeasure(int childWidthMeasureSpec, int childHeightMeasureSpec) {
+        if (mView == null) {
+            return;
+        }
        Trace.traceBegin(Trace.TRACE_TAG_VIEW, "measure");
        try {
            mView.measure(childWidthMeasureSpec, childHeightMeasureSpec);