Renaming com.google.i18n.phonenumbers to com.android.i18n.phonenumbers
to avoid name collision.
Bug: 5157607
Change-Id: Ia4b0a0a9be4b07f0dc3924b59388132f06e7c9d5
diff --git a/README.android b/README.android
index c4602c7..dcaecf8 100644
--- a/README.android
+++ b/README.android
@@ -2,3 +2,5 @@
Version: 3.7.1 (r303)
License: Apache 2
Description: Google Phone Number Library.
+Local Modification:
+ * Package renamed from com.google.i18n.phonenumbers to com.android.i18n.phonenumbers
diff --git a/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
index e175eda..fe5bbac 100644
--- a/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
+++ b/java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
-import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat;
-import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
+import com.android.i18n.phonenumbers.Phonemetadata.NumberFormat;
+import com.android.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java b/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
index 07fd3e9..c481f1a 100644
--- a/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
+++ b/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
@@ -18,7 +18,7 @@
* Please don't modify it directly.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/java/src/com/google/i18n/phonenumbers/NumberParseException.java b/java/src/com/google/i18n/phonenumbers/NumberParseException.java
index 78c6701..598723d 100644
--- a/java/src/com/google/i18n/phonenumbers/NumberParseException.java
+++ b/java/src/com/google/i18n/phonenumbers/NumberParseException.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
/**
* Generic exception class for errors encountered when parsing phone numbers.
diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java b/java/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java
index e994959..ac51111 100644
--- a/java/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java
+++ b/java/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
import java.util.Arrays;
diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java b/java/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
index c8a7651..6a4ca35 100644
--- a/java/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
+++ b/java/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
-import com.google.i18n.phonenumbers.PhoneNumberUtil.Leniency;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.android.i18n.phonenumbers.PhoneNumberUtil.Leniency;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
import java.lang.Character.UnicodeBlock;
import java.util.Iterator;
diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
index bb2bf38..0036333 100644
--- a/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
-import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat;
-import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
-import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection;
-import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource;
+import com.android.i18n.phonenumbers.Phonemetadata.NumberFormat;
+import com.android.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
+import com.android.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection;
+import com.android.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource;
import java.io.IOException;
import java.io.InputStream;
@@ -1761,10 +1761,10 @@
}
/**
- * Gets an {@link com.google.i18n.phonenumbers.AsYouTypeFormatter} for the specific region.
+ * Gets an {@link com.android.i18n.phonenumbers.AsYouTypeFormatter} for the specific region.
*
* @param regionCode the region where the phone number is being entered
- * @return an {@link com.google.i18n.phonenumbers.AsYouTypeFormatter} object, which can be used
+ * @return an {@link com.android.i18n.phonenumbers.AsYouTypeFormatter} object, which can be used
* to format phone numbers in the specific region "as you type"
*/
public AsYouTypeFormatter getAsYouTypeFormatter(String regionCode) {
@@ -2054,7 +2054,7 @@
/**
* 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
+ * {@link com.android.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}.
*
diff --git a/java/src/com/google/i18n/phonenumbers/Phonemetadata.java b/java/src/com/google/i18n/phonenumbers/Phonemetadata.java
index 34afaff..3642b34 100644
--- a/java/src/com/google/i18n/phonenumbers/Phonemetadata.java
+++ b/java/src/com/google/i18n/phonenumbers/Phonemetadata.java
@@ -20,7 +20,7 @@
* for detailed descriptions of the meaning of each field.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
import java.io.Externalizable;
import java.io.IOException;
diff --git a/java/src/com/google/i18n/phonenumbers/Phonenumber.java b/java/src/com/google/i18n/phonenumbers/Phonenumber.java
index 3d59d52..86afef1 100644
--- a/java/src/com/google/i18n/phonenumbers/Phonenumber.java
+++ b/java/src/com/google/i18n/phonenumbers/Phonenumber.java
@@ -20,7 +20,7 @@
* descriptions of the meaning of each field.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
import java.io.Serializable;
diff --git a/java/src/com/google/i18n/phonenumbers/RegexCache.java b/java/src/com/google/i18n/phonenumbers/RegexCache.java
index f3e4684..43f7a01 100644
--- a/java/src/com/google/i18n/phonenumbers/RegexCache.java
+++ b/java/src/com/google/i18n/phonenumbers/RegexCache.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java b/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java
index 8b746e3..3396881 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java
+++ b/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMap.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers.geocoding;
+package com.android.i18n.phonenumbers.geocoding;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.android.i18n.phonenumbers.PhoneNumberUtil;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
import java.io.ByteArrayOutputStream;
import java.io.Externalizable;
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java b/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java
index 65fb2bd..6ea90b3 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java
+++ b/java/src/com/google/i18n/phonenumbers/geocoding/AreaCodeMapStorageStrategy.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers.geocoding;
+package com.android.i18n.phonenumbers.geocoding;
import java.io.IOException;
import java.io.ObjectInput;
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/DefaultMapStorage.java b/java/src/com/google/i18n/phonenumbers/geocoding/DefaultMapStorage.java
index 03dfa15..7be0824 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/DefaultMapStorage.java
+++ b/java/src/com/google/i18n/phonenumbers/geocoding/DefaultMapStorage.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers.geocoding;
+package com.android.i18n.phonenumbers.geocoding;
import java.io.IOException;
import java.io.ObjectInput;
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorage.java b/java/src/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorage.java
index abdf7c5..2745fae 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorage.java
+++ b/java/src/com/google/i18n/phonenumbers/geocoding/FlyweightMapStorage.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers.geocoding;
+package com.android.i18n.phonenumbers.geocoding;
import java.io.IOException;
import java.io.ObjectInput;
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/MappingFileProvider.java b/java/src/com/google/i18n/phonenumbers/geocoding/MappingFileProvider.java
index 4f04a5d..2c294c4 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/MappingFileProvider.java
+++ b/java/src/com/google/i18n/phonenumbers/geocoding/MappingFileProvider.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers.geocoding;
+package com.android.i18n.phonenumbers.geocoding;
import java.io.Externalizable;
import java.io.IOException;
diff --git a/java/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java b/java/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
index ce1ab47..3ce96ac 100644
--- a/java/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
+++ b/java/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers.geocoding;
+package com.android.i18n.phonenumbers.geocoding;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.android.i18n.phonenumbers.PhoneNumberUtil;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
import java.io.IOException;
import java.io.InputStream;
diff --git a/java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java b/java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
index 183dc6d..4391f15 100644
--- a/java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
+++ b/java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
import junit.framework.TestCase;
diff --git a/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java b/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java
index 45d352b..8761a3d 100644
--- a/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java
+++ b/java/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java
@@ -18,7 +18,7 @@
* Please don't modify it directly.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/java/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java b/java/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java
index 776bb22..5800049 100644
--- a/java/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java
+++ b/java/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers;
+package com.android.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.android.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberType;
+import com.android.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
import junit.framework.TestCase;
diff --git a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatchTest.java b/java/test/com/google/i18n/phonenumbers/PhoneNumberMatchTest.java
index 6e19487..b54ff57 100644
--- a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatchTest.java
+++ b/java/test/com/google/i18n/phonenumbers/PhoneNumberMatchTest.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
import junit.framework.TestCase;
diff --git a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java b/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java
index 1f4d5fb..492a20d 100644
--- a/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java
+++ b/java/test/com/google/i18n/phonenumbers/PhoneNumberMatcherTest.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
-import com.google.i18n.phonenumbers.PhoneNumberUtil.Leniency;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.android.i18n.phonenumbers.PhoneNumberUtil.Leniency;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
import junit.framework.TestCase;
diff --git a/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
index 2da773e..db77003 100644
--- a/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
+++ b/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers;
+package com.android.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.android.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
+import com.android.i18n.phonenumbers.Phonemetadata.NumberFormat;
+import com.android.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
+import com.android.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource;
import junit.framework.TestCase;
diff --git a/java/test/com/google/i18n/phonenumbers/PhonenumberTest.java b/java/test/com/google/i18n/phonenumbers/PhonenumberTest.java
index 5f35bb0..ee93648 100644
--- a/java/test/com/google/i18n/phonenumbers/PhonenumberTest.java
+++ b/java/test/com/google/i18n/phonenumbers/PhonenumberTest.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource;
import junit.framework.TestCase;
diff --git a/java/test/com/google/i18n/phonenumbers/RegexCacheTest.java b/java/test/com/google/i18n/phonenumbers/RegexCacheTest.java
index c0636bb..2f5fa51 100644
--- a/java/test/com/google/i18n/phonenumbers/RegexCacheTest.java
+++ b/java/test/com/google/i18n/phonenumbers/RegexCacheTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers;
+package com.android.i18n.phonenumbers;
import junit.framework.TestCase;
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/AreaCodeMapTest.java b/java/test/com/google/i18n/phonenumbers/geocoding/AreaCodeMapTest.java
index 7d17975..637d51e 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/AreaCodeMapTest.java
+++ b/java/test/com/google/i18n/phonenumbers/geocoding/AreaCodeMapTest.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers.geocoding;
+package com.android.i18n.phonenumbers.geocoding;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
import junit.framework.TestCase;
import java.io.ByteArrayInputStream;
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/MappingFileProviderTest.java b/java/test/com/google/i18n/phonenumbers/geocoding/MappingFileProviderTest.java
index 83f4f54..95b6184 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/MappingFileProviderTest.java
+++ b/java/test/com/google/i18n/phonenumbers/geocoding/MappingFileProviderTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers.geocoding;
+package com.android.i18n.phonenumbers.geocoding;
import junit.framework.TestCase;
diff --git a/java/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java b/java/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java
index ec5f9bc..ba73b35 100644
--- a/java/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java
+++ b/java/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.google.i18n.phonenumbers.geocoding;
+package com.android.i18n.phonenumbers.geocoding;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
import junit.framework.TestCase;
import java.util.Locale;