From 9e73256fa20b95dd05bf9b46fe43ad96c3823178 Mon Sep 17 00:00:00 2001 From: zachh Date: Tue, 17 Apr 2018 18:05:25 -0700 Subject: 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 --- .../dialer/phonenumberproto/DialerPhoneNumberUtil.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'java/com/android/dialer/phonenumberproto') diff --git a/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java b/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java index a5b9520fd..d8079efe3 100644 --- a/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java +++ b/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java @@ -29,6 +29,7 @@ import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.PhoneNumberUtil.MatchType; import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; +import com.google.i18n.phonenumbers.ShortNumberInfo; /** * Wrapper for selected methods in {@link PhoneNumberUtil} which uses the {@link DialerPhoneNumber} @@ -38,11 +39,13 @@ import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; */ public class DialerPhoneNumberUtil { private final PhoneNumberUtil phoneNumberUtil; + private final ShortNumberInfo shortNumberInfo; @WorkerThread - public DialerPhoneNumberUtil(@NonNull PhoneNumberUtil phoneNumberUtil) { + public DialerPhoneNumberUtil() { Assert.isWorkerThread(); - this.phoneNumberUtil = Assert.isNotNull(phoneNumberUtil); + this.phoneNumberUtil = PhoneNumberUtil.getInstance(); + this.shortNumberInfo = ShortNumberInfo.getInstance(); } /** @@ -159,6 +162,13 @@ public class DialerPhoneNumberUtil { return firstNumberIn.getNormalizedNumber().equals(secondNumberIn.getNormalizedNumber()); } + // Both numbers are parseable, first check for short codes to so that a number like "5555" + // doesn't match "55555" (due to those being a SHORT_NSN_MATCH below). + if (shortNumberInfo.isPossibleShortNumber(phoneNumber1) + || shortNumberInfo.isPossibleShortNumber(phoneNumber2)) { + return firstNumberIn.getNormalizedNumber().equals(secondNumberIn.getNormalizedNumber()); + } + // Both numbers are parseable, use more sophisticated libphonenumber matching. MatchType matchType = phoneNumberUtil.isNumberMatch(phoneNumber1, phoneNumber2); -- cgit v1.2.3