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

Commit 7df9a7dc authored by Łukasz Rymanowski's avatar Łukasz Rymanowski
Browse files

Remove leaudio_start_stream_race_fix - step 2 

Rename V2 functions

Bug: 322106376
Bug: 325181889
Test: mmm packages/modules/Bluetooth
Flag: com.android.bluetooth.flags.leaudio_start_stream_race_fix
Change-Id: I060bfd5aaffc7eced314dee22edcaa853300de43
parent 508f6b97

system/audio_hal_interface/aidl/le_audio_software_aidl.cc

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ LeAudioTransport::~LeAudioTransport() { 
  }

}



BluetoothAudioCtrlAck LeAudioTransport::StartRequestV2(bool /*is_low_latency*/) {

BluetoothAudioCtrlAck LeAudioTransport::StartRequest(bool /*is_low_latency*/) {

  // Check if operation is pending already

  if (GetStartRequestState() == StartRequestState::PENDING_AFTER_RESUME) {

    log::info("Start request is already pending. Ignore the request");
@@ -343,7 +343,7 @@ LeAudioSinkTransport::LeAudioSinkTransport(SessionType session_type, StreamCallb 
LeAudioSinkTransport::~LeAudioSinkTransport() { delete transport_; }



BluetoothAudioCtrlAck LeAudioSinkTransport::StartRequest(bool is_low_latency) {

  return transport_->StartRequestV2(is_low_latency);

  return transport_->StartRequest(is_low_latency);

}



BluetoothAudioCtrlAck LeAudioSinkTransport::SuspendRequest() {
@@ -431,7 +431,7 @@ LeAudioSourceTransport::LeAudioSourceTransport(SessionType session_type, StreamC 
LeAudioSourceTransport::~LeAudioSourceTransport() { delete transport_; }



BluetoothAudioCtrlAck LeAudioSourceTransport::StartRequest(bool is_low_latency) {

  return transport_->StartRequestV2(is_low_latency);

  return transport_->StartRequest(is_low_latency);

}



BluetoothAudioCtrlAck LeAudioSourceTransport::SuspendRequest() {

system/audio_hal_interface/aidl/le_audio_software_aidl.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public: 
  LeAudioTransport(void (*flush)(void), StreamCallbacks stream_cb, PcmConfiguration pcm_config);

  ~LeAudioTransport();



  BluetoothAudioCtrlAck StartRequestV2(bool is_low_latency);

  BluetoothAudioCtrlAck StartRequest(bool is_low_latency);



  BluetoothAudioCtrlAck SuspendRequest();

system/audio_hal_interface/hidl/le_audio_software_hidl.cc

+3 −5
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ LeAudioTransport::LeAudioTransport(void (*flush)(void), StreamCallbacks stream_c 
      pcm_config_(std::move(pcm_config)),

      start_request_state_(StartRequestState::IDLE) {}



BluetoothAudioCtrlAck LeAudioTransport::StartRequestV2() {

BluetoothAudioCtrlAck LeAudioTransport::StartRequest() {

  SetStartRequestState(StartRequestState::PENDING_BEFORE_RESUME);

  if (stream_cb_.on_resume_(true)) {

    std::lock_guard<std::mutex> guard(start_request_state_mutex_);
@@ -263,7 +263,7 @@ LeAudioSinkTransport::LeAudioSinkTransport(SessionType_2_1 session_type, StreamC 


LeAudioSinkTransport::~LeAudioSinkTransport() { delete transport_; }



BluetoothAudioCtrlAck LeAudioSinkTransport::StartRequest() { return transport_->StartRequestV2(); }

BluetoothAudioCtrlAck LeAudioSinkTransport::StartRequest() { return transport_->StartRequest(); }



BluetoothAudioCtrlAck LeAudioSinkTransport::SuspendRequest() {

  return transport_->SuspendRequest();
@@ -334,9 +334,7 @@ LeAudioSourceTransport::LeAudioSourceTransport(SessionType_2_1 session_type, 


LeAudioSourceTransport::~LeAudioSourceTransport() { delete transport_; }



BluetoothAudioCtrlAck LeAudioSourceTransport::StartRequest() {

  return transport_->StartRequestV2();

}

BluetoothAudioCtrlAck LeAudioSourceTransport::StartRequest() { return transport_->StartRequest(); }



BluetoothAudioCtrlAck LeAudioSourceTransport::SuspendRequest() {

  return transport_->SuspendRequest();

system/audio_hal_interface/hidl/le_audio_software_hidl.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class LeAudioTransport { 
public:

  LeAudioTransport(void (*flush)(void), StreamCallbacks stream_cb, PcmParameters pcm_config);



  BluetoothAudioCtrlAck StartRequestV2();

  BluetoothAudioCtrlAck StartRequest();



  BluetoothAudioCtrlAck SuspendRequest();

system/audio_hal_interface/le_audio_software.cc

+4 −4
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ void LeAudioClientInterface::Sink::StartSession() { 
  }

}



void LeAudioClientInterface::Sink::ConfirmStreamingRequestV2() {

void LeAudioClientInterface::Sink::ConfirmStreamingRequest() {

  auto lambda =

          [&](StartRequestState currect_start_request_state) -> std::pair<StartRequestState, bool> {

    switch (currect_start_request_state) {
@@ -236,7 +236,7 @@ void LeAudioClientInterface::Sink::ConfirmStreamingRequestV2() { 
  }

}



void LeAudioClientInterface::Sink::CancelStreamingRequestV2() {

void LeAudioClientInterface::Sink::CancelStreamingRequest() {

  auto lambda =

          [&](StartRequestState currect_start_request_state) -> std::pair<StartRequestState, bool> {

    switch (currect_start_request_state) {
@@ -499,7 +499,7 @@ void LeAudioClientInterface::Source::ReconfigurationComplete() { 
  }

}



void LeAudioClientInterface::Source::ConfirmStreamingRequestV2() {

void LeAudioClientInterface::Source::ConfirmStreamingRequest() {

  auto lambda =

          [&](StartRequestState currect_start_request_state) -> std::pair<StartRequestState, bool> {

    switch (currect_start_request_state) {
@@ -536,7 +536,7 @@ void LeAudioClientInterface::Source::ConfirmStreamingRequestV2() { 
  }

}



void LeAudioClientInterface::Source::CancelStreamingRequestV2() {

void LeAudioClientInterface::Source::CancelStreamingRequest() {

  auto lambda =

          [&](StartRequestState currect_start_request_state) -> std::pair<StartRequestState, bool> {

    switch (currect_start_request_state) {