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

Commit c7088da5 authored by Dan Sandler's avatar Dan Sandler
Browse files

Fix NPE in empty SizeAdaptiveLayouts. 

Change-Id: I8fa31a733d33d6deb04ad53a0772169277b363c8
parent 881c6d57

core/java/com/android/internal/widget/SizeAdaptiveLayout.java

+6 −0
Original line number Diff line number Diff line
@@ -154,6 +154,10 @@ public class SizeAdaptiveLayout extends ViewGroup { 
        if (DEBUG) Log.d(TAG, this + " measure spec: " +

                         MeasureSpec.toString(heightMeasureSpec));

        View model = selectActiveChild(heightMeasureSpec);

        if (model == null) {

            setMeasuredDimension(0, 0);

            return;

        }

        SizeAdaptiveLayout.LayoutParams lp =

          (SizeAdaptiveLayout.LayoutParams) model.getLayoutParams();

        if (DEBUG) Log.d(TAG, "active min: " + lp.minHeight + " max: " + lp.maxHeight);
@@ -242,6 +246,8 @@ public class SizeAdaptiveLayout extends ViewGroup { 
        int measureSpec = View.MeasureSpec.makeMeasureSpec(bottom - top,

                                                           View.MeasureSpec.EXACTLY);

        mActiveChild = selectActiveChild(measureSpec);

        if (mActiveChild == null) return;



        mActiveChild.setVisibility(View.VISIBLE);



        if (mLastActive != mActiveChild && mLastActive != null) {