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

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

Merge "audio: Remove unnecessary std::move" into main

parents c9777e83 e62f97fb

audio/aidl/default/EffectMain.cpp

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

audio/aidl/default/Module.cpp

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

}

audio/common/all-versions/default/7.0/HidlUtils.cpp

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