diff --git a/service/BUILD.gn b/service/BUILD.gn
index e8c225d9dc9615b269e456bdabbaa3b412ba0316..f75f7ebd6a597fd9af7b8852b5e1d32b67d52035 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -2852,6 +2852,13 @@ ohos_unittest("EventDumpTest") {
     "-Dprotected=public",
   ]
 
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+    blocklist = "./ipc_blocklist.txt"
+  }
+
   sources = [
     "event_dump/test/event_dump_test.cpp",
     "event_dump/test/event_statistic_test.cpp",
diff --git a/service/ipc_blocklist.txt b/service/ipc_blocklist.txt
index ae31a084ca4d95346e01267f23c91b53127e24b0..b289812ca1a3613b801176ab7c375c89f8eed2b4 100644
--- a/service/ipc_blocklist.txt
+++ b/service/ipc_blocklist.txt
@@ -19,3 +19,4 @@ src:*foundation/multimodalinput/input/service/touch_event_normalize/test/*
 src:*foundation/multimodalinput/input/service/filter/test/*
 src:*foundation/multimodalinput/input/service/connect_manager/test/*
 src:*foundation/multimodalinput/input/service/event_handler/test/*
+src:*foundation/multimodalinput/input/service/event_dump/test/*
diff --git a/service/module_loader/include/app_debug_listener.h b/service/module_loader/include/app_debug_listener.h
index 3c0393cf748187daeec16502bc727d7461dcf0d6..4dac32e2f8486e6ef8bcdcdb9d39336aa607b6e7 100644
--- a/service/module_loader/include/app_debug_listener.h
+++ b/service/module_loader/include/app_debug_listener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2023-2025 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -25,8 +25,8 @@ public:
     static AppDebugListener *GetInstance();
     ~AppDebugListener() = default;
 
-    void OnAppDebugStarted(const std::vector<AppExecFwk::AppDebugInfo> &debugInfos) override;
-    void OnAppDebugStoped(const std::vector<AppExecFwk::AppDebugInfo> &debugInfos) override;
+    ErrCode OnAppDebugStarted(const std::vector<AppExecFwk::AppDebugInfo> &debugInfos) override;
+    ErrCode OnAppDebugStoped(const std::vector<AppExecFwk::AppDebugInfo> &debugInfos) override;
 
     int32_t GetAppDebugPid();
 
diff --git a/service/module_loader/src/app_debug_listener.cpp b/service/module_loader/src/app_debug_listener.cpp
index 0dd252667e94966ba035c04f1ed972d276378905..f3ed1e2553b9692ce8227f7ef572c39398b65104 100644
--- a/service/module_loader/src/app_debug_listener.cpp
+++ b/service/module_loader/src/app_debug_listener.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2023-2025 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -30,16 +30,17 @@ AppDebugListener *AppDebugListener::GetInstance()
     return instance_;
 }
 
-void AppDebugListener::OnAppDebugStarted(const std::vector<AppExecFwk::AppDebugInfo> &debugInfos)
+ErrCode AppDebugListener::OnAppDebugStarted(const std::vector<AppExecFwk::AppDebugInfo> &debugInfos)
 {
     CALL_DEBUG_ENTER;
     for (const auto &debugInfo : debugInfos) {
         appDebugPid_ = debugInfo.pid;
         MMI_HILOGD("The appDebugPid_:%{public}d", appDebugPid_);
     }
+    return ERR_OK;
 }
 
-void AppDebugListener::OnAppDebugStoped(const std::vector<AppExecFwk::AppDebugInfo> &debugInfos)
+ErrCode AppDebugListener::OnAppDebugStoped(const std::vector<AppExecFwk::AppDebugInfo> &debugInfos)
 {
     CALL_DEBUG_ENTER;
     for (const auto &debugInfo : debugInfos) {
@@ -47,6 +48,7 @@ void AppDebugListener::OnAppDebugStoped(const std::vector<AppExecFwk::AppDebugIn
             appDebugPid_ = -1;
         }
     }
+    return ERR_OK;
 }
 
 int32_t AppDebugListener::GetAppDebugPid()
diff --git a/service/window_manager/test/pointer_drawing_manager_test.cpp b/service/window_manager/test/pointer_drawing_manager_test.cpp
index 1290123337c9d1480f088ef77f2e42ce512bab69..1346033fa1f72476961c3c24fb30a4d4c52dd306 100644
--- a/service/window_manager/test/pointer_drawing_manager_test.cpp
+++ b/service/window_manager/test/pointer_drawing_manager_test.cpp
@@ -50,6 +50,7 @@ const int32_t ROTATE_POLICY = system::GetIntParameter("const.window.device.rotat
 const std::string IMAGE_POINTER_DEFAULT_PATH = "/system/etc/multimodalinput/mouse_icon/";
 const std::string CURSOR_ICON_PATH = IMAGE_POINTER_DEFAULT_PATH + "Cursor_Circle.png";
 const std::string CUSTOM_CURSOR_ICON_PATH = IMAGE_POINTER_DEFAULT_PATH + "Custom_Cursor_Circle.svg";
+const std::string DEFAULT_ICON_PATH = IMAGE_POINTER_DEFAULT_PATH + "Default.svg";
 constexpr int32_t AECH_DEVELOPER_DEFINED_STYLE { 47 };
 constexpr int32_t AECH_DEVELOPER_DEFINED { 4 };
 } // namespace
@@ -2688,6 +2689,7 @@ HWTEST_F(PointerDrawingManagerTest, InputWindowsManagerTest_AdjustMouseFocusToSo
     auto* pointerDrawingManager = static_cast<PointerDrawingManager*>(IPointerDrawingManager::GetInstance());
     pointerDrawingManager->imageWidth_ = 50;
     pointerDrawingManager->imageHeight_ = 50;
+    pointerDrawingManager->UpdateIconPath(MOUSE_ICON::DEFAULT, DEFAULT_ICON_PATH);
     int32_t physicalX = 100;
     int32_t physicalY = 100;
     pointerDrawingManager->RotateDegree(DIRECTION0);