diff options
| author | zachh <zachh@google.com> | 2018-04-17 18:05:25 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-04-17 18:25:49 -0700 |
| commit | 9e73256fa20b95dd05bf9b46fe43ad96c3823178 (patch) | |
| tree | b3c906e6253b82c88de50ad57825019649ed3e7c /java/com/android/dialer/calllog | |
| parent | 882c5bc1909eea75ac407120a1c3d36348372afd (diff) | |
Improved support for short codes in Coalescer.
Use ShortNumberInfo to identify shortcodes and apply more basic matching for them; without this short codes like '5555' and '55555' would match due to being a SHORT_NSN_MATCH even though they should not match.
Also removed the PhoneNumberUtil argument from DialerPhoneNumberUtil's constructor as it was always PhoneNumberUtil.getInstance(). (This allowed me to do a similar thing for ShortNumberInfo.getInstance()).
TEST=unit
Bug: 71586485
Test: unit
PiperOrigin-RevId: 193288929
Change-Id: Ia16c78e7eee5e0912d3913660952b9ee32713731
Diffstat (limited to 'java/com/android/dialer/calllog')
| -rw-r--r-- | java/com/android/dialer/calllog/database/Coalescer.java | 4 | ||||
| -rw-r--r-- | java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/java/com/android/dialer/calllog/database/Coalescer.java b/java/com/android/dialer/calllog/database/Coalescer.java index 5fdf0dfd9..8a16be2da 100644 --- a/java/com/android/dialer/calllog/database/Coalescer.java +++ b/java/com/android/dialer/calllog/database/Coalescer.java @@ -33,7 +33,6 @@ import com.android.dialer.compat.telephony.TelephonyManagerCompat; import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil; import com.android.dialer.telecom.TelecomUtil; import com.google.common.base.Preconditions; -import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.protobuf.InvalidProtocolBufferException; import java.util.ArrayList; import java.util.List; @@ -73,8 +72,7 @@ public class Coalescer { // Note: This method relies on rowsShouldBeCombined to determine which rows should be combined, // but delegates to data sources to actually aggregate column values. - DialerPhoneNumberUtil dialerPhoneNumberUtil = - new DialerPhoneNumberUtil(PhoneNumberUtil.getInstance()); + DialerPhoneNumberUtil dialerPhoneNumberUtil = new DialerPhoneNumberUtil(); MatrixCursor allCoalescedRowsMatrixCursor = new MatrixCursor( diff --git a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java index 99c3c9d0c..661b2495b 100644 --- a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java +++ b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java @@ -57,7 +57,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import com.google.i18n.phonenumbers.PhoneNumberUtil; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -251,8 +250,7 @@ public class SystemCallLogDataSource implements CallLogDataSource { Context appContext, CallLogMutations mutations, Set<Long> existingAnnotatedCallLogIds) { long previousTimestampProcessed = sharedPreferences.getLong(PREF_LAST_TIMESTAMP_PROCESSED, 0L); - DialerPhoneNumberUtil dialerPhoneNumberUtil = - new DialerPhoneNumberUtil(PhoneNumberUtil.getInstance()); + DialerPhoneNumberUtil dialerPhoneNumberUtil = new DialerPhoneNumberUtil(); // TODO(zachh): Really should be getting last 1000 by timestamp, not by last modified. try (Cursor cursor = |