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

Commit 090cc7d1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "btif_av: Missing call to ack_stream_started on failed reconfiguration"... 

Merge "btif_av: Missing call to ack_stream_started on failed reconfiguration" into main am: 3943d672 am: d4dead2b

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



Change-Id: I1ca11966269e4cfda0197aa54d89b83f4424fec5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5fac9cae d4dead2b

system/btif/src/btif_av.cc

+5 −1
Original line number Diff line number Diff line
@@ -2570,8 +2570,12 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, 
          log::error("Peer {} : cannot proceed to do AvStart",

                     peer_.PeerAddress());

          peer_.ClearFlags(BtifAvPeer::kFlagPendingStart);

          if (bluetooth::audio::a2dp::is_hal_enabled()) {

            bluetooth::audio::a2dp::ack_stream_started(A2DP_CTRL_ACK_FAILURE);

          } else {

            btif_a2dp_command_ack(A2DP_CTRL_ACK_FAILURE);

          }

        }

        if (peer_.IsSink()) {

          btif_av_source_disconnect(peer_.PeerAddress());

        } else if (peer_.IsSource()) {