From edd65d0141c2d36a410335316d62a82f1f305eca Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 20 Sep 2016 13:59:24 +0100 Subject: Upgrade to libphonenumber-7.7.0 which is nano proto free Bug: 31608797 Test: Rebuilt and ran android.telephony.cts.PhoneNumberUtilsTest Change-Id: Ia5beb5c0ff189577c3eb76cc4f2c4e5d243ae97d --- libphonenumber/pom.xml | 43 +- .../i18n/phonenumbers/AsYouTypeFormatter.java | 57 +- .../google/i18n/phonenumbers/MetadataLoader.java | 3 +- .../google/i18n/phonenumbers/MetadataManager.java | 113 +- .../google/i18n/phonenumbers/MetadataSource.java | 2 +- .../phonenumbers/MultiFileMetadataSourceImpl.java | 145 ++- .../i18n/phonenumbers/PhoneNumberMatcher.java | 16 +- .../google/i18n/phonenumbers/PhoneNumberUtil.java | 375 ++++--- .../google/i18n/phonenumbers/Phonemetadata.java | 1119 ++++++++++++++++++++ .../google/i18n/phonenumbers/ShortNumberInfo.java | 56 +- .../phonenumbers/SingleFileMetadataSourceImpl.java | 73 +- .../data/PhoneNumberAlternateFormatsProto_255 | Bin 99 -> 154 bytes .../data/PhoneNumberAlternateFormatsProto_27 | Bin 56 -> 104 bytes .../data/PhoneNumberAlternateFormatsProto_30 | Bin 52 -> 100 bytes .../data/PhoneNumberAlternateFormatsProto_31 | Bin 196 -> 251 bytes .../data/PhoneNumberAlternateFormatsProto_34 | Bin 97 -> 153 bytes .../data/PhoneNumberAlternateFormatsProto_350 | Bin 42 -> 89 bytes .../data/PhoneNumberAlternateFormatsProto_351 | Bin 150 -> 212 bytes .../data/PhoneNumberAlternateFormatsProto_352 | Bin 49 -> 96 bytes .../data/PhoneNumberAlternateFormatsProto_358 | Bin 121 -> 176 bytes .../data/PhoneNumberAlternateFormatsProto_359 | Bin 176 -> 238 bytes .../data/PhoneNumberAlternateFormatsProto_36 | Bin 90 -> 146 bytes .../data/PhoneNumberAlternateFormatsProto_372 | Bin 273 -> 335 bytes .../data/PhoneNumberAlternateFormatsProto_373 | Bin 111 -> 166 bytes .../data/PhoneNumberAlternateFormatsProto_380 | Bin 250 -> 307 bytes .../data/PhoneNumberAlternateFormatsProto_381 | Bin 327 -> 405 bytes .../data/PhoneNumberAlternateFormatsProto_385 | Bin 181 -> 251 bytes .../data/PhoneNumberAlternateFormatsProto_43 | Bin 735 -> 853 bytes .../data/PhoneNumberAlternateFormatsProto_44 | Bin 260 -> 342 bytes .../data/PhoneNumberAlternateFormatsProto_49 | Bin 4985 -> 5277 bytes .../data/PhoneNumberAlternateFormatsProto_505 | Bin 49 -> 96 bytes .../data/PhoneNumberAlternateFormatsProto_506 | Bin 64 -> 111 bytes .../data/PhoneNumberAlternateFormatsProto_54 | Bin 103 -> 159 bytes .../data/PhoneNumberAlternateFormatsProto_55 | Bin 50 -> 98 bytes .../data/PhoneNumberAlternateFormatsProto_58 | Bin 48 -> 96 bytes .../data/PhoneNumberAlternateFormatsProto_595 | Bin 92 -> 267 bytes .../data/PhoneNumberAlternateFormatsProto_61 | Bin 227 -> 301 bytes .../data/PhoneNumberAlternateFormatsProto_62 | Bin 67 -> 113 bytes .../data/PhoneNumberAlternateFormatsProto_63 | Bin 41 -> 89 bytes .../data/PhoneNumberAlternateFormatsProto_66 | Bin 42 -> 90 bytes .../data/PhoneNumberAlternateFormatsProto_675 | Bin 53 -> 100 bytes .../data/PhoneNumberAlternateFormatsProto_676 | Bin 55 -> 102 bytes .../data/PhoneNumberAlternateFormatsProto_679 | Bin 50 -> 97 bytes .../data/PhoneNumberAlternateFormatsProto_7 | Bin 268 -> 347 bytes .../data/PhoneNumberAlternateFormatsProto_81 | Bin 176 -> 239 bytes .../data/PhoneNumberAlternateFormatsProto_84 | Bin 103 -> 159 bytes .../data/PhoneNumberAlternateFormatsProto_855 | Bin 61 -> 108 bytes .../data/PhoneNumberAlternateFormatsProto_90 | Bin 91 -> 139 bytes .../data/PhoneNumberAlternateFormatsProto_91 | Bin 1321 -> 1366 bytes .../data/PhoneNumberAlternateFormatsProto_94 | Bin 51 -> 99 bytes .../data/PhoneNumberAlternateFormatsProto_95 | Bin 49 -> 97 bytes .../data/PhoneNumberAlternateFormatsProto_971 | Bin 54 -> 101 bytes .../data/PhoneNumberAlternateFormatsProto_972 | Bin 74 -> 119 bytes .../data/PhoneNumberAlternateFormatsProto_995 | Bin 73 -> 120 bytes .../phonenumbers/data/PhoneNumberMetadataProto_800 | Bin 225 -> 408 bytes .../phonenumbers/data/PhoneNumberMetadataProto_808 | Bin 225 -> 408 bytes .../phonenumbers/data/PhoneNumberMetadataProto_870 | Bin 246 -> 439 bytes .../phonenumbers/data/PhoneNumberMetadataProto_878 | Bin 255 -> 441 bytes .../phonenumbers/data/PhoneNumberMetadataProto_881 | Bin 233 -> 426 bytes .../phonenumbers/data/PhoneNumberMetadataProto_882 | Bin 665 -> 931 bytes .../phonenumbers/data/PhoneNumberMetadataProto_883 | Bin 400 -> 603 bytes .../phonenumbers/data/PhoneNumberMetadataProto_888 | Bin 251 -> 434 bytes .../phonenumbers/data/PhoneNumberMetadataProto_979 | Bin 236 -> 419 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AC | Bin 225 -> 420 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AD | Bin 311 -> 519 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AE | Bin 533 -> 766 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AF | Bin 309 -> 500 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AG | Bin 476 -> 667 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AI | Bin 410 -> 591 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AL | Bin 665 -> 888 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AM | Bin 564 -> 757 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AO | Bin 255 -> 446 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AR | Bin 4334 -> 4611 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AS | Bin 414 -> 595 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AT | Bin 1163 -> 1548 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AU | Bin 1047 -> 1357 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AW | Bin 367 -> 543 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AX | Bin 599 -> 949 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AZ | Bin 521 -> 759 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BA | Bin 492 -> 699 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BB | Bin 592 -> 791 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BD | Bin 2144 -> 2373 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BE | Bin 642 -> 856 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BF | Bin 333 -> 521 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BG | Bin 857 -> 1121 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BH | Bin 485 -> 657 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BI | Bin 257 -> 448 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BJ | Bin 351 -> 549 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BL | Bin 237 -> 420 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BM | Bin 426 -> 607 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BN | Bin 271 -> 459 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BO | Bin 496 -> 690 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BQ | Bin 276 -> 456 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BR | Bin 1296 -> 1581 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BS | Bin 584 -> 772 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BT | Bin 359 -> 571 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BW | Bin 512 -> 726 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BY | Bin 1261 -> 1501 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BZ | Bin 329 -> 555 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CA | Bin 720 -> 902 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CC | Bin 496 -> 708 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CD | Bin 462 -> 672 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CF | Bin 268 -> 452 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CG | Bin 310 -> 499 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CH | Bin 619 -> 827 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CI | Bin 363 -> 552 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CK | Bin 234 -> 425 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CL | Bin 1355 -> 1656 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CM | Bin 410 -> 626 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CN | Bin 3710 -> 4194 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CO | Bin 816 -> 1042 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CR | Bin 474 -> 678 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CU | Bin 393 -> 612 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CV | Bin 283 -> 471 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CW | Bin 415 -> 620 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CX | Bin 496 -> 712 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CY | Bin 342 -> 507 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CZ | Bin 649 -> 866 bytes .../phonenumbers/data/PhoneNumberMetadataProto_DE | Bin 2154 -> 2889 bytes .../phonenumbers/data/PhoneNumberMetadataProto_DJ | Bin 268 -> 450 bytes .../phonenumbers/data/PhoneNumberMetadataProto_DK | Bin 337 -> 512 bytes .../phonenumbers/data/PhoneNumberMetadataProto_DM | Bin 445 -> 626 bytes .../phonenumbers/data/PhoneNumberMetadataProto_DO | Bin 714 -> 881 bytes .../phonenumbers/data/PhoneNumberMetadataProto_DZ | Bin 569 -> 775 bytes .../phonenumbers/data/PhoneNumberMetadataProto_EC | Bin 603 -> 842 bytes .../phonenumbers/data/PhoneNumberMetadataProto_EE | Bin 866 -> 1128 bytes .../phonenumbers/data/PhoneNumberMetadataProto_EG | Bin 656 -> 882 bytes .../phonenumbers/data/PhoneNumberMetadataProto_EH | Bin 282 -> 493 bytes .../phonenumbers/data/PhoneNumberMetadataProto_ER | Bin 286 -> 476 bytes .../phonenumbers/data/PhoneNumberMetadataProto_ES | Bin 686 -> 858 bytes .../phonenumbers/data/PhoneNumberMetadataProto_ET | Bin 919 -> 1109 bytes .../phonenumbers/data/PhoneNumberMetadataProto_FI | Bin 842 -> 1184 bytes .../phonenumbers/data/PhoneNumberMetadataProto_FJ | Bin 367 -> 571 bytes .../phonenumbers/data/PhoneNumberMetadataProto_FK | Bin 191 -> 374 bytes .../phonenumbers/data/PhoneNumberMetadataProto_FM | Bin 260 -> 451 bytes .../phonenumbers/data/PhoneNumberMetadataProto_FO | Bin 368 -> 537 bytes .../phonenumbers/data/PhoneNumberMetadataProto_FR | Bin 623 -> 840 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GA | Bin 307 -> 506 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GB | Bin 2752 -> 2998 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GD | Bin 507 -> 687 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GE | Bin 538 -> 725 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GF | Bin 344 -> 530 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GG | Bin 554 -> 747 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GH | Bin 508 -> 707 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GI | Bin 336 -> 512 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GL | Bin 304 -> 484 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GM | Bin 321 -> 509 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GN | Bin 375 -> 583 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GP | Bin 337 -> 520 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GQ | Bin 377 -> 568 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GR | Bin 801 -> 985 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GT | Bin 346 -> 554 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GU | Bin 777 -> 948 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GW | Bin 390 -> 592 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GY | Bin 363 -> 543 bytes .../phonenumbers/data/PhoneNumberMetadataProto_HK | Bin 560 -> 838 bytes .../phonenumbers/data/PhoneNumberMetadataProto_HN | Bin 460 -> 657 bytes .../phonenumbers/data/PhoneNumberMetadataProto_HR | Bin 932 -> 1269 bytes .../phonenumbers/data/PhoneNumberMetadataProto_HT | Bin 328 -> 508 bytes .../phonenumbers/data/PhoneNumberMetadataProto_HU | Bin 488 -> 694 bytes .../phonenumbers/data/PhoneNumberMetadataProto_ID | Bin 1570 -> 1875 bytes .../phonenumbers/data/PhoneNumberMetadataProto_IE | Bin 1131 -> 1387 bytes .../phonenumbers/data/PhoneNumberMetadataProto_IL | Bin 992 -> 1267 bytes .../phonenumbers/data/PhoneNumberMetadataProto_IM | Bin 473 -> 634 bytes .../phonenumbers/data/PhoneNumberMetadataProto_IN | Bin 3599 -> 4914 bytes .../phonenumbers/data/PhoneNumberMetadataProto_IO | Bin 211 -> 402 bytes .../phonenumbers/data/PhoneNumberMetadataProto_IQ | Bin 398 -> 624 bytes .../phonenumbers/data/PhoneNumberMetadataProto_IR | Bin 616 -> 855 bytes .../phonenumbers/data/PhoneNumberMetadataProto_IS | Bin 721 -> 917 bytes .../phonenumbers/data/PhoneNumberMetadataProto_IT | Bin 1513 -> 1819 bytes .../phonenumbers/data/PhoneNumberMetadataProto_JE | Bin 652 -> 809 bytes .../phonenumbers/data/PhoneNumberMetadataProto_JM | Bin 641 -> 826 bytes .../phonenumbers/data/PhoneNumberMetadataProto_JO | Bin 967 -> 1174 bytes .../phonenumbers/data/PhoneNumberMetadataProto_JP | Bin 9281 -> 9621 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KE | Bin 539 -> 766 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KG | Bin 609 -> 821 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KH | Bin 572 -> 891 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KI | Bin 256 -> 451 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KM | Bin 286 -> 470 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KN | Bin 423 -> 604 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KP | Bin 420 -> 638 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KR | Bin 1378 -> 2820 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KW | Bin 524 -> 763 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KY | Bin 551 -> 727 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KZ | Bin 808 -> 970 bytes .../phonenumbers/data/PhoneNumberMetadataProto_LA | Bin 453 -> 675 bytes .../phonenumbers/data/PhoneNumberMetadataProto_LB | Bin 517 -> 719 bytes .../phonenumbers/data/PhoneNumberMetadataProto_LC | Bin 466 -> 647 bytes .../phonenumbers/data/PhoneNumberMetadataProto_LI | Bin 608 -> 820 bytes .../phonenumbers/data/PhoneNumberMetadataProto_LK | Bin 359 -> 556 bytes .../phonenumbers/data/PhoneNumberMetadataProto_LR | Bin 600 -> 822 bytes .../phonenumbers/data/PhoneNumberMetadataProto_LS | Bin 243 -> 430 bytes .../phonenumbers/data/PhoneNumberMetadataProto_LT | Bin 577 -> 750 bytes .../phonenumbers/data/PhoneNumberMetadataProto_LU | Bin 1155 -> 1445 bytes .../phonenumbers/data/PhoneNumberMetadataProto_LV | Bin 294 -> 462 bytes .../phonenumbers/data/PhoneNumberMetadataProto_LY | Bin 277 -> 467 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MA | Bin 673 -> 1011 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MC | Bin 469 -> 681 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MD | Bin 637 -> 812 bytes .../phonenumbers/data/PhoneNumberMetadataProto_ME | Bin 610 -> 817 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MF | Bin 248 -> 431 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MG | Bin 354 -> 540 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MH | Bin 276 -> 460 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MK | Bin 569 -> 769 bytes .../phonenumbers/data/PhoneNumberMetadataProto_ML | Bin 431 -> 654 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MM | Bin 1426 -> 1709 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MN | Bin 650 -> 880 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MO | Bin 266 -> 455 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MP | Bin 561 -> 728 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MQ | Bin 333 -> 519 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MR | Bin 299 -> 483 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MS | Bin 363 -> 535 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MT | Bin 488 -> 655 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MU | Bin 527 -> 730 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MV | Bin 438 -> 645 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MW | Bin 407 -> 613 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MX | Bin 1808 -> 2030 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MY | Bin 662 -> 910 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MZ | Bin 342 -> 550 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NA | Bin 812 -> 1020 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NC | Bin 311 -> 495 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NE | Bin 424 -> 609 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NF | Bin 280 -> 480 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NG | Bin 1258 -> 1550 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NI | Bin 279 -> 463 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NL | Bin 845 -> 1134 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NO | Bin 594 -> 793 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NP | Bin 547 -> 764 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NR | Bin 229 -> 420 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NU | Bin 188 -> 371 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NZ | Bin 809 -> 1076 bytes .../phonenumbers/data/PhoneNumberMetadataProto_OM | Bin 390 -> 613 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PA | Bin 815 -> 1014 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PE | Bin 519 -> 741 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PF | Bin 355 -> 559 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PG | Bin 415 -> 619 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PH | Bin 998 -> 1295 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PK | Bin 1669 -> 1927 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PL | Bin 741 -> 979 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PM | Bin 234 -> 423 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PR | Bin 395 -> 564 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PS | Bin 494 -> 724 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PT | Bin 612 -> 777 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PW | Bin 318 -> 506 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PY | Bin 781 -> 1171 bytes .../phonenumbers/data/PhoneNumberMetadataProto_QA | Bin 335 -> 534 bytes .../phonenumbers/data/PhoneNumberMetadataProto_RE | Bin 375 -> 545 bytes .../phonenumbers/data/PhoneNumberMetadataProto_RO | Bin 576 -> 786 bytes .../phonenumbers/data/PhoneNumberMetadataProto_RS | Bin 765 -> 1029 bytes .../phonenumbers/data/PhoneNumberMetadataProto_RU | Bin 718 -> 905 bytes .../phonenumbers/data/PhoneNumberMetadataProto_RW | Bin 413 -> 618 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SA | Bin 641 -> 882 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SB | Bin 431 -> 625 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SC | Bin 319 -> 526 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SD | Bin 267 -> 453 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SE | Bin 2476 -> 3061 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SG | Bin 503 -> 733 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SH | Bin 214 -> 390 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SI | Bin 618 -> 843 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SJ | Bin 437 -> 623 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SK | Bin 807 -> 1058 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SL | Bin 296 -> 486 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SM | Bin 525 -> 757 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SN | Bin 478 -> 651 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SO | Bin 473 -> 700 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SR | Bin 398 -> 606 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SS | Bin 251 -> 440 bytes .../phonenumbers/data/PhoneNumberMetadataProto_ST | Bin 246 -> 437 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SV | Bin 412 -> 640 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SX | Bin 411 -> 592 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SY | Bin 413 -> 601 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SZ | Bin 278 -> 455 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TA | Bin 164 -> 347 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TC | Bin 454 -> 631 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TD | Bin 298 -> 485 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TG | Bin 272 -> 460 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TH | Bin 519 -> 735 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TJ | Bin 590 -> 823 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TK | Bin 189 -> 410 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TL | Bin 347 -> 555 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TM | Bin 469 -> 665 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TN | Bin 348 -> 524 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TO | Bin 389 -> 602 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TR | Bin 659 -> 859 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TT | Bin 537 -> 726 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TV | Bin 206 -> 409 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TW | Bin 457 -> 672 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TZ | Bin 468 -> 674 bytes .../phonenumbers/data/PhoneNumberMetadataProto_UA | Bin 1090 -> 1282 bytes .../phonenumbers/data/PhoneNumberMetadataProto_UG | Bin 545 -> 747 bytes .../phonenumbers/data/PhoneNumberMetadataProto_US | Bin 1619 -> 1799 bytes .../phonenumbers/data/PhoneNumberMetadataProto_UY | Bin 410 -> 621 bytes .../phonenumbers/data/PhoneNumberMetadataProto_UZ | Bin 1764 -> 1947 bytes .../phonenumbers/data/PhoneNumberMetadataProto_VA | Bin 571 -> 802 bytes .../phonenumbers/data/PhoneNumberMetadataProto_VC | Bin 488 -> 669 bytes .../phonenumbers/data/PhoneNumberMetadataProto_VE | Bin 361 -> 542 bytes .../phonenumbers/data/PhoneNumberMetadataProto_VG | Bin 483 -> 664 bytes .../phonenumbers/data/PhoneNumberMetadataProto_VI | Bin 601 -> 768 bytes .../phonenumbers/data/PhoneNumberMetadataProto_VN | Bin 1025 -> 1366 bytes .../phonenumbers/data/PhoneNumberMetadataProto_VU | Bin 337 -> 533 bytes .../phonenumbers/data/PhoneNumberMetadataProto_WF | Bin 271 -> 455 bytes .../phonenumbers/data/PhoneNumberMetadataProto_WS | Bin 333 -> 561 bytes .../phonenumbers/data/PhoneNumberMetadataProto_YE | Bin 386 -> 602 bytes .../phonenumbers/data/PhoneNumberMetadataProto_YT | Bin 242 -> 420 bytes .../phonenumbers/data/PhoneNumberMetadataProto_ZA | Bin 623 -> 845 bytes .../phonenumbers/data/PhoneNumberMetadataProto_ZM | Bin 326 -> 514 bytes .../phonenumbers/data/PhoneNumberMetadataProto_ZW | Bin 1432 -> 1697 bytes .../phonenumbers/data/ShortNumberMetadataProto_AC | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_AD | Bin 121 -> 238 bytes .../phonenumbers/data/ShortNumberMetadataProto_AE | Bin 130 -> 261 bytes .../phonenumbers/data/ShortNumberMetadataProto_AF | Bin 149 -> 261 bytes .../phonenumbers/data/ShortNumberMetadataProto_AG | Bin 137 -> 249 bytes .../phonenumbers/data/ShortNumberMetadataProto_AI | Bin 118 -> 231 bytes .../phonenumbers/data/ShortNumberMetadataProto_AL | Bin 177 -> 296 bytes .../phonenumbers/data/ShortNumberMetadataProto_AM | Bin 154 -> 269 bytes .../phonenumbers/data/ShortNumberMetadataProto_AO | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_AR | Bin 221 -> 344 bytes .../phonenumbers/data/ShortNumberMetadataProto_AS | Bin 126 -> 243 bytes .../phonenumbers/data/ShortNumberMetadataProto_AT | Bin 206 -> 321 bytes .../phonenumbers/data/ShortNumberMetadataProto_AU | Bin 382 -> 481 bytes .../phonenumbers/data/ShortNumberMetadataProto_AW | Bin 133 -> 246 bytes .../phonenumbers/data/ShortNumberMetadataProto_AX | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_AZ | Bin 164 -> 279 bytes .../phonenumbers/data/ShortNumberMetadataProto_BA | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_BB | Bin 128 -> 245 bytes .../phonenumbers/data/ShortNumberMetadataProto_BD | Bin 269 -> 379 bytes .../phonenumbers/data/ShortNumberMetadataProto_BE | Bin 400 -> 506 bytes .../phonenumbers/data/ShortNumberMetadataProto_BF | Bin 110 -> 227 bytes .../phonenumbers/data/ShortNumberMetadataProto_BG | Bin 186 -> 301 bytes .../phonenumbers/data/ShortNumberMetadataProto_BH | Bin 148 -> 260 bytes .../phonenumbers/data/ShortNumberMetadataProto_BI | Bin 215 -> 326 bytes .../phonenumbers/data/ShortNumberMetadataProto_BJ | Bin 117 -> 234 bytes .../phonenumbers/data/ShortNumberMetadataProto_BL | Bin 104 -> 221 bytes .../phonenumbers/data/ShortNumberMetadataProto_BM | Bin 122 -> 235 bytes .../phonenumbers/data/ShortNumberMetadataProto_BN | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_BO | Bin 128 -> 245 bytes .../phonenumbers/data/ShortNumberMetadataProto_BQ | Bin 133 -> 246 bytes .../phonenumbers/data/ShortNumberMetadataProto_BR | Bin 245 -> 649 bytes .../phonenumbers/data/ShortNumberMetadataProto_BS | Bin 117 -> 234 bytes .../phonenumbers/data/ShortNumberMetadataProto_BT | Bin 134 -> 251 bytes .../phonenumbers/data/ShortNumberMetadataProto_BW | Bin 141 -> 253 bytes .../phonenumbers/data/ShortNumberMetadataProto_BY | Bin 176 -> 295 bytes .../phonenumbers/data/ShortNumberMetadataProto_BZ | Bin 131 -> 248 bytes .../phonenumbers/data/ShortNumberMetadataProto_CA | Bin 135 -> 359 bytes .../phonenumbers/data/ShortNumberMetadataProto_CC | Bin 122 -> 239 bytes .../phonenumbers/data/ShortNumberMetadataProto_CD | Bin 168 -> 283 bytes .../phonenumbers/data/ShortNumberMetadataProto_CF | Bin 144 -> 260 bytes .../phonenumbers/data/ShortNumberMetadataProto_CG | Bin 127 -> 240 bytes .../phonenumbers/data/ShortNumberMetadataProto_CH | Bin 372 -> 471 bytes .../phonenumbers/data/ShortNumberMetadataProto_CI | Bin 157 -> 272 bytes .../phonenumbers/data/ShortNumberMetadataProto_CK | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_CL | Bin 782 -> 882 bytes .../phonenumbers/data/ShortNumberMetadataProto_CM | Bin 141 -> 253 bytes .../phonenumbers/data/ShortNumberMetadataProto_CN | Bin 187 -> 302 bytes .../phonenumbers/data/ShortNumberMetadataProto_CO | Bin 209 -> 324 bytes .../phonenumbers/data/ShortNumberMetadataProto_CR | Bin 329 -> 443 bytes .../phonenumbers/data/ShortNumberMetadataProto_CU | Bin 145 -> 261 bytes .../phonenumbers/data/ShortNumberMetadataProto_CV | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_CW | Bin 133 -> 246 bytes .../phonenumbers/data/ShortNumberMetadataProto_CX | Bin 122 -> 239 bytes .../phonenumbers/data/ShortNumberMetadataProto_CY | Bin 174 -> 289 bytes .../phonenumbers/data/ShortNumberMetadataProto_CZ | Bin 216 -> 331 bytes .../phonenumbers/data/ShortNumberMetadataProto_DE | Bin 193 -> 308 bytes .../phonenumbers/data/ShortNumberMetadataProto_DJ | Bin 110 -> 227 bytes .../phonenumbers/data/ShortNumberMetadataProto_DK | Bin 209 -> 324 bytes .../phonenumbers/data/ShortNumberMetadataProto_DM | Bin 137 -> 253 bytes .../phonenumbers/data/ShortNumberMetadataProto_DO | Bin 122 -> 239 bytes .../phonenumbers/data/ShortNumberMetadataProto_DZ | Bin 130 -> 243 bytes .../phonenumbers/data/ShortNumberMetadataProto_EC | Bin 143 -> 259 bytes .../phonenumbers/data/ShortNumberMetadataProto_EE | Bin 167 -> 282 bytes .../phonenumbers/data/ShortNumberMetadataProto_EG | Bin 160 -> 275 bytes .../phonenumbers/data/ShortNumberMetadataProto_EH | Bin 135 -> 252 bytes .../phonenumbers/data/ShortNumberMetadataProto_ER | Bin 242 -> 361 bytes .../phonenumbers/data/ShortNumberMetadataProto_ES | Bin 548 -> 646 bytes .../phonenumbers/data/ShortNumberMetadataProto_ET | Bin 152 -> 271 bytes .../phonenumbers/data/ShortNumberMetadataProto_FI | Bin 144 -> 256 bytes .../phonenumbers/data/ShortNumberMetadataProto_FJ | Bin 194 -> 313 bytes .../phonenumbers/data/ShortNumberMetadataProto_FK | Bin 121 -> 238 bytes .../phonenumbers/data/ShortNumberMetadataProto_FM | Bin 163 -> 282 bytes .../phonenumbers/data/ShortNumberMetadataProto_FO | Bin 149 -> 271 bytes .../phonenumbers/data/ShortNumberMetadataProto_FR | Bin 582 -> 694 bytes .../phonenumbers/data/ShortNumberMetadataProto_GA | Bin 150 -> 269 bytes .../phonenumbers/data/ShortNumberMetadataProto_GB | Bin 324 -> 626 bytes .../phonenumbers/data/ShortNumberMetadataProto_GD | Bin 118 -> 231 bytes .../phonenumbers/data/ShortNumberMetadataProto_GE | Bin 184 -> 299 bytes .../phonenumbers/data/ShortNumberMetadataProto_GF | Bin 112 -> 229 bytes .../phonenumbers/data/ShortNumberMetadataProto_GG | Bin 182 -> 301 bytes .../phonenumbers/data/ShortNumberMetadataProto_GH | Bin 184 -> 299 bytes .../phonenumbers/data/ShortNumberMetadataProto_GI | Bin 344 -> 448 bytes .../phonenumbers/data/ShortNumberMetadataProto_GL | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_GM | Bin 129 -> 246 bytes .../phonenumbers/data/ShortNumberMetadataProto_GN | Bin 112 -> 229 bytes .../phonenumbers/data/ShortNumberMetadataProto_GP | Bin 112 -> 229 bytes .../phonenumbers/data/ShortNumberMetadataProto_GR | Bin 200 -> 315 bytes .../phonenumbers/data/ShortNumberMetadataProto_GT | Bin 161 -> 276 bytes .../phonenumbers/data/ShortNumberMetadataProto_GU | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_GW | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_GY | Bin 203 -> 318 bytes .../phonenumbers/data/ShortNumberMetadataProto_HK | Bin 132 -> 249 bytes .../phonenumbers/data/ShortNumberMetadataProto_HN | Bin 132 -> 245 bytes .../phonenumbers/data/ShortNumberMetadataProto_HR | Bin 198 -> 313 bytes .../phonenumbers/data/ShortNumberMetadataProto_HT | Bin 139 -> 251 bytes .../phonenumbers/data/ShortNumberMetadataProto_HU | Bin 196 -> 311 bytes .../phonenumbers/data/ShortNumberMetadataProto_ID | Bin 177 -> 292 bytes .../phonenumbers/data/ShortNumberMetadataProto_IE | Bin 202 -> 313 bytes .../phonenumbers/data/ShortNumberMetadataProto_IL | Bin 187 -> 302 bytes .../phonenumbers/data/ShortNumberMetadataProto_IM | Bin 154 -> 273 bytes .../phonenumbers/data/ShortNumberMetadataProto_IN | Bin 178 -> 363 bytes .../phonenumbers/data/ShortNumberMetadataProto_IQ | Bin 184 -> 299 bytes .../phonenumbers/data/ShortNumberMetadataProto_IR | Bin 133 -> 250 bytes .../phonenumbers/data/ShortNumberMetadataProto_IS | Bin 266 -> 369 bytes .../phonenumbers/data/ShortNumberMetadataProto_IT | Bin 426 -> 532 bytes .../phonenumbers/data/ShortNumberMetadataProto_JE | Bin 212 -> 331 bytes .../phonenumbers/data/ShortNumberMetadataProto_JM | Bin 142 -> 254 bytes .../phonenumbers/data/ShortNumberMetadataProto_JO | Bin 191 -> 306 bytes .../phonenumbers/data/ShortNumberMetadataProto_JP | Bin 117 -> 234 bytes .../phonenumbers/data/ShortNumberMetadataProto_KE | Bin 208 -> 684 bytes .../phonenumbers/data/ShortNumberMetadataProto_KG | Bin 139 -> 251 bytes .../phonenumbers/data/ShortNumberMetadataProto_KH | Bin 150 -> 265 bytes .../phonenumbers/data/ShortNumberMetadataProto_KI | Bin 166 -> 281 bytes .../phonenumbers/data/ShortNumberMetadataProto_KM | Bin 110 -> 227 bytes .../phonenumbers/data/ShortNumberMetadataProto_KN | Bin 137 -> 253 bytes .../phonenumbers/data/ShortNumberMetadataProto_KP | Bin 137 -> 253 bytes .../phonenumbers/data/ShortNumberMetadataProto_KR | Bin 220 -> 331 bytes .../phonenumbers/data/ShortNumberMetadataProto_KW | Bin 135 -> 248 bytes .../phonenumbers/data/ShortNumberMetadataProto_KY | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_KZ | Bin 175 -> 290 bytes .../phonenumbers/data/ShortNumberMetadataProto_LA | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_LB | Bin 143 -> 259 bytes .../phonenumbers/data/ShortNumberMetadataProto_LC | Bin 125 -> 242 bytes .../phonenumbers/data/ShortNumberMetadataProto_LI | Bin 166 -> 285 bytes .../phonenumbers/data/ShortNumberMetadataProto_LK | Bin 123 -> 240 bytes .../phonenumbers/data/ShortNumberMetadataProto_LR | Bin 173 -> 288 bytes .../phonenumbers/data/ShortNumberMetadataProto_LS | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_LT | Bin 233 -> 348 bytes .../phonenumbers/data/ShortNumberMetadataProto_LU | Bin 177 -> 292 bytes .../phonenumbers/data/ShortNumberMetadataProto_LV | Bin 284 -> 384 bytes .../phonenumbers/data/ShortNumberMetadataProto_LY | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_MA | Bin 135 -> 252 bytes .../phonenumbers/data/ShortNumberMetadataProto_MC | Bin 143 -> 259 bytes .../phonenumbers/data/ShortNumberMetadataProto_MD | Bin 225 -> 344 bytes .../phonenumbers/data/ShortNumberMetadataProto_ME | Bin 194 -> 313 bytes .../phonenumbers/data/ShortNumberMetadataProto_MF | Bin 112 -> 229 bytes .../phonenumbers/data/ShortNumberMetadataProto_MG | Bin 127 -> 244 bytes .../phonenumbers/data/ShortNumberMetadataProto_MH | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_MK | Bin 133 -> 250 bytes .../phonenumbers/data/ShortNumberMetadataProto_ML | Bin 504 -> 557 bytes .../phonenumbers/data/ShortNumberMetadataProto_MM | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_MN | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_MO | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_MP | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_MQ | Bin 138 -> 254 bytes .../phonenumbers/data/ShortNumberMetadataProto_MR | Bin 110 -> 227 bytes .../phonenumbers/data/ShortNumberMetadataProto_MS | Bin 125 -> 242 bytes .../phonenumbers/data/ShortNumberMetadataProto_MT | Bin 174 -> 289 bytes .../phonenumbers/data/ShortNumberMetadataProto_MU | Bin 149 -> 268 bytes .../phonenumbers/data/ShortNumberMetadataProto_MV | Bin 134 -> 251 bytes .../phonenumbers/data/ShortNumberMetadataProto_MW | Bin 157 -> 272 bytes .../phonenumbers/data/ShortNumberMetadataProto_MX | Bin 219 -> 334 bytes .../phonenumbers/data/ShortNumberMetadataProto_MY | Bin 122 -> 239 bytes .../phonenumbers/data/ShortNumberMetadataProto_MZ | Bin 157 -> 276 bytes .../phonenumbers/data/ShortNumberMetadataProto_NA | Bin 155 -> 274 bytes .../phonenumbers/data/ShortNumberMetadataProto_NC | Bin 261 -> 372 bytes .../phonenumbers/data/ShortNumberMetadataProto_NE | Bin 270 -> 382 bytes .../phonenumbers/data/ShortNumberMetadataProto_NF | Bin 131 -> 248 bytes .../phonenumbers/data/ShortNumberMetadataProto_NG | Bin 140 -> 252 bytes .../phonenumbers/data/ShortNumberMetadataProto_NI | Bin 206 -> 321 bytes .../phonenumbers/data/ShortNumberMetadataProto_NL | Bin 184 -> 377 bytes .../phonenumbers/data/ShortNumberMetadataProto_NO | Bin 150 -> 299 bytes .../phonenumbers/data/ShortNumberMetadataProto_NP | Bin 133 -> 250 bytes .../phonenumbers/data/ShortNumberMetadataProto_NR | Bin 129 -> 246 bytes .../phonenumbers/data/ShortNumberMetadataProto_NU | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_NZ | Bin 111 -> 254 bytes .../phonenumbers/data/ShortNumberMetadataProto_OM | Bin 115 -> 232 bytes .../phonenumbers/data/ShortNumberMetadataProto_PA | Bin 122 -> 239 bytes .../phonenumbers/data/ShortNumberMetadataProto_PE | Bin 131 -> 248 bytes .../phonenumbers/data/ShortNumberMetadataProto_PF | Bin 112 -> 229 bytes .../phonenumbers/data/ShortNumberMetadataProto_PG | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_PH | Bin 128 -> 245 bytes .../phonenumbers/data/ShortNumberMetadataProto_PK | Bin 154 -> 273 bytes .../phonenumbers/data/ShortNumberMetadataProto_PL | Bin 214 -> 329 bytes .../phonenumbers/data/ShortNumberMetadataProto_PM | Bin 112 -> 229 bytes .../phonenumbers/data/ShortNumberMetadataProto_PR | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_PT | Bin 168 -> 283 bytes .../phonenumbers/data/ShortNumberMetadataProto_PW | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_PY | Bin 127 -> 244 bytes .../phonenumbers/data/ShortNumberMetadataProto_QA | Bin 145 -> 261 bytes .../phonenumbers/data/ShortNumberMetadataProto_RE | Bin 138 -> 254 bytes .../phonenumbers/data/ShortNumberMetadataProto_RO | Bin 160 -> 275 bytes .../phonenumbers/data/ShortNumberMetadataProto_RS | Bin 144 -> 260 bytes .../phonenumbers/data/ShortNumberMetadataProto_RU | Bin 137 -> 253 bytes .../phonenumbers/data/ShortNumberMetadataProto_RW | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_SA | Bin 298 -> 402 bytes .../phonenumbers/data/ShortNumberMetadataProto_SB | Bin 213 -> 332 bytes .../phonenumbers/data/ShortNumberMetadataProto_SC | Bin 200 -> 319 bytes .../phonenumbers/data/ShortNumberMetadataProto_SD | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_SE | Bin 449 -> 551 bytes .../phonenumbers/data/ShortNumberMetadataProto_SG | Bin 183 -> 302 bytes .../phonenumbers/data/ShortNumberMetadataProto_SH | Bin 145 -> 261 bytes .../phonenumbers/data/ShortNumberMetadataProto_SI | Bin 180 -> 295 bytes .../phonenumbers/data/ShortNumberMetadataProto_SJ | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_SK | Bin 182 -> 304 bytes .../phonenumbers/data/ShortNumberMetadataProto_SL | Bin 155 -> 270 bytes .../phonenumbers/data/ShortNumberMetadataProto_SM | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_SN | Bin 108 -> 225 bytes .../phonenumbers/data/ShortNumberMetadataProto_SO | Bin 137 -> 253 bytes .../phonenumbers/data/ShortNumberMetadataProto_SR | Bin 123 -> 240 bytes .../phonenumbers/data/ShortNumberMetadataProto_ST | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_SV | Bin 132 -> 245 bytes .../phonenumbers/data/ShortNumberMetadataProto_SX | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_SY | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_SZ | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_TC | Bin 125 -> 242 bytes .../phonenumbers/data/ShortNumberMetadataProto_TD | Bin 110 -> 227 bytes .../phonenumbers/data/ShortNumberMetadataProto_TG | Bin 144 -> 260 bytes .../phonenumbers/data/ShortNumberMetadataProto_TH | Bin 254 -> 372 bytes .../phonenumbers/data/ShortNumberMetadataProto_TJ | Bin 133 -> 250 bytes .../phonenumbers/data/ShortNumberMetadataProto_TL | Bin 145 -> 261 bytes .../phonenumbers/data/ShortNumberMetadataProto_TM | Bin 112 -> 229 bytes .../phonenumbers/data/ShortNumberMetadataProto_TN | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_TO | Bin 138 -> 254 bytes .../phonenumbers/data/ShortNumberMetadataProto_TR | Bin 131 -> 248 bytes .../phonenumbers/data/ShortNumberMetadataProto_TT | Bin 117 -> 234 bytes .../phonenumbers/data/ShortNumberMetadataProto_TV | Bin 121 -> 238 bytes .../phonenumbers/data/ShortNumberMetadataProto_TW | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_TZ | Bin 155 -> 270 bytes .../phonenumbers/data/ShortNumberMetadataProto_UA | Bin 133 -> 250 bytes .../phonenumbers/data/ShortNumberMetadataProto_UG | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_US | Bin 638 -> 739 bytes .../phonenumbers/data/ShortNumberMetadataProto_UY | Bin 149 -> 268 bytes .../phonenumbers/data/ShortNumberMetadataProto_UZ | Bin 174 -> 289 bytes .../phonenumbers/data/ShortNumberMetadataProto_VA | Bin 121 -> 238 bytes .../phonenumbers/data/ShortNumberMetadataProto_VC | Bin 125 -> 242 bytes .../phonenumbers/data/ShortNumberMetadataProto_VE | Bin 137 -> 253 bytes .../phonenumbers/data/ShortNumberMetadataProto_VG | Bin 125 -> 242 bytes .../phonenumbers/data/ShortNumberMetadataProto_VI | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_VN | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_VU | Bin 111 -> 228 bytes .../phonenumbers/data/ShortNumberMetadataProto_WF | Bin 112 -> 229 bytes .../phonenumbers/data/ShortNumberMetadataProto_WS | Bin 119 -> 236 bytes .../phonenumbers/data/ShortNumberMetadataProto_YE | Bin 121 -> 238 bytes .../phonenumbers/data/ShortNumberMetadataProto_YT | Bin 130 -> 247 bytes .../phonenumbers/data/ShortNumberMetadataProto_ZA | Bin 156 -> 306 bytes .../phonenumbers/data/ShortNumberMetadataProto_ZM | Bin 139 -> 255 bytes .../phonenumbers/data/ShortNumberMetadataProto_ZW | Bin 148 -> 267 bytes .../data/SingleFilePhoneNumberMetadataProto | Bin 158957 -> 0 bytes .../i18n/phonenumbers/internal/MatcherApi.java | 2 +- .../phonenumbers/internal/RegexBasedMatcher.java | 6 +- .../i18n/phonenumbers/nano/Phonemetadata.java | 1040 ------------------ .../i18n/phonenumbers/ExampleNumbersTest.java | 46 +- .../i18n/phonenumbers/MetadataManagerTest.java | 6 +- .../MultiFileMetadataSourceImplTest.java | 30 +- .../i18n/phonenumbers/PhoneNumberUtilTest.java | 231 ++-- .../i18n/phonenumbers/ShortNumberInfoTest.java | 2 +- .../data/PhoneNumberMetadataProtoForTesting_800 | Bin 225 -> 424 bytes .../data/PhoneNumberMetadataProtoForTesting_979 | Bin 233 -> 435 bytes .../data/PhoneNumberMetadataProtoForTesting_AD | Bin 122 -> 299 bytes .../data/PhoneNumberMetadataProtoForTesting_AE | Bin 200 -> 384 bytes .../data/PhoneNumberMetadataProtoForTesting_AO | Bin 267 -> 455 bytes .../data/PhoneNumberMetadataProtoForTesting_AR | Bin 780 -> 1064 bytes .../data/PhoneNumberMetadataProtoForTesting_AU | Bin 322 -> 526 bytes .../data/PhoneNumberMetadataProtoForTesting_BB | Bin 122 -> 300 bytes .../data/PhoneNumberMetadataProtoForTesting_BR | Bin 117 -> 297 bytes .../data/PhoneNumberMetadataProtoForTesting_BS | Bin 344 -> 521 bytes .../data/PhoneNumberMetadataProtoForTesting_BY | Bin 312 -> 511 bytes .../data/PhoneNumberMetadataProtoForTesting_CA | Bin 122 -> 300 bytes .../data/PhoneNumberMetadataProtoForTesting_CC | Bin 117 -> 297 bytes .../data/PhoneNumberMetadataProtoForTesting_CN | Bin 202 -> 584 bytes .../data/PhoneNumberMetadataProtoForTesting_CX | Bin 121 -> 299 bytes .../data/PhoneNumberMetadataProtoForTesting_DE | Bin 660 -> 925 bytes .../data/PhoneNumberMetadataProtoForTesting_FR | Bin 224 -> 407 bytes .../data/PhoneNumberMetadataProtoForTesting_GB | Bin 483 -> 665 bytes .../data/PhoneNumberMetadataProtoForTesting_GG | Bin 117 -> 297 bytes .../data/PhoneNumberMetadataProtoForTesting_HU | Bin 174 -> 361 bytes .../data/PhoneNumberMetadataProtoForTesting_IT | Bin 402 -> 648 bytes .../data/PhoneNumberMetadataProtoForTesting_JP | Bin 673 -> 950 bytes .../data/PhoneNumberMetadataProtoForTesting_KR | Bin 1472 -> 1755 bytes .../data/PhoneNumberMetadataProtoForTesting_MX | Bin 923 -> 1161 bytes .../data/PhoneNumberMetadataProtoForTesting_NZ | Bin 492 -> 731 bytes .../data/PhoneNumberMetadataProtoForTesting_PL | Bin 274 -> 457 bytes .../data/PhoneNumberMetadataProtoForTesting_RE | Bin 359 -> 536 bytes .../data/PhoneNumberMetadataProtoForTesting_SE | Bin 121 -> 299 bytes .../data/PhoneNumberMetadataProtoForTesting_SG | Bin 359 -> 584 bytes .../data/PhoneNumberMetadataProtoForTesting_US | Bin 507 -> 693 bytes .../data/PhoneNumberMetadataProtoForTesting_YT | Bin 236 -> 414 bytes .../SingleFilePhoneNumberMetadataProtoForTesting | Bin 10902 -> 0 bytes 586 files changed, 1778 insertions(+), 1587 deletions(-) create mode 100644 libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java delete mode 100644 libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto delete mode 100644 libphonenumber/src/com/google/i18n/phonenumbers/nano/Phonemetadata.java delete mode 100644 libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting (limited to 'libphonenumber') diff --git a/libphonenumber/pom.xml b/libphonenumber/pom.xml index 82446bcc..608ab88b 100644 --- a/libphonenumber/pom.xml +++ b/libphonenumber/pom.xml @@ -3,14 +3,14 @@ 4.0.0 com.googlecode.libphonenumber libphonenumber - 7.2.6 + 7.7.0 jar https://github.com/googlei18n/libphonenumber/ com.googlecode.libphonenumber libphonenumber-parent - 7.2.6 + 7.7.0 @@ -30,41 +30,26 @@ - maven-jar-plugin - - - com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.class - com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto - - - - - maven-shade-plugin - 2.4.2 + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.15 - package + test - shade + check + + + org.codehaus.mojo.signature + java15 + 1.0 + + - - - protobuf-java-lib - file://${project.basedir}/../lib - - - - - com.google.protobuf - protobuf-java - 2.6.1 - - - diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java index 6af473e6..abcab8d5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java @@ -16,8 +16,8 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; import java.util.ArrayList; import java.util.Iterator; @@ -61,11 +61,8 @@ public class AsYouTypeFormatter { // Character used when appropriate to separate a prefix, such as a long NDD or a country calling // code, from the national number. private static final char SEPARATOR_BEFORE_NATIONAL_NUMBER = ' '; - private static final PhoneMetadata EMPTY_METADATA; - static { - EMPTY_METADATA = new PhoneMetadata(); - EMPTY_METADATA.internationalPrefix = "NA"; - } + private static final PhoneMetadata EMPTY_METADATA = + new PhoneMetadata().setInternationalPrefix("NA"); private PhoneMetadata defaultMetadata; private PhoneMetadata currentMetadata; @@ -154,7 +151,7 @@ public class AsYouTypeFormatter { Iterator it = possibleFormats.iterator(); while (it.hasNext()) { NumberFormat numberFormat = it.next(); - String pattern = numberFormat.pattern; + String pattern = numberFormat.getPattern(); if (currentFormattingPattern.equals(pattern)) { return false; } @@ -162,7 +159,7 @@ public class AsYouTypeFormatter { currentFormattingPattern = pattern; shouldAddSpaceAfterNationalPrefix = NATIONAL_PREFIX_SEPARATORS_PATTERN.matcher( - numberFormat.nationalPrefixFormattingRule).find(); + numberFormat.getNationalPrefixFormattingRule()).find(); // With a new formatting template, the matched position using the old template needs to be // reset. lastMatchPosition = 0; @@ -176,17 +173,17 @@ public class AsYouTypeFormatter { } private void getAvailableFormats(String leadingDigits) { - NumberFormat[] numberFormats = - (isCompleteNumber && currentMetadata.intlNumberFormat.length > 0) - ? currentMetadata.intlNumberFormat - : currentMetadata.numberFormat; - boolean nationalPrefixIsUsedByCountry = (!currentMetadata.nationalPrefix.equals("")); - for (NumberFormat format : numberFormats) { + List formatList = + (isCompleteNumber && currentMetadata.intlNumberFormatSize() > 0) + ? currentMetadata.intlNumberFormats() + : currentMetadata.numberFormats(); + boolean nationalPrefixIsUsedByCountry = currentMetadata.hasNationalPrefix(); + for (NumberFormat format : formatList) { if (!nationalPrefixIsUsedByCountry || isCompleteNumber || - format.nationalPrefixOptionalWhenFormatting || + format.isNationalPrefixOptionalWhenFormatting() || PhoneNumberUtil.formattingRuleHasFirstGroupOnly( - format.nationalPrefixFormattingRule)) { - if (isFormatEligible(format.format)) { + format.getNationalPrefixFormattingRule())) { + if (isFormatEligible(format.getFormat())) { possibleFormats.add(format); } } @@ -203,14 +200,14 @@ public class AsYouTypeFormatter { Iterator it = possibleFormats.iterator(); while (it.hasNext()) { NumberFormat format = it.next(); - if (format.leadingDigitsPattern.length == 0) { + if (format.leadingDigitsPatternSize() == 0) { // Keep everything that isn't restricted by leading digits. continue; } int lastLeadingDigitsPattern = - Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPattern.length - 1); + Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPatternSize() - 1); Pattern leadingDigitsPattern = regexCache.getPatternForRegex( - format.leadingDigitsPattern[lastLeadingDigitsPattern]); + format.getLeadingDigitsPattern(lastLeadingDigitsPattern)); Matcher m = leadingDigitsPattern.matcher(leadingDigits); if (!m.lookingAt()) { it.remove(); @@ -219,7 +216,7 @@ public class AsYouTypeFormatter { } private boolean createFormattingTemplate(NumberFormat format) { - String numberPattern = format.pattern; + String numberPattern = format.getPattern(); // The formatter doesn't format numbers when numberPattern contains "|", e.g. // (20|3)\d{4}. In those cases we quickly return. @@ -233,7 +230,7 @@ public class AsYouTypeFormatter { // Replace any standalone digit (not the one in d{}) with \d numberPattern = STANDALONE_DIGIT_PATTERN.matcher(numberPattern).replaceAll("\\\\d"); formattingTemplate.setLength(0); - String tempTemplate = getFormattingTemplate(numberPattern, format.format); + String tempTemplate = getFormattingTemplate(numberPattern, format.getFormat()); if (tempTemplate.length() > 0) { formattingTemplate.append(tempTemplate); return true; @@ -431,12 +428,12 @@ public class AsYouTypeFormatter { */ String attemptToFormatAccruedDigits() { for (NumberFormat numberFormat : possibleFormats) { - Matcher m = regexCache.getPatternForRegex(numberFormat.pattern).matcher(nationalNumber); + Matcher m = regexCache.getPatternForRegex(numberFormat.getPattern()).matcher(nationalNumber); if (m.matches()) { shouldAddSpaceAfterNationalPrefix = NATIONAL_PREFIX_SEPARATORS_PATTERN.matcher( - numberFormat.nationalPrefixFormattingRule).find(); - String formattedNumber = m.replaceAll(numberFormat.format); + numberFormat.getNationalPrefixFormattingRule()).find(); + String formattedNumber = m.replaceAll(numberFormat.getFormat()); return appendNationalNumber(formattedNumber); } } @@ -529,7 +526,7 @@ public class AsYouTypeFormatter { // that national significant numbers in NANPA always start with [2-9] after the national prefix. // Numbers beginning with 1[01] can only be short/emergency numbers, which don't need the // national prefix. - return (currentMetadata.countryCode == 1) && (nationalNumber.charAt(0) == '1') && + return (currentMetadata.getCountryCode() == 1) && (nationalNumber.charAt(0) == '1') && (nationalNumber.charAt(1) != '0') && (nationalNumber.charAt(1) != '1'); } @@ -540,9 +537,9 @@ public class AsYouTypeFormatter { startOfNationalNumber = 1; prefixBeforeNationalNumber.append('1').append(SEPARATOR_BEFORE_NATIONAL_NUMBER); isCompleteNumber = true; - } else if (!currentMetadata.nationalPrefixForParsing.equals("")) { + } else if (currentMetadata.hasNationalPrefixForParsing()) { Pattern nationalPrefixForParsing = - regexCache.getPatternForRegex(currentMetadata.nationalPrefixForParsing); + regexCache.getPatternForRegex(currentMetadata.getNationalPrefixForParsing()); Matcher m = nationalPrefixForParsing.matcher(nationalNumber); // Since some national prefix patterns are entirely optional, check that a national prefix // could actually be extracted. @@ -570,7 +567,7 @@ public class AsYouTypeFormatter { private boolean attemptToExtractIdd() { Pattern internationalPrefix = regexCache.getPatternForRegex("\\" + PhoneNumberUtil.PLUS_SIGN + "|" + - currentMetadata.internationalPrefix); + currentMetadata.getInternationalPrefix()); Matcher iddMatcher = internationalPrefix.matcher(accruedInputWithoutFormatting); if (iddMatcher.lookingAt()) { isCompleteNumber = true; diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataLoader.java b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataLoader.java index 1ab3e931..9904bcda 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataLoader.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataLoader.java @@ -23,7 +23,8 @@ import java.io.InputStream; */ public interface MetadataLoader { /** - * Returns an input stream corresponding to the metadata to load. + * Returns an input stream corresponding to the metadata to load. This method may be called + * concurrently so implementations must be thread-safe. * * @param metadataFileName File name (including path) of metadata to load. File path is an * absolute class path like /com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto. diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java index 0d998c75..df72a608 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java @@ -16,16 +16,16 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadataCollection; -import com.google.protobuf.nano.CodedInputByteBufferNano; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.logging.Level; @@ -36,13 +36,13 @@ import java.util.logging.Logger; * additional data files such as PhoneNumberAlternateFormats, but in the future it is envisaged it * would handle the main metadata file (PhoneNumberMetadata.xml) as well. */ -class MetadataManager { +final class MetadataManager { private static final String ALTERNATE_FORMATS_FILE_PREFIX = "/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto"; private static final String SHORT_NUMBER_METADATA_FILE_PREFIX = "/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto"; - private static final Logger LOGGER = Logger.getLogger(MetadataManager.class.getName()); + private static final Logger logger = Logger.getLogger(MetadataManager.class.getName()); private static final Map callingCodeToAlternateFormatsMap = Collections.synchronizedMap(new HashMap()); @@ -61,50 +61,52 @@ class MetadataManager { private MetadataManager() { } - private static void close(InputStream in) { - if (in != null) { + /** + * Loads and returns the metadata object from the given stream and closes the stream. + * + * @param source the non-null stream from which metadata is to be read + * @return the loaded metadata object + */ + static PhoneMetadataCollection loadMetadataAndCloseInput(InputStream source) { + ObjectInputStream ois = null; + try { try { - in.close(); + ois = new ObjectInputStream(source); } catch (IOException e) { - LOGGER.log(Level.WARNING, e.toString()); + throw new RuntimeException("cannot load/parse metadata", e); + } + PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection(); + try { + metadataCollection.readExternal(ois); + } catch (IOException e) { + throw new RuntimeException("cannot load/parse metadata", e); + } + return metadataCollection; + } finally { + try { + if (ois != null) { + // This will close all underlying streams as well, including source. + ois.close(); + } else { + source.close(); + } + } catch (IOException e) { + logger.log(Level.WARNING, "error closing input stream (ignored)", e); } } } - // The size of the byte buffer used for deserializing the alternate formats and short number - // metadata files for each region. - private static final int BUFFER_SIZE = 16 * 1024; - - static CodedInputByteBufferNano convertStreamToByteBuffer(ObjectInputStream in, int bufferSize) - throws IOException { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - int nRead; - byte[] data = new byte[bufferSize]; - - while ((nRead = in.read(data, 0, bufferSize)) != -1) { - outputStream.write(data, 0, nRead); - } - - outputStream.flush(); - return CodedInputByteBufferNano.newInstance(outputStream.toByteArray()); - } - private static void loadAlternateFormatsMetadataFromFile(int countryCallingCode) { - InputStream source = PhoneNumberMatcher.class.getResourceAsStream( - ALTERNATE_FORMATS_FILE_PREFIX + "_" + countryCallingCode); - ObjectInputStream in = null; - try { - in = new ObjectInputStream(source); - CodedInputByteBufferNano byteBuffer = convertStreamToByteBuffer(in, BUFFER_SIZE); - PhoneMetadataCollection alternateFormats = new PhoneMetadataCollection(); - alternateFormats.mergeFrom(byteBuffer); - for (PhoneMetadata metadata : alternateFormats.metadata) { - callingCodeToAlternateFormatsMap.put(metadata.countryCode, metadata); - } - } catch (IOException e) { - LOGGER.log(Level.WARNING, e.toString()); - } finally { - close(in); + String fileName = ALTERNATE_FORMATS_FILE_PREFIX + "_" + countryCallingCode; + InputStream source = MetadataManager.class.getResourceAsStream(fileName); + if (source == null) { + // Sanity check; this should not happen since we only load things based on the expectation + // that they are present, by checking the map of available data first. + throw new IllegalStateException("missing metadata: " + fileName); + } + PhoneMetadataCollection alternateFormats = loadMetadataAndCloseInput(source); + for (PhoneMetadata metadata : alternateFormats.getMetadataList()) { + callingCodeToAlternateFormatsMap.put(metadata.getCountryCode(), metadata); } } @@ -121,21 +123,16 @@ class MetadataManager { } private static void loadShortNumberMetadataFromFile(String regionCode) { - InputStream source = PhoneNumberMatcher.class.getResourceAsStream( - SHORT_NUMBER_METADATA_FILE_PREFIX + "_" + regionCode); - ObjectInputStream in = null; - try { - in = new ObjectInputStream(source); - CodedInputByteBufferNano byteBuffer = convertStreamToByteBuffer(in, BUFFER_SIZE); - PhoneMetadataCollection shortNumberMetadata = new PhoneMetadataCollection(); - shortNumberMetadata.mergeFrom(byteBuffer); - for (PhoneMetadata metadata : shortNumberMetadata.metadata) { - regionCodeToShortNumberMetadataMap.put(regionCode, metadata); - } - } catch (IOException e) { - LOGGER.log(Level.WARNING, e.toString()); - } finally { - close(in); + String fileName = SHORT_NUMBER_METADATA_FILE_PREFIX + "_" + regionCode; + InputStream source = MetadataManager.class.getResourceAsStream(fileName); + if (source == null) { + // Sanity check; this should not happen since we only load things based on the expectation + // that they are present, by checking the map of available data first. + throw new IllegalStateException("missing metadata: " + fileName); + } + PhoneMetadataCollection shortNumberMetadata = loadMetadataAndCloseInput(source); + for (PhoneMetadata metadata : shortNumberMetadata.getMetadataList()) { + regionCodeToShortNumberMetadataMap.put(regionCode, metadata); } } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java index 018ff3da..d0ec50df 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java @@ -16,7 +16,7 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; /** * A source for phone metadata for all regions. diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java b/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java index 4f6b29da..d89052c8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java @@ -16,16 +16,16 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadataCollection; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection; -import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; @@ -41,18 +41,14 @@ final class MultiFileMetadataSourceImpl implements MetadataSource { "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto"; // A mapping from a region code to the PhoneMetadata for that region. - // Note: Synchronization, though only needed for the Android version of the library, is used in - // all versions for consistency. - private final Map regionToMetadataMap = - Collections.synchronizedMap(new HashMap()); + private final ConcurrentHashMap geographicalRegions = + new ConcurrentHashMap(); // A mapping from a country calling code for a non-geographical entity to the PhoneMetadata for // that country calling code. Examples of the country calling codes include 800 (International // Toll Free Service) and 808 (International Shared Cost Service). - // Note: Synchronization, though only needed for the Android version of the library, is used in - // all versions for consistency. - private final Map countryCodeToNonGeographicalMetadataMap = - Collections.synchronizedMap(new HashMap()); + private final ConcurrentHashMap nonGeographicalRegions = + new ConcurrentHashMap(); // The prefix of the metadata files from which region data is loaded. private final String filePrefix; @@ -60,104 +56,81 @@ final class MultiFileMetadataSourceImpl implements MetadataSource { // The metadata loader used to inject alternative metadata sources. private final MetadataLoader metadataLoader; - // It is assumed that metadataLoader is not null. - public MultiFileMetadataSourceImpl(String filePrefix, MetadataLoader metadataLoader) { + // It is assumed that metadataLoader is not null. If needed, checks should happen before passing + // here. + // @VisibleForTesting + MultiFileMetadataSourceImpl(String filePrefix, MetadataLoader metadataLoader) { this.filePrefix = filePrefix; this.metadataLoader = metadataLoader; } - // It is assumed that metadataLoader is not null. + // It is assumed that metadataLoader is not null. If needed, checks should happen before passing + // here. public MultiFileMetadataSourceImpl(MetadataLoader metadataLoader) { this(META_DATA_FILE_PREFIX, metadataLoader); } @Override public PhoneMetadata getMetadataForRegion(String regionCode) { - synchronized (regionToMetadataMap) { - if (!regionToMetadataMap.containsKey(regionCode)) { - // The regionCode here will be valid and won't be '001', so we don't need to worry about - // what to pass in for the country calling code. - loadMetadataFromFile(regionCode, 0); - } - } - return regionToMetadataMap.get(regionCode); + PhoneMetadata metadata = geographicalRegions.get(regionCode); + return (metadata != null) ? metadata : loadMetadataFromFile( + regionCode, geographicalRegions, filePrefix, metadataLoader); } @Override public PhoneMetadata getMetadataForNonGeographicalRegion(int countryCallingCode) { - synchronized (countryCodeToNonGeographicalMetadataMap) { - if (!countryCodeToNonGeographicalMetadataMap.containsKey(countryCallingCode)) { - List regionCodes = - CountryCodeToRegionCodeMap.getCountryCodeToRegionCodeMap().get(countryCallingCode); - // We can assume that if the country calling code maps to the non-geo entity region code - // then that's the only region code it maps to. - if (regionCodes.size() == 1 && - PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCodes.get(0))) { - loadMetadataFromFile(PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, countryCallingCode); - } - } + PhoneMetadata metadata = nonGeographicalRegions.get(countryCallingCode); + if (metadata != null) { + return metadata; + } + if (isNonGeographical(countryCallingCode)) { + return loadMetadataFromFile( + countryCallingCode, nonGeographicalRegions, filePrefix, metadataLoader); } - return countryCodeToNonGeographicalMetadataMap.get(countryCallingCode); + // The given country calling code was for a geographical region. + return null; } + // A country calling code is non-geographical if it only maps to the non-geographical region code, + // i.e. "001". + private boolean isNonGeographical(int countryCallingCode) { + List regionCodes = + CountryCodeToRegionCodeMap.getCountryCodeToRegionCodeMap().get(countryCallingCode); + return (regionCodes.size() == 1 + && PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCodes.get(0))); + } + + /** + * @param key The geographical region code or the non-geographical region's country + * calling code. + * @param map The map to contain the mapping from {@code key} to the corresponding + * metadata. + * @param filePrefix The prefix of the metadata files from which region data is loaded. + * @param metadataLoader The metadata loader used to inject alternative metadata sources. + */ // @VisibleForTesting - void loadMetadataFromFile(String regionCode, int countryCallingCode) { - boolean isNonGeoRegion = PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCode); - String fileName = filePrefix + "_" + - (isNonGeoRegion ? String.valueOf(countryCallingCode) : regionCode); + static PhoneMetadata loadMetadataFromFile( + T key, ConcurrentHashMap map, String filePrefix, + MetadataLoader metadataLoader) { + // We assume key.toString() is well-defined. + String fileName = filePrefix + "_" + key; InputStream source = metadataLoader.loadMetadata(fileName); if (source == null) { - logger.log(Level.SEVERE, "missing metadata: " + fileName); + // Sanity check; this should not happen since we only load things based on the expectation + // that they are present, by checking the map of available data first. throw new IllegalStateException("missing metadata: " + fileName); } - try { - PhoneMetadataCollection metadataCollection = - loadMetadataAndCloseInput(new ObjectInputStream(source)); - PhoneMetadata[] metadataList = metadataCollection.metadata; - if (metadataList.length == 0) { - logger.log(Level.SEVERE, "empty metadata: " + fileName); - throw new IllegalStateException("empty metadata: " + fileName); - } - if (metadataList.length > 1) { - logger.log(Level.WARNING, "invalid metadata (too many entries): " + fileName); - } - PhoneMetadata metadata = metadataList[0]; - if (isNonGeoRegion) { - countryCodeToNonGeographicalMetadataMap.put(countryCallingCode, metadata); - } else { - regionToMetadataMap.put(regionCode, metadata); - } - } catch (IOException e) { - logger.log(Level.SEVERE, "cannot load/parse metadata: " + fileName, e); - throw new RuntimeException("cannot load/parse metadata: " + fileName, e); + PhoneMetadataCollection metadataCollection = MetadataManager.loadMetadataAndCloseInput(source); + List metadataList = metadataCollection.getMetadataList(); + if (metadataList.isEmpty()) { + // Sanity check; this should not happen since we build with non-empty metadata. + throw new IllegalStateException("empty metadata: " + fileName); } - } - - /** - * Loads the metadata protocol buffer from the given stream and closes the stream afterwards. Any - * exceptions that occur while reading or closing the stream are ignored. - * - * @param source the non-null stream from which metadata is to be read. - * @return the loaded metadata protocol buffer. - */ - private static PhoneMetadataCollection loadMetadataAndCloseInput(ObjectInputStream source) { - // The size of the byte buffer used for deserializing the phone number metadata files for each - // region. - final int MULTI_FILE_BUFFER_SIZE = 16 * 1024; - - PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection(); - try { - metadataCollection.mergeFrom( - MetadataManager.convertStreamToByteBuffer(source, MULTI_FILE_BUFFER_SIZE)); - } catch (IOException e) { - logger.log(Level.WARNING, "error reading input (ignored)", e); - } finally { - try { - source.close(); - } catch (IOException e) { - logger.log(Level.WARNING, "error closing input stream (ignored)", e); - } + if (metadataList.size() > 1) { + logger.log(Level.WARNING, "invalid metadata (too many entries): " + fileName); } - return metadataCollection; + PhoneMetadata metadata = metadataList.get(0); + PhoneMetadata oldValue = map.putIfAbsent(key, metadata); + return (oldValue != null) ? oldValue : metadata; } } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java index a9d918f2..c74b21ab 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java @@ -19,10 +19,10 @@ package com.google.i18n.phonenumbers; import com.google.i18n.phonenumbers.PhoneNumberUtil.Leniency; import com.google.i18n.phonenumbers.PhoneNumberUtil.MatchType; import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; -import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; +import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource; -import com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import java.lang.Character.UnicodeBlock; import java.util.Iterator; @@ -585,7 +585,7 @@ final class PhoneNumberMatcher implements Iterator { PhoneMetadata alternateFormats = MetadataManager.getAlternateFormatsForCountry(number.getCountryCode()); if (alternateFormats != null) { - for (NumberFormat alternateFormat : alternateFormats.numberFormat) { + for (NumberFormat alternateFormat : alternateFormats.numberFormats()) { formattedNumberGroups = getNationalNumberGroups(util, number, alternateFormat); if (checker.checkGroups(util, number, normalizedCandidate, formattedNumberGroups)) { return true; @@ -665,17 +665,17 @@ final class PhoneNumberMatcher implements Iterator { // Check if a national prefix should be present when formatting this number. String nationalNumber = util.getNationalSignificantNumber(number); NumberFormat formatRule = - util.chooseFormattingPatternForNumber(metadata.numberFormat, nationalNumber); + 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.nationalPrefixFormattingRule.length() > 0) { - if (formatRule.nationalPrefixOptionalWhenFormatting) { + 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; } if (PhoneNumberUtil.formattingRuleHasFirstGroupOnly( - formatRule.nationalPrefixFormattingRule)) { + formatRule.getNationalPrefixFormattingRule())) { // National Prefix not needed for this number. return true; } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index 0a0e455f..5a41d761 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -16,11 +16,11 @@ package com.google.i18n.phonenumbers; +import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource; -import com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; import java.io.InputStream; import java.util.ArrayList; @@ -88,6 +88,19 @@ public class PhoneNumberUtil { // be the length of the area code plus the length of the mobile token. private static final Map MOBILE_TOKEN_MAPPINGS; + // Set of country codes that have geographically assigned mobile numbers (see GEO_MOBILE_COUNTRIES + // below) which are not based on *area codes*. For example, in China mobile numbers start with a + // carrier indicator, and beyond that are geographically assigned: this carrier indicator is not + // considered to be an area code. + private static final Set GEO_MOBILE_COUNTRIES_WITHOUT_MOBILE_AREA_CODES; + + // Set of country calling codes that have geographically assigned mobile numbers. This may not be + // complete; we add calling codes case by case, as we find geographical mobile numbers or hear + // from user reports. Note that countries like the US, where we can't distinguish between + // fixed-line or mobile numbers, are not listed here, since we consider FIXED_LINE_OR_MOBILE to be + // a possibly geographically-related type anyway (like FIXED_LINE). + private static final Set GEO_MOBILE_COUNTRIES; + // The PLUS_SIGN signifies the international prefix. static final char PLUS_SIGN = '+'; @@ -119,6 +132,19 @@ public class PhoneNumberUtil { mobileTokenMap.put(54, "9"); MOBILE_TOKEN_MAPPINGS = Collections.unmodifiableMap(mobileTokenMap); + HashSet geoMobileCountriesWithoutMobileAreaCodes = new HashSet(); + geoMobileCountriesWithoutMobileAreaCodes.add(86); // China + GEO_MOBILE_COUNTRIES_WITHOUT_MOBILE_AREA_CODES = + Collections.unmodifiableSet(geoMobileCountriesWithoutMobileAreaCodes); + + HashSet geoMobileCountries = new HashSet(); + geoMobileCountries.add(52); // Mexico + geoMobileCountries.add(54); // Argentina + geoMobileCountries.add(55); // Brazil + geoMobileCountries.add(62); // Indonesia: some prefixes only (fixed CMDA wireless) + geoMobileCountries.addAll(geoMobileCountriesWithoutMobileAreaCodes); + GEO_MOBILE_COUNTRIES = Collections.unmodifiableSet(geoMobileCountries); + // Simple ASCII digits map used to populate ALPHA_PHONE_MAPPINGS and // ALL_PLUS_NUMBER_GROUPING_SYMBOLS. HashMap asciiDigitMappings = new HashMap(); @@ -586,24 +612,6 @@ public class PhoneNumberUtil { nanpaRegions.addAll(countryCallingCodeToRegionCodeMap.get(NANPA_COUNTRY_CODE)); } - /** - * Returns a copy of the given NumberFormat object. - */ - static NumberFormat copyNumberFormat(NumberFormat other) { - NumberFormat copy = new NumberFormat(); - copy.pattern = other.pattern; - copy.format = other.format; - int leadingDigitsPatternSize = other.leadingDigitsPattern.length; - copy.leadingDigitsPattern = new String[leadingDigitsPatternSize]; - for (int i = 0; i < leadingDigitsPatternSize; i++) { - copy.leadingDigitsPattern[i] = other.leadingDigitsPattern[i]; - } - copy.nationalPrefixFormattingRule = other.nationalPrefixFormattingRule; - copy.domesticCarrierCodeFormattingRule = other.domesticCarrierCodeFormattingRule; - copy.nationalPrefixOptionalWhenFormatting = other.nationalPrefixOptionalWhenFormatting; - return copy; - } - /** * Attempts to extract a possible number from the string passed in. This currently strips all * leading characters that cannot be used to start a phone number. Characters that can be used to @@ -787,11 +795,21 @@ public class PhoneNumberUtil { } // If a country doesn't use a national prefix, and this number doesn't have an Italian leading // zero, we assume it is a closed dialling plan with no area codes. - if (metadata.nationalPrefix.equals("") && !number.isItalianLeadingZero()) { + if (!metadata.hasNationalPrefix() && !number.isItalianLeadingZero()) { + return 0; + } + + PhoneNumberType type = getNumberType(number); + int countryCallingCode = number.getCountryCode(); + if (type == PhoneNumberType.MOBILE + // Note this is a rough heuristic; it doesn't cover Indonesia well, for example, where area + // codes are present for some mobile phones but not for others. We have no better way of + // representing this in the metadata at this point. + && GEO_MOBILE_COUNTRIES_WITHOUT_MOBILE_AREA_CODES.contains(countryCallingCode)) { return 0; } - if (!isNumberGeographical(number)) { + if (!isNumberGeographical(type, countryCallingCode)) { return 0; } @@ -1006,18 +1024,23 @@ public class PhoneNumberUtil { * Tests whether a phone number has a geographical association. It checks if the number is * associated to a certain region in the country where it belongs to. Note that this doesn't * verify if the number is actually in use. + */ + public boolean isNumberGeographical(PhoneNumber phoneNumber) { + return isNumberGeographical(getNumberType(phoneNumber), phoneNumber.getCountryCode()); + } + + /** + * Tests whether a phone number has a geographical association, as represented by its type and the + * country it belongs to. * - * A similar method is implemented as PhoneNumberOfflineGeocoder.canBeGeocoded, which performs a - * looser check, since it only prevents cases where prefixes overlap for geocodable and - * non-geocodable numbers. Also, if new phone number types were added, we should check if this - * other method should be updated too. + * This version of isNumberGeographical exists since calculating the phone number type is + * expensive; if we have already done this, we don't want to do it again. */ - boolean isNumberGeographical(PhoneNumber phoneNumber) { - PhoneNumberType numberType = getNumberType(phoneNumber); - // TODO: Include mobile phone numbers from countries like Indonesia, which has some - // mobile numbers that are geographical. - return numberType == PhoneNumberType.FIXED_LINE || - numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE; + public boolean isNumberGeographical(PhoneNumberType numberType, int countryCallingCode) { + return numberType == PhoneNumberType.FIXED_LINE + || numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE + || (GEO_MOBILE_COUNTRIES.contains(countryCallingCode) + && numberType == PhoneNumberType.MOBILE); } /** @@ -1131,29 +1154,29 @@ public class PhoneNumberUtil { StringBuilder formattedNumber = new StringBuilder(20); NumberFormat formattingPattern = - chooseFormattingPatternForNumber(userDefinedFormats.toArray( - new NumberFormat[userDefinedFormats.size()]), nationalSignificantNumber); + chooseFormattingPatternForNumber(userDefinedFormats, nationalSignificantNumber); if (formattingPattern == null) { // If no pattern above is matched, we format the number as a whole. formattedNumber.append(nationalSignificantNumber); } else { + NumberFormat numFormatCopy = new NumberFormat(); // Before we do a replacement of the national prefix pattern $NP with the national prefix, we // need to copy the rule so that subsequent replacements for different numbers have the // appropriate national prefix. - NumberFormat numFormatCopy = copyNumberFormat(formattingPattern); - String nationalPrefixFormattingRule = formattingPattern.nationalPrefixFormattingRule; + numFormatCopy.mergeFrom(formattingPattern); + String nationalPrefixFormattingRule = formattingPattern.getNationalPrefixFormattingRule(); if (nationalPrefixFormattingRule.length() > 0) { - String nationalPrefix = metadata.nationalPrefix; + String nationalPrefix = metadata.getNationalPrefix(); if (nationalPrefix.length() > 0) { // Replace $NP with national prefix and $FG with the first group ($1). nationalPrefixFormattingRule = NP_PATTERN.matcher(nationalPrefixFormattingRule).replaceFirst(nationalPrefix); nationalPrefixFormattingRule = FG_PATTERN.matcher(nationalPrefixFormattingRule).replaceFirst("\\$1"); - numFormatCopy.nationalPrefixFormattingRule = nationalPrefixFormattingRule; + numFormatCopy.setNationalPrefixFormattingRule(nationalPrefixFormattingRule); } else { // We don't want to have a rule for how to format the national prefix if there isn't one. - numFormatCopy.nationalPrefixFormattingRule = ""; + numFormatCopy.clearNationalPrefixFormattingRule(); } } formattedNumber.append( @@ -1369,16 +1392,16 @@ public class PhoneNumberUtil { } // Metadata cannot be null because we checked 'isValidRegionCode()' above. PhoneMetadata metadataForRegionCallingFrom = getMetadataForRegion(regionCallingFrom); - String internationalPrefix = metadataForRegionCallingFrom.internationalPrefix; + String internationalPrefix = metadataForRegionCallingFrom.getInternationalPrefix(); // For regions that have multiple international prefixes, the international format of the // number is returned, unless there is a preferred international prefix. String internationalPrefixForFormatting = ""; if (UNIQUE_INTERNATIONAL_PREFIX.matcher(internationalPrefix).matches()) { internationalPrefixForFormatting = internationalPrefix; - } else if (!metadataForRegionCallingFrom.preferredInternationalPrefix.equals("")) { + } else if (metadataForRegionCallingFrom.hasPreferredInternationalPrefix()) { internationalPrefixForFormatting = - metadataForRegionCallingFrom.preferredInternationalPrefix; + metadataForRegionCallingFrom.getPreferredInternationalPrefix(); } String regionCode = getRegionCodeForCountryCode(countryCallingCode); @@ -1464,7 +1487,7 @@ public class PhoneNumberUtil { PhoneMetadata metadata = getMetadataForRegion(regionCode); String nationalNumber = getNationalSignificantNumber(number); NumberFormat formatRule = - chooseFormattingPatternForNumber(metadata.numberFormat, nationalNumber); + chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber); // The format rule could still be null here if the national number was 0 and there was no // raw input (this should not be possible for numbers generated by the phonenumber library // as they would also not have a country calling code and we would have exited earlier). @@ -1476,7 +1499,7 @@ public class PhoneNumberUtil { // return the national format. // TODO: Refactor the code below with the code in // isNationalPrefixPresentIfRequired. - String candidateNationalPrefixRule = formatRule.nationalPrefixFormattingRule; + String candidateNationalPrefixRule = formatRule.getNationalPrefixFormattingRule(); // We assume that the first-group symbol will never be _before_ the national prefix. int indexOfFirstGroup = candidateNationalPrefixRule.indexOf("$1"); if (indexOfFirstGroup <= 0) { @@ -1492,8 +1515,9 @@ public class PhoneNumberUtil { break; } // Otherwise, we need to remove the national prefix from our output. - NumberFormat numFormatCopy = copyNumberFormat(formatRule); - numFormatCopy.nationalPrefixFormattingRule = ""; + NumberFormat numFormatCopy = new NumberFormat(); + numFormatCopy.mergeFrom(formatRule); + numFormatCopy.clearNationalPrefixFormattingRule(); List numberFormats = new ArrayList(1); numberFormats.add(numFormatCopy); formattedNumber = formatByPattern(number, PhoneNumberFormat.NATIONAL, numberFormats); @@ -1550,7 +1574,7 @@ public class PhoneNumberUtil { } String nationalNumber = getNationalSignificantNumber(number); NumberFormat formatRule = - chooseFormattingPatternForNumber(metadata.numberFormat, nationalNumber); + chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber); return formatRule != null; } @@ -1614,17 +1638,18 @@ public class PhoneNumberUtil { } else if (metadataForRegionCallingFrom != null && countryCode == getCountryCodeForValidRegion(regionCallingFrom)) { NumberFormat formattingPattern = - chooseFormattingPatternForNumber(metadataForRegionCallingFrom.numberFormat, + chooseFormattingPatternForNumber(metadataForRegionCallingFrom.numberFormats(), nationalNumber); if (formattingPattern == null) { // If no pattern above is matched, we format the original input. return rawInput; } - NumberFormat newFormat = copyNumberFormat(formattingPattern); + NumberFormat newFormat = new NumberFormat(); + newFormat.mergeFrom(formattingPattern); // The first group is the first group of digits that the user wrote together. - newFormat.pattern = "(\\d+)(.*)"; + newFormat.setPattern("(\\d+)(.*)"); // Here we just concatenate them back together after the national prefix has been fixed. - newFormat.format = "$1$2"; + newFormat.setFormat("$1$2"); // Now we format using this pattern instead of the default pattern, but with the national // prefix prefixed if necessary. // This will not work in the cases where the pattern (and not the leading digits) decide @@ -1637,11 +1662,11 @@ public class PhoneNumberUtil { // prefixes, the international format of the number is returned, unless there is a preferred // international prefix. if (metadataForRegionCallingFrom != null) { - String internationalPrefix = metadataForRegionCallingFrom.internationalPrefix; + String internationalPrefix = metadataForRegionCallingFrom.getInternationalPrefix(); internationalPrefixForFormatting = UNIQUE_INTERNATIONAL_PREFIX.matcher(internationalPrefix).matches() ? internationalPrefix - : metadataForRegionCallingFrom.preferredInternationalPrefix; + : metadataForRegionCallingFrom.getPreferredInternationalPrefix(); } StringBuilder formattedNumber = new StringBuilder(rawInput); String regionCode = getRegionCodeForCountryCode(countryCode); @@ -1723,27 +1748,27 @@ public class PhoneNumberUtil { PhoneMetadata metadata, PhoneNumberFormat numberFormat, String carrierCode) { - NumberFormat[] intlNumberFormats = metadata.intlNumberFormat; + List intlNumberFormats = metadata.intlNumberFormats(); // When the intlNumberFormats exists, we use that to format national number for the // INTERNATIONAL format instead of using the numberDesc.numberFormats. - NumberFormat[] availableFormats = - (intlNumberFormats.length == 0 || numberFormat == PhoneNumberFormat.NATIONAL) - ? metadata.numberFormat - : metadata.intlNumberFormat; + List availableFormats = + (intlNumberFormats.size() == 0 || numberFormat == PhoneNumberFormat.NATIONAL) + ? metadata.numberFormats() + : metadata.intlNumberFormats(); NumberFormat formattingPattern = chooseFormattingPatternForNumber(availableFormats, number); return (formattingPattern == null) ? number : formatNsnUsingPattern(number, formattingPattern, numberFormat, carrierCode); } - NumberFormat chooseFormattingPatternForNumber(NumberFormat[] availableFormats, + NumberFormat chooseFormattingPatternForNumber(List availableFormats, String nationalNumber) { for (NumberFormat numFormat : availableFormats) { - int size = numFormat.leadingDigitsPattern.length; + int size = numFormat.leadingDigitsPatternSize(); if (size == 0 || regexCache.getPatternForRegex( // We always use the last leading_digits_pattern, as it is the most detailed. - numFormat.leadingDigitsPattern[size - 1]).matcher(nationalNumber).lookingAt()) { - Matcher m = regexCache.getPatternForRegex(numFormat.pattern).matcher(nationalNumber); + numFormat.getLeadingDigitsPattern(size - 1)).matcher(nationalNumber).lookingAt()) { + Matcher m = regexCache.getPatternForRegex(numFormat.getPattern()).matcher(nationalNumber); if (m.matches()) { return numFormat; } @@ -1765,15 +1790,15 @@ public class PhoneNumberUtil { NumberFormat formattingPattern, PhoneNumberFormat numberFormat, String carrierCode) { - String numberFormatRule = formattingPattern.format; + String numberFormatRule = formattingPattern.getFormat(); Matcher m = - regexCache.getPatternForRegex(formattingPattern.pattern).matcher(nationalNumber); + regexCache.getPatternForRegex(formattingPattern.getPattern()).matcher(nationalNumber); String formattedNationalNumber = ""; if (numberFormat == PhoneNumberFormat.NATIONAL && carrierCode != null && carrierCode.length() > 0 && - formattingPattern.domesticCarrierCodeFormattingRule.length() > 0) { + formattingPattern.getDomesticCarrierCodeFormattingRule().length() > 0) { // Replace the $CC in the formatting rule with the desired carrier code. - String carrierCodeFormattingRule = formattingPattern.domesticCarrierCodeFormattingRule; + String carrierCodeFormattingRule = formattingPattern.getDomesticCarrierCodeFormattingRule(); carrierCodeFormattingRule = CC_PATTERN.matcher(carrierCodeFormattingRule).replaceFirst(carrierCode); // Now replace the $FG in the formatting rule with the first group and the carrier code @@ -1783,7 +1808,7 @@ public class PhoneNumberUtil { formattedNationalNumber = m.replaceAll(numberFormatRule); } else { // Use the national prefix formatting rule instead. - String nationalPrefixFormattingRule = formattingPattern.nationalPrefixFormattingRule; + String nationalPrefixFormattingRule = formattingPattern.getNationalPrefixFormattingRule(); if (numberFormat == PhoneNumberFormat.NATIONAL && nationalPrefixFormattingRule != null && nationalPrefixFormattingRule.length() > 0) { @@ -1818,6 +1843,62 @@ public class PhoneNumberUtil { return getExampleNumberForType(regionCode, PhoneNumberType.FIXED_LINE); } + /** + * Gets an invalid number for the specified region. This is useful for unit-testing purposes, + * where you want to test what will happen with an invalid number. Note that the number that is + * returned will always be able to be parsed and will have the correct country code. It may also + * be a valid *short* number/code for this region. Validity checking such numbers is handled with + * {@link com.google.i18n.phonenumbers.ShortNumberInfo}. + * + * @param regionCode the region for which an example number is needed + * @return an invalid number for the specified region. Returns null when an unsupported region or + * the region 001 (Earth) is passed in. + */ + public PhoneNumber getInvalidExampleNumber(String regionCode) { + if (!isValidRegionCode(regionCode)) { + logger.log(Level.WARNING, "Invalid or unknown region code provided: " + regionCode); + return null; + } + // We start off with a valid fixed-line number since every country supports this. Alternatively + // we could start with a different number type, since fixed-line numbers typically have a wide + // breadth of valid number lengths and we may have to make it very short before we get an + // invalid number. + PhoneNumberDesc desc = getNumberDescByType(getMetadataForRegion(regionCode), + PhoneNumberType.FIXED_LINE); + if (!desc.hasExampleNumber()) { + // This shouldn't happen; we have a test for this. + return null; + } + String exampleNumber = desc.getExampleNumber(); + // Try and make the number invalid. We do this by changing the length. We try reducing the + // length of the number, since currently no region has a number that is the same length as + // MIN_LENGTH_FOR_NSN. This is probably quicker than making the number longer, which is another + // alternative. We could also use the possible number pattern to extract the possible lengths of + // the number to make this faster, but this method is only for unit-testing so simplicity is + // preferred to performance. We don't want to return a number that can't be parsed, so we check + // the number is long enough. We try all possible lengths because phone number plans often have + // overlapping prefixes so the number 123456 might be valid as a fixed-line number, and 12345 as + // a mobile number. It would be faster to loop in a different order, but we prefer numbers that + // look closer to real numbers (and it gives us a variety of different lengths for the resulting + // phone numbers - otherwise they would all be MIN_LENGTH_FOR_NSN digits long.) + for (int phoneNumberLength = exampleNumber.length() - 1; + phoneNumberLength >= MIN_LENGTH_FOR_NSN; + phoneNumberLength--) { + String numberToTry = exampleNumber.substring(0, phoneNumberLength); + try { + PhoneNumber possiblyValidNumber = parse(numberToTry, regionCode); + if (!isValidNumber(possiblyValidNumber)) { + return possiblyValidNumber; + } + } catch (NumberParseException e) { + // Shouldn't happen: we have already checked the length, we know example numbers have + // only valid digits, and we know the region code is fine. + } + } + // We have a test to check that this doesn't happen for any of our supported regions. + return null; + } + /** * Gets a valid number for the specified region and number type. * @@ -1836,8 +1917,8 @@ public class PhoneNumberUtil { } PhoneNumberDesc desc = getNumberDescByType(getMetadataForRegion(regionCode), type); try { - if (!desc.exampleNumber.equals("")) { - return parse(desc.exampleNumber, regionCode); + if (desc.hasExampleNumber()) { + return parse(desc.getExampleNumber(), regionCode); } } catch (NumberParseException e) { logger.log(Level.SEVERE, e.toString()); @@ -1845,6 +1926,37 @@ public class PhoneNumberUtil { return null; } + /** + * Gets a valid number for the specified number type (it may belong to any country). + * + * @param type the type of number that is needed + * @return a valid number for the specified type. Returns null when the metadata + * does not contain such information. This should only happen when no numbers of this type are + * allocated anywhere in the world anymore. + */ + public PhoneNumber getExampleNumberForType(PhoneNumberType type) { + for (String regionCode : getSupportedRegions()) { + PhoneNumber exampleNumber = getExampleNumberForType(regionCode, type); + if (exampleNumber != null) { + return exampleNumber; + } + } + // If there wasn't an example number for a region, try the non-geographical entities. + for (int countryCallingCode : getSupportedGlobalNetworkCallingCodes()) { + PhoneNumberDesc desc = getNumberDescByType( + getMetadataForNonGeographicalRegion(countryCallingCode), type); + try { + if (desc.hasExampleNumber()) { + return parse("+" + countryCallingCode + desc.getExampleNumber(), UNKNOWN_REGION); + } + } catch (NumberParseException e) { + logger.log(Level.SEVERE, e.toString()); + } + } + // There are no example numbers of this type for any country in the library. + return null; + } + /** * Gets a valid number for the specified country calling code for a non-geographical entity. * @@ -1856,10 +1968,10 @@ public class PhoneNumberUtil { public PhoneNumber getExampleNumberForNonGeoEntity(int countryCallingCode) { PhoneMetadata metadata = getMetadataForNonGeographicalRegion(countryCallingCode); if (metadata != null) { - PhoneNumberDesc desc = metadata.generalDesc; + PhoneNumberDesc desc = metadata.getGeneralDesc(); try { - if (!desc.exampleNumber.equals("")) { - return parse("+" + countryCallingCode + desc.exampleNumber, "ZZ"); + if (desc.hasExampleNumber()) { + return parse("+" + countryCallingCode + desc.getExampleNumber(), UNKNOWN_REGION); } } catch (NumberParseException e) { logger.log(Level.SEVERE, e.toString()); @@ -1882,8 +1994,8 @@ public class PhoneNumberUtil { if (numberFormat == PhoneNumberFormat.RFC3966) { formattedNumber.append(RFC3966_EXTN_PREFIX).append(number.getExtension()); } else { - if (!metadata.preferredExtnPrefix.equals("")) { - formattedNumber.append(metadata.preferredExtnPrefix).append(number.getExtension()); + if (metadata.hasPreferredExtnPrefix()) { + formattedNumber.append(metadata.getPreferredExtnPrefix()).append(number.getExtension()); } else { formattedNumber.append(DEFAULT_EXTN_PREFIX).append(number.getExtension()); } @@ -1894,28 +2006,28 @@ public class PhoneNumberUtil { PhoneNumberDesc getNumberDescByType(PhoneMetadata metadata, PhoneNumberType type) { switch (type) { case PREMIUM_RATE: - return metadata.premiumRate; + return metadata.getPremiumRate(); case TOLL_FREE: - return metadata.tollFree; + return metadata.getTollFree(); case MOBILE: - return metadata.mobile; + return metadata.getMobile(); case FIXED_LINE: case FIXED_LINE_OR_MOBILE: - return metadata.fixedLine; + return metadata.getFixedLine(); case SHARED_COST: - return metadata.sharedCost; + return metadata.getSharedCost(); case VOIP: - return metadata.voip; + return metadata.getVoip(); case PERSONAL_NUMBER: - return metadata.personalNumber; + return metadata.getPersonalNumber(); case PAGER: - return metadata.pager; + return metadata.getPager(); case UAN: - return metadata.uan; + return metadata.getUan(); case VOICEMAIL: - return metadata.voicemail; + return metadata.getVoicemail(); default: - return metadata.generalDesc; + return metadata.getGeneralDesc(); } } @@ -1936,48 +2048,48 @@ public class PhoneNumberUtil { } private PhoneNumberType getNumberTypeHelper(String nationalNumber, PhoneMetadata metadata) { - if (!isNumberMatchingDesc(nationalNumber, metadata.generalDesc)) { + if (!isNumberMatchingDesc(nationalNumber, metadata.getGeneralDesc())) { return PhoneNumberType.UNKNOWN; } - if (isNumberMatchingDesc(nationalNumber, metadata.premiumRate)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getPremiumRate())) { return PhoneNumberType.PREMIUM_RATE; } - if (isNumberMatchingDesc(nationalNumber, metadata.tollFree)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getTollFree())) { return PhoneNumberType.TOLL_FREE; } - if (isNumberMatchingDesc(nationalNumber, metadata.sharedCost)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getSharedCost())) { return PhoneNumberType.SHARED_COST; } - if (isNumberMatchingDesc(nationalNumber, metadata.voip)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getVoip())) { return PhoneNumberType.VOIP; } - if (isNumberMatchingDesc(nationalNumber, metadata.personalNumber)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getPersonalNumber())) { return PhoneNumberType.PERSONAL_NUMBER; } - if (isNumberMatchingDesc(nationalNumber, metadata.pager)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getPager())) { return PhoneNumberType.PAGER; } - if (isNumberMatchingDesc(nationalNumber, metadata.uan)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getUan())) { return PhoneNumberType.UAN; } - if (isNumberMatchingDesc(nationalNumber, metadata.voicemail)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getVoicemail())) { return PhoneNumberType.VOICEMAIL; } - boolean isFixedLine = isNumberMatchingDesc(nationalNumber, metadata.fixedLine); + boolean isFixedLine = isNumberMatchingDesc(nationalNumber, metadata.getFixedLine()); if (isFixedLine) { - if (metadata.sameMobileAndFixedLinePattern) { + if (metadata.isSameMobileAndFixedLinePattern()) { return PhoneNumberType.FIXED_LINE_OR_MOBILE; - } else if (isNumberMatchingDesc(nationalNumber, metadata.mobile)) { + } else if (isNumberMatchingDesc(nationalNumber, metadata.getMobile())) { return PhoneNumberType.FIXED_LINE_OR_MOBILE; } return PhoneNumberType.FIXED_LINE; } // Otherwise, test to see if the number is mobile. Only do this if certain that the patterns for // mobile and fixed line aren't the same. - if (!metadata.sameMobileAndFixedLinePattern && - isNumberMatchingDesc(nationalNumber, metadata.mobile)) { + if (!metadata.isSameMobileAndFixedLinePattern() && + isNumberMatchingDesc(nationalNumber, metadata.getMobile())) { return PhoneNumberType.MOBILE; } return PhoneNumberType.UNKNOWN; @@ -2003,14 +2115,14 @@ public class PhoneNumberUtil { boolean isNumberPossibleForDesc(String nationalNumber, PhoneNumberDesc numberDesc) { Matcher possibleNumberPatternMatcher = - regexCache.getPatternForRegex(numberDesc.possibleNumberPattern) + regexCache.getPatternForRegex(numberDesc.getPossibleNumberPattern()) .matcher(nationalNumber); return possibleNumberPatternMatcher.matches(); } boolean isNumberMatchingDesc(String nationalNumber, PhoneNumberDesc numberDesc) { Matcher nationalNumberPatternMatcher = - regexCache.getPatternForRegex(numberDesc.nationalNumberPattern) + regexCache.getPatternForRegex(numberDesc.getNationalNumberPattern()) .matcher(nationalNumber); return isNumberPossibleForDesc(nationalNumber, numberDesc) && nationalNumberPatternMatcher.matches(); @@ -2089,8 +2201,8 @@ public class PhoneNumberUtil { // If leadingDigits is present, use this. Otherwise, do full validation. // Metadata cannot be null because the region codes come from the country calling code map. PhoneMetadata metadata = getMetadataForRegion(regionCode); - if (!metadata.leadingDigits.equals("")) { - if (regexCache.getPatternForRegex(metadata.leadingDigits) + if (metadata.hasLeadingDigits()) { + if (regexCache.getPatternForRegex(metadata.getLeadingDigits()) .matcher(nationalNumber).lookingAt()) { return regionCode; } @@ -2156,7 +2268,7 @@ public class PhoneNumberUtil { if (metadata == null) { throw new IllegalArgumentException("Invalid region code: " + regionCode); } - return metadata.countryCode; + return metadata.getCountryCode(); } /** @@ -2182,7 +2294,7 @@ public class PhoneNumberUtil { + ") provided."); return null; } - String nationalPrefix = metadata.nationalPrefix; + String nationalPrefix = metadata.getNationalPrefix(); // If no national prefix was found, we return null. if (nationalPrefix.length() == 0) { return null; @@ -2216,7 +2328,7 @@ public class PhoneNumberUtil { if (mainMetadataForCallingCode == null) { return false; } - return mainMetadataForCallingCode.leadingZeroPossible; + return mainMetadataForCallingCode.isLeadingZeroPossible(); } /** @@ -2273,7 +2385,7 @@ public class PhoneNumberUtil { */ private boolean isShorterThanPossibleNormalNumber(PhoneMetadata regionMetadata, String number) { Pattern possibleNumberPattern = regexCache.getPatternForRegex( - regionMetadata.generalDesc.possibleNumberPattern); + regionMetadata.getGeneralDesc().getPossibleNumberPattern()); return testNumberLengthAgainstPattern(possibleNumberPattern, number) == ValidationResult.TOO_SHORT; } @@ -2313,7 +2425,7 @@ public class PhoneNumberUtil { // Metadata cannot be null because the country calling code is valid. PhoneMetadata metadata = getMetadataForRegionOrCallingCode(countryCode, regionCode); Pattern possibleNumberPattern = - regexCache.getPatternForRegex(metadata.generalDesc.possibleNumberPattern); + regexCache.getPatternForRegex(metadata.getGeneralDesc().getPossibleNumberPattern()); return testNumberLengthAgainstPattern(possibleNumberPattern, nationalNumber); } @@ -2445,7 +2557,7 @@ public class PhoneNumberUtil { // Set the default prefix to be something that will never match. String possibleCountryIddPrefix = "NonMatch"; if (defaultRegionMetadata != null) { - possibleCountryIddPrefix = defaultRegionMetadata.internationalPrefix; + possibleCountryIddPrefix = defaultRegionMetadata.getInternationalPrefix(); } CountryCodeSource countryCodeSource = @@ -2473,19 +2585,19 @@ public class PhoneNumberUtil { // Check to see if the number starts with the country calling code for the default region. If // so, we remove the country calling code, and do some checks on the validity of the number // before and after. - int defaultCountryCode = defaultRegionMetadata.countryCode; + int defaultCountryCode = defaultRegionMetadata.getCountryCode(); String defaultCountryCodeString = String.valueOf(defaultCountryCode); String normalizedNumber = fullNumber.toString(); if (normalizedNumber.startsWith(defaultCountryCodeString)) { StringBuilder potentialNationalNumber = new StringBuilder(normalizedNumber.substring(defaultCountryCodeString.length())); - PhoneNumberDesc generalDesc = defaultRegionMetadata.generalDesc; + PhoneNumberDesc generalDesc = defaultRegionMetadata.getGeneralDesc(); Pattern validNumberPattern = - regexCache.getPatternForRegex(generalDesc.nationalNumberPattern); + regexCache.getPatternForRegex(generalDesc.getNationalNumberPattern()); maybeStripNationalPrefixAndCarrierCode( potentialNationalNumber, defaultRegionMetadata, null /* Don't need the carrier code */); Pattern possibleNumberPattern = - regexCache.getPatternForRegex(generalDesc.possibleNumberPattern); + regexCache.getPatternForRegex(generalDesc.getPossibleNumberPattern()); // If the number was not valid before but is valid now, or if it was too long before, we // consider the number with the country calling code stripped to be a better result and // keep that instead. @@ -2578,7 +2690,7 @@ public class PhoneNumberUtil { boolean maybeStripNationalPrefixAndCarrierCode( StringBuilder number, PhoneMetadata metadata, StringBuilder carrierCode) { int numberLength = number.length(); - String possibleNationalPrefix = metadata.nationalPrefixForParsing; + String possibleNationalPrefix = metadata.getNationalPrefixForParsing(); if (numberLength == 0 || possibleNationalPrefix.length() == 0) { // Early return for numbers of zero length. return false; @@ -2587,14 +2699,14 @@ public class PhoneNumberUtil { Matcher prefixMatcher = regexCache.getPatternForRegex(possibleNationalPrefix).matcher(number); if (prefixMatcher.lookingAt()) { Pattern nationalNumberRule = - regexCache.getPatternForRegex(metadata.generalDesc.nationalNumberPattern); + regexCache.getPatternForRegex(metadata.getGeneralDesc().getNationalNumberPattern()); // Check if the original number is viable. boolean isViableOriginalNumber = nationalNumberRule.matcher(number).matches(); // prefixMatcher.group(numOfGroups) == null implies nothing was captured by the capturing // groups in possibleNationalPrefix; therefore, no transformation is necessary, and we just // remove the national prefix. int numOfGroups = prefixMatcher.groupCount(); - String transformRule = metadata.nationalPrefixTransformRule; + String transformRule = metadata.getNationalPrefixTransformRule(); if (transformRule == null || transformRule.length() == 0 || prefixMatcher.group(numOfGroups) == null) { // If the original number was viable, and the resultant number is not, we return. @@ -2670,10 +2782,18 @@ public class PhoneNumberUtil { } /** - * Parses a string and returns it in proto buffer format. This method will throw a - * {@link com.google.i18n.phonenumbers.NumberParseException} if the number is not considered to be - * a possible number. Note that validation of whether the number is actually a valid number for a - * particular region is not performed. This can be done separately with {@link #isValidNumber}. + * Parses a string and returns it as a phone number in proto buffer format. The method is quite + * lenient and looks for a number in the input text (raw input) and does not check whether the + * string is definitely only a phone number. To do this, it ignores punctuation and white-space, + * as well as any text before the number (e.g. a leading "Tel: ") and trims the non-number bits. + * It will accept a number in any format (E164, national, international etc), assuming it can be + * interpreted with the defaultRegion supplied. It also attempts to convert any alpha characters + * into digits if it thinks this is a vanity number of the type "1800 MICROSOFT". + * + *

