Merge change I22807d19 into eclair-mr2
* changes:
Do not use the Cursor if it is closed.
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;
}
}
}