Merge "SetActivePeer should only update the active peer" into main (59c72539) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/btif_av.cc

+7 −7

Original line number	Diff line number	Diff line
		@@ -725,6 +725,8 @@ class BtifAvSink {
		// cannot set promise but need to be handled within restart_session
		return false;
		}
		LOG(INFO) << "Setting the active peer to peer address %s"
		<< ADDRESS_TO_LOGGABLE_STR(peer_address);
		active_peer_ = peer_address;
		return true;
		}
		@@ -1508,9 +1510,6 @@ BtifAvPeer* BtifAvSink::FindOrCreatePeer(const RawAddress& peer_address,
		peer = new BtifAvPeer(peer_address, AVDT_TSEP_SRC, bta_handle, peer_id);
		peers_.insert(std::make_pair(peer_address, peer));
		peer->Init();
		if (active_peer_.IsEmpty()) {
		active_peer_ = peer_address;
		}
		return peer;
		}

		@@ -3591,11 +3590,12 @@ static void set_active_peer_int(uint8_t peer_sep,
		if (peer_sep == AVDT_TSEP_SRC) {
		if (!btif_av_src_sink_coexist_enabled() \|\| (btif_av_src_sink_coexist_enabled() &&
		btif_av_both_enable() && (btif_av_source.FindPeer(peer_address) == nullptr))) {
		btif_av_sink.SetActivePeer(peer_address,
		std::move(peer_ready_promise));
		if (!btif_av_sink.SetActivePeer(peer_address,
		std::move(peer_ready_promise))) {
		BTIF_TRACE_ERROR("%s: Error setting %s as active Source peer", __func__,
		ADDRESS_TO_LOGGABLE_CSTR(peer_address));
		}
		}
		return;
		}
		// If reached here, we could not set the active peer