Fix SmartDialNameMatcher NANP test
Statically initialize prefix logic to use NANP matching for NANP tests
Bug: 10346442
Change-Id: Ia268de8a9bc5ad8dae70fe6934823a3c289f0bae
diff --git a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
index c160bd2..43aeb26 100644
--- a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
+++ b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
@@ -135,10 +135,6 @@
SmartDialPrefix.parsePhoneNumber(phoneNumber);
if (phoneNumberTokens == null) {
- if (matchPos != null) {
- replaceBitInMask(builder, matchPos);
- mPhoneNumberMatchMask = builder.toString();
- }
return matchPos;
}
if (phoneNumberTokens.countryCodeOffset != 0) {
diff --git a/tests/src/com/android/dialer/dialpad/SmartDialNameMatcherTest.java b/tests/src/com/android/dialer/dialpad/SmartDialNameMatcherTest.java
index 1e578ee..c1365f5 100644
--- a/tests/src/com/android/dialer/dialpad/SmartDialNameMatcherTest.java
+++ b/tests/src/com/android/dialer/dialpad/SmartDialNameMatcherTest.java
@@ -198,6 +198,7 @@
}
public void testMatches_NumberNANP() {
+ SmartDialPrefix.setUserInNanpRegion(true);
// An 11 digit number prefixed with 1 should be matched by the 10 digit number, as well as
// the 7 digit number (without area code)
checkMatchesNumber("1-510-333-7596", "5103337596", true, true, 2, 14);