Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc945bf6 authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

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

am: 4bc839e2

Change-Id: I1bc8741550626747849a13b15e8ec45dbc5d8110
parents 106bf46f 4bc839e2

core/java/android/view/ViewRootImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -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);