Merge "audio: Remove unnecessary std::move" into main am: 6883d48156

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3217976

Change-Id: Id3a73ba5fa3f4483b13036eb80af9afdcc6df714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-08-13 21:04:34 +00:00
committed by Automerger Merge Worker
3 changed files with 3 additions and 3 deletions

View File

@@ -38,7 +38,7 @@ static inline std::string config_file_path() {
candidatePath.append(apexName).append("/etc/").append(kDefaultConfigName);
LOG(DEBUG) << __func__ << " effect lib path " << candidatePath;
if (access(candidatePath.c_str(), R_OK) == 0) {
return std::move(candidatePath);
return candidatePath;
}
}
} else {

View File

@@ -391,7 +391,7 @@ std::vector<AudioRoute*> Module::getAudioRoutesForAudioPortImpl(int32_t portId)
Module::Configuration& Module::getConfig() {
if (!mConfig) {
mConfig = std::move(initializeConfig());
mConfig = initializeConfig();
}
return *mConfig;
}

View File

@@ -1025,7 +1025,7 @@ status_t HidlUtils::audioTagsToHal(const hidl_vec<AudioTag>& tags, char* halTags
result = BAD_VALUE;
}
}
std::string fullHalTags{std::move(halTagsBuffer.str())};
std::string fullHalTags{halTagsBuffer.str()};
strncpy(halTags, fullHalTags.c_str(), AUDIO_ATTRIBUTES_TAGS_MAX_SIZE);
CONVERT_CHECKED(fullHalTags.length() <= AUDIO_ATTRIBUTES_TAGS_MAX_SIZE ? NO_ERROR : BAD_VALUE,
result);