commit 52f25f7b30b684a46814cff60538e6a7636ed618
author Robert Greenwalt <rgreenwalt@google.com> Wed Jan 21 20:01:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 21 20:01:50 2015 +0000
tree 06ee1503dc5c5caf6e136aaace23a20036fcd0d9
parent f6b4b1a43253d5ea94763cf9750224c7b7b618c0
parent b73f431dddc0ba9260a342f2322e818460cf6f34

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

* commit 'b73f431dddc0ba9260a342f2322e818460cf6f34':
  Add + code handling logic for SMS Global Roaming

telephony/java/android/telephony/PhoneNumberUtils.java

diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index ba07a95..7ab189c 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -2361,9 +2361,13 @@
     }
 
     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;
     }