| commit | 13ee1db08e42522a14a4ddf74c9383d96cfbb297 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Aug 16 07:12:17 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 16 07:12:17 2024 +0000 |
| tree | 42b80d4c7010989f7dfb2d20fa02739ab543c322 | |
| parent | 5f675beb2b8170bc66ce5f991483e2cb5766b17e [diff] | |
| parent | 9b0609b038686e05315b9eed99d77c312c7af67d [diff] |
Merge "Remove unnecessary std::move" into main am: 9b0609b038 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3213985 Change-Id: I5cdd48e7239b89795b4bee8702e8f64cee5ea0cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/androidfw/PosixUtils.cpp b/libs/androidfw/PosixUtils.cpp index 8ddc572..49ee8f7 100644 --- a/libs/androidfw/PosixUtils.cpp +++ b/libs/androidfw/PosixUtils.cpp
@@ -119,7 +119,7 @@ auto err = ReadFile(stderr[0]); result.stderr_str = err ? std::move(*err) : ""; close(stderr[0]); - return std::move(result); + return result; } }
diff --git a/media/jni/android_media_MediaCodecLinearBlock.h b/media/jni/android_media_MediaCodecLinearBlock.h index 060abfd..ffbf0a8 100644 --- a/media/jni/android_media_MediaCodecLinearBlock.h +++ b/media/jni/android_media_MediaCodecLinearBlock.h
@@ -62,7 +62,7 @@ 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;