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

Commit 12cd72e9 authored by Zhihai Xu's avatar Zhihai Xu Committed by Android Git Automerger
Browse files

am 03de91b6: Media profile drop on ending the outgoing video call and music is heard locally 

* commit '03de91b6':
  Media profile drop on ending the outgoing video call and music is heard locally
parents 3f56bcb6 03de91b6

system/bta/av/bta_av_aact.c

+11 −1
Original line number Diff line number Diff line
@@ -2346,8 +2346,18 @@ void bta_av_suspend_cfm (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) 
    APPL_TRACE_DEBUG2 ("bta_av_suspend_cfm:audio_open_cnt = %d, err_code = %d",

        bta_av_cb.audio_open_cnt, err_code);



    if (p_scb->started == FALSE)

    {

        /* handle the condition where there is a collision of SUSPEND req from either side

        ** Second SUSPEND req could be rejected. Do not treat this as a failure

        */

        APPL_TRACE_WARNING1("bta_av_suspend_cfm: already suspended, ignore, err_code %d",

                            err_code);

        return;

    }



    suspend_rsp.status = BTA_AV_SUCCESS;

    if (err_code)

    if (err_code && (err_code != AVDT_ERR_BAD_STATE))

    {

         /* Disable suspend feature only with explicit rejection(not with timeout) */

        if (err_code != AVDT_ERR_TIMEOUT)

system/stack/avdt/avdt_scb.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ const UINT8 avdt_scb_st_open[][AVDT_SCB_NUM_COLS] = { 
/* MSG_GETCONFIG_RSP_EVT */ {AVDT_SCB_HDL_GETCONFIG_RSP,    AVDT_SCB_IGNORE,            AVDT_SCB_OPEN_ST},

/* MSG_OPEN_RSP_EVT */      {AVDT_SCB_IGNORE,               AVDT_SCB_IGNORE,            AVDT_SCB_OPEN_ST},

/* MSG_START_RSP_EVT */     {AVDT_SCB_HDL_START_RSP,        AVDT_SCB_IGNORE,            AVDT_SCB_STREAM_ST},

/* MSG_SUSPEND_RSP_EVT */   {AVDT_SCB_IGNORE,               AVDT_SCB_IGNORE,            AVDT_SCB_OPEN_ST},

/* MSG_SUSPEND_RSP_EVT */   {AVDT_SCB_HDL_SUSPEND_RSP,      AVDT_SCB_IGNORE,            AVDT_SCB_OPEN_ST},

/* MSG_CLOSE_RSP_EVT */     {AVDT_SCB_IGNORE,               AVDT_SCB_IGNORE,            AVDT_SCB_OPEN_ST},

/* MSG_ABORT_RSP_EVT */     {AVDT_SCB_IGNORE,               AVDT_SCB_IGNORE,            AVDT_SCB_IDLE_ST},

/* MSG_RECONFIG_RSP_EVT */  {AVDT_SCB_HDL_RECONFIG_RSP,     AVDT_SCB_IGNORE,            AVDT_SCB_OPEN_ST},