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

Commit 6f82bc94 authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "A2DP: Add logging when A2DP fails to open" 

am: a4994c7f

Change-Id: I825570e840f65192e4746eef762e1f8c36f6c135
parents ee4d97f1 a4994c7f

system/btif/src/btif_a2dp_audio_interface.cc

+6 −3
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ void btif_a2dp_audio_send_suspend_req() { 
}*/



uint8_t btif_a2dp_audio_process_request(uint8_t cmd) {

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

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

                   audio_a2dp_hw_dump_ctrl_event((tA2DP_CTRL_CMD)cmd));

  a2dp_cmd_pending = cmd;

  uint8_t status;
@@ -280,6 +280,9 @@ uint8_t btif_a2dp_audio_process_request(uint8_t cmd) { 
       * while in a call, and respond with BAD_STATE.

       */

      if (!bluetooth::headset::IsCallIdle()) {

        APPL_TRACE_WARNING("%s: A2DP command %s failed as call state is busy",

                           __func__,

                           audio_a2dp_hw_dump_ctrl_event((tA2DP_CTRL_CMD)cmd));

        status = A2DP_CTRL_ACK_INCALL_FAILURE;

        break;

      }
@@ -349,7 +352,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",

                   audio_a2dp_hw_dump_ctrl_event((tA2DP_CTRL_CMD)cmd));

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

                   audio_a2dp_hw_dump_ctrl_event((tA2DP_CTRL_CMD)cmd), status);

  return status;

}

system/btif/src/btif_a2dp_control.cc

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ static void btif_a2dp_recv_ctrl_data(void) { 
       * while in a call, and respond with BAD_STATE.

       */

      if (!bluetooth::headset::IsCallIdle()) {

        APPL_TRACE_WARNING("%s: A2DP command %s while call state is busy",

                           __func__, audio_a2dp_hw_dump_ctrl_event(cmd));

        btif_a2dp_command_ack(A2DP_CTRL_ACK_INCALL_FAILURE);

        break;

      }

system/btif/src/btif_av.cc

+6 −0
Original line number Diff line number Diff line
@@ -1823,6 +1823,9 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, 


      // Change state to Idle, send acknowledgement if start is pending

      if (peer_.CheckFlags(BtifAvPeer::kFlagPendingStart)) {

        BTIF_TRACE_WARNING("%s: Peer %s : failed pending start request",

                           __PRETTY_FUNCTION__,

                           peer_.PeerAddress().ToString().c_str());

        btif_a2dp_command_ack(A2DP_CTRL_ACK_FAILURE);

        // Pending start flag will be cleared when exit current state

      }
@@ -1841,6 +1844,9 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, 
                 __PRETTY_FUNCTION__, peer_.PeerAddress().ToString().c_str());

        BTA_AvStart(peer_.BtaHandle());

      } else if (peer_.CheckFlags(BtifAvPeer::kFlagPendingStart)) {

        BTIF_TRACE_WARNING("%s: Peer %s : failed reconfiguration",

                           __PRETTY_FUNCTION__,

                           peer_.PeerAddress().ToString().c_str());

        peer_.ClearFlags(BtifAvPeer::kFlagPendingStart);

        btif_a2dp_command_ack(A2DP_CTRL_ACK_FAILURE);

      }