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

Commit bae3ae1e authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge changes I324677fa,Iac3bd56a into main am: b4c5225d am: 3122c3a5 

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



Change-Id: I7622f7702c5f49aba7a25a162d06cae99ef056a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fbda529d 3122c3a5

system/bta/csis/csis_client.cc

+2 −2
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ class CsisClientImpl : public CsisClient { 
  }



  void CleanUp() {

    LOG_DEBUG();

    log::debug("");



    BTA_GATTC_AppDeregister(gatt_if_);

    for (auto& device : devices_) {
@@ -2047,7 +2047,7 @@ class CsisClientImpl : public CsisClient { 
        return;

      }



      LOG_VERBOSE();

      log::verbose("");



      const std::list<gatt::Service>* all_services =

          BTA_GATTC_GetServices(device->conn_id);

system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc

+10 −10
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ bool SinkImpl::Acquire() { 
    return false;

  }



  LOG_INFO();

  log::info("");

  le_audio_source_hal_state = HAL_STOPPED;

  return true;

}
@@ -104,7 +104,7 @@ void SinkImpl::Release() { 
    return;

  }



  LOG_INFO();

  log::info("");

  if (halSourceInterface_) {

    halSourceInterface_->Cleanup();
@@ -223,7 +223,7 @@ void SinkImpl::Stop() { 
    return;

  }



  LOG_INFO();

  log::info("");



  halSourceInterface_->StopSession();

  le_audio_source_hal_state = HAL_STOPPED;
@@ -260,7 +260,7 @@ void SinkImpl::ConfirmStreamingRequest() { 
    return;

  }



  LOG_INFO();

  log::info("");

  if (IS_FLAG_ENABLED(leaudio_start_stream_race_fix)) {

    halSourceInterface_->ConfirmStreamingRequestV2();

  } else {
@@ -275,7 +275,7 @@ void SinkImpl::SuspendedForReconfiguration() { 
    return;

  }



  LOG_INFO();

  log::info("");

  halSourceInterface_->SuspendedForReconfiguration();

}
@@ -286,7 +286,7 @@ void SinkImpl::ReconfigurationComplete() { 
    return;

  }



  LOG_INFO();

  log::info("");

  halSourceInterface_->ReconfigurationComplete();

}
@@ -297,7 +297,7 @@ void SinkImpl::CancelStreamingRequest() { 
    return;

  }



  LOG_INFO();

  log::info("");

  if (IS_FLAG_ENABLED(leaudio_start_stream_race_fix)) {

    halSourceInterface_->CancelStreamingRequestV2();

  } else {
@@ -312,7 +312,7 @@ void SinkImpl::UpdateRemoteDelay(uint16_t remote_delay_ms) { 
    return;

  }



  LOG_INFO();

  log::info("");

  halSourceInterface_->SetRemoteDelay(remote_delay_ms);

}
@@ -324,7 +324,7 @@ void SinkImpl::UpdateAudioConfigToHal( 
    return;

  }



  LOG_INFO();

  log::info("");

  halSourceInterface_->UpdateAudioConfigToHal(config);

}

}  // namespace
@@ -338,7 +338,7 @@ LeAudioSinkAudioHalClient::AcquireUnicast() { 
    return nullptr;

  }



  LOG_INFO();

  log::info("");

  return std::move(impl);

}

system/bta/le_audio/audio_hal_client/audio_source_hal_client.cc

