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

Commit e7279e4c authored by Bao Do's avatar Bao Do Committed by Automerger Merge Worker
Browse files

Merge "IsoManager: Unify protection against usage when not started" into main am: 7b32d982 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3231167



Change-Id: I577b460416259ffc010ec7bb1e90174418a9ea0e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f555326 7b32d982

system/stack/btm/btm_iso.cc

+20 −17
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 


#include <memory>



#include "btm_iso_api.h"

#include "btm_iso_impl.h"

#include "btm/btm_iso_impl.h"

#include "include/btm_iso_api.h"

#include "stack/include/bt_hdr.h"



using bluetooth::hci::iso_manager::BigCallbacks;
@@ -29,7 +29,7 @@ namespace bluetooth { 
namespace hci {



struct IsoManager::impl {

  impl(const IsoManager& iso_manager) : iso_manager_(iso_manager) {}

  explicit impl(const IsoManager& iso_manager) : iso_manager_(iso_manager) {}



  void Start() {

    log::assert_that(iso_impl_ == nullptr, "assert failed: iso_impl_ == nullptr");
@@ -56,84 +56,87 @@ struct IsoManager::impl { 
IsoManager::IsoManager() : pimpl_(std::make_unique<impl>(*this)) {}



void IsoManager::RegisterCigCallbacks(CigCallbacks* callbacks) const {

  if (pimpl_->iso_impl_) {

  if (pimpl_->IsRunning()) {

    pimpl_->iso_impl_->handle_register_cis_callbacks(callbacks);

  }

}



void IsoManager::RegisterBigCallbacks(BigCallbacks* callbacks) const {

  if (pimpl_->iso_impl_) {

  if (pimpl_->IsRunning()) {

    pimpl_->iso_impl_->handle_register_big_callbacks(callbacks);

  }

}



void IsoManager::RegisterOnIsoTrafficActiveCallback(void callback(bool)) const {

  if (pimpl_->iso_impl_) {

  if (pimpl_->IsRunning()) {

    pimpl_->iso_impl_->handle_register_on_iso_traffic_active_callback(callback);

  }

}



void IsoManager::CreateCig(uint8_t cig_id, struct iso_manager::cig_create_params cig_params) {

  if (pimpl_->iso_impl_) {

  if (pimpl_->IsRunning()) {

    pimpl_->iso_impl_->create_cig(cig_id, std::move(cig_params));

  }

}



void IsoManager::ReconfigureCig(uint8_t cig_id, struct iso_manager::cig_create_params cig_params) {

  if (pimpl_->iso_impl_) {

  if (pimpl_->IsRunning()) {

    pimpl_->iso_impl_->reconfigure_cig(cig_id, std::move(cig_params));

  }

}



void IsoManager::RemoveCig(uint8_t cig_id, bool force) {

  if (pimpl_->iso_impl_) {

  if (pimpl_->IsRunning()) {

    pimpl_->iso_impl_->remove_cig(cig_id, force);

  }

}



void IsoManager::EstablishCis(struct iso_manager::cis_establish_params conn_params) {

  if (pimpl_->iso_impl_) {

  if (pimpl_->IsRunning()) {

    pimpl_->iso_impl_->establish_cis(std::move(conn_params));

  }

}



void IsoManager::DisconnectCis(uint16_t cis_handle, uint8_t reason) {

  if (pimpl_->iso_impl_) {

  if (pimpl_->IsRunning()) {

    pimpl_->iso_impl_->disconnect_cis(cis_handle, reason);

  }

}



int IsoManager::GetNumberOfActiveIso() {

  return pimpl_->iso_impl_ ? pimpl_->iso_impl_->get_number_of_active_iso() : 0;

  if (pimpl_->IsRunning()) {

    return pimpl_->iso_impl_->get_number_of_active_iso();

  }

  return 0;

}



void IsoManager::SetupIsoDataPath(uint16_t iso_handle,

                                  struct iso_manager::iso_data_path_params path_params) {

  if (pimpl_->iso_impl_) {

  if (pimpl_->IsRunning()) {

    pimpl_->iso_impl_->setup_iso_data_path(iso_handle, std::move(path_params));

  }

}



void IsoManager::RemoveIsoDataPath(uint16_t iso_handle, uint8_t data_path_dir) {

  if (pimpl_->iso_impl_) {

  if (pimpl_->IsRunning()) {

    pimpl_->iso_impl_->remove_iso_data_path(iso_handle, data_path_dir);

  }

}



void IsoManager::ReadIsoLinkQuality(uint16_t iso_handle) {

  if (pimpl_->iso_impl_) {

  if (pimpl_->IsRunning()) {

    pimpl_->iso_impl_->read_iso_link_quality(iso_handle);

  }

}



void IsoManager::SendIsoData(uint16_t iso_handle, const uint8_t* data, uint16_t data_len) {

  if (pimpl_->iso_impl_) {

  if (pimpl_->IsRunning()) {

    pimpl_->iso_impl_->send_iso_data(iso_handle, data, data_len);

  }

}



void IsoManager::CreateBig(uint8_t big_id, struct iso_manager::big_create_params big_params) {

  if (pimpl_->iso_impl_) {

  if (pimpl_->IsRunning()) {

    pimpl_->iso_impl_->create_big(big_id, std::move(big_params));

  }

}