commit 26d0af637d2be7ff1a975dae76ce97b0c5b3b78a
author Jean-Baptiste Queru <jbq@google.com> Tue May 22 07:51:00 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Tue May 22 07:51:00 2012 -0700
tree 7decee94a73fcb857086f8d5c68f5f08c809b6c3
parent d470984844c388d6766c3de6ac64e93e00480fc9
parent 62bdf8b764832d1e01019e7f67ce535bfe507267

Merge "libphonenumber: Fix inability to dial 0001"

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

diff --git a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
index 16a975e..d65de33 100644
--- a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
@@ -2027,6 +2027,10 @@
   // 0 if fullNumber doesn't start with a valid country calling code, and leaves nationalNumber
   // unmodified.
   int extractCountryCode(StringBuilder fullNumber, StringBuilder nationalNumber) {
+    if ((fullNumber.length() == 0) || (fullNumber.charAt(0) == '0')) {
+      // Country codes do not begin with a '0'.
+      return 0;
+    }
     int potentialCountryCode;
     int numberLength = fullNumber.length();
     for (int i = 1; i <= MAX_LENGTH_COUNTRY_CODE && i <= numberLength; i++) {