commit 550964e884b16e30d478ac87c12c0cff12b91f2c
author Yi Kong <yikong@google.com> Wed Mar 01 07:29:47 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 01 07:29:47 2023 +0000
tree b234f62772aef057cefac29f0e67d296bd16fe7b
parent 746108b52f4aeb7b8cc2025df4164651c6a8df0d
parent bd5d365d8232c05e48888333dea2f7d85db640ba

Merge "Fix return-stack-address warning"

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) {