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

Commit 71ad9b90 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12229688 from abda996e to 24Q4-release 

Change-Id: If2ac9372d6e3075ecb3fbf9f2ac14e827aa382ca
parents 7fceb532 abda996e

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);

automotive/evs/1.1/default/EvsCamera.cpp

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ unsigned EvsCamera::increaseAvailableFrames_Locked(unsigned numToAdd) { 
        }

        if (!stored) {

            // Add a BufferRecord wrapping this handle to our set of available buffers

            mBuffers.push_back(std::move(BufferRecord(memHandle)));

            mBuffers.push_back(BufferRecord(memHandle));

        }



        mFramesAllowed++;

automotive/evs/aidl/impl/default/src/ConfigManager.cpp

+6 −6
Original line number Diff line number Diff line
@@ -199,8 +199,8 @@ size_t ConfigManager::readCameraCapabilities(const XMLElement* const aCapElem, C 


            CameraParam aParam;

            if (ConfigManagerUtil::convertToEvsCameraParam(nameAttr, aParam)) {

                aCamera->controls.insert_or_assign(

                        aParam, std::move(std::make_tuple(minVal, maxVal, stepVal)));

                aCamera->controls.insert_or_assign(aParam,

                                                   std::make_tuple(minVal, maxVal, stepVal));

            }



            ctrlElem = ctrlElem->NextSiblingElement("control");
@@ -583,8 +583,8 @@ bool ConfigManager::readConfigDataFromBinary() { 
        CameraCtrl* ptr = reinterpret_cast<CameraCtrl*>(p);

        for (size_t idx = 0; idx < sz; ++idx) {

            CameraCtrl temp = *ptr++;

            aCamera->controls.insert_or_assign(

                    temp.cid, std::move(std::make_tuple(temp.min, temp.max, temp.step)));

            aCamera->controls.insert_or_assign(temp.cid,

                                               std::make_tuple(temp.min, temp.max, temp.step));

        }

        p = reinterpret_cast<char*>(ptr);
@@ -689,8 +689,8 @@ bool ConfigManager::readConfigDataFromBinary() { 
        CameraCtrl* ptr = reinterpret_cast<CameraCtrl*>(p);

        for (size_t idx = 0; idx < sz; ++idx) {

            CameraCtrl temp = *ptr++;

            aCamera->controls.insert_or_assign(

                    temp.cid, std::move(std::make_tuple(temp.min, temp.max, temp.step)));

            aCamera->controls.insert_or_assign(temp.cid,

                                               std::make_tuple(temp.min, temp.max, temp.step));

        }

        p = reinterpret_cast<char*>(ptr);