diff options
| author | 2017-05-16 22:25:04 +0000 | |
|---|---|---|
| committer | 2017-05-16 22:25:09 +0000 | |
| commit | 4bc839e2670d326d42400b51cbc0652361cc7072 (patch) | |
| tree | f856a2219f322c5cdb2fbf633152c7f6b0e75332 | |
| parent | 781ad9f202b444e5269673db67133c752340dc53 (diff) | |
| parent | 001e55a17a8ff58ae80409369601ba860f8e8832 (diff) | |
Merge "ViewRootImpl: Guard against null in performMeasure" into oc-dev
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 511a2797f961..28ded55c54fa 100644 --- 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); |