am fabf0e0b: Merge "Fixing up the formatting code which is already merged"

* commit 'fabf0e0ba84e0cd28f459360b20386e68179cc31':
This commit is contained in:
Robert Greenwalt
2015-02-02 17:16:32 +00:00
committed by Android Git Automerger

View File

@@ -2286,11 +2286,11 @@ public class PhoneNumberUtils
private static String getCurrentIdp(boolean useNanp) { private static String getCurrentIdp(boolean useNanp) {
String ps = null; String ps = null;
if(useNanp) if (useNanp) {
ps = NANP_IDP_STRING; ps = NANP_IDP_STRING;
else{ } else {
// in case, there is no IDD is found, we shouldn't convert it. // 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; return ps;
} }