commit 28e691010f2990825c2e30ea244ba3bbac935725
author Raph Levien <raph@google.com> Wed Dec 17 23:15:07 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 17 23:15:07 2014 +0000
tree c9f8c7503b887d79b44dacf8885542d5baf65407
parent fd461edee007a654dc163b397445cd071f04caf9
parent 510042688ad8ffee499974b45551cfdf528f86da

am 51004268: am 0b6e78d9: Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev

* commit '510042688ad8ffee499974b45551cfdf528f86da':
  Preserve leading "+" in phone numbers

telephony/java/android/telephony/PhoneNumberUtils.java

diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index 4ff6389..ba07a95 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -1503,7 +1503,7 @@
             int digit = Character.digit(c, 10);
             if (digit != -1) {
                 sb.append(digit);
-            } else if (i == 0 && c == '+') {
+            } else if (sb.length() == 0 && c == '+') {
                 sb.append(c);
             } else if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
                 return normalizeNumber(PhoneNumberUtils.convertKeypadLettersToDigits(phoneNumber));