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

telephony/java/android/telephony/PhoneNumberUtils.java

@@ -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;
     }