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

automerge: 21475c6 * commit '21475c6a92b893f5d078ba23f06f0be6edaaacbd':
2015-02-02 17:33:09 +00:00
parent 2c56fde04d 21475c6a92
commit af7454bafb
1 changed files with 3 additions and 3 deletions
--- 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;
    }