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

Merge "Fix NPE in RecyclerView" into sc-dev

Browse Source
This commit is contained in:
George Mount
2021-04-02 16:20:06 +00:00
committed by Android (Google) Code Review
parent d402d0feb1 49bd07d665
commit e57091c6c3
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/com/android/internal/widget/RecyclerView.java
View File

@@ -2049,17 +2049,19 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
} }
if (!dispatchNestedPreFling(velocityX, velocityY)) { if (!dispatchNestedPreFling(velocityX, velocityY)) {
final View firstChild = mLayout.getChildAt(0);
final View lastChild = mLayout.getChildAt(mLayout.getChildCount() - 1);
boolean consumed = false; boolean consumed = false;
if (velocityY < 0) { if (mLayout.getChildCount() > 0) {
consumed = getChildAdapterPosition(firstChild) > 0 final View firstChild = mLayout.getChildAt(0);
|| firstChild.getTop() < getPaddingTop(); final View lastChild = mLayout.getChildAt(mLayout.getChildCount() - 1);
} if (velocityY < 0) {
consumed = getChildAdapterPosition(firstChild) > 0
|| firstChild.getTop() < getPaddingTop();
}
if (velocityY > 0) { if (velocityY > 0) {
consumed = getChildAdapterPosition(lastChild) < mAdapter.getItemCount() - 1 consumed = getChildAdapterPosition(lastChild) < mAdapter.getItemCount() - 1
|| lastChild.getBottom() > getHeight() - getPaddingBottom(); || lastChild.getBottom() > getHeight() - getPaddingBottom();
}
} }
dispatchNestedFling(velocityX, velocityY, consumed); dispatchNestedFling(velocityX, velocityY, consumed);