summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--system/audio_bluetooth_hw/device_port_proxy.cc6
-rw-r--r--system/bta/csis/csis_client.cc4
-rw-r--r--system/bta/le_audio/broadcaster/broadcaster_test.cc2
-rw-r--r--system/bta/le_audio/devices.cc2
-rw-r--r--system/bta/le_audio/state_machine_test.cc2
-rw-r--r--system/gd/dumpsys/internal/filter_internal_test.cc4
-rw-r--r--system/gd/hal/hci_hal_fake.cc8
-rw-r--r--system/gd/hal/snoop_logger_socket_thread.cc2
-rw-r--r--system/gd/hci/acl_manager/le_acl_connection_test.cc4
-rw-r--r--tools/rootcanal/model/controller/controller_properties.cc4
-rw-r--r--tools/rootcanal/model/devices/beacon.cc8
-rw-r--r--tools/rootcanal/model/devices/scripted_beacon.cc4
12 files changed, 24 insertions, 26 deletions
diff --git a/system/audio_bluetooth_hw/device_port_proxy.cc b/system/audio_bluetooth_hw/device_port_proxy.cc
index 6c0ae4ea04..8f29654d1c 100644
--- a/system/audio_bluetooth_hw/device_port_proxy.cc
+++ b/system/audio_bluetooth_hw/device_port_proxy.cc
@@ -576,8 +576,7 @@ void BluetoothAudioPortAidl::UpdateSourceMetadata(const source_metadata_v7* sour
static_cast<AudioUsage>(source_metadata->tracks[i].base.usage);
hal_source_metadata.tracks[i].contentType =
static_cast<AudioContentType>(source_metadata->tracks[i].base.content_type);
- hal_source_metadata.tracks[i].tags =
- std::move(CovertAudioTagFromV7(source_metadata->tracks[i].tags));
+ hal_source_metadata.tracks[i].tags = CovertAudioTagFromV7(source_metadata->tracks[i].tags);
}
BluetoothAudioSessionControl::UpdateSourceMetadata(session_type_, hal_source_metadata);
@@ -601,8 +600,7 @@ void BluetoothAudioPortAidl::UpdateSinkMetadata(const sink_metadata_v7* sink_met
hal_sink_metadata.tracks[i].source =
static_cast<AudioSource>(sink_metadata->tracks[i].base.source);
hal_sink_metadata.tracks[i].gain = sink_metadata->tracks[i].base.gain;
- hal_sink_metadata.tracks[i].tags =
- std::move(CovertAudioTagFromV7(sink_metadata->tracks[i].tags));
+ hal_sink_metadata.tracks[i].tags = CovertAudioTagFromV7(sink_metadata->tracks[i].tags);
}
BluetoothAudioSessionControl::UpdateSinkMetadata(session_type_, hal_sink_metadata);
diff --git a/system/bta/csis/csis_client.cc b/system/bta/csis/csis_client.cc
index 546f340817..16e5ad0559 100644
--- a/system/bta/csis/csis_client.cc
+++ b/system/bta/csis/csis_client.cc
@@ -987,7 +987,7 @@ private:
CsisGroupLockStatus status) {
log::debug("group id: {}, target state {}", csis_group->GetGroupId(), lock ? "lock" : "unlock");
- NotifyGroupStatus(csis_group->GetGroupId(), lock, status, std::move(csis_group->GetLockCb()));
+ NotifyGroupStatus(csis_group->GetGroupId(), lock, status, csis_group->GetLockCb());
csis_group->SetTargetLockState(CsisLockState::CSIS_STATE_UNSET);
}
@@ -1280,7 +1280,7 @@ private:
devices.push_back(std::move(bda));
}
- return std::move(devices);
+ return devices;
}
int GetNumOfKnownExpectedDevicesWaitingForBonding(int group_id) {
diff --git a/system/bta/le_audio/broadcaster/broadcaster_test.cc b/system/bta/le_audio/broadcaster/broadcaster_test.cc
index a30d424ec7..e40385caa2 100644
--- a/system/bta/le_audio/broadcaster/broadcaster_test.cc
+++ b/system/bta/le_audio/broadcaster/broadcaster_test.cc
@@ -179,7 +179,7 @@ std::unique_ptr<LeAudioSourceAudioHalClient> LeAudioSourceAudioHalClient::Acquir
std::unique_ptr<LeAudioSourceAudioHalClient> ptr(
(LeAudioSourceAudioHalClient*)mock_audio_source_);
is_audio_hal_acquired = true;
- return std::move(ptr);
+ return ptr;
}
return nullptr;
}
diff --git a/system/bta/le_audio/devices.cc b/system/bta/le_audio/devices.cc
index b76ebc214e..2677492ba6 100644
--- a/system/bta/le_audio/devices.cc
+++ b/system/bta/le_audio/devices.cc
@@ -1160,7 +1160,7 @@ std::vector<uint8_t> LeAudioDevice::GetMetadata(AudioContexts context_type,
AppendMetadataLtvEntryForStreamingContext(metadata, context_type);
AppendMetadataLtvEntryForCcidList(metadata, ccid_list);
- return std::move(metadata);
+ return metadata;
}
bool LeAudioDevice::IsMetadataChanged(const BidirectionalPair<AudioContexts>& context_types,
diff --git a/system/bta/le_audio/state_machine_test.cc b/system/bta/le_audio/state_machine_test.cc
index b3e7024d5f..1b54d417ce 100644
--- a/system/bta/le_audio/state_machine_test.cc
+++ b/system/bta/le_audio/state_machine_test.cc
@@ -664,7 +664,7 @@ protected:
le_audio_devices_.push_back(leAudioDevice);
addresses_.push_back(leAudioDevice->address_);
- return std::move(leAudioDevice);
+ return leAudioDevice;
}
LeAudioDeviceGroup* GroupTheDevice(int group_id,
diff --git a/system/gd/dumpsys/internal/filter_internal_test.cc b/system/gd/dumpsys/internal/filter_internal_test.cc
index 5fcce93141..cc92bd1045 100644
--- a/system/gd/dumpsys/internal/filter_internal_test.cc
+++ b/system/gd/dumpsys/internal/filter_internal_test.cc
@@ -42,7 +42,7 @@ protected:
void ParseReflectionSchema(unsigned char* bfbs, unsigned int bfbs_len) {
ASSERT_TRUE(reflection_schema_.empty());
- reflection_schema_ = std::move(std::vector<const uint8_t>(bfbs, bfbs + bfbs_len));
+ reflection_schema_ = std::vector<const uint8_t>(bfbs, bfbs + bfbs_len);
flatbuffers::Verifier verifier(reflection_schema_.data(), reflection_schema_.size());
ASSERT_TRUE(reflection::VerifySchemaBuffer(verifier));
schema_ = reflection::GetSchema(reflection_schema_.data());
@@ -50,7 +50,7 @@ protected:
}
const reflection::Schema* schema_{nullptr};
- flatbuffers::FlatBufferBuilder fb_builder_ = std::move(flatbuffers::FlatBufferBuilder(1024));
+ flatbuffers::FlatBufferBuilder fb_builder_ = flatbuffers::FlatBufferBuilder(1024);
private:
std::vector<const uint8_t> reflection_schema_;
diff --git a/system/gd/hal/hci_hal_fake.cc b/system/gd/hal/hci_hal_fake.cc
index 2a29017c90..7d396dd571 100644
--- a/system/gd/hal/hci_hal_fake.cc
+++ b/system/gd/hal/hci_hal_fake.cc
@@ -39,7 +39,7 @@ std::optional<hci::CommandView> TestHciHal::GetSentCommand(std::chrono::millisec
// Timed out
return {};
}
- auto command = hci::CommandView::Create(GetPacketView(std::move(outgoing_commands_.take())));
+ auto command = hci::CommandView::Create(GetPacketView(outgoing_commands_.take()));
log::assert_that(command.IsValid(), "assert failed: command.IsValid()");
return command;
}
@@ -49,7 +49,7 @@ std::optional<hci::AclView> TestHciHal::GetSentAcl(std::chrono::milliseconds tim
// Timed out
return {};
}
- auto acl = hci::AclView::Create(GetPacketView(std::move(outgoing_acl_.take())));
+ auto acl = hci::AclView::Create(GetPacketView(outgoing_acl_.take()));
log::assert_that(acl.IsValid(), "assert failed: acl.IsValid()");
return acl;
}
@@ -59,7 +59,7 @@ std::optional<hci::ScoView> TestHciHal::GetSentSco(std::chrono::milliseconds tim
// Timed out
return {};
}
- auto sco = hci::ScoView::Create(GetPacketView(std::move(outgoing_sco_.take())));
+ auto sco = hci::ScoView::Create(GetPacketView(outgoing_sco_.take()));
log::assert_that(sco.IsValid(), "assert failed: sco.IsValid()");
return sco;
}
@@ -71,7 +71,7 @@ std::optional<hci::IsoView> TestHciHal::GetSentIso(std::chrono::milliseconds tim
}
log::assert_that(outgoing_iso_.wait_to_take(timeout),
"assert failed: outgoing_iso_.wait_to_take(timeout)");
- auto iso = hci::IsoView::Create(GetPacketView(std::move(outgoing_iso_.take())));
+ auto iso = hci::IsoView::Create(GetPacketView(outgoing_iso_.take()));
log::assert_that(iso.IsValid(), "assert failed: iso.IsValid()");
return iso;
}
diff --git a/system/gd/hal/snoop_logger_socket_thread.cc b/system/gd/hal/snoop_logger_socket_thread.cc
index da7f21f01b..b2829626cf 100644
--- a/system/gd/hal/snoop_logger_socket_thread.cc
+++ b/system/gd/hal/snoop_logger_socket_thread.cc
@@ -51,7 +51,7 @@ std::future<bool> SnoopLoggerSocketThread::Start() {
listen_thread_ = std::make_unique<std::thread>(&SnoopLoggerSocketThread::Run, this,
std::move(thread_started));
stop_thread_ = false;
- return std::move(future);
+ return future;
}
void SnoopLoggerSocketThread::Stop() {
diff --git a/system/gd/hci/acl_manager/le_acl_connection_test.cc b/system/gd/hci/acl_manager/le_acl_connection_test.cc
index 1b80e08ec0..e8b9d0637a 100644
--- a/system/gd/hci/acl_manager/le_acl_connection_test.cc
+++ b/system/gd/hci/acl_manager/le_acl_connection_test.cc
@@ -96,7 +96,7 @@ public:
const std::lock_guard<std::mutex> lock(command_queue_mutex_);
auto packet = std::move(command_queue_.front());
command_queue_.pop();
- return std::move(packet);
+ return packet;
}
std::shared_ptr<std::vector<uint8_t>> DequeueCommandBytes() {
@@ -110,7 +110,7 @@ public:
common::ContextualOnceCallback<void(hci::CommandStatusView)> DequeueStatusCallback() {
auto on_status = std::move(command_status_callbacks.front());
command_status_callbacks.pop_front();
- return std::move(on_status);
+ return on_status;
}
bool IsPacketQueueEmpty() const {
diff --git a/tools/rootcanal/model/controller/controller_properties.cc b/tools/rootcanal/model/controller/controller_properties.cc
index b9afe2cf40..b1ad2e8082 100644
--- a/tools/rootcanal/model/controller/controller_properties.cc
+++ b/tools/rootcanal/model/controller/controller_properties.cc
@@ -1574,7 +1574,7 @@ bool ControllerProperties::CheckSupportedCommands() const {
}
ControllerProperties::ControllerProperties()
- : supported_commands(std::move(SupportedCommands())),
+ : supported_commands(SupportedCommands()),
lmp_features({Page0LmpFeatures(), 0, Page2LmpFeatures()}),
le_features(LlFeatures()) {
if (!CheckSupportedFeatures()) {
@@ -1670,7 +1670,7 @@ static void SetSupportedCommandBits(std::array<uint8_t, 64>& supported_commands,
ControllerProperties::ControllerProperties(rootcanal::configuration::Controller const& config)
: strict(!config.has_strict() || config.strict()),
- supported_commands(std::move(SupportedCommands())),
+ supported_commands(SupportedCommands()),
lmp_features({Page0LmpFeatures(), 0, Page2LmpFeatures()}),
le_features(LlFeatures()) {
using namespace rootcanal::configuration;
diff --git a/tools/rootcanal/model/devices/beacon.cc b/tools/rootcanal/model/devices/beacon.cc
index 1c7c14b054..37feff6738 100644
--- a/tools/rootcanal/model/devices/beacon.cc
+++ b/tools/rootcanal/model/devices/beacon.cc
@@ -57,10 +57,10 @@ void Beacon::Tick() {
std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
if ((now - advertising_last_) >= advertising_interval_) {
advertising_last_ = now;
- SendLinkLayerPacket(std::move(LeLegacyAdvertisingPduBuilder::Create(
+ SendLinkLayerPacket(LeLegacyAdvertisingPduBuilder::Create(
address_, Address::kEmpty, AddressType::PUBLIC, AddressType::PUBLIC,
advertising_type_,
- std::vector(advertising_data_.begin(), advertising_data_.end()))),
+ std::vector(advertising_data_.begin(), advertising_data_.end())),
Phy::Type::LOW_ENERGY);
}
}
@@ -71,9 +71,9 @@ void Beacon::ReceiveLinkLayerPacket(LinkLayerPacketView packet, Phy::Type /*type
(advertising_type_ == LegacyAdvertisingType::ADV_IND ||
advertising_type_ == LegacyAdvertisingType::ADV_SCAN_IND)) {
SendLinkLayerPacket(
- std::move(LeScanResponseBuilder::Create(
+ LeScanResponseBuilder::Create(
address_, packet.GetSourceAddress(), AddressType::PUBLIC,
- std::vector(scan_response_data_.begin(), scan_response_data_.end()))),
+ std::vector(scan_response_data_.begin(), scan_response_data_.end())),
Phy::Type::LOW_ENERGY);
}
}
diff --git a/tools/rootcanal/model/devices/scripted_beacon.cc b/tools/rootcanal/model/devices/scripted_beacon.cc
index 20e0906411..1e9bb66349 100644
--- a/tools/rootcanal/model/devices/scripted_beacon.cc
+++ b/tools/rootcanal/model/devices/scripted_beacon.cc
@@ -192,9 +192,9 @@ void ScriptedBeacon::ReceiveLinkLayerPacket(model::packets::LinkLayerPacketView
if (packet.GetDestinationAddress() == address_ && packet.GetType() == PacketType::LE_SCAN) {
set_state(PlaybackEvent::SCANNED_ONCE);
SendLinkLayerPacket(
- std::move(model::packets::LeScanResponseBuilder::Create(
+ model::packets::LeScanResponseBuilder::Create(
address_, packet.GetSourceAddress(), AddressType::PUBLIC,
- std::vector(scan_response_data_.begin(), scan_response_data_.end()))),
+ std::vector(scan_response_data_.begin(), scan_response_data_.end())),
Phy::Type::LOW_ENERGY);
}
}
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-10-21 16:52:00 +0000