From 9a721a0aff5e0913393554d45af12574b5c8ae01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E5=9B=BD=E5=BA=86?= <weiguoqing2@huawei.com>
Date: Fri, 22 Nov 2024 10:23:12 +0800
Subject: [PATCH] =?UTF-8?q?AMS=E5=8A=A0=E8=BD=BD=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E6=85=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=90=88=E9=80=82=E7=AD=89?=
 =?UTF-8?q?=E5=BE=85=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 韦国庆 <weiguoqing2@huawei.com>
---
 common/include/dtbschedmgr_log.h                            | 4 ++++
 services/dtbschedmgr/src/continue/dsched_continue.cpp       | 6 +++---
 services/dtbschedmgr/src/continue_scene_session_handler.cpp | 2 +-
 services/dtbschedmgr/src/multi_user_manager.cpp             | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/common/include/dtbschedmgr_log.h b/common/include/dtbschedmgr_log.h
index 1b22f8ec..1e8462f9 100644
--- a/common/include/dtbschedmgr_log.h
+++ b/common/include/dtbschedmgr_log.h
@@ -525,6 +525,10 @@ enum {
      * Result(29360237) for not get mgr.
      */
     DMS_NOT_GET_MANAGER = 29360237,
+    /**
+     * Result(29360238) for get window failed from scb.
+     */
+    DMS_GET_WINDOW_FAILED_FROM_SCB = 29360238,
 };
 } // namespace DistributedSchedule
 } // namespace OHOS
diff --git a/services/dtbschedmgr/src/continue/dsched_continue.cpp b/services/dtbschedmgr/src/continue/dsched_continue.cpp
index 8fba3b2f..fab8be91 100644
--- a/services/dtbschedmgr/src/continue/dsched_continue.cpp
+++ b/services/dtbschedmgr/src/continue/dsched_continue.cpp
@@ -945,15 +945,15 @@ int32_t DSchedContinue::ExecuteContinueData(std::shared_ptr<DSchedContinueDataCm
         int32_t persistentId;
         if (ContinueSceneSessionHandler::GetInstance().GetPersistentId(persistentId) != ERR_OK) {
             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);
         WaitAbilityStateInitial(persistentId);
         want.SetParam(DMS_PERSISTENT_ID, persistentId);
 
         if (ContinueSceneSessionHandler::GetInstance().GetPersistentId(persistentId) != ERR_OK) {
-            HILOGE("get persistentId failed, stop start ability");
-            return OnContinueEnd(ERR_OK);
+            HILOGE("Second get persistentId failed, stop start ability");
+            return OnContinueEnd(DMS_GET_WINDOW_FAILED_FROM_SCB);
         }
     }
 
diff --git a/services/dtbschedmgr/src/continue_scene_session_handler.cpp b/services/dtbschedmgr/src/continue_scene_session_handler.cpp
index 515853aa..e0d22b0b 100644
--- a/services/dtbschedmgr/src/continue_scene_session_handler.cpp
+++ b/services/dtbschedmgr/src/continue_scene_session_handler.cpp
@@ -26,7 +26,7 @@ namespace OHOS {
 namespace DistributedSchedule {
 namespace {
 const std::string TAG = "ContinueSceneSessionHandler";
-constexpr int32_t RETRY_TIMES = 2;
+constexpr int32_t RETRY_TIMES = 60;
 constexpr int32_t SLEEP_TIME = 50;
 }
 
diff --git a/services/dtbschedmgr/src/multi_user_manager.cpp b/services/dtbschedmgr/src/multi_user_manager.cpp
index 90dc5182..efb52eb7 100644
--- a/services/dtbschedmgr/src/multi_user_manager.cpp
+++ b/services/dtbschedmgr/src/multi_user_manager.cpp
@@ -137,6 +137,7 @@ void MultiUserManager::OnUserSwitched(int32_t accountId)
         HILOGI("GetSendMgr failed.");
         return;
     }
+    sendMgr->NotifyDeviceOnline();
     recvMgr = GetCurrentRecvMgr();
     if (recvMgr == nullptr) {
         HILOGI("GetRecvMgr failed.");