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

1 files changed, 3 insertions, 3 deletions

diff --git a/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java b/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java
index 8cb4557cb..8969737d4 100644
--- a/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java
+++ b/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java
@@ -132,13 +132,13 @@ public class DialerPhoneNumberUtil {
    * Formats the provided number to E164 format or return a normalized version of the raw number if
    * the number is not valid according to {@link PhoneNumberUtil#isValidNumber(PhoneNumber)}.
    *
-   * @see #formatToE164(DialerPhoneNumber)
+   * @see #formatToValidE164(DialerPhoneNumber)
    * @see PhoneNumberUtils#normalizeNumber(String)
    */
   @WorkerThread
   public String normalizeNumber(DialerPhoneNumber number) {
     Assert.isWorkerThread();
-    return formatToE164(number)
+    return formatToValidE164(number)
         .or(PhoneNumberUtils.normalizeNumber(number.getRawInput().getNumber()));
   }
 
@@ -154,7 +154,7 @@ public class DialerPhoneNumberUtil {
    * @see PhoneNumberUtils#formatNumberToE164(String, String)
    */
   @WorkerThread
-  public Optional<String> formatToE164(DialerPhoneNumber number) {
+  public Optional<String> formatToValidE164(DialerPhoneNumber number) {
     Assert.isWorkerThread();
     if (number.hasDialerInternalPhoneNumber()) {
       PhoneNumber phoneNumber = Converter.protoToPojo(number.getDialerInternalPhoneNumber());