diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2015-02-02 17:29:21 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-02 17:29:21 +0000 |
commit | 21475c6a92b893f5d078ba23f06f0be6edaaacbd (patch) | |
tree | bc1eabaa0fe8a4fe61a57847b7df986e8b8ca75e | |
parent | 736cb492aea736e9c3b33fe20285f531497462d0 (diff) | |
parent | 0cdd4560dac5784dda169863eb844d489bdc79d5 (diff) | |
download | frameworks_base-21475c6a92b893f5d078ba23f06f0be6edaaacbd.zip frameworks_base-21475c6a92b893f5d078ba23f06f0be6edaaacbd.tar.gz frameworks_base-21475c6a92b893f5d078ba23f06f0be6edaaacbd.tar.bz2 |
am 0cdd4560: am fabf0e0b: Merge "Fixing up the formatting code which is already merged"
* commit '0cdd4560dac5784dda169863eb844d489bdc79d5':
-rw-r--r-- | telephony/java/android/telephony/PhoneNumberUtils.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index 8f883c2..0ac56aa 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -2360,11 +2360,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; } |