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

Commit 7e7dcbcc authored by Brad Ebinger's avatar Brad Ebinger Committed by Android (Google) Code Review
Browse files

Merge "Do not always trigger CarrierConfig change in GsmCdmaPhone" into qt-dev

parents 04957f01 da22252d

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

+4 −1
Original line number Diff line number Diff line
@@ -284,7 +284,10 @@ public class GsmCdmaPhone extends Phone { 
            Rlog.d(LOG_TAG, "mBroadcastReceiver: action " + intent.getAction());

            String action = intent.getAction();

            if (CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED.equals(action)) {

                // Only handle carrier config changes for this phone id.

                if (mPhoneId == intent.getIntExtra(CarrierConfigManager.EXTRA_SLOT_INDEX, -1)) {

                    sendMessage(obtainMessage(EVENT_CARRIER_CONFIG_CHANGED));

                }

            } else if (TelecomManager.ACTION_CURRENT_TTY_MODE_CHANGED.equals(action)) {

                int ttyMode = intent.getIntExtra(

                        TelecomManager.EXTRA_CURRENT_TTY_MODE, TelecomManager.TTY_MODE_OFF);