Merge "Migrate base::Bind to base::BindOnce for do_in_jni_thread" into main (08c97d80) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/include/btif_common.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -171,7 +171,7 @@ base::Callback<R(Args...)> jni_thread_wrapper(const base::Location& from_here,
	[](const base::Location& from_here, base::Callback<R(Args...)> cb,		[](const base::Location& from_here, base::Callback<R(Args...)> cb,
	Args... args) {		Args... args) {
	do_in_jni_thread(from_here,		do_in_jni_thread(from_here,
	base::Bind(cb, std::forward<Args>(args)...));		base::BindOnce(cb, std::forward<Args>(args)...));
	},		},
	from_here, std::move(cb));		from_here, std::move(cb));
	}		}

system/btif/src/bluetooth.cc

+8 −6

Original line number	Original line	Diff line number	Diff line
	@@ -980,15 +980,17 @@ static bt_os_callouts_t* wakelock_os_callouts_saved = nullptr;

	static int acquire_wake_lock_cb(const char* lock_name) {		static int acquire_wake_lock_cb(const char* lock_name) {
	return do_in_jni_thread(		return do_in_jni_thread(
	FROM_HERE, base::Bind(base::IgnoreResult(		FROM_HERE,
	wakelock_os_callouts_saved->acquire_wake_lock),		base::BindOnce(
			base::IgnoreResult(wakelock_os_callouts_saved->acquire_wake_lock),
	lock_name));		lock_name));
	}		}

	static int release_wake_lock_cb(const char* lock_name) {		static int release_wake_lock_cb(const char* lock_name) {
	return do_in_jni_thread(		return do_in_jni_thread(
	FROM_HERE, base::Bind(base::IgnoreResult(		FROM_HERE,
	wakelock_os_callouts_saved->release_wake_lock),		base::BindOnce(
			base::IgnoreResult(wakelock_os_callouts_saved->release_wake_lock),
	lock_name));		lock_name));
	}		}

system/btif/src/btif_av.cc

+30 −27

