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

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

Merge "audio_hal_interface: Remove reduntant read" into main am: 694a8a71 am: 24f9a421 

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



Change-Id: I1db7ac0fdd0716ac0d7df383764a8a53b0146c98
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e10e0443 24f9a421

system/audio_hal_interface/aidl/client_interface_aidl.cc

+4 −0
Original line number Diff line number Diff line
@@ -538,6 +538,10 @@ void BluetoothAudioClientInterface::FlushAudioData() { 
    return;

  }

  size_t size = data_mq_->availableToRead();

  if (size == 0) {

    return;

  }



  std::vector<MqDataType> buffer(size);



  if (data_mq_->read(buffer.data(), size) != size) {

system/audio_hal_interface/aidl/le_audio_software_aidl.cc

+3 −0
Original line number Diff line number Diff line
@@ -162,8 +162,10 @@ BluetoothAudioCtrlAck LeAudioTransport::SuspendRequest() { 
  log::info("");

  if (stream_cb_.on_suspend_()) {

    flush_();

    log::info("completed with a success");

    return BluetoothAudioCtrlAck::SUCCESS_FINISHED;

  } else {

    log::info("completed with a failure");

    return BluetoothAudioCtrlAck::FAILURE;

  }

}
@@ -172,6 +174,7 @@ void LeAudioTransport::StopRequest() { 
  log::info("");

  if (stream_cb_.on_suspend_()) {

    flush_();

    log::info("completed with a success");

  }

}

system/audio_hal_interface/hidl/client_interface_hidl.cc

+5 −0
Original line number Diff line number Diff line
@@ -751,6 +751,11 @@ void BluetoothAudioClientInterface::FlushAudioData() { 
    return;

  }

  size_t size = mDataMQ->availableToRead();



  if (size == 0) {

    return;

  }



  uint8_t p_buf[size];



  if (mDataMQ->read(p_buf, size) != size)

system/audio_hal_interface/hidl/le_audio_software_hidl.cc

+3 −0
Original line number Diff line number Diff line
@@ -166,8 +166,10 @@ BluetoothAudioCtrlAck LeAudioTransport::SuspendRequest() { 
  log::info("");

  if (stream_cb_.on_suspend_()) {

    flush_();

    log::info("completed with a success");

    return BluetoothAudioCtrlAck::SUCCESS_FINISHED;

  } else {

    log::info("completed with a failure");

    return BluetoothAudioCtrlAck::FAILURE;

  }

}
@@ -176,6 +178,7 @@ void LeAudioTransport::StopRequest() { 
  log::info("");

  if (stream_cb_.on_suspend_()) {

    flush_();

    log::info("completed with a success");

  }

}