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

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

Merge changes Iafc16e2c,I3ca50a82 

* changes:
  csis: Fix active scan for set member
  leaudio: Minor cleaning up fixes
parents 47f0a16a fcea2ba9

system/bta/csis/csis_client.cc

+6 −4
Original line number Diff line number Diff line
@@ -1099,12 +1099,14 @@ class CsisClientImpl : public CsisClient { 
      DLOG(INFO) << "Found set member " << result->bd_addr;

      callbacks_->OnSetMemberAvailable(result->bd_addr,

                                       csis_group->GetGroupId());

    }



    /* Switch back to the opportunistic observer mode */

      /* Switch back to the opportunistic observer mode.

       * When second device will pair, csis will restart active scan

       * to search more members if needed */

      CsisActiveObserverSet(false);

      csis_group->SetDiscoveryState(CsisDiscoveryState::CSIS_DISCOVERY_IDLE);

    }

  }



  void CsisActiveObserverSet(bool enable) {

    LOG(INFO) << __func__ << " CSIS Discovery SET: " << enable;

system/bta/le_audio/client.cc

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ class LeAudioClientImpl : public LeAudioClient { 
      : gatt_if_(0),

        callbacks_(callbacks_),

        active_group_id_(bluetooth::groups::kGroupUnknown),

        stream_request_started_(false),

        current_context_type_(LeAudioContextType::MEDIA),

        audio_sink_ready_to_receive(false),

        audio_source_ready_to_send(false),

system/bta/le_audio/devices.h

+5 −3
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ class LeAudioDevice { 
        encrypted_(false),

        group_id_(group_id),

        csis_member_(false),

        audio_directions_(0),

        link_quality_timer(nullptr) {}

  ~LeAudioDevice(void);
@@ -186,15 +187,16 @@ class LeAudioDeviceGroup { 
  types::AudioLocations snk_audio_locations_;

  types::AudioLocations src_audio_locations_;



  /* The below is used only for Coordinate sets */

  types::CsisDiscoveryState csis_discovery_state_;

  explicit LeAudioDeviceGroup(const int group_id)

      : group_id_(group_id),

        cig_created_(false),

        audio_directions_(0),

        transport_latency_mtos_(0),

        transport_latency_stom_(0),

        active_context_type_(types::LeAudioContextType::UNINITIALIZED),

        target_state_(types::AseState::BTA_LE_AUDIO_ASE_STATE_IDLE),

        current_state_(types::AseState::BTA_LE_AUDIO_ASE_STATE_IDLE) {

        current_state_(types::AseState::BTA_LE_AUDIO_ASE_STATE_IDLE),

        context_type_(types::LeAudioContextType::UNINITIALIZED) {

    stream_conf.valid = false;

    stream_conf.conf = nullptr;

    stream_conf.sink_num_of_devices = 0;

system/bta/le_audio/le_audio_types.h

+1 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ enum class AudioStreamDataPathState { 


/* Context Types */

enum class LeAudioContextType : uint16_t {

  UNINITIALIZED = 0x0000,

  UNSPECIFIED = 0x0001,

  CONVERSATIONAL = 0x0002,

  MEDIA = 0x0004,