Merge "Fix bugprone-use-after-move warnings" into rvc-dev (3b6f5ac3) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/security/internal/security_manager_impl.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -181,7 +181,7 @@ void SecurityManagerImpl::HandleEvent(T packet) {
	security_database_.FindOrCreate(hci::AddressWithType{bd_addr, hci::AddressType::PUBLIC_DEVICE_ADDRESS});		security_database_.FindOrCreate(hci::AddressWithType{bd_addr, hci::AddressType::PUBLIC_DEVICE_ADDRESS});
	auto authentication_requirements = hci::AuthenticationRequirements::NO_BONDING;		auto authentication_requirements = hci::AuthenticationRequirements::NO_BONDING;
	DispatchPairingHandler(record, true, authentication_requirements);		DispatchPairingHandler(record, true, authentication_requirements);
	entry = pairing_handler_map_.find(packet.GetBdAddr());		entry = pairing_handler_map_.find(bd_addr);
	}		}
	entry->second->OnReceive(packet);		entry->second->OnReceive(packet);
	}		}

system/stack/btm/btm_ble_multi_adv.cc

+11 −7

Original line number	Original line	Diff line number	Diff line
	@@ -430,7 +430,8 @@ class BleAdvertisingManagerImpl
	c->self->adv_inst[c->inst_id].tx_power = tx_power;		c->self->adv_inst[c->inst_id].tx_power = tx_power;

	if (c->self->adv_inst[c->inst_id].own_address_type == BLE_ADDR_PUBLIC) {		if (c->self->adv_inst[c->inst_id].own_address_type == BLE_ADDR_PUBLIC) {
	c->self->StartAdvertisingSetAfterAddressPart(std::move(c));		auto self = c->self;
			self->StartAdvertisingSetAfterAddressPart(std::move(c));
	return;		return;
	}		}

	@@ -450,7 +451,8 @@ class BleAdvertisingManagerImpl
	return;		return;
	}		}

	c->self->StartAdvertisingSetAfterAddressPart(std::move(c));		auto self = c->self;
			self->StartAdvertisingSetAfterAddressPart(std::move(c));
	}, base::Passed(&c)));		}, base::Passed(&c)));
	}, base::Passed(&c)));		}, base::Passed(&c)));
	}, base::Passed(&c)));		}, base::Passed(&c)));
	@@ -493,11 +495,11 @@ class BleAdvertisingManagerImpl
	return;		return;
	}		}

			auto self = c->self;
	if (c->periodic_params.enable) {		if (c->periodic_params.enable) {
	c->self->StartAdvertisingSetPeriodicPart(		self->StartAdvertisingSetPeriodicPart(std::move(c));
	std::move(c));
	} else {		} else {
	c->self->StartAdvertisingSetFinish(std::move(c));		self->StartAdvertisingSetFinish(std::move(c));
	}		}
	},		},
	base::Passed(&c)));		base::Passed(&c)));
	@@ -551,7 +553,8 @@ class BleAdvertisingManagerImpl
	return;		return;
	}		}

	c->self->StartAdvertisingSetFinish(std::move(c));		auto self = c->self;
			self->StartAdvertisingSetFinish(std::move(c));

	}, base::Passed(&c)));		}, base::Passed(&c)));
	}, base::Passed(&c)));		}, base::Passed(&c)));
	@@ -789,8 +792,9 @@ class BleAdvertisingManagerImpl
	int length = moreThanOnePacket ? ADV_DATA_LEN_MAX : dataSize - offset;		int length = moreThanOnePacket ? ADV_DATA_LEN_MAX : dataSize - offset;
	int newOffset = offset + length;		int newOffset = offset + length;

			auto dataData = data.data();
	sender.Run(		sender.Run(
	inst_id, operation, length, data.data() + offset,		inst_id, operation, length, dataData + offset,
	Bind(&BleAdvertisingManagerImpl::DivideAndSendDataRecursively, false,		Bind(&BleAdvertisingManagerImpl::DivideAndSendDataRecursively, false,
	inst_id, std::move(data), newOffset, std::move(done_cb), sender));		inst_id, std::move(data), newOffset, std::move(done_cb), sender));
	}		}