diff options
| author | Daniel Lehmann <lehmannd@google.com> | 2011-10-31 13:12:13 -0700 |
|---|---|---|
| committer | Daniel Lehmann <lehmannd@google.com> | 2011-10-31 13:12:13 -0700 |
| commit | 1322df8f90d80587748ad10539516635326c01e8 (patch) | |
| tree | 79e3e263d7686c844874d2f679f8c69882cb7276 | |
| parent | 5dccfb059f5df0e9fdba026bcfbed677f44922cd (diff) | |
| download | ContactsProvider-ics-mr0-release.tar.gz | |
Fix extreme slowness in FTS searchandroid-sdk-adt_r16.0.1android-cts-4.0_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr0-releaseics-mr0ics-factoryrom-2-release
Bug:5534735
Change-Id: I561bcf32d3c66b1a86b36a043d407a725325419d
| -rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index 8c43c02c..84a2f264 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -5158,8 +5158,6 @@ public class ContactsProvider2 extends AbstractContactsProvider deferredSnipRequested); snippetDeferred = isSingleWordQuery(filterParam) && deferredSnipRequested && snippetNeeded(projection); - // Omit results in "Other Contacts". - qb.appendWhere(Contacts._ID + " IN " + Tables.DEFAULT_DIRECTORY); break; } @@ -6605,7 +6603,9 @@ public class ContactsProvider2 extends AbstractContactsProvider sb.append(SearchIndexManager.getFtsMatchQuery(filter, FtsQueryBuilder.SCOPED_NAME_NORMALIZING)); } - sb.append("') ON (" + Contacts._ID + "=" + SNIPPET_CONTACT_ID + ")"); + // Omit results in "Other Contacts". + sb.append("' AND " + SNIPPET_CONTACT_ID + " IN " + Tables.DEFAULT_DIRECTORY + ")"); + sb.append(" ON (" + Contacts._ID + "=" + SNIPPET_CONTACT_ID + ")"); } private static String sanitizeMatch(String filter) { |