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

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

Browse Source 
automerge: f19176f

* commit 'f19176ff2f1deb672172f953626fabc45304d435':
  Add + code handling logic for SMS Global Roaming
This commit is contained in:
Robert Greenwalt
2015-01-21 19:56:25 +00:00
committed by android-build-merger
parent ad55787db2 f19176ff2f
commit b73f431ddd
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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