diff options
author | Grace Jia <xiaotonj@google.com> | 2021-06-17 04:44:41 -0700 |
---|---|---|
committer | Grace Jia <xiaotonj@google.com> | 2021-06-17 04:44:41 -0700 |
commit | 4d14c5ffa51d6204ae85bab7c23b96253bdd665a (patch) | |
tree | a6118c1ebb5579de110271c66482cfd509e82e27 /repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java | |
parent | ed0b015aab7c24b7912b21019ac3e034e0fc86e1 (diff) | |
download | libphonenumber-4d14c5ffa51d6204ae85bab7c23b96253bdd665a.tar.gz |
Update libphonenumber to v8.12.25
Bug: b/184806094
Test: Telephony cts test, vogar
Signed-off-by: Grace Jia <xiaotonj@google.com>
Change-Id: I6dcfa56c5d73932d5409a7030ced788799c01850
Diffstat (limited to 'repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java')
-rw-r--r-- | repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java index 68744b56..f89a2b81 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java @@ -64,7 +64,7 @@ public class AsYouTypeFormatter { // code, from the national number. private static final char SEPARATOR_BEFORE_NATIONAL_NUMBER = ' '; private static final PhoneMetadata EMPTY_METADATA = - new PhoneMetadata().setInternationalPrefix("NA"); + PhoneMetadata.newBuilder().setId("<ignored>").setInternationalPrefix("NA").build(); private PhoneMetadata defaultMetadata; private PhoneMetadata currentMetadata; @@ -168,9 +168,9 @@ public class AsYouTypeFormatter { // First decide whether we should use international or national number rules. boolean isInternationalNumber = isCompleteNumber && extractedNationalPrefix.length() == 0; List<NumberFormat> formatList = - (isInternationalNumber && currentMetadata.intlNumberFormatSize() > 0) - ? currentMetadata.intlNumberFormats() - : currentMetadata.numberFormats(); + (isInternationalNumber && currentMetadata.getIntlNumberFormatCount() > 0) + ? currentMetadata.getIntlNumberFormatList() + : currentMetadata.getNumberFormatList(); for (NumberFormat format : formatList) { // Discard a few formats that we know are not relevant based on the presence of the national // prefix. @@ -205,12 +205,12 @@ public class AsYouTypeFormatter { Iterator<NumberFormat> it = possibleFormats.iterator(); while (it.hasNext()) { NumberFormat format = it.next(); - if (format.leadingDigitsPatternSize() == 0) { + if (format.getLeadingDigitsPatternCount() == 0) { // Keep everything that isn't restricted by leading digits. continue; } int lastLeadingDigitsPattern = - Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPatternSize() - 1); + Math.min(indexOfLeadingDigitsPattern, format.getLeadingDigitsPatternCount() - 1); Pattern leadingDigitsPattern = regexCache.getPatternForRegex( format.getLeadingDigitsPattern(lastLeadingDigitsPattern)); Matcher m = leadingDigitsPattern.matcher(leadingDigits); |