summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2014-12-17 23:04:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-17 23:04:17 +0000
commit0b6e78d9971c61877ca312801fd8258aec352231 (patch)
tree35168b6a4dab38bccc9947d5877dd419d284e9f6 /telephony/java
parentc748832f759cd7a390a32890530e854b9711eb7c (diff)
parent50e922849399f12d2411a29b2199d8202087492d (diff)
downloadframeworks_base-0b6e78d9971c61877ca312801fd8258aec352231.zip
frameworks_base-0b6e78d9971c61877ca312801fd8258aec352231.tar.gz
frameworks_base-0b6e78d9971c61877ca312801fd8258aec352231.tar.bz2
Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/PhoneNumberUtils.java2
1 files changed, 1 insertions, 1 deletions
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 @@ 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));