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

Commit 7e1ccfe9 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "leaudio: Speed up reconfiguration between Conversational and Media"... 

Merge "leaudio: Speed up reconfiguration between Conversational and Media" into main am: 2d4a0ddc am: 9d9fce65

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



Change-Id: I56d57e983c2096a019f25bb3ea4c22c26db7d7cf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26fcaa30 9d9fce65

system/bta/le_audio/client.cc

+37 −0
Original line number Diff line number Diff line
@@ -1007,6 +1007,43 @@ public: 
  void SetInCall(bool in_call) override {

    log::debug("in_call: {}", in_call);

    in_call_ = in_call;



    if (!com::android::bluetooth::flags::leaudio_speed_up_reconfiguration_between_call()) {

      log::debug("leaudio_speed_up_reconfiguration_between_call flag is not enabled");

      return;

    }



    if (active_group_id_ == bluetooth::groups::kGroupUnknown) {

      return;

    }



    LeAudioDeviceGroup* group = aseGroups_.FindById(active_group_id_);

    if (!group || !group->IsStreaming()) {

      return;

    }



    bool reconfigure = false;



    if (in_call_) {

      auto audio_set_conf = group->GetConfiguration(LeAudioContextType::CONVERSATIONAL);

      if (audio_set_conf && group->IsGroupConfiguredTo(*audio_set_conf)) {

        log::info("Call is coming, but CIG already set for a call");

        return;

      }

      log::info("Call is coming, speed up reconfiguration for a call");

      reconfigure = true;

    } else {

      if (configuration_context_type_ == LeAudioContextType::CONVERSATIONAL) {

        log::info("Call is ended, speed up reconfiguration for media");

        local_metadata_context_types_.sink.unset(LeAudioContextType::CONVERSATIONAL);

        local_metadata_context_types_.source.unset(LeAudioContextType::CONVERSATIONAL);

        reconfigure = true;

      }

    }



    if (reconfigure) {

      initReconfiguration(group, configuration_context_type_);

    }

  }



  bool IsInCall() override { return in_call_; }

system/bta/le_audio/le_audio_client_test.cc

+531 −0

File changed.

Preview size limit exceeded, changes collapsed.