Fix acore FC when clearing search query

The revert made by on commit Steve 1c779b3fd650bcddaba0359d6f7907abb5428068 had a merge issue with froyo

1 files changed, 5 insertions, 4 deletions

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 6254f9c99..a8ad16329 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -3546,15 +3546,16 @@ public class ContactsListActivity extends ListActivity implements View.OnCreateC
                         mIndexer = getNewIndexer(cursor);
                     }
                 } else {
-                */
+                // This code leads to acore crash when searching a contact and clearing the query quickly.
+                // Things seem to work without it, so I'm reverting to the original method for froyo
                     if (mIndexer instanceof AlphabetIndexer) {
                         ((AlphabetIndexer)mIndexer).setCursor(cursor);
                     } else {
                         mIndexer = getNewIndexer(cursor);
                     }
-                //}
+                }
             }
-            /*
+            */
             Bundle bundle = cursor.getExtras();
             if (bundle.containsKey(ContactCounts.EXTRA_ADDRESS_BOOK_INDEX_TITLES)) {
                 String sections[] =
@@ -3564,7 +3565,7 @@ public class ContactsListActivity extends ListActivity implements View.OnCreateC
             } else {
                 mIndexer = null;
             }
-            */
+            
         }
 
         /**