+12 −12
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ bool SourceImpl::Acquire() { 
    return false;

  }



  LOG_INFO();

  log::info("");

  le_audio_sink_hal_state_ = HAL_STOPPED;

  return this->InitAudioSinkThread();

}
@@ -145,7 +145,7 @@ void SourceImpl::Release() { 
    return;

  }



  LOG_INFO();

  log::info("");

  worker_thread_->ShutDown();



  if (halSinkInterface_) {
@@ -369,7 +369,7 @@ void SourceImpl::Stop() { 
    return;

  }



  LOG_INFO();

  log::info("");



  halSinkInterface_->StopSession();

  le_audio_sink_hal_state_ = HAL_STOPPED;
@@ -396,7 +396,7 @@ void SourceImpl::ConfirmStreamingRequest() { 
    return;

  }



  LOG_INFO();

  log::info("");

  if (IS_FLAG_ENABLED(leaudio_start_stream_race_fix)) {

    halSinkInterface_->ConfirmStreamingRequestV2();

  } else {
@@ -422,7 +422,7 @@ void SourceImpl::SuspendedForReconfiguration() { 
    return;

  }



  LOG_INFO();

  log::info("");

  halSinkInterface_->SuspendedForReconfiguration();

}
@@ -433,7 +433,7 @@ void SourceImpl::ReconfigurationComplete() { 
    return;

  }



  LOG_INFO();

  log::info("");

  halSinkInterface_->ReconfigurationComplete();

}
@@ -444,7 +444,7 @@ void SourceImpl::CancelStreamingRequest() { 
    return;

  }



  LOG_INFO();

  log::info("");

  if (IS_FLAG_ENABLED(leaudio_start_stream_race_fix)) {

    halSinkInterface_->CancelStreamingRequestV2();

  } else {
@@ -459,7 +459,7 @@ void SourceImpl::UpdateRemoteDelay(uint16_t remote_delay_ms) { 
    return;

  }



  LOG_INFO();

  log::info("");

  halSinkInterface_->SetRemoteDelay(remote_delay_ms);

}
@@ -471,7 +471,7 @@ void SourceImpl::UpdateAudioConfigToHal( 
    return;

  }



  LOG_INFO();

  log::info("");

  halSinkInterface_->UpdateAudioConfigToHal(config);

}
@@ -482,7 +482,7 @@ void SourceImpl::UpdateBroadcastAudioConfigToHal( 
    return;

  }



  LOG_INFO();

  log::info("");

  halSinkInterface_->UpdateBroadcastAudioConfigToHal(config);

}

}  // namespace
@@ -496,7 +496,7 @@ LeAudioSourceAudioHalClient::AcquireUnicast() { 
    return nullptr;

  }



  LOG_INFO();

  log::info("");

  return std::move(impl);

}
@@ -509,7 +509,7 @@ LeAudioSourceAudioHalClient::AcquireBroadcast() { 
    return nullptr;

  }



  LOG_INFO();

  log::info("");

  return std::move(impl);

}

system/bta/le_audio/broadcaster/broadcaster.cc

