diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-07 20:25:58 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-07 20:25:58 +0000 |
commit | 5412de42cc632bb63c72ddf73867ea3a2c35cc6e (patch) | |
tree | e4758bf76e5f2516fdbdfc62e5966eb9cb82b6e7 /java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java | |
parent | f39d23184df8a5d7a18efc0c8a8ddb512b791629 (diff) | |
parent | 952fc68f330177b05c29275155b3f473b7ac4dbe (diff) |
Merge changes I6806c5c8,I60afe7c6,I6d103569,I4cd6f76b,I6ddbebc9, ...
* changes:
Hide bubble in (New)ReturnToCallController.tearDown().
Grouping each listener's logic in an inner class in CallDetailsActivity.
Allow VVM activation to be rerun if carrier sent STATUS SMS
Check for null subscription info list in TelecomUtil#getSubscriptionInfo.
Ignore "new" voicemails that are too old for notifications
Display the automatically detected home country in assisted dialing settings.
Add DATA_USAGE column to the annotated call log.
Temporarily disable PhoneHistoryRecorder.
Bubble v2 animation changes.
Refactor Assisted Dialing Settings into standalone activity.
Added PhoneLookupHistoryRecorder.
Added PhoneLookupSelector.
Diffstat (limited to 'java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java')
-rw-r--r-- | java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java b/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java index 7a7f2070b..010cb8541 100644 --- a/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java +++ b/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java @@ -31,6 +31,7 @@ import com.android.dialer.calllog.datasources.CallLogMutations; import com.android.dialer.common.LogUtil; import com.android.dialer.phonelookup.PhoneLookup; import com.android.dialer.phonelookup.PhoneLookupInfo; +import com.android.dialer.phonelookup.PhoneLookupSelector; import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract.PhoneLookupHistory; import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil; import com.google.common.collect.ImmutableMap; @@ -376,11 +377,7 @@ public final class PhoneLookupDataSource implements CallLogDataSource { } } - // TODO(zachh): Extract this logic into a proper selection class or package. private static String selectName(PhoneLookupInfo phoneLookupInfo) { - if (phoneLookupInfo.getCp2Info().getCp2ContactInfoCount() > 0) { - return phoneLookupInfo.getCp2Info().getCp2ContactInfo(0).getName(); - } - return ""; + return PhoneLookupSelector.selectName(phoneLookupInfo); } } |