From 679c717fca664c0703e9ea3a58239d30f1cadea1 Mon Sep 17 00:00:00 2001 From: Tony Mak Date: Thu, 11 Feb 2016 21:21:30 +0000 Subject: Use DATA.CONTACT_ID when lookup SIP call It is actually a naming mistake in framework, the column store contact id of normal query is _id, but that of sip query is contact_id. It is an old issue and we can't do much in the framework side. So, we need to use the correct projection when it is a SIP call. Bug:27143980 Bug:27141566 (cherry picked from commit 328f75ff518bf7d8863c6cf4446e26636e05b297) Change-Id: I0551c308072892ef13c8cb14ea4a4ab37ffa6f83 --- tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/src') diff --git a/tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java b/tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java index 588a27fcf..0e032c15f 100644 --- a/tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java +++ b/tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java @@ -58,7 +58,7 @@ public class ContactInfoHelperTest extends AndroidTestCase { } public void testLookupContactFromUri_NullUri() { - Assert.assertNull(mContactInfoHelper.lookupContactFromUri(null)); + Assert.assertNull(mContactInfoHelper.lookupContactFromUri(null, false)); } public void testLookupContactFromUri_NoResults() { @@ -66,7 +66,7 @@ public class ContactInfoHelperTest extends AndroidTestCase { PhoneQuery.PHONE_LOOKUP_PROJECTION); Assert.assertEquals(ContactInfo.EMPTY, mContactInfoHelper.lookupContactFromUri( - PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI)); + PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI, false)); mContext.verify(); } @@ -77,7 +77,7 @@ public class ContactInfoHelperTest extends AndroidTestCase { PhoneQuery.DISPLAY_NAME_ALTERNATIVE_PROJECTION); ContactInfo contactInfo = mContactInfoHelper.lookupContactFromUri( - PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI); + PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI, false); Assert.assertEquals(TEST_DISPLAY_NAME, contactInfo.name); Assert.assertNull(contactInfo.nameAlternative); mContext.verify(); @@ -90,7 +90,7 @@ public class ContactInfoHelperTest extends AndroidTestCase { PhoneQuery.DISPLAY_NAME_ALTERNATIVE_PROJECTION, TEST_DISPLAY_NAME_ALTERNATIVE_ROW); ContactInfo contactInfo = mContactInfoHelper.lookupContactFromUri( - PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI); + PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI, false); Assert.assertEquals(TEST_DISPLAY_NAME, contactInfo.name); Assert.assertEquals(TEST_DISPLAY_NAME_ALTERNATIVE, contactInfo.nameAlternative); mContext.verify(); -- cgit v1.2.3