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

Commit f5de0b77 authored by Cheney Ni's avatar Cheney Ni
Browse files

A2DP: Only apply valid BtifAvPeer to be active 

If there is no BtifAvPeer in the list, it means that peer is
disconnected, and we don't apply it to be the active device.

Bug: 225253089
Tag: #stability
Test: change A2DP active device manually
Change-Id: I74cf2b98c95dc54247b2606780ce51064414d4f1
parent 099bd1e4

system/btif/src/btif_av.cc

+4 −4
Original line number Diff line number Diff line
@@ -490,8 +490,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;
@@ -629,8 +629,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;