Fixed race condition in closeSession 2p: 08acec9c3a

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282393

Bug: 258189255
Change-Id: I2135835a745d28cc90980cc16405a1c28f64f35c
Merged-In: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3

libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h

@@ -7,8 +7,9 @@
 #ifndef WV_DRM_PLUGIN_H_
 #define WV_DRM_PLUGIN_H_
 
-#include <map>
 #include <list>
+#include <map>
+#include <mutex>
 
 #include "cdm_client_property_set.h"
 #include "cdm_identifier.h"
@@ -496,9 +497,46 @@ struct WVDrmPlugin : public ::drm::V1_4::IDrmPlugin, IDrmPluginListener,
     Mutex mLock;
   };
 
+  class CryptoSessionMap {
+   public:
+    std::map<CdmSessionId, std::shared_ptr<CryptoSession>> clear() {
+      std::unique_lock<std::mutex> auto_lock(mLock);
+      auto copy = mMap;
+      mMap.clear();
+      return copy;
+    }
+
+    std::shared_ptr<CryptoSession> get(const CdmSessionId& sid) {
+      std::unique_lock<std::mutex> auto_lock(mLock);
+      if (mMap.count(sid)) {
+        return mMap[sid];
+      }
+      return nullptr;
+    }
+
+    bool empty() {
+      std::unique_lock<std::mutex> auto_lock(mLock);
+      return mMap.empty();
+    }
+
+    void erase(const CdmSessionId& sid) {
+      std::unique_lock<std::mutex> auto_lock(mLock);
+      mMap.erase(sid);
+    }
+
+    void insert(const CdmSessionId& sid, OEMCrypto_SESSION osid) {
+      std::unique_lock<std::mutex> auto_lock(mLock);
+      mMap[sid] = std::make_shared<CryptoSession>(osid);
+    }
+
+   private:
+     std::mutex mLock;
+     std::map<CdmSessionId, std::shared_ptr<CryptoSession>> mMap;
+  };
+
   sp<wvcdm::WvContentDecryptionModule> const mCDM;
   WVGenericCryptoInterface* mCrypto;
-  map<CdmSessionId, CryptoSession> mCryptoSessions;
+  CryptoSessionMap mCryptoSessions;
   sp<IDrmPluginListener> mListener;
   sp<IDrmPluginListener_V1_2> mListenerV1_2;