+13 −15
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ class LeAudioBroadcasterImpl : public LeAudioBroadcaster, public BigCallbacks { 
        current_phy_(PHY_LE_2M),

        audio_data_path_state_(AudioDataPathState::INACTIVE),

        le_audio_source_hal_client_(nullptr) {

    LOG_INFO();

    log::info("");



    /* Register State machine callbacks */

    BroadcastStateMachine::Initialize(&state_machine_callbacks_,
@@ -430,8 +430,7 @@ class LeAudioBroadcasterImpl : public LeAudioBroadcaster, public BigCallbacks { 
  /* Choose the dominating audio context when multiple contexts are mixed */

  LeAudioContextType ChooseConfigurationContextType(

      AudioContexts audio_contexts) {

    LOG_DEBUG("Got contexts=%s",

              bluetooth::common::ToString(audio_contexts).c_str());

    log::debug("Got contexts={}", bluetooth::common::ToString(audio_contexts));



    /* Prioritize the most common use cases. */

    if (audio_contexts.any()) {
@@ -443,16 +442,15 @@ class LeAudioBroadcasterImpl : public LeAudioBroadcaster, public BigCallbacks { 
      };

      for (auto ct : context_priority_list) {

        if (audio_contexts.test(ct)) {

          LOG_DEBUG("Selecting configuration context type: %s",

                    ToString(ct).c_str());

          log::debug("Selecting configuration context type: {}", ToString(ct));

          return ct;

        }

      }

    }



    auto fallback_config = LeAudioContextType::MEDIA;

    LOG_DEBUG("Selecting configuration context type: %s",

              ToString(fallback_config).c_str());

    log::debug("Selecting configuration context type: {}",

               ToString(fallback_config));

    return fallback_config;

  }
@@ -595,7 +593,7 @@ class LeAudioBroadcasterImpl : public LeAudioBroadcaster, public BigCallbacks { 


    if (public_features & bluetooth::le_audio::kLeAudioQualityHigh &&

        config->GetSamplingFrequencyHzMax() < 48000) {

      LOG_WARN(

      log::warn(

          "Preferred quality isn't supported. Fallback to standard audio "

          "quality");

      public_features &= (0xFFFF & ~bluetooth::le_audio::kLeAudioQualityHigh);
@@ -1158,7 +1156,7 @@ class LeAudioBroadcasterImpl : public LeAudioBroadcaster, public BigCallbacks { 


      if (!broadcast_config_.has_value() ||

          (broadcast_config_->subgroups.size() == 0)) {

        LOG_ERROR("Codec was not configured properly");

        log::error("Codec was not configured properly");

        return;

      }
@@ -1195,14 +1193,14 @@ class LeAudioBroadcasterImpl : public LeAudioBroadcaster, public BigCallbacks { 
    }



    virtual void OnAudioSuspend(void) override {

      LOG_INFO();

      log::info("");

      /* TODO: Should we suspend all broadcasts - remove BIGs? */

      if (instance)

        instance->audio_data_path_state_ = AudioDataPathState::SUSPENDED;

    }



    virtual void OnAudioResume(void) override {

      LOG_INFO();

      log::info("");

      if (!instance) return;



      /* TODO: Should we resume all broadcasts - recreate BIGs? */
@@ -1269,7 +1267,7 @@ void LeAudioBroadcaster::Initialize( 
    bluetooth::le_audio::LeAudioBroadcasterCallbacks* callbacks,

    base::Callback<bool()> audio_hal_verifier) {

  std::scoped_lock<std::mutex> lock(instance_mutex);

  LOG_INFO();

  log::info("");

  if (instance) {

    log::error("Already initialized");

    return;
@@ -1300,13 +1298,13 @@ void LeAudioBroadcaster::Initialize( 
bool LeAudioBroadcaster::IsLeAudioBroadcasterRunning() { return instance; }



LeAudioBroadcaster* LeAudioBroadcaster::Get(void) {

  LOG_INFO();

  log::info("");

  CHECK(instance);

  return instance;

}



void LeAudioBroadcaster::Stop(void) {

  LOG_INFO();

  log::info("");



  if (instance) {

    instance->Stop();
@@ -1315,7 +1313,7 @@ void LeAudioBroadcaster::Stop(void) { 


void LeAudioBroadcaster::Cleanup(void) {

  std::scoped_lock<std::mutex> lock(instance_mutex);

  LOG_INFO();

  log::info("");



  if (instance == nullptr) return;

system/bta/le_audio/client.cc

+7 −7
Original line number Diff line number Diff line
@@ -5411,7 +5411,8 @@ class LeAudioClientImpl : public LeAudioClient { 
  }



  void HandlePendingDeviceDisconnection(LeAudioDeviceGroup* group) {

    LOG_DEBUG();

    log::debug("");



    auto leAudioDevice = group->GetFirstDevice();

    while (leAudioDevice) {

      if (leAudioDevice->closing_stream_for_disconnection_) {
@@ -5819,8 +5820,7 @@ class LeAudioClientImpl : public LeAudioClient { 
  void ClientAudioInterfaceRelease() {

    auto group = aseGroups_.FindById(active_group_id_);

    if (!group) {

      LOG(ERROR) << __func__

                 << ", Invalid group: " << static_cast<int>(active_group_id_);

      log::error("Invalid group: {}", static_cast<int>(active_group_id_));

    } else {

      handleAsymmetricPhyForUnicast(group);

      log::info("ClientAudioInterfaceRelease - cleanup");
@@ -5864,13 +5864,13 @@ class LeAudioClientImpl : public LeAudioClient { 
    }



    if (group->dsa_.mode != DsaMode::ISO_SW) {

      LOG_WARN("ISO packets received over HCI in DSA mode: %d",

      log::warn("ISO packets received over HCI in DSA mode: {}",

                group->dsa_.mode);

      return false;

    }



    if (iso_data_callback == nullptr) {

      LOG_WARN("Dsa data consumer not registered");

      log::warn("Dsa data consumer not registered");

      return false;

    }
@@ -6291,7 +6291,7 @@ bool LeAudioClient::RegisterIsoDataConsumer(LeAudioIsoDataCallback callback) { 
    return false;

  }



  LOG_INFO("ISO data consumer changed");

  log::info("ISO data consumer changed");

  iso_data_callback = callback;

  return true;

}