diff options
author | zachh <zachh@google.com> | 2017-12-14 00:48:12 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2017-12-14 00:52:09 -0800 |
commit | 888733af75fd738dd1b503ab8a77c5eb3212d575 (patch) | |
tree | 6d5b92cbf61ac95238f68b170d26fc2045e518a8 /java/com/android/dialer/calllog | |
parent | 38ed3cc6182411c0a09b51efc8f685cb1388c776 (diff) |
Support normalization of numbers in Cp2PhoneLookup.
Bug: 34672501
Test: unit
PiperOrigin-RevId: 179012381
Change-Id: Icb78c73e243702a71f1a48692151b696ae2ac95f
Diffstat (limited to 'java/com/android/dialer/calllog')
-rw-r--r-- | java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java b/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java index 93e841409..fbb58312a 100644 --- a/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java +++ b/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java @@ -197,7 +197,7 @@ public final class PhoneLookupDataSource implements CallLogDataSource { } // Also save the updated information so that it can be written to PhoneLookupHistory // in onSuccessfulFill. - String normalizedNumber = dialerPhoneNumberUtil.formatToE164(dialerPhoneNumber); + String normalizedNumber = dialerPhoneNumberUtil.normalizeNumber(dialerPhoneNumber); phoneLookupHistoryRowsToUpdate.put(normalizedNumber, upToDateInfo); } } @@ -369,7 +369,7 @@ public final class PhoneLookupDataSource implements CallLogDataSource { DialerPhoneNumberUtil dialerPhoneNumberUtil = new DialerPhoneNumberUtil(PhoneNumberUtil.getInstance()); Map<DialerPhoneNumber, String> dialerPhoneNumberToNormalizedNumbers = - Maps.asMap(uniqueDialerPhoneNumbers, dialerPhoneNumberUtil::formatToE164); + Maps.asMap(uniqueDialerPhoneNumbers, dialerPhoneNumberUtil::normalizeNumber); // Convert values to a set to remove any duplicates that are the result of two // DialerPhoneNumbers mapping to the same normalized number. @@ -508,7 +508,7 @@ public final class PhoneLookupDataSource implements CallLogDataSource { for (Entry<DialerPhoneNumber, Set<Long>> entry : annotatedCallLogIdsByNumber.entrySet()) { DialerPhoneNumber dialerPhoneNumber = entry.getKey(); Set<Long> idsForDialerPhoneNumber = entry.getValue(); - String normalizedNumber = dialerPhoneNumberUtil.formatToE164(dialerPhoneNumber); + String normalizedNumber = dialerPhoneNumberUtil.normalizeNumber(dialerPhoneNumber); Set<Long> idsForNormalizedNumber = idsByNormalizedNumber.get(normalizedNumber); if (idsForNormalizedNumber == null) { idsForNormalizedNumber = new ArraySet<>(); |