commit af7454bafb99248caa9f02cf96195118d59afeab
author Robert Greenwalt <rgreenwalt@google.com> Mon Feb 02 17:33:09 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 02 17:33:09 2015 +0000
tree c10a5b71614f164a7ec27141efd11f25d1b163d9
parent 2c56fde04d47714fddb587fdc578c4b94830f1c3
parent 21475c6a92b893f5d078ba23f06f0be6edaaacbd

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

* commit '21475c6a92b893f5d078ba23f06f0be6edaaacbd':

telephony/java/android/telephony/PhoneNumberUtils.java

diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index 07476e3..2d874985 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -2386,11 +2386,11 @@
 
     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;
     }