drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '0cdd4560dac5784dda169863eb844d489bdc79d5':
This commit is contained in:
Robert Greenwalt
2015-02-02 17:29:21 +00:00
committed by Android Git Automerger
parent 736cb492ae 0cdd4560da
commit 21475c6a92
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@ -2360,9 +2360,9 @@ 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);
} }