commit 5523db2ea31672fa555b897970e9c7f30f95f941
author Alan Viverette <alanv@google.com> Fri Feb 28 20:22:53 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 28 20:22:53 2014 +0000
tree dba7d7f65d90f55ef4fd64ecc4557035dd2b759c
parent ce601aee4cf632e5fc9fd23265f293eada7b0d35
parent 2ac93ae9194f84e18eafe07dc0304cfbb1297b00

Merge "Don't smooth scroll if the adapter is null"

core/java/android/widget/AbsListView.java

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index ffd5c45..47d42dc 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -7160,8 +7160,14 @@
                 return;
             }
 
+            if (mAdapter == null) {
+                // Can't scroll anywhere without an adapter.
+                return;
+            }
+
             final int itemCount = getCount();
             final int clampedPosition = MathUtils.constrain(targetPosition, 0, itemCount - 1);
+            final int clampedBoundPosition = MathUtils.constrain(boundPosition, 0, itemCount - 1);
             final int firstPosition = getFirstVisiblePosition();
             final int lastPosition = firstPosition + getChildCount();
             final int targetRow = getRowForPosition(clampedPosition);
@@ -7180,8 +7186,8 @@
             }
 
             float endSubRow = targetRow;
-            if (boundPosition != INVALID_POSITION) {
-                final int boundRow = getRowForPosition(boundPosition);
+            if (clampedBoundPosition != INVALID_POSITION) {
+                final int boundRow = getRowForPosition(clampedBoundPosition);
                 if (boundRow >= firstRow && boundRow < lastRow && boundRow != targetRow) {
                     endSubRow = computeBoundSubRow(targetRow, boundRow);
                 }