commit b7dc460c4216ad14ce13bebf8060d59b2e46954e
author Dmitri Plotnikov <dplotnikov@google.com> Mon Jun 07 16:14:12 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Mon Jun 07 16:14:12 2010 -0700
tree caee07465d6e894bc4426ced539f860d9c6ba69d
parent 9d6f345bb376e68e2df40c691030402dd3d0cd86

Fixing an IllegalStateException in contact search activity

Change-Id: I1299961b1f34d7d342752a3c78fd73a20410a1cd

src/com/android/contacts/widget/CompositeCursorAdapter.java

diff --git a/src/com/android/contacts/widget/CompositeCursorAdapter.java b/src/com/android/contacts/widget/CompositeCursorAdapter.java
index 58f071a..3eb48bb 100644
--- a/src/com/android/contacts/widget/CompositeCursorAdapter.java
+++ b/src/com/android/contacts/widget/CompositeCursorAdapter.java
@@ -368,14 +368,16 @@
                     offset--;
                 }
                 if (offset == -1) {
-                    return -1;
+                    return 0;
                 }
                 if (mPartitions[i].idColumnIndex == -1) {
-                    return -1;
+                    return 0;
                 }
 
                 Cursor cursor = mPartitions[i].cursor;
-                cursor.moveToPosition(offset);
+                if (cursor == null || cursor.isClosed() || !cursor.moveToPosition(offset)) {
+                    return 0;
+                }
                 return cursor.getLong(mPartitions[i].idColumnIndex);
             }
             start = end;