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

    }

    }

    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;

    }

    }