summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-01-08 15:40:06 -0800
committerYorke Lee <yorkelee@google.com>2013-01-08 15:56:49 -0800
commitfda4395adc9266d0f8e0be8637d0effa7fd1e057 (patch)
tree1111b3e1d983e800e0a985d7887893dc235d1ac8
parentc231bb10ca1ae310568a0c7cb4f327e348ecde3b (diff)
downloadpackages_providers_ContactsProvider-fda4395adc9266d0f8e0be8637d0effa7fd1e057.zip
packages_providers_ContactsProvider-fda4395adc9266d0f8e0be8637d0effa7fd1e057.tar.gz
packages_providers_ContactsProvider-fda4395adc9266d0f8e0be8637d0effa7fd1e057.tar.bz2
Standardize search algorithm between People and Dialer
Bug: 5930716 Change-Id: Ic7cfffae5de878be683d27f92ccb5b034dc217c3
-rw-r--r--src/com/android/providers/contacts/ContactsProvider2.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 1c4c1f3..0c94657 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -5466,7 +5466,7 @@ public class ContactsProvider2 extends AbstractContactsProvider
final String ftsMatchQuery =
searchDisplayName
? SearchIndexManager.getFtsMatchQuery(filterParam,
- FtsQueryBuilder.UNSCOPED_NORMALIZING)
+ FtsQueryBuilder.SCOPED_NAME_NORMALIZING)
: null;
if (!TextUtils.isEmpty(ftsMatchQuery)) {
sb.append(Data.RAW_CONTACT_ID + " IN " +
@@ -5475,7 +5475,7 @@ public class ContactsProvider2 extends AbstractContactsProvider
" JOIN " + Tables.RAW_CONTACTS +
" ON (" + Tables.SEARCH_INDEX + "." + SearchIndexColumns.CONTACT_ID
+ "=" + RawContactsColumns.CONCRETE_CONTACT_ID + ")" +
- " WHERE " + SearchIndexColumns.NAME + " MATCH '");
+ " WHERE " + Tables.SEARCH_INDEX + " MATCH '");
sb.append(ftsMatchQuery);
sb.append("')");
hasCondition = true;