commit a00c0b82f7057006d36e6a65ee33c97ed021100a
author Yi Kong <yikong@google.com> Wed Mar 01 08:59:49 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 01 08:59:49 2023 +0000
tree b6a0b7f015b3a78f875ae7484d5c3e6fada4ef4b
parent d5ab8538d424e8021bbdc86826fba1178ade0e04
parent bfff8ee0059bb826280ce17b38922ca697f0e871

Merge "Fix return-stack-address warning" am: 550964e884 am: d6b935c115 am: bfff8ee005

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2462896

Change-Id: Ifcbfcde746e9650ac2576d85c2f56d5031cb0dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

security/keymint/aidl/vts/performance/KeyMintBenchmark.cpp

diff --git a/security/keymint/aidl/vts/performance/KeyMintBenchmark.cpp b/security/keymint/aidl/vts/performance/KeyMintBenchmark.cpp
index 0c61c25..49fd0c9 100644
--- a/security/keymint/aidl/vts/performance/KeyMintBenchmark.cpp
+++ b/security/keymint/aidl/vts/performance/KeyMintBenchmark.cpp
@@ -68,7 +68,7 @@
 
     int getError() { return static_cast<int>(error_); }
 
-    const string& GenerateMessage(int size) {
+    const string GenerateMessage(int size) {
         for (const string& message : message_cache_) {
             if (message.size() == size) {
                 return message;
@@ -76,7 +76,7 @@
         }
         string message = string(size, 'x');
         message_cache_.push_back(message);
-        return std::move(message);
+        return message;
     }
 
     optional<BlockMode> getBlockMode(string transform) {