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

Commit cbae24c6 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "Ignore redundant |BTIF_AV_SUSPEND_STREAM_REQ_EVT|" into main am: 8e48acf2 am: 227c416d 

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



Change-Id: I61cfa7ff4b09994177ee3662aa0682160c8576cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7e1c6e31 227c416d

system/btif/src/btif_av.cc

+6 −0
Original line number Diff line number Diff line
@@ -2591,6 +2591,12 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, 
               ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()),

               BtifAvEvent::EventName(event).c_str(),

               peer_.FlagsToString().c_str());



      // There is a pending LocalSuspend already, ignore.

      if (peer_.CheckFlags(BtifAvPeer::kFlagLocalSuspendPending)) {

        break;

      }



      // Set pending flag to ensure the BTIF task is not trying to restart

      // the stream while suspend is in progress.

      peer_.SetFlags(BtifAvPeer::kFlagLocalSuspendPending);