Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fabrice Di Meglio
2013-06-18 21:54:49 +00:00
committed by Android (Google) Code Review
parent 2f0396ad56 d6d543977d
commit 012416fdbb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/widget/ScrollView.java
View File

@@ -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;