From 83583b735686aa02119f5754f77eb9f0d318fe44 Mon Sep 17 00:00:00 2001 From: Tony Mak Date: Mon, 22 Feb 2016 19:58:42 +0000 Subject: Show Briefcase icon not displayed in in-call UI for work SIP calls Current dialer always queries PhoneLookup._ID and uses this as a contact ID. In pre-N, contact id of non-sip query is stored in PhoneLookup._ID and it is actually a mistake. This problem does not exist in sip query, and contact id of sip query is stored in Data.CONTACT_ID. So it is a "bug" in dialer that we use PhoneLooup._ID for sip query as it is not really a contacat id. The bug of missing work badge may not be the only issue introduced by this. In N, the issue is get fixed in framework, PhoneLookup.CONTACT_ID is introduced. We should access PhoneLookup.CONTACT_ID no matter what phone lookup query we are having. The ideal case is we always use PhoneLookup.CONTACT_ID for retrieving contact id, but given that we need to support in pre-N, we need to query PhoneLookup._ID for contact id in non-sip query in pre-N. BUG:27242975 Change-Id: Id14378e3dce5b07629ffe0c6e83c3d107fbb468e --- tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/src/com') diff --git a/tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java b/tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java index 0e032c15f..680afb15f 100644 --- a/tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java +++ b/tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java @@ -63,7 +63,7 @@ public class ContactInfoHelperTest extends AndroidTestCase { public void testLookupContactFromUri_NoResults() { setUpQueryExpectations(PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI, - PhoneQuery.PHONE_LOOKUP_PROJECTION); + PhoneQuery.getPhoneLookupProjection(PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI)); Assert.assertEquals(ContactInfo.EMPTY, mContactInfoHelper.lookupContactFromUri( PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI, false)); @@ -72,7 +72,8 @@ public class ContactInfoHelperTest extends AndroidTestCase { public void testLookupContactFromUri_NoDisplayNameAlternative() { setUpQueryExpectations(PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI, - PhoneQuery.PHONE_LOOKUP_PROJECTION, TEST_LOOKUP_ROW); + PhoneQuery.getPhoneLookupProjection(PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI), + TEST_LOOKUP_ROW); setUpQueryExpectations(displayNameAlternativeUri, PhoneQuery.DISPLAY_NAME_ALTERNATIVE_PROJECTION); @@ -85,7 +86,8 @@ public class ContactInfoHelperTest extends AndroidTestCase { public void testLookupContactFromUri_HasDisplayNameAlternative() { setUpQueryExpectations(PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI, - PhoneQuery.PHONE_LOOKUP_PROJECTION, TEST_LOOKUP_ROW); + PhoneQuery.getPhoneLookupProjection(PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI), + TEST_LOOKUP_ROW); setUpQueryExpectations(displayNameAlternativeUri, PhoneQuery.DISPLAY_NAME_ALTERNATIVE_PROJECTION, TEST_DISPLAY_NAME_ALTERNATIVE_ROW); -- cgit v1.2.3