Original line number	Original line	Diff line number	Diff line
	@@ -2930,11 +2930,13 @@ static void btif_report_connection_state(const RawAddress& peer_address,

	if (peer->IsSink()) {		if (peer->IsSink()) {
	do_in_jni_thread(		do_in_jni_thread(
	FROM_HERE, base::Bind(btif_av_source.Callbacks()->connection_state_cb,		FROM_HERE,
			base::BindOnce(btif_av_source.Callbacks()->connection_state_cb,
	peer_address, state, btav_error_t{}));		peer_address, state, btav_error_t{}));
	} else if (peer->IsSource()) {		} else if (peer->IsSource()) {
	do_in_jni_thread(FROM_HERE,		do_in_jni_thread(
	base::Bind(btif_av_sink.Callbacks()->connection_state_cb,		FROM_HERE,
			base::BindOnce(btif_av_sink.Callbacks()->connection_state_cb,
	peer_address, state, btav_error_t{}));		peer_address, state, btav_error_t{}));
	}		}
	return;		return;
	@@ -2943,14 +2945,14 @@ static void btif_report_connection_state(const RawAddress& peer_address,
	if (btif_av_source.Enabled()) {		if (btif_av_source.Enabled()) {
	do_in_jni_thread(		do_in_jni_thread(
	FROM_HERE,		FROM_HERE,
	base::Bind(btif_av_source.Callbacks()->connection_state_cb,		base::BindOnce(
	peer_address, state,		btif_av_source.Callbacks()->connection_state_cb, peer_address,
	btav_error_t{.status = status, .error_code = error_code}));		state, btav_error_t{.status = status, .error_code = error_code}));
	} else if (btif_av_sink.Enabled()) {		} else if (btif_av_sink.Enabled()) {
	do_in_jni_thread(		do_in_jni_thread(
	FROM_HERE,		FROM_HERE,
	base::Bind(btif_av_sink.Callbacks()->connection_state_cb, peer_address,		base::BindOnce(
	state,		btif_av_sink.Callbacks()->connection_state_cb, peer_address, state,
	btav_error_t{.status = status, .error_code = error_code}));		btav_error_t{.status = status, .error_code = error_code}));
	}		}
	}		}
	@@ -2972,23 +2974,23 @@ static void btif_report_audio_state(const RawAddress& peer_address,
	if (btif_av_both_enable()) {		if (btif_av_both_enable()) {
	BtifAvPeer* peer = btif_av_find_peer(peer_address);		BtifAvPeer* peer = btif_av_find_peer(peer_address);
	if (peer->IsSink()) {		if (peer->IsSink()) {
	do_in_jni_thread(FROM_HERE,		do_in_jni_thread(
	base::Bind(btif_av_source.Callbacks()->audio_state_cb,		FROM_HERE, base::BindOnce(btif_av_source.Callbacks()->audio_state_cb,
	peer_address, state));		peer_address, state));
	} else if (peer->IsSource()) {		} else if (peer->IsSource()) {
	do_in_jni_thread(FROM_HERE,		do_in_jni_thread(FROM_HERE,
	base::Bind(btif_av_sink.Callbacks()->audio_state_cb,		base::BindOnce(btif_av_sink.Callbacks()->audio_state_cb,
	peer_address, state));		peer_address, state));
	}		}
	return;		return;
	}		}
	if (btif_av_source.Enabled()) {		if (btif_av_source.Enabled()) {
	do_in_jni_thread(FROM_HERE,		do_in_jni_thread(FROM_HERE,
	base::Bind(btif_av_source.Callbacks()->audio_state_cb,		base::BindOnce(btif_av_source.Callbacks()->audio_state_cb,
	peer_address, state));		peer_address, state));
	} else if (btif_av_sink.Enabled()) {		} else if (btif_av_sink.Enabled()) {
	do_in_jni_thread(FROM_HERE,		do_in_jni_thread(FROM_HERE,
	base::Bind(btif_av_sink.Callbacks()->audio_state_cb,		base::BindOnce(btif_av_sink.Callbacks()->audio_state_cb,
	peer_address, state));		peer_address, state));
	}		}

	@@ -3024,8 +3026,8 @@ void btif_av_report_source_codec_state(
	if (btif_av_source.Enabled()) {		if (btif_av_source.Enabled()) {
	do_in_jni_thread(		do_in_jni_thread(
	FROM_HERE,		FROM_HERE,
	base::Bind(btif_av_source.Callbacks()->audio_config_cb, peer_address,		base::BindOnce(btif_av_source.Callbacks()->audio_config_cb,
	codec_config, codecs_local_capabilities,		peer_address, codec_config, codecs_local_capabilities,
	codecs_selectable_capabilities));		codecs_selectable_capabilities));
	}		}
	}		}
	@@ -3043,7 +3045,7 @@ static void btif_av_report_sink_audio_config_state(
	ADDRESS_TO_LOGGABLE_CSTR(peer_address), sample_rate, channel_count);		ADDRESS_TO_LOGGABLE_CSTR(peer_address), sample_rate, channel_count);
	if (btif_av_sink.Enabled()) {		if (btif_av_sink.Enabled()) {
	do_in_jni_thread(FROM_HERE,		do_in_jni_thread(FROM_HERE,
	base::Bind(btif_av_sink.Callbacks()->audio_config_cb,		base::BindOnce(btif_av_sink.Callbacks()->audio_config_cb,
	peer_address, sample_rate, channel_count));		peer_address, sample_rate, channel_count));
	}		}
	}		}
	@@ -3419,7 +3421,8 @@ static void bta_av_event_callback(tBTA_AV_EVT event, tBTA_AV* p_data) {
	if (btif_av_both_enable()) {		if (btif_av_both_enable()) {
	BtifAvEvent btif_av_event(event, p_data, sizeof(tBTA_AV));		BtifAvEvent btif_av_event(event, p_data, sizeof(tBTA_AV));
	do_in_main_thread(		do_in_main_thread(
	FROM_HERE, base::Bind(&btif_av_handle_bta_av_event,		FROM_HERE,
			base::BindOnce(&btif_av_handle_bta_av_event,
	AVDT_TSEP_INVALID /* peer_sep */, btif_av_event));		AVDT_TSEP_INVALID /* peer_sep */, btif_av_event));
	return;		return;
	}		}

system/btif/src/btif_bqr.cc

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -808,10 +808,10 @@ class BluetoothQualityReportInterfaceImpl

	do_in_jni_thread(		do_in_jni_thread(
	FROM_HERE,		FROM_HERE,
	base::Bind(&bluetooth::bqr::BluetoothQualityReportCallbacks::		base::BindOnce(&bluetooth::bqr::BluetoothQualityReportCallbacks::
	bqr_delivery_callback,		bqr_delivery_callback,
	base::Unretained(callbacks), bd_addr, lmp_ver, lmp_subver,		base::Unretained(callbacks), bd_addr, lmp_ver,
	manufacturer_id, std::move(raw_data)));		lmp_subver, manufacturer_id, std::move(raw_data)));
	}		}

	private:		private:

system/btif/src/btif_core.cc

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -153,7 +153,7 @@ bt_status_t btif_transfer_context(tBTIF_CBACK* p_cback, uint16_t event,
	memcpy(p_msg->p_param, p_params, param_len); /* callback parameter data */		memcpy(p_msg->p_param, p_params, param_len); /* callback parameter data */
	}		}

	return do_in_jni_thread(base::Bind(&bt_jni_msg_ready, p_msg));		return do_in_jni_thread(base::BindOnce(&bt_jni_msg_ready, p_msg));
	}		}

	/**		/**
	@@ -180,8 +180,8 @@ bool is_on_jni_thread() {
	static void do_post_on_bt_jni(BtJniClosure closure) { closure(); }		static void do_post_on_bt_jni(BtJniClosure closure) { closure(); }

	void post_on_bt_jni(BtJniClosure closure) {		void post_on_bt_jni(BtJniClosure closure) {
	ASSERT(do_in_jni_thread(FROM_HERE,		ASSERT(do_in_jni_thread(FROM_HERE, base::BindOnce(do_post_on_bt_jni,
	base::Bind(do_post_on_bt_jni, std::move(closure))) ==		std::move(closure))) ==
	BT_STATUS_SUCCESS);		BT_STATUS_SUCCESS);
	}		}