diff options
| author | 2024-09-03 20:22:42 +0000 | |
|---|---|---|
| committer | 2024-09-03 20:22:42 +0000 | |
| commit | 885500b06afb1c517341f99b649f73ddf7a61580 (patch) | |
| tree | 591f5155c36352c2a0dc1e7a92bcd0491e4a973d /libs/androidfw | |
| parent | 5f1c1da0593beea1ab1c8cad42832eac5431fde4 (diff) | |
| parent | 7db248a4a3fe8ae1ae95ee4cc949b3086516dced (diff) | |
Merge "No need to std::move local variable to return value" into main am: 608316b4fb am: 7db248a4a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2961542
Change-Id: Ie62381ab49dddf602a299fd0fc91e46a9f2b5a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw')
| -rw-r--r-- | libs/androidfw/Asset.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/androidfw/Asset.cpp b/libs/androidfw/Asset.cpp index 43a70c176a83..5a4cff0c319e 100644 --- a/libs/androidfw/Asset.cpp +++ b/libs/androidfw/Asset.cpp @@ -309,9 +309,8 @@ Asset::Asset(void) return NULL; } - // We succeeded, so relinquish control of dataMap pAsset->mAccessMode = mode; - return std::move(pAsset); + return pAsset; } /* @@ -328,9 +327,8 @@ Asset::Asset(void) return NULL; } - // We succeeded, so relinquish control of dataMap pAsset->mAccessMode = mode; - return std::move(pAsset); + return pAsset; } /* |