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

Commit 4cd15f9e authored by Jeremy Wu's avatar Jeremy Wu Committed by Automerger Merge Worker
Browse files

Merge "Floss: |ack_stream_suspended| in all cases after setting command" am: b11ff74e 

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



Change-Id: Icc2cc37b991d276a9476430c5ca50c5d32ab44eb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 354ad745 b11ff74e

system/btif/src/btif_a2dp_source.cc

+3 −3
Original line number Diff line number Diff line
@@ -710,8 +710,6 @@ void btif_a2dp_source_on_idle(void) { 
void btif_a2dp_source_on_stopped(tBTA_AV_SUSPEND* p_av_suspend) {

  LOG_INFO("%s: state=%s", __func__, btif_a2dp_source_cb.StateStr().c_str());



  if (btif_a2dp_source_cb.State() == BtifA2dpSource::kStateOff) return;



  // allow using this API for other (acknowledgement and stopping media task)

  // than suspend

  if (p_av_suspend != nullptr && p_av_suspend->status != BTA_AV_SUCCESS) {
@@ -725,11 +723,13 @@ void btif_a2dp_source_on_stopped(tBTA_AV_SUSPEND* p_av_suspend) { 
        btif_a2dp_command_ack(A2DP_CTRL_ACK_FAILURE);

      }

    }

  } else if (btif_av_is_a2dp_offload_running()) {

  } else {

    bluetooth::audio::a2dp::ack_stream_suspended(A2DP_CTRL_ACK_SUCCESS);

    return;

  }



  if (btif_a2dp_source_cb.State() == BtifA2dpSource::kStateOff) return;



  // ensure tx frames are immediately suspended

  btif_a2dp_source_cb.tx_flush = true;

  // ensure tx frames are immediately flushed