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

2014-12-17 23:04:15 +00:00
parent c748832f75 50e9228493
commit 0b6e78d997
1 changed files with 1 additions and 1 deletions
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -1503,7 +1503,7 @@ public class PhoneNumberUtils
            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));