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

Commit a1b1e1ae authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Immediately disable to prevent unstable state inspection am: 3568be5d am:... 

Immediately disable to prevent unstable state inspection am: 3568be5d am: 9cc6d6d6 am: 0ecb269b am: c3c10fdf

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



Change-Id: I75ba0a62062fbb86f2f3a150b2c065a5a810ad90
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ac65fa6 c3c10fdf

system/btif/src/btif_av.cc

+2 −2
Original line number Diff line number Diff line
@@ -1159,6 +1159,7 @@ bt_status_t BtifAvSource::Init( 
void BtifAvSource::Cleanup() {

  LOG_INFO("%s", __PRETTY_FUNCTION__);

  if (!enabled_) return;

  enabled_ = false;



  btif_queue_cleanup(UUID_SERVCLASS_AUDIO_SOURCE);
@@ -1174,7 +1175,6 @@ void BtifAvSource::Cleanup() { 
  CleanupAllPeers();



  callbacks_ = nullptr;

  enabled_ = false;

}



BtifAvPeer* BtifAvSource::FindPeer(const RawAddress& peer_address) {
@@ -1416,6 +1416,7 @@ bt_status_t BtifAvSink::Init(btav_sink_callbacks_t* callbacks, 
void BtifAvSink::Cleanup() {

  LOG_INFO("%s", __PRETTY_FUNCTION__);

  if (!enabled_) return;

  enabled_ = false;



  btif_queue_cleanup(UUID_SERVCLASS_AUDIO_SINK);
@@ -1431,7 +1432,6 @@ void BtifAvSink::Cleanup() { 
  CleanupAllPeers();



  callbacks_ = nullptr;

  enabled_ = false;

}



BtifAvPeer* BtifAvSink::FindPeer(const RawAddress& peer_address) {