Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Author: rmcc

README.android

@@ -1,5 +1,5 @@
 URL: http://code.google.com/p/libphonenumber/
-Version: 4.9 (r473)
+Version: 5.3 (r552)
 License: Apache 2
 Description: Google Phone Number Library.
 Local Modification:

java/release_notes.txt

@@ -1,17 +1,113 @@
+Jan 08, 2013: libphonenumber-5.3
+* Code changes:
+ - Handling UAN numbers in Argentina better when dialling them locally from a
+   mobile
+* Metadata changes:
+ - Updated metadata for region code(s):
+   BE, BW, CL, CN, CO, EH, KW, MA, ML, NG, PL, SY, ZA, ZM
+ - New geocoding data for country calling code(s): 32 (en, fr, nl)
+ - Updated geocoding data for country calling code(s): 27 (en), 86 (en, zh)
+
+Dec 06, 2012: libphonenumber-5.2.2
+* Metadata changes:
+ - New metadata for region code(s): EH
+ - Updated metadata for region code(s): BR, CL, CR, IN, MA, PG, PK, RO
+ - New geocoding data for country calling code(s): 241 (en)
+
+Nov 26, 2012: libphonenumber-5.2.1
+* Metadata changes:
+ - Updated metadata for region code(s):
+   AE, AW, BF, CN, DE, JO, KE, KH, LT, MM, MU, NG, RW, SR, TR, VU
+ - New geocoding data for country calling code(s): 359 (bg, en)
+
+Oct 10, 2012: libphonenumber-5.2
+* Code changes:
+ - Adds isNumberGeographical() method.
+ - Adds getRegionCodesForCountryCode() method.
+ - Fixing issue with getSupportedGlobalNetworkCallingCodes()
+   [http://code.google.com/p/libphonenumber/issues/detail?id=202]
+ - Ensures that returned collections are unmodifiable where necessary
+   [there is a very slight risk that this may break existing users who were relying on being able
+   to modify these collections, but doing so would be breaking lots of other assumptions that this
+   library makes - if you need to modify any affected collections you must copy them first]
+* Metadata changes:
+ - Updated metadata for region code(s): DE, GR, HR, OM, SB, ZA
+ - Removed metadata for region code: AN (Netherlands Antilles)
+ - Updated geocoding data for country calling code(s): 30 (el, en)
+
+Sep 27, 2012: libphonenumber-5.1.4
+* Metadata changes:
+ - Updated metadata for region code(s): AU, EC, KH, LB, TN, US
+
+Sep 17, 2012: libphonenumber-5.1.3
+* Metadata changes:
+ - Updated metadata for region code(s): EG, LA, LB, LI, PY
+ - Updated metadata for non-geographical calling codes: 800, 808, 888, 979
+ - Updated geocoding data for country calling code(s): 98 (en), 1 (en)
+
+Sep 11, 2010: libphonenumber-5.1.2
+* Bug fix:
+ - Fixing regression in AsYouTypeFormatter where it no longer worked for numbers entered in national
+   format for countries with no national prefix, e.g. Spain.
+
+Sep 5, 2010: libphonenumber-5.1.1
+* Code changes:
+  - Added better logging/exception handling for catching cases where metadata is invalid/missing.
+
+Sep 3, 2012: libphonenumber-5.1
+* Code changes:
+ - Inserting a space after the national prefix in the AsYouTypeFormatter when formatting numbers in
+   national format, if the formatting rules for that country dictate that a space is appropriate.
+ - Format emergency numbers and short-codes as a block in the AsYouTypeFormatter.
+* Metadata changes:
+ - Updated metadata for region code(s): BF, BG, DZ, GA, IT, JP, KW, PF
+
+Aug 20, 2012: libphonenumber-5.0.3
+* Metadata changes:
+ - New alternate formatting data for country calling code(s): 43
+ - Updated metadata for region code(s): AT, BF, JO, NG, RU, SL
+ - New geocoding data for country calling code(s): 62 (en, id), 98 (fa)
+
+Aug 07, 2012: libphonenumber-5.0.2
+* Metadata changes:
+ - Updated metadata for region code(s):
+   BF, CN, DJ, IL, JO, KH, KZ, MA, MT, MV, MY, NC, NG, SD, SK, SN, TL, UZ
+ - New geocoding data for country calling code(s): 7 (ru), 98 (en)
+ - Updated geocoding data for country calling code(s): 7 (en)
+
+July 26th, 2012: libphonenumber-5.0.1
+* Metadata changes
+ - CL, DE ,IN, KR, US
+ - New geocoding data for country calling codes 40, 57, 66, 82, 91.
+ - Fixed comments for 353 (IE).
+
+July 12th, 2012: libphonenumber-5.0
+* Code changes:
+ - Support for alternate formats when finding phone numbers.
+ - Allowing two-digit numbers to be parsed if they are entered in national-format with no
+   punctuation
+* Metadata changes
+ - IL, GA
+* Other
+ - Reflowed this file to 100 char width to make it unambiguous as to what the standard should be.
+
+July 6th, 2012: libphonenumber-4.9.1
+* Metadata changes
+ - AR, BA, BF, CR, DE, EC, ES, KZ, MK, NC, NG, PF, SB, UZ, non-geo entity 882
+ - Geocoding data updates for country calling codes 54 (AR) and 81 (JP), new data for 234 (NG)
+
 June 21st, 2012: libphonenumber-4.9
 * Bug fix
- - formatInOriginalFormat fixed not to add a star sign if it was not present
-   originally.
+ - formatInOriginalFormat fixed not to add a star sign if it was not present originally.
 * Metadata changes
  - BF, CZ, ES, KW
- - Non-geographical entities with calling code 882 (BebbiCell, Maritime
-   Communications, Oration Technologies, Telespazio and Thuraya)
+ - Non-geographical entities with calling code 882 (BebbiCell, Maritime Communications, Oration
+   Technologies, Telespazio and Thuraya)
  - Geocoding data updates for country calling codes 221, 224, 226, 242, 244, 245
 * Functionality changes:
- - Minimum allowed length for a national significant number (NSN) when parsing
-   changed from 3 to 2.
- - Support parsing of RFC3966-formatted strings with an isdn-subaddress or extra
-   parameters specified.
+ - Minimum allowed length for a national significant number (NSN) when parsing changed from 3 to 2.
+ - Support parsing of RFC3966-formatted strings with an isdn-subaddress or extra parameters
+   specified.
  - Allow soft hyphen to appear in phone numbers (\u00AD)
 * Testing changes:
  - Add extra unit tests for non-geographical phone number entities
@@ -117,33 +213,31 @@ November 24th, 2011: libphonenumber-4.3
 November 10th, 2011: libphonenumber-4.2
 * Code changes
  - Providing an "exact match" isEmergencyNumber method
- - Improvement to PhoneNumberMatcher: requires national prefix to be present
-   when matching national-format numbers, unless matching for a region where it
-   is explicitly marked in the metadata that they may be omitted. Applies to
-   leniency level VALID and higher.
+ - Improvement to PhoneNumberMatcher: requires national prefix to be present when matching
+   national-format numbers, unless matching for a region where it is explicitly marked in the
+   metadata that they may be omitted. Applies to leniency level VALID and higher.
  - Change formatNumberForMobileDialing not to modify the phoneNumber passed in.
 
 * Metadata changes
  - Emergency numbers added for all remaining countries
- - Collected data on which numbers we format with a national prefix are
-   commonly written without one and added this
+ - Collected data on which numbers we format with a national prefix are commonly written without one
+   and added this
  - Updates for AR, AT, BH, CZ, GR, IR, KM, LT, MX, PT, SE, SO, UG
  - Addition of SX (Sint Maarten)
 
 October 19th, 2011: libphonenumber-4.1
 * Code changes
- - Update code and metadata for countries with IDD "8~10" to accept phone
-   numbers where the "~" is omitted.
- - Modify formatInOriginalFormat to use raw_input (when present) when the number
-   is considered as invalid by the library.
- - Add ShortNumberUtil to deal with international short phone numbers, such as
-   short codes and emergency numbers.
+ - Update code and metadata for countries with IDD "8~10" to accept phone numbers where the "~" is
+   omitted.
+ - Modify formatInOriginalFormat to use raw_input (when present) when the number is considered as
+   invalid by the library.
+ - Add ShortNumberUtil to deal with international short phone numbers, such as short codes and
+   emergency numbers.
  - Increase the maximum phone-number length accepted when parsing (now set to
    16).
 
 * Metadata changes
- - Updates: BF, BN, CN, DE, DK, DO, FR, IN, KI, KW, MC, MD, ML, PA, QA, SB, UK,
-   WS
+ - Updates: BF, BN, CN, DE, DK, DO, FR, IN, KI, KW, MC, MD, ML, PA, QA, SB, UK, WS
  - Emergency number information also added to: AE, AF, AL, AM, AR, AT, AU, BA,
    BB, BD, BE, BG, BH, BO, BR, BY, CA, CH, CL, CN, CO, CR, CY, CZ, DE, DJ, DK,
    DO, DZ, EC, EE, EG, ES, FI, FJ, FO, FR, GB, GE, GF, GH, GI, GL, GR, GT, GY,
@@ -155,10 +249,9 @@ October 19th, 2011: libphonenumber-4.1
 
 October 6th, 2011: libphonenumber-4.0
 * Code changes
- - New function formatNumberForMobileDialing, which attempts to format a number in
-   such a way that the call can be connected from a mobile phone. If this is
-   impossible, for example for numbers that cannot be internationally dialled,
-   then an empty string is returned.
+ - New function formatNumberForMobileDialing, which attempts to format a number in such a way that
+   the call can be connected from a mobile phone. If this is impossible, for example for numbers
+   that cannot be internationally dialled, then an empty string is returned.
  - Fallback functionality to English for non-CJK languages for geocoding
 
 * Metadata changes
@@ -172,8 +265,7 @@ September 13th, 2011: libphonenumber-3.9
  - Enable AsYouTypeFormatter to handle long IDD and NDD.
  - Allow the presence of an IDD following a +.
  - Fix formatting of phone numbers which contain only 0s in the national number.
- - Refactored some code in geocoding including AreaCodeMap and the storage
-   strategies.
+ - Refactored some code in geocoding including AreaCodeMap and the storage strategies.
 
 * Metadata changes
  - Updates: AM, BE, BH, BJ, BR, BT, BZ, CI, CL, CN, DE, DK, DM, DZ, EC, EG, FJ,
@@ -188,16 +280,14 @@ August 11th, 2011: libphonenumber-3.8
 * Code changes
  - Fix to demo to not throw null-ptr exceptions for invalid NANPA numbers
  - Fixed AYTF to not accept plus signs in the middle of input
- - PhoneNumberMatcher improvements - added STRICT_GROUPING and EXACT_GROUPING
-   levels, numbers followed/preceded by a currency symbol will not match,
-   multiple numbers separated by phone-number punctuation will now match. ", "
-   is no longer accepted as an extension symbol when matching, only when
-   parsing. "x" is only accepted as a carrier code or extension marker, not
-   otherwise.
- - Changes to handling of leading zeroes - these will not be silently ignored
-   anymore, but will be stored as part of the number.
- - PhoneNumberOfflineGeocoder - new method to get the description of a number that assumes
-   the validity of the number has already been checked and will not re-verify it.
+ - PhoneNumberMatcher improvements - added STRICT_GROUPING and EXACT_GROUPING levels, numbers
+   followed/preceded by a currency symbol will not match, multiple numbers separated by phone-number
+   punctuation will now match. ", " is no longer accepted as an extension symbol when matching, only
+   when parsing. "x" is only accepted as a carrier code or extension marker, not otherwise.
+ - Changes to handling of leading zeroes - these will not be silently ignored anymore, but will be
+   stored as part of the number.
+ - PhoneNumberOfflineGeocoder - new method to get the description of a number that assumes the
+   validity of the number has already been checked and will not re-verify it.
  - Split geocoding US binary data into multiple files.
 
 * Metadata changes
@@ -455,16 +545,16 @@ August 16th, 2010
 August 4th, 2010
 * Further improve startup performance
   - Preload no country specific metadata at startup.
-  - Stop creating the file containing mapping from country calling code to region code
-    and loading it at startup; instead, do the initialization in PhoneNumberUtil.
+  - Stop creating the file containing mapping from country calling code to region code and loading
+    it at startup; instead, do the initialization in PhoneNumberUtil.
 
 July 31th, 2010
 
 * Improve startup performance
   - Separate generated metadata binary file to one file per region
   - Preload US at start up, and load other region at the time when needed
-  - Create a file containing mapping from country calling code to region code,
-    and load it at startup
+  - Create a file containing mapping from country calling code to region code, and load it at
+    startup
   - Same change also applied to unittests
 
 July 30th, 2010

java/src/com/android/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+/* This file is automatically generated by {@link BuildMetadataProtoFromXml}.
+ * Please don't modify it directly.
+ */
+
+package com.android.i18n.phonenumbers;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class AlternateFormatsCountryCodeSet {
+  // A set of all country codes for which data is available.
+  static Set<Integer> getCountryCodeSet() {
+    // The capacity is set to 8 as there are 6 different country codes,
+    // and this offers a load factor of roughly 0.75.
+    Set<Integer> countryCodeSet = new HashSet<Integer>(8);
+
+    countryCodeSet.add(43);
+    countryCodeSet.add(44);
+    countryCodeSet.add(49);
+    countryCodeSet.add(55);
+    countryCodeSet.add(61);
+    countryCodeSet.add(81);
+
+    return countryCodeSet;
+  }
+}