From 11d0069f9228400943e9932e3286babb2b5f4135 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Mon, 5 May 2014 13:28:22 -0700 Subject: [PATCH] Fix a bug in AbsListView nested scrolling support. Bug 14564701 Change-Id: I8cb854b987736e6f141610c8e6e77eb263a718db --- core/java/android/widget/AbsListView.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 3fac883166c56..f4cd5fcf7b652 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -3380,7 +3380,9 @@ public abstract class AbsListView extends AdapterView implements Te mScrollOffset)) { mMotionCorrection -= mScrollOffset[1]; lastYCorrection -= mScrollOffset[1]; - vtev.offsetLocation(0, mScrollOffset[1]); + if (vtev != null) { + vtev.offsetLocation(0, mScrollOffset[1]); + } } else { overScrollBy(0, overscroll, 0, mScrollY, 0, 0, 0, mOverscrollDistance, true);