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

Commit ee3d0f27 authored by Sunny Kapdi's avatar Sunny Kapdi Committed by android-build-merger
Browse files

A2DP Offload: Don't crash on repeated endSession 

am: fe2b4af8

Change-Id: I8cdd3690128e6bb4652beedfe4e84440a5b8dc33
parents f71cf56a fe2b4af8

system/btif/src/btif_a2dp_audio_interface.cc

+6 −5
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ void btif_a2dp_audio_interface_start_session() { 


void btif_a2dp_audio_interface_end_session() {

  LOG_INFO(LOG_TAG, "%s", __func__);

  CHECK(btAudio != nullptr);

  if (btAudio == nullptr) return;

  auto ret = btAudio->endSession();

  if (!ret.isOk()) {

    LOG_ERROR(LOG_TAG, "HAL server is dead");
@@ -260,6 +260,7 @@ void btif_a2dp_audio_send_start_req() { 
  }

}

void btif_a2dp_audio_send_suspend_req() {

  LOG_INFO(LOG_TAG, "%s", __func__);

  uint8_t resp;

  resp = btif_a2dp_audio_process_request(A2DP_CTRL_CMD_SUSPEND);

  if (btAudio != nullptr) {
@@ -278,7 +279,7 @@ void btif_a2dp_audio_send_suspend_req() { 
}*/



uint8_t btif_a2dp_audio_process_request(uint8_t cmd) {

  APPL_TRACE_DEBUG("%s: cmd: %s", __func__,

  LOG_INFO(LOG_TAG, "%s: cmd: %s", __func__,

           audio_a2dp_hw_dump_ctrl_event((tA2DP_CTRL_CMD)cmd));

  a2dp_cmd_pending = cmd;

  uint8_t status;
@@ -362,7 +363,7 @@ uint8_t btif_a2dp_audio_process_request(uint8_t cmd) { 
      status = A2DP_CTRL_ACK_FAILURE;

      break;

  }

  APPL_TRACE_DEBUG("a2dp-ctrl-cmd : %s DONE returning status %d",

  LOG_INFO(LOG_TAG, "a2dp-ctrl-cmd : %s DONE returning status %d",

           audio_a2dp_hw_dump_ctrl_event((tA2DP_CTRL_CMD)cmd), status);

  return status;

}