diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-17 23:49:31 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-17 23:49:31 +0000 |
commit | b9e1064c332c11973c68f20f8f7547e502dcf733 (patch) | |
tree | d589e402098c228ba940a26b950dfa50126c2d70 | |
parent | dd4125beebefd2e75646b6c6077f0882dcf8e1e3 (diff) | |
parent | ecdc9dc290920850713779e3686228c9046bb3de (diff) | |
download | av-b9e1064c332c11973c68f20f8f7547e502dcf733.tar.gz |
Merge cherrypicks of [19536772] into rvc-platform-release.android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24
Change-Id: Icfe1cd1afe9e2c77e566278c22891010dc244d02
-rw-r--r-- | drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp | 2 | ||||
-rw-r--r-- | drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp b/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp index 6f69110d50..0e5169c9e0 100644 --- a/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp +++ b/drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp @@ -623,6 +623,7 @@ Return<void> DrmPlugin::getSecurityLevel(const hidl_vec<uint8_t>& sessionId, return Void(); } + Mutex::Autolock lock(mSecurityLevelLock); std::map<std::vector<uint8_t>, SecurityLevel>::iterator itr = mSecurityLevel.find(sid); if (itr == mSecurityLevel.end()) { @@ -653,6 +654,7 @@ Return<Status> DrmPlugin::setSecurityLevel(const hidl_vec<uint8_t>& sessionId, return Status::ERROR_DRM_SESSION_NOT_OPENED; } + Mutex::Autolock lock(mSecurityLevelLock); std::map<std::vector<uint8_t>, SecurityLevel>::iterator itr = mSecurityLevel.find(sid); if (itr != mSecurityLevel.end()) { diff --git a/drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h b/drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h index 894985bd1b..e957cee194 100644 --- a/drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h +++ b/drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h @@ -398,7 +398,8 @@ private: std::map<std::string, std::string> mStringProperties; std::map<std::string, std::vector<uint8_t> > mByteArrayProperties; std::map<std::string, std::vector<uint8_t> > mReleaseKeysMap; - std::map<std::vector<uint8_t>, SecurityLevel> mSecurityLevel; + std::map<std::vector<uint8_t>, SecurityLevel> mSecurityLevel + GUARDED_BY(mSecurityLevelLock); sp<IDrmPluginListener> mListener; sp<IDrmPluginListener_V1_2> mListenerV1_2; SessionLibrary *mSessionLibrary; @@ -419,6 +420,7 @@ private: DeviceFiles mFileHandle GUARDED_BY(mFileHandleLock); Mutex mFileHandleLock; Mutex mSecureStopLock; + Mutex mSecurityLevelLock; CLEARKEY_DISALLOW_COPY_AND_ASSIGN_AND_NEW(DrmPlugin); }; |