Snap for 5409551 from 2336ca0bbafba3544ab1f1a2ae9a04ce14b2ee24 to qt-release

Change-Id: I22abf83268d755ba97800b1e7d1b5b8044976f27

2 files changed, 3 insertions, 0 deletions

diff --git a/keystore/operation_proto_handler.cpp b/keystore/operation_proto_handler.cpp
index 1833acb3..dfc06928 100644
--- a/keystore/operation_proto_handler.cpp
+++ b/keystore/operation_proto_handler.cpp
@@ -106,6 +106,7 @@ void checkOpCharacteristics(const hidl_vec<KeyParameter>& characteristics,
 }
 
 void OperationProtoHandler::uploadOpAsProto(Operation& op, bool wasOpSuccessful) {
+    std::lock_guard<std::mutex> lock(op_upload_mutex);
     OperationConfig operationConfig;
     determinePurpose(op.purpose, &operationConfig);
     checkKeyCharacteristics(op.characteristics.softwareEnforced, &operationConfig);
diff --git a/keystore/operation_proto_handler.h b/keystore/operation_proto_handler.h
index 838f3ec4..64d0a594 100644
--- a/keystore/operation_proto_handler.h
+++ b/keystore/operation_proto_handler.h
@@ -20,6 +20,7 @@
 #include "operation_config.pb.h"
 #include "operation_struct.h"
 #include <chrono>
+#include <mutex>
 #include <unordered_map>
 #include <vector>
 
@@ -35,6 +36,7 @@ class OperationProtoHandler {
   private:
     std::unordered_map<std::string, int> protoMap;
     std::chrono::steady_clock::time_point start_time = std::chrono::steady_clock::now();
+    std::mutex op_upload_mutex;
 };
 
 }  // namespace keystore