diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-04-28 16:24:36 -0700 |
|---|---|---|
| committer | Makoto Onuki <omakoto@google.com> | 2015-04-28 16:26:52 -0700 |
| commit | 11d45334311f1b2ffa4f6697520939e6ce5b239e (patch) | |
| tree | 4d7fb17bb128f4413b12e28b1fd3a6a813aae63e /src/com/android/providers/contacts | |
| parent | 77b65aa3d1c2db02ce664c4b31e10370efe645cb (diff) | |
| download | packages_providers_ContactsProvider-11d45334311f1b2ffa4f6697520939e6ce5b239e.tar.gz packages_providers_ContactsProvider-11d45334311f1b2ffa4f6697520939e6ce5b239e.tar.bz2 packages_providers_ContactsProvider-11d45334311f1b2ffa4f6697520939e6ce5b239e.zip | |
Fix SIP enterprise lookup
SIP lookup's _id is the data ID, not the contact ID unlike the non-SIP lookup.
Properly use the contact ID for photo URLs.
Bug 20522260
Bug 20518934
Change-Id: I52535968363c56af3b371197287743eb6e517731
Diffstat (limited to 'src/com/android/providers/contacts')
| -rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index 1eecf0f0..5cbca9e9 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -6838,7 +6838,8 @@ public class ContactsProvider2 extends AbstractContactsProvider .appendPath(phoneNumber) .appendQueryParameter(PhoneLookup.QUERY_PARAMETER_SIP_ADDRESS, String.valueOf(isSipAddress)).build(); - return queryEnterpriseIfNecessary(localUri, projection, null, null, null, PhoneLookup._ID); + return queryEnterpriseIfNecessary(localUri, projection, null, null, null, + isSipAddress ? Data.CONTACT_ID : PhoneLookup._ID); } /** |