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

Commit 398d8d6f authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

Merge changes I771efe95,I0a86e885,Ia1b22fd6 am: 52b7f312 

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



Change-Id: Ib8fcfec4ad5a7fd4e2af8ea7535c149fa7968762
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97e133de 52b7f312

system/bta/le_audio/client_audio.h

+5 −5
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ class LeAudioClientAudioSource { 
  const void* Acquire(bool is_broadcasting_session_type);

  bool InitAudioSinkThread(const std::string name);



  bluetooth::common::MessageLoopThread* worker_thread_;

  bluetooth::common::MessageLoopThread* worker_thread_ = nullptr;



 private:

  bool SinkOnResumeReq(bool start_media_task);
@@ -147,9 +147,9 @@ class LeAudioClientAudioSource { 


  bluetooth::common::RepeatingTimer audio_timer_;

  LeAudioCodecConfiguration source_codec_config_;

  LeAudioClientAudioSinkReceiver* audioSinkReceiver_;

  LeAudioClientAudioSinkReceiver* audioSinkReceiver_ = nullptr;

  bluetooth::audio::le_audio::LeAudioClientInterface::Sink*

      sinkClientInterface_;

      sinkClientInterface_ = nullptr;



  /* Guard audio sink receiver mutual access from stack with internal mutex */

  std::mutex sinkInterfaceMutex_;
@@ -180,9 +180,9 @@ class LeAudioUnicastClientAudioSink { 
  bool SourceOnSuspendReq();

  bool SourceOnMetadataUpdateReq(const sink_metadata_t& sink_metadata);



  LeAudioClientAudioSourceReceiver* audioSourceReceiver_;

  LeAudioClientAudioSourceReceiver* audioSourceReceiver_ = nullptr;

  bluetooth::audio::le_audio::LeAudioClientInterface::Source*

      sourceClientInterface_;

      sourceClientInterface_ = nullptr;

};



class LeAudioUnicastClientAudioSource : public LeAudioClientAudioSource {

system/bta/le_audio/devices.cc

+5 −1
Original line number Diff line number Diff line
@@ -2636,8 +2636,12 @@ void LeAudioDevices::Dump(int fd, int group_id) { 


void LeAudioDevices::Cleanup(void) {

  for (auto const& device : leAudioDevices_) {

    if (device->conn_id_ != GATT_INVALID_CONN_ID) {

      BtaGattQueue::Clean(device->conn_id_);

      BTA_GATTC_Close(device->conn_id_);

      device->DisconnectAcl();

    }

  }

  leAudioDevices_.clear();

}

system/bta/le_audio/le_audio_types.cc

+2 −2
Original line number Diff line number Diff line
@@ -579,8 +579,8 @@ uint32_t AdjustAllocationForOffloader(uint32_t allocation) { 


namespace types {

std::ostream& operator<<(std::ostream& os, const types::CigState& state) {

  static const char* char_value_[4] = {"NONE", "CREATING", "CREATED",

                                       "REMOVING"};

  static const char* char_value_[5] = {"NONE", "CREATING", "CREATED",

                                       "REMOVING", "RECOVERING"};



  os << char_value_[static_cast<uint8_t>(state)] << " ("

     << "0x" << std::setfill('0') << std::setw(2) << static_cast<int>(state)

system/bta/le_audio/le_audio_types.h

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ constexpr uint16_t kMaxTransportLatencyMin = 0x0005; 
constexpr uint16_t kMaxTransportLatencyMax = 0x0FA0;



/* Enums */

enum class CigState : uint8_t { NONE, CREATING, CREATED, REMOVING };

enum class CigState : uint8_t { NONE, CREATING, CREATED, REMOVING, RECOVERING };



/* ASE states according to BAP defined state machine states */

enum class AseState : uint8_t {

system/bta/le_audio/mock_iso_manager.cc

+3 −1
Original line number Diff line number Diff line
@@ -58,7 +58,9 @@ void IsoManager::ReconfigureCig( 
  pimpl_->ReconfigureCig(cig_id, std::move(cig_params));

}



void IsoManager::RemoveCig(uint8_t cig_id) { pimpl_->RemoveCig(cig_id); }

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

  pimpl_->RemoveCig(cig_id, force);

}



void IsoManager::EstablishCis(

    struct iso_manager::cis_establish_params conn_params) {