Automated import from //branches/master/...@141834,141834
diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 1491040..7231c4e 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -656,7 +656,14 @@
super.onRestart();
// The cursor was killed off in onStop(), so we need to get a new one here
- startQuery();
+ // We do not perform the query if a filter is set on the list because the
+ // filter will cause the query to happen anyway
+ if (TextUtils.isEmpty(getListView().getTextFilter())) {
+ startQuery();
+ } else {
+ // Run the filtered query on the adapter
+ ((ContactItemListAdapter) getListView().getAdapter()).onContentChanged();
+ }
}
private void updateGroup() {