commit bfff8ee0059bb826280ce17b38922ca697f0e871
author Yi Kong <yikong@google.com> Wed Mar 01 08:23:20 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 01 08:23:20 2023 +0000
tree dab9fa0a204f471a1d0e3a7ec18ae6c818876c78
parent 75e98b770298122ca117755ff05352d1cb83c1f9
parent d6b935c115cb5a2bc37d8229c5691aa338f0572c

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

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

Change-Id: I31fe88e44857ae014159f7e3a87a030cd5e7c1b6
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) {