summaryrefslogtreecommitdiffstats
path: root/src/com/android/providers/contacts/aggregation
diff options
context:
space:
mode:
authorZheng Fu <zhengfu@google.com>2014-11-13 12:07:24 -0800
committerZheng Fu <zhengfu@google.com>2014-11-13 12:07:24 -0800
commitdf1e589415a68f4427219459ced28638d382132b (patch)
treeaae17cdfd4f646c0954c60b5c8db4066947f0dda /src/com/android/providers/contacts/aggregation
parent77e675b050770c1bd68906c25859d7cdf8ea49db (diff)
downloadpackages_providers_ContactsProvider-df1e589415a68f4427219459ced28638d382132b.zip
packages_providers_ContactsProvider-df1e589415a68f4427219459ced28638d382132b.tar.gz
packages_providers_ContactsProvider-df1e589415a68f4427219459ced28638d382132b.tar.bz2
Make the email comparison case-insensitive for contact aggregation.
Bug:18304324 Change-Id: If9e11022e392323b770c7560eba69617769ca080
Diffstat (limited to 'src/com/android/providers/contacts/aggregation')
-rw-r--r--src/com/android/providers/contacts/aggregation/ContactAggregator.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/providers/contacts/aggregation/ContactAggregator.java b/src/com/android/providers/contacts/aggregation/ContactAggregator.java
index e4044c2..ed73114 100644
--- a/src/com/android/providers/contacts/aggregation/ContactAggregator.java
+++ b/src/com/android/providers/contacts/aggregation/ContactAggregator.java
@@ -930,7 +930,7 @@ public class ContactAggregator {
"SELECT count(*)" +
" FROM " + Tables.DATA + " AS d1" +
" JOIN " + Tables.DATA + " AS d2"
- + " ON (d1." + Email.ADDRESS + " = d2." + Email.ADDRESS + ")" +
+ + " ON lower(d1." + Email.ADDRESS + ") = lower(d2." + Email.ADDRESS + ")" +
" WHERE d1." + DataColumns.MIMETYPE_ID + " = ?1" +
" AND d2." + DataColumns.MIMETYPE_ID + " = ?1" +
" AND d1." + Data.RAW_CONTACT_ID + " = ?2" +
@@ -1616,7 +1616,7 @@ public class ContactAggregator {
private interface EmailLookupQuery {
String TABLE = Tables.DATA + " dataA"
+ " JOIN " + Tables.DATA + " dataB" +
- " ON (" + "dataA." + Email.DATA + "=dataB." + Email.DATA + ")"
+ " ON lower(" + "dataA." + Email.DATA + ")=lower(dataB." + Email.DATA + ")"
+ " JOIN " + Tables.RAW_CONTACTS +
" ON (dataB." + Data.RAW_CONTACT_ID + " = "
+ Tables.RAW_CONTACTS + "." + RawContacts._ID + ")";