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

Commit 54cec65a authored Apr 24, 2024 by Chris Manton Committed by Automerger Merge Worker Apr 24, 2024

Flag: Remove api_get_connection_state_sync_on_main am: 2a614a86

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

Change-Id: I4159563ae3a84e092b75eebb26ec04cc75a09fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents e9fd98d4 2a614a86

flags/connectivity.aconfig

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -14,10 +14,3 @@ flag {
	description: "Guard the le shim connection map with a mutex"		description: "Guard the le shim connection map with a mutex"
	bug: "302054609"		bug: "302054609"
	}		}

	flag {
	name: "api_get_connection_state_sync_on_main"
	namespace: "bluetooth"
	description: "API call is unprotected from thread race conditions"
	bug: "325333718"
	}

system/btif/src/bluetooth.cc

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -674,12 +674,8 @@ static int get_connection_state(const RawAddress* bd_addr) {

	if (bd_addr == nullptr) return 0;		if (bd_addr == nullptr) return 0;

	if (IS_FLAG_ENABLED(api_get_connection_state_sync_on_main)) {
	return btif_dm_get_connection_state_sync(*bd_addr);
	} else {
	return btif_dm_get_connection_state(*bd_addr);		return btif_dm_get_connection_state(*bd_addr);
	}		}
	}

	static int pin_reply(const RawAddress* bd_addr, uint8_t accept, uint8_t pin_len,		static int pin_reply(const RawAddress* bd_addr, uint8_t accept, uint8_t pin_len,
	bt_pin_code_t* pin_code) {		bt_pin_code_t* pin_code) {