summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2015-01-21 19:52:20 +0000
committersohryun.shin <sohryun.shin@lge.com>2015-02-02 15:04:56 +0900
commit3c6e38d3b5c7c5c209dca4f99526109e352a5392 (patch)
treee696d9a509a444470ede2006fb900179a12096aa /telephony/java
parent247e828b5cd63efeae3226c2a9d3bd1f466141dc (diff)
parenta423a279f6297bb9422fc8841651348c2fcc7b7a (diff)
downloadframeworks_base-3c6e38d3b5c7c5c209dca4f99526109e352a5392.zip
frameworks_base-3c6e38d3b5c7c5c209dca4f99526109e352a5392.tar.gz
frameworks_base-3c6e38d3b5c7c5c209dca4f99526109e352a5392.tar.bz2
Fixing up the formatting code which is already merged
I just apply google coding guide like space. Uploading the same code about + handling just apply the Google Coding Guide. The previous code is "https://android-review.googlesource.com/#/c/122770/" This code is about + plus number converting logic for international NANP. Change-Id: I23e4709294c603b387b28b3c2a56c932d838c666
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/PhoneNumberUtils.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index 30799f8..d002d9b 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -2285,9 +2285,13 @@ public class PhoneNumberUtils
}
private static String getCurrentIdp(boolean useNanp) {
- // in case, there is no IDD is found, we shouldn't convert it.
- String ps = SystemProperties.get(
- PROPERTY_OPERATOR_IDP_STRING, useNanp ? NANP_IDP_STRING : PLUS_SIGN_STRING);
+ String ps = null;
+ if (useNanp) {
+ ps = NANP_IDP_STRING;
+ } else {
+ // in case, there is no IDD is found, we shouldn't convert it.
+ ps = SystemProperties.get(PROPERTY_OPERATOR_IDP_STRING, PLUS_SIGN_STRING);
+ }
return ps;
}