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

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

Merge "Remove unnecessary std::move" into main

parents eceb636e 3ac211f5

media/codec2/hal/common/MultiAccessUnitHelper.cpp

+4 −4
Original line number Diff line number Diff line
@@ -327,10 +327,10 @@ c2_status_t MultiAccessUnitHelper::scatter( 
                newWork->worklets.front()->component = inWork->worklets.front()->component;

                std::vector<std::unique_ptr<C2Tuning>> tunings;

                for (std::unique_ptr<C2Tuning>& tuning : inWork->worklets.front()->tunings) {

                    tunings.push_back(std::move(

                    tunings.push_back(

                            std::unique_ptr<C2Tuning>(

                                    static_cast<C2Tuning*>(

                                            C2Param::Copy(*(tuning.get())).release()))));

                                            C2Param::Copy(*(tuning.get())).release())));

                }

                newWork->worklets.front()->tunings = std::move(tunings);

            }
@@ -344,7 +344,7 @@ c2_status_t MultiAccessUnitHelper::scatter( 
                    << inputOrdinal.frameIndex.peekull()

                    << ") -> newFrameIndex " << newFrameIdx

                    <<" : input ts " << inputOrdinal.timestamp.peekull();

            sliceWork.push_back(std::move(cloneInputWork(w, w->input.flags)));

            sliceWork.push_back(cloneInputWork(w, w->input.flags));

            if (!w->input.buffers.empty() && w->input.buffers.front() != nullptr) {

                sliceWork.back()->input.buffers = std::move(w->input.buffers);

            }

media/libstagefright/MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ private: 
                                    .id = getId(mClient),

                                    .name = mCodecName,

                                    .importance = mImportance};

        return std::move(clientInfo);

        return clientInfo;

    }



private:

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4491,7 +4491,7 @@ sp<IAfEffectHandle> AudioFlinger::createOrphanEffect_l( 
            // TODO(b/184194057): Use the vibrator information from the vibrator that will be used

            // for the HapticGenerator.

            const std::optional<media::AudioVibratorInfo> defaultVibratorInfo =

                    std::move(getDefaultVibratorInfo_l());

                    getDefaultVibratorInfo_l();

            if (defaultVibratorInfo) {

                // Only set the vibrator info when it is a valid one.

                audio_utils::lock_guard _cl(chain->mutex());

services/audioflinger/Threads.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1695,7 +1695,7 @@ sp<IAfEffectHandle> ThreadBase::createEffect_l( 
            // TODO(b/184194057): Use the vibrator information from the vibrator that will be used

            // for the HapticGenerator.

            const std::optional<media::AudioVibratorInfo> defaultVibratorInfo =

                    std::move(mAfThreadCallback->getDefaultVibratorInfo_l());

                    mAfThreadCallback->getDefaultVibratorInfo_l();

            if (defaultVibratorInfo) {

                audio_utils::lock_guard _cl(chain->mutex());

                // Only set the vibrator info when it is a valid one.
@@ -2916,7 +2916,7 @@ status_t PlaybackThread::addTrack_l(const sp<IAfTrack>& track) 
                // TODO(b/184194780): Use the vibrator information from the vibrator that will be

                // used to play this track.

                 audio_utils::lock_guard _l(mAfThreadCallback->mutex());

                vibratorInfo = std::move(mAfThreadCallback->getDefaultVibratorInfo_l());

                vibratorInfo = mAfThreadCallback->getDefaultVibratorInfo_l();

            }

            mutex().lock();

            track->setHapticScale(hapticScale);

services/camera/libcameraservice/CameraService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1570,7 +1570,7 @@ std::string CameraService::toString(std::set<userid_t> intSet) { 
            s << ", " << std::to_string(i);

        }

    }

    return std::move(s.str());

    return s.str();

}



int32_t CameraService::mapToInterface(TorchModeStatus status) {
@@ -5155,7 +5155,7 @@ std::string CameraService::CameraClientManager::toString() const { 
    }

    if (hasAny) ret << "\n";

    ret << "]\n";

    return std::move(ret.str());

    return ret.str();

}



CameraService::DescriptorPtr CameraService::CameraClientManager::makeClientDescriptor(