openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-18 16:24:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix screen Manager crash bug

Browse Source 
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: Id4ac0353552aed60d6cfa6a36174ae148c9b9663
This commit is contained in:
xiaojianfeng
2022-02-15 20:34:14 +08:00
parent 6a250c9ac2
commit d892811011
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dmserver/src/abstract_screen_controller.cpp
+1
View File
@@ -725,6 +725,7 @@ void AbstractScreenController::DumpScreenInfo() const
PRIu64" %{public}10s %{public}20" PRIu64" ", screen->dmsId_, screen->rsId_, screen->groupDmsId_,
isGroup.c_str(), screenType.c_str(), nodeId, isMirrored.c_str(), screen->rSDisplayNodeConfig_.mirrorNodeId);
}
DumpScreenGroupInfo();
}
void AbstractScreenController::DumpScreenGroupInfo() const
dmserver/src/display_manager_service.cpp
+4 -3
View File
@@ -133,14 +133,15 @@ DMError DisplayManagerService::DestroyVirtualScreen(ScreenId screenId)
return DMError::DM_ERROR_INVALID_PARAM;
}
WM_SCOPED_TRACE("dms:DestroyVirtualScreen(%" PRIu64")", screenId);
std::map<ScreenId, std::shared_ptr<RSDisplayNode>>::iterator iter = displayNodeMap_.find(screenId);
auto rsScreenId = abstractScreenController_->ConvertToRsScreenId(screenId);
std::map<ScreenId, std::shared_ptr<RSDisplayNode>>::iterator iter = displayNodeMap_.find(rsScreenId);
if (iter == displayNodeMap_.end()) {
WLOGFE("DisplayManagerService: displayNode is nullptr");
return abstractScreenController_->DestroyVirtualScreen(screenId);
}
displayNodeMap_[screenId]->RemoveFromTree();
displayNodeMap_[rsScreenId]->RemoveFromTree();
WLOGFE("DisplayManagerService: displayNode remove from tree");
displayNodeMap_.erase(screenId);
displayNodeMap_.erase(rsScreenId);
auto transactionProxy = RSTransactionProxy::GetInstance();
if (transactionProxy != nullptr) {
transactionProxy->FlushImplicitTransaction();