summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2011-06-24 12:32:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-24 12:32:04 -0700
commitb81b1c91d81eb7f5706d3e16c6f0a3512596f16b (patch)
tree5ee59ed1d24e943e9df72ee8b8b3eb868f321964 /telephony
parenta54a600bc41c8ac760f85333b0c562cdc6770531 (diff)
parent5b0b167f7fd74d8e238508badb0af2cd6038d522 (diff)
downloadframeworks_base-b81b1c91d81eb7f5706d3e16c6f0a3512596f16b.zip
frameworks_base-b81b1c91d81eb7f5706d3e16c6f0a3512596f16b.tar.gz
frameworks_base-b81b1c91d81eb7f5706d3e16c6f0a3512596f16b.tar.bz2
Merge "Uppercase region code so that AsYouTypeFormatter works correctly."
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java
index ffabb7b..dea67f3 100644
--- a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java
+++ b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java
@@ -94,6 +94,9 @@ public class PhoneNumberFormattingTextWatcher implements TextWatcher {
*/
public PhoneNumberFormattingTextWatcher(String countryCode) {
if (countryCode == null) throw new IllegalArgumentException();
+ // TODO: remove this once CountryDetector.detectCountry().getCountryIso() is fixed to always
+ // return uppercase. Tracked at b/4941319.
+ countryCode = countryCode.toUpperCase(Locale.ENGLISH);
mFormatter = PhoneNumberUtil.getInstance().getAsYouTypeFormatter(countryCode);
}