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

Commit e6beccda authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove unnecessary std::move" into main

parents dbc3d1d6 923f19db

system/audio_bluetooth_hw/device_port_proxy.cc

+2 −4
Original line number Diff line number Diff line
@@ -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);

system/bta/csis/csis_client.cc

+2 −2
Original line number Diff line number Diff line
@@ -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) {

system/bta/le_audio/broadcaster/broadcaster_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

system/bta/le_audio/devices.cc

+1 −1
Original line number Diff line number Diff line
@@ -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,

system/bta/le_audio/state_machine_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -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,