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

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

Merge "le_audio_software: Fix CancelStreamingRequestV2 functions" into main... 

Merge "le_audio_software: Fix CancelStreamingRequestV2 functions" into main am: dbfd8e4d am: 908574d1

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



Change-Id: I2a4f99e5f1db1d9fcaee54ef8934e76142af54e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0490ca2 908574d1

system/audio_hal_interface/le_audio_software.cc

+20 −32
Original line number Diff line number Diff line
@@ -351,51 +351,39 @@ void LeAudioClientInterface::Sink::CancelStreamingRequest() { 
}



void LeAudioClientInterface::Sink::CancelStreamingRequestV2() {

  if (HalVersionManager::GetHalTransport() ==

      BluetoothAudioHalTransport::HIDL) {

    auto hidl_instance = hidl::le_audio::LeAudioSinkTransport::instance;

    auto start_request_state = hidl_instance->GetStartRequestState();

    switch (start_request_state) {

  auto lambda = [&](StartRequestState currect_start_request_state)

      -> std::pair<StartRequestState, bool> {

    switch (currect_start_request_state) {

      case StartRequestState::IDLE:

        log::warn(", no pending start stream request");

        return;

        return std::make_pair(StartRequestState::IDLE, false);

      case StartRequestState::PENDING_BEFORE_RESUME:

        log::info("Response before sending PENDING to audio HAL");

        hidl_instance->SetStartRequestState(StartRequestState::CANCELED);

        return;

        return std::make_pair(StartRequestState::CANCELED, false);

      case StartRequestState::PENDING_AFTER_RESUME:

        log::info("Response after sending PENDING to audio HAL");

        hidl_instance->ClearStartRequestState();

        hidl::le_audio::LeAudioSinkTransport::interface->StreamStarted(

            hidl::BluetoothAudioCtrlAck::FAILURE);

        return;

        return std::make_pair(StartRequestState::IDLE, true);

      case StartRequestState::CONFIRMED:

      case StartRequestState::CANCELED:

        log::error("Invalid state, start stream already confirmed");

        break;

        return std::make_pair(currect_start_request_state, false);

    }

  };



  if (HalVersionManager::GetHalTransport() ==

      BluetoothAudioHalTransport::HIDL) {

    auto hidl_instance = hidl::le_audio::LeAudioSinkTransport::instance;

    if (hidl_instance->IsRequestCompletedAfterUpdate(lambda)) {

      hidl::le_audio::LeAudioSinkTransport::interface->StreamStarted(

          hidl::BluetoothAudioCtrlAck::FAILURE);

    }

    return;

  }



  auto aidl_instance = get_aidl_transport_instance(is_broadcaster_);

  auto start_request_state = aidl_instance->GetStartRequestState();

  switch (start_request_state) {

    case StartRequestState::IDLE:

      log::warn(", no pending start stream request");

      return;

    case StartRequestState::PENDING_BEFORE_RESUME:

      log::info("Response before sending PENDING to audio HAL");

      aidl_instance->SetStartRequestState(StartRequestState::CANCELED);

      return;

    case StartRequestState::PENDING_AFTER_RESUME:

      log::info("Response after sending PENDING to audio HAL");

      aidl_instance->ClearStartRequestState();

  if (aidl_instance->IsRequestCompletedAfterUpdate(lambda)) {

    get_aidl_client_interface(is_broadcaster_)

        ->StreamStarted(aidl::BluetoothAudioCtrlAck::FAILURE);

      return;

    case StartRequestState::CONFIRMED:

    case StartRequestState::CANCELED:

      log::error("Invalid state, start stream already confirmed");

      break;

  }

}