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

Commit 4d67c3a0 authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in empty SizeAdaptiveLayouts."

parents 77b17f33 c7088da5

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

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

        if (DEBUG) Log.d(TAG, this + " measure spec: " +

                         MeasureSpec.toString(heightMeasureSpec));

                         MeasureSpec.toString(heightMeasureSpec));

        View model = selectActiveChild(heightMeasureSpec);

        View model = selectActiveChild(heightMeasureSpec);

        if (model == null) {

            setMeasuredDimension(0, 0);

            return;

        }

        SizeAdaptiveLayout.LayoutParams lp =

        SizeAdaptiveLayout.LayoutParams lp =

          (SizeAdaptiveLayout.LayoutParams) model.getLayoutParams();

          (SizeAdaptiveLayout.LayoutParams) model.getLayoutParams();

        if (DEBUG) Log.d(TAG, "active min: " + lp.minHeight + " max: " + lp.maxHeight);

        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,

        int measureSpec = View.MeasureSpec.makeMeasureSpec(bottom - top,

                                                           View.MeasureSpec.EXACTLY);

                                                           View.MeasureSpec.EXACTLY);

        mActiveChild = selectActiveChild(measureSpec);

        mActiveChild = selectActiveChild(measureSpec);

        if (mActiveChild == null) return;



        mActiveChild.setVisibility(View.VISIBLE);

        mActiveChild.setVisibility(View.VISIBLE);





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

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