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

Commit a16a517d authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Gerrit Code Review
Browse files

Merge "Floss: Fix usage of BT_STATUS_BUSY"

parents a4f11da0 548b53c2

system/btif/src/btif_hd.cc

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static bt_status_t register_app(bthd_app_param_t* p_app_param, 


  if (btif_hd_cb.app_registered) {

    BTIF_TRACE_WARNING("%s: application already registered", __func__);

    return BT_STATUS_BUSY;

    return BT_STATUS_DONE;

  }



  if (strlen(p_app_param->name) >= BTIF_HD_APP_NAME_LEN ||

system/btif/src/btif_hf.cc

+1 −1
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ static bt_status_t connect_int(RawAddress* bd_addr, uint16_t uuid) { 
  if (is_connected(bd_addr)) {

    BTIF_TRACE_WARNING("%s: device %s is already connected", __func__,

                       bd_addr->ToString().c_str());

    return BT_STATUS_BUSY;

    return BT_STATUS_DONE;

  }

  btif_hf_cb_t* hf_cb = nullptr;

  for (int i = 0; i < btif_max_hf_clients; i++) {

system/include/hardware/bluetooth.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ typedef enum { 
  BT_STATUS_FAIL,

  BT_STATUS_NOT_READY,

  BT_STATUS_NOMEM,

  BT_STATUS_BUSY,

  BT_STATUS_BUSY, /* retryable error */

  BT_STATUS_DONE, /* request already completed */

  BT_STATUS_UNSUPPORTED,

  BT_STATUS_PARM_INVALID,

system/include/hardware/bluetooth_headset_interface.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <raw_address.h>



#include "bluetooth.h"

#include "bluetooth_headset_callbacks.h"

#include "bt_hf.h"