!426 merge cherry-pick-mr-423-1772109657707-auto into master

修复死锁问题

Created-by: zhupengfei
Commit-by: m0_54007497
Merged-by: openharmony_ci
Description: ### 一、内容说明(相关的Issue)



### 二、建议测试周期和提测地址  
  建议测试完成时间:xxxx.xx.xx  
  投产上线时间:xxxx.xx.xx  
  提测地址:CI环境/压测环境  
  测试账号:  

### 三、变更内容
  * 3.1 关联PR列表

  * 3.2 数据库和部署说明  
    1. 常规更新 
    2. 重启unicorn
    3. 重启sidekiq
    4. 迁移任务:是否有迁移任务,没有写 "无"
    5. rake脚本:`bundle exec xxx RAILS_ENV = production`;没有写 "无"

  * 3.4 其他技术优化内容(做了什么,变更了什么)
    - 重构了 xxxx 代码
    - xxxx 算法优化


  * 3.5 废弃通知(什么字段、方法弃用?)



  * 3.6  后向不兼容变更(是否有无法向后兼容的变更?)


  
### 四、研发自测点(自测哪些?冒烟用例全部自测?)
  自测测试结论:


### 五、测试关注点(需要提醒QA重点关注的、可能会忽略的地方)
  检查点:

| 需求名称 | 是否影响xx公共模块 | 是否需要xx功能 | 需求升级是否依赖其他子产品 |
|------|------------|----------|---------------|
| xxx  | 否          | 需要       | 不需要           |
|      |            |          |               |

  接口测试:

  性能测试:

  并发测试:

  其他:



See merge request: openharmony/multimedia_drm_framework!426
This commit is contained in:
openharmony_ci
2026-03-02 16:08:27 +08:00
@@ -79,24 +79,28 @@ void DrmHostManager::DrmHostDeathRecipient::OnRemoteDied(const wptr<IRemoteObjec
void DrmHostManager::ClearDeathService(std::string &name)
{
DRM_INFO_LOG("ClearDeathService enter.");
std::lock_guard<std::recursive_mutex> lock(drmHostMapMutex);
DRM_CHECK_AND_RETURN_LOG(
lazyLoadPluginInfoMap.count(name) > 0, "PluginCountInfo is empty, name:%{public}s", name.c_str());
DRM_CHECK_AND_RETURN_LOG(!lazyLoadPluginCountMap.empty(), "PluginCountMap is empty.");
if (statusCallback_ != nullptr) {
statusCallback_->OnDrmPluginDied(name);
}
lazyLoadPluginCountMap[name] = NOT_LAZY_LOADDED;
lazyLoadPluginTimeoutMap[name] = NOT_LAZY_LOADDED;
for (auto it = hdiMediaKeySystemFactoryAndPluginNameMap.begin();
it != hdiMediaKeySystemFactoryAndPluginNameMap.end();) {
if (it->second == name) {
it = hdiMediaKeySystemFactoryAndPluginNameMap.erase(it);
} else {
++it;
StatusCallback *statusCallback = nullptr;
{
std::lock_guard<std::recursive_mutex> lock(drmHostMapMutex);
DRM_CHECK_AND_RETURN_LOG(
lazyLoadPluginInfoMap.count(name) > 0, "PluginCountInfo is empty, name:%{public}s", name.c_str());
DRM_CHECK_AND_RETURN_LOG(!lazyLoadPluginCountMap.empty(), "PluginCountMap is empty.");
statusCallback = statusCallback_;
lazyLoadPluginCountMap[name] = NOT_LAZY_LOADDED;
lazyLoadPluginTimeoutMap[name] = NOT_LAZY_LOADDED;
for (auto it = hdiMediaKeySystemFactoryAndPluginNameMap.begin();
it != hdiMediaKeySystemFactoryAndPluginNameMap.end();) {
if (it->second == name) {
it = hdiMediaKeySystemFactoryAndPluginNameMap.erase(it);
} else {
++it;
}
}
}
if (statusCallback != nullptr) {
statusCallback->OnDrmPluginDied(name);
}
}
DrmHostManager::DrmHostManager(StatusCallback *statusCallback) : statusCallback_(statusCallback)