Snap for 4598635 from 3e02df8d3c to pi-release

Change-Id: Ib38a74630da0771dbcf5a18f371030c68cf0a46e
6 years ago · f789c65d0d
parent 1a6491a047 3e02df8d3c
commit f789c65d0d
1 changed files with 8 additions and 4 deletions
--- a/Keymaster.h
+++ b/Keymaster.h
@ -66,11 +66,15 @@ class KeymasterOperation {
    KeymasterOperation() : mDevice{nullptr}, mOpHandle{0}, mError{km::ErrorCode::UNKNOWN_ERROR} {}
    // Move Assignment
    KeymasterOperation& operator=(KeymasterOperation&& rhs) {
-        mDevice = std::move(rhs.mDevice);
-        mOpHandle = std::move(rhs.mOpHandle);
-        mError = std::move(rhs.mError);
-        rhs.mError = km::ErrorCode::UNKNOWN_ERROR;
+        mDevice = rhs.mDevice;
+        rhs.mDevice = nullptr;
+
+        mOpHandle = rhs.mOpHandle;
        rhs.mOpHandle = 0;
+
+        mError = rhs.mError;
+        rhs.mError = km::ErrorCode::UNKNOWN_ERROR;
+
        return *this;
    }