From 3bf84127cd907af57524cce9db4ad02455cd0495 Mon Sep 17 00:00:00 2001 From: linyuh Date: Sun, 8 Apr 2018 23:28:26 -0700 Subject: Have PhoneLookup read carrier presence data from CP2. Bug: 70988687 Test: Cp2DefaultDirectoryPhoneLookupTest, PhoneLookupInfoConsolidatorTest PiperOrigin-RevId: 192085574 Change-Id: I4512c9e2e9e14340fa3aa9b2d7d6aaea6344bba6 --- .../android/dialer/phonelookup/cp2/Cp2Projections.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'java/com/android/dialer/phonelookup/cp2') diff --git a/java/com/android/dialer/phonelookup/cp2/Cp2Projections.java b/java/com/android/dialer/phonelookup/cp2/Cp2Projections.java index 5a211eddc..377091264 100644 --- a/java/com/android/dialer/phonelookup/cp2/Cp2Projections.java +++ b/java/com/android/dialer/phonelookup/cp2/Cp2Projections.java @@ -41,7 +41,8 @@ final class Cp2Projections { Phone.LABEL, // 5 Phone.NORMALIZED_NUMBER, // 6 Phone.CONTACT_ID, // 7 - Phone.LOOKUP_KEY // 8 + Phone.LOOKUP_KEY, // 8 + Phone.CARRIER_PRESENCE }; // Projection for performing lookups using the PHONE_LOOKUP table @@ -58,7 +59,8 @@ final class Cp2Projections { PhoneLookup.LOOKUP_KEY // 8 }; - // The following indexes should match both PHONE_PROJECTION and PHONE_LOOKUP_PROJECTION above. + // The following indexes should match the common columns in + // PHONE_PROJECTION and PHONE_LOOKUP_PROJECTION above. private static final int CP2_INFO_NAME_INDEX = 0; private static final int CP2_INFO_PHOTO_THUMBNAIL_URI_INDEX = 1; private static final int CP2_INFO_PHOTO_URI_INDEX = 2; @@ -116,6 +118,16 @@ final class Cp2Projections { if (!TextUtils.isEmpty(lookupKey)) { infoBuilder.setLookupUri(Contacts.getLookupUri(contactId, lookupKey).toString()); } + + // Only PHONE_PROJECTION has a column containing carrier presence info. + int carrierPresenceColumn = cursor.getColumnIndex(Phone.CARRIER_PRESENCE); + if (carrierPresenceColumn != -1) { + int carrierPresenceInfo = cursor.getInt(carrierPresenceColumn); + infoBuilder.setCanSupportCarrierVideoCall( + (carrierPresenceInfo & Phone.CARRIER_PRESENCE_VT_CAPABLE) + == Phone.CARRIER_PRESENCE_VT_CAPABLE); + } + return infoBuilder.build(); } -- cgit v1.2.3