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

Commit 5f45d733 authored by Chris Manton's avatar Chris Manton
Browse files

Remove cpp is_gd_hci_enabled because It Is Known 

Bug: 197150934
Tag: #refactor
Test: gd/cert/run

Change-Id: Ibd2d626d691db99d6b2c6eaab0b9440e81bfa6a0
parent 53f6c4bb

system/hci/src/hci_layer.cc

+1 −5
Original line number Diff line number Diff line
@@ -903,11 +903,7 @@ const hci_t* hci_layer_get_interface_legacy() { 
}



const hci_t* hci_layer_get_interface() {

  if (bluetooth::shim::is_gd_hci_enabled()) {

  return bluetooth::shim::hci_layer_get_interface();

  } else {

    return hci_layer_get_interface_legacy();

  }

}



const hci_t* hci_layer_get_test_interface(

system/hci/test/other_stack_stub.cc

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ void DumpBtScheduling(unsigned char, unsigned char*) {} 


namespace shim {



bool is_gd_hci_enabled() { return false; }

bool is_gd_shim_enabled() { return false; }

bool is_gd_stack_started_up() { return false; }

void Post(base::OnceClosure task) {}

system/main/shim/hci_layer.cc

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static bool event_already_registered_in_hci_layer( 
    case bluetooth::hci::EventCode::PAGE_SCAN_REPETITION_MODE_CHANGE:

    case bluetooth::hci::EventCode::MAX_SLOTS_CHANGE:

    case bluetooth::hci::EventCode::LE_META_EVENT:

      return bluetooth::shim::is_gd_hci_enabled() ||

      return bluetooth::common::init_flags::gd_hci_is_enabled() ||

             bluetooth::shim::is_gd_acl_enabled() ||

             bluetooth::shim::is_gd_l2cap_enabled();

    case bluetooth::hci::EventCode::DISCONNECTION_COMPLETE:

system/main/shim/shim.cc

+0 −4
Original line number Diff line number Diff line
@@ -74,10 +74,6 @@ bool bluetooth::shim::is_gd_link_policy_enabled() { 
  return bluetooth::common::init_flags::gd_link_policy_is_enabled();

}



bool bluetooth::shim::is_gd_hci_enabled() {

  return bluetooth::common::init_flags::gd_hci_is_enabled();

}



bool bluetooth::shim::is_gd_controller_enabled() {

  return bluetooth::common::init_flags::gd_controller_is_enabled();

}

system/main/shim/shim.h

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ bool is_gd_scanning_enabled(); 
bool is_gd_security_enabled();

bool is_gd_acl_enabled();

bool is_gd_link_policy_enabled();

bool is_gd_hci_enabled();

bool is_gd_controller_enabled();

bool is_gd_l2cap_enabled();

bool is_gd_shim_enabled();