openharmony/ability_dmsfwk
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_dmsfwk synced 2024-11-23 06:20:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:openharmony/ability_dmsfwk into master

Browse Source 
Signed-off-by: 皇甫毅 <smart_e@126.com>
This commit is contained in:
皇甫毅 2024-11-22 08:15:11 +00:00 committed by Gitee
commit 2749bd6181
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/include/dtbschedmgr_log.h
View File

@ -525,6 +525,10 @@ enum {
* Result(29360237) for not get mgr. * Result(29360237) for not get mgr.
*/ */
DMS_NOT_GET_MANAGER = 29360237, DMS_NOT_GET_MANAGER = 29360237,
/**
* Result(29360238) for get window failed from scb.
*/
DMS_GET_WINDOW_FAILED_FROM_SCB = 29360238,
/** /**
* Result(29360238) for BMS can not find the specified module. * Result(29360238) for BMS can not find the specified module.
*/ */

6
services/dtbschedmgr/src/continue/dsched_continue.cpp
View File

@ -949,15 +949,15 @@ int32_t DSchedContinue::ExecuteContinueData(std::shared_ptr<DSchedContinueDataCm
int32_t persistentId; int32_t persistentId;
if (ContinueSceneSessionHandler::GetInstance().GetPersistentId(persistentId) != ERR_OK) { if (ContinueSceneSessionHandler::GetInstance().GetPersistentId(persistentId) != ERR_OK) {
HILOGE("get persistentId failed, stop start ability"); HILOGE("get persistentId failed, stop start ability");
return OnContinueEnd(ERR_OK); return OnContinueEnd(DMS_GET_WINDOW_FAILED_FROM_SCB);
} }
HILOGI("get persistentId success, persistentId: %{public}d", persistentId); HILOGI("get persistentId success, persistentId: %{public}d", persistentId);
WaitAbilityStateInitial(persistentId); WaitAbilityStateInitial(persistentId);
want.SetParam(DMS_PERSISTENT_ID, persistentId); want.SetParam(DMS_PERSISTENT_ID, persistentId);
if (ContinueSceneSessionHandler::GetInstance().GetPersistentId(persistentId) != ERR_OK) { if (ContinueSceneSessionHandler::GetInstance().GetPersistentId(persistentId) != ERR_OK) {
HILOGE("get persistentId failed, stop start ability"); HILOGE("Second get persistentId failed, stop start ability");
return OnContinueEnd(ERR_OK); return OnContinueEnd(DMS_GET_WINDOW_FAILED_FROM_SCB);
} }
} }

2
services/dtbschedmgr/src/continue_scene_session_handler.cpp
View File

@ -26,7 +26,7 @@ namespace OHOS {
namespace DistributedSchedule { namespace DistributedSchedule {
namespace { namespace {
const std::string TAG = "ContinueSceneSessionHandler"; const std::string TAG = "ContinueSceneSessionHandler";
constexpr int32_t RETRY_TIMES = 2; constexpr int32_t RETRY_TIMES = 60;
constexpr int32_t SLEEP_TIME = 50; constexpr int32_t SLEEP_TIME = 50;
} }

1
services/dtbschedmgr/src/multi_user_manager.cpp
View File

@ -137,6 +137,7 @@ void MultiUserManager::OnUserSwitched(int32_t accountId)
HILOGI("GetSendMgr failed."); HILOGI("GetSendMgr failed.");
return; return;
} }
sendMgr->NotifyDeviceOnline();
recvMgr = GetCurrentRecvMgr(); recvMgr = GetCurrentRecvMgr();
if (recvMgr == nullptr) { if (recvMgr == nullptr) {
HILOGI("GetRecvMgr failed."); HILOGI("GetRecvMgr failed.");