commit 7daaa98c6531373a2a742c1360f0a2795de0619f
author Dianne Hackborn <hackbod@google.com> Wed Dec 15 12:56:53 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 15 12:56:53 2010 -0800
tree 045a653d311d72d8c1ac06bab11bee4f2193698a
parent 52078255dacabe9b779613b032a4dc3706b2b5d3
parent 99441c45e48abd118bd38da6f0844750a710cd33

Merge "Fix issue #3149290: java.lang.RuntimeException: Unable to pause activity" into gingerbread

core/java/android/widget/AbsListView.java

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 9a38acc..8e8b830 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -963,7 +963,7 @@
 
         SavedState ss = new SavedState(superState);
 
-        boolean haveChildren = getChildCount() > 0;
+        boolean haveChildren = getChildCount() > 0 && mItemCount > 0;
         long selectedId = getSelectedItemId();
         ss.selectedId = selectedId;
         ss.height = getHeight();
@@ -978,8 +978,12 @@
                 // Remember the position of the first child
                 View v = getChildAt(0);
                 ss.viewTop = v.getTop();
-                ss.position = mFirstPosition;
-                ss.firstId = mAdapter.getItemId(mFirstPosition);
+                int firstPos = mFirstPosition;
+                if (firstPos >= mItemCount) {
+                    firstPos = mItemCount - 1;
+                }
+                ss.position = firstPos;
+                ss.firstId = mAdapter.getItemId(firstPos);
             } else {
                 ss.viewTop = 0;
                 ss.firstId = INVALID_POSITION;