Merge "Fix crash on SDP results" into main (3285d053) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_disc.cc

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -249,9 +249,11 @@ void bta_dm_sdp_finished(RawAddress bda, tBTA_STATUS result, std::vector<bluetoo

	/* Callback from sdp with discovery status */		/* Callback from sdp with discovery status */
	void bta_dm_sdp_callback(const RawAddress& /* bd_addr */, tSDP_STATUS sdp_status) {		void bta_dm_sdp_callback(const RawAddress& /* bd_addr */, tSDP_STATUS sdp_status) {
	log::info("{}", bta_dm_state_text(bta_dm_discovery_get_state()));		bool sdp_pending = bta_dm_discovery_cb.transports & BT_TRANSPORT_BR_EDR;
			log::info("{}, sdp_pending: {}", bta_dm_state_text(bta_dm_discovery_get_state()), sdp_pending);

	if (bta_dm_discovery_get_state() == BTA_DM_DISCOVER_IDLE) {		if (bta_dm_discovery_get_state() == BTA_DM_DISCOVER_IDLE \|\| !sdp_pending \|\|
			!bta_dm_discovery_cb.sdp_state) {
	return;		return;
	}		}