commit e5c18d038ae1f696f278940f0eb2ec0a5436a75b
author Dan Albert <danalbert@google.com> Thu Aug 13 20:19:23 2015 -0700
committer Dan Albert <danalbert@google.com> Fri Aug 14 20:40:30 2015 +0000
tree ea861c7f118b301fb90b4df7192283db62cb086f
parent a481160fa6b335850cbda8e9903de4972ad8541b

Fix pessimizing move.

Using std::move here prevents the compiler from performing copy
elision.

Change-Id: I21ad9dfec4fe36dd935403c9fd0af5e20e131036
(cherry picked from commit 17ee05c5842d8730f4a0b81b14638ce6ac2287ac)

keystore/operation.cpp

diff --git a/keystore/operation.cpp b/keystore/operation.cpp
index 4a71922..3b381c4 100644
--- a/keystore/operation.cpp
+++ b/keystore/operation.cpp
@@ -31,7 +31,7 @@
                                        keymaster_key_characteristics_t* characteristics,
                                        bool pruneable) {
     sp<IBinder> token = new BBinder();
-    mMap[token] = std::move(Operation(handle, keyid, purpose, dev, characteristics, appToken));
+    mMap[token] = Operation(handle, keyid, purpose, dev, characteristics, appToken);
     if (pruneable) {
         mLru.push_back(token);
     }