Merge "Floss: Fix unused but set variables." (9150e42d) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/btif_storage.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -1943,6 +1943,7 @@ void btif_storage_load_bonded_leaudio_has_devices() {
		!btif_config_exist(name, HAS_FEATURES))
		continue;

		#ifndef TARGET_FLOSS
		int value;
		uint16_t is_acceptlisted = 0;
		if (btif_config_get_int(name, HAS_IS_ACCEPTLISTED, &value))
		@@ -1951,7 +1952,6 @@ void btif_storage_load_bonded_leaudio_has_devices() {
		uint8_t features = 0;
		if (btif_config_get_int(name, HAS_FEATURES, &value)) features = value;

		#ifndef TARGET_FLOSS
		do_in_main_thread(FROM_HERE, Bind(&le_audio::has::HasClient::AddFromStorage,
		bd_addr, features, is_acceptlisted));
		#else

+0 −4

Original line number	Diff line number	Diff line
		@@ -90,7 +90,6 @@ int waitHciDev(int hci_interface) {
		struct pollfd fds[1];
		struct mgmt_pkt ev;
		int fd;
		int ret = 0;

		fd = socket(PF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
		if (fd < 0) {
		@@ -128,11 +127,9 @@ int waitHciDev(int hci_interface) {
		WRITE_NO_INTR(n = poll(fds, 1, -1));
		if (n == -1) {
		LOG_ERROR("Poll error: %s", strerror(errno));
		ret = -1;
		break;
		} else if (n == 0) {
		LOG_ERROR("Timeout, no HCI device detected");
		ret = -1;
		break;
		}

		@@ -140,7 +137,6 @@ int waitHciDev(int hci_interface) {
		WRITE_NO_INTR(n = read(fd, &ev, sizeof(struct mgmt_pkt)));
		if (n < 0) {
		LOG_ERROR("Error reading control channel: %s", strerror(errno));
		ret = -1;
		break;
		}