commit 0b6e78d9971c61877ca312801fd8258aec352231
author Raph Levien <raph@google.com> Wed Dec 17 23:04:15 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 17 23:04:17 2014 +0000
tree 35168b6a4dab38bccc9947d5877dd419d284e9f6
parent c748832f759cd7a390a32890530e854b9711eb7c
parent 50e922849399f12d2411a29b2199d8202087492d

Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev

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));