diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-19 17:05:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-19 17:05:55 +0000 |
| commit | 958b292fc04ad15879fff47df929d6d1a826615c (patch) | |
| tree | 7f16f98729404c79ed9d2d8dd6894e05a4049539 /java/com/android/dialer/app/calllog | |
| parent | 5cb3ecff08854c7b3da976f7981d1b9c3ff5bee0 (diff) | |
| parent | 88041ae80c81fc4dfab1e17f937baa35688b0040 (diff) | |
Merge changes I9a5b30d6,Ie9e7b741,I415f5b7e,I86e720b8,Ia8b7d508, ...
* changes:
Automated g4 rollback of changelist 172154863.
Take into account special dialable characters when grouping calls in the call log UI.
Move more Video Share stuff to third_party
Fix NPE in TelecomAdapter.stopForegroundNotification().
wrapping %s in in <xliff:g> </xliff:g> tags to prevent translation
Check AD eligibility before utilizing the feature.
Diffstat (limited to 'java/com/android/dialer/app/calllog')
| -rw-r--r-- | java/com/android/dialer/app/calllog/CallLogGroupBuilder.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java b/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java index 513c8aa59..f689571bd 100644 --- a/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java +++ b/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java @@ -21,7 +21,6 @@ import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; -import android.telephony.PhoneNumberUtils; import android.text.TextUtils; import android.text.format.Time; import com.android.contacts.common.util.DateUtils; @@ -194,7 +193,7 @@ public class CallLogGroupBuilder { if (PhoneNumberHelper.isUriNumber(number1) || PhoneNumberHelper.isUriNumber(number2)) { return compareSipAddresses(number1, number2); } else { - return PhoneNumberUtils.compare(number1, number2); + return PhoneNumberHelper.compare(number1, number2); } } |