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

Commit 012416fd authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #9463581 NPE observed while launching News&Weather app from all apps tray"

parents 2f0396ad d6d54397

core/java/android/widget/ScrollView.java

+5 −5
Original line number Diff line number Diff line
@@ -1473,16 +1473,16 @@ public class ScrollView extends FrameLayout { 
        }

        mChildToScrollTo = null;



        // There is only one child

        final View child = getChildAt(0);

        final int childHeight = child.getMeasuredHeight();

        if (!hasLayout()) {

            final int scrollRange = Math.max(0,

                    childHeight - (b - t - mPaddingBottom - mPaddingTop));

            if (mSavedState != null) {

                mScrollY = mSavedState.scrollPosition;

                mSavedState = null;

            } // mScrollY default value is "0"



            final int childHeight = (getChildCount() > 0) ? getChildAt(0).getMeasuredHeight() : 0;

            final int scrollRange = Math.max(0,

                    childHeight - (b - t - mPaddingBottom - mPaddingTop));



            // Don't forget to clamp

            if (mScrollY > scrollRange) {

                mScrollY = scrollRange;