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

Commit ba38f872 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary std::move" into main

parents 493e36c9 9dce90f3

libs/sensor/SensorManager.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ bool findSensorNameInList(int32_t handle, const Vector<Sensor>& sensorList, 
            std::ostringstream oss;

            std::ostringstream oss;

            oss << sensor.getStringType() << ":" << sensor.getName();

            oss << sensor.getStringType() << ":" << sensor.getName();

            if (outString) {

            if (outString) {

                *outString = std::move(oss.str());

                *outString = oss.str();

            }

            }

            return true;

            return true;

        }

        }

services/surfaceflinger/CompositionEngine/src/Output.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -1101,10 +1101,10 @@ void Output::prepareFrame() { 
}

}





ftl::Future<std::monostate> Output::presentFrameAndReleaseLayersAsync(bool flushEvenWhenDisabled) {

ftl::Future<std::monostate> Output::presentFrameAndReleaseLayersAsync(bool flushEvenWhenDisabled) {

    return ftl::Future<bool>(std::move(mHwComposerAsyncWorker->send([this, flushEvenWhenDisabled]() {

    return ftl::Future<bool>(mHwComposerAsyncWorker->send([this, flushEvenWhenDisabled]() {

               presentFrameAndReleaseLayers(flushEvenWhenDisabled);

               presentFrameAndReleaseLayers(flushEvenWhenDisabled);

               return true;

               return true;

           })))

           }))

            .then([](bool) { return std::monostate{}; });

            .then([](bool) { return std::monostate{}; });

}

}