summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2015-02-02 17:16:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-02 17:16:32 +0000
commit0cdd4560dac5784dda169863eb844d489bdc79d5 (patch)
tree71478ce28a197a935e3653dd23767b57ae259e9a
parent5b392ee7584688d6929ca40760d0df2a12bd0b16 (diff)
parentfabf0e0ba84e0cd28f459360b20386e68179cc31 (diff)
downloadframeworks_base-0cdd4560dac5784dda169863eb844d489bdc79d5.zip
frameworks_base-0cdd4560dac5784dda169863eb844d489bdc79d5.tar.gz
frameworks_base-0cdd4560dac5784dda169863eb844d489bdc79d5.tar.bz2
am fabf0e0b: Merge "Fixing up the formatting code which is already merged"
* commit 'fabf0e0ba84e0cd28f459360b20386e68179cc31':
-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 86015fc..d002d9b 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -2286,11 +2286,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;
}