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

Commit 30287c0e authored by Myles Watson's avatar Myles Watson
Browse files

Remove gd_remote_name_request flag 

Bug: 283254594
Test: presubmit
Change-Id: I444125f3f4e4bf0fd7e247db968fdc4381041f37
parent 47ad776e

system/gd/hci/acl_manager.cc

+2 −6
Original line number Diff line number Diff line
@@ -68,9 +68,7 @@ struct AclManager::impl { 
    round_robin_scheduler_ = new RoundRobinScheduler(handler_, controller_, hci_layer_->GetAclQueueEnd());

    acl_scheduler_ = acl_manager_.GetDependency<AclScheduler>();



    if (bluetooth::common::init_flags::gd_remote_name_request_is_enabled()) {

    remote_name_request_module_ = acl_manager_.GetDependency<RemoteNameRequestModule>();

    }



    bool crash_on_unknown_handle = false;

    {
@@ -426,10 +424,8 @@ void AclManager::ListDependencies(ModuleList* list) const { 
  list->add<Controller>();

  list->add<storage::StorageModule>();

  list->add<AclScheduler>();

  if (bluetooth::common::init_flags::gd_remote_name_request_is_enabled()) {

  list->add<RemoteNameRequestModule>();

}

}



void AclManager::Start() {

  pimpl_->Start();

system/gd/hci/acl_manager/classic_impl.h

+1 −6
Original line number Diff line number Diff line
@@ -446,12 +446,7 @@ struct classic_impl : public security::ISecurityManagerListener { 
                  ADDRESS_TO_LOGGABLE_CSTR(address),

                  ErrorCodeText(status).c_str());

              LOG_WARN("Firmware error after RemoteNameRequestCancel?");  // see b/184239841

              if (bluetooth::common::init_flags::gd_remote_name_request_is_enabled()) {

                ASSERT_LOG(

                    remote_name_request_module != nullptr,

                    "RNR module enabled but module not provided");

              remote_name_request_module->ReportRemoteNameRequestCancellation(address);

              }

            },

            common::Unretained(remote_name_request_module_),

            address,

system/gd/rust/common/src/init_flags.rs

+0 −1
Original line number Diff line number Diff line
@@ -379,7 +379,6 @@ init_flags!( 
        gd_hal_snoop_logger_filtering = true,

        gd_l2cap,

        gd_link_policy,

        gd_remote_name_request = true,

        gd_rust,

        hci_adapter: i32,

        hfp_dynamic_version = true,

system/gd/rust/shim/src/init_flags.rs

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ mod ffi { 
        fn gd_hal_snoop_logger_socket_is_enabled() -> bool;

        fn gd_l2cap_is_enabled() -> bool;

        fn gd_link_policy_is_enabled() -> bool;

        fn gd_remote_name_request_is_enabled() -> bool;

        fn get_default_log_level() -> i32;

        fn get_hci_adapter() -> i32;

        fn get_log_level_for_tag(tag: &str) -> i32;

system/main/shim/hci_layer.cc

+1 −2
Original line number Diff line number Diff line
@@ -171,10 +171,9 @@ static bool event_already_registered_in_hci_layer( 
    case bluetooth::hci::EventCode::LE_META_EVENT:

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

    case bluetooth::hci::EventCode::READ_REMOTE_VERSION_INFORMATION_COMPLETE:

      return true;

    case bluetooth::hci::EventCode::REMOTE_HOST_SUPPORTED_FEATURES_NOTIFICATION:

    case bluetooth::hci::EventCode::REMOTE_NAME_REQUEST_COMPLETE:

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

      return true;

    default:

      return false;

  }