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

* commit '0b6e78d9971c61877ca312801fd8258aec352231':
  Preserve leading "+" in phone numbers
This commit is contained in:
Raph Levien
2014-12-17 23:09:59 +00:00
committed by Android Git Automerger

View File

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