diff --git a/audio/aidl/default/EffectMain.cpp b/audio/aidl/default/EffectMain.cpp index a300cfdd78..7a6141a339 100644 --- a/audio/aidl/default/EffectMain.cpp +++ b/audio/aidl/default/EffectMain.cpp @@ -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 { diff --git a/audio/aidl/default/Module.cpp b/audio/aidl/default/Module.cpp index 543efd1b3e..c14d06ec18 100644 --- a/audio/aidl/default/Module.cpp +++ b/audio/aidl/default/Module.cpp @@ -391,7 +391,7 @@ std::vector Module::getAudioRoutesForAudioPortImpl(int32_t portId) Module::Configuration& Module::getConfig() { if (!mConfig) { - mConfig = std::move(initializeConfig()); + mConfig = initializeConfig(); } return *mConfig; } diff --git a/audio/common/all-versions/default/7.0/HidlUtils.cpp b/audio/common/all-versions/default/7.0/HidlUtils.cpp index f89c898da8..bc056e21aa 100644 --- a/audio/common/all-versions/default/7.0/HidlUtils.cpp +++ b/audio/common/all-versions/default/7.0/HidlUtils.cpp @@ -1025,7 +1025,7 @@ status_t HidlUtils::audioTagsToHal(const hidl_vec& 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);