Standardize search algorithm between People and Dialer
Bug: 5930716
Change-Id: Ic7cfffae5de878be683d27f92ccb5b034dc217c3
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 @@
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 @@
" 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;