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

Commit 13ee1db0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessary std::move" into main am: 9b0609b0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3213985



Change-Id: I5cdd48e7239b89795b4bee8702e8f64cee5ea0cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f675beb 9b0609b0

libs/androidfw/PosixUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ ProcResult ExecuteBinary(const std::vector<std::string>& argv) { 
      auto err = ReadFile(stderr[0]);

      result.stderr_str = err ? std::move(*err) : "";

      close(stderr[0]);

      return std::move(result);

      return result;

  }

}

media/jni/android_media_MediaCodecLinearBlock.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ struct JMediaCodecLinearBlock { 
            std::shared_ptr<C2Buffer> buffer =

                C2Buffer::CreateLinearBuffer(block.subBlock(offset, size));

            for (const std::shared_ptr<const C2Info> &info : mBuffer->info()) {

                std::shared_ptr<C2Param> param = std::move(C2Param::Copy(*info));

                std::shared_ptr<C2Param> param = C2Param::Copy(*info);

                buffer->setInfo(std::static_pointer_cast<C2Info>(param));

            }

            return buffer;