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

Commit 30c717c9 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Ensure ACTION_EMERGENCY_CALL_STATE_CHANGED doesn't send on GSM." am: bb841b97 

am: ef4603b8

Change-Id: I4d6e49159aa311c125cb34ebcce63d0f935992ee
parents 316c2032 ef4603b8

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

+6 −1
Original line number Diff line number Diff line
@@ -632,11 +632,16 @@ public class GsmCdmaPhone extends Phone { 
        intent.putExtra(PhoneConstants.PHONE_IN_ECM_STATE, isInEcm());

        SubscriptionManager.putPhoneIdAndSubIdExtra(intent, getPhoneId());

        ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL);

        if (DBG) logd("sendEmergencyCallbackModeChange");

        logi("sendEmergencyCallbackModeChange");

    }



    @Override

    public void sendEmergencyCallStateChange(boolean callActive) {

        if (!isPhoneTypeCdma()) {

            // It possible that this method got called from ImsPhoneCallTracker#

            logi("sendEmergencyCallbackModeChange - skip for non-cdma");

            return;

        }

        if (mBroadcastEmergencyCallStateChanges) {

            Intent intent = new Intent(TelephonyIntents.ACTION_EMERGENCY_CALL_STATE_CHANGED);

            intent.putExtra(PhoneConstants.PHONE_IN_EMERGENCY_CALL, callActive);