commit ae77959253d69643ba0fc71647630cee880f3519
author Leon Scroggins <scroggo@google.com> Wed Dec 09 15:45:33 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 09 15:45:33 2009 -0800
tree 2e73a333ec6e5a866fa79798745b4c9f81fca963
parent 98f0d6db63213c3107cb8f2e6ed649df73f4521f
parent 4e67a2a46507299a1aa8f2b94c33c3f65e5f78e2

am 4e67a2a4: Merge change I22807d19 into eclair-mr2

Merge commit '4e67a2a46507299a1aa8f2b94c33c3f65e5f78e2' into eclair-mr2-plus-aosp

* commit '4e67a2a46507299a1aa8f2b94c33c3f65e5f78e2':
  Do not use the Cursor if it is closed.

src/com/android/browser/BrowserHistoryPage.java

diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java
index bdd109b..2eab181 100644
--- a/src/com/android/browser/BrowserHistoryPage.java
+++ b/src/com/android/browser/BrowserHistoryPage.java
@@ -418,6 +418,8 @@
             } else {
                 item = (HistoryItem) convertView;
             }
+            // Bail early if the Cursor is closed.
+            if (mCursor.isClosed()) return item;
             int index = childPosition;
             for (int i = 0; i < groupPosition; i++) {
                 index += mItemMap[i];
@@ -515,7 +517,7 @@
         }
 
         public boolean isEmpty() {
-            return mCursor.getCount() == 0;
+            return mCursor.isClosed() || mCursor.getCount() == 0;
         }
     }
 }