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

Commit 4eb9feff authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add back the aidl trasnport handle for Sink::CancelStreamingRequest"... 

Merge "Add back the aidl trasnport handle for Sink::CancelStreamingRequest" into main am: e5d2e677

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



Change-Id: Ic9c992042167ee4fa75412c75264b46614cc3ffd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 03fc6115 e5d2e677

system/audio_hal_interface/le_audio_software.cc

+22 −0
Original line number Original line Diff line number Diff line
@@ -325,6 +325,28 @@ void LeAudioClientInterface::Sink::CancelStreamingRequest() { 
        break;

        break;

    }

    }

  }

  }



  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();

      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;

  }

}

}





void LeAudioClientInterface::Sink::CancelStreamingRequestV2() {

void LeAudioClientInterface::Sink::CancelStreamingRequestV2() {