Upgrade to 8.10.3

Created using ./update-from-external.sh 8.10.3

m -j32 droid
adb reboot bootloader
fastboot flashall -w
m -j32 cts
cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.PhoneNumberUtilsTest
m -j32 libphonenumber-test vogar dx
vogar --timeout 0 \
    --classpath ${ANDROID_BUILD_TOP}/out/target/common/obj/JAVA_LIBRARIES/libphonenumber-test_intermediates/classes.jar \
        com.google.i18n.phonenumbers

Bug: 120045955
Test: see above
Change-Id: If633f16b8a29d00caaf973f5f8a31f2d6feead69

1 files changed, 28 insertions, 39 deletions

diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
index 64113593..fe86ca2e 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
@@ -19,7 +19,6 @@ package com.google.i18n.phonenumbers;
 import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat;
 import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
 import com.google.i18n.phonenumbers.internal.RegexCache;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -67,16 +66,6 @@ public class AsYouTypeFormatter {
   private PhoneMetadata defaultMetadata;
   private PhoneMetadata currentMetadata;
 
-  // A pattern that is used to match character classes in regular expressions. An example of a
-  // character class is [1-4].
-  private static final Pattern CHARACTER_CLASS_PATTERN = Pattern.compile("\\[([^\\[\\]])*\\]");
-  // Any digit in a regular expression that actually denotes a digit. For example, in the regular
-  // expression 80[0-2]\d{6,10}, the first 2 digits (8 and 0) are standalone digits, but the rest
-  // are not.
-  // Two look-aheads are needed because the number following \\d could be a two-digit number, since
-  // the phone number can be as long as 15 digits.
-  private static final Pattern STANDALONE_DIGIT_PATTERN = Pattern.compile("\\d(?=[^,}][^,}])");
-
   // A pattern that is used to determine if a numberFormat under availableFormats is eligible to be
   // used by the AYTF. It is eligible when the format element under numberFormat contains groups of
   // the dollar sign followed by a single digit, separated by valid phone number punctuation. This
@@ -174,29 +163,41 @@ public class AsYouTypeFormatter {
   }
 
   private void getAvailableFormats(String leadingDigits) {
+    // First decide whether we should use international or national number rules.
+    boolean isInternationalNumber = isCompleteNumber && extractedNationalPrefix.length() == 0;
     List<NumberFormat> formatList =
-        (isCompleteNumber && currentMetadata.intlNumberFormatSize() > 0)
-        ? currentMetadata.intlNumberFormats()
-        : currentMetadata.numberFormats();
-    boolean nationalPrefixIsUsedByCountry = currentMetadata.hasNationalPrefix();
+        (isInternationalNumber && currentMetadata.intlNumberFormatSize() > 0)
+            ? currentMetadata.intlNumberFormats()
+            : currentMetadata.numberFormats();
     for (NumberFormat format : formatList) {
-      if (!nationalPrefixIsUsedByCountry
-          || isCompleteNumber
-          || format.getNationalPrefixOptionalWhenFormatting()
-          || PhoneNumberUtil.formattingRuleHasFirstGroupOnly(
-              format.getNationalPrefixFormattingRule())) {
-        if (isFormatEligible(format.getFormat())) {
-          possibleFormats.add(format);
-        }
+      // Discard a few formats that we know are not relevant based on the presence of the national
+      // prefix.
+      if (extractedNationalPrefix.length() > 0
+          && PhoneNumberUtil.formattingRuleHasFirstGroupOnly(
+              format.getNationalPrefixFormattingRule())
+          && !format.getNationalPrefixOptionalWhenFormatting()
+          && !format.hasDomesticCarrierCodeFormattingRule()) {
+        // If it is a national number that had a national prefix, any rules that aren't valid with a
+        // national prefix should be excluded. A rule that has a carrier-code formatting rule is
+        // kept since the national prefix might actually be an extracted carrier code - we don't
+        // distinguish between these when extracting it in the AYTF.
+        continue;
+      } else if (extractedNationalPrefix.length() == 0
+          && !isCompleteNumber
+          && !PhoneNumberUtil.formattingRuleHasFirstGroupOnly(
+              format.getNationalPrefixFormattingRule())
+          && !format.getNationalPrefixOptionalWhenFormatting()) {
+        // This number was entered without a national prefix, and this formatting rule requires one,
+        // so we discard it.
+        continue;
+      }
+      if (ELIGIBLE_FORMAT_PATTERN.matcher(format.getFormat()).matches()) {
+        possibleFormats.add(format);
       }
     }
     narrowDownPossibleFormats(leadingDigits);
   }
 
-  private boolean isFormatEligible(String format) {
-    return ELIGIBLE_FORMAT_PATTERN.matcher(format).matches();
-  }
-
   private void narrowDownPossibleFormats(String leadingDigits) {
     int indexOfLeadingDigitsPattern = leadingDigits.length() - MIN_LEADING_DIGITS_LENGTH;
     Iterator<NumberFormat> it = possibleFormats.iterator();
@@ -219,18 +220,6 @@ public class AsYouTypeFormatter {
 
   private boolean createFormattingTemplate(NumberFormat format) {
     String numberPattern = format.getPattern();
-
-    // The formatter doesn't format numbers when numberPattern contains "|", e.g.
-    // (20|3)\d{4}. In those cases we quickly return.
-    if (numberPattern.indexOf('|') != -1) {
-      return false;
-    }
-
-    // Replace anything in the form of [..] with \d
-    numberPattern = CHARACTER_CLASS_PATTERN.matcher(numberPattern).replaceAll("\\\\d");
-
-    // Replace any standalone digit (not the one in d{}) with \d
-    numberPattern = STANDALONE_DIGIT_PATTERN.matcher(numberPattern).replaceAll("\\\\d");
     formattingTemplate.setLength(0);
     String tempTemplate = getFormattingTemplate(numberPattern, format.getFormat());
     if (tempTemplate.length() > 0) {