Fix SmartDialNameMatcher NANP test

Statically initialize prefix logic to use NANP matching for NANP tests

Bug: 10346442

Change-Id: Ia268de8a9bc5ad8dae70fe6934823a3c289f0bae

2 files changed, 1 insertions, 4 deletions

diff --git a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
index c160bd258..43aeb26ec 100644
--- a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
+++ b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
@@ -135,10 +135,6 @@ public class SmartDialNameMatcher {
                     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 1e578eee7..c1365f5cf 100644
--- a/tests/src/com/android/dialer/dialpad/SmartDialNameMatcherTest.java
+++ b/tests/src/com/android/dialer/dialpad/SmartDialNameMatcherTest.java
@@ -198,6 +198,7 @@ public class SmartDialNameMatcherTest extends TestCase {
     }
 
     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);