summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2015-02-02 17:33:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-02 17:33:09 +0000
commitaf7454bafb99248caa9f02cf96195118d59afeab (patch)
treec10a5b71614f164a7ec27141efd11f25d1b163d9 /telephony
parent2c56fde04d47714fddb587fdc578c4b94830f1c3 (diff)
parent21475c6a92b893f5d078ba23f06f0be6edaaacbd (diff)
downloadframeworks_base-af7454bafb99248caa9f02cf96195118d59afeab.zip
frameworks_base-af7454bafb99248caa9f02cf96195118d59afeab.tar.gz
frameworks_base-af7454bafb99248caa9f02cf96195118d59afeab.tar.bz2
am 0cdd4560: am fabf0e0b: Merge "Fixing up the formatting code which is already merged"
automerge: 21475c6 * commit '21475c6a92b893f5d078ba23f06f0be6edaaacbd':
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/PhoneNumberUtils.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index 07476e3..2d87498 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -2386,11 +2386,11 @@ public class PhoneNumberUtils
private static String getCurrentIdp(boolean useNanp) {
String ps = null;
- if(useNanp)
+ if (useNanp) {
ps = NANP_IDP_STRING;
- else{
+ } else {
// in case, there is no IDD is found, we shouldn't convert it.
- ps = SystemProperties.get(PROPERTY_OPERATOR_IDP_STRING, PLUS_SIGN_STRING);
+ ps = SystemProperties.get(PROPERTY_OPERATOR_IDP_STRING, PLUS_SIGN_STRING);
}
return ps;
}