Merge "Add + code handling logic for SMS Global Roaming"

This commit is contained in:
Robert Greenwalt
2015-01-21 19:52:20 +00:00
committed by Gerrit Code Review

View File

@@ -2285,9 +2285,13 @@ public class PhoneNumberUtils
} }
private static String getCurrentIdp(boolean useNanp) { private static String getCurrentIdp(boolean useNanp) {
String ps = null;
if(useNanp)
ps = NANP_IDP_STRING;
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.
String ps = SystemProperties.get( ps = SystemProperties.get(PROPERTY_OPERATOR_IDP_STRING, PLUS_SIGN_STRING);
PROPERTY_OPERATOR_IDP_STRING, useNanp ? NANP_IDP_STRING : PLUS_SIGN_STRING); }
return ps; return ps;
} }