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

Commit 2962b68b authored by Zyan Wu's avatar Zyan Wu Committed by Automerger Merge Worker
Browse files

Merge "Fix: give an event for AVDT_DELAY_REPORT_CFM_EVT" am: 8bb0eb34 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1708144

Change-Id: I8cc77c18294a5fbce08f70f86f9d0ab4529e061e
parents b42519d1 8bb0eb34

system/bta/av/bta_av_aact.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -134,7 +134,7 @@ static const uint16_t bta_av_stream_evt_ok[] = { 
    BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */

    BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */

    BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */

    BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */

    BTA_AV_AVDT_DELAY_RPT_EVT, /* AVDT_DELAY_REPORT_EVT */

    BTA_AV_AVDT_DELAY_RPT_EVT, /* AVDT_DELAY_REPORT_EVT */

    0                          /* AVDT_DELAY_REPORT_CFM_EVT */

    BTA_AV_AVDT_DELAY_RPT_CFM_EVT, /* AVDT_DELAY_REPORT_CFM_EVT */

};

};





static const uint16_t bta_av_stream_evt_fail[] = {

static const uint16_t bta_av_stream_evt_fail[] = {
@@ -159,7 +159,7 @@ static const uint16_t bta_av_stream_evt_fail[] = { 
    BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */

    BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */

    BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */

    BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */

    BTA_AV_AVDT_DELAY_RPT_EVT, /* AVDT_DELAY_REPORT_EVT */

    BTA_AV_AVDT_DELAY_RPT_EVT, /* AVDT_DELAY_REPORT_EVT */

    0                          /* AVDT_DELAY_REPORT_CFM_EVT */

    BTA_AV_AVDT_DELAY_RPT_CFM_EVT, /* AVDT_DELAY_REPORT_CFM_EVT */

};

};





/***********************************************

/***********************************************

system/bta/av/bta_av_int.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -90,6 +90,7 @@ enum { 
  BTA_AV_AVDT_DISCONNECT_EVT,

  BTA_AV_AVDT_DISCONNECT_EVT,

  BTA_AV_ROLE_CHANGE_EVT,

  BTA_AV_ROLE_CHANGE_EVT,

  BTA_AV_AVDT_DELAY_RPT_EVT,

  BTA_AV_AVDT_DELAY_RPT_EVT,

  BTA_AV_AVDT_DELAY_RPT_CFM_EVT,

  BTA_AV_ACP_CONNECT_EVT,

  BTA_AV_ACP_CONNECT_EVT,

  BTA_AV_API_OFFLOAD_START_EVT,

  BTA_AV_API_OFFLOAD_START_EVT,

  BTA_AV_API_OFFLOAD_START_RSP_EVT,

  BTA_AV_API_OFFLOAD_START_RSP_EVT,