diff options
| author | zachh <zachh@google.com> | 2018-01-12 15:19:00 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-01-12 15:20:18 -0800 |
| commit | a240266106bf99780a48d86883499dbebd20fbda (patch) | |
| tree | 67a670fcc3ffa1c0461e3e675f03ea4d33782e5f /java/com/android/dialer/phonelookup/blockednumber | |
| parent | f8eb6798d116165971702a698b3e3e6c495abec6 (diff) | |
Cleaned up wording around "valid" and "formattable".
We don't actually parition by "formattable", we parition by "valid". An invalid number like 456-7890 can be formatted to E164 ("+14567890") but what ParitionedNumbers actually does is parition by valid/invalid (and then converts the valid numbers to E164).
Also added a new sharded test suite for phonenumberproto tests which had occasionally been timing out on TAP.
Test: existing
PiperOrigin-RevId: 181800443
Change-Id: Id64fc32c893025b0115dd350dd87e3277607f21c
Diffstat (limited to 'java/com/android/dialer/phonelookup/blockednumber')
| -rw-r--r-- | java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java b/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java index 54df3995c..e6c15e8d9 100644 --- a/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java +++ b/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java @@ -134,7 +134,8 @@ public final class DialerBlockedNumberPhoneLookup implements PhoneLookup<DialerB null)) { while (cursor != null && cursor.moveToNext()) { if (cursor.getInt(1) == FilteredNumberTypes.BLOCKED_NUMBER) { - blockedNumbers.addAll(partitionedNumbers.dialerPhoneNumbersForE164(cursor.getString(0))); + blockedNumbers.addAll( + partitionedNumbers.dialerPhoneNumbersForValidE164(cursor.getString(0))); } } } @@ -143,8 +144,8 @@ public final class DialerBlockedNumberPhoneLookup implements PhoneLookup<DialerB Selection.column(FilteredNumberColumns.NUMBER) .in( partitionedNumbers - .unformattableNumbers() - .toArray(new String[partitionedNumbers.unformattableNumbers().size()])); + .invalidNumbers() + .toArray(new String[partitionedNumbers.invalidNumbers().size()])); try (Cursor cursor = appContext .getContentResolver() @@ -157,7 +158,7 @@ public final class DialerBlockedNumberPhoneLookup implements PhoneLookup<DialerB while (cursor != null && cursor.moveToNext()) { if (cursor.getInt(1) == FilteredNumberTypes.BLOCKED_NUMBER) { blockedNumbers.addAll( - partitionedNumbers.dialerPhoneNumbersForUnformattable(cursor.getString(0))); + partitionedNumbers.dialerPhoneNumbersForInvalid(cursor.getString(0))); } } } |