diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-01-21 20:05:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-21 20:05:30 +0000 |
| commit | fe0e33495c63542ea04be3879b97c03119c2f88b (patch) | |
| tree | 6285e0b956754638f3f35b58e4266671ee7eb5d6 /telephony | |
| parent | 4b94649ce3a57312e7a9bdbb256b5448b5bd8c32 (diff) | |
| parent | 52f25f7b30b684a46814cff60538e6a7636ed618 (diff) | |
| download | frameworks_base-fe0e33495c63542ea04be3879b97c03119c2f88b.zip frameworks_base-fe0e33495c63542ea04be3879b97c03119c2f88b.tar.gz frameworks_base-fe0e33495c63542ea04be3879b97c03119c2f88b.tar.bz2 | |
am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f
automerge: 52f25f7
* commit '52f25f7b30b684a46814cff60538e6a7636ed618':
Add + code handling logic for SMS Global Roaming
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/PhoneNumberUtils.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index 9d2a1ec..a59505c 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -2387,9 +2387,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; } |