This method will throw a {@link com.google.i18n.phonenumbers.NumberParseException} if the + * number is not considered to be a possible number. Note that validation of whether the number + * is actually a valid number for a particular region is not performed. This can be done + * separately with {@link #isValidNumber}. * * @param numberToParse number that we are attempting to parse. This can contain formatting * such as +, ( and -, as well as a phone number extension. It can also @@ -2685,9 +2805,10 @@ public class PhoneNumberUtil { * start with a '+' followed by the country calling code, then * "ZZ" or null can be supplied. * @return a phone number proto buffer filled with the parsed number - * @throws NumberParseException if the string is not considered to be a viable phone number or if - * no default region was supplied and the number is not in - * international format (does not start with +) + * @throws NumberParseException if the string is not considered to be a viable phone number (e.g. + * too few or too many digits) or if no default region was supplied + * and the number is not in international format (does not start + * with +) */ public PhoneNumber parse(String numberToParse, String defaultRegion) throws NumberParseException { @@ -2880,7 +3001,7 @@ public class PhoneNumberUtil { normalize(nationalNumber); normalizedNationalNumber.append(nationalNumber); if (defaultRegion != null) { - countryCode = regionMetadata.countryCode; + countryCode = regionMetadata.getCountryCode(); phoneNumber.setCountryCode(countryCode); } else if (keepRawInput) { phoneNumber.clearCountryCodeSource(); @@ -3154,7 +3275,7 @@ public class PhoneNumberUtil { return true; } String nationalSignificantNumber = getNationalSignificantNumber(number); - return !isNumberMatchingDesc(nationalSignificantNumber, metadata.noInternationalDialling); + return !isNumberMatchingDesc(nationalSignificantNumber, metadata.getNoInternationalDialling()); } /** @@ -3170,6 +3291,6 @@ public class PhoneNumberUtil { logger.log(Level.WARNING, "Invalid or unknown region code provided: " + regionCode); return false; } - return metadata.mobileNumberPortableRegion; + return metadata.isMobileNumberPortableRegion(); } } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java b/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java new file mode 100644 index 00000000..ac63ec6f --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java @@ -0,0 +1,1119 @@ +/* + * Copyright (C) 2010 The Libphonenumber Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Definition of the class representing metadata for international telephone numbers. This class is + * hand created based on the class file compiled from phonemetadata.proto. Please refer to that file + * for detailed descriptions of the meaning of each field. + */ + +package com.google.i18n.phonenumbers; + +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; + +public final class Phonemetadata { + private Phonemetadata() {} + public static class NumberFormat implements Externalizable { + private static final long serialVersionUID = 1; + public NumberFormat() {} + + /** + * Provides a dummy builder to 'emulate' the API of the code generated by the latest version of + * Protocol Buffers. This lets BuildMetadataFromXml class to build with both this hand created + * class and the one generated by the latest version of Protocol Buffers. + */ + public static final class Builder extends NumberFormat { + public NumberFormat build() { + return this; + } + } + + public static Builder newBuilder() { + return new Builder(); + } + + // required string pattern = 1; + private boolean hasPattern; + private String pattern_ = ""; + public boolean hasPattern() { return hasPattern; } + public String getPattern() { return pattern_; } + public NumberFormat setPattern(String value) { + hasPattern = true; + pattern_ = value; + return this; + } + + // required string format = 2; + private boolean hasFormat; + private String format_ = ""; + public boolean hasFormat() { return hasFormat; } + public String getFormat() { return format_; } + public NumberFormat setFormat(String value) { + hasFormat = true; + format_ = value; + return this; + } + + // repeated string leading_digits_pattern = 3; + private java.util.List leadingDigitsPattern_ = new java.util.ArrayList(); + public java.util.List leadingDigitPatterns() { + return leadingDigitsPattern_; + } + public int leadingDigitsPatternSize() { return leadingDigitsPattern_.size(); } + public String getLeadingDigitsPattern(int index) { + return leadingDigitsPattern_.get(index); + } + public NumberFormat addLeadingDigitsPattern(String value) { + if (value == null) { + throw new NullPointerException(); + } + leadingDigitsPattern_.add(value); + return this; + } + + // optional string national_prefix_formatting_rule = 4; + private boolean hasNationalPrefixFormattingRule; + private String nationalPrefixFormattingRule_ = ""; + public boolean hasNationalPrefixFormattingRule() { return hasNationalPrefixFormattingRule; } + public String getNationalPrefixFormattingRule() { return nationalPrefixFormattingRule_; } + public NumberFormat setNationalPrefixFormattingRule(String value) { + hasNationalPrefixFormattingRule = true; + nationalPrefixFormattingRule_ = value; + return this; + } + public NumberFormat clearNationalPrefixFormattingRule() { + hasNationalPrefixFormattingRule = false; + nationalPrefixFormattingRule_ = ""; + 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_ = ""; + public boolean hasDomesticCarrierCodeFormattingRule() { + return hasDomesticCarrierCodeFormattingRule; } + public String getDomesticCarrierCodeFormattingRule() { + return domesticCarrierCodeFormattingRule_; } + public NumberFormat setDomesticCarrierCodeFormattingRule(String value) { + hasDomesticCarrierCodeFormattingRule = true; + domesticCarrierCodeFormattingRule_ = value; + return this; + } + + public NumberFormat mergeFrom(NumberFormat other) { + if (other.hasPattern()) { + setPattern(other.getPattern()); + } + if (other.hasFormat()) { + setFormat(other.getFormat()); + } + int leadingDigitsPatternSize = other.leadingDigitsPatternSize(); + for (int i = 0; i < leadingDigitsPatternSize; i++) { + addLeadingDigitsPattern(other.getLeadingDigitsPattern(i)); + } + if (other.hasNationalPrefixFormattingRule()) { + setNationalPrefixFormattingRule(other.getNationalPrefixFormattingRule()); + } + if (other.hasDomesticCarrierCodeFormattingRule()) { + setDomesticCarrierCodeFormattingRule(other.getDomesticCarrierCodeFormattingRule()); + } + setNationalPrefixOptionalWhenFormatting(other.isNationalPrefixOptionalWhenFormatting()); + return this; + } + + public void writeExternal(ObjectOutput objectOutput) throws IOException { + objectOutput.writeUTF(pattern_); + objectOutput.writeUTF(format_); + int leadingDigitsPatternSize = leadingDigitsPatternSize(); + objectOutput.writeInt(leadingDigitsPatternSize); + for (int i = 0; i < leadingDigitsPatternSize; i++) { + objectOutput.writeUTF(leadingDigitsPattern_.get(i)); + } + + objectOutput.writeBoolean(hasNationalPrefixFormattingRule); + if (hasNationalPrefixFormattingRule) { + objectOutput.writeUTF(nationalPrefixFormattingRule_); + } + objectOutput.writeBoolean(hasDomesticCarrierCodeFormattingRule); + if (hasDomesticCarrierCodeFormattingRule) { + objectOutput.writeUTF(domesticCarrierCodeFormattingRule_); + } + objectOutput.writeBoolean(nationalPrefixOptionalWhenFormatting_); + } + + public void readExternal(ObjectInput objectInput) throws IOException { + setPattern(objectInput.readUTF()); + setFormat(objectInput.readUTF()); + int leadingDigitsPatternSize = objectInput.readInt(); + for (int i = 0; i < leadingDigitsPatternSize; i++) { + leadingDigitsPattern_.add(objectInput.readUTF()); + } + if (objectInput.readBoolean()) { + setNationalPrefixFormattingRule(objectInput.readUTF()); + } + if (objectInput.readBoolean()) { + setDomesticCarrierCodeFormattingRule(objectInput.readUTF()); + } + setNationalPrefixOptionalWhenFormatting(objectInput.readBoolean()); + } + } + + public static class PhoneNumberDesc implements Externalizable { + private static final long serialVersionUID = 1; + public PhoneNumberDesc() {} + + /** + * Provides a dummy builder. + * + * @see NumberFormat.Builder + */ + public static final class Builder extends PhoneNumberDesc { + public PhoneNumberDesc build() { + return this; + } + } + public static Builder newBuilder() { + return new Builder(); + } + + // optional string national_number_pattern = 2; + private boolean hasNationalNumberPattern; + private String nationalNumberPattern_ = ""; + public boolean hasNationalNumberPattern() { return hasNationalNumberPattern; } + public String getNationalNumberPattern() { return nationalNumberPattern_; } + public PhoneNumberDesc setNationalNumberPattern(String value) { + hasNationalNumberPattern = true; + nationalNumberPattern_ = value; + return this; + } + + // optional string possible_number_pattern = 3; + private boolean hasPossibleNumberPattern; + private String possibleNumberPattern_ = ""; + public boolean hasPossibleNumberPattern() { return hasPossibleNumberPattern; } + public String getPossibleNumberPattern() { return possibleNumberPattern_; } + public PhoneNumberDesc setPossibleNumberPattern(String value) { + hasPossibleNumberPattern = true; + possibleNumberPattern_ = value; + return this; + } + + // repeated int32 possible_length = 9; + private java.util.List possibleLength_ = new java.util.ArrayList(); + public java.util.List getPossibleLengthList() { + return possibleLength_; + } + public int getPossibleLengthCount() { return possibleLength_.size(); } + public int getPossibleLength(int index) { + return possibleLength_.get(index); + } + public PhoneNumberDesc addPossibleLength(int value) { + possibleLength_.add(value); + return this; + } + public PhoneNumberDesc clearPossibleLength() { + possibleLength_.clear(); + return this; + } + + // repeated int32 possible_length_local_only = 10; + private java.util.List possibleLengthLocalOnly_ = new java.util.ArrayList(); + public java.util.List getPossibleLengthLocalOnlyList() { + return possibleLengthLocalOnly_; + } + public int getPossibleLengthLocalOnlyCount() { return possibleLengthLocalOnly_.size(); } + public int getPossibleLengthLocalOnly(int index) { + return possibleLengthLocalOnly_.get(index); + } + public PhoneNumberDesc addPossibleLengthLocalOnly(int value) { + possibleLengthLocalOnly_.add(value); + return this; + } + public PhoneNumberDesc clearPossibleLengthLocalOnly() { + possibleLengthLocalOnly_.clear(); + return this; + } + + // optional string example_number = 6; + private boolean hasExampleNumber; + private String exampleNumber_ = ""; + public boolean hasExampleNumber() { return hasExampleNumber; } + public String getExampleNumber() { return exampleNumber_; } + public PhoneNumberDesc setExampleNumber(String value) { + hasExampleNumber = true; + exampleNumber_ = value; + return this; + } + + public PhoneNumberDesc mergeFrom(PhoneNumberDesc other) { + if (other.hasNationalNumberPattern()) { + setNationalNumberPattern(other.getNationalNumberPattern()); + } + if (other.hasPossibleNumberPattern()) { + setPossibleNumberPattern(other.getPossibleNumberPattern()); + } + for (int i = 0; i < other.getPossibleLengthCount(); i++) { + addPossibleLength(other.getPossibleLength(i)); + } + for (int i = 0; i < other.getPossibleLengthLocalOnlyCount(); i++) { + addPossibleLengthLocalOnly(other.getPossibleLengthLocalOnly(i)); + } + if (other.hasExampleNumber()) { + setExampleNumber(other.getExampleNumber()); + } + return this; + } + + public boolean exactlySameAs(PhoneNumberDesc other) { + return nationalNumberPattern_.equals(other.nationalNumberPattern_) && + possibleNumberPattern_.equals(other.possibleNumberPattern_) && + possibleLength_.equals(other.possibleLength_) && + possibleLengthLocalOnly_.equals(other.possibleLengthLocalOnly_) && + exampleNumber_.equals(other.exampleNumber_); + } + + public void writeExternal(ObjectOutput objectOutput) throws IOException { + objectOutput.writeBoolean(hasNationalNumberPattern); + if (hasNationalNumberPattern) { + objectOutput.writeUTF(nationalNumberPattern_); + } + + objectOutput.writeBoolean(hasPossibleNumberPattern); + if (hasPossibleNumberPattern) { + objectOutput.writeUTF(possibleNumberPattern_); + } + + int possibleLengthSize = getPossibleLengthCount(); + objectOutput.writeInt(possibleLengthSize); + for (int i = 0; i < possibleLengthSize; i++) { + objectOutput.writeInt(possibleLength_.get(i)); + } + + int possibleLengthLocalOnlySize = getPossibleLengthLocalOnlyCount(); + objectOutput.writeInt(possibleLengthLocalOnlySize); + for (int i = 0; i < possibleLengthLocalOnlySize; i++) { + objectOutput.writeInt(possibleLengthLocalOnly_.get(i)); + } + + objectOutput.writeBoolean(hasExampleNumber); + if (hasExampleNumber) { + objectOutput.writeUTF(exampleNumber_); + } + } + + public void readExternal(ObjectInput objectInput) throws IOException { + if (objectInput.readBoolean()) { + setNationalNumberPattern(objectInput.readUTF()); + } + + if (objectInput.readBoolean()) { + setPossibleNumberPattern(objectInput.readUTF()); + } + + int possibleLengthSize = objectInput.readInt(); + for (int i = 0; i < possibleLengthSize; i++) { + possibleLength_.add(objectInput.readInt()); + } + + int possibleLengthLocalOnlySize = objectInput.readInt(); + for (int i = 0; i < possibleLengthLocalOnlySize; i++) { + possibleLengthLocalOnly_.add(objectInput.readInt()); + } + + if (objectInput.readBoolean()) { + setExampleNumber(objectInput.readUTF()); + } + } + } + + public static class PhoneMetadata implements Externalizable { + private static final long serialVersionUID = 1; + public PhoneMetadata() {} + + /** + * Provides a dummy builder. + * + * @see NumberFormat.Builder + */ + public static final class Builder extends PhoneMetadata { + public PhoneMetadata build() { + return this; + } + } + public static Builder newBuilder() { + return new Builder(); + } + + // optional PhoneNumberDesc general_desc = 1; + private boolean hasGeneralDesc; + private PhoneNumberDesc generalDesc_ = null; + public boolean hasGeneralDesc() { return hasGeneralDesc; } + public PhoneNumberDesc getGeneralDesc() { return generalDesc_; } + public PhoneMetadata setGeneralDesc(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasGeneralDesc = true; + generalDesc_ = value; + return this; + } + + // optional PhoneNumberDesc fixed_line = 2; + private boolean hasFixedLine; + private PhoneNumberDesc fixedLine_ = null; + public boolean hasFixedLine() { return hasFixedLine; } + public PhoneNumberDesc getFixedLine() { return fixedLine_; } + public PhoneMetadata setFixedLine(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasFixedLine = true; + fixedLine_ = value; + return this; + } + + // optional PhoneNumberDesc mobile = 3; + private boolean hasMobile; + private PhoneNumberDesc mobile_ = null; + public boolean hasMobile() { return hasMobile; } + public PhoneNumberDesc getMobile() { return mobile_; } + public PhoneMetadata setMobile(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasMobile = true; + mobile_ = value; + return this; + } + + // optional PhoneNumberDesc toll_free = 4; + private boolean hasTollFree; + private PhoneNumberDesc tollFree_ = null; + public boolean hasTollFree() { return hasTollFree; } + public PhoneNumberDesc getTollFree() { return tollFree_; } + public PhoneMetadata setTollFree(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasTollFree = true; + tollFree_ = value; + return this; + } + + // optional PhoneNumberDesc premium_rate = 5; + private boolean hasPremiumRate; + private PhoneNumberDesc premiumRate_ = null; + public boolean hasPremiumRate() { return hasPremiumRate; } + public PhoneNumberDesc getPremiumRate() { return premiumRate_; } + public PhoneMetadata setPremiumRate(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasPremiumRate = true; + premiumRate_ = value; + return this; + } + + // optional PhoneNumberDesc shared_cost = 6; + private boolean hasSharedCost; + private PhoneNumberDesc sharedCost_ = null; + public boolean hasSharedCost() { return hasSharedCost; } + public PhoneNumberDesc getSharedCost() { return sharedCost_; } + public PhoneMetadata setSharedCost(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasSharedCost = true; + sharedCost_ = value; + return this; + } + + // optional PhoneNumberDesc personal_number = 7; + private boolean hasPersonalNumber; + private PhoneNumberDesc personalNumber_ = null; + public boolean hasPersonalNumber() { return hasPersonalNumber; } + public PhoneNumberDesc getPersonalNumber() { return personalNumber_; } + public PhoneMetadata setPersonalNumber(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasPersonalNumber = true; + personalNumber_ = value; + return this; + } + + // optional PhoneNumberDesc voip = 8; + private boolean hasVoip; + private PhoneNumberDesc voip_ = null; + public boolean hasVoip() { return hasVoip; } + public PhoneNumberDesc getVoip() { return voip_; } + public PhoneMetadata setVoip(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasVoip = true; + voip_ = value; + return this; + } + + // optional PhoneNumberDesc pager = 21; + private boolean hasPager; + private PhoneNumberDesc pager_ = null; + public boolean hasPager() { return hasPager; } + public PhoneNumberDesc getPager() { return pager_; } + public PhoneMetadata setPager(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasPager = true; + pager_ = value; + return this; + } + + // optional PhoneNumberDesc uan = 25; + private boolean hasUan; + private PhoneNumberDesc uan_ = null; + public boolean hasUan() { return hasUan; } + public PhoneNumberDesc getUan() { return uan_; } + public PhoneMetadata setUan(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasUan = true; + uan_ = value; + return this; + } + + // optional PhoneNumberDesc emergency = 27; + private boolean hasEmergency; + private PhoneNumberDesc emergency_ = null; + public boolean hasEmergency() { return hasEmergency; } + public PhoneNumberDesc getEmergency() { return emergency_; } + public PhoneMetadata setEmergency(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasEmergency = true; + emergency_ = value; + return this; + } + + // optional PhoneNumberDesc voicemail = 28; + private boolean hasVoicemail; + private PhoneNumberDesc voicemail_ = null; + public boolean hasVoicemail() { return hasVoicemail; } + public PhoneNumberDesc getVoicemail() { return voicemail_; } + public PhoneMetadata setVoicemail(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasVoicemail = true; + voicemail_ = value; + return this; + } + + // optional PhoneNumberDesc short_code = 29; + private boolean hasShortCode; + private PhoneNumberDesc shortCode_ = null; + public boolean hasShortCode() { return hasShortCode; } + public PhoneNumberDesc getShortCode() { return shortCode_; } + public PhoneMetadata setShortCode(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasShortCode = true; + shortCode_ = value; + return this; + } + + // optional PhoneNumberDesc standard_rate = 30; + private boolean hasStandardRate; + private PhoneNumberDesc standardRate_ = null; + public boolean hasStandardRate() { return hasStandardRate; } + public PhoneNumberDesc getStandardRate() { return standardRate_; } + public PhoneMetadata setStandardRate(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasStandardRate = true; + standardRate_ = value; + return this; + } + + // optional PhoneNumberDesc carrier_specific = 31; + private boolean hasCarrierSpecific; + private PhoneNumberDesc carrierSpecific_ = null; + public boolean hasCarrierSpecific() { return hasCarrierSpecific; } + public PhoneNumberDesc getCarrierSpecific() { return carrierSpecific_; } + public PhoneMetadata setCarrierSpecific(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasCarrierSpecific = true; + carrierSpecific_ = value; + return this; + } + + // optional PhoneNumberDesc noInternationalDialling = 24; + private boolean hasNoInternationalDialling; + private PhoneNumberDesc noInternationalDialling_ = null; + public boolean hasNoInternationalDialling() { return hasNoInternationalDialling; } + public PhoneNumberDesc getNoInternationalDialling() { return noInternationalDialling_; } + public PhoneMetadata setNoInternationalDialling(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasNoInternationalDialling = true; + noInternationalDialling_ = value; + return this; + } + + // required string id = 9; + private boolean hasId; + private String id_ = ""; + public boolean hasId() { return hasId; } + public String getId() { return id_; } + public PhoneMetadata setId(String value) { + hasId = true; + id_ = value; + return this; + } + + // optional int32 country_code = 10; + private boolean hasCountryCode; + private int countryCode_ = 0; + public boolean hasCountryCode() { return hasCountryCode; } + public int getCountryCode() { return countryCode_; } + public PhoneMetadata setCountryCode(int value) { + hasCountryCode = true; + countryCode_ = value; + return this; + } + + // optional string international_prefix = 11; + private boolean hasInternationalPrefix; + private String internationalPrefix_ = ""; + public boolean hasInternationalPrefix() { return hasInternationalPrefix; } + public String getInternationalPrefix() { return internationalPrefix_; } + public PhoneMetadata setInternationalPrefix(String value) { + hasInternationalPrefix = true; + internationalPrefix_ = value; + return this; + } + + // optional string preferred_international_prefix = 17; + private boolean hasPreferredInternationalPrefix; + private String preferredInternationalPrefix_ = ""; + public boolean hasPreferredInternationalPrefix() { return hasPreferredInternationalPrefix; } + public String getPreferredInternationalPrefix() { return preferredInternationalPrefix_; } + public PhoneMetadata setPreferredInternationalPrefix(String value) { + hasPreferredInternationalPrefix = true; + preferredInternationalPrefix_ = value; + return this; + } + + // optional string national_prefix = 12; + private boolean hasNationalPrefix; + private String nationalPrefix_ = ""; + public boolean hasNationalPrefix() { return hasNationalPrefix; } + public String getNationalPrefix() { return nationalPrefix_; } + public PhoneMetadata setNationalPrefix(String value) { + hasNationalPrefix = true; + nationalPrefix_ = value; + return this; + } + + // optional string preferred_extn_prefix = 13; + private boolean hasPreferredExtnPrefix; + private String preferredExtnPrefix_ = ""; + public boolean hasPreferredExtnPrefix() { return hasPreferredExtnPrefix; } + public String getPreferredExtnPrefix() { return preferredExtnPrefix_; } + public PhoneMetadata setPreferredExtnPrefix(String value) { + hasPreferredExtnPrefix = true; + preferredExtnPrefix_ = value; + return this; + } + + // optional string national_prefix_for_parsing = 15; + private boolean hasNationalPrefixForParsing; + private String nationalPrefixForParsing_ = ""; + public boolean hasNationalPrefixForParsing() { return hasNationalPrefixForParsing; } + public String getNationalPrefixForParsing() { return nationalPrefixForParsing_; } + public PhoneMetadata setNationalPrefixForParsing(String value) { + hasNationalPrefixForParsing = true; + nationalPrefixForParsing_ = value; + return this; + } + + // optional string national_prefix_transform_rule = 16; + private boolean hasNationalPrefixTransformRule; + private String nationalPrefixTransformRule_ = ""; + public boolean hasNationalPrefixTransformRule() { return hasNationalPrefixTransformRule; } + public String getNationalPrefixTransformRule() { return nationalPrefixTransformRule_; } + public PhoneMetadata setNationalPrefixTransformRule(String value) { + hasNationalPrefixTransformRule = true; + nationalPrefixTransformRule_ = value; + return this; + } + + // optional bool same_mobile_and_fixed_line_pattern = 18 [default = false]; + private boolean hasSameMobileAndFixedLinePattern; + private boolean sameMobileAndFixedLinePattern_ = false; + public boolean hasSameMobileAndFixedLinePattern() { return hasSameMobileAndFixedLinePattern; } + public boolean isSameMobileAndFixedLinePattern() { return sameMobileAndFixedLinePattern_; } + public PhoneMetadata setSameMobileAndFixedLinePattern(boolean value) { + hasSameMobileAndFixedLinePattern = true; + sameMobileAndFixedLinePattern_ = value; + return this; + } + + // repeated NumberFormat number_format = 19; + private java.util.List numberFormat_ = new java.util.ArrayList(); + public java.util.List numberFormats() { + return numberFormat_; + } + public int numberFormatSize() { return numberFormat_.size(); } + public NumberFormat getNumberFormat(int index) { + return numberFormat_.get(index); + } + public PhoneMetadata addNumberFormat(NumberFormat value) { + if (value == null) { + throw new NullPointerException(); + } + numberFormat_.add(value); + return this; + } + + // repeated NumberFormat intl_number_format = 20; + private java.util.List intlNumberFormat_ = + new java.util.ArrayList(); + public java.util.List intlNumberFormats() { + return intlNumberFormat_; + } + public int intlNumberFormatSize() { return intlNumberFormat_.size(); } + public NumberFormat getIntlNumberFormat(int index) { + return intlNumberFormat_.get(index); + } + + public PhoneMetadata addIntlNumberFormat(NumberFormat value) { + if (value == null) { + throw new NullPointerException(); + } + intlNumberFormat_.add(value); + return this; + } + public PhoneMetadata clearIntlNumberFormat() { + intlNumberFormat_.clear(); + return this; + } + + // optional bool main_country_for_code = 22 [default = false]; + private boolean hasMainCountryForCode; + private boolean mainCountryForCode_ = false; + public boolean hasMainCountryForCode() { return hasMainCountryForCode; } + public boolean isMainCountryForCode() { return mainCountryForCode_; } + // Method that lets this class have the same interface as the one generated by Protocol Buffers + // which is used by C++ build tools. + public boolean getMainCountryForCode() { return mainCountryForCode_; } + public PhoneMetadata setMainCountryForCode(boolean value) { + hasMainCountryForCode = true; + mainCountryForCode_ = value; + return this; + } + + // optional string leading_digits = 23; + private boolean hasLeadingDigits; + private String leadingDigits_ = ""; + public boolean hasLeadingDigits() { return hasLeadingDigits; } + public String getLeadingDigits() { return leadingDigits_; } + public PhoneMetadata setLeadingDigits(String value) { + hasLeadingDigits = true; + leadingDigits_ = value; + return this; + } + + // optional bool leading_zero_possible = 26 [default = false]; + private boolean hasLeadingZeroPossible; + private boolean leadingZeroPossible_ = false; + public boolean hasLeadingZeroPossible() { return hasLeadingZeroPossible; } + public boolean isLeadingZeroPossible() { return leadingZeroPossible_; } + public PhoneMetadata setLeadingZeroPossible(boolean value) { + hasLeadingZeroPossible = true; + leadingZeroPossible_ = value; + return this; + } + + // optional bool mobile_number_portable_region = 32 [default = false]; + private boolean hasMobileNumberPortableRegion; + private boolean mobileNumberPortableRegion_ = false; + public boolean hasMobileNumberPortableRegion() { return hasMobileNumberPortableRegion; } + public boolean isMobileNumberPortableRegion() { return mobileNumberPortableRegion_; } + public PhoneMetadata setMobileNumberPortableRegion(boolean value) { + hasMobileNumberPortableRegion = true; + mobileNumberPortableRegion_ = value; + return this; + } + + public void writeExternal(ObjectOutput objectOutput) throws IOException { + objectOutput.writeBoolean(hasGeneralDesc); + if (hasGeneralDesc) { + generalDesc_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasFixedLine); + if (hasFixedLine) { + fixedLine_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasMobile); + if (hasMobile) { + mobile_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasTollFree); + if (hasTollFree) { + tollFree_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasPremiumRate); + if (hasPremiumRate) { + premiumRate_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasSharedCost); + if (hasSharedCost) { + sharedCost_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasPersonalNumber); + if (hasPersonalNumber) { + personalNumber_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasVoip); + if (hasVoip) { + voip_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasPager); + if (hasPager) { + pager_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasUan); + if (hasUan) { + uan_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasEmergency); + if (hasEmergency) { + emergency_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasVoicemail); + if (hasVoicemail) { + voicemail_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasShortCode); + if (hasShortCode) { + shortCode_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasStandardRate); + if (hasStandardRate) { + standardRate_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasCarrierSpecific); + if (hasCarrierSpecific) { + carrierSpecific_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasNoInternationalDialling); + if (hasNoInternationalDialling) { + noInternationalDialling_.writeExternal(objectOutput); + } + + objectOutput.writeUTF(id_); + objectOutput.writeInt(countryCode_); + objectOutput.writeUTF(internationalPrefix_); + + objectOutput.writeBoolean(hasPreferredInternationalPrefix); + if (hasPreferredInternationalPrefix) { + objectOutput.writeUTF(preferredInternationalPrefix_); + } + + objectOutput.writeBoolean(hasNationalPrefix); + if (hasNationalPrefix) { + objectOutput.writeUTF(nationalPrefix_); + } + + objectOutput.writeBoolean(hasPreferredExtnPrefix); + if (hasPreferredExtnPrefix) { + objectOutput.writeUTF(preferredExtnPrefix_); + } + + objectOutput.writeBoolean(hasNationalPrefixForParsing); + if (hasNationalPrefixForParsing) { + objectOutput.writeUTF(nationalPrefixForParsing_); + } + + objectOutput.writeBoolean(hasNationalPrefixTransformRule); + if (hasNationalPrefixTransformRule) { + objectOutput.writeUTF(nationalPrefixTransformRule_); + } + + objectOutput.writeBoolean(sameMobileAndFixedLinePattern_); + + int numberFormatSize = numberFormatSize(); + objectOutput.writeInt(numberFormatSize); + for (int i = 0; i < numberFormatSize; i++) { + numberFormat_.get(i).writeExternal(objectOutput); + } + + int intlNumberFormatSize = intlNumberFormatSize(); + objectOutput.writeInt(intlNumberFormatSize); + for (int i = 0; i < intlNumberFormatSize; i++) { + intlNumberFormat_.get(i).writeExternal(objectOutput); + } + + objectOutput.writeBoolean(mainCountryForCode_); + + objectOutput.writeBoolean(hasLeadingDigits); + if (hasLeadingDigits) { + objectOutput.writeUTF(leadingDigits_); + } + + objectOutput.writeBoolean(leadingZeroPossible_); + + objectOutput.writeBoolean(mobileNumberPortableRegion_); + } + + public void readExternal(ObjectInput objectInput) throws IOException { + boolean hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setGeneralDesc(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setFixedLine(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setMobile(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setTollFree(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setPremiumRate(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setSharedCost(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setPersonalNumber(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setVoip(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setPager(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setUan(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setEmergency(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setVoicemail(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setShortCode(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setStandardRate(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setCarrierSpecific(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setNoInternationalDialling(desc); + } + + setId(objectInput.readUTF()); + setCountryCode(objectInput.readInt()); + setInternationalPrefix(objectInput.readUTF()); + + boolean hasString = objectInput.readBoolean(); + if (hasString) { + setPreferredInternationalPrefix(objectInput.readUTF()); + } + + hasString = objectInput.readBoolean(); + if (hasString) { + setNationalPrefix(objectInput.readUTF()); + } + + hasString = objectInput.readBoolean(); + if (hasString) { + setPreferredExtnPrefix(objectInput.readUTF()); + } + + hasString = objectInput.readBoolean(); + if (hasString) { + setNationalPrefixForParsing(objectInput.readUTF()); + } + + hasString = objectInput.readBoolean(); + if (hasString) { + setNationalPrefixTransformRule(objectInput.readUTF()); + } + + setSameMobileAndFixedLinePattern(objectInput.readBoolean()); + + int nationalFormatSize = objectInput.readInt(); + for (int i = 0; i < nationalFormatSize; i++) { + NumberFormat numFormat = new NumberFormat(); + numFormat.readExternal(objectInput); + numberFormat_.add(numFormat); + } + + int intlNumberFormatSize = objectInput.readInt(); + for (int i = 0; i < intlNumberFormatSize; i++) { + NumberFormat numFormat = new NumberFormat(); + numFormat.readExternal(objectInput); + intlNumberFormat_.add(numFormat); + } + + setMainCountryForCode(objectInput.readBoolean()); + + hasString = objectInput.readBoolean(); + if (hasString) { + setLeadingDigits(objectInput.readUTF()); + } + + setLeadingZeroPossible(objectInput.readBoolean()); + + setMobileNumberPortableRegion(objectInput.readBoolean()); + } + } + + public static class PhoneMetadataCollection implements Externalizable { + private static final long serialVersionUID = 1; + public PhoneMetadataCollection() {} + + /** + * Provides a dummy builder. + * + * @see NumberFormat.Builder + */ + public static final class Builder extends PhoneMetadataCollection { + public PhoneMetadataCollection build() { + return this; + } + } + public static Builder newBuilder() { + return new Builder(); + } + + // repeated PhoneMetadata metadata = 1; + private java.util.List metadata_ = new java.util.ArrayList(); + + public java.util.List getMetadataList() { + return metadata_; + } + public int getMetadataCount() { return metadata_.size(); } + + public PhoneMetadataCollection addMetadata(PhoneMetadata value) { + if (value == null) { + throw new NullPointerException(); + } + metadata_.add(value); + return this; + } + + public void writeExternal(ObjectOutput objectOutput) throws IOException { + int size = getMetadataCount(); + objectOutput.writeInt(size); + for (int i = 0; i < size; i++) { + metadata_.get(i).writeExternal(objectOutput); + } + } + + public void readExternal(ObjectInput objectInput) throws IOException { + int size = objectInput.readInt(); + for (int i = 0; i < size; i++) { + PhoneMetadata metadata = new PhoneMetadata(); + metadata.readExternal(objectInput); + metadata_.add(metadata); + } + } + + public PhoneMetadataCollection clear() { + metadata_.clear(); + return this; + } + } +} diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java b/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java index fe5ca8f3..abe800ab 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java @@ -16,11 +16,11 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.google.i18n.phonenumbers.internal.MatcherApi; import com.google.i18n.phonenumbers.internal.RegexBasedMatcher; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; +import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import java.util.ArrayList; import java.util.Arrays; @@ -130,7 +130,7 @@ public class ShortNumberInfo { if (phoneMetadata == null) { return false; } - return matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.generalDesc); + return matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.getGeneralDesc()); } /** @@ -151,7 +151,7 @@ public class ShortNumberInfo { return false; } return matcherApi.matchesPossibleNumber(getNationalSignificantNumber(number), - phoneMetadata.generalDesc); + phoneMetadata.getGeneralDesc()); } /** @@ -171,7 +171,7 @@ public class ShortNumberInfo { if (phoneMetadata == null) { continue; } - if (matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.generalDesc)) { + if (matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.getGeneralDesc())) { return true; } } @@ -199,11 +199,11 @@ public class ShortNumberInfo { if (phoneMetadata == null) { return false; } - PhoneNumberDesc generalDesc = phoneMetadata.generalDesc; + PhoneNumberDesc generalDesc = phoneMetadata.getGeneralDesc(); if (!matchesPossibleNumberAndNationalNumber(shortNumber, generalDesc)) { return false; } - PhoneNumberDesc shortNumberDesc = phoneMetadata.shortCode; + PhoneNumberDesc shortNumberDesc = phoneMetadata.getShortCode(); return matchesPossibleNumberAndNationalNumber(shortNumber, shortNumberDesc); } @@ -226,11 +226,11 @@ public class ShortNumberInfo { return false; } String shortNumber = getNationalSignificantNumber(number); - PhoneNumberDesc generalDesc = phoneMetadata.generalDesc; + PhoneNumberDesc generalDesc = phoneMetadata.getGeneralDesc(); if (!matchesPossibleNumberAndNationalNumber(shortNumber, generalDesc)) { return false; } - PhoneNumberDesc shortNumberDesc = phoneMetadata.shortCode; + PhoneNumberDesc shortNumberDesc = phoneMetadata.getShortCode(); return matchesPossibleNumberAndNationalNumber(shortNumber, shortNumberDesc); } @@ -292,13 +292,13 @@ public class ShortNumberInfo { // The cost categories are tested in order of decreasing expense, since if for some reason the // patterns overlap the most expensive matching cost category should be returned. - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.premiumRate)) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getPremiumRate())) { return ShortNumberCost.PREMIUM_RATE; } - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.standardRate)) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getStandardRate())) { return ShortNumberCost.STANDARD_RATE; } - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.tollFree)) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getTollFree())) { return ShortNumberCost.TOLL_FREE; } if (isEmergencyNumber(shortNumber, regionDialingFrom)) { @@ -346,13 +346,13 @@ public class ShortNumberInfo { // The cost categories are tested in order of decreasing expense, since if for some reason the // patterns overlap the most expensive matching cost category should be returned. - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.premiumRate)) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getPremiumRate())) { return ShortNumberCost.PREMIUM_RATE; } - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.standardRate)) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getStandardRate())) { return ShortNumberCost.STANDARD_RATE; } - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.tollFree)) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getTollFree())) { return ShortNumberCost.TOLL_FREE; } if (isEmergencyNumber(shortNumber, regionDialingFrom)) { @@ -429,7 +429,7 @@ public class ShortNumberInfo { for (String regionCode : regionCodes) { PhoneMetadata phoneMetadata = MetadataManager.getShortNumberMetadataForRegion(regionCode); if (phoneMetadata != null - && matchesPossibleNumberAndNationalNumber(nationalNumber, phoneMetadata.shortCode)) { + && matchesPossibleNumberAndNationalNumber(nationalNumber, phoneMetadata.getShortCode())) { // The number is valid for this region. return regionCode; } @@ -457,9 +457,9 @@ public class ShortNumberInfo { if (phoneMetadata == null) { return ""; } - PhoneNumberDesc desc = phoneMetadata.shortCode; - if (!desc.exampleNumber.equals("")) { - return desc.exampleNumber; + PhoneNumberDesc desc = phoneMetadata.getShortCode(); + if (desc.hasExampleNumber()) { + return desc.getExampleNumber(); } return ""; } @@ -481,20 +481,20 @@ public class ShortNumberInfo { PhoneNumberDesc desc = null; switch (cost) { case TOLL_FREE: - desc = phoneMetadata.tollFree; + desc = phoneMetadata.getTollFree(); break; case STANDARD_RATE: - desc = phoneMetadata.standardRate; + desc = phoneMetadata.getStandardRate(); break; case PREMIUM_RATE: - desc = phoneMetadata.premiumRate; + desc = phoneMetadata.getPremiumRate(); break; default: // UNKNOWN_COST numbers are computed by the process of elimination from the other cost // categories. } - if (desc != null && !desc.exampleNumber.equals("")) { - return desc.exampleNumber; + if (desc != null && desc.hasExampleNumber()) { + return desc.getExampleNumber(); } return ""; } @@ -543,12 +543,12 @@ public class ShortNumberInfo { return false; } PhoneMetadata metadata = MetadataManager.getShortNumberMetadataForRegion(regionCode); - if (metadata == null || metadata.emergency == null) { + if (metadata == null || !metadata.hasEmergency()) { return false; } String normalizedNumber = PhoneNumberUtil.normalizeDigitsOnly(number); - PhoneNumberDesc emergencyDesc = metadata.emergency; + PhoneNumberDesc emergencyDesc = metadata.getEmergency(); boolean allowPrefixMatchForRegion = allowPrefixMatch && !REGIONS_WHERE_EMERGENCY_NUMBERS_MUST_BE_EXACT.contains(regionCode); return matcherApi.matchesNationalNumber(normalizedNumber, emergencyDesc, @@ -572,7 +572,7 @@ public class ShortNumberInfo { PhoneMetadata phoneMetadata = MetadataManager.getShortNumberMetadataForRegion(regionCode); return (phoneMetadata != null) && (matchesPossibleNumberAndNationalNumber(nationalNumber, - phoneMetadata.carrierSpecific)); + phoneMetadata.getCarrierSpecific())); } /** diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java b/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java index b89c234d..9062ef44 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java @@ -16,17 +16,14 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadataCollection; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection; -import java.io.IOException; import java.io.InputStream; -import java.io.ObjectInputStream; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.logging.Level; import java.util.logging.Logger; /** @@ -97,58 +94,28 @@ final class SingleFileMetadataSourceImpl implements MetadataSource { void loadMetadataFromFile() { InputStream source = metadataLoader.loadMetadata(fileName); if (source == null) { - logger.log(Level.SEVERE, "missing metadata: " + fileName); + // This should not happen since clients shouldn't be using this implementation directly. + // The single file implementation is experimental, only for when the jars contain a single + // file with all regions' metadata. Currently we do not release such jars. + // TODO(b/30807096): Get the MetadataManager to decide whether to use this or the multi file + // loading depending on what data is available in the jar. throw new IllegalStateException("missing metadata: " + fileName); } - try { - PhoneMetadataCollection metadataCollection = - loadMetadataAndCloseInput(new ObjectInputStream(source)); - PhoneMetadata[] metadataList = metadataCollection.metadata; - if (metadataList.length == 0) { - logger.log(Level.SEVERE, "empty metadata: " + fileName); - throw new IllegalStateException("empty metadata: " + fileName); - } - for (PhoneMetadata metadata : metadataList) { - String regionCode = metadata.id; - int countryCallingCode = metadata.countryCode; - boolean isNonGeoRegion = PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCode); - if (isNonGeoRegion) { - countryCodeToNonGeographicalMetadataMap.put(countryCallingCode, metadata); - } else { - regionToMetadataMap.put(regionCode, metadata); - } - } - } catch (IOException e) { - logger.log(Level.SEVERE, "cannot load/parse metadata: " + fileName, e); - throw new RuntimeException("cannot load/parse metadata: " + fileName, e); + PhoneMetadataCollection metadataCollection = MetadataManager.loadMetadataAndCloseInput(source); + List metadataList = metadataCollection.getMetadataList(); + if (metadataList.isEmpty()) { + // This should not happen since clients shouldn't be using this implementation! + throw new IllegalStateException("empty metadata: " + fileName); } - } - - /** - * Loads the metadata protocol buffer from the given stream and closes the stream afterwards. Any - * exceptions that occur while reading or closing the stream are ignored. - * - * @param source the non-null stream from which metadata is to be read. - * @return the loaded metadata protocol buffer. - */ - private static PhoneMetadataCollection loadMetadataAndCloseInput(ObjectInputStream source) { - // The size of the byte buffer for deserializing the single nano metadata file which holds - // metadata for all regions. - final int SINGLE_FILE_BUFFER_SIZE = 256 * 1024; - - PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection(); - try { - metadataCollection.mergeFrom( - MetadataManager.convertStreamToByteBuffer(source, SINGLE_FILE_BUFFER_SIZE)); - } catch (IOException e) { - logger.log(Level.WARNING, "error reading input (ignored)", e); - } finally { - try { - source.close(); - } catch (IOException e) { - logger.log(Level.WARNING, "error closing input stream (ignored)", e); + for (PhoneMetadata metadata : metadataList) { + String regionCode = metadata.getId(); + int countryCallingCode = metadata.getCountryCode(); + boolean isNonGeoRegion = PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCode); + if (isNonGeoRegion) { + countryCodeToNonGeographicalMetadataMap.put(countryCallingCode, metadata); + } else { + regionToMetadataMap.put(regionCode, metadata); } } - return metadataCollection; } } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255 index 7e32b2bb..7c4f9daa 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27 index a8394f75..5ab6d03f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_30 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_30 index cfd7b379..4f6f50a5 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_30 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_30 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_31 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_31 index 82340deb..1999488e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_31 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_31 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_34 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_34 index d0703f81..7c60d3d6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_34 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_34 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_350 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_350 index 1ea3d71f..e857d20e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_350 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_350 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_351 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_351 index bffda86f..bd077e77 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_351 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_351 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_352 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_352 index 79b39e11..7ee05e92 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_352 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_352 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_358 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_358 index 83951fb5..dc7a5d13 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_358 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_358 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_359 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_359 index fb48aa62..6431d101 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_359 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_359 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_36 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_36 index 0994e0db..9284fb16 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_36 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_36 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_372 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_372 index 3f3689ce..a16f968b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_372 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_372 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_373 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_373 index b9d0f47d..6932076f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_373 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_373 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_380 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_380 index 7bd530d8..ef963276 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_380 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_380 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_381 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_381 index b98f0b39..37654d46 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_381 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_381 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_385 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_385 index a2f2fbe3..c6d79133 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_385 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_385 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_43 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_43 index cab13d8a..48addfeb 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_43 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_43 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_44 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_44 index a5cdfdc3..4864eeb6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_44 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_44 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_49 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_49 index aca98ea6..54cc030a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_49 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_49 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_505 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_505 index 437160a4..f8b78ffb 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_505 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_505 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_506 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_506 index 4be38166..1987a239 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_506 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_506 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54 index fcd3a376..c401bf93 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_55 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_55 index 490569e3..a2075952 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_55 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_55 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_58 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_58 index 07bd92e0..da951398 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_58 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_58 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 index a2563d38..60201411 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_61 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_61 index 2ff5a990..7a0a3b81 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_61 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_61 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_62 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_62 index 3c041465..8763d3c0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_62 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_62 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63 index 0c434d18..84f5a53c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_66 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_66 index 3f59b7b5..bcf3abb9 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_66 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_66 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_675 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_675 index b28f198e..52d0a37d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_675 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_675 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 index b9a02bc5..e7f5f11d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_679 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_679 index f7996373..15209d24 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_679 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_679 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_7 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_7 index 74eba0df..5d72f0be 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_7 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_7 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_81 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_81 index 59525337..efe9684b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_81 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_81 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_84 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_84 index bae5eaa2..5c772332 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_84 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_84 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_855 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_855 index 8dc04dbd..e231e9d5 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_855 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_855 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_90 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_90 index 531b6e2c..94750712 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_90 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_90 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 index 319d6211..f63b8ecf 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_94 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_94 index 931b3e54..69584350 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_94 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_94 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_95 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_95 index 50afc445..a672784f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_95 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_95 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_971 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_971 index 1cf408c7..31d4fe03 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_971 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_971 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_972 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_972 index 6bdc92c4..01d2cb9f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_972 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_972 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_995 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_995 index 6e21214a..81d6f13b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_995 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_995 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 index c8d5ffa4..dd551738 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 index d17c8d62..8f434f28 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 index e8c082bd..894b6cb8 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878 index d58df564..d10e41fd 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 index ea9ef7ec..1ae3e350 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 index ca49ff01..550e9a4b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 index 88b8a5ae..e0c66f15 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_888 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_888 index 0cd763b9..1bf712d0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_888 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_888 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 index 0929b3fe..f5151bee 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC index c1878bd8..06d59619 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD index bfac1112..78988b4f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE index 3fed6695..23a8e2d3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF index a34ad96a..1e38dd77 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG index 122a2d28..cf19f85a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI index c8decd9e..2fb4737c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL index aa2ab6d8..cc43beb8 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM index 38daaa1c..6cd5015a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO index 133a93b2..243033e1 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR index e8d3d9c8..1a91aa60 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS index 1762bfde..030cf8ee 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT index 7b6813f8..528c3173 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU index e87facdf..2c35e5dd 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW index bea4677d..59edc866 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX index 3a0163b9..32cd44fb 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ index 32fcc1ae..80515182 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA index 9f7ced8a..550b49e4 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB index 07e15523..7cf85530 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD index 81e9a79b..349705c2 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE index 9cab9756..74370f97 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF index 1265ae9c..45f03ecd 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG index bda39900..36a59d30 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH index 7700513c..96732086 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI index 1aa3e010..1a3442c5 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ index ed13585d..7bcf135f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL index 25c83186..fe4139aa 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM index 31659662..56c05de1 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN index b8d90015..2af84ab4 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO index a17a92b6..025a2617 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ index 7825f44e..9ee6d9f0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR index 9d1f45ce..f6d3a1f1 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS index 87b790b7..440f6242 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT index 4790935c..21d17813 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW index d59df846..b95a873e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY index 63c20628..7696797f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ index f6ad5c1a..3a9eaac1 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA index 690e6d80..ebb127ad 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC index b4fc272f..6ce90131 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD index cf0004f0..0a069cef 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF index 456b2a34..ddd2cdfd 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG index f1cb4eb7..d3e80dae 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH index 144c6ebe..f8952993 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI index 6c8e4efa..f4c1bd1e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK index 0a2c5e82..8620374a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL index 21f89d88..0f0b7c2b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM index 8d458be2..c4c6ae19 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN index 6c3815b7..fba893ed 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO index eba5a7bd..96075d2c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR index 06034b74..ff2bfff8 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU index 38836643..586226b2 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV index bea6d98a..f285ad11 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW index 96c787ac..c0f87362 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX index 81e9a311..6da44fb9 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY index 8b1f9daa..27df1947 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ index 4003d75a..d888c3c1 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE index fbaad08d..8594987f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ index 0a69eb8a..df52fa88 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK index 0f0a954c..b46f8ca4 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM index 020d81b4..0efc9924 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO index 81cbb5ad..a5f2ae34 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ index 93eb0325..c90f9d5c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC index 9beb7d23..fa11c733 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE index 45c53c65..adf90fa8 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG index f98dde25..abba494a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH index 54840122..fb7c7f47 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER index b9f7028c..3493c4a2 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES index f31856ef..c4d98896 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET index f26f873f..a17b030f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI index 0da76921..ec2d9589 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ index 17da1054..b47ac8f7 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK index 0b8ff8f1..7792393d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM index ec4f6344..c5bb1641 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO index 2a3c8a42..a1735d3b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR index c27b0079..c7bdc8a7 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA index 8513d528..a086ea1b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB index d31f4808..7f33b9b1 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD index 9116ebcb..59228347 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE index 27548408..25412b4e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF index 76ea09d7..ff2ed91f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG index 17aa02e3..2e79234d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH index 6f2a0887..901d822b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI index 3fef3017..8eabaa6f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL index b9c885aa..e4e91a3f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM index 402e5e22..81bc9ce3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN index 357c2f02..305a0a30 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP index 8799e47f..019e38f0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ index bed4f181..be34bae0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR index 010b08f0..4a655219 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT index 0e66b7fa..2451e16a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU index ec96aae0..0c45ef6a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW index 737b6ebd..d4d061f1 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY index 6efcfab6..9e4a0594 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK index aa348cb1..d5b5a20e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN index b0f61db0..9ae12b9c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR index 8aab20bb..addda3a2 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT index c8d1d5fa..9fb5a7bb 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU index ae834a8a..cb1eb60c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID index a6f6d7cd..844c4c52 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE index 09746144..b4d3a108 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL index fa66a439..c3b0d2c8 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM index d03d54b9..2e6cc685 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN index 16ce8055..233d9698 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO index 7a0aff30..811ec9a6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ index e0ce0c2b..020eb373 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR index 1f4aa7c2..80c3751e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS index 69c7840c..60209c00 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT index d40afaea..312e16e0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE index 8252564c..7aa280cc 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM index 00b6fb7a..d14f29c3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO index a06b3de7..1762bcd1 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP index 3018755c..617b85d7 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE index 3f090b0f..859fc28e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG index 90c99e5d..01c777db 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH index d613ba53..51cd3d1d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI index afdd07c9..eef2315d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM index f77db732..4b50eb59 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN index 3de9458d..b70a2197 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP index ed9ca6d6..eeb0d20f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR index fbf6919a..9558689d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW index 11e2f67c..68ff9bb0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY index 58f8997b..95165429 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ index d27d765f..2fd94d0e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA index 77b03c30..907e8eae 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB index e581024e..30ef3302 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC index bf87478c..79633260 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI index de0a7f32..9296aecb 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK index 5229b08c..7370f609 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR index e74f064f..a67fb982 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS index 51e44360..fa569e25 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT index 293e570e..c35889e0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU index 1a6159a5..b45028cb 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV index aff0d8ac..67a90330 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY index 87d5b7b6..d02ab180 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA index faa1b92e..b5779ac6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC index 7b21de82..55a213cb 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD index 0e181e2e..ac53564b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME index c4752c7a..0209cdec 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF index 85534b98..1c411031 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG index 7c1109ee..4be38623 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH index fe2f8eee..d22bc619 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK index 6d067e52..dfbf3203 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML index f3da8d51..e6b26281 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM index ce3c3a2a..f55b9c16 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN index 7fc3dc5c..4dc239b8 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO index 2c431d1c..f302fb6f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP index 1081beaa..52e25b8a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ index da0b5691..874d1369 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR index 6b3891e9..79914889 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS index 97ea8efe..dc6aec10 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT index 9f4ff69e..33ed28d0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU index 89674400..b1afdc0b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV index 1864b4a0..72ade39c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW index e10d74a4..46ba7161 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX index 267bd729..9b7ed163 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY index 3c3a9133..8cc82c0b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ index ba7d7622..30b630d0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA index 84098ce7..b4ad6c9a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC index b4a00fc0..9448ef13 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE index ca1b8809..94cfbd6d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF index 2b8d8ca1..fb7a27ad 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG index 0520cbab..26c6a661 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI index a346663a..d193df2f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL index e74d23ec..dc3b99c6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO index 643ca914..0789050b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP index fa21ba0d..4cc0540c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR index ae7cff03..675edb24 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU index 2e2af52a..7407a2c4 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ index 2280bf83..ae8b3104 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM index e2ab69d9..0b6614b8 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA index 4ca001e5..032e12d9 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE index 7130c273..21d246ea 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF index 6d78c6af..0f51df38 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG index ca9dcbad..d8e9fb6e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH index c0cf3643..7f74aea1 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK index ebc0d913..7c95b377 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL index ee40a831..8eebf08c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM index 3b54a741..84d8d006 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR index 1879c811..12de93d0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS index 3f011495..7a4f4490 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT index e0478c03..7cdefab7 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW index ed6d8297..c78f3f8c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY index 3b44fa5c..4c023000 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA index 3394f13d..3a809687 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE index 26dd0c45..8cdb151e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO index 01c62caf..7a5f675d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS index 709b19be..c6719054 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU index 50a6e6c6..f2e9dfc5 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW index 2440e11a..78c0c399 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA index f60c95d0..7121f036 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB index 860a62f7..d4c4a1eb 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC index 0b8c108f..c9ab7bf1 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD index a483c1ec..b1c18197 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE index fafe8d68..2b83aa55 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG index 1c0e6a2c..c176e1b5 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH index c8d6f823..c65b7851 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI index 1d2b9e73..213809d9 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ index 2a006424..d6b5da2f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK index c642a83a..2e825222 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL index f2f231b9..b3bd72ee 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM index 6c2df8f2..99abc501 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN index 83fe3a16..c9300344 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO index bf98eef5..0f3a4918 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR index 9d3d88e5..1cbadd06 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS index d6ab3936..22af2918 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST index 1736256b..4b02e5d6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV index fbc8cd62..06e019d6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX index 80ae038e..57c5acd9 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY index f61fd9d9..d099d141 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ index 3fccaea9..06ee7a69 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TA index 5359335c..94ea084d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC index 5e045019..eb21bba3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD index 546dd980..c48135b0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG index cd6d88df..0e293cbe 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH index 415a87d3..e6950ed4 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ index 43b8accb..c33fddaf 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK index 3b216e7e..b78c16ff 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL index 2afdf562..4b981261 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM index daa26251..3423cdb5 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN index 4eece03c..f619fc09 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO index fe9ea53f..6022c49b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR index 55d9cdd1..da111358 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT index 75e974c5..c5bdb72e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV index 36947304..8b5e3704 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW index 77446e35..21e17d50 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ index e520fee3..fddf6c47 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA index af44a6ba..2c8b86c3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG index 99a51557..658338da 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US index a8fdf10f..c85b9ae0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY index 34677205..b12ec528 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ index 38273b62..fe878893 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA index e9484d11..bfa0356a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC index 17bc40e8..bbd247f3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE index a1a3ad93..3697e6bf 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG index e6da71bd..6eb1fd88 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI index f04e5741..8e83bddd 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN index 55c5d6c8..9d9827d3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU index 818cca84..fb52724d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF index 15de7fed..192f85b6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS index 73fdc760..b68ec5bf 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE index 88b4749a..acca926a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT index 1dc3dd41..5d99aab5 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA index a0ba8112..e9beec74 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM index e1d55445..a94420a3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW index 0b35a04d..40e4fd9d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC index 74ffcdcc..3dea590c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AD index f24df335..a45bbb75 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AE index fbcfefc9..5bbc6dfe 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF index 3788b26d..38212a31 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG index 78ae869f..975779f5 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI index e7e5bff1..bd88c285 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL index 8ea4ce80..20aa7bb6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AM index 63522938..31e46c10 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AO index 310df7fa..22ad3f65 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR index 8a9daf15..3e570916 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS index a27ffe7f..16b9fff9 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT index 304c1a29..42feb964 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU index d209247b..f572a64f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW index f3ffda49..79fc45c0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AX b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AX index 565fcb51..2aa1773b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AX and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AX differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AZ index c3a7dc4e..36f53ad5 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA index 33520ea1..48fb30db 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB index 269b75bf..7ed12a5a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BD index a1983cfb..89bb7518 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE index 3701ff68..9f14fed9 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BF index bd050b34..74599976 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG index 8b926fb8..db210628 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BH index 662b7ae2..48204d4a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI index 5b3dec4a..0c7a866f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BJ index 3d5f8aaf..cd723b68 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BJ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BJ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BL index 2f404c38..68e41a12 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM index b373c206..dd6f8ef6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BN index 02cabe07..fbfd8ec4 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BO index 22e77330..a63de67d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BQ index a29dd56c..77dd739a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BQ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BQ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR index 8072ac7e..1dad637d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS index 66388d79..ed4609a9 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BT index f290d2ed..561d108d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW index 97605039..762ee4ab 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BY index 8c7e33c8..1e54cb16 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BZ index 4609c032..cf5d6706 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA index 60321f54..601800ae 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CC index 9f460e27..a95e63d9 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD index cdc47655..3129e02b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF index 13be56cb..6e828c85 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG index a87dfd0c..959f8453 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH index fc732e0b..18515230 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CI index 0b01c4ac..aafce89d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CK index 2a9df3f2..745dd900 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CL index 6ace01af..01770d02 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CM index e03b68f7..c08c97e6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN index 557fcdd5..fc1e772b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO index 890d0df9..ef1fa4eb 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR index d31a3714..87e65596 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CU index e6f3a6ab..fbcc4167 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CV index d751c2d6..998eebd7 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CV and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CV differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CW index 638e4ea3..e3ae0459 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CX b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CX index 584ed683..42cf8d98 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CX and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CX differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY index 87f0f0a5..7822789e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ index 6788fb64..15cc9db0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE index 15b5a22b..d13b10eb 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DJ index 9570d9ae..d2e2cf77 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DJ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DJ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK index 0c51ecec..a7feff76 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM index 2937e9f9..a243358f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO index 02548a8d..bed984d9 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ index fffe170b..8adb195a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EC index dffb0c4e..bd6fb373 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE index cf858b78..a2add072 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EG index 16f946ae..6c566a53 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EH index 157e3019..1fd543eb 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER index bd31d1a7..80819795 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ES b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ES index 9e332872..e3466718 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ES and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ES differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET index 992d15f9..de8a8199 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI index ed0013ec..b329404f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FJ index 105990ea..eb5053c3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FJ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FJ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FK index d06ee70a..4fc96e6b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FM index c02c6760..899f3010 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO index 1032654b..2f87edee 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR index 781a5a22..9cd45b19 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GA index 253da099..bcebdb31 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB index 0567b725..85a8eae8 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD index 42f73e84..57a94038 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GE index 0f035481..d5f00786 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GF index d064d4b7..77ac3823 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GG index 525a43ab..b69dbd67 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GH index b58fcf3d..68991628 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GI index 1ec43e29..5525f6d4 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GL index 5d89ce58..bd1430e6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GM index 45580ca6..f4e1dc93 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN index d29e28c5..6a4b36da 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GP index 0495da14..fb326ba7 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GP and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GP differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR index 7e055f6a..02040dd4 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GT index ad158a95..35a99a7f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU index 0f971920..fa65f3b6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GW index 2cdaa3ce..2ad73860 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY index 727fd90c..0725de1c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK index ae9d3375..fcca67f3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HN index dcfa8e59..c1d91089 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR index 5fe20b66..9ef49ea4 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HT index f20c9567..32e3c8de 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU index 26fb3321..c06399a9 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID index b001a74b..e7252540 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE index b707978c..70c05d55 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL index cf44a7c7..826cc645 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IM index 0f486650..a06e48de 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IN index 5672dc75..4a9ef2be 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IQ index a2b3e7de..1f9373f7 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IQ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IQ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR index 8ac0ca5b..e0403a97 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS index ff8b2147..2fdf7624 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT index a6d5e6a8..7bcbdc21 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JE index f1e1f5ba..8fea2860 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM index f531f3f5..f5de2f5a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO index 60606743..38ea92bf 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP index 0a41f2bd..08fff356 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KE index 67c23821..16e91612 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KG index 645409a9..e7bdf5b7 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KH index 357e193f..a8a9bd1f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI index ad6ff09d..80a0aa6b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KM index f007b0b5..35dadfca 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN index bed22feb..e7372929 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP index e0108aa9..5ce93640 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR index edb0da11..c87bb621 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KW index b8d7ba7b..b2446459 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY index 2021fd6c..a64d89c6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KZ index fdd15244..23ee5727 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LA index a0db8e73..6478104c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LB index 461f7853..1c5858a8 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LB and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LB differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC index dccb2145..c3bb4cb1 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI index 75cbf63c..64dbc287 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK index f7a3bf53..6e481a43 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LR index 865909b2..33710050 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LS index 1402e1b3..8aa07444 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT index f24cd392..f50b8926 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU index 73dfe0c1..fc674776 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV index 55065ba8..915764a3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LY index da6addd4..39e3992f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MA index b72a0cb9..2b8d16b6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC index 40b9d7bb..529230d3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD index 54c4b90b..03634d16 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ME b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ME index 7fd5a28b..8b825179 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ME and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ME differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MF index b1fa010c..6bd7e04c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MG index 9fb191b3..95e41da8 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MH index c0c09600..2b9ea51a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK index cf8e304e..25f54dd3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ML b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ML index 21b14db7..0c82380c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ML and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ML differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MM index 22ea7224..fc113f31 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN index 5ab339b8..2119e3e8 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MO index d1528324..1040888f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP index a34c3f04..d8917d7d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MQ index f6ec8c75..865d1e59 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MQ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MQ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MR index e2c2542b..01e47d0c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS index 38fb6c94..d50d6731 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT index 4c923cbb..aaebe77c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MU index ab8083e6..fbbc863e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MV index 95dc6e3a..d6b201a3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MV and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MV differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MW index 91bafccd..2838c135 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX index dc5de200..3d3f45d7 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MY index e49f8113..9f7e3494 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MZ index fbd9affe..8839ea3f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NA index e86b9ceb..28d941bf 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NC index 2c538915..d8ec9e11 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE index d771aa15..6c98019b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NF index 469c0aa3..1b8e2711 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NG index 4765e574..24ecb770 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NI index 0e644247..e87a268b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL index b7c82f65..e1575705 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO index 82318904..6428caff 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP index f4b2a097..20cb1a81 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NR index 5a471fd3..fd5ca97b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU index e225d925..edf51559 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NZ index ab3f5254..e96a67e7 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM index 01fb50d5..8eb00719 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PA index fbcf2983..980d4909 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PE index d52f09dd..6d7d8bb6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PF index 2bc0ee23..41ab3dca 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PG index db09b2bf..5b41c33d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PH index c89463ca..33ad6a02 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK index f0aa8a42..4abf46d8 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL index 3561642b..0ae25145 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM index f4adb431..f2bfe1f4 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR index 0b237f00..a07a07bd 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT index cda1278c..355988ee 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PW index c6440cd8..2b57a225 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY index b5930495..32526472 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_QA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_QA index 574a4f46..dd44334a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_QA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_QA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RE index 924f8388..19558baf 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO index 24e8a54f..fc00dfa4 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RS index 85048861..ad8531b0 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU index 71da7531..d3559a93 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW index 1f02df86..54db8157 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA index 1af3a30d..24f9bdf7 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB index f067ce04..a6a8b03f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC index 983acb84..f80964ad 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SD index 193fe6b7..50e23e7f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE index 4dba0dae..9eeff846 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG index 3b2ddf5b..6c15300a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH index e7bf39ca..a6af740a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI index fa6214f8..65a3a5ef 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SJ index 71d22bda..bfc5612f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SJ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SJ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK index a4cdcb57..d80bf275 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SL index f4270f18..f4d57e10 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SM index 9957c8fa..1d5ef4dc 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SN index a5cd1c3a..1902a563 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO index c5f6cdbd..90b23de8 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SR index e7bae5d4..10a3b013 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ST b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ST index 097b246b..d25e3087 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ST and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ST differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV index 4b1f16d9..11c9282e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX index afa6a860..53df3160 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SY index b2118eb9..8638c3ff 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SZ index fa0cba52..94d4b94f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC index 3f9db425..a3ece84b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TD index 96aa8a11..760d2114 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TD and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TD differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TG index 16ed6c70..d7e1910e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH index 11b3296e..9ff0ca44 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TJ index 51a8727f..17e0c923 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TJ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TJ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TL index 1dabb417..26cd38e9 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM index ded3a7c1..1c8ac3d9 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TN index 992b3718..9368cc4e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TO index 5a36936e..a72b863e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TO and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TO differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR index 1bb44352..869c121c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT index 1c67e2b4..0b710135 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV index 40e53103..4135f706 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW index 846f0185..6dfce011 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ index 0c67e673..1e0572d3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UA index 58a31df2..c10cb136 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UG index b7b68399..c3a24b74 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US index 5b5cd668..9a3f862c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UY index 7dc561d5..79de6f8b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UZ index febccc90..0d23be4d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VA index a170b283..dfab49ff 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC index b5b54580..23228e33 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VE index e9a731ec..0722459c 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG index aac109ba..7b22a386 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI index 5e6e6df8..6cf76229 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VN index 136a0772..555e7622 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VU index a6ab9eea..d5efdac7 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WF index fc5bcb22..d5675c74 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS index 686c1893..e8545221 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YE index dcdd8dfa..3d559e49 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YE and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YE differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YT index 60a6a334..026b3404 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA index 2e639e00..c63b9477 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM index f0e5edbd..33083f19 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW index 77fcbd62..b6ebb295 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto b/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto deleted file mode 100644 index a6d902d2..00000000 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto and /dev/null differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java b/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java index ac201366..38319cbb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java @@ -16,7 +16,7 @@ package com.google.i18n.phonenumbers.internal; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; /** * Internal phonenumber matching API used to isolate the underlying implementation of the diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java b/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java index b1e7a23f..125a1822 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java @@ -16,8 +16,8 @@ package com.google.i18n.phonenumbers.internal; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import com.google.i18n.phonenumbers.RegexCache; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; import java.util.regex.Matcher; @@ -38,7 +38,7 @@ public final class RegexBasedMatcher implements MatcherApi { public boolean matchesNationalNumber(String nationalNumber, PhoneNumberDesc numberDesc, boolean allowPrefixMatch) { Matcher nationalNumberPatternMatcher = regexCache.getPatternForRegex( - numberDesc.nationalNumberPattern).matcher(nationalNumber); + numberDesc.getNationalNumberPattern()).matcher(nationalNumber); return nationalNumberPatternMatcher.matches() || (allowPrefixMatch && nationalNumberPatternMatcher.lookingAt()); } @@ -46,7 +46,7 @@ public final class RegexBasedMatcher implements MatcherApi { // @Override public boolean matchesPossibleNumber(String nationalNumber, PhoneNumberDesc numberDesc) { Matcher possibleNumberPatternMatcher = regexCache.getPatternForRegex( - numberDesc.possibleNumberPattern).matcher(nationalNumber); + numberDesc.getPossibleNumberPattern()).matcher(nationalNumber); return possibleNumberPatternMatcher.matches(); } } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/nano/Phonemetadata.java b/libphonenumber/src/com/google/i18n/phonenumbers/nano/Phonemetadata.java deleted file mode 100644 index abf4a67b..00000000 --- a/libphonenumber/src/com/google/i18n/phonenumbers/nano/Phonemetadata.java +++ /dev/null @@ -1,1040 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! - -package com.google.i18n.phonenumbers.nano; - -@SuppressWarnings("hiding") -public interface Phonemetadata { - - public static final class NumberFormat extends - com.google.protobuf.nano.MessageNano { - - private static volatile NumberFormat[] _emptyArray; - public static NumberFormat[] emptyArray() { - // Lazily initializes the empty array - if (_emptyArray == null) { - synchronized ( - com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) { - if (_emptyArray == null) { - _emptyArray = new NumberFormat[0]; - } - } - } - return _emptyArray; - } - - // required string pattern = 1; - public java.lang.String pattern; - - // required string format = 2; - public java.lang.String format; - - // repeated string leading_digits_pattern = 3; - public java.lang.String[] leadingDigitsPattern; - - // optional string national_prefix_formatting_rule = 4; - public java.lang.String nationalPrefixFormattingRule; - - // optional bool national_prefix_optional_when_formatting = 6; - public boolean nationalPrefixOptionalWhenFormatting; - - // optional string domestic_carrier_code_formatting_rule = 5; - public java.lang.String domesticCarrierCodeFormattingRule; - - public NumberFormat() { - clear(); - } - - public NumberFormat clear() { - pattern = ""; - format = ""; - leadingDigitsPattern = com.google.protobuf.nano.WireFormatNano.EMPTY_STRING_ARRAY; - nationalPrefixFormattingRule = ""; - nationalPrefixOptionalWhenFormatting = false; - domesticCarrierCodeFormattingRule = ""; - cachedSize = -1; - return this; - } - - @Override - public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output) - throws java.io.IOException { - output.writeString(1, this.pattern); - output.writeString(2, this.format); - if (this.leadingDigitsPattern != null && this.leadingDigitsPattern.length > 0) { - for (int i = 0; i < this.leadingDigitsPattern.length; i++) { - java.lang.String element = this.leadingDigitsPattern[i]; - if (element != null) { - output.writeString(3, element); - } - } - } - if (!this.nationalPrefixFormattingRule.equals("")) { - output.writeString(4, this.nationalPrefixFormattingRule); - } - if (!this.domesticCarrierCodeFormattingRule.equals("")) { - output.writeString(5, this.domesticCarrierCodeFormattingRule); - } - if (this.nationalPrefixOptionalWhenFormatting != false) { - output.writeBool(6, this.nationalPrefixOptionalWhenFormatting); - } - super.writeTo(output); - } - - @Override - protected int computeSerializedSize() { - int size = super.computeSerializedSize(); - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(1, this.pattern); - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(2, this.format); - if (this.leadingDigitsPattern != null && this.leadingDigitsPattern.length > 0) { - int dataCount = 0; - int dataSize = 0; - for (int i = 0; i < this.leadingDigitsPattern.length; i++) { - java.lang.String element = this.leadingDigitsPattern[i]; - if (element != null) { - dataCount++; - dataSize += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSizeNoTag(element); - } - } - size += dataSize; - size += 1 * dataCount; - } - if (!this.nationalPrefixFormattingRule.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(4, this.nationalPrefixFormattingRule); - } - if (!this.domesticCarrierCodeFormattingRule.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(5, this.domesticCarrierCodeFormattingRule); - } - if (this.nationalPrefixOptionalWhenFormatting != false) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeBoolSize(6, this.nationalPrefixOptionalWhenFormatting); - } - return size; - } - - @Override - public NumberFormat mergeFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - while (true) { - int tag = input.readTag(); - switch (tag) { - case 0: - return this; - default: { - if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) { - return this; - } - break; - } - case 10: { - this.pattern = input.readString(); - break; - } - case 18: { - this.format = input.readString(); - break; - } - case 26: { - int arrayLength = com.google.protobuf.nano.WireFormatNano - .getRepeatedFieldArrayLength(input, 26); - int i = this.leadingDigitsPattern == null ? 0 : this.leadingDigitsPattern.length; - java.lang.String[] newArray = new java.lang.String[i + arrayLength]; - if (i != 0) { - java.lang.System.arraycopy(this.leadingDigitsPattern, 0, newArray, 0, i); - } - for (; i < newArray.length - 1; i++) { - newArray[i] = input.readString(); - input.readTag(); - } - // Last one without readTag. - newArray[i] = input.readString(); - this.leadingDigitsPattern = newArray; - break; - } - case 34: { - this.nationalPrefixFormattingRule = input.readString(); - break; - } - case 42: { - this.domesticCarrierCodeFormattingRule = input.readString(); - break; - } - case 48: { - this.nationalPrefixOptionalWhenFormatting = input.readBool(); - break; - } - } - } - } - - public static NumberFormat parseFrom(byte[] data) - throws com.google.protobuf.nano.InvalidProtocolBufferNanoException { - return com.google.protobuf.nano.MessageNano.mergeFrom(new NumberFormat(), data); - } - - public static NumberFormat parseFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - return new NumberFormat().mergeFrom(input); - } - } - - public static final class PhoneNumberDesc extends - com.google.protobuf.nano.MessageNano { - - private static volatile PhoneNumberDesc[] _emptyArray; - public static PhoneNumberDesc[] emptyArray() { - // Lazily initializes the empty array - if (_emptyArray == null) { - synchronized ( - com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) { - if (_emptyArray == null) { - _emptyArray = new PhoneNumberDesc[0]; - } - } - } - return _emptyArray; - } - - // optional string national_number_pattern = 2; - public java.lang.String nationalNumberPattern; - - // optional string possible_number_pattern = 3; - public java.lang.String possibleNumberPattern; - - // optional string example_number = 6; - public java.lang.String exampleNumber; - - public PhoneNumberDesc() { - clear(); - } - - public PhoneNumberDesc clear() { - nationalNumberPattern = ""; - possibleNumberPattern = ""; - exampleNumber = ""; - cachedSize = -1; - return this; - } - - @Override - public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output) - throws java.io.IOException { - if (!this.nationalNumberPattern.equals("")) { - output.writeString(2, this.nationalNumberPattern); - } - if (!this.possibleNumberPattern.equals("")) { - output.writeString(3, this.possibleNumberPattern); - } - if (!this.exampleNumber.equals("")) { - output.writeString(6, this.exampleNumber); - } - super.writeTo(output); - } - - @Override - protected int computeSerializedSize() { - int size = super.computeSerializedSize(); - if (!this.nationalNumberPattern.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(2, this.nationalNumberPattern); - } - if (!this.possibleNumberPattern.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(3, this.possibleNumberPattern); - } - if (!this.exampleNumber.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(6, this.exampleNumber); - } - return size; - } - - @Override - public PhoneNumberDesc mergeFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - while (true) { - int tag = input.readTag(); - switch (tag) { - case 0: - return this; - default: { - if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) { - return this; - } - break; - } - case 18: { - this.nationalNumberPattern = input.readString(); - break; - } - case 26: { - this.possibleNumberPattern = input.readString(); - break; - } - case 50: { - this.exampleNumber = input.readString(); - break; - } - } - } - } - - public static PhoneNumberDesc parseFrom(byte[] data) - throws com.google.protobuf.nano.InvalidProtocolBufferNanoException { - return com.google.protobuf.nano.MessageNano.mergeFrom(new PhoneNumberDesc(), data); - } - - public static PhoneNumberDesc parseFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - return new PhoneNumberDesc().mergeFrom(input); - } - } - - public static final class PhoneMetadata extends - com.google.protobuf.nano.MessageNano { - - private static volatile PhoneMetadata[] _emptyArray; - public static PhoneMetadata[] emptyArray() { - // Lazily initializes the empty array - if (_emptyArray == null) { - synchronized ( - com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) { - if (_emptyArray == null) { - _emptyArray = new PhoneMetadata[0]; - } - } - } - return _emptyArray; - } - - // optional .i18n.phonenumbers.PhoneNumberDesc general_desc = 1; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc generalDesc; - - // optional .i18n.phonenumbers.PhoneNumberDesc fixed_line = 2; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc fixedLine; - - // optional .i18n.phonenumbers.PhoneNumberDesc mobile = 3; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc mobile; - - // optional .i18n.phonenumbers.PhoneNumberDesc toll_free = 4; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc tollFree; - - // optional .i18n.phonenumbers.PhoneNumberDesc premium_rate = 5; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc premiumRate; - - // optional .i18n.phonenumbers.PhoneNumberDesc shared_cost = 6; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc sharedCost; - - // optional .i18n.phonenumbers.PhoneNumberDesc personal_number = 7; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc personalNumber; - - // optional .i18n.phonenumbers.PhoneNumberDesc voip = 8; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc voip; - - // optional .i18n.phonenumbers.PhoneNumberDesc pager = 21; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc pager; - - // optional .i18n.phonenumbers.PhoneNumberDesc uan = 25; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc uan; - - // optional .i18n.phonenumbers.PhoneNumberDesc emergency = 27; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc emergency; - - // optional .i18n.phonenumbers.PhoneNumberDesc voicemail = 28; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc voicemail; - - // optional .i18n.phonenumbers.PhoneNumberDesc short_code = 29; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc shortCode; - - // optional .i18n.phonenumbers.PhoneNumberDesc standard_rate = 30; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc standardRate; - - // optional .i18n.phonenumbers.PhoneNumberDesc carrier_specific = 31; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc carrierSpecific; - - // optional .i18n.phonenumbers.PhoneNumberDesc no_international_dialling = 24; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc noInternationalDialling; - - // required string id = 9; - public java.lang.String id; - - // optional int32 country_code = 10; - public int countryCode; - - // optional string international_prefix = 11; - public java.lang.String internationalPrefix; - - // optional string preferred_international_prefix = 17; - public java.lang.String preferredInternationalPrefix; - - // optional string national_prefix = 12; - public java.lang.String nationalPrefix; - - // optional string preferred_extn_prefix = 13; - public java.lang.String preferredExtnPrefix; - - // optional string national_prefix_for_parsing = 15; - public java.lang.String nationalPrefixForParsing; - - // optional string national_prefix_transform_rule = 16; - public java.lang.String nationalPrefixTransformRule; - - // optional bool same_mobile_and_fixed_line_pattern = 18 [default = false]; - public boolean sameMobileAndFixedLinePattern; - - // repeated .i18n.phonenumbers.NumberFormat number_format = 19; - public com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat[] numberFormat; - - // repeated .i18n.phonenumbers.NumberFormat intl_number_format = 20; - public com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat[] intlNumberFormat; - - // optional bool main_country_for_code = 22 [default = false]; - public boolean mainCountryForCode; - - // optional string leading_digits = 23; - public java.lang.String leadingDigits; - - // optional bool leading_zero_possible = 26 [default = false]; - public boolean leadingZeroPossible; - - // optional bool mobile_number_portable_region = 32 [default = false]; - public boolean mobileNumberPortableRegion; - - public PhoneMetadata() { - clear(); - } - - public PhoneMetadata clear() { - generalDesc = null; - fixedLine = null; - mobile = null; - tollFree = null; - premiumRate = null; - sharedCost = null; - personalNumber = null; - voip = null; - pager = null; - uan = null; - emergency = null; - voicemail = null; - shortCode = null; - standardRate = null; - carrierSpecific = null; - noInternationalDialling = null; - id = ""; - countryCode = 0; - internationalPrefix = ""; - preferredInternationalPrefix = ""; - nationalPrefix = ""; - preferredExtnPrefix = ""; - nationalPrefixForParsing = ""; - nationalPrefixTransformRule = ""; - sameMobileAndFixedLinePattern = false; - numberFormat = com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat.emptyArray(); - intlNumberFormat = com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat.emptyArray(); - mainCountryForCode = false; - leadingDigits = ""; - leadingZeroPossible = false; - mobileNumberPortableRegion = false; - cachedSize = -1; - return this; - } - - @Override - public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output) - throws java.io.IOException { - if (this.generalDesc != null) { - output.writeMessage(1, this.generalDesc); - } - if (this.fixedLine != null) { - output.writeMessage(2, this.fixedLine); - } - if (this.mobile != null) { - output.writeMessage(3, this.mobile); - } - if (this.tollFree != null) { - output.writeMessage(4, this.tollFree); - } - if (this.premiumRate != null) { - output.writeMessage(5, this.premiumRate); - } - if (this.sharedCost != null) { - output.writeMessage(6, this.sharedCost); - } - if (this.personalNumber != null) { - output.writeMessage(7, this.personalNumber); - } - if (this.voip != null) { - output.writeMessage(8, this.voip); - } - output.writeString(9, this.id); - if (this.countryCode != 0) { - output.writeInt32(10, this.countryCode); - } - if (!this.internationalPrefix.equals("")) { - output.writeString(11, this.internationalPrefix); - } - if (!this.nationalPrefix.equals("")) { - output.writeString(12, this.nationalPrefix); - } - if (!this.preferredExtnPrefix.equals("")) { - output.writeString(13, this.preferredExtnPrefix); - } - if (!this.nationalPrefixForParsing.equals("")) { - output.writeString(15, this.nationalPrefixForParsing); - } - if (!this.nationalPrefixTransformRule.equals("")) { - output.writeString(16, this.nationalPrefixTransformRule); - } - if (!this.preferredInternationalPrefix.equals("")) { - output.writeString(17, this.preferredInternationalPrefix); - } - if (this.sameMobileAndFixedLinePattern != false) { - output.writeBool(18, this.sameMobileAndFixedLinePattern); - } - if (this.numberFormat != null && this.numberFormat.length > 0) { - for (int i = 0; i < this.numberFormat.length; i++) { - com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat element = this.numberFormat[i]; - if (element != null) { - output.writeMessage(19, element); - } - } - } - if (this.intlNumberFormat != null && this.intlNumberFormat.length > 0) { - for (int i = 0; i < this.intlNumberFormat.length; i++) { - com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat element = this.intlNumberFormat[i]; - if (element != null) { - output.writeMessage(20, element); - } - } - } - if (this.pager != null) { - output.writeMessage(21, this.pager); - } - if (this.mainCountryForCode != false) { - output.writeBool(22, this.mainCountryForCode); - } - if (!this.leadingDigits.equals("")) { - output.writeString(23, this.leadingDigits); - } - if (this.noInternationalDialling != null) { - output.writeMessage(24, this.noInternationalDialling); - } - if (this.uan != null) { - output.writeMessage(25, this.uan); - } - if (this.leadingZeroPossible != false) { - output.writeBool(26, this.leadingZeroPossible); - } - if (this.emergency != null) { - output.writeMessage(27, this.emergency); - } - if (this.voicemail != null) { - output.writeMessage(28, this.voicemail); - } - if (this.shortCode != null) { - output.writeMessage(29, this.shortCode); - } - if (this.standardRate != null) { - output.writeMessage(30, this.standardRate); - } - if (this.carrierSpecific != null) { - output.writeMessage(31, this.carrierSpecific); - } - if (this.mobileNumberPortableRegion != false) { - output.writeBool(32, this.mobileNumberPortableRegion); - } - super.writeTo(output); - } - - @Override - protected int computeSerializedSize() { - int size = super.computeSerializedSize(); - if (this.generalDesc != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(1, this.generalDesc); - } - if (this.fixedLine != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(2, this.fixedLine); - } - if (this.mobile != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(3, this.mobile); - } - if (this.tollFree != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(4, this.tollFree); - } - if (this.premiumRate != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(5, this.premiumRate); - } - if (this.sharedCost != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(6, this.sharedCost); - } - if (this.personalNumber != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(7, this.personalNumber); - } - if (this.voip != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(8, this.voip); - } - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(9, this.id); - if (this.countryCode != 0) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeInt32Size(10, this.countryCode); - } - if (!this.internationalPrefix.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(11, this.internationalPrefix); - } - if (!this.nationalPrefix.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(12, this.nationalPrefix); - } - if (!this.preferredExtnPrefix.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(13, this.preferredExtnPrefix); - } - if (!this.nationalPrefixForParsing.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(15, this.nationalPrefixForParsing); - } - if (!this.nationalPrefixTransformRule.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(16, this.nationalPrefixTransformRule); - } - if (!this.preferredInternationalPrefix.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(17, this.preferredInternationalPrefix); - } - if (this.sameMobileAndFixedLinePattern != false) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeBoolSize(18, this.sameMobileAndFixedLinePattern); - } - if (this.numberFormat != null && this.numberFormat.length > 0) { - for (int i = 0; i < this.numberFormat.length; i++) { - com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat element = this.numberFormat[i]; - if (element != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(19, element); - } - } - } - if (this.intlNumberFormat != null && this.intlNumberFormat.length > 0) { - for (int i = 0; i < this.intlNumberFormat.length; i++) { - com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat element = this.intlNumberFormat[i]; - if (element != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(20, element); - } - } - } - if (this.pager != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(21, this.pager); - } - if (this.mainCountryForCode != false) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeBoolSize(22, this.mainCountryForCode); - } - if (!this.leadingDigits.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(23, this.leadingDigits); - } - if (this.noInternationalDialling != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(24, this.noInternationalDialling); - } - if (this.uan != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(25, this.uan); - } - if (this.leadingZeroPossible != false) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeBoolSize(26, this.leadingZeroPossible); - } - if (this.emergency != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(27, this.emergency); - } - if (this.voicemail != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(28, this.voicemail); - } - if (this.shortCode != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(29, this.shortCode); - } - if (this.standardRate != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(30, this.standardRate); - } - if (this.carrierSpecific != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(31, this.carrierSpecific); - } - if (this.mobileNumberPortableRegion != false) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeBoolSize(32, this.mobileNumberPortableRegion); - } - return size; - } - - @Override - public PhoneMetadata mergeFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - while (true) { - int tag = input.readTag(); - switch (tag) { - case 0: - return this; - default: { - if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) { - return this; - } - break; - } - case 10: { - if (this.generalDesc == null) { - this.generalDesc = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.generalDesc); - break; - } - case 18: { - if (this.fixedLine == null) { - this.fixedLine = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.fixedLine); - break; - } - case 26: { - if (this.mobile == null) { - this.mobile = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.mobile); - break; - } - case 34: { - if (this.tollFree == null) { - this.tollFree = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.tollFree); - break; - } - case 42: { - if (this.premiumRate == null) { - this.premiumRate = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.premiumRate); - break; - } - case 50: { - if (this.sharedCost == null) { - this.sharedCost = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.sharedCost); - break; - } - case 58: { - if (this.personalNumber == null) { - this.personalNumber = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.personalNumber); - break; - } - case 66: { - if (this.voip == null) { - this.voip = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.voip); - break; - } - case 74: { - this.id = input.readString(); - break; - } - case 80: { - this.countryCode = input.readInt32(); - break; - } - case 90: { - this.internationalPrefix = input.readString(); - break; - } - case 98: { - this.nationalPrefix = input.readString(); - break; - } - case 106: { - this.preferredExtnPrefix = input.readString(); - break; - } - case 122: { - this.nationalPrefixForParsing = input.readString(); - break; - } - case 130: { - this.nationalPrefixTransformRule = input.readString(); - break; - } - case 138: { - this.preferredInternationalPrefix = input.readString(); - break; - } - case 144: { - this.sameMobileAndFixedLinePattern = input.readBool(); - break; - } - case 154: { - int arrayLength = com.google.protobuf.nano.WireFormatNano - .getRepeatedFieldArrayLength(input, 154); - int i = this.numberFormat == null ? 0 : this.numberFormat.length; - com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat[] newArray = - new com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat[i + arrayLength]; - if (i != 0) { - java.lang.System.arraycopy(this.numberFormat, 0, newArray, 0, i); - } - for (; i < newArray.length - 1; i++) { - newArray[i] = new com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat(); - input.readMessage(newArray[i]); - input.readTag(); - } - // Last one without readTag. - newArray[i] = new com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat(); - input.readMessage(newArray[i]); - this.numberFormat = newArray; - break; - } - case 162: { - int arrayLength = com.google.protobuf.nano.WireFormatNano - .getRepeatedFieldArrayLength(input, 162); - int i = this.intlNumberFormat == null ? 0 : this.intlNumberFormat.length; - com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat[] newArray = - new com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat[i + arrayLength]; - if (i != 0) { - java.lang.System.arraycopy(this.intlNumberFormat, 0, newArray, 0, i); - } - for (; i < newArray.length - 1; i++) { - newArray[i] = new com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat(); - input.readMessage(newArray[i]); - input.readTag(); - } - // Last one without readTag. - newArray[i] = new com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat(); - input.readMessage(newArray[i]); - this.intlNumberFormat = newArray; - break; - } - case 170: { - if (this.pager == null) { - this.pager = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.pager); - break; - } - case 176: { - this.mainCountryForCode = input.readBool(); - break; - } - case 186: { - this.leadingDigits = input.readString(); - break; - } - case 194: { - if (this.noInternationalDialling == null) { - this.noInternationalDialling = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.noInternationalDialling); - break; - } - case 202: { - if (this.uan == null) { - this.uan = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.uan); - break; - } - case 208: { - this.leadingZeroPossible = input.readBool(); - break; - } - case 218: { - if (this.emergency == null) { - this.emergency = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.emergency); - break; - } - case 226: { - if (this.voicemail == null) { - this.voicemail = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.voicemail); - break; - } - case 234: { - if (this.shortCode == null) { - this.shortCode = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.shortCode); - break; - } - case 242: { - if (this.standardRate == null) { - this.standardRate = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.standardRate); - break; - } - case 250: { - if (this.carrierSpecific == null) { - this.carrierSpecific = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.carrierSpecific); - break; - } - case 256: { - this.mobileNumberPortableRegion = input.readBool(); - break; - } - } - } - } - - public static PhoneMetadata parseFrom(byte[] data) - throws com.google.protobuf.nano.InvalidProtocolBufferNanoException { - return com.google.protobuf.nano.MessageNano.mergeFrom(new PhoneMetadata(), data); - } - - public static PhoneMetadata parseFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - return new PhoneMetadata().mergeFrom(input); - } - } - - public static final class PhoneMetadataCollection extends - com.google.protobuf.nano.MessageNano { - - private static volatile PhoneMetadataCollection[] _emptyArray; - public static PhoneMetadataCollection[] emptyArray() { - // Lazily initializes the empty array - if (_emptyArray == null) { - synchronized ( - com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) { - if (_emptyArray == null) { - _emptyArray = new PhoneMetadataCollection[0]; - } - } - } - return _emptyArray; - } - - // repeated .i18n.phonenumbers.PhoneMetadata metadata = 1; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata[] metadata; - - public PhoneMetadataCollection() { - clear(); - } - - public PhoneMetadataCollection clear() { - metadata = com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata.emptyArray(); - cachedSize = -1; - return this; - } - - @Override - public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output) - throws java.io.IOException { - if (this.metadata != null && this.metadata.length > 0) { - for (int i = 0; i < this.metadata.length; i++) { - com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata element = this.metadata[i]; - if (element != null) { - output.writeMessage(1, element); - } - } - } - super.writeTo(output); - } - - @Override - protected int computeSerializedSize() { - int size = super.computeSerializedSize(); - if (this.metadata != null && this.metadata.length > 0) { - for (int i = 0; i < this.metadata.length; i++) { - com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata element = this.metadata[i]; - if (element != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(1, element); - } - } - } - return size; - } - - @Override - public PhoneMetadataCollection mergeFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - while (true) { - int tag = input.readTag(); - switch (tag) { - case 0: - return this; - default: { - if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) { - return this; - } - break; - } - case 10: { - int arrayLength = com.google.protobuf.nano.WireFormatNano - .getRepeatedFieldArrayLength(input, 10); - int i = this.metadata == null ? 0 : this.metadata.length; - com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata[] newArray = - new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata[i + arrayLength]; - if (i != 0) { - java.lang.System.arraycopy(this.metadata, 0, newArray, 0, i); - } - for (; i < newArray.length - 1; i++) { - newArray[i] = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata(); - input.readMessage(newArray[i]); - input.readTag(); - } - // Last one without readTag. - newArray[i] = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata(); - input.readMessage(newArray[i]); - this.metadata = newArray; - break; - } - } - } - } - - public static PhoneMetadataCollection parseFrom(byte[] data) - throws com.google.protobuf.nano.InvalidProtocolBufferNanoException { - return com.google.protobuf.nano.MessageNano.mergeFrom(new PhoneMetadataCollection(), data); - } - - public static PhoneMetadataCollection parseFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - return new PhoneMetadataCollection().mergeFrom(input); - } - } -} diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java index 1365ac3f..2591131b 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java @@ -17,8 +17,8 @@ package com.google.i18n.phonenumbers; import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberType; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; import junit.framework.TestCase; @@ -142,10 +142,10 @@ public class ExampleNumbersTest extends TestCase { for (String regionCode : phoneNumberUtil.getSupportedRegions()) { PhoneNumber exampleNumber = null; PhoneNumberDesc desc = - phoneNumberUtil.getMetadataForRegion(regionCode).noInternationalDialling; + phoneNumberUtil.getMetadataForRegion(regionCode).getNoInternationalDialling(); try { - if (!desc.exampleNumber.equals("")) { - exampleNumber = phoneNumberUtil.parse(desc.exampleNumber, regionCode); + if (desc.hasExampleNumber()) { + exampleNumber = phoneNumberUtil.parse(desc.getExampleNumber(), regionCode); } } catch (NumberParseException e) { LOGGER.log(Level.SEVERE, e.toString()); @@ -175,7 +175,21 @@ public class ExampleNumbersTest extends TestCase { public void testEveryRegionHasAnExampleNumber() throws Exception { for (String regionCode : phoneNumberUtil.getSupportedRegions()) { PhoneNumber exampleNumber = phoneNumberUtil.getExampleNumber(regionCode); - assertNotNull("None found for region " + regionCode, exampleNumber); + assertNotNull("No example number found for region " + regionCode, exampleNumber); + } + } + + public void testEveryRegionHasAnInvalidExampleNumber() throws Exception { + for (String regionCode : phoneNumberUtil.getSupportedRegions()) { + PhoneNumber exampleNumber = phoneNumberUtil.getInvalidExampleNumber(regionCode); + assertNotNull("No invalid example number found for region " + regionCode, exampleNumber); + } + } + + public void testEveryTypeHasAnExampleNumber() throws Exception { + for (PhoneNumberUtil.PhoneNumberType type : PhoneNumberUtil.PhoneNumberType.values()) { + PhoneNumber exampleNumber = phoneNumberUtil.getExampleNumberForType(type); + assertNotNull("No example number found for type " + type, exampleNumber); } } @@ -199,10 +213,14 @@ public class ExampleNumbersTest extends TestCase { for (ShortNumberInfo.ShortNumberCost cost : ShortNumberInfo.ShortNumberCost.values()) { exampleShortNumber = shortNumberInfo.getExampleShortNumberForCost(regionCode, cost); if (!exampleShortNumber.equals("")) { - if (cost != shortNumberInfo.getExpectedCostForRegion( - phoneNumberUtil.parse(exampleShortNumber, regionCode), regionCode)) { + phoneNumber = phoneNumberUtil.parse(exampleShortNumber, regionCode); + ShortNumberInfo.ShortNumberCost exampleShortNumberCost = + shortNumberInfo.getExpectedCostForRegion(phoneNumber, regionCode); + if (cost != exampleShortNumberCost) { wrongTypeCases.add(phoneNumber); - LOGGER.log(Level.SEVERE, "Wrong cost for " + phoneNumber.toString()); + LOGGER.log(Level.SEVERE, "Wrong cost for " + phoneNumber.toString() + + ": got " + exampleShortNumberCost + + ", expected: " + cost); } } } @@ -216,9 +234,9 @@ public class ExampleNumbersTest extends TestCase { int wrongTypeCounter = 0; for (String regionCode : shortNumberInfo.getSupportedRegions()) { PhoneNumberDesc desc = - MetadataManager.getShortNumberMetadataForRegion(regionCode).emergency; - if (!desc.exampleNumber.equals("")) { - String exampleNumber = desc.exampleNumber; + MetadataManager.getShortNumberMetadataForRegion(regionCode).getEmergency(); + if (desc.hasExampleNumber()) { + String exampleNumber = desc.getExampleNumber(); PhoneNumber phoneNumber = phoneNumberUtil.parse(exampleNumber, regionCode); if (!shortNumberInfo.isPossibleShortNumberForRegion(phoneNumber, regionCode) || !shortNumberInfo.isEmergencyNumber(exampleNumber, regionCode)) { @@ -239,9 +257,9 @@ public class ExampleNumbersTest extends TestCase { for (String regionCode : shortNumberInfo.getSupportedRegions()) { // Test the carrier-specific tag. PhoneNumberDesc desc = - MetadataManager.getShortNumberMetadataForRegion(regionCode).carrierSpecific; - if (!desc.exampleNumber.equals("")) { - String exampleNumber = desc.exampleNumber; + MetadataManager.getShortNumberMetadataForRegion(regionCode).getCarrierSpecific(); + if (desc.hasExampleNumber()) { + String exampleNumber = desc.getExampleNumber(); PhoneNumber carrierSpecificNumber = phoneNumberUtil.parse(exampleNumber, regionCode); if (!shortNumberInfo.isPossibleShortNumberForRegion(carrierSpecificNumber, regionCode) || !shortNumberInfo.isCarrierSpecific(carrierSpecificNumber)) { diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java index 7a4b5eca..229d8f7d 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java @@ -16,7 +16,7 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; import junit.framework.TestCase; @@ -29,14 +29,14 @@ public class MetadataManagerTest extends TestCase { // We should have some data for Germany. PhoneMetadata germanyAlternateFormats = MetadataManager.getAlternateFormatsForCountry(49); assertNotNull(germanyAlternateFormats); - assertTrue(germanyAlternateFormats.numberFormat.length > 0); + assertTrue(germanyAlternateFormats.numberFormats().size() > 0); } public void testShortNumberMetadataContainsData() throws Exception { // We should have some data for France. PhoneMetadata franceShortNumberMetadata = MetadataManager.getShortNumberMetadataForRegion("FR"); assertNotNull(franceShortNumberMetadata); - assertTrue(franceShortNumberMetadata.shortCode != null); + assertTrue(franceShortNumberMetadata.hasShortCode()); } public void testAlternateFormatsFailsGracefully() throws Exception { diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java index c1c53191..cf9bc90d 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java @@ -16,6 +16,9 @@ package com.google.i18n.phonenumbers; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; + +import java.util.concurrent.ConcurrentHashMap; import junit.framework.TestCase; /** @@ -24,21 +27,38 @@ import junit.framework.TestCase; public class MultiFileMetadataSourceImplTest extends TestCase { public MultiFileMetadataSourceImplTest() {} + public void testGeographicalRegionMetadataLoadsCorrectly() { + ConcurrentHashMap map = new ConcurrentHashMap(); + PhoneMetadata metadata = MultiFileMetadataSourceImpl.loadMetadataFromFile( + "CA", map, "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting", + PhoneNumberUtil.DEFAULT_METADATA_LOADER); + assertEquals(metadata, map.get("CA")); + } + + public void testNonGeographicalRegionMetadataLoadsCorrectly() { + ConcurrentHashMap map = new ConcurrentHashMap(); + PhoneMetadata metadata = MultiFileMetadataSourceImpl.loadMetadataFromFile( + 800, map, "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting", + PhoneNumberUtil.DEFAULT_METADATA_LOADER); + assertEquals(metadata, map.get(800)); + } + public void testMissingMetadataFileThrowsRuntimeException() { - MultiFileMetadataSourceImpl multiFileMetadataSource = new MultiFileMetadataSourceImpl( - "no/such/file", PhoneNumberUtil.DEFAULT_METADATA_LOADER); // In normal usage we should never get a state where we are asking to load metadata that doesn't // exist. However if the library is packaged incorrectly in the jar, this could happen and the // best we can do is make sure the exception has the file name in it. try { - multiFileMetadataSource.loadMetadataFromFile("XX", -1); + MultiFileMetadataSourceImpl.loadMetadataFromFile( + "XX", new ConcurrentHashMap(), "no/such/file", + PhoneNumberUtil.DEFAULT_METADATA_LOADER); fail("expected exception"); } catch (RuntimeException e) { assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_XX")); } try { - multiFileMetadataSource.loadMetadataFromFile( - PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, 123); + MultiFileMetadataSourceImpl.loadMetadataFromFile( + 123, new ConcurrentHashMap(), "no/such/file", + PhoneNumberUtil.DEFAULT_METADATA_LOADER); fail("expected exception"); } catch (RuntimeException e) { assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_123")); diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java index 4f6bcaf5..e5313c7b 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java @@ -17,11 +17,11 @@ package com.google.i18n.phonenumbers; import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; +import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource; -import com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; import java.util.ArrayList; import java.util.List; @@ -132,77 +132,81 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertNull(phoneUtil.getMetadataForNonGeographicalRegion(-1)); } - private boolean exactlySame(PhoneNumberDesc first, PhoneNumberDesc second) { - return first.nationalNumberPattern.equals(second.nationalNumberPattern) && - first.possibleNumberPattern.equals(second.possibleNumberPattern) && - first.exampleNumber.equals(second.exampleNumber); - } - public void testGetInstanceLoadUSMetadata() { PhoneMetadata metadata = phoneUtil.getMetadataForRegion(RegionCode.US); - assertEquals("US", metadata.id); - assertEquals(1, metadata.countryCode); - assertEquals("011", metadata.internationalPrefix); - assertTrue(!metadata.nationalPrefix.equals("")); - assertEquals(2, metadata.numberFormat.length); + assertEquals("US", metadata.getId()); + assertEquals(1, metadata.getCountryCode()); + assertEquals("011", metadata.getInternationalPrefix()); + assertTrue(metadata.hasNationalPrefix()); + assertEquals(2, metadata.numberFormatSize()); assertEquals("(\\d{3})(\\d{3})(\\d{4})", - metadata.numberFormat[1].pattern); - assertEquals("$1 $2 $3", metadata.numberFormat[1].format); + metadata.getNumberFormat(1).getPattern()); + assertEquals("$1 $2 $3", metadata.getNumberFormat(1).getFormat()); assertEquals("[13-689]\\d{9}|2[0-35-9]\\d{8}", - metadata.generalDesc.nationalNumberPattern); - assertEquals("\\d{7}(?:\\d{3})?", metadata.generalDesc.possibleNumberPattern); - assertTrue(exactlySame(metadata.generalDesc, metadata.fixedLine)); - assertEquals("\\d{10}", metadata.tollFree.possibleNumberPattern); - assertEquals("900\\d{7}", metadata.premiumRate.nationalNumberPattern); + metadata.getGeneralDesc().getNationalNumberPattern()); + assertEquals("\\d{7}(?:\\d{3})?", metadata.getGeneralDesc().getPossibleNumberPattern()); + assertTrue(metadata.getGeneralDesc().exactlySameAs(metadata.getFixedLine())); + assertEquals("\\d{10}", metadata.getTollFree().getPossibleNumberPattern()); + assertEquals(10, metadata.getGeneralDesc().getPossibleLength(0)); + // Possible lengths are the same as the general description, so aren't stored separately in the + // toll free element as well. + assertEquals(0, metadata.getTollFree().getPossibleLengthCount()); + assertEquals("900\\d{7}", metadata.getPremiumRate().getNationalNumberPattern()); // No shared-cost data is available, so it should be initialised to "NA". - assertEquals("NA", metadata.sharedCost.nationalNumberPattern); - assertEquals("NA", metadata.sharedCost.possibleNumberPattern); + assertEquals("NA", metadata.getSharedCost().getNationalNumberPattern()); + assertEquals("NA", metadata.getSharedCost().getPossibleNumberPattern()); } public void testGetInstanceLoadDEMetadata() { PhoneMetadata metadata = phoneUtil.getMetadataForRegion(RegionCode.DE); - assertEquals("DE", metadata.id); - assertEquals(49, metadata.countryCode); - assertEquals("00", metadata.internationalPrefix); - assertEquals("0", metadata.nationalPrefix); - assertEquals(6, metadata.numberFormat.length); - assertEquals(1, metadata.numberFormat[5].leadingDigitsPattern.length); - assertEquals("900", metadata.numberFormat[5].leadingDigitsPattern[0]); + assertEquals("DE", metadata.getId()); + assertEquals(49, metadata.getCountryCode()); + assertEquals("00", metadata.getInternationalPrefix()); + assertEquals("0", metadata.getNationalPrefix()); + assertEquals(6, metadata.numberFormatSize()); + assertEquals(1, metadata.getNumberFormat(5).leadingDigitsPatternSize()); + assertEquals("900", metadata.getNumberFormat(5).getLeadingDigitsPattern(0)); assertEquals("(\\d{3})(\\d{3,4})(\\d{4})", - metadata.numberFormat[5].pattern); - assertEquals("$1 $2 $3", metadata.numberFormat[5].format); - assertEquals("(?:[24-6]\\d{2}|3[03-9]\\d|[789](?:[1-9]\\d|0[2-9]))\\d{1,8}", - metadata.fixedLine.nationalNumberPattern); - assertEquals("\\d{2,14}", metadata.fixedLine.possibleNumberPattern); - assertEquals("30123456", metadata.fixedLine.exampleNumber); - assertEquals("\\d{10}", metadata.tollFree.possibleNumberPattern); - assertEquals("900([135]\\d{6}|9\\d{7})", metadata.premiumRate.nationalNumberPattern); + metadata.getNumberFormat(5).getPattern()); + assertEquals("$1 $2 $3", metadata.getNumberFormat(5).getFormat()); + assertEquals(2, metadata.getGeneralDesc().getPossibleLengthLocalOnlyCount()); + assertEquals(8, metadata.getGeneralDesc().getPossibleLengthCount()); + // Nothing is present for fixed-line, since it is the same as the general desc, so for + // efficiency reasons we don't store an extra value. + assertEquals(0, metadata.getFixedLine().getPossibleLengthCount()); + assertEquals(2, metadata.getMobile().getPossibleLengthCount()); + assertEquals("(?:[24-6]\\d{2}|3[03-9]\\d|[789](?:0[2-9]|[1-9]\\d))\\d{1,8}", + metadata.getFixedLine().getNationalNumberPattern()); + assertEquals("\\d{2,14}", metadata.getFixedLine().getPossibleNumberPattern()); + assertEquals("30123456", metadata.getFixedLine().getExampleNumber()); + assertEquals("\\d{10}", metadata.getTollFree().getPossibleNumberPattern()); + assertEquals("900([135]\\d{6}|9\\d{7})", metadata.getPremiumRate().getNationalNumberPattern()); } public void testGetInstanceLoadARMetadata() { PhoneMetadata metadata = phoneUtil.getMetadataForRegion(RegionCode.AR); - assertEquals("AR", metadata.id); - assertEquals(54, metadata.countryCode); - assertEquals("00", metadata.internationalPrefix); - assertEquals("0", metadata.nationalPrefix); - assertEquals("0(?:(11|343|3715)15)?", metadata.nationalPrefixForParsing); - assertEquals("9$1", metadata.nationalPrefixTransformRule); - assertEquals("$2 15 $3-$4", metadata.numberFormat[2].format); + assertEquals("AR", metadata.getId()); + assertEquals(54, metadata.getCountryCode()); + assertEquals("00", metadata.getInternationalPrefix()); + assertEquals("0", metadata.getNationalPrefix()); + assertEquals("0(?:(11|343|3715)15)?", metadata.getNationalPrefixForParsing()); + assertEquals("9$1", metadata.getNationalPrefixTransformRule()); + assertEquals("$2 15 $3-$4", metadata.getNumberFormat(2).getFormat()); assertEquals("(9)(\\d{4})(\\d{2})(\\d{4})", - metadata.numberFormat[3].pattern); + metadata.getNumberFormat(3).getPattern()); assertEquals("(9)(\\d{4})(\\d{2})(\\d{4})", - metadata.intlNumberFormat[3].pattern); - assertEquals("$1 $2 $3 $4", metadata.intlNumberFormat[3].format); + metadata.getIntlNumberFormat(3).getPattern()); + assertEquals("$1 $2 $3 $4", metadata.getIntlNumberFormat(3).getFormat()); } public void testGetInstanceLoadInternationalTollFreeMetadata() { PhoneMetadata metadata = phoneUtil.getMetadataForNonGeographicalRegion(800); - assertEquals("001", metadata.id); - assertEquals(800, metadata.countryCode); - assertEquals("$1 $2", metadata.numberFormat[0].format); - assertEquals("(\\d{4})(\\d{4})", metadata.numberFormat[0].pattern); - assertEquals("12345678", metadata.generalDesc.exampleNumber); - assertEquals("12345678", metadata.tollFree.exampleNumber); + assertEquals("001", metadata.getId()); + assertEquals(800, metadata.getCountryCode()); + assertEquals("$1 $2", metadata.getNumberFormat(0).getFormat()); + assertEquals("(\\d{4})(\\d{4})", metadata.getNumberFormat(0).getPattern()); + assertEquals("12345678", metadata.getGeneralDesc().getExampleNumber()); + assertEquals("12345678", metadata.getTollFree().getExampleNumber()); } public void testIsNumberGeographical() { @@ -210,6 +214,10 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertTrue(phoneUtil.isNumberGeographical(AU_NUMBER)); // Australian fixed line number. assertFalse(phoneUtil.isNumberGeographical(INTERNATIONAL_TOLL_FREE)); // International toll // free number. + // We test that mobile phone numbers in relevant regions are indeed considered geographical. + assertTrue(phoneUtil.isNumberGeographical(AR_MOBILE)); // Argentina, mobile phone number. + assertTrue(phoneUtil.isNumberGeographical(MX_MOBILE1)); // Mexico, mobile phone number. + assertTrue(phoneUtil.isNumberGeographical(MX_MOBILE2)); // Mexico, another mobile phone number. } public void testIsLeadingZeroPossible() { @@ -231,12 +239,16 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { // Google London, which has area code "20". assertEquals(2, phoneUtil.getLengthOfGeographicalAreaCode(GB_NUMBER)); - // A UK mobile phone, which has no area code. + // A mobile number in the UK does not have an area code (by default, mobile numbers do not, + // unless they have been added to our list of exceptions). assertEquals(0, phoneUtil.getLengthOfGeographicalAreaCode(GB_MOBILE)); // Google Buenos Aires, which has area code "11". assertEquals(2, phoneUtil.getLengthOfGeographicalAreaCode(AR_NUMBER)); + // A mobile number in Argentina also has an area code. + assertEquals(3, phoneUtil.getLengthOfGeographicalAreaCode(AR_MOBILE)); + // Google Sydney, which has area code "2". assertEquals(1, phoneUtil.getLengthOfGeographicalAreaCode(AU_NUMBER)); @@ -251,6 +263,10 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { // An international toll free number, which has no area code. assertEquals(0, phoneUtil.getLengthOfGeographicalAreaCode(INTERNATIONAL_TOLL_FREE)); + + // A mobile number from China is geographical, but does not have an area code. + PhoneNumber cnMobile = new PhoneNumber().setCountryCode(86).setNationalNumber(18912341234L); + assertEquals(0, phoneUtil.getLengthOfGeographicalAreaCode(cnMobile)); } public void testGetLengthOfNationalDestinationCode() { @@ -287,6 +303,11 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { // An international toll free number, which has NDC "1234". assertEquals(4, phoneUtil.getLengthOfNationalDestinationCode(INTERNATIONAL_TOLL_FREE)); + + // A mobile number from China is geographical, but does not have an area code: however it still + // can be considered to have a national destination code. + PhoneNumber cnMobile = new PhoneNumber().setCountryCode(86).setNationalNumber(18912341234L); + assertEquals(3, phoneUtil.getLengthOfNationalDestinationCode(cnMobile)); } public void testGetCountryMobileToken() { @@ -330,7 +351,17 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { PhoneNumberUtil.PhoneNumberType.MOBILE)); // RegionCode 001 is reserved for supporting non-geographical country calling code. We don't // support getting an example number for it with this method. - assertEquals(null, phoneUtil.getExampleNumber(RegionCode.UN001)); + assertNull(phoneUtil.getExampleNumber(RegionCode.UN001)); + } + + public void testGetInvalidExampleNumber() { + // RegionCode 001 is reserved for supporting non-geographical country calling codes. We don't + // support getting an invalid example number for it with getInvalidExampleNumber. + assertNull(phoneUtil.getInvalidExampleNumber(RegionCode.UN001)); + assertNull(phoneUtil.getInvalidExampleNumber(RegionCode.CS)); + PhoneNumber usInvalidNumber = phoneUtil.getInvalidExampleNumber(RegionCode.US); + assertEquals(1, usInvalidNumber.getCountryCode()); + assertFalse(usInvalidNumber.getNationalNumber() == 0); } public void testGetExampleNumberForNonGeoEntity() { @@ -338,6 +369,13 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertEquals(UNIVERSAL_PREMIUM_RATE, phoneUtil.getExampleNumberForNonGeoEntity(979)); } + public void testGetExampleNumberWithoutRegion() { + // In our test metadata we don't cover all types: in our real metadata, we do. + assertNotNull(phoneUtil.getExampleNumberForType(PhoneNumberUtil.PhoneNumberType.FIXED_LINE)); + assertNotNull(phoneUtil.getExampleNumberForType(PhoneNumberUtil.PhoneNumberType.MOBILE)); + assertNotNull(phoneUtil.getExampleNumberForType(PhoneNumberUtil.PhoneNumberType.PREMIUM_RATE)); + } + public void testConvertAlphaCharactersInNumber() { String input = "1800-ABC-DEF"; // Alpha chars are converted to digits; everything else is left untouched. @@ -815,8 +853,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { public void testFormatByPattern() { NumberFormat newNumFormat = new NumberFormat(); - newNumFormat.pattern = "(\\d{3})(\\d{3})(\\d{4})"; - newNumFormat.format = "($1) $2-$3"; + newNumFormat.setPattern("(\\d{3})(\\d{3})(\\d{4})"); + newNumFormat.setFormat("($1) $2-$3"); List newNumberFormats = new ArrayList(); newNumberFormats.add(newNumFormat); @@ -831,8 +869,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { // $NP is set to '1' for the US. Here we check that for other NANPA countries the US rules are // followed. - newNumFormat.nationalPrefixFormattingRule = "$NP ($FG)"; - newNumFormat.format = "$1 $2-$3"; + newNumFormat.setNationalPrefixFormattingRule("$NP ($FG)"); + newNumFormat.setFormat("$1 $2-$3"); assertEquals("1 (242) 365-1234", phoneUtil.formatByPattern(BS_NUMBER, PhoneNumberFormat.NATIONAL, newNumberFormats)); @@ -840,8 +878,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { phoneUtil.formatByPattern(BS_NUMBER, PhoneNumberFormat.INTERNATIONAL, newNumberFormats)); - newNumFormat.pattern = "(\\d{2})(\\d{5})(\\d{3})"; - newNumFormat.format = "$1-$2 $3"; + newNumFormat.setPattern("(\\d{2})(\\d{5})(\\d{3})"); + newNumFormat.setFormat("$1-$2 $3"); newNumberFormats.set(0, newNumFormat); assertEquals("02-36618 300", @@ -851,20 +889,20 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { phoneUtil.formatByPattern(IT_NUMBER, PhoneNumberFormat.INTERNATIONAL, newNumberFormats)); - newNumFormat.nationalPrefixFormattingRule = "$NP$FG"; - newNumFormat.pattern = "(\\d{2})(\\d{4})(\\d{4})"; - newNumFormat.format = "$1 $2 $3"; + newNumFormat.setNationalPrefixFormattingRule("$NP$FG"); + newNumFormat.setPattern("(\\d{2})(\\d{4})(\\d{4})"); + newNumFormat.setFormat("$1 $2 $3"); newNumberFormats.set(0, newNumFormat); assertEquals("020 7031 3000", phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL, newNumberFormats)); - newNumFormat.nationalPrefixFormattingRule = "($NP$FG)"; + newNumFormat.setNationalPrefixFormattingRule("($NP$FG)"); assertEquals("(020) 7031 3000", phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL, newNumberFormats)); - newNumFormat.nationalPrefixFormattingRule = ""; + newNumFormat.setNationalPrefixFormattingRule(""); assertEquals("20 7031 3000", phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL, newNumberFormats)); @@ -1437,9 +1475,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { public void testMaybeStripNationalPrefix() { PhoneMetadata metadata = new PhoneMetadata(); - metadata.nationalPrefixForParsing = "34"; - metadata.generalDesc = new PhoneNumberDesc(); - metadata.generalDesc.nationalNumberPattern = "\\d{4,8}"; + metadata.setNationalPrefixForParsing("34"); + metadata.setGeneralDesc(new PhoneNumberDesc().setNationalNumberPattern("\\d{4,8}")); StringBuilder numberToStrip = new StringBuilder("34356778"); String strippedNumber = "356778"; assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null)); @@ -1451,20 +1488,20 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { 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.nationalPrefixForParsing = ""; + metadata.setNationalPrefixForParsing(""); 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.nationalPrefixForParsing = "3"; + metadata.setNationalPrefixForParsing("3"); numberToStrip = new StringBuilder("3123"); strippedNumber = "3123"; 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()); + assertEquals("Should have had no change - after stripping, it wouldn't have matched " + + "the national rule.", + strippedNumber, numberToStrip.toString()); // Test extracting carrier selection code. - metadata.nationalPrefixForParsing = "0(81)?"; + metadata.setNationalPrefixForParsing("0(81)?"); numberToStrip = new StringBuilder("08122123456"); strippedNumber = "22123456"; StringBuilder carrierCode = new StringBuilder(); @@ -1474,9 +1511,9 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertEquals("Should have had national prefix and carrier code stripped.", strippedNumber, numberToStrip.toString()); // If there was a transform rule, check it was applied. - metadata.nationalPrefixTransformRule = "5$15"; + metadata.setNationalPrefixTransformRule("5$15"); // Note that a capturing group is present here. - metadata.nationalPrefixForParsing = "0(\\d{2})"; + metadata.setNationalPrefixForParsing("0(\\d{2})"); numberToStrip = new StringBuilder("031123"); String transformedNumber = "5315123"; assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null)); @@ -1651,11 +1688,10 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { try { String phoneNumber = "(1 610) 619 446"; StringBuilder numberToFill = new StringBuilder(); - assertEquals("Should not have extracted a country calling code - invalid number after " + - "extraction of uncertain country calling code.", - 0, - phoneUtil.maybeExtractCountryCode(phoneNumber, metadata, numberToFill, false, - number)); + assertEquals("Should not have extracted a country calling code - invalid number after " + + "extraction of uncertain country calling code.", + 0, + phoneUtil.maybeExtractCountryCode(phoneNumber, metadata, numberToFill, false, number)); assertFalse("Should not contain CountryCodeSource.", number.hasCountryCodeSource()); } catch (NumberParseException e) { fail("Should not have thrown an exception: " + e.toString()); @@ -1664,11 +1700,10 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { try { String phoneNumber = "(1 610) 619"; StringBuilder numberToFill = new StringBuilder(); - assertEquals("Should not have extracted a country calling code - too short number both " + - "before and after extraction of uncertain country calling code.", - 0, - phoneUtil.maybeExtractCountryCode(phoneNumber, metadata, numberToFill, true, - number)); + assertEquals("Should not have extracted a country calling code - too short number both " + + "before and after extraction of uncertain country calling code.", + 0, + phoneUtil.maybeExtractCountryCode(phoneNumber, metadata, numberToFill, true, number)); assertEquals("Did not figure out CountryCodeSource correctly", CountryCodeSource.FROM_DEFAULT_COUNTRY, number.getCountryCodeSource()); } catch (NumberParseException e) { @@ -1814,20 +1849,18 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { // Using a soft hyphen U+00AD. assertEquals(US_NUMBER, phoneUtil.parse("1 (650) 253\u00AD-0000", RegionCode.US)); // The whole number, including punctuation, is here represented in full-width form. - assertEquals(US_NUMBER, phoneUtil.parse("\uFF0B\uFF11\u3000\uFF08\uFF16\uFF15\uFF10\uFF09" + - "\u3000\uFF12\uFF15\uFF13\uFF0D\uFF10\uFF10\uFF10" + - "\uFF10", - RegionCode.SG)); + assertEquals(US_NUMBER, phoneUtil.parse("\uFF0B\uFF11\u3000\uFF08\uFF16\uFF15\uFF10\uFF09" + + "\u3000\uFF12\uFF15\uFF13\uFF0D\uFF10\uFF10\uFF10\uFF10", + RegionCode.SG)); // Using U+30FC dash instead. - assertEquals(US_NUMBER, phoneUtil.parse("\uFF0B\uFF11\u3000\uFF08\uFF16\uFF15\uFF10\uFF09" + - "\u3000\uFF12\uFF15\uFF13\u30FC\uFF10\uFF10\uFF10" + - "\uFF10", - RegionCode.SG)); + assertEquals(US_NUMBER, phoneUtil.parse("\uFF0B\uFF11\u3000\uFF08\uFF16\uFF15\uFF10\uFF09" + + "\u3000\uFF12\uFF15\uFF13\u30FC\uFF10\uFF10\uFF10\uFF10", + RegionCode.SG)); // Using a very strange decimal digit range (Mongolian digits). - assertEquals(US_NUMBER, phoneUtil.parse("\u1811 \u1816\u1815\u1810 " + - "\u1812\u1815\u1813 \u1810\u1810\u1810\u1810", - RegionCode.US)); + assertEquals(US_NUMBER, phoneUtil.parse("\u1811 \u1816\u1815\u1810 " + + "\u1812\u1815\u1813 \u1810\u1810\u1810\u1810", + RegionCode.US)); } public void testParseWithLeadingZero() throws Exception { diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java index edcb004c..70596787 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java @@ -329,7 +329,7 @@ public class ShortNumberInfoTest extends TestMetadataTestCase { assertEquals(ShortNumberInfo.ShortNumberCost.UNKNOWN_COST, shortInfo.getExpectedCostForRegion(parse("211", RegionCode.US), RegionCode.US)); assertFalse(shortInfo.isEmergencyNumber("211", RegionCode.CA)); - assertEquals(ShortNumberInfo.ShortNumberCost.UNKNOWN_COST, + assertEquals(ShortNumberInfo.ShortNumberCost.TOLL_FREE, shortInfo.getExpectedCostForRegion(parse("211", RegionCode.CA), RegionCode.CA)); } diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 index c8d5ffa4..cfaaeca9 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 index 87e98359..92cb48ae 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD index fd2844b8..42e2c857 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE index de5efa3b..79aeb163 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO index 7865c2f5..3b33ecc0 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR index c9c1af82..e8eee835 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU index 734279b1..ef6e385b 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB index fc3a7156..76b000cd 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR index 8bf34a1d..22841767 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS index 443033c7..301810e1 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY index d89232d9..ac429201 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA index 464bd029..3be2c449 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC index 2462f4c1..7547c46f 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN index b8329393..42970124 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX index 92a95820..7c76e172 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE index e3797a48..e55eebfd 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR index ece939db..c15c8cda 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB index 9e8ecc45..59c48618 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG index 712f683d..b20aac7b 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU index 28fdec1d..43873a44 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT index d3c00b2f..6f46a990 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP index aa055b19..14180614 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR index 49e83020..fc352035 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX index cd4593a9..9151ddc1 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ index 9a26ed1e..554b8002 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL index 7c5fc15b..da93e753 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE index 144938ce..435ecc0b 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE index 99fdf26f..7e9e68b7 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG index fa312851..1f13cb27 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US index a6c26c52..6ee41783 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT index 0852976e..aa7469b2 100644 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT and b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting b/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting deleted file mode 100644 index 82ae4a8f..00000000 Binary files a/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting and /dev/null differ -- cgit v1.2.3