Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed9b90ad authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'LA.UM.5.5.r1-00900-8x96.0' of... 

Merge tag 'LA.UM.5.5.r1-00900-8x96.0' of git://codeaurora.org/platform/frameworks/opt/telephony into cm-14.0

"LA.UM.5.5.r1-00900-8x96.0"
parents d8f2d87b a4dec372

src/java/com/android/internal/telephony/GsmCdmaConnection.java

+12 −2
Original line number Diff line number Diff line
@@ -152,9 +152,19 @@ public class GsmCdmaConnection extends Connection { 
        mOwner = ct;

        mHandler = new MyHandler(mOwner.getLooper());



        if (isPhoneTypeGsm()) {

        boolean showOrigDialString = false;

        if (phone != null) {

            CarrierConfigManager configManager = (CarrierConfigManager)phone.getContext().

                    getSystemService(Context.CARRIER_CONFIG_SERVICE);

            PersistableBundle pb = configManager.getConfigForSubId(phone.getSubId());

            if (pb != null) {

                showOrigDialString = pb.getBoolean("config_show_orig_dial_string_for_cdma");

            }

        }

        if (isPhoneTypeGsm() || showOrigDialString) {

            mDialString = dialString;

        } else {

        }

        if (!isPhoneTypeGsm()) {

            Rlog.d(LOG_TAG, "[GsmCdmaConn] GsmCdmaConnection: dialString=" + maskDialString(dialString));

            dialString = formatDialString(dialString);

            Rlog.d(LOG_TAG,