commit 903239ff9ed5b070fbb4268c264ec063936c7a53
author Dmitri Plotnikov <dplotnikov@google.com> Thu Mar 04 21:29:27 2010 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Thu Mar 04 21:29:27 2010 -0800
tree 718fcde170d9cd234c3cc2d1609cfe33898436e3
parent e287d61e31e682c52222423c5a1750aa1b7ebc55

Fixing cache reset in GroupingListAdapter (Call Log)

Bug: 2479978
Change-Id: I70a17d13cedbd8986cd6dca2b218c7180dc17470

src/com/android/contacts/GroupingListAdapter.java

diff --git a/src/com/android/contacts/GroupingListAdapter.java b/src/com/android/contacts/GroupingListAdapter.java
index 9d494a3..5937a6d 100644
--- a/src/com/android/contacts/GroupingListAdapter.java
+++ b/src/com/android/contacts/GroupingListAdapter.java
@@ -19,7 +19,6 @@
 import com.android.internal.util.ArrayUtils;
 
 import android.content.Context;
-import android.database.CharArrayBuffer;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.database.DataSetObserver;
@@ -163,6 +162,9 @@
             mCursor.close();
         }
         mCursor = cursor;
+        resetCache();
+        findGroups();
+
         if (cursor != null) {
             cursor.registerContentObserver(mChangeObserver);
             cursor.registerDataSetObserver(mDataSetObserver);
@@ -173,8 +175,6 @@
             notifyDataSetInvalidated();
         }
 
-        resetCache();
-        findGroups();
     }
 
     public Cursor getCursor() {
@@ -418,6 +418,10 @@
     }
 
     public Object getItem(int position) {
+        if (mCursor == null) {
+            return null;
+        }
+
         obtainPositionMetadata(mPositionMetadata, position);
         if (mCursor.moveToPosition(mPositionMetadata.cursorPosition)) {
             return mCursor;

src/com/android/contacts/RecentCallsListActivity.java

diff --git a/src/com/android/contacts/RecentCallsListActivity.java b/src/com/android/contacts/RecentCallsListActivity.java
index d12f9dd..a195971 100644
--- a/src/com/android/contacts/RecentCallsListActivity.java
+++ b/src/com/android/contacts/RecentCallsListActivity.java
@@ -758,10 +758,7 @@
     protected void onDestroy() {
         super.onDestroy();
         mAdapter.stopRequestProcessing();
-        Cursor cursor = mAdapter.getCursor();
-        if (cursor != null && !cursor.isClosed()) {
-            cursor.close();
-        }
+        mAdapter.changeCursor(null);
     }
 
     @Override