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

Commit 8b607516 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "legacy: Remove stack::btm_ble_create_conn_cancel"

parents 126e0f38 688a1783

system/stack/acl/btm_ble_connection_establishment.cc

+0 −9
Original line number Original line Diff line number Diff line
@@ -99,15 +99,6 @@ bool maybe_resolve_address(RawAddress* bda, tBLE_ADDR_TYPE* bda_type) { 
  return is_in_security_db;

  return is_in_security_db;

}

}





void btm_ble_create_conn_cancel() {

  ASSERT_LOG(false,

             "When gd_acl enabled this code path should not be exercised");



  btsnd_hcic_ble_create_conn_cancel();

  btm_cb.ble_ctr_cb.set_connection_state_cancelled();

  btm_ble_clear_topology_mask(BTM_BLE_STATE_INIT_BIT);

}



void btm_ble_create_conn_cancel_complete(uint8_t* p) {

void btm_ble_create_conn_cancel_complete(uint8_t* p) {

  uint8_t status;

  uint8_t status;

  STREAM_TO_UINT8(status, p);

  STREAM_TO_UINT8(status, p);

system/stack/btm/btm_ble_bgconn.cc

+0 −2
Original line number Original line Diff line number Diff line
@@ -39,8 +39,6 @@ 




extern tBTM_CB btm_cb;

extern tBTM_CB btm_cb;





extern void btm_ble_create_conn_cancel();



namespace {

namespace {

system/stack/btu/btu_hcif.cc

+8 −4
Original line number Original line Diff line number Diff line
@@ -1210,10 +1210,6 @@ static void btu_hcif_hdl_command_complete(uint16_t opcode, uint8_t* p, 
      LOG(ERROR) << "No command complete expected, but received!";

      LOG(ERROR) << "No command complete expected, but received!";

      break;

      break;





    case HCI_BLE_CREATE_CONN_CANCEL:

      btm_ble_create_conn_cancel_complete(p);

      break;



    case HCI_BLE_TRANSMITTER_TEST:

    case HCI_BLE_TRANSMITTER_TEST:

    case HCI_BLE_RECEIVER_TEST:

    case HCI_BLE_RECEIVER_TEST:

    case HCI_BLE_TEST_END:

    case HCI_BLE_TEST_END:
@@ -1240,6 +1236,14 @@ static void btu_hcif_hdl_command_complete(uint16_t opcode, uint8_t* p, 
    case HCI_BLE_SET_ADDR_RESOLUTION_ENABLE:

    case HCI_BLE_SET_ADDR_RESOLUTION_ENABLE:

    case HCI_BLE_SET_RAND_PRIV_ADDR_TIMOUT:

    case HCI_BLE_SET_RAND_PRIV_ADDR_TIMOUT:

      break;

      break;



    case HCI_BLE_CREATE_CONN_CANCEL:

      LOG_ERROR(

          "Unexpectedly received command complete for opcode:0x%02x that "

          "should not be "

          "handled here",

          opcode);

      break;

    default:

    default:

      if ((opcode & HCI_GRP_VENDOR_SPECIFIC) == HCI_GRP_VENDOR_SPECIFIC)

      if ((opcode & HCI_GRP_VENDOR_SPECIFIC) == HCI_GRP_VENDOR_SPECIFIC)

        btm_vsc_complete(p, opcode, evt_len, (tBTM_VSC_CMPL_CB*)p_cplt_cback);

        btm_vsc_complete(p, opcode, evt_len, (tBTM_VSC_CMPL_CB*)p_cplt_cback);

system/test/mock/mock_stack_acl_btm_ble_connection_establishment.cc

+0 −6
Original line number Original line Diff line number Diff line
@@ -53,7 +53,6 @@ namespace stack_acl_btm_ble_connection_establishment { 
struct btm_ble_create_ll_conn_complete btm_ble_create_ll_conn_complete;

struct btm_ble_create_ll_conn_complete btm_ble_create_ll_conn_complete;

struct maybe_resolve_address maybe_resolve_address;

struct maybe_resolve_address maybe_resolve_address;

struct btm_ble_conn_complete btm_ble_conn_complete;

struct btm_ble_conn_complete btm_ble_conn_complete;

struct btm_ble_create_conn_cancel btm_ble_create_conn_cancel;

struct btm_ble_create_conn_cancel_complete btm_ble_create_conn_cancel_complete;

struct btm_ble_create_conn_cancel_complete btm_ble_create_conn_cancel_complete;





}  // namespace stack_acl_btm_ble_connection_establishment

}  // namespace stack_acl_btm_ble_connection_establishment
@@ -75,11 +74,6 @@ void btm_ble_conn_complete(uint8_t* p, uint16_t evt_len, bool enhanced) { 
  test::mock::stack_acl_btm_ble_connection_establishment::btm_ble_conn_complete(

  test::mock::stack_acl_btm_ble_connection_establishment::btm_ble_conn_complete(

      p, evt_len, enhanced);

      p, evt_len, enhanced);

}

}

void btm_ble_create_conn_cancel() {

  mock_function_count_map[__func__]++;

  test::mock::stack_acl_btm_ble_connection_establishment::

      btm_ble_create_conn_cancel();

}

void btm_ble_create_conn_cancel_complete(uint8_t* p) {

void btm_ble_create_conn_cancel_complete(uint8_t* p) {

  mock_function_count_map[__func__]++;

  mock_function_count_map[__func__]++;

  test::mock::stack_acl_btm_ble_connection_establishment::

  test::mock::stack_acl_btm_ble_connection_establishment::

system/test/mock/mock_stack_acl_btm_ble_connection_establishment.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -78,14 +78,6 @@ struct btm_ble_conn_complete { 
  };

  };

};

};

extern struct btm_ble_conn_complete btm_ble_conn_complete;

extern struct btm_ble_conn_complete btm_ble_conn_complete;

// Name: btm_ble_create_conn_cancel

// Params:

// Returns: void

struct btm_ble_create_conn_cancel {

  std::function<void()> body{[]() {}};

  void operator()() { body(); };

};

extern struct btm_ble_create_conn_cancel btm_ble_create_conn_cancel;

// Name: btm_ble_create_conn_cancel_complete

// Name: btm_ble_create_conn_cancel_complete

// Params: uint8_t* p

// Params: uint8_t* p

// Returns: void

// Returns: void