diff --git a/java/release_notes.txt b/java/release_notes.txt index 3aa751b7a..0fb5dc645 100644 --- a/java/release_notes.txt +++ b/java/release_notes.txt @@ -1,3 +1,19 @@ +November 10th, 2011: libphonenumber-4.2 +* Code changes + - Providing an "exact match" isEmergencyNumber method + - Improvement to PhoneNumberMatcher: requires national prefix to be present + when matching national-format numbers, unless matching for a region where it + is explicitly marked in the metadata that they may be omitted. Applies to + leniency level VALID and higher. + - Change formatNumberForMobileDialing not to modify the phoneNumber passed in. + +* Metadata changes + - Emergency numbers added for all remaining countries + - Collected data on which numbers we format with a national prefix are + commonly written without one and added this + - Updates for AR, AT, BH, CZ, GR, IR, KM, LT, MX, PT, SE, SO, UG + - Addition of SX (Sint Maarten) + October 19th, 2011: libphonenumber-4.1 * Code changes - Update code and metadata for countries with IDD "8~10" to accept phone diff --git a/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java b/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java index 5a64fe875..b69c3cab4 100644 --- a/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java +++ b/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java @@ -38,7 +38,7 @@ public class CountryCodeToRegionCodeMap { ArrayList listWithRegionCode; - listWithRegionCode = new ArrayList(24); + listWithRegionCode = new ArrayList(25); listWithRegionCode.add("US"); listWithRegionCode.add("AG"); listWithRegionCode.add("AI"); @@ -58,6 +58,7 @@ public class CountryCodeToRegionCodeMap { listWithRegionCode.add("MP"); listWithRegionCode.add("MS"); listWithRegionCode.add("PR"); + listWithRegionCode.add("SX"); listWithRegionCode.add("TC"); listWithRegionCode.add("TT"); listWithRegionCode.add("VC"); diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java b/java/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java index 7969a0620..62586f13c 100644 --- a/java/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java +++ b/java/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java @@ -279,6 +279,7 @@ final class PhoneNumberMatcher implements Iterator { * combining marks should also return true since we assume they have been added to a preceding * Latin character. */ + // @VisibleForTesting static boolean isLatinLetter(char letter) { // Combining marks are a subset of non-spacing-mark. if (!Character.isLetter(letter) && Character.getType(letter) != Character.NON_SPACING_MARK) { @@ -420,8 +421,14 @@ final class PhoneNumberMatcher implements Iterator { } } - PhoneNumber number = phoneUtil.parse(candidate, preferredRegion); + PhoneNumber number = phoneUtil.parseAndKeepRawInput(candidate, preferredRegion); if (leniency.verify(number, candidate, phoneUtil)) { + // We used parseAndKeepRawInput to create this number, but for now we don't return the extra + // values parsed. TODO: stop clearing all values here and switch all users over + // to using rawInput() rather than the rawString() of PhoneNumberMatch. + number.clearCountryCodeSource(); + number.clearRawInput(); + number.clearPreferredDomesticCarrierCode(); return new PhoneNumberMatch(offset, candidate, number); } } catch (NumberParseException e) { diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index 01d028188..05f438f2b 100644 --- a/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -420,15 +420,18 @@ public class PhoneNumberUtil { /** * Phone numbers accepted are * {@linkplain PhoneNumberUtil#isPossibleNumber(Phonenumber.PhoneNumber) possible} and - * {@linkplain PhoneNumberUtil#isValidNumber(Phonenumber.PhoneNumber) valid}. + * {@linkplain PhoneNumberUtil#isValidNumber(Phonenumber.PhoneNumber) valid}. Numbers written + * in national format must have their national-prefix present if it is usually written for a + * number of this type. */ VALID { @Override boolean verify(PhoneNumber number, String candidate, PhoneNumberUtil util) { - if (!util.isValidNumber(number)) { + if (!util.isValidNumber(number) || + !containsOnlyValidXChars(number, candidate, util)) { return false; } - return containsOnlyValidXChars(number, candidate, util); + return isNationalPrefixPresentIfRequired(number, util); } }, /** @@ -447,7 +450,8 @@ public class PhoneNumberUtil { boolean verify(PhoneNumber number, String candidate, PhoneNumberUtil util) { if (!util.isValidNumber(number) || !containsOnlyValidXChars(number, candidate, util) || - containsMoreThanOneSlash(candidate)) { + containsMoreThanOneSlash(candidate) || + !isNationalPrefixPresentIfRequired(number, util)) { return false; } // TODO: Evaluate how this works for other locales (testing has been @@ -501,7 +505,8 @@ public class PhoneNumberUtil { boolean verify(PhoneNumber number, String candidate, PhoneNumberUtil util) { if (!util.isValidNumber(number) || !containsOnlyValidXChars(number, candidate, util) || - containsMoreThanOneSlash(candidate)) { + containsMoreThanOneSlash(candidate) || + !isNationalPrefixPresentIfRequired(number, util)) { return false; } // TODO: Evaluate how this works for other locales (testing has been @@ -591,6 +596,51 @@ public class PhoneNumberUtil { return true; } + private static boolean isNationalPrefixPresentIfRequired( + PhoneNumber number, PhoneNumberUtil util) { + // First, check how we deduced the country code. If it was written in international format, + // then the national prefix is not required. + if (number.getCountryCodeSource() != CountryCodeSource.FROM_DEFAULT_COUNTRY) { + return true; + } + String phoneNumberRegion = + util.getRegionCodeForCountryCode(number.getCountryCode()); + PhoneMetadata metadata = util.getMetadataForRegion(phoneNumberRegion); + if (metadata == null) { + return true; + } + // Check if a national prefix should be present when formatting this number. + String nationalNumber = util.getNationalSignificantNumber(number); + NumberFormat formatRule = + util.chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber); + // To do this, we check that a national prefix formatting rule was present and that it wasn't + // just the first-group symbol ($1) with punctuation. + if ((formatRule != null) && formatRule.getNationalPrefixFormattingRule().length() > 0) { + if (formatRule.isNationalPrefixOptionalWhenFormatting()) { + // The national-prefix is optional in these cases, so we don't need to check if it was + // present. + return true; + } + // Remove the first-group symbol. + String candidateNationalPrefixRule = formatRule.getNationalPrefixFormattingRule(); + // We assume that the first-group symbol will never be _before_ the national prefix. + candidateNationalPrefixRule = + candidateNationalPrefixRule.substring(0, candidateNationalPrefixRule.indexOf("$1")); + candidateNationalPrefixRule = util.normalizeDigitsOnly(candidateNationalPrefixRule); + if (candidateNationalPrefixRule.length() == 0) { + // National Prefix not needed for this number. + return true; + } + // Normalize the remainder. + String rawInputCopy = util.normalizeDigitsOnly(number.getRawInput()); + StringBuilder rawInput = new StringBuilder(rawInputCopy); + // Check if we found a national prefix and/or carrier code at the start of the raw input, + // and return the result. + return util.maybeStripNationalPrefixAndCarrierCode(rawInput, metadata, null); + } + return true; + } + /** Returns true if {@code number} is a verified number according to this leniency. */ abstract boolean verify(PhoneNumber number, String candidate, PhoneNumberUtil util); } @@ -1476,6 +1526,22 @@ public class PhoneNumberUtil { return formattedNationalNumber; } + private NumberFormat chooseFormattingPatternForNumber(List availableFormats, + String nationalNumber) { + for (NumberFormat numFormat : availableFormats) { + int size = numFormat.leadingDigitsPatternSize(); + if (size == 0 || regexCache.getPatternForRegex( + // We always use the last leading_digits_pattern, as it is the most detailed. + numFormat.getLeadingDigitsPattern(size - 1)).matcher(nationalNumber).lookingAt()) { + Matcher m = regexCache.getPatternForRegex(numFormat.getPattern()).matcher(nationalNumber); + if (m.matches()) { + return numFormat; + } + } + } + return null; + } + // Simple wrapper of formatAccordingToFormats for the common case of no carrier code. private String formatAccordingToFormats(String nationalNumber, List availableFormats, @@ -1489,44 +1555,37 @@ public class PhoneNumberUtil { List availableFormats, PhoneNumberFormat numberFormat, String carrierCode) { - for (NumberFormat numFormat : availableFormats) { - int size = numFormat.leadingDigitsPatternSize(); - if (size == 0 || regexCache.getPatternForRegex( - // We always use the last leading_digits_pattern, as it is the most detailed. - numFormat.getLeadingDigitsPattern(size - 1)).matcher(nationalNumber).lookingAt()) { - Matcher m = regexCache.getPatternForRegex(numFormat.getPattern()).matcher(nationalNumber); - if (m.matches()) { - String numberFormatRule = numFormat.getFormat(); - if (numberFormat == PhoneNumberFormat.NATIONAL && - carrierCode != null && carrierCode.length() > 0 && - numFormat.getDomesticCarrierCodeFormattingRule().length() > 0) { - // Replace the $CC in the formatting rule with the desired carrier code. - String carrierCodeFormattingRule = numFormat.getDomesticCarrierCodeFormattingRule(); - carrierCodeFormattingRule = - CC_PATTERN.matcher(carrierCodeFormattingRule).replaceFirst(carrierCode); - // Now replace the $FG in the formatting rule with the first group and the carrier code - // combined in the appropriate way. - numberFormatRule = FIRST_GROUP_PATTERN.matcher(numberFormatRule) - .replaceFirst(carrierCodeFormattingRule); - return m.replaceAll(numberFormatRule); - } else { - // Use the national prefix formatting rule instead. - String nationalPrefixFormattingRule = numFormat.getNationalPrefixFormattingRule(); - if (numberFormat == PhoneNumberFormat.NATIONAL && - nationalPrefixFormattingRule != null && - nationalPrefixFormattingRule.length() > 0) { - Matcher firstGroupMatcher = FIRST_GROUP_PATTERN.matcher(numberFormatRule); - return m.replaceAll(firstGroupMatcher.replaceFirst(nationalPrefixFormattingRule)); - } else { - return m.replaceAll(numberFormatRule); - } - } - } + NumberFormat numFormat = chooseFormattingPatternForNumber(availableFormats, nationalNumber); + if (numFormat == null) { + // If no pattern above is matched, we format the number as a whole. + return nationalNumber; + } + String numberFormatRule = numFormat.getFormat(); + Matcher m = regexCache.getPatternForRegex(numFormat.getPattern()).matcher(nationalNumber); + if (numberFormat == PhoneNumberFormat.NATIONAL && + carrierCode != null && carrierCode.length() > 0 && + numFormat.getDomesticCarrierCodeFormattingRule().length() > 0) { + // Replace the $CC in the formatting rule with the desired carrier code. + String carrierCodeFormattingRule = numFormat.getDomesticCarrierCodeFormattingRule(); + carrierCodeFormattingRule = + CC_PATTERN.matcher(carrierCodeFormattingRule).replaceFirst(carrierCode); + // Now replace the $FG in the formatting rule with the first group and the carrier code + // combined in the appropriate way. + numberFormatRule = FIRST_GROUP_PATTERN.matcher(numberFormatRule) + .replaceFirst(carrierCodeFormattingRule); + return m.replaceAll(numberFormatRule); + } else { + // Use the national prefix formatting rule instead. + String nationalPrefixFormattingRule = numFormat.getNationalPrefixFormattingRule(); + if (numberFormat == PhoneNumberFormat.NATIONAL && + nationalPrefixFormattingRule != null && + nationalPrefixFormattingRule.length() > 0) { + Matcher firstGroupMatcher = FIRST_GROUP_PATTERN.matcher(numberFormatRule); + return m.replaceAll(firstGroupMatcher.replaceFirst(nationalPrefixFormattingRule)); + } else { + return m.replaceAll(numberFormatRule); } } - - // If no pattern above is matched, we format the number as a whole. - return nationalNumber; } /** @@ -2131,7 +2190,8 @@ public class PhoneNumberUtil { PhoneNumberDesc generalDesc = defaultRegionMetadata.getGeneralDesc(); Pattern validNumberPattern = regexCache.getPatternForRegex(generalDesc.getNationalNumberPattern()); - maybeStripNationalPrefixAndCarrierCode(potentialNationalNumber, defaultRegionMetadata); + maybeStripNationalPrefixAndCarrierCode( + potentialNationalNumber, defaultRegionMetadata, null /* Don't need the carrier code */); Pattern possibleNumberPattern = regexCache.getPatternForRegex(generalDesc.getPossibleNumberPattern()); // If the number was not valid before but is valid now, or if it was too long before, we @@ -2219,16 +2279,17 @@ public class PhoneNumberUtil { * @param number the normalized telephone number that we wish to strip any national * dialing prefix from * @param metadata the metadata for the region that we think this number is from - * @return the carrier code extracted if it is present, otherwise return an empty string. + * @param carrierCode a place to insert the carrier code if one is extracted + * @return true if a national prefix or carrier code (or both) could be extracted. */ // @VisibleForTesting - String maybeStripNationalPrefixAndCarrierCode(StringBuilder number, PhoneMetadata metadata) { - String carrierCode = ""; + boolean maybeStripNationalPrefixAndCarrierCode( + StringBuilder number, PhoneMetadata metadata, StringBuilder carrierCode) { int numberLength = number.length(); String possibleNationalPrefix = metadata.getNationalPrefixForParsing(); if (numberLength == 0 || possibleNationalPrefix.length() == 0) { // Early return for numbers of zero length. - return ""; + return false; } // Attempt to parse the first digits as a national prefix. Matcher prefixMatcher = regexCache.getPatternForRegex(possibleNationalPrefix).matcher(number); @@ -2247,12 +2308,13 @@ public class PhoneNumberUtil { // If the original number was viable, and the resultant number is not, we return. if (isViableOriginalNumber && !nationalNumberRule.matcher(number.substring(prefixMatcher.end())).matches()) { - return ""; + return false; } - if (numOfGroups > 0 && prefixMatcher.group(numOfGroups) != null) { - carrierCode = prefixMatcher.group(1); + if (carrierCode != null && numOfGroups > 0 && prefixMatcher.group(numOfGroups) != null) { + carrierCode.append(prefixMatcher.group(1)); } number.delete(0, prefixMatcher.end()); + return true; } else { // Check that the resultant number is still viable. If not, return. Check this by copying // the string buffer and making the transformation on the copy first. @@ -2260,15 +2322,16 @@ public class PhoneNumberUtil { transformedNumber.replace(0, numberLength, prefixMatcher.replaceFirst(transformRule)); if (isViableOriginalNumber && !nationalNumberRule.matcher(transformedNumber.toString()).matches()) { - return ""; + return false; } - if (numOfGroups > 1) { - carrierCode = prefixMatcher.group(1); + if (carrierCode != null && numOfGroups > 1) { + carrierCode.append(prefixMatcher.group(1)); } number.replace(0, number.length(), transformedNumber.toString()); + return true; } } - return carrierCode; + return false; } /** @@ -2511,10 +2574,10 @@ public class PhoneNumberUtil { "The string supplied is too short to be a phone number."); } if (regionMetadata != null) { - String carrierCode = - maybeStripNationalPrefixAndCarrierCode(normalizedNationalNumber, regionMetadata); + StringBuilder carrierCode = new StringBuilder(); + maybeStripNationalPrefixAndCarrierCode(normalizedNationalNumber, regionMetadata, carrierCode); if (keepRawInput) { - phoneNumber.setPreferredDomesticCarrierCode(carrierCode); + phoneNumber.setPreferredDomesticCarrierCode(carrierCode.toString()); } } int lengthOfNationalNumber = normalizedNationalNumber.length(); diff --git a/java/src/com/google/i18n/phonenumbers/Phonemetadata.java b/java/src/com/google/i18n/phonenumbers/Phonemetadata.java index db3ca64ac..cb3f8b5ec 100644 --- a/java/src/com/google/i18n/phonenumbers/Phonemetadata.java +++ b/java/src/com/google/i18n/phonenumbers/Phonemetadata.java @@ -102,6 +102,19 @@ public final class Phonemetadata { return this; } + // optional bool national_prefix_optional_when_formatting = 6; + private boolean hasNationalPrefixOptionalWhenFormatting; + private boolean nationalPrefixOptionalWhenFormatting_ = false; + public boolean hasNationalPrefixOptionalWhenFormatting() { + return hasNationalPrefixOptionalWhenFormatting; } + public boolean isNationalPrefixOptionalWhenFormatting() { + return nationalPrefixOptionalWhenFormatting_; } + public NumberFormat setNationalPrefixOptionalWhenFormatting(boolean value) { + hasNationalPrefixOptionalWhenFormatting = true; + nationalPrefixOptionalWhenFormatting_ = value; + return this; + } + // optional string domestic_carrier_code_formatting_rule = 5; private boolean hasDomesticCarrierCodeFormattingRule; private String domesticCarrierCodeFormattingRule_ = ""; @@ -132,6 +145,7 @@ public final class Phonemetadata { if (other.hasDomesticCarrierCodeFormattingRule()) { setDomesticCarrierCodeFormattingRule(other.getDomesticCarrierCodeFormattingRule()); } + setNationalPrefixOptionalWhenFormatting(other.isNationalPrefixOptionalWhenFormatting()); return this; } @@ -152,6 +166,7 @@ public final class Phonemetadata { if (hasDomesticCarrierCodeFormattingRule) { objectOutput.writeUTF(domesticCarrierCodeFormattingRule_); } + objectOutput.writeBoolean(nationalPrefixOptionalWhenFormatting_); } public void readExternal(ObjectInput objectInput) throws IOException { @@ -167,6 +182,7 @@ public final class Phonemetadata { if (objectInput.readBoolean()) { setDomesticCarrierCodeFormattingRule(objectInput.readUTF()); } + setNationalPrefixOptionalWhenFormatting(objectInput.readBoolean()); } } diff --git a/java/src/com/google/i18n/phonenumbers/ShortNumberUtil.java b/java/src/com/google/i18n/phonenumbers/ShortNumberUtil.java index 458775985..2a23d7cc0 100644 --- a/java/src/com/google/i18n/phonenumbers/ShortNumberUtil.java +++ b/java/src/com/google/i18n/phonenumbers/ShortNumberUtil.java @@ -16,6 +16,7 @@ package com.google.i18n.phonenumbers; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import java.util.regex.Pattern; @@ -51,6 +52,25 @@ public class ShortNumberUtil { * @return if the number might be used to connect to an emergency service in the given region. */ public boolean connectsToEmergencyNumber(String number, String regionCode) { + return matchesEmergencyNumberHelper(number, regionCode, true /* allows prefix match */); + } + + /** + * Returns true if the number exactly matches an emergency service number in the given region. + * + * This method takes into account cases where the number might contain formatting, but doesn't + * allow additional digits to be appended. + * + * @param number the phone number to test + * @param regionCode the region where the phone number is being dialed + * @return if the number exactly matches an emergency services number in the given region. + */ + public boolean isEmergencyNumber(String number, String regionCode) { + return matchesEmergencyNumberHelper(number, regionCode, false /* doesn't allow prefix match */); + } + + private boolean matchesEmergencyNumberHelper(String number, String regionCode, + boolean allowPrefixMatch) { number = PhoneNumberUtil.extractPossibleNumber(number); if (PhoneNumberUtil.PLUS_CHARS_PATTERN.matcher(number).lookingAt()) { // Returns false if the number starts with a plus sign. We don't believe dialing the country @@ -58,20 +78,17 @@ public class ShortNumberUtil { // add additional logic here to handle it. return false; } - String normalizedNumber = PhoneNumberUtil.normalizeDigitsOnly(number); - PhoneNumberDesc emergencyNumberDesc = phoneUtil.getMetadataForRegion(regionCode).getEmergency(); - Pattern emergencyNumberPattern = - Pattern.compile(emergencyNumberDesc.getNationalNumberPattern()); - if (regionCode.equals("BR")) { - // This is to prevent Brazilian local numbers which start with 911 being incorrectly - // classified as emergency numbers. In Brazil, it is impossible to append additional digits to - // an emergency number to dial the number. - if (!emergencyNumberPattern.matcher(normalizedNumber).matches()) { - return false; - } + PhoneMetadata metadata = phoneUtil.getMetadataForRegion(regionCode); + if (metadata == null || !metadata.hasEmergency()) { + return false; } - - // Check the prefix against possible emergency numbers for this region. - return emergencyNumberPattern.matcher(normalizedNumber).lookingAt(); + Pattern emergencyNumberPattern = + Pattern.compile(metadata.getEmergency().getNationalNumberPattern()); + String normalizedNumber = PhoneNumberUtil.normalizeDigitsOnly(number); + // In Brazil, it is impossible to append additional digits to an emergency number to dial the + // number. + return (!allowPrefixMatch || regionCode.equals("BR")) + ? emergencyNumberPattern.matcher(normalizedNumber).matches() + : emergencyNumberPattern.matcher(normalizedNumber).lookingAt(); } } diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC index 1a3a4b186..63a07844e 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD index 8a62bd606..565140444 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE index db146bc94..5ce6bd9d5 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF index 5bef81bcb..ce0b67764 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG index 5f23860a3..0fb852a9d 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI index de0fb778a..5ec108b78 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL index 3c865860b..e7f2d420d 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM index 399379466..5af20f5ee 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN index 25aab5684..27c2ae350 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO index c975f9978..77b08cb75 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR index e42081621..a39c6017a 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS index 221eccba9..3b38675c8 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT index 92a4e32da..c38a56c81 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU index dbb500d9e..2fa06cf8b 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW index de31efe8c..fb3aad4cf 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX index fd7987dae..c0dbabf15 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ index 6b536c7c1..e4b14a686 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA index b3dfcd3e6..ad4662f0c 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD index e63abb138..b6c204aff 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE index 3e9ed8fbc..b37f61f06 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF index 635f743d2..48d20e7ff 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG index 81fa78b05..2b3c0ae3f 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH index 3f39c962b..841ea9a88 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI index db38b2c1c..293ebbc2c 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ index abe937704..e3c5863bf 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL index dede30919..4987820fb 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM index 18c09454d..d014b2a52 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN index 38d82488a..c257c58de 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO index 634f143fd..f5919ff9a 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR index 71dc64bd4..ec29af276 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS index c6f960e8b..f52796e06 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT index c0f93c593..e549cd77e 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW index cf0954242..21fd265de 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY index c2228e312..a679105c1 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ index e9bd308d8..5a4d052df 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC index 515bcc465..2f2f8aadf 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD index 65cd03b4a..cf7bba2fc 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF index fb5a305c7..e3ce491d4 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG index 3cab707fd..2b4128dd8 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH index 46aa41a55..409254af1 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI index bb771dc3d..98198b8ea 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK index 168a085fe..2f6fe6309 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL index 1422c5cb1..0e90d894a 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM index 330fe3ad2..4018df43b 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN index 70701d1a0..67a7f5e0c 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO index d1491f4c3..b1dbb84ed 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR index 146a9db45..cbc064bbe 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU index c4da25e4f..97e98380e 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV index 70b16679e..451724468 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX index 733e530a3..cb8dfd9f3 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY index b6fd4b9fc..de1e00412 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ index 7e782e1de..5c41a795d 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE index 1905b9447..cfc5b1936 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ index 9f9414635..55113818e 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK index 79d8735f8..008296668 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM index 3829dafbe..723ea80d7 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ index 8cff69ef4..410733581 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC index 7b7f5ec88..343743d6a 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE index b88d8c3e0..28bd9fbbc 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG index 6d271358f..38e39b348 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER index d6e0f9b77..ae892007e 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES index 02af173c8..9b855f14d 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET index 4e73ea12e..8843e5402 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI index 865ca1a1a..604d7ff24 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ index 965c75528..cdd713c30 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK index ff38f2ccc..6c19901b7 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM index eceb9a2ba..b4031f06b 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO index cc4be13e7..46dac926c 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR index 874194aac..66d244e00 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA index 348b1ed09..dddd714ed 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB index 143ff4b21..bd6e72a9a 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD index 368a10511..e120fa5b0 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE index 306b9a5ec..ac5bb5799 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF index 7b2b581e0..da17df2be 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG index f289a987e..0e6809f3b 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH index 74ea830da..dea89c771 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL index 654cd4ffc..d327b7531 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM index 827c8b7c4..3bf3e41a8 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN index 0d8cd8a59..b0b740658 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP index 05961ecbe..e03584b29 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ index e18b8f508..424b068fe 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR index 6f68892ca..655b5b4e8 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT index a3fbe0fca..a2a20cf0d 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU index de49dfebf..9a006f1de 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW index 3c9ee2034..77b639854 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY index 78cb16d68..eb367615b 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK index 86b33570c..dfd2d0987 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN index fa77fd780..6dd47c025 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR index f1f8c6c78..27a0c8a03 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT index 105d95f30..245ee938d 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU index 1ec5c7f16..6ef130686 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID index 516d1910e..3d0f8cc60 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE index 13f4b02f7..12bc79291 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL index 83505d578..a0f1071eb 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM index c83da95ad..8d8c88164 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN index f934b5fc9..05b4b5086 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO index 0e26ed9da..a9aa56984 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ index eaf0102cf..400994617 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR index 3d6c9780c..9edbc8786 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS index fdfe70b40..d2813474d 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT index ee1dc2951..d5c2c719a 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE index 71003d31f..1908b641d 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO index 2043332ae..47058adb1 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP index d90979177..9db7e6e3a 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE index ba3662551..68de57a00 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG index f9013e769..617ce07e6 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH index b6d9b708c..9f757d432 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI index f0140dfd2..82bdb9053 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM index 9035f8f89..21570aef1 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN index 091abf0a1..5a5f4e8ab 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP index 8bb923868..42a4b2632 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR index 331d1d81e..816ed3f98 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW index 2f5c5b228..77f805ac6 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA index 456293175..62db7dc52 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB index 67af442ea..65b3c94ba 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC index 45c9fe743..c8a6ad504 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI index 13efb94c2..c29d89032 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK index cacb5a22b..a9a9d2eee 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR index 9094843ed..f1ce4beb4 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS index e8210553f..e04c603b9 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT index 5bdabd4f5..0c1131505 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU index 2ed3fc25f..4ffc79128 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV index b7a02eda3..a76eab93c 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY index 8988b9f3e..8fc1ee7cc 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA index 3bb35a04f..ef1522abf 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC index 66461fc1b..79fac1a8e 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD index 56e6ac350..b17e4afe7 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME index 264ec5704..24937fd9f 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF index e00abfa28..381314943 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG index da2d7b2fa..072379ff3 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH index def092dac..fc6421314 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK index 945490b65..3bbd43ea9 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML index a3cb55d70..5cce5628c 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM index 2e6b56817..4f3ea9183 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN index 7ed10784e..0a7e31aa3 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO index cf9446c1e..4cf962572 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP index 1f0249c3b..0f9476d27 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ index 1e686cea6..c48db3472 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR index eadaab099..36db9e419 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS index 1db3c7b38..969cafc50 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT index 2d3ed91b5..c2aaa5390 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU index 4eb65a23b..d69bd6822 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV index 2e09171d7..8841a29b7 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW index a50961085..7bf7d4387 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX index 053036607..fa3cb4022 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY index 1f2933143..07b6b858b 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ index c50b92460..3d0967a55 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA index 0538f74b8..86d10bc62 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC index 1a7d8a8ec..6e5d3f786 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE index 226b16f6e..b9cd0ac7a 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF index 596dd70d1..622d39ffa 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG index ac6597eab..0f478cacf 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI index b92feee56..64d3eb01a 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL index e395fbddd..aaefdd957 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO index 5f3ef88f0..68388545c 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP index 18854559d..2868f9ca9 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR index 870e517ba..c8ec23eba 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU index 571051f28..50dbafdf2 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ index cd204814c..6c3535bca 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM index 9b7337010..84cded466 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA index 981d07937..2c032e675 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE index 40bbf5840..6b89b38b0 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF index f24e8e49a..60c6d306b 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG index ec72d57da..9fbb7bcce 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH index 1ea186dbb..56a53cba4 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK index 7bfe2ad64..e1114b608 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL index 51d56b3cb..69d172c06 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM index 65f6ac539..f8da61b59 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR index 0901ad539..3b8c4a2fb 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS index 46a269f8b..da7d297c1 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT index 187db1a7b..6baccc72f 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW index a8bd035e1..45398fa6f 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY index 7bb927a72..6bc931e8c 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA index a482873e0..8ec44a086 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE index 43593bb5b..e2af509be 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO index 60f99b274..a55d60fb6 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS index 9dc55f33b..5a803f96d 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU index 1d1ade8a8..28bb82d0b 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW index 4ca186777..cb6329eab 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA index 46619c2bd..aefd945c6 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB index 21df6666e..e35361f26 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC index ca57e4c90..f012a5559 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD index 609d732c0..060bd91b7 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE index 04170b560..e5850c789 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG index 731a1fbc2..e8dfd31d4 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH index b4ebc4bb9..dcf690a93 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI index b0c485747..ca7c517c9 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ index a8b4cabf4..17122ccac 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK index c5df50f09..48323b5d5 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL index b11e93aab..e942566b4 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM index 3545cc3cc..943278423 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN index 933dca859..549ff61c1 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO index 023886801..0b4edc7cd 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR index 79f19dcee..a7260aadf 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST index da445dfd0..265f3af10 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV index 0ac6bba56..436b979cb 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX new file mode 100644 index 000000000..50b2362e1 Binary files /dev/null and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY index 0b8d63f3e..4a6a7b80d 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ index 3cdd28476..c1ed38809 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC index 67ccd0f74..dc62e4cac 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD index 31a135419..b92127f01 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG index ee3bd808a..176b9bfb7 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH index 51e0a7980..8b56a1f64 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ index 974034edf..efce54e89 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL index e971e0400..46a855f94 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM index 3c02452bb..cf1c21d0c 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN index 6043f2d0c..50a7217e1 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO index aee32a7db..e2cd8de96 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR index eb2be5490..060cc34c6 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV index ab5424e70..3b5321053 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW index bfb6f6be8..acda89f24 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ index 1c8003639..5450858d7 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA index 0ab8c47ce..5019f027e 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG index 4b28889ec..d154f24c3 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US index d83bd32df..1046ec6a0 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY index e214c2592..f9e4805e6 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ index 1d1f028ab..f894a1fe9 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA index 96152e867..42367de85 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC index 386be34ee..294335dca 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE index bfbe19adc..645c9a5e3 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG index 215b7a54e..bda87e458 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI index bf3ab19b8..987acec43 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN index 74ddd8961..ad1e62bff 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU index 685bf497a..26ecb82bb 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF index 404da8ec7..2337ed6a2 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS index 324ae99ff..03fa87f66 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE index 43cba39d2..be646a13e 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT index 088ad95cb..e5eb1059f 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA index 2a441893d..c742d5c11 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM index a12724305..dd3dea3f0 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM differ diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW index dfe9fde6d..2766b3c3a 100644 Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW differ diff --git a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java b/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java index 7b22e3b01..c23181d80 100644 --- a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java +++ b/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java @@ -45,7 +45,8 @@ public class PhoneNumberMatcherTest extends TestCase { public void testFindNationalNumber() throws Exception { // same cases as in testParseNationalNumber doTestFindInContext("033316005", RegionCode.NZ); - doTestFindInContext("33316005", RegionCode.NZ); + // ("33316005", RegionCode.NZ) is omitted since the national prefix is obligatory for these + // types of numbers in New Zealand. // National prefix attached and some formatting present. doTestFindInContext("03-331 6005", RegionCode.NZ); doTestFindInContext("03 331 6005", RegionCode.NZ); @@ -375,6 +376,7 @@ public class PhoneNumberMatcherTest extends TestCase { new NumberTest("1650 x 253 - 1234", RegionCode.US), new NumberTest("650 x 253 - 1234", RegionCode.US), new NumberTest("650x2531234", RegionCode.US), + new NumberTest("(20) 3346 1234", RegionCode.GB), // Non-optional NP omitted }; /** @@ -393,7 +395,7 @@ public class PhoneNumberMatcherTest extends TestCase { new NumberTest("800 234 1 111x1111", RegionCode.US), new NumberTest("+494949-4-94", RegionCode.DE), // National number in wrong format new NumberTest("\uFF14\uFF11\uFF15\uFF16\uFF16\uFF16\uFF16-\uFF17\uFF17\uFF17\uFF17", - RegionCode.US) + RegionCode.US), }; /** @@ -405,7 +407,7 @@ public class PhoneNumberMatcherTest extends TestCase { new NumberTest("415-6667777", RegionCode.US), // Should be found by strict grouping but not exact grouping, as the last two groups are // formatted together as a block. - new NumberTest("800-2491234", RegionCode.DE), + new NumberTest("0800-2491234", RegionCode.DE), }; /** @@ -430,6 +432,8 @@ public class PhoneNumberMatcherTest extends TestCase { new NumberTest("+49494949 ext. 49", RegionCode.DE), new NumberTest("0494949", RegionCode.DE), new NumberTest("0494949 ext. 49", RegionCode.DE), + new NumberTest("01 (33) 3461 2234", RegionCode.MX), // Optional NP present + new NumberTest("(33) 3461 2234", RegionCode.MX), // Optional NP omitted }; public void testMatchesWithStrictGroupingLeniency() throws Exception { diff --git a/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java index bd3439bb7..e7038c6f2 100644 --- a/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java +++ b/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java @@ -477,6 +477,13 @@ public class PhoneNumberUtilTest extends TestCase { phoneUtil.formatOutOfCountryCallingNumber(arNumberWithExtn, RegionCode.AR)); } + public void testFormatOutOfCountryWithInvalidRegion() { + // AQ/Antarctica isn't a valid region code for phone number formatting, + // so this falls back to intl formatting. + assertEquals("+1 650 253 0000", + phoneUtil.formatOutOfCountryCallingNumber(US_NUMBER, "AQ")); + } + public void testFormatOutOfCountryWithPreferredIntlPrefix() { // This should use 0011, since that is the preferred international prefix (both 0011 and 0012 // are accepted as possible international prefixes in our test metadta.) @@ -1102,24 +1109,24 @@ public class PhoneNumberUtilTest extends TestCase { metadata.setGeneralDesc(new PhoneNumberDesc().setNationalNumberPattern("\\d{4,8}")); StringBuilder numberToStrip = new StringBuilder("34356778"); String strippedNumber = "356778"; - phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata); + assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null)); assertEquals("Should have had national prefix stripped.", strippedNumber, numberToStrip.toString()); // Retry stripping - now the number should not start with the national prefix, so no more // stripping should occur. - phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata); + assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null)); assertEquals("Should have had no change - no national prefix present.", strippedNumber, numberToStrip.toString()); // Some countries have no national prefix. Repeat test with none specified. metadata.setNationalPrefixForParsing(""); - phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata); + assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null)); assertEquals("Should not strip anything with empty national prefix.", strippedNumber, numberToStrip.toString()); // If the resultant number doesn't match the national rule, it shouldn't be stripped. metadata.setNationalPrefixForParsing("3"); numberToStrip = new StringBuilder("3123"); strippedNumber = "3123"; - phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata); + assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null)); assertEquals("Should have had no change - after stripping, it wouldn't have matched " + "the national rule.", strippedNumber, numberToStrip.toString()); @@ -1127,7 +1134,10 @@ public class PhoneNumberUtilTest extends TestCase { metadata.setNationalPrefixForParsing("0(81)?"); numberToStrip = new StringBuilder("08122123456"); strippedNumber = "22123456"; - assertEquals("81", phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata)); + StringBuilder carrierCode = new StringBuilder(); + assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode( + numberToStrip, metadata, carrierCode)); + assertEquals("81", carrierCode.toString()); assertEquals("Should have had national prefix and carrier code stripped.", strippedNumber, numberToStrip.toString()); // If there was a transform rule, check it was applied. @@ -1136,7 +1146,7 @@ public class PhoneNumberUtilTest extends TestCase { metadata.setNationalPrefixForParsing("0(\\d{2})"); numberToStrip = new StringBuilder("031123"); String transformedNumber = "5315123"; - phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata); + assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null)); assertEquals("Should transform the 031 to a 5315.", transformedNumber, numberToStrip.toString()); } diff --git a/java/test/com/google/i18n/phonenumbers/RegionCode.java b/java/test/com/google/i18n/phonenumbers/RegionCode.java index 4cff40c3c..36e44e502 100644 --- a/java/test/com/google/i18n/phonenumbers/RegionCode.java +++ b/java/test/com/google/i18n/phonenumbers/RegionCode.java @@ -41,6 +41,7 @@ final class RegionCode { static final String SG = "SG"; static final String US = "US"; static final String YT = "YT"; + static final String ZW = "ZW"; // Official code for the unknown region. static final String ZZ = "ZZ"; } diff --git a/java/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java b/java/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java index 8f0baf6c8..20644d211 100644 --- a/java/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java +++ b/java/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java @@ -21,6 +21,8 @@ import junit.framework.TestCase; import java.io.InputStream; /** + * Unit tests for ShortNumberUtil.java + * * @author Shaopeng Jia */ public class ShortNumberUtilTest extends TestCase { @@ -74,4 +76,73 @@ public class ShortNumberUtilTest extends TestCase { assertFalse(shortUtil.connectsToEmergencyNumber("1900", RegionCode.BR)); assertFalse(shortUtil.connectsToEmergencyNumber("9996", RegionCode.BR)); } + + public void testConnectsToEmergencyNumber_AO() { + // Angola doesn't have any metadata for emergency numbers in the test metadata. + assertFalse(shortUtil.connectsToEmergencyNumber("911", RegionCode.AO)); + assertFalse(shortUtil.connectsToEmergencyNumber("222123456", RegionCode.AO)); + assertFalse(shortUtil.connectsToEmergencyNumber("923123456", RegionCode.AO)); + } + + public void testConnectsToEmergencyNumber_ZW() { + // Zimbabwe doesn't have any metadata in the test metadata. + assertFalse(shortUtil.connectsToEmergencyNumber("911", RegionCode.ZW)); + assertFalse(shortUtil.connectsToEmergencyNumber("01312345", RegionCode.ZW)); + assertFalse(shortUtil.connectsToEmergencyNumber("0711234567", RegionCode.ZW)); + } + + public void testIsEmergencyNumber_US() { + assertTrue(shortUtil.isEmergencyNumber("911", RegionCode.US)); + assertTrue(shortUtil.isEmergencyNumber("119", RegionCode.US)); + assertFalse(shortUtil.isEmergencyNumber("999", RegionCode.US)); + } + + public void testIsEmergencyNumberLongNumber_US() { + assertFalse(shortUtil.isEmergencyNumber("9116666666", RegionCode.US)); + assertFalse(shortUtil.isEmergencyNumber("1196666666", RegionCode.US)); + assertFalse(shortUtil.isEmergencyNumber("9996666666", RegionCode.US)); + } + + public void testIsEmergencyNumberWithFormatting_US() { + assertTrue(shortUtil.isEmergencyNumber("9-1-1", RegionCode.US)); + assertTrue(shortUtil.isEmergencyNumber("*911", RegionCode.US)); + assertTrue(shortUtil.isEmergencyNumber("1-1-9", RegionCode.US)); + assertTrue(shortUtil.isEmergencyNumber("*119", RegionCode.US)); + assertFalse(shortUtil.isEmergencyNumber("9-9-9", RegionCode.US)); + assertFalse(shortUtil.isEmergencyNumber("*999", RegionCode.US)); + } + + public void testIsEmergencyNumberWithPlusSign_US() { + assertFalse(shortUtil.isEmergencyNumber("+911", RegionCode.US)); + assertFalse(shortUtil.isEmergencyNumber("\uFF0B911", RegionCode.US)); + assertFalse(shortUtil.isEmergencyNumber(" +911", RegionCode.US)); + assertFalse(shortUtil.isEmergencyNumber("+119", RegionCode.US)); + assertFalse(shortUtil.isEmergencyNumber("+999", RegionCode.US)); + } + + public void testIsEmergencyNumber_BR() { + assertTrue(shortUtil.isEmergencyNumber("911", RegionCode.BR)); + assertTrue(shortUtil.isEmergencyNumber("190", RegionCode.BR)); + assertFalse(shortUtil.isEmergencyNumber("999", RegionCode.BR)); + } + + public void testIsEmergencyNumberLongNumber_BR() { + assertFalse(shortUtil.isEmergencyNumber("9111", RegionCode.BR)); + assertFalse(shortUtil.isEmergencyNumber("1900", RegionCode.BR)); + assertFalse(shortUtil.isEmergencyNumber("9996", RegionCode.BR)); + } + + public void testIsEmergencyNumber_AO() { + // Angola doesn't have any metadata for emergency numbers in the test metadata. + assertFalse(shortUtil.isEmergencyNumber("911", RegionCode.AO)); + assertFalse(shortUtil.isEmergencyNumber("222123456", RegionCode.AO)); + assertFalse(shortUtil.isEmergencyNumber("923123456", RegionCode.AO)); + } + + public void testIsEmergencyNumber_ZW() { + // Zimbabwe doesn't have any metadata in the test metadata. + assertFalse(shortUtil.isEmergencyNumber("911", RegionCode.ZW)); + assertFalse(shortUtil.isEmergencyNumber("01312345", RegionCode.ZW)); + assertFalse(shortUtil.isEmergencyNumber("0711234567", RegionCode.ZW)); + } } diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO index 6a8cb6873..44b042ef6 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO differ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR index f93ae44c9..549bc8b80 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR differ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU index a5761e1d0..b3ee4837a 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU differ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE index c2ebe28af..42d58fe7e 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE differ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB index 28acb39c8..171bbc09a 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB differ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT index 4175feed3..be4d9c172 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT differ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP index 8fc2b7894..1dbb2b1be 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP differ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR index 63fc8eac0..21c764ead 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR differ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX index e033b4046..854f0206d 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX differ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ index de811438f..d3b27a630 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ differ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL index 00fbafe44..9b082dff7 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL differ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE index fffbfcf1a..02b38fa70 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE differ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG index b9877358e..c5df8dc5a 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG differ diff --git a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US index ce84e222c..cf65f6aa0 100644 Binary files a/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US and b/java/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US differ diff --git a/resources/PhoneNumberMetaData.xml b/resources/PhoneNumberMetaData.xml index e5440b4d5..415b0c5f8 100644 --- a/resources/PhoneNumberMetaData.xml +++ b/resources/PhoneNumberMetaData.xml @@ -68,6 +68,7 @@ + @@ -76,10 +77,11 @@ - + + ]> @@ -109,6 +111,15 @@ NA NA + + + 911 + \d{3} + 911 + @@ -158,6 +169,13 @@ \d{6} 912345 + + + 11[0268] + \d{3} + 112 + @@ -353,6 +371,17 @@ \d{10} 2684801234 + + + + 9(?: + 11| + 99 + ) + + \d{3} + 911 + @@ -421,6 +450,12 @@ \d{10} 5002345678 + + + 911 + \d{3} + 911 + @@ -650,6 +685,8 @@ \d{7,8} + (?: 318| @@ -717,6 +754,15 @@ 1011234 + + + + 112| + 911 + + \d{3} + 112 + @@ -745,6 +791,12 @@ 9[1-3]\d{7} 923123456 + + + 11[235] + \d{3} + 113 + @@ -845,7 +897,7 @@ - [1-8]\d{9}| + [1-368]\d{9}| 9\d{10} \d{6,11} @@ -917,7 +969,7 @@ )| 8(?: [123578]\d| - 4[13-6] + 4[13-6]| 6[1-357-9]| 9[124] ) @@ -1043,6 +1095,14 @@ \d{10} 5002345678 + + + 911 + \d{3} + 911 + @@ -1119,7 +1179,7 @@ 6[1-46-8]| 7[1-8]| 8[124-7]| - 8[1458] + 9[1458] )| 3(?: 1[1-8]| @@ -1240,9 +1300,9 @@ - + preferredInternationalPrefix="0011" nationalPrefix="0"> @@ -1326,7 +1386,7 @@ [237]\d{8}| 8(?: [68]\d{3}| - 7[1-4]\d{2}| + 7[0-6]\d{2}| 9(?: [02-9]\d{2}| 1(?: @@ -1480,6 +1540,15 @@ 5011234 + + + + 100| + 911 + + \d{3} + 911 + @@ -1544,6 +1613,12 @@ \d{5,10} 10112345 + + + 112 + \d{3} + 112 + @@ -1680,6 +1755,18 @@ \d{9} 900200123 + + + + 1(?: + 0[123]| + 12 + ) + + \d{3} + 101 + @@ -2149,6 +2236,12 @@ 70123456 + + + 1[78] + \d{2} + 17 + @@ -2299,14 +2392,21 @@ 3[3-6]| 6[0156]| 7\d - )| + )\d| 6(?: - 1[16]| - 6[03469]| - 9[69] + 1[16]\d| + 6(?: + 0\d| + 3[12]| + 44 + )| + 9(?: + 69| + 9[6-9] + ) )| - 77\d - )\d{5} + 77\d{2} + )\d{4} 17001234 @@ -2319,14 +2419,21 @@ [23469]\d| 77| 8[348] - )| + )\d| 6(?: - 1[16]| - 6[03469]| - 9[69] + 1[16]\d| + 6(?: + [06]\d + 3[03-9]| + 44| + )| + 9(?: + 69| + 9[6-9] + ) )| - 77\d - )\d{5} + 77\d{2} + )\d{4} 36001234 @@ -2394,6 +2501,12 @@ 79561234 + + + 11[78] + \d{3} + 117 + @@ -2451,6 +2564,11 @@ \d{8} 85751234 + + 11[78] + \d{3} + 117 + @@ -2489,6 +2607,12 @@ 690221234 + + + 18 + \d{2} + 18 + @@ -2560,6 +2684,12 @@ \d{10} 5002345678 + + + 911 + \d{3} + 911 + @@ -2583,6 +2713,12 @@ [78]\d{6} 7123456 + + + 99[135] + \d{3} + 991 + @@ -2855,6 +2991,12 @@ \d{10} 5002345678 + + + 91[19] + \d{3} + 911 + @@ -2903,6 +3045,13 @@ \d{8} 17123456 + + + + 11[023] + \d{3} + 113 + @@ -2987,6 +3136,13 @@ \d{8} 79101234 + + + + 99[789] + \d{3} + 999 + @@ -3171,6 +3327,17 @@ \d{11} 08001234123 + + + + 9(?: + 0| + 11 + ) + + \d{2,3} + 911 + @@ -3313,7 +3480,7 @@ - + @@ -3377,6 +3544,16 @@ \d{9} 550123456 + + + + 000| + 112 + + \d{3} + 112 + @@ -3415,6 +3592,7 @@ \d{9} 991234567 + @@ -3441,6 +3619,7 @@ 8776\d{4} 87761234 + @@ -3473,6 +3652,7 @@ 800\d{6} 800123456 + @@ -3592,6 +3772,17 @@ 01234567 + + + + 1(?: + 1[01]| + [78]0 + ) + + \d{3} + 110 + @@ -3625,6 +3816,13 @@ 71234 + + + 99[689] + \d{3} + 998 + @@ -3804,6 +4002,13 @@ 88\d{6} 88012345 + + + + 1?1[37] + \d{2,3} + 113 + @@ -3811,7 +4016,8 @@ - + 80[2678] $1 $2 @@ -3830,11 +4036,13 @@ $1 $2 NA - + 21 $1 $2 $3 - + 10[1-9]| 2[02-9] @@ -3856,7 +4064,8 @@ $1 $2 $3 - + 3(?: 11| @@ -3883,7 +4092,8 @@ $1 $2 $3 - + 3(?: 1[02-9]| @@ -4366,6 +4576,12 @@ \d{8} 51234567 + + + 10[56] + \d{3} + 106 + @@ -4407,6 +4623,12 @@ 9911234 + + + 13[012] + \d{3} + 132 + @@ -4469,7 +4691,7 @@ - + @@ -4533,6 +4755,16 @@ \d{9} 550123456 + + + + 000| + 112 + + \d{3} + 112 + @@ -4549,16 +4781,13 @@ \d{9} - 2\d{8}| (?: 3[1257-9]| 4[16-9]| 5[13-9] - )\d{7}| - 97[234]\d{6} + )\d{7} 212345678 @@ -4600,6 +4829,19 @@ 9[17]0\d{6} 910123456 + + + + 9(?: + 5[056]| + 7[234] + )\d{6} + + 972123456 + 1(?: @@ -5033,6 +5275,19 @@ \d{10} 5002345678 + + + + + 333| + 9(?: + 11| + 99 + ) + + \d{3} + 999 + @@ -5610,6 +5865,7 @@ \d{7} 7123456 + @@ -5827,6 +6083,22 @@ \d{9} 911234567 + + + + + + + + 9(?: + 11?| + [23]| + 9[17] + ) + + \d{2,3} + 991 + @@ -6029,12 +6301,16 @@ - - 1\d{2}| - 999 - + 1\d{2} + \d{3} 123 + + + 999 + \d{3} + 999 + @@ -6065,6 +6341,15 @@ 3501234 + + + + 911| + 320221 + + \d{3}(?:\d{3})? + 911 + @@ -6314,6 +6599,15 @@ \d{8} 06031234 + + + 1730| + 18| + 13\d{2} + + \d{2,4} + 1730 + @@ -7040,6 +7334,12 @@ \d{10} 5002345678 + + + 911 + \d{3} + 911 + @@ -7287,13 +7587,37 @@ 5512345678 + - 1\d{2}(?:\d{3})?| - 999 + 1(?: + 0[01]| + 1(?: + 1| + [68]\d{3} + )| + 23| + 4(?: + 1| + 7\d + )| + 55| + 800\d| + 95 + ) \d{3,6} - 150 + 155 + + + + 112| + 999 + + \d{3} + 999 + @@ -7534,6 +7858,13 @@ [3679]\d{6} 3012345 + + + + 1?1[678] + \d{2,3} + 117 + @@ -7582,6 +7913,7 @@ 60201234 + @@ -7632,9 +7964,15 @@ 690301234 - - - + + + 1[578] + \d{2} + 18 + + + + @@ -7683,6 +8021,7 @@ 90\d[1-9]\d{5} 900123456 + @@ -7751,12 +8090,12 @@ )| 6(?: 1\d| - 3[24]| + 3[124]| 4[1-7]| 5[13-9]| [269][1-6]| 7[14]| - 8[1-35] + 8[1-5] )| 7(?: 1\d| @@ -8023,6 +8362,12 @@ \d{10} 5002345678 + + + 911 + \d{3} + 911 + @@ -8054,6 +8399,12 @@ [5-7]\d{6} 5012345 + + + 11[378] + \d{3} + 113 + @@ -8443,6 +8794,12 @@ \d{3} 114 + + + 11[48] + \d{3} + 118 + @@ -9080,13 +9437,16 @@ 5512345678 - - 1\d{2}(?:\d{3})?| - 999 - + 1\d{2}(?:\d{3})? \d{3,6} 150 + + + 999 + \d{3} + 999 + @@ -9096,7 +9456,8 @@ - changes are notified on the www.bsnl.co.in website. Area codes can be verified here at http://www.bsnl.co.in/stdsearch.php. --> + nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG" + nationalPrefixOptionalWhenFormatting="true" > @@ -9809,6 +10170,7 @@ 38\d{5} 3801234 + @@ -9854,6 +10216,7 @@ 7912345678 + @@ -9863,21 +10226,36 @@ nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG"> + + 21 + $1 $2 + + + 21 + $1 $2 $3 + 21 $1 $2 $3 - + - [13-89]| + [13-9]| 2[02-9] $1 $2 $3 - [2-6]\d{4,9}|[1789]\d{9} - \d{5,10} + + [2-6]\d{4,9}| + 9(?: + [134]\d{8}| + 9\d{2,8} + )| + [178]\d{9} + + \d{4,10} - 9990\d{6} - \d{10} + + 9990\d{0,6} 9990123456 @@ -10395,10 +10773,7 @@ 1(?: 00| - 1(?: - 2| - 8\d{3} - )| + 18\d{3}| 23| 4(?: [14]| @@ -10414,12 +10789,20 @@ 808| 9[135] )| - 23[234]| - 999 + 23[234] \d{3,6} 150 + + + + 112| + 999 + + \d{3} + 999 + @@ -11624,6 +12007,15 @@ \d{8,10} 900123456 + + + + 112| + 999 + + \d{3} + 999 + @@ -11733,6 +12125,12 @@ 800123456 + + + 10[123] + \d{3} + 101 + @@ -11816,6 +12214,15 @@ \d{10} 1900123456 + + + + 11[789]| + 666 + + \d{3} + 117 + @@ -11842,7 +12249,14 @@ 31234 - [69]\d{4} + + + 6\d{4}| + 9(?: + [0-8]\d| + 9[015-8] + )\d{2} + 61234 @@ -11850,19 +12264,24 @@ 10(?: [0-8]| 5[01259] - )| - 99[234] + ) \d{3,4} - 992 + 100 + + + 99[2349] + \d{3} + 999 + - + $1 $2 $3 @@ -11882,7 +12301,7 @@ 7712345 - 3[23]\d{5} + 3[234]\d{5} 3212345 @@ -11896,6 +12315,12 @@ 9001234 + + + 1[78] + \d{2} + 17 + @@ -11970,6 +12395,19 @@ \d{10} 5002345678 + + + + 333| + 9(?: + 11| + 99 + ) + + \d{3} + 999 + @@ -12031,6 +12469,8 @@ \d{10} 1921234567 + @@ -12665,6 +13105,12 @@ 2023123456 + + + 19[015] + \d{3} + 190 + @@ -12826,6 +13272,20 @@ \d{10} 5002345678 + + + + 9(?: + 11| + 99 + ) + + \d{3} + 911 + @@ -12950,6 +13410,41 @@ \d{7} 7011234 + + + + 1(?: + 145| + 4(?: + [0357]| + 14 + )| + 50\d{4}| + 6(?: + 00| + [1-4] + )| + 75| + 8(?: + 1[128]| + 7 + ) + ) + + \d{7} + 1600 + + + + 1(?: + 1[278]| + 44 + ) + + \d{3} + 112 + @@ -13067,6 +13562,15 @@ \d{9} 332001234 + + + + 355| + 911 + + \d{3} + 911 + @@ -13094,6 +13598,13 @@ 800[256]\d{4} 80021234 + + + 11[257] + \d{3} + 112 + @@ -13114,7 +13625,7 @@ $1 $2 $3 $4 - + 3[148]| 4(?: @@ -13125,7 +13636,7 @@ [0189]| 28 )| - [689] + [6-9] $1 $2 $3 @@ -13160,6 +13671,10 @@ 90[0239]\d{5} 90012345 + + 700\d{5} + 70012345 + 0(?: @@ -13449,6 +13964,15 @@ \d{9} 912345678 + + + + + + 19[013] + \d{3} + 193 + @@ -13961,6 +14485,12 @@ \d{9} 301234567 + + + 11?[78] + \d{2,3} + 117 + @@ -13995,6 +14525,12 @@ 690221234 + + + 1[578] + \d{2} + 18 + @@ -14036,6 +14572,8 @@ 635\d{4} 6351234 + @@ -14503,6 +15041,12 @@ \d{10} 5002345678 + + + 911 + \d{3} + 911 + @@ -14546,6 +15090,17 @@ + + + + 1(?: + 12| + [578] + ) + + \d{2,3} + 15 + @@ -14594,6 +15149,12 @@ 800\d{5} 80012345 + + + 1[78] + \d{2} + 17 + @@ -14644,6 +15205,17 @@ \d{10} 5002345678 + + + + 9(?: + 11| + 99 + ) + + \d{3} + 911 + @@ -14971,6 +15543,16 @@ 991234567 + + + + + 199| + 99[789] + + \d{3} + 997 + @@ -14982,7 +15564,8 @@ nationalPrefix="01" nationalPrefixForParsing="0[12]|04[45](\d{10})" nationalPrefixTransformRule="1$1" - nationalPrefixFormattingRule="$NP $FG"> + nationalPrefixFormattingRule="$NP $FG" + nationalPrefixOptionalWhenFormatting="true"> + + + + + + 1(?: + 1[79]| + 9[78] + ) + + \d{3} + 119 + @@ -15486,10 +16082,7 @@ - 1(?: - 0111| - \d{3} - )| + 1\d{3}| 9(?: 3111| \d{2} @@ -15498,6 +16091,13 @@ \d{3,5} 93111 + + + + 10111 + \d{5} + 10111 + @@ -15547,13 +16147,18 @@ 42| 5[058]| 77 - )| - [5-8] + ) ) \d{2,4} 15 + + + 1[5-8] + \d{2} + 15 + @@ -15613,6 +16218,7 @@ 09\d{6} 09123456 + @@ -15653,6 +16259,18 @@ 38\d{4} 381234 + + + + 9(?: + 11| + 55| + 77 + ) + + \d{3} + 911 + @@ -16062,6 +16680,7 @@ + @@ -16088,7 +16707,6 @@ 1(?: - 1[012]| 23| 92 ) @@ -16096,10 +16714,16 @@ \d{3} 110 + + 11[0-2] + \d{3} + 110 + + @@ -16115,6 +16739,11 @@ [125]\d{3} 1234 + + 999 + \d{3} + 999 + @@ -16579,6 +17208,12 @@ 212345 + + + 1[578] + \d{2} + 15 + @@ -16642,6 +17277,13 @@ \d{7} 2751234 + + + 000 + \d{3} + 000 + @@ -17305,6 +17947,13 @@ \d{10} 5002345678 + + + 911 + \d{3} + 911 + @@ -17440,6 +18089,15 @@ 30\d{7} 301234567 + + + 70(?: + 7\d| + 8[147] + )\d{5} + + 707123456 + 112 \d{3} @@ -17498,12 +18156,11 @@ 6201234 - - + 911 \d{3} 911 - + @@ -17750,6 +18407,17 @@ 810123456 + + + + 1(?: + 12| + [578] + ) + + \d{2,3} + 15 + @@ -17926,9 +18594,10 @@ - + nationalPrefixFormattingRule="$NP ($FG)" + nationalPrefixOptionalWhenFormatting="true" > + \d{3,4} 100 + + 999 + \d{3} + 999 + @@ -18436,8 +19111,8 @@ $1-$2 $3 $1 $2 $3 - - 7[02-467] + + 7 $1-$2 $3 $4 $1 $2 $3 $4 @@ -18572,6 +19247,11 @@ \d{9} 771234567 + + 75\d{7} + \d{9} + 751234567 + 112| @@ -18715,7 +19395,19 @@ 1\d{2,3} \d{3,4} + 1234 + + + + 9(?: + 11| + 99 + ) + + \d{3} + 999 + @@ -18886,6 +19578,12 @@ 01234 + + + 11[023] + \d{3} + 112 + @@ -19136,77 +19834,79 @@ 33301\d{4} 333011234 + - - + + - [13-5] + [1-5] $1 $2 - - 2 + + [267] $1 $2 - - + 15| - 62| 9 $1 $2 - - 61 + + 6[17] $1 $2 - - 699 + + 69 $1 $2 - [1-69]\d{6,8} + [1-79]\d{6,8} \d{7,9} - + (?: 5[57-9]| - 6[19]\d{2}| - [134]\d + [1-4]\d )\d{5} - \d{7,9} + \d{7} 5522010 - + (?: 15| 24| - 62| + 6[179]?\d| + 7\d| 9[01] )\d{6} - \d{8} + \d{8,9} 90792024 + @@ -19301,6 +20001,15 @@ 9[89]\d{5} 9812345 + + + + + + 112 + \d{3} + 112 + @@ -19362,10 +20071,76 @@ + + + + + + [5789]\d{9} + \d{7}(?:\d{3})? + + + 72154[2-8]\d{4} + 7215425678 + + + + + 7215(?: + 1[02]| + 2\d| + 5[0346]| + 8[01678] + )\d{4} + + \d{10} + 7215205678 + + + + 8(?: + 00| + 55| + 66| + 77| + 88 + )[2-9]\d{6} + + \d{10} + 8002123456 + + + 900[2-9]\d{6} + \d{10} + 9002123456 + + + + + 5(?: + 00| + 33| + 44 + )[2-9]\d{6} + + \d{10} + 5002345678 + + + + 919 + \d{3} + 919 + + + + nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG" + nationalPrefixOptionalWhenFormatting="true"> [1-5] @@ -19478,6 +20253,13 @@ 0800\d{4} 08001234 + + + + 999 + \d{3} + 999 + @@ -19553,6 +20335,17 @@ \d{10} 6497101234 + + + + 9(?: + 11| + 99 + ) + + \d{3} + 911 + @@ -19637,6 +20430,20 @@ 9[0-289]\d{6} 90112345 + + + + + + 1(?: + 01| + 1[78]| + 7[17] + ) + + \d{3} + 117 + @@ -19723,7 +20530,8 @@ + nationalPrefixFormattingRule="($NP) $FG" + nationalPrefixOptionalWhenFormatting="true"> @@ -19824,6 +20632,7 @@ \d{4} 3190 + @@ -19864,6 +20673,13 @@ 70\d{5} 7012345 + + + 112 + \d{3} + 112 + @@ -19899,6 +20715,13 @@ 66123456 + + + 0[1-3] + \d{2} + 03 + @@ -20002,6 +20825,19 @@ \d{7} 0800222 + + + + 9(?: + 11| + 22| + 33| + 99 + ) + + \d{3} + 911 + @@ -20009,7 +20845,8 @@ - + [23]| 4(?: @@ -20019,7 +20856,8 @@ $1 $2 $3 - + [589] $1 $2 $3 @@ -20213,6 +21051,7 @@ + @@ -20232,6 +21071,11 @@ \d{6} 901234 + + 911 + \d{3} + 911 + @@ -20350,6 +21194,16 @@ \d{9} 412345678 + + + + 11[12]| + 999 + + \d{3} + 111 + @@ -20539,7 +21393,7 @@ - + @@ -20547,7 +21401,10 @@ [7-9]| - 200| + 20(?: + 0| + 2[5-9] + )| 4(?: 6[45]| [7-9] @@ -20567,7 +21424,7 @@ $1 $2 - 202 + 2024 $1 $2 @@ -20577,27 +21434,26 @@ - 3\d{8}| - 4(?: - [1-6]\d| - 7[136]| - 8[1356]| - 96 - )\d{6}| 20(?: - [04]\d| - 24 - )\d{5} + [014]\d{2}| + 2(?: + 40| + [5-9]\d + )| + 3[23]| + 4\d + )\d{4}| + [34]\d{8} \d{5,9} 312345678 - + 7(?: - [15789]\d| - 0[0-7] + 0[0-7]| + [15789]\d )\d{6} \d{9} @@ -21282,6 +22138,23 @@ 912345678 + + + + 0(?: + 0[123]| + [123]| + 50 + ) + + \d{2,3} + 01 + @@ -21397,6 +22270,18 @@ \d{10} 5002345678 + + + + 9(?: + 11| + 99 + ) + + \d{3} + 911 + @@ -21546,6 +22431,18 @@ \d{10} 5002345678 + + + + 9(?: + 11| + 99 + ) + + \d{3} + 911 + @@ -21664,13 +22561,20 @@ \d{10} 5002345678 + + + 911 + \d{3} + 911 + + nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG" + nationalPrefixOptionalWhenFormatting="true"> [48] @@ -21887,6 +22791,13 @@ 501234 + + + 1[578] + \d{2} + 15 + @@ -21938,6 +22849,12 @@ 800123 + + + 99[4-6] + \d{3} + 994 + @@ -21986,6 +22903,14 @@ 712345678 + + + + + 19[1459] + \d{3} + 191 + @@ -22014,6 +22939,18 @@ 80\d{7} 801234567 + + + + + 1(?: + 12| + 5 + ) + + \d{2,3} + 15 + diff --git a/resources/PhoneNumberMetaDataForTesting.xml b/resources/PhoneNumberMetaDataForTesting.xml index 9cfae8d40..55bb2096b 100644 --- a/resources/PhoneNumberMetaDataForTesting.xml +++ b/resources/PhoneNumberMetaDataForTesting.xml @@ -486,7 +486,8 @@ + nationalPrefixTransformRule="1$1" nationalPrefixFormattingRule="$NP $FG" + nationalPrefixOptionalWhenFormatting="true"> [89]00 diff --git a/resources/phonemetadata.proto b/resources/phonemetadata.proto index 2af674b4b..1899fb519 100644 --- a/resources/phonemetadata.proto +++ b/resources/phonemetadata.proto @@ -15,7 +15,8 @@ */ // Definition of protocol buffer for holding metadata for international -// telephone numbers. +// telephone numbers. The fields here correspond exactly to those in +// resources/PhoneNumberMetaData.xml. // @author Shaopeng Jia syntax = "proto2"; @@ -67,13 +68,24 @@ message NumberFormat { // would contain "($NP)$FG". Note $FG should always be present in this field, // but $NP can be omitted. For example, having "$FG" could indicate the // number should be formatted in NATIONAL format without the national prefix. - // This is commonly used to override the rule from generalDesc. + // This is commonly used to override the rule specified for the territory in + // the XML file. // // When this field is missing, a number will be formatted without national // prefix in NATIONAL format. This field does not affect how a number // is formatted in other formats, such as INTERNATIONAL. optional string national_prefix_formatting_rule = 4; + // This field specifies whether the $NP can be omitted when formatting a + // number in national format, even though it usually wouldn't be. For example, + // a UK number would be formatted by our library as 020 XXXX XXXX. If we have + // commonly seen this number written by people without the leading 0, for + // example as (20) XXXX XXXX, this field would be set to true. This will be + // inherited from the value set for the territory in the XML file, unless a + // national_prefix_formatting_rule is defined specifically for this + // NumberFormat. + optional bool national_prefix_optional_when_formatting = 6; + // This field specifies how any carrier code ($CC) together with the first // group ($FG) in the national significant number should be formatted // when formatWithCarrierCode is called, if carrier codes are used for a @@ -203,6 +215,23 @@ message PhoneMetadata { // format. In this case, the prefix 9 is inserted when dialling from // overseas, but otherwise the prefix 0 and the carrier selection code // 15 (inserted after the area code of 343) is used. + // Note: this field is populated by setting a value for inside + // the tag in the XML file. If is not set then it + // defaults to the same value as the tag. + // + // Examples: + // To set the to a different value than the : + // + // $1 $2 $3 + // $1-$2-$3 + // + // + // To have a format only used for national formatting, set to + // "NA": + // + // $1 $2 $3 + // NA + // repeated NumberFormat intl_number_format = 20; // This field is set when this country is considered to be the main country diff --git a/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java b/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java index 9ebe2ba59..5a6aa44c3 100644 --- a/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java +++ b/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java @@ -63,6 +63,8 @@ public class BuildMetadataFromXml { private static final String NATIONAL_NUMBER_PATTERN = "nationalNumberPattern"; private static final String NATIONAL_PREFIX = "nationalPrefix"; private static final String NATIONAL_PREFIX_FORMATTING_RULE = "nationalPrefixFormattingRule"; + private static final String NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING = + "nationalPrefixOptionalWhenFormatting"; private static final String NATIONAL_PREFIX_FOR_PARSING = "nationalPrefixForParsing"; private static final String NATIONAL_PREFIX_TRANSFORM_RULE = "nationalPrefixTransformRule"; private static final String NO_INTERNATIONAL_DIALLING = "noInternationalDialling"; @@ -270,12 +272,15 @@ public class BuildMetadataFromXml { /** * Extracts the available formats from the provided DOM element. If it does not contain any - * nationalPrefixFormattingRule, the one passed-in is retained. + * nationalPrefixFormattingRule, the one passed-in is retained. The nationalPrefix, + * nationalPrefixFormattingRule and nationalPrefixOptionalWhenFormatting values are provided from + * the parent (territory) element. */ // @VisibleForTesting static void loadAvailableFormats(PhoneMetadata.Builder metadata, String regionCode, Element element, String nationalPrefix, - String nationalPrefixFormattingRule) { + String nationalPrefixFormattingRule, + boolean nationalPrefixOptionalWhenFormatting) { String carrierCodeFormattingRule = ""; if (element.hasAttribute(CARRIER_CODE_FORMATTING_RULE)) { carrierCodeFormattingRule = validateRE( @@ -293,8 +298,11 @@ public class BuildMetadataFromXml { if (numberFormatElement.hasAttribute(NATIONAL_PREFIX_FORMATTING_RULE)) { format.setNationalPrefixFormattingRule( getNationalPrefixFormattingRuleFromElement(numberFormatElement, nationalPrefix)); + format.setNationalPrefixOptionalWhenFormatting( + numberFormatElement.hasAttribute(NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING)); } else { format.setNationalPrefixFormattingRule(nationalPrefixFormattingRule); + format.setNationalPrefixOptionalWhenFormatting(nationalPrefixOptionalWhenFormatting); } if (numberFormatElement.hasAttribute(CARRIER_CODE_FORMATTING_RULE)) { format.setDomesticCarrierCodeFormattingRule(validateRE( @@ -444,7 +452,8 @@ public class BuildMetadataFromXml { loadTerritoryTagMetadata(regionCode, element, nationalPrefix, nationalPrefixFormattingRule); loadAvailableFormats(metadata, regionCode, element, nationalPrefix.toString(), - nationalPrefixFormattingRule.toString()); + nationalPrefixFormattingRule.toString(), + element.hasAttribute(NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING)); loadGeneralDesc(metadata, element); return metadata.build(); } diff --git a/tools/java/common/test/com/google/i18n/phonenumbers/BuildMetadataFromXmlTest.java b/tools/java/common/test/com/google/i18n/phonenumbers/BuildMetadataFromXmlTest.java index 70944b617..529cc6d35 100644 --- a/tools/java/common/test/com/google/i18n/phonenumbers/BuildMetadataFromXmlTest.java +++ b/tools/java/common/test/com/google/i18n/phonenumbers/BuildMetadataFromXmlTest.java @@ -259,7 +259,8 @@ public class BuildMetadataFromXmlTest extends TestCase { ""; Element element = parseXmlString(xmlInput); PhoneMetadata.Builder metadata = PhoneMetadata.newBuilder(); - BuildMetadataFromXml.loadAvailableFormats(metadata, "AE", element, "0", ""); + BuildMetadataFromXml.loadAvailableFormats( + metadata, "AE", element, "0", "", false /* NP not optional */); assertEquals("($1)", metadata.getNumberFormat(0).getNationalPrefixFormattingRule()); assertEquals("0 $CC ($1)", metadata.getNumberFormat(0).getDomesticCarrierCodeFormattingRule()); assertEquals("$1 $2 $3", metadata.getNumberFormat(0).getFormat()); @@ -277,7 +278,8 @@ public class BuildMetadataFromXmlTest extends TestCase { ""; Element element = parseXmlString(xmlInput); PhoneMetadata.Builder metadata = PhoneMetadata.newBuilder(); - BuildMetadataFromXml.loadAvailableFormats(metadata, "AE", element, "0", ""); + BuildMetadataFromXml.loadAvailableFormats( + metadata, "AE", element, "0", "", false /* NP not optional */); assertEquals("($1)", metadata.getNumberFormat(0).getNationalPrefixFormattingRule()); assertEquals("0 $CC ($1)", metadata.getNumberFormat(0).getDomesticCarrierCodeFormattingRule()); assertEquals("$1 $2 $3", metadata.getNumberFormat(0).getFormat()); @@ -293,7 +295,8 @@ public class BuildMetadataFromXmlTest extends TestCase { ""; Element element = parseXmlString(xmlInput); PhoneMetadata.Builder metadata = PhoneMetadata.newBuilder(); - BuildMetadataFromXml.loadAvailableFormats(metadata, "AE", element, "", "($1)"); + BuildMetadataFromXml.loadAvailableFormats( + metadata, "AE", element, "", "($1)", false /* NP not optional */); assertEquals("($1)", metadata.getNumberFormat(0).getNationalPrefixFormattingRule()); } @@ -307,7 +310,8 @@ public class BuildMetadataFromXmlTest extends TestCase { ""; Element element = parseXmlString(xmlInput); PhoneMetadata.Builder metadata = PhoneMetadata.newBuilder(); - BuildMetadataFromXml.loadAvailableFormats(metadata, "AE", element, "0", "($1)"); + BuildMetadataFromXml.loadAvailableFormats( + metadata, "AE", element, "0", "($1)", false /* NP not optional */); assertEquals(0, metadata.intlNumberFormatSize()); } @@ -322,7 +326,8 @@ public class BuildMetadataFromXmlTest extends TestCase { ""; Element element = parseXmlString(xmlInput); PhoneMetadata.Builder metadata = PhoneMetadata.newBuilder(); - BuildMetadataFromXml.loadAvailableFormats(metadata, "AE", element, "0", "($1)"); + BuildMetadataFromXml.loadAvailableFormats( + metadata, "AE", element, "0", "($1)", false /* NP not optional */); assertEquals("$1 $2 $3", metadata.getNumberFormat(0).getFormat()); assertEquals("$1-$2", metadata.getNumberFormat(1).getFormat()); } diff --git a/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar b/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar index 18e6ab058..c9e004f3c 100644 Binary files a/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar and b/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar differ diff --git a/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar b/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar index 9c4274f5f..41ca62da2 100644 Binary files a/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar and b/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar differ