Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent f6b4b1a432 b73f431ddd
commit 52f25f7b30
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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