summaryrefslogtreecommitdiff
path: root/libs/androidfw/Asset.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-03 20:23:16 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-09-03 20:23:16 +0000
commit7ac6800824e1a631a20677cef4d70807c240c438 (patch)
treed70ad75a4754fcdce2fff15a2c553e9b8e76648a /libs/androidfw/Asset.cpp
parent92277317ec80fa308e771b259fc919ce23b644ae (diff)
parent885500b06afb1c517341f99b649f73ddf7a61580 (diff)
Merge "Merge "No need to std::move local variable to return value" into main am: 608316b4fb am: 7db248a4a3" into main
Diffstat (limited to 'libs/androidfw/Asset.cpp')
-rw-r--r--libs/androidfw/Asset.cpp6
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;
}
/*