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

Commit ef4603b8 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

Change-Id: Id925287536c2ed08591c4422bd661fa7cb62d29c
parents 168b46e8 bb841b97
Loading
Loading
Loading
Loading
+6 −1
Original line number Original line Diff line number Diff line
@@ -632,11 +632,16 @@ public class GsmCdmaPhone extends Phone {
        intent.putExtra(PhoneConstants.PHONE_IN_ECM_STATE, isInEcm());
        intent.putExtra(PhoneConstants.PHONE_IN_ECM_STATE, isInEcm());
        SubscriptionManager.putPhoneIdAndSubIdExtra(intent, getPhoneId());
        SubscriptionManager.putPhoneIdAndSubIdExtra(intent, getPhoneId());
        ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL);
        ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL);
        if (DBG) logd("sendEmergencyCallbackModeChange");
        logi("sendEmergencyCallbackModeChange");
    }
    }


    @Override
    @Override
    public void sendEmergencyCallStateChange(boolean callActive) {
    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) {
        if (mBroadcastEmergencyCallStateChanges) {
            Intent intent = new Intent(TelephonyIntents.ACTION_EMERGENCY_CALL_STATE_CHANGED);
            Intent intent = new Intent(TelephonyIntents.ACTION_EMERGENCY_CALL_STATE_CHANGED);
            intent.putExtra(PhoneConstants.PHONE_IN_EMERGENCY_CALL, callActive);
            intent.putExtra(PhoneConstants.PHONE_IN_EMERGENCY_CALL, callActive);