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

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

Merge "A2DP: Only apply valid BtifAvPeer to be active" am: ffbcf282 am:... 

Merge "A2DP: Only apply valid BtifAvPeer to be active" am: ffbcf282 am: 92a47694 am: 3bd8b4bb am: c3faddf4

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



Change-Id: I27df5e263aff76dc1dfafc10d223a89ab0bc16cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2203a65 c3faddf4

system/btif/src/btif_av.cc

+4 −4
Original line number Diff line number Diff line
@@ -492,8 +492,8 @@ class BtifAvSource { 
    }



    BtifAvPeer* peer = FindPeer(peer_address);

    if (peer != nullptr && !peer->IsConnected()) {

      LOG(ERROR) << __func__ << ": Error setting " << peer->PeerAddress()

    if (peer == nullptr || !peer->IsConnected()) {

      LOG(ERROR) << __func__ << ": Error setting " << peer_address

                 << " as active Source peer";

      peer_ready_promise.set_value();

      return false;
@@ -631,8 +631,8 @@ class BtifAvSink { 
    }



    BtifAvPeer* peer = FindPeer(peer_address);

    if (peer != nullptr && !peer->IsConnected()) {

      LOG(ERROR) << __func__ << ": Error setting " << peer->PeerAddress()

    if (peer == nullptr || !peer->IsConnected()) {

      LOG(ERROR) << __func__ << ": Error setting " << peer_address

                 << " as active Sink peer";

      peer_ready_promise.set_value();

      return false;