am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f

* commit 'b73f431dddc0ba9260a342f2322e818460cf6f34':
  Add + code handling logic for SMS Global Roaming
This commit is contained in:
Robert Greenwalt
2015-01-21 20:01:50 +00:00
committed by Android Git Automerger

View File

@@ -2361,9 +2361,13 @@ public class PhoneNumberUtils
}
private static String getCurrentIdp(boolean useNanp) {
// in case, there is no IDD is found, we shouldn't convert it.
String ps = SystemProperties.get(
PROPERTY_OPERATOR_IDP_STRING, useNanp ? NANP_IDP_STRING : PLUS_SIGN_STRING);
String ps = null;
if(useNanp)
ps = NANP_IDP_STRING;
else{
// in case, there is no IDD is found, we shouldn't convert it.
ps = SystemProperties.get(PROPERTY_OPERATOR_IDP_STRING, PLUS_SIGN_STRING);
}
return ps;
}