commit 1f196f29127f9a05d0bd0553d2f3db2ad983df14
author Dirk Dougherty <ddougherty@google.com> Fri Mar 26 17:50:26 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 26 17:50:26 2010 -0700
tree 7e794b0324ec8e02b3681608876a1f75c8a644a6
parent 213b9805e31ae9de26c740c04e04af2090759e52
parent 7b229effcced9ad5aaa3d2ea6b4b219239348481

Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo

core/java/android/widget/GridView.java

diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java
index be633be..d867980 100644
--- a/core/java/android/widget/GridView.java
+++ b/core/java/android/widget/GridView.java
@@ -1128,11 +1128,13 @@
             default:
                 if (childCount == 0) {
                     if (!mStackFromBottom) {
-                        setSelectedPositionInt(0);
+                        setSelectedPositionInt(mAdapter == null || isInTouchMode() ?
+                                INVALID_POSITION : 0);
                         sel = fillFromTop(childrenTop);
                     } else {
                         final int last = mItemCount - 1;
-                        setSelectedPositionInt(last);
+                        setSelectedPositionInt(mAdapter == null || isInTouchMode() ?
+                                INVALID_POSITION : last);
                         sel = fillFromBottom(last, childrenBottom);
                     }
                 } else {