diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-06-21 21:23:25 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-21 21:23:25 +0000 |
commit | 219fe038593350a7d07bfd60a1e434793e5cd439 (patch) | |
tree | a6118c1ebb5579de110271c66482cfd509e82e27 /libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java | |
parent | b3d3a05359b72de8128ef151fada918213e38fe0 (diff) | |
parent | 55ae84c46746c1dc4e6882f70264be9f95620581 (diff) | |
download | libphonenumber-219fe038593350a7d07bfd60a1e434793e5cd439.tar.gz |
Merge "Update libphonenumber to v8.12.25" am: 257eb21b92 am: ebf20ccf48 am: 625a6e98cd am: 55ae84c467
Original change: https://android-review.googlesource.com/c/platform/external/libphonenumber/+/1739113
Change-Id: I5da239a4c8c3f3f0aca329823296b15349a834c7
Diffstat (limited to 'libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java')
-rw-r--r-- | libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java index a0d9957b..c9a1f5c3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java @@ -62,7 +62,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; @@ -166,9 +166,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. @@ -203,12 +203,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); |