From 7b6a51c6b862d26e1653c00999ec2008f9b586b7 Mon Sep 17 00:00:00 2001
From: wangdi119 <wangdi119@huawei.com>
Date: Wed, 27 Jul 2022 14:38:38 +0800
Subject: [PATCH 001/360] =?UTF-8?q?=E2=80=9C=E9=BC=A0=E6=A0=87=E6=8D=95?=
 =?UTF-8?q?=E8=8E=B7=E6=A8=A1=E5=BC=8F=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangdi119 <wangdi119@huawei.com>
---
 .../napi/mouse/include/js_mouse_context.h     |  2 +
 .../napi/mouse/include/js_mouse_manager.h     |  2 +
 .../napi/mouse/src/js_mouse_context.cpp       | 64 +++++++++++++++++++
 .../napi/mouse/src/js_mouse_manager.cpp       | 46 +++++++++++++
 4 files changed, 114 insertions(+)

diff --git a/frameworks/napi/mouse/include/js_mouse_context.h b/frameworks/napi/mouse/include/js_mouse_context.h
index 264ea7a629..f1dce376c7 100755
--- a/frameworks/napi/mouse/include/js_mouse_context.h
+++ b/frameworks/napi/mouse/include/js_mouse_context.h
@@ -27,6 +27,8 @@ public:
     static napi_value Export(napi_env env, napi_value exports);
     static napi_value SetPointerVisible(napi_env env, napi_callback_info info);
     static napi_value IsPointerVisible(napi_env env, napi_callback_info info);
+    static napi_value EnterCaptureMode(napi_env env, napi_callback_info info);
+    static napi_value LeaveCaptureMode(napi_env env, napi_callback_info info);
     std::shared_ptr<JsMouseManager> GetJsMouseMgr() const;
 
 private:
diff --git a/frameworks/napi/mouse/include/js_mouse_manager.h b/frameworks/napi/mouse/include/js_mouse_manager.h
index 0a0d84c580..4ecaedba2f 100755
--- a/frameworks/napi/mouse/include/js_mouse_manager.h
+++ b/frameworks/napi/mouse/include/js_mouse_manager.h
@@ -83,6 +83,8 @@ public:
     void ResetEnv();
     napi_value SetPointerVisible(napi_env env, bool visible, napi_value handle = nullptr);
     napi_value IsPointerVisible(napi_env env, napi_value handle = nullptr);
+    napi_value EnterCaptureMode(napi_env env, int32_t windowId, napi_value handle = nullptr);
+    napi_value LeaveCaptureMode(napi_env env, int32_t windowId, napi_value handle = nullptr);
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/napi/mouse/src/js_mouse_context.cpp b/frameworks/napi/mouse/src/js_mouse_context.cpp
index 9618b7df75..a20600511a 100755
--- a/frameworks/napi/mouse/src/js_mouse_context.cpp
+++ b/frameworks/napi/mouse/src/js_mouse_context.cpp
@@ -164,6 +164,68 @@ napi_value JsMouseContext::IsPointerVisible(napi_env env, napi_callback_info inf
     return jsmouseMgr->IsPointerVisible(env, argv[0]);
 }
 
+napi_value JsMouseContext::EnterCaptureMode(napi_env env, napi_callback_info info)
+{
+    CALL_DEBUG_ENTER;
+    size_t argc = 2;
+    napi_value argv[2];
+    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    if (argc < 1 || argc > 2) {
+        THROWERR(env, "the number of parameters is not as expected");
+        return nullptr;
+    }
+    if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
+        THROWERR(env, "The first parameter type is wrong");
+        return nullptr;
+    }
+
+    int32_t windowId = 0;
+    CHKRP(env, napi_get_value_int32(env, argv[0], &windowId), GET_BOOL);
+
+    JsMouseContext *jsPointer = JsMouseContext::GetInstance(env);
+    auto jsmouseMgr = jsPointer->GetJsMouseMgr();
+    if(argc == 1)
+    {
+        return jsmouseMgr->EnterCaptureMode(env,windowId);
+    }
+    if (!JsCommon::TypeOf(env, argv[1], napi_function)) {
+        THROWERR(env, "The second parameter type is wrong");
+        return nullptr;
+    }
+    return jsmouseMgr->EnterCaptureMode(env, windowId, argv[1]);
+}
+
+napi_value JsMouseContext::LeaveCaptureMode(napi_env env, napi_callback_info info)
+{
+    CALL_DEBUG_ENTER;
+    size_t argc = 2;
+    napi_value argv[2];
+    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    if (argc < 1 || argc > 2) {
+        THROWERR(env, "the number of parameters is not as expected");
+        return nullptr;
+    }
+    if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
+        THROWERR(env, "The first parameter type is wrong");
+        return nullptr;
+    }
+
+    int32_t windowId = 0;
+    CHKRP(env, napi_get_value_int32(env, argv[0], &windowId), GET_BOOL);
+
+    JsMouseContext *jsPointer = JsMouseContext::GetInstance(env);
+    auto jsmouseMgr = jsPointer->GetJsMouseMgr();
+    if(argc == 1)
+    {
+        return jsmouseMgr->LeaveCaptureMode(env,windowId);
+    }
+    if (!JsCommon::TypeOf(env, argv[1], napi_function)) {
+        THROWERR(env, "The second parameter type is wrong");
+        return nullptr;
+    }
+    return jsmouseMgr->LeaveCaptureMode(env, windowId, argv[1]);
+}
+
 napi_value JsMouseContext::Export(napi_env env, napi_value exports)
 {
     CALL_DEBUG_ENTER;
@@ -175,6 +237,8 @@ napi_value JsMouseContext::Export(napi_env env, napi_value exports)
     napi_property_descriptor desc[] = {
         DECLARE_NAPI_STATIC_FUNCTION("setPointerVisible", SetPointerVisible),
         DECLARE_NAPI_STATIC_FUNCTION("isPointerVisible", IsPointerVisible),
+        DECLARE_NAPI_STATIC_FUNCTION("setCaptureMode", EnterCaptureMode),
+        DECLARE_NAPI_STATIC_FUNCTION("setCaptureMode", LeaveCaptureMode),
     };
     CHKRP(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc), DEFINE_PROPERTIES);
     return exports;
diff --git a/frameworks/napi/mouse/src/js_mouse_manager.cpp b/frameworks/napi/mouse/src/js_mouse_manager.cpp
index 59aab03d86..aee740251e 100755
--- a/frameworks/napi/mouse/src/js_mouse_manager.cpp
+++ b/frameworks/napi/mouse/src/js_mouse_manager.cpp
@@ -157,5 +157,51 @@ napi_value JsMouseManager::IsPointerVisible(napi_env env, napi_value handle)
     AsyncCallbackWork(asyncContext);
     return promise;
 }
+
+napi_value JsMouseManager::EnterCaptureMode(napi_env env, int32_t windowId, napi_value handle)
+{
+    CALL_DEBUG_ENTER;
+    sptr<AsyncContext> asyncContext = new (std::nothrow) AsyncContext(env);
+    if(asyncContext == nullptr) {
+        THROWERR(env,"create AsyncContext failed");
+        return nullptr;
+    }
+
+    asyncContext->errorCode = InputManager::GetInstance()->EnterCaptureMode(windowId);
+    asyncContext->reserve << ReturnType::VOID;
+
+    napi_value promise = nullptr;
+    if(handle != nullptr) {
+        CHKRP(env, napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
+        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
+    } else {
+        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
+    }
+    AsyncCallbackWork(asyncContext);
+    return promise;
+}
+
+napi_value JsMouseManager::LeaveCaptureMode(napi_env env, int32_t windowId, napi_value handle)
+{
+    CALL_DEBUG_ENTER;
+    sptr<AsyncContext> asyncContext = new (std::nothrow) AsyncContext(env);
+    if(asyncContext == nullptr) {
+        THROWERR(env,"create AsyncContext failed");
+        return nullptr;
+    }
+
+    asyncContext->errorCode = InputManager::GetInstance()->LeaveCaptureMode(windowId);
+    asyncContext->reserve << ReturnType::VOID;
+
+    napi_value promise = nullptr;
+    if(handle != nullptr) {
+        CHKRP(env, napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
+        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
+    } else {
+        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
+    }
+    AsyncCallbackWork(asyncContext);
+    return promise;
+}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
-- 
Gitee


From 621bcadbab795d869eafeeda0693dacb7823cf1c Mon Sep 17 00:00:00 2001
From: wangdi119 <wangdi119@huawei.com>
Date: Wed, 27 Jul 2022 14:41:13 +0800
Subject: [PATCH 002/360] =?UTF-8?q?=E2=80=9C=E5=9B=9E=E9=80=80=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangdi119 <wangdi119@huawei.com>
---
 .../napi/mouse/include/js_mouse_context.h     |  2 -
 .../napi/mouse/include/js_mouse_manager.h     |  2 -
 .../napi/mouse/src/js_mouse_context.cpp       | 64 -------------------
 .../napi/mouse/src/js_mouse_manager.cpp       | 45 -------------
 4 files changed, 113 deletions(-)

diff --git a/frameworks/napi/mouse/include/js_mouse_context.h b/frameworks/napi/mouse/include/js_mouse_context.h
index f1dce376c7..264ea7a629 100755
--- a/frameworks/napi/mouse/include/js_mouse_context.h
+++ b/frameworks/napi/mouse/include/js_mouse_context.h
@@ -27,8 +27,6 @@ public:
     static napi_value Export(napi_env env, napi_value exports);
     static napi_value SetPointerVisible(napi_env env, napi_callback_info info);
     static napi_value IsPointerVisible(napi_env env, napi_callback_info info);
-    static napi_value EnterCaptureMode(napi_env env, napi_callback_info info);
-    static napi_value LeaveCaptureMode(napi_env env, napi_callback_info info);
     std::shared_ptr<JsMouseManager> GetJsMouseMgr() const;
 
 private:
diff --git a/frameworks/napi/mouse/include/js_mouse_manager.h b/frameworks/napi/mouse/include/js_mouse_manager.h
index 4ecaedba2f..0a0d84c580 100755
--- a/frameworks/napi/mouse/include/js_mouse_manager.h
+++ b/frameworks/napi/mouse/include/js_mouse_manager.h
@@ -83,8 +83,6 @@ public:
     void ResetEnv();
     napi_value SetPointerVisible(napi_env env, bool visible, napi_value handle = nullptr);
     napi_value IsPointerVisible(napi_env env, napi_value handle = nullptr);
-    napi_value EnterCaptureMode(napi_env env, int32_t windowId, napi_value handle = nullptr);
-    napi_value LeaveCaptureMode(napi_env env, int32_t windowId, napi_value handle = nullptr);
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/napi/mouse/src/js_mouse_context.cpp b/frameworks/napi/mouse/src/js_mouse_context.cpp
index a20600511a..9618b7df75 100755
--- a/frameworks/napi/mouse/src/js_mouse_context.cpp
+++ b/frameworks/napi/mouse/src/js_mouse_context.cpp
@@ -164,68 +164,6 @@ napi_value JsMouseContext::IsPointerVisible(napi_env env, napi_callback_info inf
     return jsmouseMgr->IsPointerVisible(env, argv[0]);
 }
 
-napi_value JsMouseContext::EnterCaptureMode(napi_env env, napi_callback_info info)
-{
-    CALL_DEBUG_ENTER;
-    size_t argc = 2;
-    napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
-    if (argc < 1 || argc > 2) {
-        THROWERR(env, "the number of parameters is not as expected");
-        return nullptr;
-    }
-    if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
-        THROWERR(env, "The first parameter type is wrong");
-        return nullptr;
-    }
-
-    int32_t windowId = 0;
-    CHKRP(env, napi_get_value_int32(env, argv[0], &windowId), GET_BOOL);
-
-    JsMouseContext *jsPointer = JsMouseContext::GetInstance(env);
-    auto jsmouseMgr = jsPointer->GetJsMouseMgr();
-    if(argc == 1)
-    {
-        return jsmouseMgr->EnterCaptureMode(env,windowId);
-    }
-    if (!JsCommon::TypeOf(env, argv[1], napi_function)) {
-        THROWERR(env, "The second parameter type is wrong");
-        return nullptr;
-    }
-    return jsmouseMgr->EnterCaptureMode(env, windowId, argv[1]);
-}
-
-napi_value JsMouseContext::LeaveCaptureMode(napi_env env, napi_callback_info info)
-{
-    CALL_DEBUG_ENTER;
-    size_t argc = 2;
-    napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
-    if (argc < 1 || argc > 2) {
-        THROWERR(env, "the number of parameters is not as expected");
-        return nullptr;
-    }
-    if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
-        THROWERR(env, "The first parameter type is wrong");
-        return nullptr;
-    }
-
-    int32_t windowId = 0;
-    CHKRP(env, napi_get_value_int32(env, argv[0], &windowId), GET_BOOL);
-
-    JsMouseContext *jsPointer = JsMouseContext::GetInstance(env);
-    auto jsmouseMgr = jsPointer->GetJsMouseMgr();
-    if(argc == 1)
-    {
-        return jsmouseMgr->LeaveCaptureMode(env,windowId);
-    }
-    if (!JsCommon::TypeOf(env, argv[1], napi_function)) {
-        THROWERR(env, "The second parameter type is wrong");
-        return nullptr;
-    }
-    return jsmouseMgr->LeaveCaptureMode(env, windowId, argv[1]);
-}
-
 napi_value JsMouseContext::Export(napi_env env, napi_value exports)
 {
     CALL_DEBUG_ENTER;
@@ -237,8 +175,6 @@ napi_value JsMouseContext::Export(napi_env env, napi_value exports)
     napi_property_descriptor desc[] = {
         DECLARE_NAPI_STATIC_FUNCTION("setPointerVisible", SetPointerVisible),
         DECLARE_NAPI_STATIC_FUNCTION("isPointerVisible", IsPointerVisible),
-        DECLARE_NAPI_STATIC_FUNCTION("setCaptureMode", EnterCaptureMode),
-        DECLARE_NAPI_STATIC_FUNCTION("setCaptureMode", LeaveCaptureMode),
     };
     CHKRP(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc), DEFINE_PROPERTIES);
     return exports;
diff --git a/frameworks/napi/mouse/src/js_mouse_manager.cpp b/frameworks/napi/mouse/src/js_mouse_manager.cpp
index aee740251e..575dc7aa27 100755
--- a/frameworks/napi/mouse/src/js_mouse_manager.cpp
+++ b/frameworks/napi/mouse/src/js_mouse_manager.cpp
@@ -158,50 +158,5 @@ napi_value JsMouseManager::IsPointerVisible(napi_env env, napi_value handle)
     return promise;
 }
 
-napi_value JsMouseManager::EnterCaptureMode(napi_env env, int32_t windowId, napi_value handle)
-{
-    CALL_DEBUG_ENTER;
-    sptr<AsyncContext> asyncContext = new (std::nothrow) AsyncContext(env);
-    if(asyncContext == nullptr) {
-        THROWERR(env,"create AsyncContext failed");
-        return nullptr;
-    }
-
-    asyncContext->errorCode = InputManager::GetInstance()->EnterCaptureMode(windowId);
-    asyncContext->reserve << ReturnType::VOID;
-
-    napi_value promise = nullptr;
-    if(handle != nullptr) {
-        CHKRP(env, napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
-        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
-    } else {
-        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
-    }
-    AsyncCallbackWork(asyncContext);
-    return promise;
-}
-
-napi_value JsMouseManager::LeaveCaptureMode(napi_env env, int32_t windowId, napi_value handle)
-{
-    CALL_DEBUG_ENTER;
-    sptr<AsyncContext> asyncContext = new (std::nothrow) AsyncContext(env);
-    if(asyncContext == nullptr) {
-        THROWERR(env,"create AsyncContext failed");
-        return nullptr;
-    }
-
-    asyncContext->errorCode = InputManager::GetInstance()->LeaveCaptureMode(windowId);
-    asyncContext->reserve << ReturnType::VOID;
-
-    napi_value promise = nullptr;
-    if(handle != nullptr) {
-        CHKRP(env, napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
-        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
-    } else {
-        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
-    }
-    AsyncCallbackWork(asyncContext);
-    return promise;
-}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
-- 
Gitee


From 5822d9f6fb9a8acd477229369fedaf1ba4bcfd89 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Wed, 17 Aug 2022 11:23:42 +0800
Subject: [PATCH 003/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 service/BUILD.gn                              |   1 +
 service/event_handler/include/device_config.h |  73 ++++++++
 .../include/input_event_normalize_handler.h   |   1 +
 service/event_handler/src/device_config.cpp   | 172 ++++++++++++++++++
 .../src/input_event_normalize_handler.cpp     |   3 +
 .../include/mouse_event_handler.h             |  10 +-
 .../src/mouse_event_handler.cpp               |  63 ++++++-
 7 files changed, 314 insertions(+), 9 deletions(-)
 create mode 100644 service/event_handler/include/device_config.h
 create mode 100644 service/event_handler/src/device_config.cpp

diff --git a/service/BUILD.gn b/service/BUILD.gn
index a24bd5dc3b..501aacf269 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -141,6 +141,7 @@ ohos_shared_library("libmmi-server") {
     "event_handler/src/key_auto_repeat.cpp",
     "event_handler/src/key_event_value_transformation.cpp",
     "event_handler/src/key_map_manager.cpp",
+    "event_handler/src/device_config.cpp",
     "libinput_adapter/src/libinput_adapter.cpp",
     "message_handle/src/server_msg_handler.cpp",
     "module_loader/src/mmi_service.cpp",
diff --git a/service/event_handler/include/device_config.h b/service/event_handler/include/device_config.h
new file mode 100644
index 0000000000..8af261bcfb
--- /dev/null
+++ b/service/event_handler/include/device_config.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef DEVICE_CONFIG_H
+#define DEVICE_CONFIG_H
+
+#include <map>
+#include <string>
+struct libinput_device;
+
+namespace OHOS {
+namespace MMI {
+
+enum ConfigFileItem
+{
+    INVALID = -1,
+    POINTER_BASE = 0,
+    POINTER_SPEED,
+    KEYBOARD_BASE = 1000,
+    KEY_XXXX,
+};
+
+class DeviceConfigManagement {
+public:
+    DeviceConfigManagement() = default;
+    ~DeviceConfigManagement() = default;
+    /*
+/etc/mouse/common.conf
+button_count = TTTTTTT
+
+/etc/mouse/1a-2b-3c-d.conf   => device id: 30, 35
+include /etc/mouse/common.conf
+speed = 100
+30 => {1 => 100, 2 => 3, }
+/etc/mouse/1a-2b-3c-e.conf   => device id: 40
+speed = 200
+
+/etc/keyboard/01-20-3c-k.conf   => device id: 10, 15
+layout = 104
+/etc/keyboard/01-24-3c-l.conf   => device id: 20
+layout = 110
+     */
+
+public:
+
+    int32_t AddDeviceProfile(struct libinput_device *device);
+    void RemoveDeviceProfile(struct libinput_device *device);
+    std::string GetEventFileName(struct libinput_device *device);
+private:
+    typedef int32_t DeviceId;
+    std::map<DeviceId, std::map<ConfigFileItem, int32_t>> deviceListConfig;
+
+private:
+    int32_t DeviceClassification(struct libinput_device *device, DeviceId deviceId);
+    int32_t DeviceConfiguration(struct libinput_device *device, DeviceId deviceId);
+    std::map<ConfigFileItem, int32_t> ReadConfigFile(const std::string &filePath);
+    ConfigFileItem ConfigItemName2Id(const std::string &name);
+};
+} // namespace MMI
+} // namespace OHOS
+#endif // DEVICE_CONFIG_H
\ No newline at end of file
diff --git a/service/event_handler/include/input_event_normalize_handler.h b/service/event_handler/include/input_event_normalize_handler.h
index 48fa123fb4..757136068c 100755
--- a/service/event_handler/include/input_event_normalize_handler.h
+++ b/service/event_handler/include/input_event_normalize_handler.h
@@ -50,6 +50,7 @@ private:
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     KeyEventHandler keyEventHandler_;
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
+    DeviceConfigManagement configManagement_;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/event_handler/src/device_config.cpp b/service/event_handler/src/device_config.cpp
new file mode 100644
index 0000000000..3c42e9b3e8
--- /dev/null
+++ b/service/event_handler/src/device_config.cpp
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "device_config.h"
+
+#include "libinput.h"
+#include "input_device.h"
+#include "error_multimodal.h"
+#include "mouse_event_handler.h"
+#include "input_device_manager.h"
+
+namespace OHOS {
+namespace MMI {
+namespace {
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "DeviceConfigManagement" };
+constexpr int32_t INVALID_DEVICE_ID = -1;
+
+
+inline bool IsNumqq(const std::string &str)
+{
+    std::istringstream sin(str);
+    double num;
+    sin >> num;
+    return num;
+}
+} // namespace
+
+enum evdev_device_udev_tags {
+    EVDEV_UDEV_TAG_INPUT = 1 << 0,
+    EVDEV_UDEV_TAG_KEYBOARD = 1 << 1,
+    EVDEV_UDEV_TAG_MOUSE = 1 << 2,
+    EVDEV_UDEV_TAG_TOUCHPAD = 1 << 3,
+    EVDEV_UDEV_TAG_TOUCHSCREEN = 1 << 4,
+    EVDEV_UDEV_TAG_TABLET = 1 << 5,
+    EVDEV_UDEV_TAG_JOYSTICK = 1 << 6,
+    EVDEV_UDEV_TAG_ACCELEROMETER = 1 << 7,
+    EVDEV_UDEV_TAG_TABLET_PAD = 1 << 8,
+    EVDEV_UDEV_TAG_POINTINGSTICK = 1 << 9,
+    EVDEV_UDEV_TAG_TRACKBALL = 1 << 10,
+    EVDEV_UDEV_TAG_SWITCH = 1 << 11,
+};
+
+std::string DeviceConfigManagement::GetEventFileName(struct libinput_device *device)
+{
+    CALL_DEBUG_ENTER;
+    CHKPS(device);
+    uint32_t vendor = libinput_device_get_id_vendor(device);
+    uint32_t product = libinput_device_get_id_product(device);
+    uint32_t version = libinput_device_get_id_version(device);
+    const char *name = libinput_device_get_name(device);
+    CHKPS(name);
+    std::string fileName = std::to_string(vendor) + "_" + std::to_string(product) + "_" +
+        std::to_string(version) + "_" + name;
+    RemoveSpace(fileName);
+    return fileName;
+}
+
+ConfigFileItem DeviceConfigManagement::ConfigItemName2Id(const std::string &name)
+{
+    static const std::map<const std::string, ConfigFileItem> configList = {
+        {"speed", POINTER_SPEED},
+    };
+
+    auto iter = configList.find(name);
+    if (iter == configList.end()) {
+        MMI_HILOGE("Device config file remove failed");
+        return INVALID;
+    }
+    return configList.at(name);
+}
+
+std::map<ConfigFileItem, int32_t> DeviceConfigManagement::ReadConfigFile(const std::string &filePath)
+{
+    std::map<ConfigFileItem, int32_t> configList;
+    FILE* fp = fopen(filePath.c_str(), "r");
+    if (fp == nullptr) {
+        MMI_HILOGE("Config file open failed");
+        return configList;
+    }
+    char buf[256] = {};
+    std::string dataStr;
+
+    while (fgets(buf, sizeof(buf), fp) != nullptr) {
+        dataStr = buf;
+        int32_t keyLen = dataStr.find_first_of(":");
+        std::string key = dataStr.substr(0 , keyLen);
+        std::string value = dataStr.substr(keyLen + 1);
+        if (!IsNumqq(value)) {
+           continue;
+        }
+        configList[ConfigItemName2Id(key)] = std::stoi(value);
+    }
+    if (fclose(fp) != 0) {
+        MMI_HILOGW("Close file failed");
+    }
+    return configList;
+}
+
+int32_t DeviceConfigManagement::DeviceConfiguration(struct libinput_device *device, DeviceId deviceId)
+{
+    CALL_DEBUG_ENTER;
+    std::string fileName = "/vendor/etc/pointer/" + GetEventFileName(device) + ".TOML";
+    auto configList = ReadConfigFile(fileName);
+    if (configList.empty()) {
+        MMI_HILOGE("configList is empty");
+        return RET_ERR;
+    }
+    deviceListConfig[deviceId] = configList;
+    int32_t ret = MouseEventHdr->SetPointerSpeedWithDeviceId(deviceId, configList[POINTER_SPEED]);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Pointer speed set failed, ret : %{public}d", ret);
+    }
+    return ret;
+}
+
+int32_t DeviceConfigManagement::DeviceClassification(struct libinput_device *device, DeviceId deviceId)
+{
+    CHKPR(device, ERROR_NULL_POINTER);
+    uint32_t udevTags = static_cast<int32_t>(libinput_device_get_tags(device));
+    if (udevTags & (EVDEV_UDEV_TAG_MOUSE |
+                    EVDEV_UDEV_TAG_TRACKBALL |
+                    EVDEV_UDEV_TAG_POINTINGSTICK |
+                    EVDEV_UDEV_TAG_TOUCHPAD |
+                    EVDEV_UDEV_TAG_TABLET_PAD)) {
+        return DeviceConfiguration(device, deviceId);
+    }
+    MMI_HILOGE("Device config set failed");
+    return RET_ERR;
+}
+
+int32_t DeviceConfigManagement::AddDeviceProfile(struct libinput_device *device)
+{
+    CALL_DEBUG_ENTER;
+    CHKPR(device, ERROR_NULL_POINTER);
+    int32_t deviceId = InputDevMgr->FindInputDeviceId(device);
+    if (deviceId == INVALID_DEVICE_ID) {
+        MMI_HILOGE("Find to device failed");
+        return RET_ERR;
+    }
+    return DeviceClassification(device, deviceId);
+}
+
+void DeviceConfigManagement::RemoveDeviceProfile(struct libinput_device *device)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(device);
+    int32_t deviceId = InputDevMgr->FindInputDeviceId(device);
+    auto iter = deviceListConfig.find(deviceId);
+    if (iter == deviceListConfig.end()) {
+        MMI_HILOGE("Device config file remove failed");
+        return;
+    }
+    int32_t ret = MouseEventHdr->RemovePointerSpeed(deviceId);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Pointer speed set failed, ret : %{public}d", ret);
+    }
+    deviceListConfig.erase(iter);
+}
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/service/event_handler/src/input_event_normalize_handler.cpp b/service/event_handler/src/input_event_normalize_handler.cpp
index 50da0f4996..13f5c9379f 100644
--- a/service/event_handler/src/input_event_normalize_handler.cpp
+++ b/service/event_handler/src/input_event_normalize_handler.cpp
@@ -28,6 +28,7 @@
 #include "time_cost_chk.h"
 #include "timer_manager.h"
 #include "touch_transform_point_manager.h"
+#include "device_config.h"
 
 namespace OHOS {
 namespace MMI {
@@ -114,6 +115,7 @@ int32_t InputEventNormalizeHandler::OnEventDeviceAdded(libinput_event *event)
     InputDevMgr->OnInputDeviceAdded(device);
     KeyMapMgr->ParseDeviceConfigFile(device);
     KeyRepeat->AddDeviceConfig(device);
+    configManagement_.AddDeviceProfile(device);
     return RET_OK;
 }
 
@@ -125,6 +127,7 @@ int32_t InputEventNormalizeHandler::OnEventDeviceRemoved(libinput_event *event)
     KeyMapMgr->RemoveKeyValue(device);
     KeyRepeat->RemoveDeviceConfig(device);
     InputDevMgr->OnInputDeviceRemoved(device);
+    configManagement_.RemoveDeviceProfile(device);
     return RET_OK;
 }
 
diff --git a/service/mouse_event_handler/include/mouse_event_handler.h b/service/mouse_event_handler/include/mouse_event_handler.h
index a77cea1e71..d7bbc82d2b 100644
--- a/service/mouse_event_handler/include/mouse_event_handler.h
+++ b/service/mouse_event_handler/include/mouse_event_handler.h
@@ -23,6 +23,7 @@
 #include "singleton.h"
 
 #include "pointer_event.h"
+#include <map>
 
 namespace OHOS {
 namespace MMI {
@@ -42,10 +43,13 @@ public:
     bool NormalizeMoveMouse(int32_t offsetX, int32_t offsetY);
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
     int32_t SetPointerSpeed(int32_t speed);
+    int32_t SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed);
+    int32_t RemovePointerSpeed(int32_t deviceId);
     int32_t GetPointerSpeed() const;
+    int32_t GetPointerSpeedWithDeviceId(int32_t deviceId) const;
 
 private:
-    int32_t HandleMotionInner(libinput_event_pointer* data);
+    int32_t HandleMotionInner(libinput_event_pointer* data, int32_t deviceId);
     int32_t HandleButtonInner(libinput_event_pointer* data);
     int32_t HandleAxisInner(libinput_event_pointer* data);
     void HandlePostInner(libinput_event_pointer* data, int32_t deviceId, PointerEvent::PointerItem& pointerItem);
@@ -54,7 +58,7 @@ private:
     void HandlePostMoveMouse(PointerEvent::PointerItem& pointerItem);
  #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
     int32_t HandleButtonValueInner(libinput_event_pointer* data);
-    int32_t HandleMotionCorrection(libinput_event_pointer* data);
+    int32_t HandleMotionCorrection(libinput_event_pointer* data, int32_t deviceId);
     bool GetSpeedGain(const double &vin, double& gain) const;
     void DumpInner();
     void InitAbsolution();
@@ -68,6 +72,8 @@ private:
     bool isPressed_ { false };
     int32_t currentDisplayId_ { -1 };
     int32_t speed_ { DEFAULT_SPEED };
+    std::map<int32_t, int32_t> pointerDeviceSpeeds;
+    bool isJsPointerSpeed_ { false };
 };
 
 #define MouseEventHdr MouseEventHandler::GetInstance()
diff --git a/service/mouse_event_handler/src/mouse_event_handler.cpp b/service/mouse_event_handler/src/mouse_event_handler.cpp
index 49da40a579..d7b7486edc 100644
--- a/service/mouse_event_handler/src/mouse_event_handler.cpp
+++ b/service/mouse_event_handler/src/mouse_event_handler.cpp
@@ -67,7 +67,7 @@ bool MouseEventHandler::GetSpeedGain(const double& vin, double& gain) const
     return true;
 }
 
-int32_t MouseEventHandler::HandleMotionInner(libinput_event_pointer* data)
+int32_t MouseEventHandler::HandleMotionInner(libinput_event_pointer* data, int32_t deviceId)
 {
     CALL_DEBUG_ENTER;
     CHKPR(data, ERROR_NULL_POINTER);
@@ -83,7 +83,7 @@ int32_t MouseEventHandler::HandleMotionInner(libinput_event_pointer* data)
         return RET_ERR;
     }
 
-    int32_t ret = HandleMotionCorrection(data);
+    int32_t ret = HandleMotionCorrection(data, deviceId);
     if (ret != RET_OK) {
         MMI_HILOGE("Failed to handle motion correction");
         return ret;
@@ -95,7 +95,7 @@ int32_t MouseEventHandler::HandleMotionInner(libinput_event_pointer* data)
     return RET_OK;
 }
 
-int32_t MouseEventHandler::HandleMotionCorrection(libinput_event_pointer* data)
+int32_t MouseEventHandler::HandleMotionCorrection(libinput_event_pointer* data, int32_t deviceId)
 {
     CALL_DEBUG_ENTER;
     CHKPR(data, ERROR_NULL_POINTER);
@@ -107,8 +107,14 @@ int32_t MouseEventHandler::HandleMotionCorrection(libinput_event_pointer* data)
         MMI_HILOGE("Get speed gain failed");
         return RET_ERR;
     }
-    double correctionX = dx * gain * static_cast<double>(speed_) / 10.0;
-    double correctionY = dy * gain * static_cast<double>(speed_) / 10.0;
+    int32_t speedTmp = 0;
+    if (isJsPointerSpeed_){
+        speedTmp = speed_;
+    } else {
+        speedTmp = GetPointerSpeedWithDeviceId(deviceId);
+    }
+    double correctionX = dx * gain * static_cast<double>(speedTmp) / 10.0;
+    double correctionY = dy * gain * static_cast<double>(speedTmp) / 10.0;
     MMI_HILOGD("Get and process the movement coordinates, dx:%{public}lf, dy:%{public}lf,"
                "correctionX:%{public}lf, correctionY:%{public}lf, gain:%{public}lf",
                dx, dy, correctionX, correctionY, gain);
@@ -269,10 +275,11 @@ int32_t MouseEventHandler::Normalize(struct libinput_event *event)
     pointerEvent_->ClearAxisValue();
     int32_t result;
     const int32_t type = libinput_event_get_type(event);
+    int32_t deviceId = InputDevMgr->FindInputDeviceId(libinput_event_get_device(event));
     switch (type) {
         case LIBINPUT_EVENT_POINTER_MOTION:
         case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: {
-            result = HandleMotionInner(data);
+            result = HandleMotionInner(data, deviceId);
             break;
         }
         case LIBINPUT_EVENT_POINTER_BUTTON: {
@@ -288,7 +295,7 @@ int32_t MouseEventHandler::Normalize(struct libinput_event *event)
             return RET_ERR;
         }
     }
-    int32_t deviceId = InputDevMgr->FindInputDeviceId(libinput_event_get_device(event));
+
     PointerEvent::PointerItem pointerItem;
     HandlePostInner(data, deviceId, pointerItem);
     WinMgr->UpdateTargetPointer(pointerEvent_);
@@ -387,9 +394,51 @@ int32_t MouseEventHandler::SetPointerSpeed(int32_t speed)
         speed_ = speed;
     }
     MMI_HILOGD("Set pointer speed:%{public}d", speed_);
+    isJsPointerSpeed_ = true;
+    return RET_OK;
+}
+
+int32_t MouseEventHandler::SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed)
+{
+    CALL_DEBUG_ENTER;
+    int32_t speedTmp = speed;
+    if (speed < MIN_SPEED) {
+        speedTmp = MIN_SPEED;
+    } else if (speed > MAX_SPEED) {
+        speedTmp = MAX_SPEED;
+    } else {
+        speedTmp = speed;
+    }
+    MMI_HILOGD("Set pointer speed:%{public}d", speedTmp);
+    pointerDeviceSpeeds[deviceId] = speedTmp;
+    // Notify
+    return RET_OK;
+}
+
+int32_t MouseEventHandler::RemovePointerSpeed(int32_t deviceId)
+{
+    CALL_DEBUG_ENTER;
+    auto it = pointerDeviceSpeeds.find(deviceId);
+    if (it == pointerDeviceSpeeds.end()) {
+        pointerDeviceSpeeds.erase(it);
+        MMI_HILOGD("remove pointer speed with deviceId:%{public}d", deviceId);
+    }
+    // notify
     return RET_OK;
 }
 
+int32_t MouseEventHandler::GetPointerSpeedWithDeviceId(int32_t deviceId) const
+{
+    CALL_DEBUG_ENTER;
+    auto it = pointerDeviceSpeeds.find(deviceId);
+    if (it == pointerDeviceSpeeds.end()) {
+        MMI_HILOGD("Not find speed with deviceId:%{public}d", deviceId);
+        return speed_;
+    }
+    MMI_HILOGD("Get pointer speed:%{public}d", speed_);
+    return pointerDeviceSpeeds.at(deviceId);
+}
+
 int32_t MouseEventHandler::GetPointerSpeed() const
 {
     CALL_DEBUG_ENTER;
-- 
Gitee


From 93209cd1bfdd25f00d654538a2b1aa7fa3a51421 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Thu, 18 Aug 2022 11:29:50 +0800
Subject: [PATCH 004/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 service/BUILD.gn                              |  2 +-
 ...e_config.h => device_config_file_parser.h} | 21 +++---
 .../include/input_event_normalize_handler.h   |  1 -
 ...nfig.cpp => device_config_file_parser.cpp} | 71 +++++++++----------
 .../src/input_event_normalize_handler.cpp     |  7 +-
 .../include/mouse_event_handler.h             |  5 +-
 .../src/mouse_event_handler.cpp               | 58 ++++++++-------
 7 files changed, 82 insertions(+), 83 deletions(-)
 rename service/event_handler/include/{device_config.h => device_config_file_parser.h} (83%)
 rename service/event_handler/src/{device_config.cpp => device_config_file_parser.cpp} (75%)

diff --git a/service/BUILD.gn b/service/BUILD.gn
index 501aacf269..ca6da310f3 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -141,7 +141,7 @@ ohos_shared_library("libmmi-server") {
     "event_handler/src/key_auto_repeat.cpp",
     "event_handler/src/key_event_value_transformation.cpp",
     "event_handler/src/key_map_manager.cpp",
-    "event_handler/src/device_config.cpp",
+    "event_handler/src/device_config_file_parser.cpp",
     "libinput_adapter/src/libinput_adapter.cpp",
     "message_handle/src/server_msg_handler.cpp",
     "module_loader/src/mmi_service.cpp",
diff --git a/service/event_handler/include/device_config.h b/service/event_handler/include/device_config_file_parser.h
similarity index 83%
rename from service/event_handler/include/device_config.h
rename to service/event_handler/include/device_config_file_parser.h
index 8af261bcfb..58f4137e61 100644
--- a/service/event_handler/include/device_config.h
+++ b/service/event_handler/include/device_config_file_parser.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef DEVICE_CONFIG_H
-#define DEVICE_CONFIG_H
+#ifndef DEVICE_CONFIG_FILE_PARSER_H
+#define DEVICE_CONFIG_FILE_PARSER_H
 
 #include <map>
 #include <string>
@@ -22,8 +22,7 @@ struct libinput_device;
 
 namespace OHOS {
 namespace MMI {
-
-enum ConfigFileItem
+enum class ConfigFileItem
 {
     INVALID = -1,
     POINTER_BASE = 0,
@@ -31,7 +30,6 @@ enum ConfigFileItem
     KEYBOARD_BASE = 1000,
     KEY_XXXX,
 };
-
 class DeviceConfigManagement {
 public:
     DeviceConfigManagement() = default;
@@ -54,13 +52,12 @@ layout = 110
      */
 
 public:
-
-    int32_t AddDeviceProfile(struct libinput_device *device);
-    void RemoveDeviceProfile(struct libinput_device *device);
-    std::string GetEventFileName(struct libinput_device *device);
+    int32_t OnDeviceAdd(struct libinput_device *device);
+    void OnDeviceRemove(struct libinput_device *device);
+    std::string CombDeviceFileName(struct libinput_device *device);
 private:
-    typedef int32_t DeviceId;
-    std::map<DeviceId, std::map<ConfigFileItem, int32_t>> deviceListConfig;
+    using DeviceId = int32_t;
+    std::map<DeviceId, std::map<ConfigFileItem, int32_t>> deviceConfigs_;
 
 private:
     int32_t DeviceClassification(struct libinput_device *device, DeviceId deviceId);
@@ -70,4 +67,4 @@ private:
 };
 } // namespace MMI
 } // namespace OHOS
-#endif // DEVICE_CONFIG_H
\ No newline at end of file
+#endif // DEVICE_CONFIG_FILE_PARSER_H
\ No newline at end of file
diff --git a/service/event_handler/include/input_event_normalize_handler.h b/service/event_handler/include/input_event_normalize_handler.h
index 757136068c..48fa123fb4 100755
--- a/service/event_handler/include/input_event_normalize_handler.h
+++ b/service/event_handler/include/input_event_normalize_handler.h
@@ -50,7 +50,6 @@ private:
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     KeyEventHandler keyEventHandler_;
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
-    DeviceConfigManagement configManagement_;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/event_handler/src/device_config.cpp b/service/event_handler/src/device_config_file_parser.cpp
similarity index 75%
rename from service/event_handler/src/device_config.cpp
rename to service/event_handler/src/device_config_file_parser.cpp
index 3c42e9b3e8..f87a0b5115 100644
--- a/service/event_handler/src/device_config.cpp
+++ b/service/event_handler/src/device_config_file_parser.cpp
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#include "device_config.h"
-
+#include "device_config_file_parser.h"
+#include <fstream>
 #include "libinput.h"
 #include "input_device.h"
 #include "error_multimodal.h"
@@ -26,15 +26,7 @@ namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "DeviceConfigManagement" };
 constexpr int32_t INVALID_DEVICE_ID = -1;
-
-
-inline bool IsNumqq(const std::string &str)
-{
-    std::istringstream sin(str);
-    double num;
-    sin >> num;
-    return num;
-}
+constexpr int32_t COMMENT_SUBSCRIPT = 0;
 } // namespace
 
 enum evdev_device_udev_tags {
@@ -52,7 +44,7 @@ enum evdev_device_udev_tags {
     EVDEV_UDEV_TAG_SWITCH = 1 << 11,
 };
 
-std::string DeviceConfigManagement::GetEventFileName(struct libinput_device *device)
+std::string DeviceConfigManagement::CombDeviceFileName(struct libinput_device *device)
 {
     CALL_DEBUG_ENTER;
     CHKPS(device);
@@ -70,13 +62,13 @@ std::string DeviceConfigManagement::GetEventFileName(struct libinput_device *dev
 ConfigFileItem DeviceConfigManagement::ConfigItemName2Id(const std::string &name)
 {
     static const std::map<const std::string, ConfigFileItem> configList = {
-        {"speed", POINTER_SPEED},
+        {"speed", ConfigFileItem::POINTER_SPEED},
     };
 
     auto iter = configList.find(name);
     if (iter == configList.end()) {
         MMI_HILOGE("Device config file remove failed");
-        return INVALID;
+        return ConfigFileItem::INVALID;
     }
     return configList.at(name);
 }
@@ -84,41 +76,46 @@ ConfigFileItem DeviceConfigManagement::ConfigItemName2Id(const std::string &name
 std::map<ConfigFileItem, int32_t> DeviceConfigManagement::ReadConfigFile(const std::string &filePath)
 {
     std::map<ConfigFileItem, int32_t> configList;
-    FILE* fp = fopen(filePath.c_str(), "r");
-    if (fp == nullptr) {
-        MMI_HILOGE("Config file open failed");
+    std::ifstream cfgFile(filePath);
+    if (!cfgFile.is_open()) {
+        MMI_HILOGE("Failed to open config file");
         return configList;
     }
-    char buf[256] = {};
-    std::string dataStr;
+    std::string tmp;
 
-    while (fgets(buf, sizeof(buf), fp) != nullptr) {
-        dataStr = buf;
-        int32_t keyLen = dataStr.find_first_of(":");
-        std::string key = dataStr.substr(0 , keyLen);
-        std::string value = dataStr.substr(keyLen + 1);
-        if (!IsNumqq(value)) {
-           continue;
+    while (std::getline(cfgFile, tmp)) {
+        RemoveSpace(tmp);
+        size_t pos = tmp.find('#');
+        if (pos != tmp.npos && pos != COMMENT_SUBSCRIPT) {
+            continue;
+        }
+        if (tmp.empty() || tmp.front() == '#') {
+            continue;
         }
+        pos = tmp.find('=');
+        if (pos == (tmp.size() - 1) || pos == tmp.npos) {
+            continue;
+        }
+        std::string key = tmp.substr(0, pos);
+        std::string value = tmp.substr(pos + 1);
         configList[ConfigItemName2Id(key)] = std::stoi(value);
     }
-    if (fclose(fp) != 0) {
-        MMI_HILOGW("Close file failed");
-    }
+    cfgFile.close();
     return configList;
 }
 
 int32_t DeviceConfigManagement::DeviceConfiguration(struct libinput_device *device, DeviceId deviceId)
 {
     CALL_DEBUG_ENTER;
-    std::string fileName = "/vendor/etc/pointer/" + GetEventFileName(device) + ".TOML";
+    std::string fileName = "/vendor/etc/pointer/" + CombDeviceFileName(device) + ".TOML";
     auto configList = ReadConfigFile(fileName);
     if (configList.empty()) {
         MMI_HILOGE("configList is empty");
         return RET_ERR;
     }
-    deviceListConfig[deviceId] = configList;
-    int32_t ret = MouseEventHdr->SetPointerSpeedWithDeviceId(deviceId, configList[POINTER_SPEED]);
+    deviceConfigs_[deviceId] = configList;
+    int32_t ret = MouseEventHdr->SetPointerSpeedWithDeviceId(deviceId,
+        configList[ConfigFileItem::POINTER_SPEED]);
     if (ret != RET_OK) {
         MMI_HILOGE("Pointer speed set failed, ret : %{public}d", ret);
     }
@@ -140,7 +137,7 @@ int32_t DeviceConfigManagement::DeviceClassification(struct libinput_device *dev
     return RET_ERR;
 }
 
-int32_t DeviceConfigManagement::AddDeviceProfile(struct libinput_device *device)
+int32_t DeviceConfigManagement::OnDeviceAdd(struct libinput_device *device)
 {
     CALL_DEBUG_ENTER;
     CHKPR(device, ERROR_NULL_POINTER);
@@ -152,13 +149,13 @@ int32_t DeviceConfigManagement::AddDeviceProfile(struct libinput_device *device)
     return DeviceClassification(device, deviceId);
 }
 
-void DeviceConfigManagement::RemoveDeviceProfile(struct libinput_device *device)
+void DeviceConfigManagement::OnDeviceRemove(struct libinput_device *device)
 {
     CALL_DEBUG_ENTER;
     CHKPV(device);
     int32_t deviceId = InputDevMgr->FindInputDeviceId(device);
-    auto iter = deviceListConfig.find(deviceId);
-    if (iter == deviceListConfig.end()) {
+    auto iter = deviceConfigs_.find(deviceId);
+    if (iter == deviceConfigs_.end()) {
         MMI_HILOGE("Device config file remove failed");
         return;
     }
@@ -166,7 +163,7 @@ void DeviceConfigManagement::RemoveDeviceProfile(struct libinput_device *device)
     if (ret != RET_OK) {
         MMI_HILOGE("Pointer speed set failed, ret : %{public}d", ret);
     }
-    deviceListConfig.erase(iter);
+    deviceConfigs_.erase(iter);
 }
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/service/event_handler/src/input_event_normalize_handler.cpp b/service/event_handler/src/input_event_normalize_handler.cpp
index 13f5c9379f..ff457ce78a 100644
--- a/service/event_handler/src/input_event_normalize_handler.cpp
+++ b/service/event_handler/src/input_event_normalize_handler.cpp
@@ -28,12 +28,13 @@
 #include "time_cost_chk.h"
 #include "timer_manager.h"
 #include "touch_transform_point_manager.h"
-#include "device_config.h"
+#include "device_config_file_parser.h"
 
 namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputEventNormalizeHandler" };
+DeviceConfigManagement configManagement_;
 }
 
 void InputEventNormalizeHandler::HandleEvent(libinput_event* event)
@@ -115,7 +116,7 @@ int32_t InputEventNormalizeHandler::OnEventDeviceAdded(libinput_event *event)
     InputDevMgr->OnInputDeviceAdded(device);
     KeyMapMgr->ParseDeviceConfigFile(device);
     KeyRepeat->AddDeviceConfig(device);
-    configManagement_.AddDeviceProfile(device);
+    configManagement_.OnDeviceAdd(device);
     return RET_OK;
 }
 
@@ -127,7 +128,7 @@ int32_t InputEventNormalizeHandler::OnEventDeviceRemoved(libinput_event *event)
     KeyMapMgr->RemoveKeyValue(device);
     KeyRepeat->RemoveDeviceConfig(device);
     InputDevMgr->OnInputDeviceRemoved(device);
-    configManagement_.RemoveDeviceProfile(device);
+    configManagement_.OnDeviceRemove(device);
     return RET_OK;
 }
 
diff --git a/service/mouse_event_handler/include/mouse_event_handler.h b/service/mouse_event_handler/include/mouse_event_handler.h
index d7bbc82d2b..a484d7929d 100644
--- a/service/mouse_event_handler/include/mouse_event_handler.h
+++ b/service/mouse_event_handler/include/mouse_event_handler.h
@@ -46,7 +46,7 @@ public:
     int32_t SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed);
     int32_t RemovePointerSpeed(int32_t deviceId);
     int32_t GetPointerSpeed() const;
-    int32_t GetPointerSpeedWithDeviceId(int32_t deviceId) const;
+    int32_t GetPointerSpeedByDeviceId(int32_t deviceId) const;
 
 private:
     int32_t HandleMotionInner(libinput_event_pointer* data, int32_t deviceId);
@@ -62,6 +62,7 @@ private:
     bool GetSpeedGain(const double &vin, double& gain) const;
     void DumpInner();
     void InitAbsolution();
+    int32_t GetSpeed(int32_t deviceId);
 
 private:
     std::shared_ptr<PointerEvent> pointerEvent_ { nullptr };
@@ -73,7 +74,7 @@ private:
     int32_t currentDisplayId_ { -1 };
     int32_t speed_ { DEFAULT_SPEED };
     std::map<int32_t, int32_t> pointerDeviceSpeeds;
-    bool isJsPointerSpeed_ { false };
+    bool isSpeedSetByUser_ { false };
 };
 
 #define MouseEventHdr MouseEventHandler::GetInstance()
diff --git a/service/mouse_event_handler/src/mouse_event_handler.cpp b/service/mouse_event_handler/src/mouse_event_handler.cpp
index d7b7486edc..ac9c9166ef 100644
--- a/service/mouse_event_handler/src/mouse_event_handler.cpp
+++ b/service/mouse_event_handler/src/mouse_event_handler.cpp
@@ -38,7 +38,21 @@ const std::array<double, 6> SPEED_DIFF_NUMS { 0.0, -2.0, -5.0, -19.0, -28.6, -57
 constexpr double DOUBLE_ZERO = 1e-6;
 constexpr int32_t MIN_SPEED = 1;
 constexpr int32_t MAX_SPEED = 11;
+int32_t PointerSpeedCheck(int32_t speed)
+{
+    if (speed < MIN_SPEED) {
+        MMI_HILOGW("Set pointer speed less than minimum speed:%{public}d", speed);
+        return MIN_SPEED;
+    } else if (speed > MAX_SPEED) {
+        MMI_HILOGW("Set pointer speed greater than the maximum value speed:%{public}d", speed);
+        return MAX_SPEED;
+    } else {
+        return speed;
+    }
+}
 } // namespace
+
+
 MouseEventHandler::MouseEventHandler()
 {
     pointerEvent_ = PointerEvent::Create();
@@ -50,6 +64,15 @@ std::shared_ptr<PointerEvent> MouseEventHandler::GetPointerEvent() const
     return pointerEvent_;
 }
 
+int32_t MouseEventHandler::GetSpeed(int32_t deviceId)
+{
+    if (isSpeedSetByUser_) {
+        return speed_;
+    } else {
+        return GetPointerSpeedByDeviceId(deviceId);
+    }
+}
+
 bool MouseEventHandler::GetSpeedGain(const double& vin, double& gain) const
 {
     if (abs(vin) < DOUBLE_ZERO) {
@@ -107,14 +130,9 @@ int32_t MouseEventHandler::HandleMotionCorrection(libinput_event_pointer* data,
         MMI_HILOGE("Get speed gain failed");
         return RET_ERR;
     }
-    int32_t speedTmp = 0;
-    if (isJsPointerSpeed_){
-        speedTmp = speed_;
-    } else {
-        speedTmp = GetPointerSpeedWithDeviceId(deviceId);
-    }
-    double correctionX = dx * gain * static_cast<double>(speedTmp) / 10.0;
-    double correctionY = dy * gain * static_cast<double>(speedTmp) / 10.0;
+    int32_t speed = GetSpeed(deviceId);
+    double correctionX = dx * gain * static_cast<double>(speed) / 10.0;
+    double correctionY = dy * gain * static_cast<double>(speed) / 10.0;
     MMI_HILOGD("Get and process the movement coordinates, dx:%{public}lf, dy:%{public}lf,"
                "correctionX:%{public}lf, correctionY:%{public}lf, gain:%{public}lf",
                dx, dy, correctionX, correctionY, gain);
@@ -386,31 +404,17 @@ void MouseEventHandler::Dump(int32_t fd, const std::vector<std::string> &args)
 int32_t MouseEventHandler::SetPointerSpeed(int32_t speed)
 {
     CALL_DEBUG_ENTER;
-    if (speed < MIN_SPEED) {
-        speed_ = MIN_SPEED;
-    } else if (speed > MAX_SPEED) {
-        speed_ = MAX_SPEED;
-    } else {
-        speed_ = speed;
-    }
+    speed_ = PointerSpeedCheck(speed);
     MMI_HILOGD("Set pointer speed:%{public}d", speed_);
-    isJsPointerSpeed_ = true;
+    isSpeedSetByUser_ = true;
     return RET_OK;
 }
 
 int32_t MouseEventHandler::SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed)
 {
     CALL_DEBUG_ENTER;
-    int32_t speedTmp = speed;
-    if (speed < MIN_SPEED) {
-        speedTmp = MIN_SPEED;
-    } else if (speed > MAX_SPEED) {
-        speedTmp = MAX_SPEED;
-    } else {
-        speedTmp = speed;
-    }
-    MMI_HILOGD("Set pointer speed:%{public}d", speedTmp);
-    pointerDeviceSpeeds[deviceId] = speedTmp;
+    pointerDeviceSpeeds[deviceId] = PointerSpeedCheck(speed);
+    MMI_HILOGD("Set pointer speed:%{public}d", pointerDeviceSpeeds[deviceId]);
     // Notify
     return RET_OK;
 }
@@ -427,7 +431,7 @@ int32_t MouseEventHandler::RemovePointerSpeed(int32_t deviceId)
     return RET_OK;
 }
 
-int32_t MouseEventHandler::GetPointerSpeedWithDeviceId(int32_t deviceId) const
+int32_t MouseEventHandler::GetPointerSpeedByDeviceId(int32_t deviceId) const
 {
     CALL_DEBUG_ENTER;
     auto it = pointerDeviceSpeeds.find(deviceId);
-- 
Gitee


From 85d9677a00ead1912b1b97a0950823c2d76ee19e Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Thu, 18 Aug 2022 16:54:37 +0800
Subject: [PATCH 005/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 service/BUILD.gn                              |  3 ++-
 .../include/device_config_file_parser.h       | 20 -------------------
 .../src/device_config_file_parser.cpp         |  0
 3 files changed, 2 insertions(+), 21 deletions(-)
 rename service/{event_handler => device_config}/include/device_config_file_parser.h (80%)
 rename service/{event_handler => device_config}/src/device_config_file_parser.cpp (100%)

diff --git a/service/BUILD.gn b/service/BUILD.gn
index ca6da310f3..b98f6d92e2 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -17,6 +17,7 @@ mmi_service_path = "${mmi_path}/service"
 
 config("libmmi_server_config") {
   include_dirs = [
+    "device_config/include",
     "device_manager/include",
     "device_scalability/include",
     "delegate_task/include",
@@ -131,6 +132,7 @@ ohos_shared_library("libmmi-server") {
   sources = [
     "//foundation/multimodalinput/input/frameworks/proxy/event_handler/src/bytrace_adapter.cpp",
     "delegate_task/src/delegate_tasks.cpp",
+    "device_config/src/device_config_file_parser.cpp",
     "device_manager/src/input_device_manager.cpp",
     "dfx/src/dfx_hisysevent.cpp",
     "event_dispatch/src/event_dispatch.cpp",
@@ -141,7 +143,6 @@ ohos_shared_library("libmmi-server") {
     "event_handler/src/key_auto_repeat.cpp",
     "event_handler/src/key_event_value_transformation.cpp",
     "event_handler/src/key_map_manager.cpp",
-    "event_handler/src/device_config_file_parser.cpp",
     "libinput_adapter/src/libinput_adapter.cpp",
     "message_handle/src/server_msg_handler.cpp",
     "module_loader/src/mmi_service.cpp",
diff --git a/service/event_handler/include/device_config_file_parser.h b/service/device_config/include/device_config_file_parser.h
similarity index 80%
rename from service/event_handler/include/device_config_file_parser.h
rename to service/device_config/include/device_config_file_parser.h
index 58f4137e61..887943fecd 100644
--- a/service/event_handler/include/device_config_file_parser.h
+++ b/service/device_config/include/device_config_file_parser.h
@@ -27,30 +27,11 @@ enum class ConfigFileItem
     INVALID = -1,
     POINTER_BASE = 0,
     POINTER_SPEED,
-    KEYBOARD_BASE = 1000,
-    KEY_XXXX,
 };
 class DeviceConfigManagement {
 public:
     DeviceConfigManagement() = default;
     ~DeviceConfigManagement() = default;
-    /*
-/etc/mouse/common.conf
-button_count = TTTTTTT
-
-/etc/mouse/1a-2b-3c-d.conf   => device id: 30, 35
-include /etc/mouse/common.conf
-speed = 100
-30 => {1 => 100, 2 => 3, }
-/etc/mouse/1a-2b-3c-e.conf   => device id: 40
-speed = 200
-
-/etc/keyboard/01-20-3c-k.conf   => device id: 10, 15
-layout = 104
-/etc/keyboard/01-24-3c-l.conf   => device id: 20
-layout = 110
-     */
-
 public:
     int32_t OnDeviceAdd(struct libinput_device *device);
     void OnDeviceRemove(struct libinput_device *device);
@@ -58,7 +39,6 @@ public:
 private:
     using DeviceId = int32_t;
     std::map<DeviceId, std::map<ConfigFileItem, int32_t>> deviceConfigs_;
-
 private:
     int32_t DeviceClassification(struct libinput_device *device, DeviceId deviceId);
     int32_t DeviceConfiguration(struct libinput_device *device, DeviceId deviceId);
diff --git a/service/event_handler/src/device_config_file_parser.cpp b/service/device_config/src/device_config_file_parser.cpp
similarity index 100%
rename from service/event_handler/src/device_config_file_parser.cpp
rename to service/device_config/src/device_config_file_parser.cpp
-- 
Gitee


From 3f1f0eeb1b6d2b51189098f50378840ba07aff93 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Tue, 23 Aug 2022 11:16:57 +0800
Subject: [PATCH 006/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8D=95=E8=8E=B7?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 .../include/input_manager_impl.h              |  4 ++-
 .../event_handler/src/input_manager_impl.cpp  | 34 +++++++++++++++++++
 frameworks/proxy/events/src/input_manager.cpp | 10 ++++++
 frameworks/proxy/events/src/pointer_event.cpp | 28 +++++++++++++--
 .../innerkits/event/include/pointer_event.h   | 33 ++++++++++++++++++
 .../innerkits/proxy/include/input_manager.h   | 18 +++++++++-
 .../include/i_multimodal_input_connect.h      |  2 ++
 .../multimodal_input_connect_manager.h        |  1 +
 .../include/multimodal_input_connect_proxy.h  |  1 +
 .../include/multimodal_input_connect_stub.h   |  1 +
 .../src/multimodal_input_connect_manager.cpp  |  6 ++++
 .../src/multimodal_input_connect_proxy.cpp    | 21 ++++++++++++
 .../src/multimodal_input_connect_stub.cpp     | 17 +++++++++-
 service/module_loader/include/mmi_service.h   |  1 +
 service/module_loader/src/mmi_service.cpp     | 11 ++++++
 .../src/mouse_event_handler.cpp               | 10 ++++--
 .../include/input_windows_manager.h           |  7 +++-
 .../src/input_windows_manager.cpp             | 25 ++++++++++++++
 test/unittest/common/src/event_util_test.cpp  |  3 +-
 19 files changed, 224 insertions(+), 9 deletions(-)

diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index e0bd698a85..ecd127556c 100644
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -108,7 +108,7 @@ public:
 
     void SetAnrObserver(std::shared_ptr<IAnrObserver> observer);
     void OnAnr(int32_t pid);
-	
+
     int32_t SetPointerLocation(int32_t x, int32_t y);
     using DeviceUniqId = std::tuple<int32_t, int32_t, int32_t, int32_t, int32_t, std::string>;
     int32_t SetInputDeviceSeatName(const std::string& seatName, DeviceUniqId& deviceUniqId);
@@ -118,6 +118,8 @@ public:
     int32_t UnprepareRemoteInput(const std::string& deviceId, std::function<void(int32_t)> callback);
     int32_t StartRemoteInput(const std::string& deviceId, uint32_t inputAbility, std::function<void(int32_t)> callback);
     int32_t StopRemoteInput(const std::string& deviceId, uint32_t inputAbility, std::function<void(int32_t)> callback);
+    int32_t EnterCaptureMode(int32_t windowId);
+    int32_t LeaveCaptureMode(int32_t windowId);
 
 private:
     int32_t PackWindowInfo(NetPacket &pkt);
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index c4cc6b3e35..6ca059ca23 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -534,6 +534,7 @@ int32_t InputManagerImpl::SetPointerVisible(bool visible)
 {
 #if defined(OHOS_BUILD_ENABLE_POINTER) && defined(OHOS_BUILD_ENABLE_POINTER_DRAWING)
     CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mtx_);
     int32_t ret = MultimodalInputConnMgr->SetPointerVisible(visible);
     if (ret != RET_OK) {
         MMI_HILOGE("Set pointer visible failed, ret:%{public}d", ret);
@@ -549,6 +550,7 @@ bool InputManagerImpl::IsPointerVisible()
 {
 #if defined(OHOS_BUILD_ENABLE_POINTER) && defined(OHOS_BUILD_ENABLE_POINTER_DRAWING)
     CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mtx_);
     bool visible;
     int32_t ret = MultimodalInputConnMgr->IsPointerVisible(visible);
     if (ret != 0) {
@@ -913,5 +915,37 @@ int32_t InputManagerImpl::StopRemoteInput(const std::string& deviceId,
     return RET_OK;
 #endif // OHOS_DISTRIBUTED_INPUT_MODEL
 }
+
+int32_t InputManagerImpl::EnterCaptureMode(int32_t windowId)
+{
+#if defined(OHOS_BUILD_ENABLE_POINTER)
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mtx_);
+    int32_t ret = MultimodalInputConnMgr->SetMouseCaptureMode(windowId, true);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Enter captrue mode failed");
+    }
+    return ret;
+#else
+        MMI_HILOGW("Pointer device module does not support");
+        return ERROR_UNSUPPORT;
+#endif // OHOS_BUILD_ENABLE_POINTER
+}
+
+int32_t InputManagerImpl::LeaveCaptureMode(int32_t windowId)
+{
+#if defined(OHOS_BUILD_ENABLE_POINTER)
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mtx_);
+    int32_t ret = MultimodalInputConnMgr->SetMouseCaptureMode(windowId, false);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Leave captrue mode failed");
+    }
+    return ret;
+#else
+        MMI_HILOGW("Pointer device module does not support");
+        return ERROR_UNSUPPORT;
+#endif // OHOS_BUILD_ENABLE_POINTER
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index c20a0a7747..4255f82bea 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -223,5 +223,15 @@ int32_t InputManager::StopRemoteInput(const std::string& deviceId, uint32_t inpu
 {
     return InputManagerImpl::GetInstance()->StopRemoteInput(deviceId, inputAbility, callback);
 }
+
+int32_t InputManager::EnterCaptureMode(int32_t windowId)
+{
+    return InputMgrImpl->EnterCaptureMode(windowId);
+}
+
+int32_t InputManager::LeaveCaptureMode(int32_t windowId)
+{
+    return InputMgrImpl->LeaveCaptureMode(windowId);
+}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/frameworks/proxy/events/src/pointer_event.cpp b/frameworks/proxy/events/src/pointer_event.cpp
index db85473235..92c1fa6906 100644
--- a/frameworks/proxy/events/src/pointer_event.cpp
+++ b/frameworks/proxy/events/src/pointer_event.cpp
@@ -266,6 +266,26 @@ void PointerEvent::PointerItem::SetTargetWindowId(int32_t windowId)
     targetWindowId_ = windowId;
 }
 
+int32_t PointerEvent::PointerItem::GetRawDeltaX() const
+{
+    return rawDeltaX_;
+}
+
+void PointerEvent::PointerItem::SetRawDeltaX(int32_t rawDeltaX)
+{
+    rawDeltaX_ = rawDeltaX;
+}
+
+int32_t PointerEvent::PointerItem::GetRawDeltaY() const
+{
+    return rawDeltaY_;
+}
+
+void PointerEvent::PointerItem::SetRawDeltaY(int32_t rawDeltaY)
+{
+    rawDeltaY_ = rawDeltaY;
+}
+
 bool PointerEvent::PointerItem::WriteToParcel(Parcel &out) const
 {
     return (
@@ -290,7 +310,9 @@ bool PointerEvent::PointerItem::WriteToParcel(Parcel &out) const
         out.WriteInt32(longAxis_) &&
         out.WriteInt32(shortAxis_) &&
         out.WriteInt32(toolType_) &&
-        out.WriteInt32(deviceId_)
+        out.WriteInt32(deviceId_) &&
+        out.WriteInt32(rawDeltaX_) &&
+        out.WriteInt32(rawDeltaY_)
     );
 }
 
@@ -318,7 +340,9 @@ bool PointerEvent::PointerItem::ReadFromParcel(Parcel &in)
         in.ReadInt32(longAxis_) &&
         in.ReadInt32(shortAxis_) &&
         in.ReadInt32(toolType_) &&
-        in.ReadInt32(deviceId_)
+        in.ReadInt32(deviceId_)&&
+        in.ReadInt32(rawDeltaX_) &&
+        in.ReadInt32(rawDeltaY_)
     );
 }
 
diff --git a/interfaces/native/innerkits/event/include/pointer_event.h b/interfaces/native/innerkits/event/include/pointer_event.h
index 6c758d8585..4e04469239 100644
--- a/interfaces/native/innerkits/event/include/pointer_event.h
+++ b/interfaces/native/innerkits/event/include/pointer_event.h
@@ -689,6 +689,37 @@ public:
          */
         bool ReadFromParcel(Parcel &in);
 
+        /**
+         * @brief 获取 x 坐标的偏移量。
+         * 对于指针输入事件，该值为目标屏幕上的 x 坐标相对偏移量。
+         * @return x 坐标相对偏移量。
+         * @since 9
+         */
+        int32_t GetRawDeltaX() const;
+
+        /**
+         * @brief 设置 x 坐标相对偏移量。
+         * @param rawDeltaX 表示要设置的 x 坐标相对偏移量。
+         * @return 无
+         * @since 9
+         */
+        void SetRawDeltaX(int32_t rawDeltaX);
+        /**
+         * @brief 获取 y 坐标的偏移量。
+         * 对于指针输入事件，该值为目标屏幕上的 y 坐标相对偏移量。
+         * @return y 坐标相对偏移量。
+         * @since 9
+         */
+        int32_t GetRawDeltaY() const;
+
+        /**
+         * @brief 设置 y 坐标相对偏移量。
+         * @param rawDeltaY 表示要设置的 y 坐标相对偏移量。
+         * @return 无效
+         * @since 9
+         */
+        void SetRawDeltaY(int32_t rawDeltaY);
+
     private:
         int32_t pointerId_ {};
         bool pressed_ { false };
@@ -713,6 +744,8 @@ public:
         int64_t downTime_ {};
         int32_t toolType_ {};
         int32_t targetWindowId_ { -1 };
+        int32_t rawDeltaX_ {};
+        int32_t rawDeltaY_ {};
     };
 
 public:
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index 5233fbb9ea..98753d27ce 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -363,7 +363,7 @@ public:
      * 否则返回小于 <b>0</b> 的值
      */
     int32_t StopRemoteInput(const std::string& deviceId, uint32_t inputAbility, std::function<void(int32_t)> callback);
-	
+
     /**
      * @brief 设定输入设备的席位名称.
      * @param seatName 席位名称
@@ -374,6 +374,22 @@ public:
     using DeviceUniqId = std::tuple<int32_t, int32_t, int32_t, int32_t, int32_t, std::string>;
     int32_t SetInputDeviceSeatName(const std::string& seatName, DeviceUniqId& deviceUniqId);
 
+    /**
+     * @brief 进入捕获模式
+     * @param windowId 窗口id.
+     * @return 进入捕获模式成功或失败.
+     * @since 9
+     */
+
+    int32_t EnterCaptureMode(int32_t windowId);
+    /**
+     * @brief 退出捕获模式
+     * @param windowId 窗口id.
+     * @return 退出捕获模式成功或失败.
+     * @since 9
+     */
+    int32_t LeaveCaptureMode(int32_t windowId);
+
 private:
     InputManager() = default;
     DISALLOW_COPY_AND_MOVE(InputManager);
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
index 3896116c56..6dda86c52b 100644
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -61,6 +61,7 @@ public:
     virtual int32_t StopRemoteCooperate() = 0;
     virtual int32_t StopRemoteCooperateResult(bool isSucess) = 0;
     virtual int32_t StartCooperateOtherResult(const std::string &srcNetworkId) = 0;
+    virtual int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode) = 0;
     enum {
         ALLOC_SOCKET_FD = 0,
         ADD_INPUT_EVENT_FILTER = 1,
@@ -85,6 +86,7 @@ public:
         GET_POINTER_SPEED = 22,
         SET_POINTER_STYLE = 23,
         GET_POINTER_STYLE = 24,
+        SET_CAPTURE_MODE = 25,
         REMOTE_COOPERATE_START = 35,
         REMOTE_COOPERATE_START_RES = 36,
         REMOTE_COOPERATE_STOP = 37,
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
index 5a91c608ac..b16b33d746 100644
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -59,6 +59,7 @@ public:
     int32_t UnsubscribeKeyEvent(int32_t subscribeId);
     int32_t InjectPointerEvent(const std::shared_ptr<PointerEvent> pointerEvent);
     int32_t SetAnrObserver();
+    int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode);
 private:
     MultimodalInputConnectManager() = default;
     DISALLOW_COPY_AND_MOVE(MultimodalInputConnectManager);
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
index 5fe6b9468f..59eac79caa 100644
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -60,6 +60,7 @@ public:
     virtual int32_t StopRemoteCooperate() override;
     virtual int32_t StopRemoteCooperateResult(bool isSucess) override;
     virtual int32_t StartCooperateOtherResult(const std::string &srcNetworkId) override;
+    virtual int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode) override;
 private:
     static inline BrokerDelegator<MultimodalInputConnectProxy> delegator_;
 };
diff --git a/service/connect_manager/include/multimodal_input_connect_stub.h b/service/connect_manager/include/multimodal_input_connect_stub.h
index a55c1aea61..bf091a8c99 100644
--- a/service/connect_manager/include/multimodal_input_connect_stub.h
+++ b/service/connect_manager/include/multimodal_input_connect_stub.h
@@ -65,6 +65,7 @@ protected:
     int32_t StubStopRemoteCooperate(MessageParcel& data, MessageParcel& reply);
     int32_t StubStopRemoteCooperateRes(MessageParcel& data, MessageParcel& reply);
     int32_t StubStartCooperateOtherRes(MessageParcel& data, MessageParcel& reply);
+    int32_t StubSetMouseCaptureMode(MessageParcel& data, MessageParcel& reply);
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
index bc60e19f16..897263ca1a 100644
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -282,5 +282,11 @@ void MultimodalInputConnectManager::NotifyDeath()
         }
     } while (--retryCount > 0);
 }
+
+int32_t MultimodalInputConnectManager::SetMouseCaptureMode(int32_t windowId, bool isCaptureMode)
+{
+    CHKPR(multimodalInputConnectService_, INVALID_HANDLER_ID);
+    return multimodalInputConnectService_->SetMouseCaptureMode(windowId, isCaptureMode);
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index 88e3761644..acfbd6bc2d 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -671,5 +671,26 @@ int32_t MultimodalInputConnectProxy::StartCooperateOtherResult(const std::string
     }
     return ret;
 }
+
+int32_t MultimodalInputConnectProxy::SetMouseCaptureMode(int32_t windowId, bool isCaptureMode)
+{
+    CALL_DEBUG_ENTER;
+    MessageParcel data;
+    if (!data.WriteInterfaceToken(MultimodalInputConnectProxy::GetDescriptor())) {
+        MMI_HILOGE("Failed to write descriptor");
+        return ERR_INVALID_VALUE;
+    }
+    WRITEINT32(data, windowId, ERR_INVALID_VALUE);
+    WRITEBOOL(data, isCaptureMode, ERR_INVALID_VALUE);
+    MessageParcel reply;
+    MessageOption option;
+    sptr<IRemoteObject> remote = Remote();
+    CHKPR(remote, RET_ERR);
+    int32_t ret = remote->SendRequest(SET_CAPTURE_MODE, data, reply, option);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Send request fail, ret:%{public}d", ret);
+    }
+    return ret;
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index e78453305a..dc7c929789 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -76,7 +76,8 @@ int32_t MultimodalInputConnectStub::OnRemoteRequest(
         {IMultimodalInputConnect::REMOTE_COOPERATE_STOP, &MultimodalInputConnectStub::StubStopRemoteCooperate},
         {IMultimodalInputConnect::REMOTE_COOPERATE_STOP_RES, &MultimodalInputConnectStub::StubStopRemoteCooperateRes},
         {IMultimodalInputConnect::REMOTE_COOPERATE_STOP_OTHER_RES,
-            &MultimodalInputConnectStub::StubStartCooperateOtherRes}
+            &MultimodalInputConnectStub::StubStartCooperateOtherRes},
+        {IMultimodalInputConnect::SET_CAPTURE_MODE, &MultimodalInputConnectStub::StubSetMouseCaptureMode},
     };
     auto it = mapConnFunc.find(code);
     if (it != mapConnFunc.end()) {
@@ -641,5 +642,19 @@ int32_t MultimodalInputConnectStub::StubStartCooperateOtherRes(MessageParcel& da
     }
     return ret;
 }
+
+int32_t MultimodalInputConnectStub::StubSetMouseCaptureMode(MessageParcel& data, MessageParcel& reply)
+{
+    CALL_DEBUG_ENTER;
+    int32_t windowId = -1;
+    bool isCaptureMode = false;
+    READINT32(data, windowId, IPC_PROXY_DEAD_OBJECT_ERR);
+    READBOOL(data, isCaptureMode, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = SetMouseCaptureMode(windowId, isCaptureMode);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Fail to call SetMouseCaptureMode, ret:%{public}d", ret);
+    }
+    return ret;
+}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index ad2831e8bb..5744b95787 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -78,6 +78,7 @@ public:
     virtual int32_t StopRemoteCooperate() override;
     virtual int32_t StopRemoteCooperateResult(bool isSucess) override;
     virtual int32_t StartCooperateOtherResult(const std::string& srcNetworkId) override;
+    virtual int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode) override;
 
 #ifdef OHOS_RSS_CLIENT
     virtual void OnAddSystemAbility(int32_t systemAbilityId, const std::string& deviceId) override;
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 0d42a6411d..e33ad7cab3 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -1081,5 +1081,16 @@ int32_t MMIService::StartCooperateOtherResult(const std::string& srcNetworkId)
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     return RET_OK;
 }
+
+int32_t MMIService::SetMouseCaptureMode(int32_t windowId, bool isCaptureMode)
+{
+    CALL_DEBUG_ENTER;
+    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&InputWindowsManager::SetMouseCaptureMode,
+        InputWindowsManager::GetInstance(), windowId, isCaptureMode));
+    if (ret != RET_OK) {
+        MMI_HILOGE("Set capture failed,return %{public}d", ret);
+    }
+    return ret;;
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/mouse_event_handler/src/mouse_event_handler.cpp b/service/mouse_event_handler/src/mouse_event_handler.cpp
index d0ad9473e0..a65d3cb7ec 100644
--- a/service/mouse_event_handler/src/mouse_event_handler.cpp
+++ b/service/mouse_event_handler/src/mouse_event_handler.cpp
@@ -126,8 +126,10 @@ int32_t MouseEventHandler::HandleMotionAccelerate(struct libinput_event_pointer*
     MMI_HILOGD("Get and process the movement coordinates, dx:%{public}lf, dy:%{public}lf,"
                "correctionX:%{public}lf, correctionY:%{public}lf, gain:%{public}lf",
                dx, dy, correctionX, correctionY, gain);
-    absolutionX_ += correctionX;
-    absolutionY_ += correctionY;
+    if (!WinMgr->GetMouseIsCaptureMode()) {
+        absolutionX_ += correctionX;
+        absolutionY_ += correctionY;
+    }
     return RET_OK;
 }
 
@@ -246,6 +248,10 @@ void MouseEventHandler::HandlePostInner(struct libinput_event_pointer* data, int
     CHKPV(data);
     auto mouseInfo = WinMgr->GetMouseInfo();
     MouseState->SetMouseCoords(mouseInfo.physicalX, mouseInfo.physicalY);
+    if (WinMgr->GetMouseIsCaptureMode()) {
+        pointerItem.SetRawDeltaX(static_cast<int32_t>(libinput_event_pointer_get_dx(data)));
+        pointerItem.SetRawDeltaY(static_cast<int32_t>(libinput_event_pointer_get_dy(data)));
+    }
     pointerItem.SetDisplayX(mouseInfo.physicalX);
     pointerItem.SetDisplayY(mouseInfo.physicalY);
     pointerItem.SetWindowX(0);
diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
index 6be3a1a239..b4ad509ba7 100644
--- a/service/window_manager/include/input_windows_manager.h
+++ b/service/window_manager/include/input_windows_manager.h
@@ -80,7 +80,8 @@ public:
     void DispatchPointer(int32_t pointerAction);
     void SendPointerEvent(int32_t pointerAction);
 #endif // OHOS_BUILD_ENABLE_POINTER
-
+    int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode);
+    bool GetMouseIsCaptureMode() const;
 private:
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
     bool IsInHotArea(int32_t x, int32_t y, const std::vector<Rect> &rects) const;
@@ -131,6 +132,10 @@ private:
 #endif // OHOS_BUILD_ENABLE_POINTER
     DisplayGroupInfo displayGroupInfo_;
     MouseLocation mouseLocation_ = {-1, -1}; // physical coord
+    struct CaptureModeInfo {
+        int32_t windowId { -1 };
+        bool isCaptureMode { false };
+    } captureModeInfo_;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 7cb19498ec..d080683373 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -171,6 +171,11 @@ void InputWindowsManager::UpdateDisplayInfo(const DisplayGroupInfo &displayGroup
     CALL_DEBUG_ENTER;
     CheckFocusWindowChange(displayGroupInfo);
     CheckZorderWindowChange(displayGroupInfo);
+    if (captureModeInfo_.isCaptureMode &&
+        ((displayGroupInfo_.focusWindowId != displayGroupInfo.focusWindowId) ||
+        (displayGroupInfo_.windowsInfo[0].id != displayGroupInfo.windowsInfo[0].id))) {
+        captureModeInfo_.isCaptureMode = false;
+    }
     displayGroupInfo_ = displayGroupInfo;
     if (!displayGroupInfo.displaysInfo.empty()) {
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -615,6 +620,9 @@ int32_t InputWindowsManager::UpdateMouseTarget(std::shared_ptr<PointerEvent> poi
         MMI_HILOGE("touchWindow is nullptr, targetWindow:%{public}d", pointerEvent->GetTargetWindowId());
         return RET_ERR;
     }
+    if (captureModeInfo_.isCaptureMode && (touchWindow->id != captureModeInfo_.windowId)) {
+        captureModeInfo_.isCaptureMode = false;
+    }
     pointerEvent->SetTargetWindowId(touchWindow->id);
     pointerEvent->SetAgentWindowId(touchWindow->agentWindowId);
     int32_t windowX = logicalX - touchWindow->area.x;
@@ -639,6 +647,23 @@ int32_t InputWindowsManager::UpdateMouseTarget(std::shared_ptr<PointerEvent> poi
 }
 #endif // OHOS_BUILD_ENABLE_POINTER
 
+int32_t InputWindowsManager::SetMouseCaptureMode(int32_t windowId, bool isCaptureMode)
+{
+    if (windowId < 0) {
+        MMI_HILOGE("Windowid(%{public}d) is invalid", windowId);
+        return RET_ERR;
+    }
+    captureModeInfo_.windowId = windowId;
+    captureModeInfo_.isCaptureMode = isCaptureMode;
+    MMI_HILOGI("Windowid:(%{public}d) is (%{public}d)", windowId, isCaptureMode);
+    return RET_OK;
+}
+
+bool InputWindowsManager::GetMouseIsCaptureMode() const
+{
+    return captureModeInfo_.isCaptureMode;
+}
+
 #ifdef OHOS_BUILD_ENABLE_TOUCH
 int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEvent> pointerEvent)
 {
diff --git a/test/unittest/common/src/event_util_test.cpp b/test/unittest/common/src/event_util_test.cpp
index cd5711100f..8bca323014 100644
--- a/test/unittest/common/src/event_util_test.cpp
+++ b/test/unittest/common/src/event_util_test.cpp
@@ -167,7 +167,8 @@ std::string EventUtilTest::DumpInputEvent(const std::shared_ptr<PointerEvent>& p
             << ",ToolWindowX:" << item.GetToolWindowX() << ",ToolWindowY:" << item.GetToolWindowY()
             << ",ToolWidth:" << item.GetToolWidth() << ",ToolHeight:" << item.GetToolHeight()
             << ",Pressure:" << item.GetPressure() << ",ToolType:" << item.GetToolType()
-            << ",LongAxis:" << item.GetLongAxis() << ",ShortAxis:" << item.GetShortAxis();
+            << ",LongAxis:" << item.GetLongAxis() << ",ShortAxis:" << item.GetShortAxis()
+            << ",RawDeltaX:" << item.GetRawDeltaX() << ",RawDeltaY:" << item.GetRawDeltaY();
     }
     return ostream.str();
 }
-- 
Gitee


From 8ca2f7d3251c81d35a2919f73a8f82ee86ac2c58 Mon Sep 17 00:00:00 2001
From: wangdi119 <wangdi119@huawei.com>
Date: Tue, 23 Aug 2022 15:30:54 +0800
Subject: [PATCH 007/360] =?UTF-8?q?=E2=80=9C=E9=BC=A0=E6=A0=87=E6=8D=95?=
 =?UTF-8?q?=E8=8E=B7=E6=A8=A1=E5=BC=8FJS=E6=8E=A5=E5=8F=A3=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangdi119 <wangdi119@huawei.com>
---
 .../napi/pointer/include/js_pointer_context.h |  2 +
 .../napi/pointer/include/js_pointer_manager.h |  2 +
 .../napi/pointer/src/js_pointer_context.cpp   | 61 +++++++++++++++++++
 .../napi/pointer/src/js_pointer_manager.cpp   | 45 ++++++++++++++
 4 files changed, 110 insertions(+)

diff --git a/frameworks/napi/pointer/include/js_pointer_context.h b/frameworks/napi/pointer/include/js_pointer_context.h
index b9c8f1f4d5..48510e3769 100644
--- a/frameworks/napi/pointer/include/js_pointer_context.h
+++ b/frameworks/napi/pointer/include/js_pointer_context.h
@@ -33,6 +33,8 @@ public:
     static napi_value SetPointerSpeed(napi_env env, napi_callback_info info);
     static napi_value GetPointerSpeed(napi_env env, napi_callback_info info);
     static napi_value SetPointerLocation(napi_env env, napi_callback_info info);
+    static napi_value EnterCaptureMode(napi_env env, napi_callback_info info);
+    static napi_value LeaveCaptureMode(napi_env env, napi_callback_info info);
 
 private:
     static napi_value CreateInstance(napi_env env);
diff --git a/frameworks/napi/pointer/include/js_pointer_manager.h b/frameworks/napi/pointer/include/js_pointer_manager.h
index 9e45e43008..77c9bb7dc4 100644
--- a/frameworks/napi/pointer/include/js_pointer_manager.h
+++ b/frameworks/napi/pointer/include/js_pointer_manager.h
@@ -90,6 +90,8 @@ public:
     napi_value SetPointerStyle(napi_env env, int32_t windowid, int32_t pointerStyle, napi_value handle = nullptr);
     napi_value GetPointerStyle(napi_env env, int32_t windowid, napi_value handle = nullptr);
     napi_value SetPointerLocation(napi_env env, napi_value handle, int32_t x, int32_t y);
+    napi_value EnterCaptureMode(napi_env env, int32_t windowId, napi_value handle = nullptr);
+    napi_value LeaveCaptureMode(napi_env env, int32_t windowId, napi_value handle = nullptr);
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/napi/pointer/src/js_pointer_context.cpp b/frameworks/napi/pointer/src/js_pointer_context.cpp
index 8cfc0d2778..7bb5b6018c 100644
--- a/frameworks/napi/pointer/src/js_pointer_context.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_context.cpp
@@ -430,6 +430,67 @@ napi_value JsPointerContext::EnumConstructor(napi_env env, napi_callback_info in
     return ret;
 }
 
+napi_value JsPointerContext::EnterCaptureMode(napi_env env, napi_callback_info info)
+{
+    CALL_DEBUG_ENTER;
+    size_t argc = 2;
+    napi_value argv[2];
+    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    if (argc < 1 || argc > 2) {
+        THROWERR(env, "the number of parameters is not as expected");
+        return nullptr;
+    }
+    if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
+        THROWERR(env, "The first parameter type is wrong");
+        return nullptr;
+    }
+
+    int32_t windowId = 0;
+    CHKRP(env, napi_get_value_int32(env, argv[0], &windowId), GET_BOOL);
+    JsPointerContext *jsPointer = JsPointerContext::GetInstance(env);
+    auto jsPointerMgr = jsPointer->GetJsPointerMgr();
+    if(argc == 1)
+    {
+        return jsPointerMgr->EnterCaptureMode(env,windowId);
+    }
+    if (!JsCommon::TypeOf(env, argv[1], napi_function)) {
+        THROWERR(env, "The second parameter type is wrong");
+        return nullptr;
+    }
+    return jsPointerMgr->EnterCaptureMode(env, windowId, argv[1]);
+}
+
+napi_value JsPointerContext::LeaveCaptureMode(napi_env env, napi_callback_info info)
+{
+    CALL_DEBUG_ENTER;
+    size_t argc = 2;
+    napi_value argv[2];
+    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    if (argc < 1 || argc > 2) {
+        THROWERR(env, "the number of parameters is not as expected");
+        return nullptr;
+    }
+    if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
+        THROWERR(env, "The first parameter type is wrong");
+        return nullptr;
+    }
+    
+    int32_t windowId = 0;
+    CHKRP(env, napi_get_value_int32(env, argv[0], &windowId), GET_BOOL);
+
+    JsPointerContext *jsPointer = JsPointerContext::GetInstance(env);
+    auto jsPointerMgr = jsPointer->GetJsPointerMgr();
+    if(argc == 1)
+    {
+        return jsPointerMgr->LeaveCaptureMode(env,windowId);
+    }
+    if (!JsCommon::TypeOf(env, argv[1], napi_function)) {
+        THROWERR(env, "The second parameter type is wrong");
+        return nullptr;
+    }
+    return jsPointerMgr      ->LeaveCaptureMode(env, windowId, argv[1]);
+}
+
 napi_value JsPointerContext::Export(napi_env env, napi_value exports)
 {
     CALL_DEBUG_ENTER;
diff --git a/frameworks/napi/pointer/src/js_pointer_manager.cpp b/frameworks/napi/pointer/src/js_pointer_manager.cpp
index 23702cfb3d..3602d47765 100644
--- a/frameworks/napi/pointer/src/js_pointer_manager.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_manager.cpp
@@ -276,5 +276,50 @@ napi_value JsPointerManager::GetPointerStyle(napi_env env, int32_t windowid, nap
     AsyncCallbackWork(asyncContext);
     return promise;
 }
+
+napi_value JsPointerManager::EnterCaptureMode(napi_env env, int32_t windowId, napi_value handle)
+{
+    CALL_DEBUG_ENTER;
+    sptr<AsyncContext> asyncContext = new (std::nothrow) AsyncContext(env);
+    if(asyncContext == nullptr) {
+        THROWERR(env,"create AsyncContext failed");
+        return nullptr;
+    }
+    asyncContext->errorCode = InputManager::GetInstance()->EnterCaptureMode(windowId);
+    asyncContext->reserve << ReturnType::VOID;
+
+    napi_value promise = nullptr;
+    if(handle != nullptr) {
+        CHKRP(env, napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
+        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
+    } else {
+        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
+    }
+    AsyncCallbackWork(asyncContext);
+    return promise;
+}
+
+napi_value JsPointerManager::LeaveCaptureMode(napi_env env, int32_t windowId, napi_value handle)
+{
+    CALL_DEBUG_ENTER;
+    sptr<AsyncContext> asyncContext = new (std::nothrow) AsyncContext(env);
+    if(asyncContext == nullptr) {
+        THROWERR(env,"create AsyncContext failed");
+        return nullptr;
+    }
+
+    asyncContext->errorCode = InputManager::GetInstance()->LeaveCaptureMode(windowId);
+    asyncContext->reserve << ReturnType::VOID;
+
+    napi_value promise = nullptr;
+    if(handle != nullptr) {
+        CHKRP(env, napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
+        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
+    } else {
+        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
+    }
+    AsyncCallbackWork(asyncContext);
+    return promise;
+}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
-- 
Gitee


From c6bce3fa2a415b6d5c5ac0287440a684b14a2c47 Mon Sep 17 00:00:00 2001
From: wangdi119 <wangdi119@huawei.com>
Date: Thu, 25 Aug 2022 09:34:52 +0800
Subject: [PATCH 008/360] =?UTF-8?q?"=E9=BC=A0=E6=A0=87=E6=8D=95=E8=8E=B7js?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangdi119 <wangdi119@huawei.com>
---
 frameworks/napi/pointer/src/js_pointer_context.cpp | 10 ++++++----
 frameworks/napi/pointer/src/js_pointer_manager.cpp |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/frameworks/napi/pointer/src/js_pointer_context.cpp b/frameworks/napi/pointer/src/js_pointer_context.cpp
index 7bb5b6018c..79fc5c59f1 100644
--- a/frameworks/napi/pointer/src/js_pointer_context.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_context.cpp
@@ -433,11 +433,11 @@ napi_value JsPointerContext::EnumConstructor(napi_env env, napi_callback_info in
 napi_value JsPointerContext::EnterCaptureMode(napi_env env, napi_callback_info info)
 {
     CALL_DEBUG_ENTER;
-    size_t argc = 2;
-    napi_value argv[2];
+    size_t argc = 1;
+    napi_value argv[1];
     CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 1 || argc > 2) {
-        THROWERR(env, "the number of parameters is not as expected");
+        THROWERR(env, "The number of parameters is not as expected");
         return nullptr;
     }
     if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
@@ -488,7 +488,7 @@ napi_value JsPointerContext::LeaveCaptureMode(napi_env env, napi_callback_info i
         THROWERR(env, "The second parameter type is wrong");
         return nullptr;
     }
-    return jsPointerMgr      ->LeaveCaptureMode(env, windowId, argv[1]);
+    return jsPointerMgr->LeaveCaptureMode(env, windowId, argv[1]);
 }
 
 napi_value JsPointerContext::Export(napi_env env, napi_value exports)
@@ -506,6 +506,8 @@ napi_value JsPointerContext::Export(napi_env env, napi_value exports)
         DECLARE_NAPI_STATIC_FUNCTION("getPointerSpeed", GetPointerSpeed),
         DECLARE_NAPI_STATIC_FUNCTION("setPointerStyle", SetPointerStyle),
         DECLARE_NAPI_STATIC_FUNCTION("getPointerStyle", GetPointerStyle),
+        DECLARE_NAPI_STATIC_FUNCTION("enterCaptureMode", EnterCaptureMode),
+        DECLARE_NAPI_STATIC_FUNCTION("leaveCaptureMode", LeaveCaptureMode),
     };
     CHKRP(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc), DEFINE_PROPERTIES);
     if (CreatePointerStyle(env, exports) == nullptr) {
diff --git a/frameworks/napi/pointer/src/js_pointer_manager.cpp b/frameworks/napi/pointer/src/js_pointer_manager.cpp
index 3602d47765..cd25e0982a 100644
--- a/frameworks/napi/pointer/src/js_pointer_manager.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_manager.cpp
@@ -282,7 +282,7 @@ napi_value JsPointerManager::EnterCaptureMode(napi_env env, int32_t windowId, na
     CALL_DEBUG_ENTER;
     sptr<AsyncContext> asyncContext = new (std::nothrow) AsyncContext(env);
     if(asyncContext == nullptr) {
-        THROWERR(env,"create AsyncContext failed");
+        THROWERR(env, "create AsyncContext failed");
         return nullptr;
     }
     asyncContext->errorCode = InputManager::GetInstance()->EnterCaptureMode(windowId);
@@ -304,7 +304,7 @@ napi_value JsPointerManager::LeaveCaptureMode(napi_env env, int32_t windowId, na
     CALL_DEBUG_ENTER;
     sptr<AsyncContext> asyncContext = new (std::nothrow) AsyncContext(env);
     if(asyncContext == nullptr) {
-        THROWERR(env,"create AsyncContext failed");
+        THROWERR(env, "Create AsyncContext failed");
         return nullptr;
     }
 
-- 
Gitee


From 9b41ab10a370254795c8ac43cdecdda28551e9aa Mon Sep 17 00:00:00 2001
From: wangdi119 <wangdi119@huawei.com>
Date: Thu, 25 Aug 2022 09:35:54 +0800
Subject: [PATCH 009/360] =?UTF-8?q?=E2=80=9C=E9=BC=A0=E6=A0=87=E6=8D=95?=
 =?UTF-8?q?=E8=8E=B7js=E6=8E=A5=E5=8F=A3=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangdi119 <wangdi119@huawei.com>
---
 frameworks/napi/pointer/src/js_pointer_context.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frameworks/napi/pointer/src/js_pointer_context.cpp b/frameworks/napi/pointer/src/js_pointer_context.cpp
index 79fc5c59f1..1536d1ec02 100644
--- a/frameworks/napi/pointer/src/js_pointer_context.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_context.cpp
@@ -433,8 +433,8 @@ napi_value JsPointerContext::EnumConstructor(napi_env env, napi_callback_info in
 napi_value JsPointerContext::EnterCaptureMode(napi_env env, napi_callback_info info)
 {
     CALL_DEBUG_ENTER;
-    size_t argc = 1;
-    napi_value argv[1];
+    size_t argc = 2;
+    napi_value argv[2];
     CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 1 || argc > 2) {
         THROWERR(env, "The number of parameters is not as expected");
-- 
Gitee


From c3eec7cbac070935a42f2d151d46f9932abbe430 Mon Sep 17 00:00:00 2001
From: wangdi119 <wangdi119@huawei.com>
Date: Thu, 25 Aug 2022 09:42:57 +0800
Subject: [PATCH 010/360] =?UTF-8?q?=E2=80=9C=E9=BC=A0=E6=A0=87=E6=8D=95?=
 =?UTF-8?q?=E8=8E=B7js=E6=8E=A5=E5=8F=A3=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangdi119 <wangdi119@huawei.com>
---
 frameworks/napi/pointer/src/js_pointer_context.cpp | 2 +-
 frameworks/napi/pointer/src/js_pointer_manager.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frameworks/napi/pointer/src/js_pointer_context.cpp b/frameworks/napi/pointer/src/js_pointer_context.cpp
index 1536d1ec02..110ae8aaf8 100644
--- a/frameworks/napi/pointer/src/js_pointer_context.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_context.cpp
@@ -467,7 +467,7 @@ napi_value JsPointerContext::LeaveCaptureMode(napi_env env, napi_callback_info i
     napi_value argv[2];
     CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 1 || argc > 2) {
-        THROWERR(env, "the number of parameters is not as expected");
+        THROWERR(env, "The number of parameters is not as expected");
         return nullptr;
     }
     if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
diff --git a/frameworks/napi/pointer/src/js_pointer_manager.cpp b/frameworks/napi/pointer/src/js_pointer_manager.cpp
index cd25e0982a..1e46e1b4aa 100644
--- a/frameworks/napi/pointer/src/js_pointer_manager.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_manager.cpp
@@ -282,7 +282,7 @@ napi_value JsPointerManager::EnterCaptureMode(napi_env env, int32_t windowId, na
     CALL_DEBUG_ENTER;
     sptr<AsyncContext> asyncContext = new (std::nothrow) AsyncContext(env);
     if(asyncContext == nullptr) {
-        THROWERR(env, "create AsyncContext failed");
+        THROWERR(env, "Create AsyncContext failed");
         return nullptr;
     }
     asyncContext->errorCode = InputManager::GetInstance()->EnterCaptureMode(windowId);
-- 
Gitee


From 49478f1b4ba7355efb6fa138aeb165d97de0d7a7 Mon Sep 17 00:00:00 2001
From: wangdi119 <wangdi119@huawei.com>
Date: Fri, 26 Aug 2022 14:11:32 +0800
Subject: [PATCH 011/360] =?UTF-8?q?=E2=80=9C=E6=8C=87=E9=92=88=E6=8D=95?=
 =?UTF-8?q?=E8=8E=B7=E6=A8=A1=E5=BC=8Fjs=E6=8E=A5=E5=8F=A3=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangdi119 <wangdi119@huawei.com>
---
 frameworks/napi/pointer/src/js_pointer_context.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/frameworks/napi/pointer/src/js_pointer_context.cpp b/frameworks/napi/pointer/src/js_pointer_context.cpp
index 110ae8aaf8..c5f966d1a5 100644
--- a/frameworks/napi/pointer/src/js_pointer_context.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_context.cpp
@@ -449,9 +449,8 @@ napi_value JsPointerContext::EnterCaptureMode(napi_env env, napi_callback_info i
     CHKRP(env, napi_get_value_int32(env, argv[0], &windowId), GET_BOOL);
     JsPointerContext *jsPointer = JsPointerContext::GetInstance(env);
     auto jsPointerMgr = jsPointer->GetJsPointerMgr();
-    if(argc == 1)
-    {
-        return jsPointerMgr->EnterCaptureMode(env,windowId);
+    if(argc == 1) {
+        return jsPointerMgr->EnterCaptureMode(env, windowId);
     }
     if (!JsCommon::TypeOf(env, argv[1], napi_function)) {
         THROWERR(env, "The second parameter type is wrong");
@@ -480,9 +479,8 @@ napi_value JsPointerContext::LeaveCaptureMode(napi_env env, napi_callback_info i
 
     JsPointerContext *jsPointer = JsPointerContext::GetInstance(env);
     auto jsPointerMgr = jsPointer->GetJsPointerMgr();
-    if(argc == 1)
-    {
-        return jsPointerMgr->LeaveCaptureMode(env,windowId);
+    if(argc == 1) {
+        return jsPointerMgr->LeaveCaptureMode(env, windowId);
     }
     if (!JsCommon::TypeOf(env, argv[1], napi_function)) {
         THROWERR(env, "The second parameter type is wrong");
-- 
Gitee


From 4cd2a42b2964924e7fc8127f30c7ec69f5242090 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Mon, 29 Aug 2022 17:09:10 +0800
Subject: [PATCH 012/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8D=95=E8=8E=B7?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 interfaces/native/innerkits/event/include/pointer_event.h | 2 +-
 test/unittest/common/src/event_util_test.cpp              | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/interfaces/native/innerkits/event/include/pointer_event.h b/interfaces/native/innerkits/event/include/pointer_event.h
index ea599d5563..22a14b9580 100644
--- a/interfaces/native/innerkits/event/include/pointer_event.h
+++ b/interfaces/native/innerkits/event/include/pointer_event.h
@@ -722,6 +722,7 @@ public:
          */
         void SetRawDy(int32_t rawDy);
 #endif // OHOS_BUILD_ENABLE_COOPERATE
+
         /**
          * @brief 获取 x 坐标的偏移量。
          * 对于指针输入事件，该值为目标屏幕上的 x 坐标相对偏移量。
@@ -752,7 +753,6 @@ public:
          * @since 9
          */
         void SetRawDeltaY(int32_t rawDeltaY);
-
     private:
         int32_t pointerId_ {};
         bool pressed_ { false };
diff --git a/test/unittest/common/src/event_util_test.cpp b/test/unittest/common/src/event_util_test.cpp
index ef72186c42..de5961ec6d 100644
--- a/test/unittest/common/src/event_util_test.cpp
+++ b/test/unittest/common/src/event_util_test.cpp
@@ -166,8 +166,7 @@ std::string EventUtilTest::DumpInputEvent(const std::shared_ptr<PointerEvent>& p
             << ",ToolWindowX:" << item.GetToolWindowX() << ",ToolWindowY:" << item.GetToolWindowY()
             << ",ToolWidth:" << item.GetToolWidth() << ",ToolHeight:" << item.GetToolHeight()
             << ",Pressure:" << item.GetPressure() << ",ToolType:" << item.GetToolType()
-            << ",LongAxis:" << item.GetLongAxis() << ",ShortAxis:" << item.GetShortAxis()
-            << ",RawDeltaX:" << item.GetRawDeltaX() << ",RawDeltaY:" << item.GetRawDeltaY();
+            << ",LongAxis:" << item.GetLongAxis() << ",ShortAxis:" << item.GetShortAxis();
     }
     return ostream.str();
 }
-- 
Gitee


From bf7d9ec4a758a5e77d47104543cf2f63a7ac5876 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Mon, 29 Aug 2022 17:16:49 +0800
Subject: [PATCH 013/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 service/mouse_event_handler/include/mouse_event_handler.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/mouse_event_handler/include/mouse_event_handler.h b/service/mouse_event_handler/include/mouse_event_handler.h
index 878cade9e9..0874412a9d 100644
--- a/service/mouse_event_handler/include/mouse_event_handler.h
+++ b/service/mouse_event_handler/include/mouse_event_handler.h
@@ -70,7 +70,8 @@ private:
  #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
     int32_t HandleButtonValueInner(struct libinput_event_pointer* data);
     int32_t HandleMotionAccelerate(struct libinput_event_pointer* data, int32_t deviceId);
-    bool GetSpeedGain(double vin, double& gain, int32_t deviceId) const;    void DumpInner();
+    bool GetSpeedGain(double vin, double& gain, int32_t deviceId) const;
+    void DumpInner();
     void InitAbsolution();
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     void SetDxDyForDInput(PointerEvent::PointerItem& pointerItem, libinput_event_pointer* data);
-- 
Gitee


From 101f40b9c007fb6020bf8a78d3330dc5ebada009 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Tue, 6 Sep 2022 15:16:05 +0800
Subject: [PATCH 014/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8D=95=E8=8E=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 frameworks/proxy/events/src/pointer_event.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frameworks/proxy/events/src/pointer_event.cpp b/frameworks/proxy/events/src/pointer_event.cpp
index d92dae3248..3f746e691b 100644
--- a/frameworks/proxy/events/src/pointer_event.cpp
+++ b/frameworks/proxy/events/src/pointer_event.cpp
@@ -334,7 +334,7 @@ bool PointerEvent::PointerItem::WriteToParcel(Parcel &out) const
         out.WriteInt32(toolType_) &&
         out.WriteInt32(deviceId_) &&
         out.WriteInt32(rawDx_) &&
-        out.WriteInt32(rawDy_)&&
+        out.WriteInt32(rawDy_) &&
         out.WriteInt32(rawDeltaX_) &&
         out.WriteInt32(rawDeltaY_)
     );
@@ -366,7 +366,7 @@ bool PointerEvent::PointerItem::ReadFromParcel(Parcel &in)
         in.ReadInt32(toolType_) &&
         in.ReadInt32(deviceId_) &&
         in.ReadInt32(rawDx_) &&
-        in.ReadInt32(rawDy_)&&
+        in.ReadInt32(rawDy_) &&
         in.ReadInt32(rawDeltaX_) &&
         in.ReadInt32(rawDeltaY_)
     );
-- 
Gitee


From a64dc11694c792d58d7b633283e5f630bb6237e7 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Thu, 8 Sep 2022 17:06:28 +0800
Subject: [PATCH 015/360] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8D=95=E8=8E=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 .../proxy/events/include/event_log_helper.h   |  5 +--
 frameworks/proxy/events/src/pointer_event.cpp | 28 ++--------------
 .../innerkits/event/include/pointer_event.h   | 33 -------------------
 .../src/mouse_event_handler.cpp               |  4 +--
 4 files changed, 7 insertions(+), 63 deletions(-)

diff --git a/frameworks/proxy/events/include/event_log_helper.h b/frameworks/proxy/events/include/event_log_helper.h
index a987a4d6c3..f2ea7480bf 100644
--- a/frameworks/proxy/events/include/event_log_helper.h
+++ b/frameworks/proxy/events/include/event_log_helper.h
@@ -88,12 +88,13 @@ private:
                 "DisplayY:%{public}d,WindowX:%{public}d,WindowY:%{public}d,Width:%{public}d,Height:%{public}d,"
                 "TiltX:%{public}.2f,TiltY:%{public}.2f,ToolDisplayX:%{public}d,ToolDisplayY:%{public}d,"
                 "ToolWindowX:%{public}d,ToolWindowY:%{public}d,ToolWidth:%{public}d,ToolHeight:%{public}d,"
-                "Pressure:%{public}.2f,ToolType:%{public}d,LongAxis:%{public}d,ShortAxis:%{public}d",
+                "Pressure:%{public}.2f,ToolType:%{public}d,LongAxis:%{public}d,ShortAxis:%{public}d,RawDx:%{public}d,"
+                "RawDy:%{public}d",
                 pointerId, item.GetDownTime(), item.IsPressed(), item.GetDisplayX(),
                 item.GetDisplayY(), item.GetWindowX(), item.GetWindowY(), item.GetWidth(), item.GetHeight(),
                 item.GetTiltX(), item.GetTiltY(), item.GetToolDisplayX(), item.GetToolDisplayY(), item.GetToolWindowX(),
                 item.GetToolWindowY(), item.GetToolWidth(), item.GetToolHeight(), item.GetPressure(), item.GetToolType(),
-                item.GetLongAxis(), item.GetShortAxis());
+                item.GetLongAxis(), item.GetShortAxis(), item.GetRawDx(), item.GetRawDy());
         }
         std::vector<int32_t> pressedKeys = event->GetPressedKeys();
         std::vector<int32_t>::const_iterator cItr = pressedKeys.cbegin();
diff --git a/frameworks/proxy/events/src/pointer_event.cpp b/frameworks/proxy/events/src/pointer_event.cpp
index 387a89d0e6..d3f44a5ace 100644
--- a/frameworks/proxy/events/src/pointer_event.cpp
+++ b/frameworks/proxy/events/src/pointer_event.cpp
@@ -288,26 +288,6 @@ void PointerEvent::PointerItem::SetRawDy(int32_t rawDy)
     rawDy_ = rawDy;
 }
 
-int32_t PointerEvent::PointerItem::GetRawDeltaX() const
-{
-    return rawDeltaX_;
-}
-
-void PointerEvent::PointerItem::SetRawDeltaX(int32_t rawDeltaX)
-{
-    rawDeltaX_ = rawDeltaX;
-}
-
-int32_t PointerEvent::PointerItem::GetRawDeltaY() const
-{
-    return rawDeltaY_;
-}
-
-void PointerEvent::PointerItem::SetRawDeltaY(int32_t rawDeltaY)
-{
-    rawDeltaY_ = rawDeltaY;
-}
-
 bool PointerEvent::PointerItem::WriteToParcel(Parcel &out) const
 {
     return (
@@ -334,9 +314,7 @@ bool PointerEvent::PointerItem::WriteToParcel(Parcel &out) const
         out.WriteInt32(toolType_) &&
         out.WriteInt32(deviceId_) &&
         out.WriteInt32(rawDx_) &&
-        out.WriteInt32(rawDy_) &&
-        out.WriteInt32(rawDeltaX_) &&
-        out.WriteInt32(rawDeltaY_)
+        out.WriteInt32(rawDy_)
     );
 }
 
@@ -366,9 +344,7 @@ bool PointerEvent::PointerItem::ReadFromParcel(Parcel &in)
         in.ReadInt32(toolType_) &&
         in.ReadInt32(deviceId_) &&
         in.ReadInt32(rawDx_) &&
-        in.ReadInt32(rawDy_) &&
-        in.ReadInt32(rawDeltaX_) &&
-        in.ReadInt32(rawDeltaY_)
+        in.ReadInt32(rawDy_)
     );
 }
 
diff --git a/interfaces/native/innerkits/event/include/pointer_event.h b/interfaces/native/innerkits/event/include/pointer_event.h
index c2c168128b..107ed9a2fa 100644
--- a/interfaces/native/innerkits/event/include/pointer_event.h
+++ b/interfaces/native/innerkits/event/include/pointer_event.h
@@ -717,37 +717,6 @@ public:
          * @since 9
          */
         void SetRawDy(int32_t rawDy);
-
-        /**
-         * @brief 获取 x 坐标的偏移量。
-         * 对于指针输入事件，该值为目标屏幕上的 x 坐标相对偏移量。
-         * @return x 坐标相对偏移量。
-         * @since 9
-         */
-        int32_t GetRawDeltaX() const;
-
-        /**
-         * @brief 设置 x 坐标相对偏移量。
-         * @param rawDeltaX 表示要设置的 x 坐标相对偏移量。
-         * @return 无
-         * @since 9
-         */
-        void SetRawDeltaX(int32_t rawDeltaX);
-        /**
-         * @brief 获取 y 坐标的偏移量。
-         * 对于指针输入事件，该值为目标屏幕上的 y 坐标相对偏移量。
-         * @return y 坐标相对偏移量。
-         * @since 9
-         */
-        int32_t GetRawDeltaY() const;
-
-        /**
-         * @brief 设置 y 坐标相对偏移量。
-         * @param rawDeltaY 表示要设置的 y 坐标相对偏移量。
-         * @return 无效
-         * @since 9
-         */
-        void SetRawDeltaY(int32_t rawDeltaY);
     private:
         int32_t pointerId_ {};
         bool pressed_ { false };
@@ -774,8 +743,6 @@ public:
         int32_t targetWindowId_ { -1 };
         int32_t rawDx_ {};
         int32_t rawDy_ {};
-        int32_t rawDeltaX_ {};
-        int32_t rawDeltaY_ {};
     };
 
 public:
diff --git a/service/mouse_event_handler/src/mouse_event_handler.cpp b/service/mouse_event_handler/src/mouse_event_handler.cpp
index a70ff7d438..e930eda33c 100644
--- a/service/mouse_event_handler/src/mouse_event_handler.cpp
+++ b/service/mouse_event_handler/src/mouse_event_handler.cpp
@@ -256,8 +256,8 @@ void MouseEventHandler::HandlePostInner(struct libinput_event_pointer* data, int
     auto mouseInfo = WinMgr->GetMouseInfo();
     MouseState->SetMouseCoords(mouseInfo.physicalX, mouseInfo.physicalY);
     if (WinMgr->GetMouseIsCaptureMode()) {
-        pointerItem.SetRawDeltaX(static_cast<int32_t>(libinput_event_pointer_get_dx(data)));
-        pointerItem.SetRawDeltaY(static_cast<int32_t>(libinput_event_pointer_get_dy(data)));
+        pointerItem.SetRawDx(static_cast<int32_t>(libinput_event_pointer_get_dx(data)));
+        pointerItem.SetRawDy(static_cast<int32_t>(libinput_event_pointer_get_dy(data)));
     }
     pointerItem.SetDisplayX(mouseInfo.physicalX);
     pointerItem.SetDisplayY(mouseInfo.physicalY);
-- 
Gitee


From ff731b1ca966a2ffb92fc4a271436a8c032e4f9e Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Wed, 14 Sep 2022 11:29:46 +0800
Subject: [PATCH 016/360] =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E6=84=8F=E5=9B=BE=E5=BD=92=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 frameworks/proxy/events/src/key_event.cpp     | 42 ++++++++++++++
 .../innerkits/event/include/key_event.h       | 36 ++++++++++++
 .../include/key_event_value_transformation.h  |  4 ++
 .../src/key_event_value_transformation.cpp    | 55 +++++++++++++++++++
 .../src/key_event_handler.cpp                 |  2 +
 5 files changed, 139 insertions(+)

diff --git a/frameworks/proxy/events/src/key_event.cpp b/frameworks/proxy/events/src/key_event.cpp
index 2789b50546..1cbaaf6085 100644
--- a/frameworks/proxy/events/src/key_event.cpp
+++ b/frameworks/proxy/events/src/key_event.cpp
@@ -424,6 +424,38 @@ const int32_t KeyEvent::KEY_ACTION_CANCEL = 0X00000001;
 const int32_t KeyEvent::KEY_ACTION_DOWN = 0x00000002;
 const int32_t KeyEvent::KEY_ACTION_UP = 0X00000003;
 
+const int32_t KeyEvent::INTENTION_UNKNOWN = -1;
+const int32_t KeyEvent::INTENTION_UP = 1;
+const int32_t KeyEvent::INTENTION_DOWN = 2;
+const int32_t KeyEvent::INTENTION_LEFT = 3;
+const int32_t KeyEvent::INTENTION_RIGHT = 4;
+const int32_t KeyEvent::INTENTION_SELECT = 5;
+const int32_t KeyEvent::INTENTION_ESCAPE = 6;
+const int32_t KeyEvent::INTENTION_BACK = 7;
+const int32_t KeyEvent::INTENTION_FORWARD = 8;
+const int32_t KeyEvent::INTENTION_MENU = 9;
+const int32_t KeyEvent::INTENTION_HOME = 10;
+const int32_t KeyEvent::INTENTION_PAGE_UP = 11;
+const int32_t KeyEvent::INTENTION_PAGE_DOWN = 12;
+const int32_t KeyEvent::INTENTION_ZOOM_OUT = 13;
+const int32_t KeyEvent::INTENTION_ZOOM_IN = 14;
+
+const int32_t KeyEvent::INTENTION_MEDIA_PLAY_PAUSE = 100;
+const int32_t KeyEvent::INTENTION_MEDIA_FAST_FORWARD = 101;
+const int32_t KeyEvent::INTENTION_MEDIA_FAST_REWIND = 102;
+const int32_t KeyEvent::INTENTION_MEDIA_FAST_PLAYBACK = 103;
+const int32_t KeyEvent::INTENTION_MEDIA_NEXT = 104;
+const int32_t KeyEvent::INTENTION_MEDIA_PREVIOUS = 105;
+const int32_t KeyEvent::INTENTION_MEDIA_MUTE = 106;
+const int32_t KeyEvent::INTENTION_VOLUTE_UP = 107;
+const int32_t KeyEvent::INTENTION_VOLUTE_DOWN = 108;
+
+const int32_t KeyEvent::INTENTION_CALL = 200;
+const int32_t KeyEvent::INTENTION_ENDCALL = 201;
+const int32_t KeyEvent::INTENTION_REJECTCALL = 202;
+
+const int32_t KeyEvent::INTENTION_CAMERA = 300;
+
 KeyEvent::KeyItem::KeyItem() {}
 
 KeyEvent::KeyItem::~KeyItem() {}
@@ -1222,5 +1254,15 @@ int32_t KeyEvent::SetFunctionKey(int32_t funcKey, int32_t value)
         }
     }
 }
+
+int32_t KeyEvent::GetKeyIntention()
+{
+    return keyIntention_;
+}
+
+void KeyEvent::SetKeyIntention(int32_t keyIntention)
+{
+    keyIntention_ = keyIntention;
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/interfaces/native/innerkits/event/include/key_event.h b/interfaces/native/innerkits/event/include/key_event.h
index ca2dbcef52..438d5d872a 100644
--- a/interfaces/native/innerkits/event/include/key_event.h
+++ b/interfaces/native/innerkits/event/include/key_event.h
@@ -2858,6 +2858,38 @@ public:
      */
     static const int32_t KEY_ACTION_UP;
 
+    static const int32_t INTENTION_UNKNOWN;
+    static const int32_t INTENTION_UP;
+    static const int32_t INTENTION_DOWN;
+    static const int32_t INTENTION_LEFT;
+    static const int32_t INTENTION_RIGHT;
+    static const int32_t INTENTION_SELECT;
+    static const int32_t INTENTION_ESCAPE;
+    static const int32_t INTENTION_BACK;
+    static const int32_t INTENTION_FORWARD;
+    static const int32_t INTENTION_MENU;
+    static const int32_t INTENTION_HOME;
+    static const int32_t INTENTION_PAGE_UP;
+    static const int32_t INTENTION_PAGE_DOWN;
+    static const int32_t INTENTION_ZOOM_OUT;
+    static const int32_t INTENTION_ZOOM_IN;
+
+    static const int32_t INTENTION_MEDIA_PLAY_PAUSE;
+    static const int32_t INTENTION_MEDIA_FAST_FORWARD;
+    static const int32_t INTENTION_MEDIA_FAST_REWIND;
+    static const int32_t INTENTION_MEDIA_FAST_PLAYBACK;
+    static const int32_t INTENTION_MEDIA_NEXT;
+    static const int32_t INTENTION_MEDIA_PREVIOUS;
+    static const int32_t INTENTION_MEDIA_MUTE;
+    static const int32_t INTENTION_VOLUTE_UP;
+    static const int32_t INTENTION_VOLUTE_DOWN;
+
+    static const int32_t INTENTION_CALL;
+    static const int32_t INTENTION_ENDCALL;
+    static const int32_t INTENTION_REJECTCALL;
+
+    static const int32_t INTENTION_CAMERA;
+
 public:
     class KeyItem {
     public:
@@ -3124,6 +3156,9 @@ public:
      */
     bool GetFunctionKey(int32_t funcKey) const;
 
+    int32_t GetKeyIntention();
+    void SetKeyIntention(int32_t keyIntention);
+
 public:
     /**
      * @brief Writes data to a <b>Parcel</b> object.
@@ -3159,6 +3194,7 @@ private:
     bool numLock_ { false };
     bool capsLock_ { false };
     bool scrollLock_ { false };
+    int32_t keyIntention_ = -1;
 };
 
 std::ostream& operator<<(std::ostream&, KeyEvent&);
diff --git a/service/event_handler/include/key_event_value_transformation.h b/service/event_handler/include/key_event_value_transformation.h
index d6c23856e2..bb5401f705 100644
--- a/service/event_handler/include/key_event_value_transformation.h
+++ b/service/event_handler/include/key_event_value_transformation.h
@@ -18,6 +18,8 @@
 
 #include <string>
 
+#include "key_event.h"
+
 namespace OHOS {
 namespace MMI {
 struct KeyEventValueTransformation {
@@ -29,6 +31,8 @@ struct KeyEventValueTransformation {
 
 KeyEventValueTransformation TransferKeyValue(int32_t keyValueOfInput);
 int32_t InputTransformationKeyValue(int32_t keyCode);
+int32_t GetKeyIntentionByKeyCode(int64_t keyCodes);
+int32_t GetKeyIntentionByItems(std::shared_ptr<KeyEvent> keyEvent);
 } // namespace MMI
 } // namespace OHOS
 #endif // KEY_EVENT_VALUE_TRANSFORMATION_H
\ No newline at end of file
diff --git a/service/event_handler/src/key_event_value_transformation.cpp b/service/event_handler/src/key_event_value_transformation.cpp
index 52b7b3cbcf..56bd332b34 100644
--- a/service/event_handler/src/key_event_value_transformation.cpp
+++ b/service/event_handler/src/key_event_value_transformation.cpp
@@ -459,5 +459,60 @@ int32_t InputTransformationKeyValue(int32_t keyCode)
     }
     return INVALID_KEY_CODE;
 }
+
+std::map<int64_t, int32_t> KeyIntentionMap = {
+    {(int64_t)KeyEvent::KEYCODE_DPAD_UP, KeyEvent::INTENTION_UP},
+    {(int64_t)KeyEvent::KEYCODE_DPAD_DOWN, KeyEvent::INTENTION_DOWN},
+    {(int64_t)KeyEvent::KEYCODE_DPAD_LEFT, KeyEvent::INTENTION_LEFT},
+    {(int64_t)KeyEvent::KEYCODE_DPAD_RIGHT, KeyEvent::INTENTION_RIGHT},
+    {(int64_t)KeyEvent::KEYCODE_SPACE, KeyEvent::INTENTION_SELECT},
+    {(int64_t)KeyEvent::KEYCODE_ESCAPE, KeyEvent::INTENTION_ESCAPE},
+    {((int64_t)KeyEvent::KEYCODE_ALT_LEFT<<16) + KeyEvent::KEYCODE_DPAD_LEFT, KeyEvent::INTENTION_BACK},
+    {((int64_t)KeyEvent::KEYCODE_ALT_LEFT<<16) + KeyEvent::KEYCODE_DPAD_RIGHT, KeyEvent::INTENTION_FORWARD},
+    {((int64_t)KeyEvent::KEYCODE_ALT_RIGHT<<16) + KeyEvent::KEYCODE_DPAD_LEFT, KeyEvent::INTENTION_BACK},
+    {((int64_t)KeyEvent::KEYCODE_ALT_RIGHT<<16) + KeyEvent::KEYCODE_DPAD_RIGHT, KeyEvent::INTENTION_FORWARD},
+    {((int64_t)KeyEvent::KEYCODE_SHIFT_LEFT<<16) + KeyEvent::KEYCODE_F10, KeyEvent::INTENTION_MENU},
+    {((int64_t)KeyEvent::KEYCODE_SHIFT_RIGHT<<16) + KeyEvent::KEYCODE_F10, KeyEvent::INTENTION_MENU},
+    {(int64_t)KeyEvent::KEYCODE_MENU, KeyEvent::INTENTION_MENU},
+    {(int64_t)KeyEvent::KEYCODE_PAGE_UP, KeyEvent::INTENTION_PAGE_UP},
+    {(int64_t)KeyEvent::KEYCODE_PAGE_DOWN, KeyEvent::INTENTION_PAGE_DOWN},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_LEFT<<16) + KeyEvent::KEYCODE_PLUS, KeyEvent::INTENTION_ZOOM_OUT},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_RIGHT<<16) + KeyEvent::KEYCODE_PLUS, KeyEvent::INTENTION_ZOOM_OUT},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_LEFT<<16) + KeyEvent::KEYCODE_NUMPAD_ADD, KeyEvent::INTENTION_ZOOM_OUT},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_RIGHT<<16) + KeyEvent::KEYCODE_NUMPAD_ADD, KeyEvent::INTENTION_ZOOM_OUT},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_LEFT<<16) + KeyEvent::KEYCODE_MINUS, KeyEvent::INTENTION_ZOOM_IN},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_RIGHT<<16) + KeyEvent::KEYCODE_MINUS, KeyEvent::INTENTION_ZOOM_IN},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_LEFT<<16) + KeyEvent::KEYCODE_NUMPAD_SUBTRACT, KeyEvent::INTENTION_ZOOM_IN},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_RIGHT<<16) + KeyEvent::KEYCODE_NUMPAD_SUBTRACT, KeyEvent::INTENTION_ZOOM_IN},
+    {(int64_t)KeyEvent::KEYCODE_VOLUME_MUTE, KeyEvent::INTENTION_MEDIA_MUTE},
+    {(int64_t)KeyEvent::KEYCODE_MUTE, KeyEvent::INTENTION_MEDIA_MUTE},
+    {(int64_t)KeyEvent::KEYCODE_VOLUME_UP, KeyEvent::INTENTION_VOLUTE_UP},
+    {(int64_t)KeyEvent::KEYCODE_VOLUME_DOWN, KeyEvent::INTENTION_VOLUTE_DOWN},
+    {(int64_t)KeyEvent::KEYCODE_APPSELECT, KeyEvent::INTENTION_SELECT},
+    {(int64_t)KeyEvent::KEYCODE_BACK, KeyEvent::INTENTION_BACK},
+};
+
+int32_t GetKeyIntentionByKeyCode(int64_t keyCodes)
+{
+    auto iter = KeyIntentionMap.find(keyCodes);
+    if (iter == KeyIntentionMap.end()) {
+        return KeyEvent::INTENTION_UNKNOWN;
+    }
+    return iter->second;
+}
+
+int32_t GetKeyIntentionByItems(std::shared_ptr<KeyEvent> keyEvent)
+{
+    std::vector<KeyEvent::KeyItem> items = keyEvent->GetKeyItems();
+    if (items.size() > 3) {
+        return KeyEvent::INTENTION_UNKNOWN;
+    }
+
+    int64_t keyCodes = 0;
+    for (const auto &item : items) {
+        keyCodes = (keyCodes<<16) + item.GetKeyCode();
+    }
+    return GetKeyIntentionByKeyCode(keyCodes);
+}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/service/key_event_handler/src/key_event_handler.cpp b/service/key_event_handler/src/key_event_handler.cpp
index 19fbf2cdae..dc20b12174 100644
--- a/service/key_event_handler/src/key_event_handler.cpp
+++ b/service/key_event_handler/src/key_event_handler.cpp
@@ -100,6 +100,8 @@ int32_t KeyEventHandler::Normalize(struct libinput_event *event, std::shared_ptr
         keyEvent->RemoveReleasedKeyItems(item);
         keyEvent->AddPressedKeyItems(item);
     }
+    int32_t keyIntention = GetKeyIntentionByItems(keyEvent);
+    keyEvent->SetKeyIntention(keyIntention);
     return RET_OK;
 }
 
-- 
Gitee


From 2a3310be6b31995b210cf32592c03c2db7d604f9 Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Wed, 14 Sep 2022 11:34:59 +0800
Subject: [PATCH 017/360] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9A=E4=BD=8D?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 service/event_handler/src/key_event_value_transformation.cpp | 2 ++
 service/key_event_handler/src/key_event_handler.cpp          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/service/event_handler/src/key_event_value_transformation.cpp b/service/event_handler/src/key_event_value_transformation.cpp
index 56bd332b34..3c1df8c131 100644
--- a/service/event_handler/src/key_event_value_transformation.cpp
+++ b/service/event_handler/src/key_event_value_transformation.cpp
@@ -510,8 +510,10 @@ int32_t GetKeyIntentionByItems(std::shared_ptr<KeyEvent> keyEvent)
 
     int64_t keyCodes = 0;
     for (const auto &item : items) {
+        MMI_HILOGE("****************keyCode:%{public}d", item.GetKeyCode());
         keyCodes = (keyCodes<<16) + item.GetKeyCode();
     }
+    MMI_HILOGE("****************KeyCodes Sum:%{public}u", keyCodes);
     return GetKeyIntentionByKeyCode(keyCodes);
 }
 } // namespace MMI
diff --git a/service/key_event_handler/src/key_event_handler.cpp b/service/key_event_handler/src/key_event_handler.cpp
index dc20b12174..53c7d6f802 100644
--- a/service/key_event_handler/src/key_event_handler.cpp
+++ b/service/key_event_handler/src/key_event_handler.cpp
@@ -101,6 +101,7 @@ int32_t KeyEventHandler::Normalize(struct libinput_event *event, std::shared_ptr
         keyEvent->AddPressedKeyItems(item);
     }
     int32_t keyIntention = GetKeyIntentionByItems(keyEvent);
+    MMI_HILOGE("****************KeyEventHandler::Normalize, keyIntention:%{public}d", keyIntention);
     keyEvent->SetKeyIntention(keyIntention);
     return RET_OK;
 }
-- 
Gitee


From 89cbe838d80e6469c96f0ed0d20d233e2ce9fb0b Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Wed, 14 Sep 2022 14:22:22 +0800
Subject: [PATCH 018/360] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 service/event_handler/src/key_event_value_transformation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/event_handler/src/key_event_value_transformation.cpp b/service/event_handler/src/key_event_value_transformation.cpp
index 3c1df8c131..b36eab09c8 100644
--- a/service/event_handler/src/key_event_value_transformation.cpp
+++ b/service/event_handler/src/key_event_value_transformation.cpp
@@ -513,7 +513,7 @@ int32_t GetKeyIntentionByItems(std::shared_ptr<KeyEvent> keyEvent)
         MMI_HILOGE("****************keyCode:%{public}d", item.GetKeyCode());
         keyCodes = (keyCodes<<16) + item.GetKeyCode();
     }
-    MMI_HILOGE("****************KeyCodes Sum:%{public}u", keyCodes);
+    MMI_HILOGE("****************KeyCodes Sum:%{public}lld", keyCodes);
     return GetKeyIntentionByKeyCode(keyCodes);
 }
 } // namespace MMI
-- 
Gitee


From 972a00a054c8884a00c113170491397ea8b4e741 Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Wed, 14 Sep 2022 15:15:20 +0800
Subject: [PATCH 019/360] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 service/event_handler/src/key_event_value_transformation.cpp | 4 ++--
 service/key_event_handler/src/key_event_handler.cpp          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/service/event_handler/src/key_event_value_transformation.cpp b/service/event_handler/src/key_event_value_transformation.cpp
index b36eab09c8..f9c5094615 100644
--- a/service/event_handler/src/key_event_value_transformation.cpp
+++ b/service/event_handler/src/key_event_value_transformation.cpp
@@ -510,10 +510,10 @@ int32_t GetKeyIntentionByItems(std::shared_ptr<KeyEvent> keyEvent)
 
     int64_t keyCodes = 0;
     for (const auto &item : items) {
-        MMI_HILOGE("****************keyCode:%{public}d", item.GetKeyCode());
+        MMI_HILOGE("songliy keyCode:%{public}d", item.GetKeyCode());
         keyCodes = (keyCodes<<16) + item.GetKeyCode();
     }
-    MMI_HILOGE("****************KeyCodes Sum:%{public}lld", keyCodes);
+    MMI_HILOGE("songliy KeyCodes Sum:%{public}lld", keyCodes);
     return GetKeyIntentionByKeyCode(keyCodes);
 }
 } // namespace MMI
diff --git a/service/key_event_handler/src/key_event_handler.cpp b/service/key_event_handler/src/key_event_handler.cpp
index 53c7d6f802..d226a2d327 100644
--- a/service/key_event_handler/src/key_event_handler.cpp
+++ b/service/key_event_handler/src/key_event_handler.cpp
@@ -101,7 +101,7 @@ int32_t KeyEventHandler::Normalize(struct libinput_event *event, std::shared_ptr
         keyEvent->AddPressedKeyItems(item);
     }
     int32_t keyIntention = GetKeyIntentionByItems(keyEvent);
-    MMI_HILOGE("****************KeyEventHandler::Normalize, keyIntention:%{public}d", keyIntention);
+    MMI_HILOGE("songliy KeyEventHandler::Normalize, keyIntention:%{public}d", keyIntention);
     keyEvent->SetKeyIntention(keyIntention);
     return RET_OK;
 }
-- 
Gitee


From 2dde97523300f0033a099634a3c29cb2460f5cc2 Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Wed, 14 Sep 2022 15:32:01 +0800
Subject: [PATCH 020/360] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=94=AE=E7=9B=98?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 frameworks/proxy/events/src/key_event.cpp                  | 1 +
 interfaces/native/innerkits/event/include/key_event.h      | 7 +++++++
 .../event_handler/src/key_event_value_transformation.cpp   | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/frameworks/proxy/events/src/key_event.cpp b/frameworks/proxy/events/src/key_event.cpp
index 1cbaaf6085..92906b229f 100644
--- a/frameworks/proxy/events/src/key_event.cpp
+++ b/frameworks/proxy/events/src/key_event.cpp
@@ -211,6 +211,7 @@ const int32_t KeyEvent::KEYCODE_BUTTON_BASE7 = 2413;
 const int32_t KeyEvent::KEYCODE_BUTTON_BASE8 = 2414;
 const int32_t KeyEvent::KEYCODE_BUTTON_BASE9 = 2415;
 const int32_t KeyEvent::KEYCODE_BUTTON_DEAD = 2416;
+const int32_t KeyEvent::KEYCODE_COMPOSE = 2466;
 const int32_t KeyEvent::KEYCODE_SLEEP = 2600;
 const int32_t KeyEvent::KEYCODE_ZENKAKU_HANKAKU = 2601;
 const int32_t KeyEvent::KEYCODE_102ND = 2602;
diff --git a/interfaces/native/innerkits/event/include/key_event.h b/interfaces/native/innerkits/event/include/key_event.h
index 438d5d872a..d791106ac8 100644
--- a/interfaces/native/innerkits/event/include/key_event.h
+++ b/interfaces/native/innerkits/event/include/key_event.h
@@ -1368,6 +1368,13 @@ public:
      */
     static const int32_t KEYCODE_BUTTON_DEAD;
 
+    /**
+     * Keyboard menu key
+     *
+     * @since 9
+     */
+    static const int32_t KEYCODE_COMPOSE;
+
     /**
      * Sleep key
      *
diff --git a/service/event_handler/src/key_event_value_transformation.cpp b/service/event_handler/src/key_event_value_transformation.cpp
index f9c5094615..eef6691186 100644
--- a/service/event_handler/src/key_event_value_transformation.cpp
+++ b/service/event_handler/src/key_event_value_transformation.cpp
@@ -473,7 +473,7 @@ std::map<int64_t, int32_t> KeyIntentionMap = {
     {((int64_t)KeyEvent::KEYCODE_ALT_RIGHT<<16) + KeyEvent::KEYCODE_DPAD_RIGHT, KeyEvent::INTENTION_FORWARD},
     {((int64_t)KeyEvent::KEYCODE_SHIFT_LEFT<<16) + KeyEvent::KEYCODE_F10, KeyEvent::INTENTION_MENU},
     {((int64_t)KeyEvent::KEYCODE_SHIFT_RIGHT<<16) + KeyEvent::KEYCODE_F10, KeyEvent::INTENTION_MENU},
-    {(int64_t)KeyEvent::KEYCODE_MENU, KeyEvent::INTENTION_MENU},
+    {(int64_t)KeyEvent::KEYCODE_COMPOSE, KeyEvent::INTENTION_MENU},
     {(int64_t)KeyEvent::KEYCODE_PAGE_UP, KeyEvent::INTENTION_PAGE_UP},
     {(int64_t)KeyEvent::KEYCODE_PAGE_DOWN, KeyEvent::INTENTION_PAGE_DOWN},
     {((int64_t)KeyEvent::KEYCODE_CTRL_LEFT<<16) + KeyEvent::KEYCODE_PLUS, KeyEvent::INTENTION_ZOOM_OUT},
-- 
Gitee


From 1480c4c923a4f91c54d769ab5ccf54c62556fbd2 Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Thu, 15 Sep 2022 10:00:38 +0800
Subject: [PATCH 021/360] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=84=8F=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 service/event_handler/src/key_event_value_transformation.cpp | 3 ++-
 service/key_event_handler/src/key_event_handler.cpp          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/service/event_handler/src/key_event_value_transformation.cpp b/service/event_handler/src/key_event_value_transformation.cpp
index eef6691186..8fe40b446e 100644
--- a/service/event_handler/src/key_event_value_transformation.cpp
+++ b/service/event_handler/src/key_event_value_transformation.cpp
@@ -466,6 +466,7 @@ std::map<int64_t, int32_t> KeyIntentionMap = {
     {(int64_t)KeyEvent::KEYCODE_DPAD_LEFT, KeyEvent::INTENTION_LEFT},
     {(int64_t)KeyEvent::KEYCODE_DPAD_RIGHT, KeyEvent::INTENTION_RIGHT},
     {(int64_t)KeyEvent::KEYCODE_SPACE, KeyEvent::INTENTION_SELECT},
+    {(int64_t)KeyEvent::KEYCODE_NUMPAD_ENTER, KeyEvent::INTENTION_SELECT},
     {(int64_t)KeyEvent::KEYCODE_ESCAPE, KeyEvent::INTENTION_ESCAPE},
     {((int64_t)KeyEvent::KEYCODE_ALT_LEFT<<16) + KeyEvent::KEYCODE_DPAD_LEFT, KeyEvent::INTENTION_BACK},
     {((int64_t)KeyEvent::KEYCODE_ALT_LEFT<<16) + KeyEvent::KEYCODE_DPAD_RIGHT, KeyEvent::INTENTION_FORWARD},
@@ -490,6 +491,7 @@ std::map<int64_t, int32_t> KeyIntentionMap = {
     {(int64_t)KeyEvent::KEYCODE_VOLUME_DOWN, KeyEvent::INTENTION_VOLUTE_DOWN},
     {(int64_t)KeyEvent::KEYCODE_APPSELECT, KeyEvent::INTENTION_SELECT},
     {(int64_t)KeyEvent::KEYCODE_BACK, KeyEvent::INTENTION_BACK},
+    {(int64_t)KeyEvent::KEYCODE_MOVE_HOME, KeyEvent::INTENTION_HOME},
 };
 
 int32_t GetKeyIntentionByKeyCode(int64_t keyCodes)
@@ -513,7 +515,6 @@ int32_t GetKeyIntentionByItems(std::shared_ptr<KeyEvent> keyEvent)
         MMI_HILOGE("songliy keyCode:%{public}d", item.GetKeyCode());
         keyCodes = (keyCodes<<16) + item.GetKeyCode();
     }
-    MMI_HILOGE("songliy KeyCodes Sum:%{public}lld", keyCodes);
     return GetKeyIntentionByKeyCode(keyCodes);
 }
 } // namespace MMI
diff --git a/service/key_event_handler/src/key_event_handler.cpp b/service/key_event_handler/src/key_event_handler.cpp
index d226a2d327..a3fc1ab737 100644
--- a/service/key_event_handler/src/key_event_handler.cpp
+++ b/service/key_event_handler/src/key_event_handler.cpp
@@ -101,7 +101,7 @@ int32_t KeyEventHandler::Normalize(struct libinput_event *event, std::shared_ptr
         keyEvent->AddPressedKeyItems(item);
     }
     int32_t keyIntention = GetKeyIntentionByItems(keyEvent);
-    MMI_HILOGE("songliy KeyEventHandler::Normalize, keyIntention:%{public}d", keyIntention);
+    MMI_HILOGE("songliy KeyEventHandler:: Normalize, keyIntention:%{public}d", keyIntention);
     keyEvent->SetKeyIntention(keyIntention);
     return RET_OK;
 }
-- 
Gitee


From b9efed804a74aca0ec685a5a04d44cf31f2b8fbd Mon Sep 17 00:00:00 2001
From: lilong <lilong121@huawei.com>
Date: Thu, 15 Sep 2022 14:32:15 +0800
Subject: [PATCH 022/360] =?UTF-8?q?uinput=E6=B3=A8=E5=85=A5=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=96=B0=E5=8A=9F=E8=83=BD=EF=BC=9A=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E5=B9=B3=E6=BB=91=E6=8B=96=E6=8B=BD=E4=BB=A5=E5=8F=8A=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E5=B9=B3=E6=BB=91=E6=8B=96=E6=8B=BD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?UT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lilong <lilong121@huawei.com>
---
 .../src/input_manager_command.cpp             | 97 ++++++++++++++++++-
 tools/inject_event/test/inject_event_test.cpp | 23 +++++
 2 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/tools/inject_event/src/input_manager_command.cpp b/tools/inject_event/src/input_manager_command.cpp
index 8085c710c4..2e98ffeb01 100755
--- a/tools/inject_event/src/input_manager_command.cpp
+++ b/tools/inject_event/src/input_manager_command.cpp
@@ -116,6 +116,7 @@ int32_t InputManagerCommand::ParseCommand(int32_t argc, char *argv[])
         {"down", required_argument, NULL, 'd'},
         {"up", required_argument, NULL, 'u'},
         {"scroll", required_argument, NULL, 's'},
+        {"drag", required_argument, NULL, 'g'},
         {"interval", required_argument, NULL, 'i'},
         {NULL, 0, NULL, 0}
     };
@@ -145,7 +146,7 @@ int32_t InputManagerCommand::ParseCommand(int32_t argc, char *argv[])
                 int32_t py = 0;
                 int32_t buttonId;
                 int32_t scrollValue;
-                while ((c = getopt_long(argc, argv, "m:d:u:c:b:s:i:", mouseSensorOptions, &optionIndex)) != -1) {
+                while ((c = getopt_long(argc, argv, "m:d:u:c:b:s:g:i:", mouseSensorOptions, &optionIndex)) != -1) {
                     switch (c) {
                         case 'm': {
                             if (argc - optind < 1) {
@@ -528,6 +529,97 @@ int32_t InputManagerCommand::ParseCommand(int32_t argc, char *argv[])
                             InputMgr->SimulateInputEvent(pointerEvent);
                             break;
                         }
+                        case 'g': {
+                            int32_t px1 = 0;
+                            int32_t py1 = 0;
+                            int32_t px2 = 0;
+                            int32_t py2 = 0;
+                            int32_t buttonId = 0;
+                            int32_t totalTimeMs = 1000;
+                            if (argc < 7) {
+                                std::cout << "argc:" << argc << std::endl;
+                                std::cout << "Wrong number of parameters" << std::endl;
+                                return RET_ERR;
+                            }
+                            if (argc >= 7) {
+                                if ((!StrToInt(optarg, px1)) ||
+                                    (!StrToInt(argv[optind], py1)) ||
+                                    (!StrToInt(argv[optind + 1], px2)) ||
+                                    (!StrToInt(argv[optind + 2], py2))) {
+                                        std::cout << "Invalid coordinate value" << std::endl;
+                                        return RET_ERR;
+                                }
+                            }
+                            if ((px1 < 0) || (py1 < 0) || (px2 < 0) || (py2 < 0)) {
+                                std::cout << "Coordinate value must be greater than 0" << std::endl;
+                                return RET_ERR;
+                            }
+                            if (argc >= 8) {
+                                if (!StrToInt(argv[optind + 3], totalTimeMs)) {
+                                    std::cout << "Invalid total times" << std::endl;
+                                    return RET_ERR;
+                                }
+                            }
+                            static const int64_t minTotalTimeMs = 1;
+                            static const int64_t maxTotalTimeMs = 15000;
+                            if ((totalTimeMs < minTotalTimeMs) || (totalTimeMs > maxTotalTimeMs)) {
+                                std::cout << "Total time is out of range:"
+                                    << minTotalTimeMs << "ms" << " <= " << totalTimeMs << "ms" << " <= "
+                                    << maxTotalTimeMs << "ms" << std::endl;
+                                return RET_ERR;
+                            }
+                            std::cout << "start coordinate: (" << px1 << ", "  << py1 << ")" << std::endl;
+                            std::cout << "  end coordinate: (" << px2 << ", "  << py2 << ")" << std::endl;
+                            std::cout << "      total time: "  << totalTimeMs  << "ms"       << std::endl;
+                            auto pointerEvent = PointerEvent::Create();
+                            CHKPR(pointerEvent, ERROR_NULL_POINTER);
+                            PointerEvent::PointerItem item;
+                            item.SetPointerId(0);
+                            item.SetDisplayX(px1);
+                            item.SetDisplayY(py1);
+                            item.SetPressed(false);
+                            pointerEvent->SetPointerId(0);
+                            pointerEvent->AddPointerItem(item);
+                            pointerEvent->SetButtonPressed(0);
+                            pointerEvent->SetButtonId(buttonId);
+                            pointerEvent->SetButtonPressed(buttonId);
+                            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_BUTTON_DOWN);
+                            pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
+                            InputMgr->SimulateInputEvent(pointerEvent);
+
+                            int64_t startTimeMs = GetSysClockTime() / 1000;
+                            int64_t endTimeMs = 0;
+                            if (!AddInt64(startTimeMs, totalTimeMs, endTimeMs)) {
+                                std::cout << "System time error" << std::endl;
+                                return RET_ERR;
+                            }
+                            int64_t currentTimeMs = startTimeMs;
+                            while (currentTimeMs < endTimeMs) {
+                                item.SetDisplayX(NextPos(startTimeMs, currentTimeMs, totalTimeMs, px1, px2));
+                                item.SetDisplayY(NextPos(startTimeMs, currentTimeMs, totalTimeMs, py1, py2));
+                                pointerEvent->SetActionTime(currentTimeMs);
+                                pointerEvent->UpdatePointerItem(0, item);
+                                pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_MOVE);
+                                InputMgr->SimulateInputEvent(pointerEvent);
+                                SleepAndUpdateTime(currentTimeMs);
+                            }
+                            item.SetDisplayX(px2);
+                            item.SetDisplayY(py2);
+                            pointerEvent->SetActionTime(endTimeMs);
+                            pointerEvent->UpdatePointerItem(0, item);
+                            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_MOVE);
+                            InputMgr->SimulateInputEvent(pointerEvent);
+                            std::this_thread::sleep_for(std::chrono::milliseconds(BLOCK_TIME_MS));
+
+                            item.SetDisplayX(px2);
+                            item.SetDisplayY(py2);
+                            item.SetPressed(true);
+                            pointerEvent->SetActionTime(endTimeMs);
+                            pointerEvent->UpdatePointerItem(0, item);
+                            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_BUTTON_UP);
+                            InputMgr->SimulateInputEvent(pointerEvent);
+                            break;
+                        }
                         case 'i': {
                             int32_t taktTime = 0;
                             if (!StrToInt(optarg, taktTime)) {
@@ -1100,6 +1192,9 @@ void InputManagerCommand::ShowUsage()
     std::cout << "   key value:6 - button back"     << std::endl;
     std::cout << "   key value:7 - button task"     << std::endl;
     std::cout << "-s <key>                  --scroll <key>      -positive values are sliding backwards" << std::endl;
+    std::cout << "-g <dx1> <dy1> <dx2> <dy2> [total time]       --drag <dx1> <dy1> <dx2> <dy2> [total time],";
+    std::cout << std::endl;
+    std::cout << "                                              dx1 dy1 to dx2 dy2 smooth drag"         << std::endl;
     std::cout << "-i <time>                 --interval <time>   -the program interval for the (time) milliseconds";
     std::cout << std::endl;
     std::cout << "                                               negative values are sliding forwards"  << std::endl;
diff --git a/tools/inject_event/test/inject_event_test.cpp b/tools/inject_event/test/inject_event_test.cpp
index 176f57abda..68fab31741 100644
--- a/tools/inject_event/test/inject_event_test.cpp
+++ b/tools/inject_event/test/inject_event_test.cpp
@@ -166,6 +166,29 @@ HWTEST_F(InjectEventTest, InjectEvent_InjectMouse_007, TestSize.Level1)
     EXPECT_EQ(OHOS::ERR_OK, result);
 }
 
+/**
+ * @tc.name:InjectEvent_InjectMouse_008
+ * @tc.desc: test inject mouse soomth drag interface
+ * @tc.type: FUNC
+ * @tc.require:SR000GGQBJ
+ */
+HWTEST_F(InjectEventTest, InjectEvent_InjectMouse_008, TestSize.Level1)
+{
+    std::unique_ptr<InputManagerCommand> inputManagerCommand = std::make_unique<InputManagerCommand>();
+    char command1[] = {"uinput"};
+    char command2[] = {"-M"};
+    char command3[] = {"-g"};
+    char command4[] = {"100"};
+    char command5[] = {"200"};
+    char command6[] = {"100"};
+    char command7[] = {"700"};
+    char command8[] = {"3000"};
+
+    char *argv[] = {command1, command2, command3, command4, command5, command6, command7, command8};
+    int32_t result = inputManagerCommand->ParseCommand(8, argv);
+    EXPECT_EQ(OHOS::ERR_OK, result);
+}
+
 /**
  * @tc.name:InjectEvent_InjectKey_001
  * @tc.desc: test inject key down interface
-- 
Gitee


From cead45b222fc7edcb93d4e7102fc50d7177d356b Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Fri, 16 Sep 2022 11:04:09 +0800
Subject: [PATCH 023/360] =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 frameworks/proxy/events/include/event_log_helper.h           | 4 ++--
 service/event_handler/src/key_event_value_transformation.cpp | 1 -
 service/key_event_normalize/src/key_event_normalize.cpp      | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/frameworks/proxy/events/include/event_log_helper.h b/frameworks/proxy/events/include/event_log_helper.h
index a987a4d6c3..8d884a5562 100644
--- a/frameworks/proxy/events/include/event_log_helper.h
+++ b/frameworks/proxy/events/include/event_log_helper.h
@@ -38,10 +38,10 @@ private:
     static void Print(const std::shared_ptr<KeyEvent> event)
     {
         std::vector<KeyEvent::KeyItem> eventItems { event->GetKeyItems() };
-        MMI_HILOGD("KeyCode:%{public}d,ActionTime:%{public}" PRId64 ",ActionStartTime:%{public}" PRId64
+        MMI_HILOGD("KeyCode:%{public}d,KeyIntention:%{public}d,ActionTime:%{public}" PRId64 ",ActionStartTime:%{public}" PRId64
             ",EventType:%{public}s,Flag:%{public}d,KeyAction:%{public}s,NumLock:%{public}d,"
             "CapsLock:%{public}d,ScrollLock:%{public}d,EventNumber:%{public}d,keyItemsCount:%{public}zu",
-            event->GetKeyCode(), event->GetActionTime(), event->GetActionStartTime(),
+            event->GetKeyCode(), event->GetKeyIntention(), event->GetActionTime(), event->GetActionStartTime(),
             InputEvent::EventTypeToString(event->GetEventType()), event->GetFlag(),
             KeyEvent::ActionToString(event->GetKeyAction()), event->GetFunctionKey(KeyEvent::NUM_LOCK_FUNCTION_KEY),
             event->GetFunctionKey(KeyEvent::CAPS_LOCK_FUNCTION_KEY),
diff --git a/service/event_handler/src/key_event_value_transformation.cpp b/service/event_handler/src/key_event_value_transformation.cpp
index 8fe40b446e..b1e108c7be 100644
--- a/service/event_handler/src/key_event_value_transformation.cpp
+++ b/service/event_handler/src/key_event_value_transformation.cpp
@@ -512,7 +512,6 @@ int32_t GetKeyIntentionByItems(std::shared_ptr<KeyEvent> keyEvent)
 
     int64_t keyCodes = 0;
     for (const auto &item : items) {
-        MMI_HILOGE("songliy keyCode:%{public}d", item.GetKeyCode());
         keyCodes = (keyCodes<<16) + item.GetKeyCode();
     }
     return GetKeyIntentionByKeyCode(keyCodes);
diff --git a/service/key_event_normalize/src/key_event_normalize.cpp b/service/key_event_normalize/src/key_event_normalize.cpp
index fce5ef0e7d..f1bd352165 100644
--- a/service/key_event_normalize/src/key_event_normalize.cpp
+++ b/service/key_event_normalize/src/key_event_normalize.cpp
@@ -104,7 +104,6 @@ int32_t KeyEventNormalize::Normalize(struct libinput_event *event, std::shared_p
         keyEvent->AddPressedKeyItems(item);
     }
     int32_t keyIntention = GetKeyIntentionByItems(keyEvent);
-    MMI_HILOGE("songliy KeyEventHandler:: Normalize, keyIntention:%{public}d", keyIntention);
     keyEvent->SetKeyIntention(keyIntention);
     return RET_OK;
 }
-- 
Gitee


From 8c1532a6ef0a59980b17b4f8dbc67d23e98b0c90 Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Fri, 16 Sep 2022 15:55:22 +0800
Subject: [PATCH 024/360] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 frameworks/proxy/events/src/key_event.cpp     |  2 +-
 .../innerkits/event/include/key_event.h       | 23 ++++++--
 .../include/key_event_value_transformation.h  |  3 +-
 .../src/key_event_value_transformation.cpp    | 54 +++++++++----------
 .../src/key_event_normalize.cpp               |  3 +-
 5 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/frameworks/proxy/events/src/key_event.cpp b/frameworks/proxy/events/src/key_event.cpp
index 7f6c94acab..49c760c4d5 100644
--- a/frameworks/proxy/events/src/key_event.cpp
+++ b/frameworks/proxy/events/src/key_event.cpp
@@ -1245,7 +1245,7 @@ int32_t KeyEvent::SetFunctionKey(int32_t funcKey, int32_t value)
     }
 }
 
-int32_t KeyEvent::GetKeyIntention()
+int32_t KeyEvent::GetKeyIntention() const
 {
     return keyIntention_;
 }
diff --git a/interfaces/native/innerkits/event/include/key_event.h b/interfaces/native/innerkits/event/include/key_event.h
index e48fb4c727..b6c6dc8d65 100644
--- a/interfaces/native/innerkits/event/include/key_event.h
+++ b/interfaces/native/innerkits/event/include/key_event.h
@@ -1369,7 +1369,7 @@ public:
     static const int32_t KEYCODE_BUTTON_DEAD;
 
     /**
-     * Keyboard menu key
+     * 键盘list菜单键
      *
      * @since 9
      */
@@ -3163,7 +3163,20 @@ public:
      */
     bool GetFunctionKey(int32_t funcKey) const;
 
-    int32_t GetKeyIntention();
+    /**
+     * @brief 获取当前事件的按键意图。
+     * @param void
+     * @return 返回当前事件的按键意图。
+     * @since 9
+     */
+    int32_t GetKeyIntention() const;
+
+    /**
+     * @brief 给当前按键事件设置按键意图。
+     * @param keyIntention 指定的按键意图。
+     * @return void
+     * @since 9
+     */
     void SetKeyIntention(int32_t keyIntention);
 
 public:
@@ -3195,13 +3208,13 @@ private:
     bool IsValidKeyItem() const;
 
 private:
-    int32_t keyCode_ = -1;
+    int32_t keyCode_ { -1 };
     std::vector<KeyItem> keys_;
-    int32_t keyAction_ = 0;
+    int32_t keyAction_ { 0 };
     bool numLock_ { false };
     bool capsLock_ { false };
     bool scrollLock_ { false };
-    int32_t keyIntention_ = -1;
+    int32_t keyIntention_ { -1 };
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/event_handler/include/key_event_value_transformation.h b/service/event_handler/include/key_event_value_transformation.h
index bb5401f705..e4c6d7900b 100644
--- a/service/event_handler/include/key_event_value_transformation.h
+++ b/service/event_handler/include/key_event_value_transformation.h
@@ -31,8 +31,7 @@ struct KeyEventValueTransformation {
 
 KeyEventValueTransformation TransferKeyValue(int32_t keyValueOfInput);
 int32_t InputTransformationKeyValue(int32_t keyCode);
-int32_t GetKeyIntentionByKeyCode(int64_t keyCodes);
-int32_t GetKeyIntentionByItems(std::shared_ptr<KeyEvent> keyEvent);
+int32_t keyItemsTransKeyIntention(const std::vector<KeyEvent::KeyItem> &items);
 } // namespace MMI
 } // namespace OHOS
 #endif // KEY_EVENT_VALUE_TRANSFORMATION_H
\ No newline at end of file
diff --git a/service/event_handler/src/key_event_value_transformation.cpp b/service/event_handler/src/key_event_value_transformation.cpp
index b1e108c7be..35c1851aca 100644
--- a/service/event_handler/src/key_event_value_transformation.cpp
+++ b/service/event_handler/src/key_event_value_transformation.cpp
@@ -460,7 +460,8 @@ int32_t InputTransformationKeyValue(int32_t keyCode)
     return INVALID_KEY_CODE;
 }
 
-std::map<int64_t, int32_t> KeyIntentionMap = {
+namespace {
+constexpr  std::map<int64_t, int32_t> KeyIntentionMap = {
     {(int64_t)KeyEvent::KEYCODE_DPAD_UP, KeyEvent::INTENTION_UP},
     {(int64_t)KeyEvent::KEYCODE_DPAD_DOWN, KeyEvent::INTENTION_DOWN},
     {(int64_t)KeyEvent::KEYCODE_DPAD_LEFT, KeyEvent::INTENTION_LEFT},
@@ -468,23 +469,23 @@ std::map<int64_t, int32_t> KeyIntentionMap = {
     {(int64_t)KeyEvent::KEYCODE_SPACE, KeyEvent::INTENTION_SELECT},
     {(int64_t)KeyEvent::KEYCODE_NUMPAD_ENTER, KeyEvent::INTENTION_SELECT},
     {(int64_t)KeyEvent::KEYCODE_ESCAPE, KeyEvent::INTENTION_ESCAPE},
-    {((int64_t)KeyEvent::KEYCODE_ALT_LEFT<<16) + KeyEvent::KEYCODE_DPAD_LEFT, KeyEvent::INTENTION_BACK},
-    {((int64_t)KeyEvent::KEYCODE_ALT_LEFT<<16) + KeyEvent::KEYCODE_DPAD_RIGHT, KeyEvent::INTENTION_FORWARD},
-    {((int64_t)KeyEvent::KEYCODE_ALT_RIGHT<<16) + KeyEvent::KEYCODE_DPAD_LEFT, KeyEvent::INTENTION_BACK},
-    {((int64_t)KeyEvent::KEYCODE_ALT_RIGHT<<16) + KeyEvent::KEYCODE_DPAD_RIGHT, KeyEvent::INTENTION_FORWARD},
-    {((int64_t)KeyEvent::KEYCODE_SHIFT_LEFT<<16) + KeyEvent::KEYCODE_F10, KeyEvent::INTENTION_MENU},
-    {((int64_t)KeyEvent::KEYCODE_SHIFT_RIGHT<<16) + KeyEvent::KEYCODE_F10, KeyEvent::INTENTION_MENU},
+    {((int64_t)KeyEvent::KEYCODE_ALT_LEFT << 16) + KeyEvent::KEYCODE_DPAD_LEFT, KeyEvent::INTENTION_BACK},
+    {((int64_t)KeyEvent::KEYCODE_ALT_LEFT << 16) + KeyEvent::KEYCODE_DPAD_RIGHT, KeyEvent::INTENTION_FORWARD},
+    {((int64_t)KeyEvent::KEYCODE_ALT_RIGHT << 16) + KeyEvent::KEYCODE_DPAD_LEFT, KeyEvent::INTENTION_BACK},
+    {((int64_t)KeyEvent::KEYCODE_ALT_RIGHT << 16) + KeyEvent::KEYCODE_DPAD_RIGHT, KeyEvent::INTENTION_FORWARD},
+    {((int64_t)KeyEvent::KEYCODE_SHIFT_LEFT << 16) + KeyEvent::KEYCODE_F10, KeyEvent::INTENTION_MENU},
+    {((int64_t)KeyEvent::KEYCODE_SHIFT_RIGHT << 16) + KeyEvent::KEYCODE_F10, KeyEvent::INTENTION_MENU},
     {(int64_t)KeyEvent::KEYCODE_COMPOSE, KeyEvent::INTENTION_MENU},
     {(int64_t)KeyEvent::KEYCODE_PAGE_UP, KeyEvent::INTENTION_PAGE_UP},
     {(int64_t)KeyEvent::KEYCODE_PAGE_DOWN, KeyEvent::INTENTION_PAGE_DOWN},
-    {((int64_t)KeyEvent::KEYCODE_CTRL_LEFT<<16) + KeyEvent::KEYCODE_PLUS, KeyEvent::INTENTION_ZOOM_OUT},
-    {((int64_t)KeyEvent::KEYCODE_CTRL_RIGHT<<16) + KeyEvent::KEYCODE_PLUS, KeyEvent::INTENTION_ZOOM_OUT},
-    {((int64_t)KeyEvent::KEYCODE_CTRL_LEFT<<16) + KeyEvent::KEYCODE_NUMPAD_ADD, KeyEvent::INTENTION_ZOOM_OUT},
-    {((int64_t)KeyEvent::KEYCODE_CTRL_RIGHT<<16) + KeyEvent::KEYCODE_NUMPAD_ADD, KeyEvent::INTENTION_ZOOM_OUT},
-    {((int64_t)KeyEvent::KEYCODE_CTRL_LEFT<<16) + KeyEvent::KEYCODE_MINUS, KeyEvent::INTENTION_ZOOM_IN},
-    {((int64_t)KeyEvent::KEYCODE_CTRL_RIGHT<<16) + KeyEvent::KEYCODE_MINUS, KeyEvent::INTENTION_ZOOM_IN},
-    {((int64_t)KeyEvent::KEYCODE_CTRL_LEFT<<16) + KeyEvent::KEYCODE_NUMPAD_SUBTRACT, KeyEvent::INTENTION_ZOOM_IN},
-    {((int64_t)KeyEvent::KEYCODE_CTRL_RIGHT<<16) + KeyEvent::KEYCODE_NUMPAD_SUBTRACT, KeyEvent::INTENTION_ZOOM_IN},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_LEFT << 16) + KeyEvent::KEYCODE_PLUS, KeyEvent::INTENTION_ZOOM_OUT},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_RIGHT << 16) + KeyEvent::KEYCODE_PLUS, KeyEvent::INTENTION_ZOOM_OUT},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_LEFT << 16) + KeyEvent::KEYCODE_NUMPAD_ADD, KeyEvent::INTENTION_ZOOM_OUT},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_RIGHT << 16) + KeyEvent::KEYCODE_NUMPAD_ADD, KeyEvent::INTENTION_ZOOM_OUT},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_LEFT << 16) + KeyEvent::KEYCODE_MINUS, KeyEvent::INTENTION_ZOOM_IN},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_RIGHT << 16) + KeyEvent::KEYCODE_MINUS, KeyEvent::INTENTION_ZOOM_IN},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_LEFT << 16) + KeyEvent::KEYCODE_NUMPAD_SUBTRACT, KeyEvent::INTENTION_ZOOM_IN},
+    {((int64_t)KeyEvent::KEYCODE_CTRL_RIGHT << 16) + KeyEvent::KEYCODE_NUMPAD_SUBTRACT, KeyEvent::INTENTION_ZOOM_IN},
     {(int64_t)KeyEvent::KEYCODE_VOLUME_MUTE, KeyEvent::INTENTION_MEDIA_MUTE},
     {(int64_t)KeyEvent::KEYCODE_MUTE, KeyEvent::INTENTION_MEDIA_MUTE},
     {(int64_t)KeyEvent::KEYCODE_VOLUME_UP, KeyEvent::INTENTION_VOLUTE_UP},
@@ -493,28 +494,23 @@ std::map<int64_t, int32_t> KeyIntentionMap = {
     {(int64_t)KeyEvent::KEYCODE_BACK, KeyEvent::INTENTION_BACK},
     {(int64_t)KeyEvent::KEYCODE_MOVE_HOME, KeyEvent::INTENTION_HOME},
 };
+} // namespace
 
-int32_t GetKeyIntentionByKeyCode(int64_t keyCodes)
-{
-    auto iter = KeyIntentionMap.find(keyCodes);
-    if (iter == KeyIntentionMap.end()) {
-        return KeyEvent::INTENTION_UNKNOWN;
-    }
-    return iter->second;
-}
-
-int32_t GetKeyIntentionByItems(std::shared_ptr<KeyEvent> keyEvent)
+int32_t keyItemsTransKeyIntention(const std::vector<KeyEvent::KeyItem> &items)
 {
-    std::vector<KeyEvent::KeyItem> items = keyEvent->GetKeyItems();
-    if (items.size() > 3) {
+    if (items.size() < 1 || items.size() > 3) {
         return KeyEvent::INTENTION_UNKNOWN;
     }
 
     int64_t keyCodes = 0;
     for (const auto &item : items) {
-        keyCodes = (keyCodes<<16) + item.GetKeyCode();
+        keyCodes = (keyCodes << 16) + item.GetKeyCode();
     }
-    return GetKeyIntentionByKeyCode(keyCodes);
+    auto iter = KeyIntentionMap.find(keyCodes);
+    if (iter == KeyIntentionMap.end()) {
+        return KeyEvent::INTENTION_UNKNOWN;
+    }
+    return iter->second;
 }
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/service/key_event_normalize/src/key_event_normalize.cpp b/service/key_event_normalize/src/key_event_normalize.cpp
index f1bd352165..fac50bd79d 100644
--- a/service/key_event_normalize/src/key_event_normalize.cpp
+++ b/service/key_event_normalize/src/key_event_normalize.cpp
@@ -103,7 +103,8 @@ int32_t KeyEventNormalize::Normalize(struct libinput_event *event, std::shared_p
         keyEvent->RemoveReleasedKeyItems(item);
         keyEvent->AddPressedKeyItems(item);
     }
-    int32_t keyIntention = GetKeyIntentionByItems(keyEvent);
+    std::vector<KeyEvent::KeyItem> items = keyEvent->GetKeyItems();
+    int32_t keyIntention = keyItemsTransKeyIntention(items);
     keyEvent->SetKeyIntention(keyIntention);
     return RET_OK;
 }
-- 
Gitee


From 3e1acad9301858906e24ca77744317ad72b64c2e Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Fri, 16 Sep 2022 16:10:05 +0800
Subject: [PATCH 025/360] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 .../event_handler/src/key_event_value_transformation.cpp    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/service/event_handler/src/key_event_value_transformation.cpp b/service/event_handler/src/key_event_value_transformation.cpp
index 35c1851aca..fb84fa1c37 100644
--- a/service/event_handler/src/key_event_value_transformation.cpp
+++ b/service/event_handler/src/key_event_value_transformation.cpp
@@ -461,7 +461,7 @@ int32_t InputTransformationKeyValue(int32_t keyCode)
 }
 
 namespace {
-constexpr  std::map<int64_t, int32_t> KeyIntentionMap = {
+const std::map<int64_t, int32_t> MAP_KEY_INTENTION = {
     {(int64_t)KeyEvent::KEYCODE_DPAD_UP, KeyEvent::INTENTION_UP},
     {(int64_t)KeyEvent::KEYCODE_DPAD_DOWN, KeyEvent::INTENTION_DOWN},
     {(int64_t)KeyEvent::KEYCODE_DPAD_LEFT, KeyEvent::INTENTION_LEFT},
@@ -506,8 +506,8 @@ int32_t keyItemsTransKeyIntention(const std::vector<KeyEvent::KeyItem> &items)
     for (const auto &item : items) {
         keyCodes = (keyCodes << 16) + item.GetKeyCode();
     }
-    auto iter = KeyIntentionMap.find(keyCodes);
-    if (iter == KeyIntentionMap.end()) {
+    auto iter = MAP_KEY_INTENTION.find(keyCodes);
+    if (iter == MAP_KEY_INTENTION.end()) {
         return KeyEvent::INTENTION_UNKNOWN;
     }
     return iter->second;
-- 
Gitee


From 9c9e88696eaba10e25a754e0bc9551701cf85137 Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Fri, 16 Sep 2022 17:08:15 +0800
Subject: [PATCH 026/360] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 frameworks/proxy/events/src/key_event.cpp             | 4 ++--
 interfaces/native/innerkits/event/include/key_event.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frameworks/proxy/events/src/key_event.cpp b/frameworks/proxy/events/src/key_event.cpp
index 49c760c4d5..14f93c2576 100644
--- a/frameworks/proxy/events/src/key_event.cpp
+++ b/frameworks/proxy/events/src/key_event.cpp
@@ -1158,7 +1158,7 @@ bool KeyEvent::WriteToParcel(Parcel &out) const
         }
     }
     WRITEINT32(out, keyAction_);
-
+    WRITEINT32(out, keyIntention_);
     return true;
 }
 
@@ -1180,7 +1180,7 @@ bool KeyEvent::ReadFromParcel(Parcel &in)
         keys_.push_back(val);
     }
     READINT32(in, keyAction_);
-
+    READINT32(in, keyIntention_);
     return true;
 }
 
diff --git a/interfaces/native/innerkits/event/include/key_event.h b/interfaces/native/innerkits/event/include/key_event.h
index b6c6dc8d65..a9529f3a47 100644
--- a/interfaces/native/innerkits/event/include/key_event.h
+++ b/interfaces/native/innerkits/event/include/key_event.h
@@ -3211,10 +3211,10 @@ private:
     int32_t keyCode_ { -1 };
     std::vector<KeyItem> keys_;
     int32_t keyAction_ { 0 };
+    int32_t keyIntention_ { -1 };
     bool numLock_ { false };
     bool capsLock_ { false };
     bool scrollLock_ { false };
-    int32_t keyIntention_ { -1 };
 };
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From 5b8668ce384d13986ef6d61a0b00420c9e91da17 Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Fri, 16 Sep 2022 17:14:38 +0800
Subject: [PATCH 027/360] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A3=80=E8=A7=86?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 service/key_event_normalize/src/key_event_normalize.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/service/key_event_normalize/src/key_event_normalize.cpp b/service/key_event_normalize/src/key_event_normalize.cpp
index fac50bd79d..14f84b2519 100644
--- a/service/key_event_normalize/src/key_event_normalize.cpp
+++ b/service/key_event_normalize/src/key_event_normalize.cpp
@@ -103,8 +103,7 @@ int32_t KeyEventNormalize::Normalize(struct libinput_event *event, std::shared_p
         keyEvent->RemoveReleasedKeyItems(item);
         keyEvent->AddPressedKeyItems(item);
     }
-    std::vector<KeyEvent::KeyItem> items = keyEvent->GetKeyItems();
-    int32_t keyIntention = keyItemsTransKeyIntention(items);
+    int32_t keyIntention = keyItemsTransKeyIntention(keyEvent->GetKeyItems());
     keyEvent->SetKeyIntention(keyIntention);
     return RET_OK;
 }
-- 
Gitee


From c16dd02668503f31391eb56d1722c432ed27e509 Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Mon, 19 Sep 2022 10:06:40 +0800
Subject: [PATCH 028/360] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 frameworks/proxy/events/src/key_event.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frameworks/proxy/events/src/key_event.cpp b/frameworks/proxy/events/src/key_event.cpp
index 14f93c2576..6a06b6f8bd 100644
--- a/frameworks/proxy/events/src/key_event.cpp
+++ b/frameworks/proxy/events/src/key_event.cpp
@@ -542,7 +542,8 @@ KeyEvent::KeyEvent(const KeyEvent& other)
     : InputEvent(other),
       keyCode_(other.keyCode_),
       keys_(other.keys_),
-      keyAction_(other.keyAction_) {}
+      keyAction_(other.keyAction_),
+      keyIntention_(other.keyIntention_) {}
 
 KeyEvent::~KeyEvent() {}
 
-- 
Gitee


From 9e9eeb7b199cb1d9d63526c029682ba6ea711e08 Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Mon, 19 Sep 2022 10:17:56 +0800
Subject: [PATCH 029/360] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0keyIntention=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 util/common/src/input_event_data_transformation.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/util/common/src/input_event_data_transformation.cpp b/util/common/src/input_event_data_transformation.cpp
index a0dd005805..35d943e0f7 100644
--- a/util/common/src/input_event_data_transformation.cpp
+++ b/util/common/src/input_event_data_transformation.cpp
@@ -30,7 +30,7 @@ int32_t InputEventDataTransformation::KeyEventToNetPacket(
         MMI_HILOGE("Serialize input event failed");
         return RET_ERR;
     }
-    pkt << key->GetKeyCode() << key->GetKeyAction();
+    pkt << key->GetKeyCode() << key->GetKeyAction() << key->GetKeyIntention();
     auto keys = key->GetKeyItems();
     int32_t size = static_cast<int32_t>(keys.size());
     if (size > MAX_KEY_SIZE) {
@@ -63,6 +63,8 @@ int32_t InputEventDataTransformation::NetPacketToKeyEvent(NetPacket &pkt, std::s
     key->SetKeyCode(data);
     pkt >> data;
     key->SetKeyAction(data);
+    pkt >> data;
+    key->SetKeyIntention(data);
     int32_t size = 0;
     pkt >> size;
     if (size > MAX_KEY_SIZE) {
-- 
Gitee


From e8f53bf0b6d66bc7bff4a438b8bc7bd94133480d Mon Sep 17 00:00:00 2001
From: lisong <lisong92@huawei.com>
Date: Mon, 19 Sep 2022 11:23:41 +0800
Subject: [PATCH 030/360] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lisong <lisong92@huawei.com>
---
 .../innerkits/event/include/key_event.h       | 164 ++++++++++++++++++
 1 file changed, 164 insertions(+)

diff --git a/interfaces/native/innerkits/event/include/key_event.h b/interfaces/native/innerkits/event/include/key_event.h
index a9529f3a47..b83ccc503c 100644
--- a/interfaces/native/innerkits/event/include/key_event.h
+++ b/interfaces/native/innerkits/event/include/key_event.h
@@ -2865,36 +2865,200 @@ public:
      */
     static const int32_t KEY_ACTION_UP;
 
+    /**
+     * 未知意图
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_UNKNOWN;
+
+    /**
+     * D-pad 上
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_UP;
+
+    /**
+     * D-pad 下
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_DOWN;
+
+    /**
+     * D-pad 左
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_LEFT;
+
+    /**
+     * D-pad 右
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_RIGHT;
+
+    /**
+     * 选中
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_SELECT;
+
+    /**
+     * 逃逸
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_ESCAPE;
+
+    /**
+     * 返回
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_BACK;
+
+    /**
+     * 前进
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_FORWARD;
+
+    /**
+     * 菜单
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_MENU;
+    
+    /**
+     * 回到桌面
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_HOME;
+    
+    /**
+     * 上一页
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_PAGE_UP;
+    
+    /**
+     * 下一页
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_PAGE_DOWN;
+    
+    /**
+     * 放大键
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_ZOOM_OUT;
+    
+    /**
+     * 缩小键
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_ZOOM_IN;
 
+    /**
+     * 播放/暂停
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_MEDIA_PLAY_PAUSE;
+    
+    /**
+     * 快进
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_MEDIA_FAST_FORWARD;
+    
+    /**
+     * 快退
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_MEDIA_FAST_REWIND;
+    
+    /**
+     * 倍速播放
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_MEDIA_FAST_PLAYBACK;
+    
+    /**
+     * 下一首/下一集
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_MEDIA_NEXT;
+    
+    /**
+     * 上一首/上一集
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_MEDIA_PREVIOUS;
+    
+    /**
+     * 扬声器静音键
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_MEDIA_MUTE;
+
+    /**
+     * 音量增加键
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_VOLUTE_UP;
+    
+    /**
+     * 音量减小键
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_VOLUTE_DOWN;
 
+    /**
+     * 接听/挂断/拨号
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_CALL;
+    
+    /**
+     * 挂断
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_ENDCALL;
+    
+    /**
+     * 拒绝
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_REJECTCALL;
 
+    /**
+     * 拍照键
+     *
+     * @since 9
+     */
     static const int32_t INTENTION_CAMERA;
 
 public:
-- 
Gitee


From 5ebf06b7e2aed4a861d1221d55d0c3db23beadcd Mon Sep 17 00:00:00 2001
From: wangdi119 <wangdi119@huawei.com>
Date: Tue, 20 Sep 2022 09:43:24 +0800
Subject: [PATCH 031/360] =?UTF-8?q?=E2=80=9C=E6=97=A5=E5=BF=97=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangdi119 <wangdi119@huawei.com>
---
 util/common/include/time_cost_chk.h | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/util/common/include/time_cost_chk.h b/util/common/include/time_cost_chk.h
index 8522436d2c..356d4d22f5 100644
--- a/util/common/include/time_cost_chk.h
+++ b/util/common/include/time_cost_chk.h
@@ -17,6 +17,7 @@
 #define TIME_COST_CHK_H
 
 #include <cinttypes>
+#include <map>
 
 #include "nocopyable.h"
 
@@ -24,6 +25,25 @@ namespace OHOS {
 namespace MMI {
 inline constexpr int64_t MAX_INPUT_EVENT_TIME = 1000;
 inline constexpr int64_t MAX_OVER_TIME = 300;
+static std::map<int32_t, std::string> paramType = {
+        {1, "device_added"},
+        {2, "device_removed"},
+        {300, "keyboard_key"},
+        {400, "pointer_monitor"},
+        {401, "pointer_monitor_absolute"},
+        {402, "pointer_button"},
+        {403, "pointer_axis"},
+        {500, "touch_down"},
+        {501, "touch_up"},
+        {502, "touch_monitor"},
+        {600, "tablet_tool_axis"},
+        {800, "gesture_swipe_begin"},
+        {801, "gesture_swipe_update"},
+        {802, "gesturn_swipe_end"},
+        {803, "gesturn_pinch_begin"},
+        {804, "gesturn_pinch_update"},
+        {805, "gesturn_pinch_end"},
+};
 template<class T>
 class TimeCostChk {
     static inline constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "TimeCostChk" };
@@ -44,8 +64,8 @@ public:
             if (llParam1_ != 0 || llParam2_ != 0) {
                 MMI_HILOGW("Time cost overtime (%{public}" PRId64 ",(us)>%{public}" PRId64
                          "(us)) when Reason:%{public}s,chk:%{public}s,"
-                         "param1:%{public}" PRId64 ",param2:%{public}" PRId64 "",
-                         ullCost, uiTime_, strReason_.c_str(), strOutput_.c_str(), llParam1_, llParam2_);
+                         "paramType:%{public}s, param2:%{public}" PRId64 "",
+                         ullCost, uiTime_, strReason_.c_str(), strOutput_.c_str(), paramType[llParam1_].data(), llParam2_);
             } else {
                 MMI_HILOGW("Overtime(%{public}" PRId64 ",(us)>%{public}" PRId64
                          "(us)) when Reason:%{public}s,chk:%{public}s",
-- 
Gitee


From 32d2735c9c9204c16c96721d7b7b1096611bf937 Mon Sep 17 00:00:00 2001
From: fuchao33 <fuchao33@huawei.com>
Date: Tue, 20 Sep 2022 19:07:46 +0800
Subject: [PATCH 032/360] =?UTF-8?q?Description:=20rpc=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=88=90p2p=20Sig:=20SIG=5FBscSoftSrv=20Feature=20or=20Bugfix:?=
 =?UTF-8?q?=20Feature=20Binary=20Source:=20No=20Signed-off-by:=20<zhenying?=
 =?UTF-8?q?.wu@thundersoft.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../input_device_cooperate/include/js_util.h  |   1 +
 .../src/js_event_target.cpp                   |  10 +-
 .../src/js_input_device_cooperate_context.cpp |  37 +-
 .../input_device_cooperate/src/js_util.cpp    |  13 +-
 .../input_monitor/src/js_input_monitor.cpp    |   2 +-
 service/BUILD.gn                              |   2 +
 service/connect_manager/BUILD.gn              |   6 -
 .../include/i_multimodal_input_connect.h      |  13 +-
 .../include/multimodal_input_connect_proxy.h  |   8 +-
 .../include/multimodal_input_connect_stub.h   |   7 +-
 .../src/multimodal_input_connect_proxy.cpp    | 103 ----
 .../src/multimodal_input_connect_remoter.cpp  | 144 -----
 .../src/multimodal_input_connect_stub.cpp     |  90 ---
 .../include/input_device_manager.h            |   1 -
 .../src/input_device_manager.cpp              |  31 +-
 .../include/event_dispatch_handler.h          |  10 +-
 .../src/event_dispatch_handler.cpp            |  45 +-
 .../src/event_normalize_handler.cpp           |  10 +-
 .../device_cooperate_softbus_adapter.h}       |  52 +-
 .../include/distributed_input_adapter.h       |  38 +-
 .../include/input_device_cooperate_sm.h       |   1 -
 .../input_device_cooperate_state_free.h       |   3 +-
 .../include/input_device_cooperate_util.h     |  25 +
 .../include/mmi_softbus_define.h              |  54 ++
 .../src/cooperate_event_manager.cpp           |   5 +-
 .../src/device_cooperate_softbus_adapter.cpp  | 532 ++++++++++++++++++
 .../src/device_profile_adapter.cpp            |   6 +-
 .../src/distributed_input_adapter.cpp         |  46 +-
 .../src/i_input_device_cooperate_state.cpp    |   2 +-
 .../src/input_device_cooperate_sm.cpp         |  44 +-
 .../src/input_device_cooperate_state_free.cpp |   9 +-
 .../src/input_device_cooperate_state_in.cpp   |   9 +-
 .../src/input_device_cooperate_state_out.cpp  |   9 +-
 .../src/input_device_cooperate_util.cpp       |  40 ++
 service/module_loader/include/mmi_service.h   |  12 -
 service/module_loader/src/mmi_service.cpp     | 114 ----
 .../src/mouse_event_normalize.cpp             |   2 +-
 util/common/include/config_multimodal.h       |   1 +
 38 files changed, 834 insertions(+), 703 deletions(-)
 delete mode 100755 service/connect_manager/src/multimodal_input_connect_remoter.cpp
 rename service/{connect_manager/include/multimodal_input_connect_remoter.h => input_device_cooperate/include/device_cooperate_softbus_adapter.h} (42%)
 create mode 100644 service/input_device_cooperate/include/input_device_cooperate_util.h
 create mode 100644 service/input_device_cooperate/include/mmi_softbus_define.h
 create mode 100755 service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
 create mode 100644 service/input_device_cooperate/src/input_device_cooperate_util.cpp

diff --git a/frameworks/napi/input_device_cooperate/include/js_util.h b/frameworks/napi/input_device_cooperate/include/js_util.h
index 1b281ef8fc..a8fca46933 100755
--- a/frameworks/napi/input_device_cooperate/include/js_util.h
+++ b/frameworks/napi/input_device_cooperate/include/js_util.h
@@ -61,6 +61,7 @@ public:
     static napi_value GetStopInfo(const std::unique_ptr<CallbackInfo> &cb);
     static napi_value GetStateInfo(const std::unique_ptr<CallbackInfo> &cb);
     static napi_value GetResult(napi_env env, bool result);
+    static napi_value GetStateResult(napi_env env, bool result);
     static bool IsSameHandle(napi_env env, napi_value handle, napi_ref ref);
 
     template <typename T>
diff --git a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
index 783c2245c7..2ab9122e73 100755
--- a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
@@ -514,16 +514,18 @@ void JsEventTarget::CallGetStateAsyncWork(uv_work_t *work, int32_t status)
     CHKPV(cb);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
-
-    napi_value object = JsUtil::GetStateInfo(cb);
-    if (object == nullptr) {
+    napi_value resultObj[2] = {0};
+    napi_get_undefined(cb->env, &resultObj[0]);
+    resultObj[1] = JsUtil::GetStateInfo(cb);
+    CHKPV(resultObj[0]);
+    if (resultObj[1] == nullptr) {
         MMI_HILOGE("object is nullptr");
         napi_close_handle_scope(cb->env, scope);
     }
     napi_value handler = nullptr;
     CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE_VALUE, scope);
     napi_value result = nullptr;
-    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 1, &object, &result), CALL_FUNCTION, scope);
+    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, resultObj, &result), CALL_FUNCTION, scope);
     napi_close_handle_scope(cb->env, scope);
 }
 
diff --git a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
index 5a088e747c..138ed2abcc 100755
--- a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
@@ -216,8 +216,11 @@ napi_value JsInputDeviceCooperateContext::On(napi_env env, napi_callback_info in
     char type[MAX_STRING_LEN] = {};
     size_t length = 0;
     CHKRP(env, napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &length), GET_STRING);
-    std::string type_ = type;
-
+    if (std::strcmp(type, "cooperation") != 0) {
+        THROWERR(env, "Register listener failed, the first parameter is invalid");
+        MMI_HILOGE("Register listener failed, the first parameter is invalid");
+        return nullptr;
+    }
     JsInputDeviceCooperateContext *jsDev = JsInputDeviceCooperateContext::GetInstance(env);
     auto jsInputDeviceMgr = jsDev->GetJsInputDeviceCooperateMgr();
     if (!UtilNapi::TypeOf(env, argv[1], napi_function)) {
@@ -225,7 +228,7 @@ napi_value JsInputDeviceCooperateContext::On(napi_env env, napi_callback_info in
         MMI_HILOGE("The seocond parameter is not function");
         return nullptr;
     }
-    jsInputDeviceMgr->RegisterListener(env, type_, argv[1]);
+    jsInputDeviceMgr->RegisterListener(env, type, argv[1]);
     return nullptr;
 }
 
@@ -366,12 +369,6 @@ JsInputDeviceCooperateContext *JsInputDeviceCooperateContext::GetInstance(napi_e
 
 void JsInputDeviceCooperateContext::DeclareDeviceCooperateInterface(napi_env env, napi_value exports)
 {
-    napi_value openSuccess = nullptr;
-    CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::OPEN_SUCCESS), &openSuccess),
-        CREATE_INT32);
-    napi_value openFail = nullptr;
-    CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::OPEN_FAIL), &openFail),
-        CREATE_INT32);
     napi_value infoStart = nullptr;
     CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::INFO_START), &infoStart),
         CREATE_INT32);
@@ -381,21 +378,6 @@ void JsInputDeviceCooperateContext::DeclareDeviceCooperateInterface(napi_env env
     napi_value infoFail = nullptr;
     CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::INFO_FAIL), &infoFail),
         CREATE_INT32);
-    napi_value close = nullptr;
-    CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::CLOSE), &close),
-        CREATE_INT32);
-    napi_value closeSuccess = nullptr;
-    CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::CLOSE_SUCCESS), &closeSuccess),
-        CREATE_INT32);
-    napi_value stop = nullptr;
-    CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::STOP), &stop),
-        CREATE_INT32);
-    napi_value stopSuccess = nullptr;
-    CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::STOP_SUCCESS), &stopSuccess),
-        CREATE_INT32);
-    napi_value stopFail = nullptr;
-    CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::STOP_FAIL), &stopFail),
-        CREATE_INT32);
     napi_value stateOn = nullptr;
     CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::STATE_ON), &stateOn),
         CREATE_INT32);
@@ -404,16 +386,9 @@ void JsInputDeviceCooperateContext::DeclareDeviceCooperateInterface(napi_env env
         CREATE_INT32);
 
     napi_property_descriptor msg[] = {
-        DECLARE_NAPI_STATIC_PROPERTY("MSG_COOPERATE_OPEN_SUCCESS", openSuccess),
-        DECLARE_NAPI_STATIC_PROPERTY("MSG_COOPERATE_OPEN_FAIL", openFail),
         DECLARE_NAPI_STATIC_PROPERTY("MSG_COOPERATE_INFO_START", infoStart),
         DECLARE_NAPI_STATIC_PROPERTY("MSG_COOPERATE_INFO_SUCCESS", infoSuccess),
         DECLARE_NAPI_STATIC_PROPERTY("MSG_COOPERATE_INFO_FAIL", infoFail),
-        DECLARE_NAPI_STATIC_PROPERTY("MSG_COOPERATE_CLOSE", close),
-        DECLARE_NAPI_STATIC_PROPERTY("MSG_COOPERATE_CLOSE_SUCCESS", closeSuccess),
-        DECLARE_NAPI_STATIC_PROPERTY("MSG_COOPERATE_STOP", stop),
-        DECLARE_NAPI_STATIC_PROPERTY("MSG_COOPERATE_STOP_SUCCESS", stopSuccess),
-        DECLARE_NAPI_STATIC_PROPERTY("MSG_COOPERATE_STOP_FAIL", stopFail),
         DECLARE_NAPI_STATIC_PROPERTY("MSG_COOPERATE_STATE_ON", stateOn),
         DECLARE_NAPI_STATIC_PROPERTY("MSG_COOPERATE_STATE_OFF", stateOff),
     };
diff --git a/frameworks/napi/input_device_cooperate/src/js_util.cpp b/frameworks/napi/input_device_cooperate/src/js_util.cpp
index 694395faac..e1e5d22316 100755
--- a/frameworks/napi/input_device_cooperate/src/js_util.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_util.cpp
@@ -59,7 +59,7 @@ napi_value JsUtil::GetStateInfo(const std::unique_ptr<CallbackInfo> &cb)
 {
     CHKPP(cb);
     CHKPP(cb->env);
-    return GetResult(cb->env, cb->data.cooperateOpened);
+    return GetStateResult(cb->env, cb->data.cooperateOpened);
 }
 
 napi_value JsUtil::GetResult(napi_env env, bool result)
@@ -77,6 +77,17 @@ napi_value JsUtil::GetResult(napi_env env, bool result)
     return object;
 }
 
+napi_value JsUtil::GetStateResult(napi_env env, bool result)
+{
+    CHKPP(env);
+    napi_value object = nullptr;
+    napi_value state = nullptr;
+    CHKRP(env, napi_get_boolean(env, result, &state), GET_BOOLEAN);
+    CHKRP(env, napi_create_object(env, &object), CREATE_OBJECT);
+    CHKRP(env, napi_set_named_property(env,  object, "state", state), SET_NAMED_PROPERTY);
+    return object;
+}
+
 bool JsUtil::IsSameHandle(napi_env env, napi_value handle, napi_ref ref)
 {
     napi_value handlerTemp = nullptr;
diff --git a/frameworks/napi/input_monitor/src/js_input_monitor.cpp b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
index 302eb70f87..9c5dd0f9e0 100755
--- a/frameworks/napi/input_monitor/src/js_input_monitor.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
@@ -40,7 +40,7 @@ constexpr int32_t AXIS_UPDATE = 5;
 constexpr int32_t AXIS_END = 6;
 constexpr int32_t MIDDLE = 1;
 constexpr int32_t RIGHT = 2;
-constexpr int32_t MOUSE_FLOW = 25;
+constexpr int32_t MOUSE_FLOW = 15;
 } // namespace
 
 bool InputMonitor::Start()
diff --git a/service/BUILD.gn b/service/BUILD.gn
index d7446700bd..8a97f186b4 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -455,6 +455,8 @@ ohos_shared_library("libmmi-server") {
       "input_device_cooperate/src/input_device_cooperate_state_free.cpp",
       "input_device_cooperate/src/input_device_cooperate_state_in.cpp",
       "input_device_cooperate/src/input_device_cooperate_state_out.cpp",
+      "input_device_cooperate/src/device_cooperate_softbus_adapter.cpp",
+      "input_device_cooperate/src/input_device_cooperate_util.cpp",
     ]
   }
 
diff --git a/service/connect_manager/BUILD.gn b/service/connect_manager/BUILD.gn
index e612df100a..0358d045ae 100644
--- a/service/connect_manager/BUILD.gn
+++ b/service/connect_manager/BUILD.gn
@@ -64,12 +64,6 @@ ohos_source_set("mmi_connect_manager_proxy") {
     "${mmi_connect_manager_path}/src/multimodal_input_connect_proxy.cpp",
   ]
 
-  if (input_feature_input_cooperation) {
-    sources += [
-      "${mmi_connect_manager_path}/src/multimodal_input_connect_remoter.cpp",
-    ]
-  }
-
   configs = [ ":mmi_connect_manager_config" ]
 
   external_deps = [
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
index 3e6f6f0914..603690721f 100644
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -60,11 +60,6 @@ public:
         START_INPUT_DEVICE_COOPERATE = 33,
         STOP_DEVICE_COOPERATE = 34,
         GET_INPUT_DEVICE_COOPERATE_STATE = 35,
-        REMOTE_COOPERATE_START = 40,
-        REMOTE_COOPERATE_START_RES = 41,
-        REMOTE_COOPERATE_STOP = 42,
-        REMOTE_COOPERATE_STOP_RES = 43,
-        REMOTE_COOPERATE_STOP_OTHER_RES = 44,
         SET_INPUT_DEVICE_TO_SCREEN = 50,
     };
 
@@ -107,15 +102,9 @@ public:
     virtual int32_t StopDeviceCooperate(int32_t userData) = 0;
     virtual int32_t GetInputDeviceCooperateState(int32_t userData, const std::string &deviceId) = 0;
     virtual int32_t SetInputDevice(const std::string& dhid, const std::string& screenId) = 0;
-    virtual int32_t StartRemoteCooperate(const std::string& localDeviceId) = 0;
-    virtual int32_t StartRemoteCooperateResult(bool isSuccess, const std::string& startDhid,
-        int32_t xPercent, int32_t yPercent) = 0;
-    virtual int32_t StopRemoteCooperate() = 0;
-    virtual int32_t StopRemoteCooperateResult(bool isSuccess) = 0;
-    virtual int32_t StartCooperateOtherResult(const std::string &srcNetworkId) = 0;
     virtual int32_t GetFunctionKeyState(int32_t funckey, bool &state) = 0;
     virtual int32_t SetFunctionKeyState(int32_t funcKey, bool enable) = 0;
 };
 } // namespace MMI
 } // namespace OHOS
-#endif // I_MULTIMODAL_INPUT_CONNECT_H
\ No newline at end of file
+#endif // I_MULTIMODAL_INPUT_CONNECT_H
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
index cff5fad685..3462468700 100644
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -62,12 +62,6 @@ public:
     virtual int32_t StopDeviceCooperate(int32_t userData) override;
     virtual int32_t GetInputDeviceCooperateState(int32_t userData, const std::string &deviceId) override;
     virtual int32_t SetInputDevice(const std::string& dhid, const std::string& screenId) override;
-    virtual int32_t StartRemoteCooperate(const std::string &localDeviceId) override;
-    virtual int32_t StartRemoteCooperateResult(bool isSuccess, const std::string& startDhid,
-        int32_t xPercent, int32_t yPercent) override;
-    virtual int32_t StopRemoteCooperate() override;
-    virtual int32_t StopRemoteCooperateResult(bool isSuccess) override;
-    virtual int32_t StartCooperateOtherResult(const std::string &srcNetworkId) override;
     virtual int32_t GetFunctionKeyState(int32_t funcKey, bool &state) override;
     virtual int32_t SetFunctionKeyState(int32_t funcKey, bool enable) override;
 
@@ -76,4 +70,4 @@ private:
 };
 } // namespace MMI
 } // namespace OHOS
-#endif // MULTIMODAL_INPUT_CONNECT_PROXY_H
\ No newline at end of file
+#endif // MULTIMODAL_INPUT_CONNECT_PROXY_H
diff --git a/service/connect_manager/include/multimodal_input_connect_stub.h b/service/connect_manager/include/multimodal_input_connect_stub.h
index 66666a841f..7269376f56 100644
--- a/service/connect_manager/include/multimodal_input_connect_stub.h
+++ b/service/connect_manager/include/multimodal_input_connect_stub.h
@@ -67,14 +67,9 @@ protected:
     int32_t StubStopDeviceCooperate(MessageParcel& data, MessageParcel& reply);
     int32_t StubGetInputDeviceCooperateState(MessageParcel& data, MessageParcel& reply);
     int32_t StubSetInputDevice(MessageParcel& data, MessageParcel& reply);
-    int32_t StubStartRemoteCooperate(MessageParcel& data, MessageParcel& reply);
-    int32_t StubStartRemoteCooperateRes(MessageParcel& data, MessageParcel& reply);
-    int32_t StubStopRemoteCooperate(MessageParcel& data, MessageParcel& reply);
-    int32_t StubStopRemoteCooperateRes(MessageParcel& data, MessageParcel& reply);
-    int32_t StubStartCooperateOtherRes(MessageParcel& data, MessageParcel& reply);
     int32_t StubGetFunctionKeyState(MessageParcel &data, MessageParcel &reply);
     int32_t StubSetFunctionKeyState(MessageParcel &data, MessageParcel &reply);
 };
 } // namespace MMI
 } // namespace OHOS
-#endif // MULTIMODAL_INPUT_CONNECT_STUB_H
\ No newline at end of file
+#endif // MULTIMODAL_INPUT_CONNECT_STUB_H
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index ce00033f58..8a8e51884c 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -718,109 +718,6 @@ int32_t MultimodalInputConnectProxy::GetInputDeviceCooperateState(int32_t userDa
     return ret;
 }
 
-int32_t MultimodalInputConnectProxy::StartRemoteCooperate(const std::string& localDeviceId)
-{
-    CALL_INFO_TRACE;
-    MessageParcel data;
-    if (!data.WriteInterfaceToken(MultimodalInputConnectProxy::GetDescriptor())) {
-        MMI_HILOGE("Failed to write descriptor");
-        return ERR_INVALID_VALUE;
-    }
-    WRITESTRING(data, localDeviceId, ERR_INVALID_VALUE);
-    MessageParcel reply;
-    MessageOption option;
-    sptr<IRemoteObject> remote = Remote();
-    CHKPR(remote, RET_ERR);
-    int32_t ret = remote->SendRequest(REMOTE_COOPERATE_START, data, reply, option);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Send request fail, ret:%{public}d", ret);
-    }
-    return ret;
-}
-
-int32_t MultimodalInputConnectProxy::StartRemoteCooperateResult(bool isSuccess,
-    const std::string& startDhid, int32_t xPercent, int32_t yPercent)
-{
-    CALL_INFO_TRACE;
-    MessageParcel data;
-    if (!data.WriteInterfaceToken(MultimodalInputConnectProxy::GetDescriptor())) {
-        MMI_HILOGE("Failed to write descriptor");
-        return ERR_INVALID_VALUE;
-    }
-    WRITEBOOL(data, isSuccess, ERR_INVALID_VALUE);
-    WRITESTRING(data, startDhid, ERR_INVALID_VALUE);
-    WRITEINT32(data, xPercent, ERR_INVALID_VALUE);
-    WRITEINT32(data, yPercent, ERR_INVALID_VALUE);
-    MessageParcel reply;
-    MessageOption option;
-    sptr<IRemoteObject> remote = Remote();
-    CHKPR(remote, RET_ERR);
-    int32_t ret = remote->SendRequest(REMOTE_COOPERATE_START_RES, data, reply, option);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Send request fail, ret:%{public}d", ret);
-    }
-    return ret;
-}
-
-int32_t MultimodalInputConnectProxy::StopRemoteCooperate()
-{
-    CALL_INFO_TRACE;
-    MessageParcel data;
-    if (!data.WriteInterfaceToken(MultimodalInputConnectProxy::GetDescriptor())) {
-        MMI_HILOGE("Failed to write descriptor");
-        return ERR_INVALID_VALUE;
-    }
-    MessageParcel reply;
-    MessageOption option;
-    sptr<IRemoteObject> remote = Remote();
-    CHKPR(remote, RET_ERR);
-    int32_t ret = remote->SendRequest(REMOTE_COOPERATE_STOP, data, reply, option);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Send request fail, ret:%{public}d", ret);
-    }
-    return ret;
-}
-
-int32_t MultimodalInputConnectProxy::StopRemoteCooperateResult(bool isSuccess)
-{
-    CALL_INFO_TRACE;
-    MessageParcel data;
-    if (!data.WriteInterfaceToken(MultimodalInputConnectProxy::GetDescriptor())) {
-        MMI_HILOGE("Failed to write descriptor");
-        return ERR_INVALID_VALUE;
-    }
-    WRITEBOOL(data, isSuccess, ERR_INVALID_VALUE);
-    MessageParcel reply;
-    MessageOption option;
-    sptr<IRemoteObject> remote = Remote();
-    CHKPR(remote, RET_ERR);
-    int32_t ret = remote->SendRequest(REMOTE_COOPERATE_STOP_RES, data, reply, option);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Send request fail, ret:%{public}d", ret);
-    }
-    return ret;
-}
-
-int32_t MultimodalInputConnectProxy::StartCooperateOtherResult(const std::string& srcNetworkId)
-{
-    CALL_INFO_TRACE;
-    MessageParcel data;
-    if (!data.WriteInterfaceToken(MultimodalInputConnectProxy::GetDescriptor())) {
-        MMI_HILOGE("Failed to write descriptor");
-        return ERR_INVALID_VALUE;
-    }
-    WRITESTRING(data, srcNetworkId, ERR_INVALID_VALUE);
-    MessageParcel reply;
-    MessageOption option;
-    sptr<IRemoteObject> remote = Remote();
-    CHKPR(remote, RET_ERR);
-    int32_t ret = remote->SendRequest(REMOTE_COOPERATE_STOP_OTHER_RES, data, reply, option);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Send request fail, ret:%{public}d", ret);
-    }
-    return ret;
-}
-
 int32_t MultimodalInputConnectProxy::GetFunctionKeyState(int32_t funcKey, bool &state)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/connect_manager/src/multimodal_input_connect_remoter.cpp b/service/connect_manager/src/multimodal_input_connect_remoter.cpp
deleted file mode 100755
index 9f959b0905..0000000000
--- a/service/connect_manager/src/multimodal_input_connect_remoter.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "multimodal_input_connect_remoter.h"
-
-#include <chrono>
-#include <thread>
-
-#include "iservice_registry.h"
-#include "system_ability_definition.h"
-
-#include "mmi_log.h"
-#include "multimodal_input_connect_death_recipient.h"
-#include "multimodal_input_connect_define.h"
-#include "util.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-std::shared_ptr<MultimodalInputConnectRemoter> g_instance = nullptr;
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "MultimodalInputConnectRemoter"};
-} // namespace
-
-std::shared_ptr<MultimodalInputConnectRemoter> MultimodalInputConnectRemoter::GetInstance()
-{
-    static std::once_flag flag;
-    std::call_once(flag, [&]() {
-        g_instance.reset(new (std::nothrow) MultimodalInputConnectRemoter());
-    });
-    return g_instance;
-}
-
-int32_t MultimodalInputConnectRemoter::StartRemoteCooperate(const std::string &localDeviceId,
-    const std::string &remoteDeviceId)
-{
-    CALL_DEBUG_ENTER;
-    auto proxy = GetProxyById(remoteDeviceId);
-    CHKPR(proxy, RET_ERR);
-    return proxy->StartRemoteCooperate(localDeviceId);
-}
-
-int32_t MultimodalInputConnectRemoter::StartRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess,
-    const std::string &startDhid, int32_t xPercent, int32_t yPercent)
-{
-    CALL_DEBUG_ENTER;
-    auto proxy = GetProxyById(remoteDeviceId);
-    CHKPR(proxy, RET_ERR);
-    return proxy->StartRemoteCooperateResult(isSuccess, startDhid, xPercent, yPercent);
-}
-
-int32_t MultimodalInputConnectRemoter::StopRemoteCooperate(const std::string &remoteDeviceId)
-{
-    CALL_DEBUG_ENTER;
-    auto proxy = GetProxyById(remoteDeviceId);
-    CHKPR(proxy, RET_ERR);
-    return proxy->StopRemoteCooperate();
-}
-
-int32_t MultimodalInputConnectRemoter::StopRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess)
-{
-    CALL_DEBUG_ENTER;
-    auto proxy = GetProxyById(remoteDeviceId);
-    CHKPR(proxy, RET_ERR);
-    return proxy->StopRemoteCooperateResult(isSuccess);
-}
-
-int32_t MultimodalInputConnectRemoter::StartCooperateOtherResult(const std::string &remoteDeviceId,
-    const std::string &srcNetworkId)
-{
-    CALL_DEBUG_ENTER;
-    auto proxy = GetProxyById(remoteDeviceId);
-    CHKPR(proxy, RET_ERR);
-    return proxy->StartCooperateOtherResult(srcNetworkId);
-}
-
-sptr<IMultimodalInputConnect> MultimodalInputConnectRemoter::GetProxyById(const std::string &remoteDeviceId)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(lock_);
-    auto iterService = mmiRemoteServices_.find(remoteDeviceId);
-    if (iterService != mmiRemoteServices_.end()) {
-        return iterService->second;
-    }
-    auto sm = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
-    CHKPP(sm);
-    auto sa = sm->GetSystemAbility(IMultimodalInputConnect::MULTIMODAL_INPUT_CONNECT_SERVICE_ID, remoteDeviceId);
-    CHKPP(sa);
-    std::weak_ptr<MultimodalInputConnectRemoter> weakPtr = shared_from_this();
-    auto deathCallback = [remoteDeviceId, weakPtr](const wptr<IRemoteObject> &object) {
-        auto sharedPtr = weakPtr.lock();
-        if (sharedPtr != nullptr) {
-            sharedPtr->OnRemoteDeath(remoteDeviceId);
-        }
-    };
-    sptr<IRemoteObject::DeathRecipient> deathRecipient =
-        new (std::nothrow) MultimodalInputConnectDeathRecipient(deathCallback);
-    CHKPP(deathRecipient);
-    sa->AddDeathRecipient(deathRecipient);
-    auto retDeath = mmiDeathRecipients_.emplace(remoteDeviceId, deathRecipient);
-    if (!retDeath.second) {
-        MMI_HILOGE("Get proxy faild, death recipient not set");
-        return nullptr;
-    }
-    sptr<IMultimodalInputConnect> remoteService = iface_cast<IMultimodalInputConnect>(sa);
-    if (remoteService == nullptr) {
-        MMI_HILOGE("Get proxy faild, get remote service is null!");
-        OnRemoteDeath(remoteDeviceId);
-        return nullptr;
-    }
-    auto retService = mmiRemoteServices_.emplace(remoteDeviceId, remoteService);
-    if (!retService.second) {
-        MMI_HILOGE("Get proxy faild, remote service not set!");
-        OnRemoteDeath(remoteDeviceId);
-        return nullptr;
-    }
-    return remoteService;
-}
-
-void MultimodalInputConnectRemoter::OnRemoteDeath(const std::string &remoteDeviceId)
-{
-    CALL_DEBUG_ENTER;
-    auto iterService = mmiRemoteServices_.find(remoteDeviceId);
-    if (iterService != mmiRemoteServices_.end()) {
-        mmiRemoteServices_.erase(iterService);
-    }
-    auto iterRecipient = mmiDeathRecipients_.find(remoteDeviceId);
-    if (iterRecipient != mmiDeathRecipients_.end()) {
-        mmiDeathRecipients_.erase(iterRecipient);
-    }
-}
-} // namespace MMI
-} // namespace OHOS
\ No newline at end of file
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 950ba8ed47..04ebb57a6c 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -83,12 +83,6 @@ int32_t MultimodalInputConnectStub::OnRemoteRequest(uint32_t code, MessageParcel
         {IMultimodalInputConnect::GET_INPUT_DEVICE_COOPERATE_STATE,
             &MultimodalInputConnectStub::StubGetInputDeviceCooperateState},
         {IMultimodalInputConnect::SET_INPUT_DEVICE_TO_SCREEN, &MultimodalInputConnectStub::StubSetInputDevice},
-        {IMultimodalInputConnect::REMOTE_COOPERATE_START, &MultimodalInputConnectStub::StubStartRemoteCooperate},
-        {IMultimodalInputConnect::REMOTE_COOPERATE_START_RES, &MultimodalInputConnectStub::StubStartRemoteCooperateRes},
-        {IMultimodalInputConnect::REMOTE_COOPERATE_STOP, &MultimodalInputConnectStub::StubStopRemoteCooperate},
-        {IMultimodalInputConnect::REMOTE_COOPERATE_STOP_RES, &MultimodalInputConnectStub::StubStopRemoteCooperateRes},
-        {IMultimodalInputConnect::REMOTE_COOPERATE_STOP_OTHER_RES,
-            &MultimodalInputConnectStub::StubStartCooperateOtherRes},
         {IMultimodalInputConnect::GET_FUNCTION_KEY_STATE, &MultimodalInputConnectStub::StubGetFunctionKeyState},
         {IMultimodalInputConnect::SET_FUNCTION_KEY_STATE, &MultimodalInputConnectStub::StubSetFunctionKeyState}
     };
@@ -686,90 +680,6 @@ int32_t MultimodalInputConnectStub::StubGetInputDeviceCooperateState(MessageParc
     return ret;
 }
 
-int32_t MultimodalInputConnectStub::StubStartRemoteCooperate(MessageParcel& data, MessageParcel& reply)
-{
-    CALL_DEBUG_ENTER;
-    if (!IsRunning()) {
-        MMI_HILOGE("Service is not running");
-        return MMISERVICE_NOT_RUNNING;
-    }
-    std::string remoteDeviceId;
-    READSTRING(data, remoteDeviceId, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = StartRemoteCooperate(remoteDeviceId);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Call StartRemoteCooperate failed, ret:%{public}d", ret);
-    }
-    return ret;
-}
-
-int32_t MultimodalInputConnectStub::StubStartRemoteCooperateRes(MessageParcel& data, MessageParcel& reply)
-{
-    CALL_DEBUG_ENTER;
-    if (!IsRunning()) {
-        MMI_HILOGE("Service is not running");
-        return MMISERVICE_NOT_RUNNING;
-    }
-    bool isSuccess;
-    READBOOL(data, isSuccess, IPC_PROXY_DEAD_OBJECT_ERR);
-    std::string startDhid;
-    READSTRING(data, startDhid, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t xPercent;
-    READINT32(data, xPercent, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t yPercent;
-    READINT32(data, yPercent, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = StartRemoteCooperateResult(isSuccess, startDhid, xPercent, yPercent);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Call StartRemoteCooperateResult failed, ret:%{public}d", ret);
-    }
-    return ret;
-}
-
-int32_t MultimodalInputConnectStub::StubStopRemoteCooperate(MessageParcel& data, MessageParcel& reply)
-{
-    CALL_DEBUG_ENTER;
-    if (!IsRunning()) {
-        MMI_HILOGE("Service is not running");
-        return MMISERVICE_NOT_RUNNING;
-    }
-    int32_t ret = StopRemoteCooperate();
-    if (ret != RET_OK) {
-        MMI_HILOGE("Call StopRemoteCooperate failed, ret:%{public}d", ret);
-    }
-    return ret;
-}
-
-int32_t MultimodalInputConnectStub::StubStopRemoteCooperateRes(MessageParcel& data, MessageParcel& reply)
-{
-    CALL_DEBUG_ENTER;
-    if (!IsRunning()) {
-        MMI_HILOGE("Service is not running");
-        return MMISERVICE_NOT_RUNNING;
-    }
-    bool isSuccess;
-    READBOOL(data, isSuccess, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = StopRemoteCooperateResult(isSuccess);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Call StopRemoteCooperateResult failed, ret:%{public}d", ret);
-    }
-    return ret;
-}
-
-int32_t MultimodalInputConnectStub::StubStartCooperateOtherRes(MessageParcel& data, MessageParcel& reply)
-{
-    CALL_DEBUG_ENTER;
-    if (!IsRunning()) {
-        MMI_HILOGE("Service is not running");
-        return MMISERVICE_NOT_RUNNING;
-    }
-    std::string peerNetworkId;
-    READSTRING(data, peerNetworkId, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = StartCooperateOtherResult(peerNetworkId);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Call StartCooperateOtherRes failed, ret:%{public}d", ret);
-    }
-    return ret;
-}
-
 int32_t MultimodalInputConnectStub::StubSetInputDevice(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/device_manager/include/input_device_manager.h b/service/device_manager/include/input_device_manager.h
index 0513e599d2..f65052a838 100644
--- a/service/device_manager/include/input_device_manager.h
+++ b/service/device_manager/include/input_device_manager.h
@@ -63,7 +63,6 @@ public:
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     std::string GetOriginNetworkId(int32_t id);
     std::string GetOriginNetworkId(const std::string &dhid);
-    void GetLocalDeviceId(std::string &local);
     std::string GetDhid(int32_t deviceId) const;
     std::vector<std::string> GetCooperateDhids(int32_t deviceId);
     std::vector<std::string> GetCooperateDhids(const std::string &dhid);
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index dc0fe60c08..b141dbb5e4 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -26,11 +26,11 @@
 #include "dfx_hisysevent.h"
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
 #include "input_device_cooperate_sm.h"
+#include "input_device_cooperate_util.h"
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 #include "input_windows_manager.h"
 #include "key_event_value_transformation.h"
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-#include "softbus_bus_center.h"
 #include "util.h"
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 #include "util_ex.h"
@@ -45,7 +45,6 @@ constexpr int32_t SUPPORT_KEY = 1;
 const std::string UNKNOWN_SCREEN_ID = "";
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
 const char *SPLIT_SYMBOL = "|";
-const std::string BUNDLE_NAME = "DBinderBus_" + std::to_string(getpid());
 const std::string DH_ID_PREFIX = "Input_";
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 
@@ -531,14 +530,14 @@ std::vector<std::string> InputDeviceManager::GetCooperateDhids(int32_t deviceId)
 
 std::vector<std::string> InputDeviceManager::GetCooperateDhids(const std::string &dhid)
 {
-    int32_t pointerId = -1;
+    int32_t inputDeviceId = INVALID_DEVICE_ID;
     for (const auto &iter : inputDevice_) {
         if (iter.second.dhid_ == dhid) {
-            pointerId = iter.first;
+            inputDeviceId = iter.first;
             break;
         }
     }
-    return GetCooperateDhids(pointerId);
+    return GetCooperateDhids(inputDeviceId);
 }
 
 std::string InputDeviceManager::GetOriginNetworkId(int32_t id)
@@ -562,30 +561,14 @@ std::string InputDeviceManager::GetOriginNetworkId(const std::string &dhid)
     }
     std::string networkId;
     for (const auto &iter : inputDevice_) {
-        if (iter.second.dhid_ == dhid) {
+        if (iter.second.isRemote_ && iter.second.dhid_ == dhid) {
             networkId = iter.second.networkIdOrigin_;
-            if (networkId.empty()) {
-                GetLocalDeviceId(networkId);
-                break;
-            }
+            break;
         }
     }
     return networkId;
 }
 
-void InputDeviceManager::GetLocalDeviceId(std::string &local)
-{
-    local = "";
-    auto localNode = std::make_unique<NodeBasicInfo>();
-    CHKPV(localNode);
-    int32_t errCode = GetLocalNodeDeviceInfo(BUNDLE_NAME.c_str(), localNode.get());
-    if (errCode != RET_OK) {
-        MMI_HILOGE("GetLocalNodeDeviceInfo errCode: %{public}d", errCode);
-        return;
-    }
-    local = localNode->networkId;
-}
-
 std::string InputDeviceManager::GetDhid(int32_t deviceId) const
 {
     auto dev = inputDevice_.find(deviceId);
@@ -695,7 +678,7 @@ std::string InputDeviceManager::GenerateDescriptor(struct libinput_device *input
         rawDescriptor += "uniqueId:" + std::string(uniqueId);
     }
     if (physicalPath != nullptr) {
-        rawDescriptor += "physicalPath:" + std::string(physicalPath);
+        rawDescriptor += "location:" + std::string(physicalPath);
     }
     if (name != nullptr && name[0] != '\0') {
         rawDescriptor += "name:" + regex_replace(name, std::regex(" "), "");
diff --git a/service/event_dispatch/include/event_dispatch_handler.h b/service/event_dispatch/include/event_dispatch_handler.h
index b7990681ee..a8412c1fa8 100644
--- a/service/event_dispatch/include/event_dispatch_handler.h
+++ b/service/event_dispatch/include/event_dispatch_handler.h
@@ -28,7 +28,7 @@
 namespace OHOS {
 namespace MMI {
 class EventDispatchHandler : public IInputEventHandler {
-    struct MouseState {
+    struct DinputSimulateEvent {
         uint32_t type { PointerEvent::SOURCE_TYPE_UNKNOWN };
         uint32_t code { PointerEvent::BUTTON_NONE };
         int32_t value { PointerEvent::POINTER_ACTION_UNKNOWN };
@@ -53,16 +53,16 @@ public:
     void HandlePointerEventInner(const std::shared_ptr<PointerEvent> point);
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-    void OnMouseStateChange(uint32_t type, uint32_t code, int32_t value);
-#endif // OHOS_BUILD_ENABLE_COOPERATE
+    void OnDinputSimulateEvent(uint32_t type, uint32_t code, int32_t value);
     bool CheckPointerEvent(std::shared_ptr<PointerEvent> pointerEvent);
+#endif // OHOS_BUILD_ENABLE_COOPERATE
 
 private:
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     std::mutex lock_;
-    std::vector<MouseState> mouseState_;
+    std::vector<DinputSimulateEvent> dinputSimulateEvent_;
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 };
 } // namespace MMI
 } // namespace OHOS
-#endif // EVENT_DISPATCH_HANDLER_H
\ No newline at end of file
+#endif // EVENT_DISPATCH_HANDLER_H
diff --git a/service/event_dispatch/src/event_dispatch_handler.cpp b/service/event_dispatch/src/event_dispatch_handler.cpp
index 219961c84e..d96f00e6e6 100644
--- a/service/event_dispatch/src/event_dispatch_handler.cpp
+++ b/service/event_dispatch/src/event_dispatch_handler.cpp
@@ -30,6 +30,7 @@
 #include "input_event_handler.h"
 #include "input_windows_manager.h"
 #include "input-event-codes.h"
+#include "mouse_device_state.h"
 #include "napi_constants.h"
 #include "proto.h"
 #include "util.h"
@@ -45,7 +46,7 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Event
 EventDispatchHandler::EventDispatchHandler()
 {
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-    DistributedAdapter->RegisterEventCallback(std::bind(&EventDispatchHandler::OnMouseStateChange, this,
+    DistributedAdapter->RegisterEventCallback(std::bind(&EventDispatchHandler::OnDinputSimulateEvent, this,
         std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 }
@@ -89,10 +90,12 @@ void EventDispatchHandler::HandlePointerEventInner(const std::shared_ptr<Pointer
         DfxHisysevent::OnUpdateTargetPointer(point, fd, OHOS::HiviewDFX::HiSysEvent::EventType::FAULT);
         return;
     }
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
     if (CheckPointerEvent(point)) {
         MMI_HILOGE("Check pointer event return true,filter out this pointer event");
         return;
     }
+#endif // OHOS_BUILD_ENABLE_COOPERATE
     auto udsServer = InputHandler->GetUDSServer();
     CHKPV(udsServer);
     auto session = udsServer->GetSession(fd);
@@ -102,7 +105,6 @@ void EventDispatchHandler::HandlePointerEventInner(const std::shared_ptr<Pointer
         MMI_HILOGW("The pointer event does not report normally, application not response");
         return;
     }
-    auto pid = udsServer->GetClientPid(fd);
     auto pointerEvent = std::make_shared<PointerEvent>(*point);
     auto pointerIdList = pointerEvent->GetPointerIds();
     if (pointerIdList.size() > 1) {
@@ -113,7 +115,7 @@ void EventDispatchHandler::HandlePointerEventInner(const std::shared_ptr<Pointer
                 continue;
             }
             auto itemPid = WinMgr->GetWindowPid(pointeritem.GetTargetWindowId());
-            if (itemPid >= 0 && itemPid != pid) {
+            if ((itemPid >= 0) && (itemPid != udsServer->GetClientPid(fd))) {
                 pointerEvent->RemovePointerItem(id);
                 MMI_HILOGD("pointerIdList size:%{public}zu", pointerEvent->GetPointerIds().size());
             }
@@ -168,32 +170,35 @@ int32_t EventDispatchHandler::DispatchKeyEventPid(UDSServer& udsServer, std::sha
 }
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
 
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
 bool EventDispatchHandler::CheckPointerEvent(std::shared_ptr<PointerEvent> pointerEvent)
 {
     CHKPF(pointerEvent);
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
-    if (pointerEvent->GetSourceType() == PointerEvent::SOURCE_TYPE_MOUSE) {
-        std::lock_guard<std::mutex> guard(lock_);
-        if (!mouseState_.empty()) {
-            if (pointerEvent->GetSourceType() == mouseState_[0].type &&
-                pointerEvent->GetButtonId() == mouseState_[0].code &&
-                pointerEvent->GetPointerAction() == mouseState_[0].value) {
-                mouseState_.clear();
-                return true;
-            }
-        }
+    if (pointerEvent->GetSourceType() != PointerEvent::SOURCE_TYPE_MOUSE) {
+        return false;
+    }
+    std::lock_guard<std::mutex> guard(lock_);
+    if (dinputSimulateEvent_.empty()) {
+        return false;
+    }
+    int32_t pointerAction = PointerEvent::POINTER_ACTION_BUTTON_DOWN;
+    if (dinputSimulateEvent_[0].value == BUTTON_STATE_RELEASED) {
+        pointerAction = PointerEvent::POINTER_ACTION_BUTTON_UP;
+    }
+    if ((EV_KEY == dinputSimulateEvent_[0].type == EV_KEY) &&
+        (MouseState->LibinputChangeToPointer(dinputSimulateEvent_[0].code) == pointerEvent->GetButtonId()) &&
+        (pointerAction == pointerEvent->GetPointerAction())) {
+        dinputSimulateEvent_.clear();
+        return true;
     }
-#endif // OHOS_BUILD_ENABLE_COOPERATE
     return false;
 }
 
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
-void EventDispatchHandler::OnMouseStateChange(uint32_t type, uint32_t code, int32_t value)
+void EventDispatchHandler::OnDinputSimulateEvent(uint32_t type, uint32_t code, int32_t value)
 {
     std::lock_guard<std::mutex> guard(lock_);
-    mouseState_.clear();
-    MouseState state = {type, code, value};
-    mouseState_.push_back(state);
+    dinputSimulateEvent_.clear();
+    dinputSimulateEvent_.push_back({type, code, value});
 }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 } // namespace MMI
diff --git a/service/event_handler/src/event_normalize_handler.cpp b/service/event_handler/src/event_normalize_handler.cpp
index 7a575042ee..202cce8fe6 100644
--- a/service/event_handler/src/event_normalize_handler.cpp
+++ b/service/event_handler/src/event_normalize_handler.cpp
@@ -22,6 +22,7 @@
 #include "event_log_helper.h"
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
 #include "input_device_cooperate_sm.h"
+#include "input_device_cooperate_util.h"
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 #include "input_device_manager.h"
 #include "input_event_handler.h"
@@ -262,7 +263,7 @@ bool EventNormalizeHandler::CheckKeyboardWhiteList(std::shared_ptr<KeyEvent> key
         }
     } else if (state == CooperateState::STATE_OUT) {
         std::string networkId;
-        InputDevMgr->GetLocalDeviceId(networkId);
+        GetLocalDeviceId(networkId);
         if (!IsNeedFilterOut(networkId, keyEvent)) {
             if (keyEvent->GetKeyAction() == KeyEvent::KEY_ACTION_UP) {
                 KeyRepeat->SelectAutoRepeat(keyEvent);
@@ -396,13 +397,6 @@ int32_t EventNormalizeHandler::HandleTouchEvent(libinput_event* event)
     CHKPR(event, ERROR_NULL_POINTER);
     auto pointerEvent = TouchEventHdr->OnLibInput(event, INPUT_DEVICE_CAP_TOUCH);
     CHKPR(pointerEvent, ERROR_NULL_POINTER);
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-    if (InputDevCooSM->CheckTouchEvent(event)) {
-        MMI_HILOGW("Touch event filter out");
-        ResetTouchUpEvent(pointerEvent, event);
-        return RET_OK;
-    }
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
     BytraceAdapter::StartBytrace(pointerEvent, BytraceAdapter::TRACE_START);
     nextHandler_->HandleTouchEvent(pointerEvent);
     ResetTouchUpEvent(pointerEvent, event);
diff --git a/service/connect_manager/include/multimodal_input_connect_remoter.h b/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
similarity index 42%
rename from service/connect_manager/include/multimodal_input_connect_remoter.h
rename to service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
index d587c48e0d..6a8d834364 100755
--- a/service/connect_manager/include/multimodal_input_connect_remoter.h
+++ b/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
@@ -13,23 +13,25 @@
  * limitations under the License.
  */
 
-#ifndef MULTIMODAL_INPUT_CONNECT_REMOTER_H
-#define MULTIMODAL_INPUT_CONNECT_REMOTER_H
+#ifndef INPUT_DEVICE_COOPERATE_ADAPTER_H
+#define INPUT_DEVICE_COOPERATE_ADAPTER_H
 
 #include <map>
 #include <memory>
 #include <string>
 
+#include "nlohmann/json.hpp"
 #include "nocopyable.h"
+#include "session.h"
 
 #include "i_multimodal_input_connect.h"
 
 namespace OHOS {
 namespace MMI {
-class MultimodalInputConnectRemoter : public std::enable_shared_from_this<MultimodalInputConnectRemoter> {
+class DeviceCooperateSoftbusAdapter {
 public:
-    virtual ~MultimodalInputConnectRemoter() = default;
-    static std::shared_ptr<MultimodalInputConnectRemoter> GetInstance();
+    virtual ~DeviceCooperateSoftbusAdapter() = default;
+    static std::shared_ptr<DeviceCooperateSoftbusAdapter> GetInstance();
     int32_t StartRemoteCooperate(const std::string &localDeviceId, const std::string &remoteDeviceId);
     int32_t StartRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess,
         const std::string &startDhid, int32_t xPercent, int32_t yPercent);
@@ -37,17 +39,37 @@ public:
     int32_t StopRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess);
     int32_t StartCooperateOtherResult(const std::string &remoteDeviceId, const std::string &srcNetworkId);
 
+    int32_t Init();
+    void Release();
+    int32_t OpenInputSoftbus(const std::string &remoteDevId);
+    void CloseInputSoftbus(const std::string &remoteDevId);
+
+    int32_t OnSessionOpened(int32_t sessionId, int32_t result);
+    void OnSessionClosed(int32_t sessionId);
+    void OnBytesReceived(int32_t sessionId, const void *data, uint32_t dataLen);
+
 private:
-    MultimodalInputConnectRemoter() = default;
-    DISALLOW_COPY_AND_MOVE(MultimodalInputConnectRemoter);
-
-    sptr<IMultimodalInputConnect> GetProxyById(const std::string &remoteDeviceId);
-    void OnRemoteDeath(const std::string &remoteDeviceId);
-    std::mutex lock_;
-    std::map<std::string, sptr<IMultimodalInputConnect>> mmiRemoteServices_;
-    std::map<std::string, sptr<IRemoteObject::DeathRecipient>> mmiDeathRecipients_;
+    DeviceCooperateSoftbusAdapter() = default;
+    DISALLOW_COPY_AND_MOVE(DeviceCooperateSoftbusAdapter);
+    std::string FindDeviceBySession(int32_t sessionId);
+    int32_t SendMsg(int32_t sessionId, std::string &message);
+    int32_t CheckDeviceSessionState(const std::string &remoteDevId);
+    void HandleSessionData(int32_t sessionId, const std::string& messageData);
+
+    void NotifyResponseStartRemoteCooperate(int32_t sessionId, const nlohmann::json &recMsg);
+    void NotifyResponseStartRemoteCooperateResult(int32_t sessionId, const nlohmann::json &recMsg);
+    void NotifyResponseStopRemoteCooperate(int32_t sessionId, const nlohmann::json &recMsg);
+    void NotifyResponseStopRemoteCooperateResult(int32_t sessionId, const nlohmann::json &recMsg);
+    void NotifyResponseStartCooperateOtherResult(int32_t sessionId, const nlohmann::json &recMsg);
+
+    std::map<std::string, int32_t> sessionDevMap_;
+    std::map<std::string, bool> channelStatusMap_;
+    std::mutex operationMutex_;
+    std::string mySessionName_ = "";
+    std::condition_variable openSessionWaitCond_;
+    ISessionListener sessListener_;
 };
 } // namespace MMI
 } // namespace OHOS
-#define RemoteMgr MultimodalInputConnectRemoter::GetInstance()
-#endif // MULTIMODAL_INPUT_CONNECT_REMOTER_H
+#define DevCooperateSoftbusAdapter DeviceCooperateSoftbusAdapter::GetInstance()
+#endif // INPUT_DEVICE_COOPERATE_ADAPTER_H
diff --git a/service/input_device_cooperate/include/distributed_input_adapter.h b/service/input_device_cooperate/include/distributed_input_adapter.h
index 1d1c9c55de..040ca84c6a 100644
--- a/service/input_device_cooperate/include/distributed_input_adapter.h
+++ b/service/input_device_cooperate/include/distributed_input_adapter.h
@@ -42,7 +42,7 @@ class DistributedInputAdapter final {
     DECLARE_DELAYED_SINGLETON(DistributedInputAdapter);
 public:
     using DInputCallback = std::function<void(bool)>;
-    using MouseStateChangeCallback = std::function<void(uint32_t type, uint32_t code, int32_t value)>;
+    using SimulateEventCallback = std::function<void(uint32_t type, uint32_t code, int32_t value)>;
     DISALLOW_COPY_AND_MOVE(DistributedInputAdapter);
 
     bool IsNeedFilterOut(const std::string &deviceId,
@@ -69,19 +69,17 @@ public:
     int32_t PrepareRemoteInput(const std::string &deviceId, DInputCallback callback);
     int32_t UnPrepareRemoteInput(const std::string &deviceId, DInputCallback callback);
 
-    int32_t RegisterEventCallback(MouseStateChangeCallback callback);
-    int32_t UnregisterEventCallback(MouseStateChangeCallback callback);
-
-    bool IsTouchEventNeedFilterOut(uint32_t absX, uint32_t absY);
+    int32_t RegisterEventCallback(SimulateEventCallback callback);
+    int32_t UnregisterEventCallback(SimulateEventCallback callback);
 
 private:
     enum class CallbackType {
         StartDInputCallback,
         StartDInputCallbackDHIds,
-        StartDInputCallbackFds,
+        StartDInputCallbackSink,
         StopDInputCallback,
         StopDInputCallbackDHIds,
-        StopDInputCallbackFds,
+        StopDInputCallbackSink,
         PrepareStartDInputCallback,
         UnPrepareStopDInputCallback,
         PrepareStartDInputCallbackSink,
@@ -93,57 +91,57 @@ private:
         int32_t timerId { 0 };
     };
 
-    class StartDInputCallback : public DistributedHardware::DistributedInput::StartDInputCallbackStub {
+    class StartDInputCallback final : public DistributedHardware::DistributedInput::StartDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const uint32_t &inputTypes, const int32_t &status) override;
     };
 
-    class StopDInputCallback : public DistributedHardware::DistributedInput::StopDInputCallbackStub {
+    class StopDInputCallback final : public DistributedHardware::DistributedInput::StopDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const uint32_t &inputTypes, const int32_t &status) override;
     };
 
-    class StartDInputCallbackDHIds : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
+    class StartDInputCallbackDHIds final : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
     public:
         void OnResultDhids(const std::string &devId, const int32_t &status) override;
     };
 
-    class StopDInputCallbackDHIds : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
+    class StopDInputCallbackDHIds final : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
     public:
         void OnResultDhids(const std::string &devId, const int32_t &status) override;
     };
 
-    class StartDInputCallbackFds : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
+    class StartDInputCallbackSink final : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
     public:
         void OnResultDhids(const std::string &devId, const int32_t &status) override;
     };
 
-    class StopDInputCallbackFds : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
+    class StopDInputCallbackSink final : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
     public:
         void OnResultDhids(const std::string &devId, const int32_t &status) override;
     };
 
-    class PrepareStartDInputCallback : public DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
+    class PrepareStartDInputCallback final : public DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const int32_t &status) override;
     };
 
-    class UnPrepareStopDInputCallback : public DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
+    class UnPrepareStopDInputCallback final : public DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const int32_t &status) override;
     };
 
-    class PrepareStartDInputCallbackSink : public DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
+    class PrepareStartDInputCallbackSink final : public DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const int32_t &status) override;
     };
 
-    class UnPrepareStopDInputCallbackSink : public DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
+    class UnPrepareStopDInputCallbackSink final : public DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const int32_t &status) override;
     };
 
-    class MouseStateChangeCallbackImpl : public DistributedHardware::DistributedInput::SimulationEventListenerStub {
+    class SimulateEventCallbackImpl final : public DistributedHardware::DistributedInput::SimulationEventListenerStub {
     public:
         int32_t OnSimulationEvent(uint32_t type, uint32_t code, int32_t value) override;
     };
@@ -155,8 +153,8 @@ private:
     void OnSimulationEvent(uint32_t type, uint32_t code, int32_t value);
     std::map<CallbackType, TimerInfo> watchingMap_;
     std::map<CallbackType, DInputCallback> callbackMap_;
-    MouseStateChangeCallback mouseStateChangeCallback_ = { nullptr };
-    sptr<MouseStateChangeCallbackImpl> mouseListener_ { nullptr };
+    SimulateEventCallback SimulateEventCallback_ = { nullptr };
+    sptr<SimulateEventCallbackImpl> simulationEventListener_ { nullptr };
     std::mutex adapterLock_;
 };
 
diff --git a/service/input_device_cooperate/include/input_device_cooperate_sm.h b/service/input_device_cooperate/include/input_device_cooperate_sm.h
index 240ec4afb0..7523ee97f8 100755
--- a/service/input_device_cooperate/include/input_device_cooperate_sm.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_sm.h
@@ -93,7 +93,6 @@ public:
 private:
     void Reset(bool adjustAbsolutionLocation = false);
     void CheckPointerEvent(struct libinput_event *event);
-    bool CheckTouchEvent(struct libinput_event* event);
     void OnCloseCooperation(const std::string &networkId, bool isLocal);
     void NotifyRemoteStartFail(const std::string &remoteNetworkId);
     void NotifyRemoteStartSucess(const std::string &remoteNetworkId, const std::string &startDhid);
diff --git a/service/input_device_cooperate/include/input_device_cooperate_state_free.h b/service/input_device_cooperate/include/input_device_cooperate_state_free.h
index b0903d7011..036d896c6e 100755
--- a/service/input_device_cooperate/include/input_device_cooperate_state_free.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_state_free.h
@@ -16,7 +16,6 @@
 #ifndef INPUT_DEVICE_COOPERATE_STATE_FREE_H
 #define INPUT_DEVICE_COOPERATE_STATE_FREE_H
 
-#include "distributed_input_adapter.h"
 #include "i_input_device_cooperate_state.h"
 
 namespace OHOS {
@@ -30,4 +29,4 @@ private:
 };
 } // namespace MMI
 } // namespace OHOS
-#endif // INPUT_DEVICE_COOPERATE_STATE_FREE_H
\ No newline at end of file
+#endif // INPUT_DEVICE_COOPERATE_STATE_FREE_H
diff --git a/service/input_device_cooperate/include/input_device_cooperate_util.h b/service/input_device_cooperate/include/input_device_cooperate_util.h
new file mode 100644
index 0000000000..fc7ebac8e4
--- /dev/null
+++ b/service/input_device_cooperate/include/input_device_cooperate_util.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef INPUT_DEVICE_COOPERATE_UTIL_H
+#define INPUT_DEVICE_COOPERATE_UTIL_H
+
+#include <string>
+
+namespace OHOS {
+namespace MMI {
+void GetLocalDeviceId(std::string &local);
+} // namespace MMI
+} // namespace OHOS
+#endif // INPUT_DEVICE_COOPERATE_UTIL_H
diff --git a/service/input_device_cooperate/include/mmi_softbus_define.h b/service/input_device_cooperate/include/mmi_softbus_define.h
new file mode 100644
index 0000000000..d229c1f3dc
--- /dev/null
+++ b/service/input_device_cooperate/include/mmi_softbus_define.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MMI_SOFTBUS_DEFINE_H
+#define MMI_SOFTBUS_DEFINE_H
+
+#include <string>
+#include <unistd.h>
+
+namespace OHOS {
+namespace MMI {
+
+constexpr int32_t ENCRYPT_TAG_LEN = 32;
+constexpr int32_t MSG_MAX_SIZE = 45 * 1024;
+
+constexpr uint32_t SESSION_NAME_SIZE_MAX = 256;
+constexpr uint32_t DEVICE_ID_SIZE_MAX = 65;
+constexpr uint32_t INTERCEPT_STRING_LENGTH = 20;
+constexpr int32_t SESSION_WAIT_TIMEOUT_SECOND = 5;
+constexpr int32_t SESSION_SIDE_SERVER = 0;
+constexpr int32_t SESSION_SIDE_CLIENT = 1;
+
+const std::string SESSION_NAME = "ohos.mmi.";
+const std::string GROUP_ID = "mmi_softbus_group_id";
+
+#define MMI_SOFTBUS_KEY_CMD_TYPE "mmi_softbus_key_cmd_type"
+#define MMI_SOFTBUS_KEY_LOCAL_DEVICE_ID "mmi_softbus_key_local_device_id"
+#define MMI_SOFTBUS_KEY_START_DHID "mmi_softbus_key_start_dhid"
+#define MMI_SOFTBUS_KEY_POINTER_X "mmi_softbus_key_pointer_x"
+#define MMI_SOFTBUS_KEY_POINTER_Y "mmi_softbus_key_pointer_y"
+#define MMI_SOFTBUS_KEY_RESULT "mmi_softbus_key_result"
+#define MMI_SOFTBUS_KEY_OTHER_DEVICE_ID "mmi_softbus_key_other_device_id"
+#define MMI_SOFTBUS_KEY_SESSION_ID "mmi_softbus_key_session_id"
+
+const uint32_t  REMOTE_COOPERATE_START = 1;
+const uint32_t  REMOTE_COOPERATE_START_RES = 2;
+const uint32_t  REMOTE_COOPERATE_STOP = 3;
+const uint32_t  REMOTE_COOPERATE_STOP_RES = 4;
+const uint32_t  REMOTE_COOPERATE_STOP_OTHER_RES = 5;
+}  // namespace MMI
+}  // namespace OHOS
+#endif  // MMI_SOFTBUS_DEFINE_H
diff --git a/service/input_device_cooperate/src/cooperate_event_manager.cpp b/service/input_device_cooperate/src/cooperate_event_manager.cpp
index 8e3618fa74..783200f970 100755
--- a/service/input_device_cooperate/src/cooperate_event_manager.cpp
+++ b/service/input_device_cooperate/src/cooperate_event_manager.cpp
@@ -29,10 +29,10 @@ CooperateEventManager::~CooperateEventManager() {}
 void CooperateEventManager::AddCooperationEvent(sptr<EventInfo> event)
 {
     CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(lock_);
     if (event->type == EventType::LISTENER) {
         remoteCooperateCallbacks_.emplace_back(event);
     } else {
-        std::lock_guard<std::mutex> guard(lock_);
         cooperateCallbacks_[event->type] = event;
     }
 }
@@ -55,6 +55,7 @@ void CooperateEventManager::RemoveCooperationEvent(sptr<EventInfo> event)
 void CooperateEventManager::OnCooperateMessage(CooperationMessage msg, const std::string &deviceId)
 {
     CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(lock_);
     if (remoteCooperateCallbacks_.empty()) {
         MMI_HILOGE("No listener, send cooperate message failed");
         return;
@@ -148,4 +149,4 @@ void CooperateEventManager::NotifyCooperateState(SessionPtr sess, MmiMessageId m
     }
 }
 } // namespace MMI
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
new file mode 100755
index 0000000000..7b95312453
--- /dev/null
+++ b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
@@ -0,0 +1,532 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "device_cooperate_softbus_adapter.h"
+
+#include <chrono>
+#include <thread>
+
+#include "softbus_bus_center.h"
+#include "softbus_common.h"
+
+#include "config_multimodal.h"
+#include "input_device_cooperate_util.h"
+#include "mmi_log.h"
+#include "mmi_softbus_define.h"
+#include "util.h"
+#include "multimodal_input_connect_define.h"
+#include "input_device_cooperate_sm.h"
+
+namespace OHOS {
+namespace MMI {
+namespace {
+std::shared_ptr<DeviceCooperateSoftbusAdapter> g_instance = nullptr;
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "DeviceCooperateSoftbusAdapter"};
+const int32_t DINPUT_LINK_TYPE_MAX = 4;
+static SessionAttribute g_sessionAttr = {
+    .dataType = SessionType::TYPE_BYTES,
+    .linkTypeNum = DINPUT_LINK_TYPE_MAX,
+    .linkType = {
+        LINK_TYPE_WIFI_WLAN_2G,
+        LINK_TYPE_WIFI_WLAN_5G,
+        LINK_TYPE_WIFI_P2P,
+        LINK_TYPE_BR
+    }
+};
+} // namespace
+
+static int32_t SessionOpened(int32_t sessionId, int32_t result)
+{
+    return DevCooperateSoftbusAdapter->OnSessionOpened(sessionId, result);
+}
+
+static void SessionClosed(int32_t sessionId)
+{
+    DevCooperateSoftbusAdapter->OnSessionClosed(sessionId);
+}
+
+static void BytesReceived(int32_t sessionId, const void *data, uint32_t dataLen)
+{
+    DevCooperateSoftbusAdapter->OnBytesReceived(sessionId, data, dataLen);
+}
+
+static void MessageReceived(int32_t sessionId, const void *data, uint32_t dataLen)
+{
+    (void)sessionId;
+    (void)data;
+    (void)dataLen;
+}
+
+static void StreamReceived(int32_t sessionId, const StreamData *data, const StreamData *ext,
+    const StreamFrameInfo *param)
+{
+    (void)sessionId;
+    (void)data;
+    (void)ext;
+    (void)param;
+}
+
+int32_t DeviceCooperateSoftbusAdapter::Init()
+{
+    CALL_INFO_TRACE;
+    sessListener_ = {
+        .OnSessionOpened = SessionOpened,
+        .OnSessionClosed = SessionClosed,
+        .OnBytesReceived = BytesReceived,
+        .OnMessageReceived = MessageReceived,
+        .OnStreamReceived = StreamReceived
+    };
+
+    std::string networkId;
+    GetLocalDeviceId(networkId);
+    if (networkId.empty()) {
+        MMI_HILOGE("Local networkid is empty");
+        return RET_ERR;
+    }
+    mySessionName_ = SESSION_NAME + networkId.substr(0, INTERCEPT_STRING_LENGTH);
+    int32_t ret = CreateSessionServer(MMI_DSOFTBUS_PKG_NAME, mySessionName_.c_str(), &sessListener_);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Init create session server failed, error code %{public}d.", ret);
+        return RET_ERR;
+    }
+    return RET_OK;
+}
+
+void DeviceCooperateSoftbusAdapter::Release()
+{
+    std::unique_lock<std::mutex> sessionLock(operationMutex_);
+    std::for_each(sessionDevMap_.begin(), sessionDevMap_.end(), [](auto item) { CloseSession(item.second); });
+    (void)RemoveSessionServer(MMI_DSOFTBUS_PKG_NAME, mySessionName_.c_str());
+    sessionDevMap_.clear();
+    channelStatusMap_.clear();
+}
+
+int32_t DeviceCooperateSoftbusAdapter::CheckDeviceSessionState(const std::string &devId)
+{
+    std::unique_lock<std::mutex> sessionLock(operationMutex_);
+    if (sessionDevMap_.count(devId) != 0) {
+        return RET_OK;
+    } else {
+        MMI_HILOGE("Check session state error");
+        return RET_ERR;
+    }
+}
+
+int32_t DeviceCooperateSoftbusAdapter::OpenInputSoftbus(const std::string &remoteDevId)
+{
+    CALL_INFO_TRACE;
+    int32_t ret = CheckDeviceSessionState(remoteDevId);
+    if (ret == RET_OK) {
+        MMI_HILOGD("Softbus session has already opened");
+        return RET_OK;
+    }
+
+    ret = Init();
+    if (ret != RET_OK) {
+        MMI_HILOGE("CreateSessionServer failed.");
+        return RET_ERR;
+    }
+
+    std::string peerSessionName = SESSION_NAME + remoteDevId.substr(0, INTERCEPT_STRING_LENGTH);
+    MMI_HILOGI("OpenInputSoftbus peerSessionName:%{public}s", peerSessionName.c_str());
+
+    int sessionId = OpenSession(mySessionName_.c_str(), peerSessionName.c_str(), remoteDevId.c_str(),
+        GROUP_ID.c_str(), &g_sessionAttr);
+    if (sessionId < 0) {
+        MMI_HILOGE("OpenSession failed");
+        return RET_ERR;
+    }
+    {
+        std::unique_lock<std::mutex> sessionLock(operationMutex_);
+        sessionDevMap_[remoteDevId] = sessionId;
+    }
+
+    MMI_HILOGI("Wait for channel session opened.");
+    {
+        std::unique_lock<std::mutex> waitLock(operationMutex_);
+        auto status = openSessionWaitCond_.wait_for(waitLock, std::chrono::seconds(SESSION_WAIT_TIMEOUT_SECOND),
+            [this, remoteDevId] () { return channelStatusMap_[remoteDevId]; });
+        if (!status) {
+            MMI_HILOGE("OpenSession timeout");
+            return RET_ERR;
+        }
+    }
+    channelStatusMap_[remoteDevId] = false;
+    MMI_HILOGI("OpenSession finish");
+    return RET_OK;
+}
+
+void DeviceCooperateSoftbusAdapter::CloseInputSoftbus(const std::string &remoteDevId)
+{
+    std::unique_lock<std::mutex> sessionLock(operationMutex_);
+    if (sessionDevMap_.count(remoteDevId) == 0) {
+        MMI_HILOGI("SessionDevIdMap Not find");
+        return;
+    }
+    int32_t sessionId = sessionDevMap_[remoteDevId];
+
+    CloseSession(sessionId);
+    sessionDevMap_.erase(remoteDevId);
+    channelStatusMap_.erase(remoteDevId);
+}
+
+std::shared_ptr<DeviceCooperateSoftbusAdapter> DeviceCooperateSoftbusAdapter::GetInstance()
+{
+    static std::once_flag flag;
+    std::call_once(flag, [&]() {
+        g_instance.reset(new (std::nothrow) DeviceCooperateSoftbusAdapter());
+    });
+    return g_instance;
+}
+
+
+int32_t DeviceCooperateSoftbusAdapter::StartRemoteCooperate(const std::string &localDeviceId,
+    const std::string &remoteDeviceId)
+{
+    CALL_DEBUG_ENTER;
+    std::unique_lock<std::mutex> sessionLock(operationMutex_);
+    if (sessionDevMap_.count(remoteDeviceId) > 0) {
+        int32_t sessionId = sessionDevMap_[remoteDeviceId];
+        nlohmann::json jsonStr;
+        jsonStr[MMI_SOFTBUS_KEY_CMD_TYPE] = REMOTE_COOPERATE_START;
+        jsonStr[MMI_SOFTBUS_KEY_LOCAL_DEVICE_ID] = localDeviceId;
+        jsonStr[MMI_SOFTBUS_KEY_SESSION_ID] = sessionId;
+        std::string smsg = jsonStr.dump();
+        int32_t ret = SendMsg(sessionId, smsg);
+        if (ret != RET_OK) {
+            MMI_HILOGE("Start remote cooperate send session msg failed");
+            return RET_ERR;
+        }
+        return RET_OK;
+    } else {
+        MMI_HILOGE("Start remote cooperate error, not find this device.");
+        return RET_ERR;
+    }
+}
+
+int32_t DeviceCooperateSoftbusAdapter::StartRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess,
+    const std::string &startDhid, int32_t xPercent, int32_t yPercent)
+{
+    CALL_DEBUG_ENTER;
+    std::unique_lock<std::mutex> sessionLock(operationMutex_);
+    if (sessionDevMap_.count(remoteDeviceId) > 0) {
+        int32_t sessionId = sessionDevMap_[remoteDeviceId];
+        nlohmann::json jsonStr;
+        jsonStr[MMI_SOFTBUS_KEY_CMD_TYPE] = REMOTE_COOPERATE_START_RES;
+        jsonStr[MMI_SOFTBUS_KEY_RESULT] = isSuccess;
+        jsonStr[MMI_SOFTBUS_KEY_START_DHID] = startDhid;
+        jsonStr[MMI_SOFTBUS_KEY_POINTER_X] = xPercent;
+        jsonStr[MMI_SOFTBUS_KEY_POINTER_Y] = yPercent;
+        jsonStr[MMI_SOFTBUS_KEY_SESSION_ID] = sessionId;
+        std::string smsg = jsonStr.dump();
+        int32_t ret = SendMsg(sessionId, smsg);
+        if (ret != RET_OK) {
+            MMI_HILOGE("Start remote cooperate result send session msg failed");
+            return RET_ERR;
+        }
+        return RET_OK;
+    } else {
+        MMI_HILOGE("Start remote cooperate result error, not find this device.");
+        return RET_ERR;
+    }
+}
+
+int32_t DeviceCooperateSoftbusAdapter::StopRemoteCooperate(const std::string &remoteDeviceId)
+{
+    CALL_DEBUG_ENTER;
+    std::unique_lock<std::mutex> sessionLock(operationMutex_);
+    if (sessionDevMap_.count(remoteDeviceId) > 0) {
+        int32_t sessionId = sessionDevMap_[remoteDeviceId];
+        nlohmann::json jsonStr;
+        jsonStr[MMI_SOFTBUS_KEY_CMD_TYPE] = REMOTE_COOPERATE_STOP;
+        jsonStr[MMI_SOFTBUS_KEY_SESSION_ID] = sessionId;
+        std::string smsg = jsonStr.dump();
+        int32_t ret = SendMsg(sessionId, smsg);
+        if (ret != RET_OK) {
+            MMI_HILOGE("Stop remote cooperate send session msg failed");
+            return RET_ERR;
+        }
+        return RET_OK;
+    } else {
+        MMI_HILOGE("Stop remote cooperate error, not find this device.");
+        return RET_ERR;
+    }
+}
+
+int32_t DeviceCooperateSoftbusAdapter::StopRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess)
+{
+    CALL_DEBUG_ENTER;
+    std::unique_lock<std::mutex> sessionLock(operationMutex_);
+    if (sessionDevMap_.count(remoteDeviceId) > 0) {
+        int32_t sessionId = sessionDevMap_[remoteDeviceId];
+        nlohmann::json jsonStr;
+        jsonStr[MMI_SOFTBUS_KEY_CMD_TYPE] = REMOTE_COOPERATE_STOP_RES;
+        jsonStr[MMI_SOFTBUS_KEY_RESULT] = isSuccess;
+        jsonStr[MMI_SOFTBUS_KEY_SESSION_ID] = sessionId;
+        std::string smsg = jsonStr.dump();
+        int32_t ret = SendMsg(sessionId, smsg);
+        if (ret != RET_OK) {
+            MMI_HILOGE("Stop remote cooperate result send session msg failed");
+            return RET_ERR;
+        }
+        return RET_OK;
+    } else {
+        MMI_HILOGE("Stop remote cooperate result error, not find this device.");
+        return RET_ERR;
+    }
+}
+
+int32_t DeviceCooperateSoftbusAdapter::StartCooperateOtherResult(const std::string &remoteDeviceId,
+    const std::string &srcNetworkId)
+{
+    CALL_DEBUG_ENTER;
+    std::unique_lock<std::mutex> sessionLock(operationMutex_);
+    if (sessionDevMap_.count(remoteDeviceId) > 0) {
+        int32_t sessionId = sessionDevMap_[remoteDeviceId];
+        nlohmann::json jsonStr;
+        jsonStr[MMI_SOFTBUS_KEY_CMD_TYPE] = REMOTE_COOPERATE_STOP_OTHER_RES;
+        jsonStr[MMI_SOFTBUS_KEY_OTHER_DEVICE_ID] = srcNetworkId;
+        jsonStr[MMI_SOFTBUS_KEY_SESSION_ID] = sessionId;
+        std::string smsg = jsonStr.dump();
+        int32_t ret = SendMsg(sessionId, smsg);
+        if (ret != RET_OK) {
+            MMI_HILOGE("Start cooperate other result send session msg failed");
+            return RET_ERR;
+        }
+        return RET_OK;
+    } else {
+        MMI_HILOGE("Start cooperate other result error, not find this device.");
+        return RET_ERR;
+    }
+}
+
+void DeviceCooperateSoftbusAdapter::HandleSessionData(int32_t sessionId, const std::string& message)
+{
+    nlohmann::json recMsg = nlohmann::json::parse(message);
+    if (recMsg.is_discarded()) {
+        MMI_HILOGE("OnBytesReceived jsonStr error.");
+        return;
+    }
+
+    if (recMsg.contains(MMI_SOFTBUS_KEY_CMD_TYPE) != true) {
+        MMI_HILOGE("OnBytesReceived message:%{public}s is error, not contain cmdType.", message.c_str());
+        return;
+    }
+
+    if (recMsg[MMI_SOFTBUS_KEY_CMD_TYPE].is_number() != true) {
+        MMI_HILOGE("OnBytesReceived cmdType is not number type.");
+        return;
+    }
+
+    int cmdType = recMsg[MMI_SOFTBUS_KEY_CMD_TYPE];
+    switch (cmdType) {
+        case REMOTE_COOPERATE_START: {
+            NotifyResponseStartRemoteCooperate(sessionId, recMsg);
+            break;
+        }
+        case REMOTE_COOPERATE_START_RES: {
+            NotifyResponseStartRemoteCooperateResult(sessionId, recMsg);
+            break;
+        }
+        case REMOTE_COOPERATE_STOP: {
+            NotifyResponseStopRemoteCooperate(sessionId, recMsg);
+            break;
+        }
+        case REMOTE_COOPERATE_STOP_RES: {
+            NotifyResponseStopRemoteCooperateResult(sessionId, recMsg);
+            break;
+        }
+        case REMOTE_COOPERATE_STOP_OTHER_RES: {
+            NotifyResponseStartCooperateOtherResult(sessionId, recMsg);
+            break;
+        }
+        default: {
+            MMI_HILOGE("OnBytesReceived cmdType is undefined.");
+            break;
+        }
+    }
+}
+
+void DeviceCooperateSoftbusAdapter::OnBytesReceived(int32_t sessionId, const void *data, uint32_t dataLen)
+{
+    MMI_HILOGD("OnBytesReceived, sessionId:%{public}d, dataLen:%{public}d", sessionId, dataLen);
+    if (sessionId < 0 || data == nullptr || dataLen <= 0) {
+        MMI_HILOGE("OnBytesReceived param check failed");
+        return;
+    }
+
+    uint8_t *buf = (uint8_t *)calloc(dataLen + 1, sizeof(uint8_t));
+    if (buf == nullptr) {
+        MMI_HILOGE("OnBytesReceived: malloc memory failed");
+        return;
+    }
+
+    if (memcpy_s(buf, dataLen + 1, (const uint8_t *)data, dataLen) != RET_OK) {
+        MMI_HILOGE("OnBytesReceived: memcpy memory failed");
+        free(buf);
+        return;
+    }
+
+    std::string message(buf, buf + dataLen);
+    MMI_HILOGD("OnBytesReceived message:%{public}s.", message.c_str());
+    HandleSessionData(sessionId, message);
+
+    free(buf);
+    MMI_HILOGD("OnBytesReceived completed");
+    return;
+}
+
+// send message by sessionId (channel opened)
+int32_t DeviceCooperateSoftbusAdapter::SendMsg(int32_t sessionId, std::string &message)
+{
+    CALL_DEBUG_ENTER;
+    if (message.size() > MSG_MAX_SIZE) {
+        MMI_HILOGW("error: message.size() > MSG_MAX_SIZE");
+        return RET_ERR;
+    }
+    uint8_t *buf = (uint8_t *)calloc((MSG_MAX_SIZE), sizeof(uint8_t));
+    if (buf == nullptr) {
+        MMI_HILOGE("malloc memory failed");
+        return RET_ERR;
+    }
+    int32_t outLen = 0;
+    if (memcpy_s(buf, MSG_MAX_SIZE, (const uint8_t *)message.c_str(), message.size()) != RET_OK) {
+        MMI_HILOGE("memcpy memory failed");
+        free(buf);
+        return RET_ERR;
+    }
+    outLen = (int32_t)message.size();
+    int32_t ret = SendBytes(sessionId, buf, outLen);
+    free(buf);
+    return ret;
+}
+
+std::string DeviceCooperateSoftbusAdapter::FindDeviceBySession(int32_t sessionId)
+{
+    std::unique_lock<std::mutex> sessionLock(operationMutex_);
+    auto find_item = std::find_if(sessionDevMap_.begin(), sessionDevMap_.end(),
+        [sessionId](const std::map<std::string, int>::value_type item) {
+        return item.second == sessionId;
+    });
+
+    std::string devId = "";
+    if (find_item != sessionDevMap_.end()) {
+        devId = (*find_item).first;
+    } else {
+        MMI_HILOGE("findKeyByValue error.");
+    }
+    return devId;
+}
+
+int32_t DeviceCooperateSoftbusAdapter::OnSessionOpened(int32_t sessionId, int32_t result)
+{
+    CALL_INFO_TRACE;
+    char peerDevId[DEVICE_ID_SIZE_MAX] = "";
+    int32_t ret = GetPeerDeviceId(sessionId, peerDevId, sizeof(peerDevId));
+    if (result != RET_OK) {
+        std::string deviceId = FindDeviceBySession(sessionId);
+        MMI_HILOGE("Session open failed result: %{public}d", result);
+        std::unique_lock<std::mutex> sessionLock(operationMutex_);
+        if (sessionDevMap_.count(deviceId) > 0) {
+            sessionDevMap_.erase(deviceId);
+        }
+        channelStatusMap_[peerDevId] = true;
+        openSessionWaitCond_.notify_all();
+        return RET_OK;
+    }
+
+    int32_t sessionSide = GetSessionSide(sessionId);
+    MMI_HILOGI("session open succeed, sessionId:%{public}d, sessionSide:%{public}d(1 is client side)",
+        sessionId, sessionSide);
+    // 0 is server
+    if (sessionSide == SESSION_SIDE_SERVER){
+        if (ret == RET_OK) {
+            sessionDevMap_[peerDevId] = sessionId;
+        }
+    } else {
+        std::lock_guard<std::mutex> notifyLock(operationMutex_);
+        channelStatusMap_[peerDevId] = true;
+        openSessionWaitCond_.notify_all();
+    }
+    return RET_OK;
+}
+
+void DeviceCooperateSoftbusAdapter::OnSessionClosed(int32_t sessionId)
+{
+    CALL_DEBUG_ENTER;
+    std::string deviceId = FindDeviceBySession(sessionId);
+    std::unique_lock<std::mutex> sessionLock(operationMutex_);
+    if (sessionDevMap_.count(deviceId) > 0) {
+        sessionDevMap_.erase(deviceId);
+    }
+    // 0 is server
+    if (GetSessionSide(sessionId) != 0) {
+        channelStatusMap_.erase(deviceId);
+    }
+}
+
+void DeviceCooperateSoftbusAdapter::NotifyResponseStartRemoteCooperate(int32_t sessionId, const nlohmann::json &recMsg)
+{
+    CALL_DEBUG_ENTER;
+    if (!recMsg[MMI_SOFTBUS_KEY_LOCAL_DEVICE_ID].is_string()) {
+        MMI_HILOGE("OnBytesReceived cmdType is TRANS_SINK_MSG_ONPREPARE, data type is error.");
+        return;
+    }
+    InputDevCooSM->StartRemoteCooperate(recMsg[MMI_SOFTBUS_KEY_LOCAL_DEVICE_ID]);
+}
+
+void DeviceCooperateSoftbusAdapter::NotifyResponseStartRemoteCooperateResult(int32_t sessionId, const nlohmann::json &recMsg)
+{
+    CALL_DEBUG_ENTER;
+    if (!recMsg[MMI_SOFTBUS_KEY_RESULT].is_boolean() ||
+        !recMsg[MMI_SOFTBUS_KEY_START_DHID].is_string() ||
+        !recMsg[MMI_SOFTBUS_KEY_POINTER_X].is_number() ||
+        !recMsg[MMI_SOFTBUS_KEY_POINTER_Y].is_number()) {
+        MMI_HILOGE("OnBytesReceived cmdType is TRANS_SINK_MSG_ONPREPARE, data type is error.");
+        return;
+    }
+    bool result = recMsg[MMI_SOFTBUS_KEY_RESULT];
+    std::string dhid = recMsg[MMI_SOFTBUS_KEY_START_DHID];
+    int32_t x = recMsg[MMI_SOFTBUS_KEY_POINTER_X];
+    int32_t y = recMsg[MMI_SOFTBUS_KEY_POINTER_Y];
+    InputDevCooSM->StartRemoteCooperateResult(result, dhid, x, y);
+}
+
+void DeviceCooperateSoftbusAdapter::NotifyResponseStopRemoteCooperate(int32_t sessionId, const nlohmann::json &recMsg)
+{
+    InputDevCooSM->StopRemoteCooperate();
+}
+
+void DeviceCooperateSoftbusAdapter::NotifyResponseStopRemoteCooperateResult(int32_t sessionId, const nlohmann::json &recMsg)
+{
+    CALL_DEBUG_ENTER;
+    if (!recMsg[MMI_SOFTBUS_KEY_RESULT].is_boolean()) {
+        MMI_HILOGE("OnBytesReceived cmdType is TRANS_SINK_MSG_ONPREPARE, data type is error.");
+        return;
+    }
+    InputDevCooSM->StopRemoteCooperateResult(recMsg[MMI_SOFTBUS_KEY_RESULT]);
+}
+
+void DeviceCooperateSoftbusAdapter::NotifyResponseStartCooperateOtherResult(int32_t sessionId, const nlohmann::json &recMsg)
+{
+    CALL_DEBUG_ENTER;
+    if (!recMsg[MMI_SOFTBUS_KEY_OTHER_DEVICE_ID].is_string()) {
+        MMI_HILOGE("OnBytesReceived cmdType is TRANS_SINK_MSG_ONPREPARE, data type is error.");
+        return;
+    }
+    InputDevCooSM->StartCooperateOtherResult(recMsg[MMI_SOFTBUS_KEY_OTHER_DEVICE_ID]);
+}
+} // namespace MMI
+} // namespace OHOS
diff --git a/service/input_device_cooperate/src/device_profile_adapter.cpp b/service/input_device_cooperate/src/device_profile_adapter.cpp
index 543e214b0d..41a9434ec2 100755
--- a/service/input_device_cooperate/src/device_profile_adapter.cpp
+++ b/service/input_device_cooperate/src/device_profile_adapter.cpp
@@ -22,8 +22,6 @@
 
 #include "distributed_device_profile_client.h"
 #include "service_characteristic_profile.h"
-#include "softbus_bus_center.h"
-#include "softbus_common.h"
 #include "sync_options.h"
 
 namespace OHOS {
@@ -56,7 +54,7 @@ int32_t DeviceProfileAdapter::UpdateCrossingSwitchState(bool state, const std::v
 
     int32_t ret = DistributedDeviceProfileClient::GetInstance().PutDeviceProfile(profile);
     if (ret != 0) {
-        MMI_HILOGE("Put device profile failed");
+        MMI_HILOGE("Put device profile failed, ret:%{public}d", ret);
         return ret;
     }
     SyncOptions syncOptions;
@@ -198,4 +196,4 @@ void DeviceProfileAdapter::ProfileEventCallbackImpl::OnSyncCompleted(const Devic
     });
 }
 } // namespace MMI
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/service/input_device_cooperate/src/distributed_input_adapter.cpp b/service/input_device_cooperate/src/distributed_input_adapter.cpp
index 798393c47f..fa0afed2d0 100755
--- a/service/input_device_cooperate/src/distributed_input_adapter.cpp
+++ b/service/input_device_cooperate/src/distributed_input_adapter.cpp
@@ -32,16 +32,16 @@ constexpr int32_t RETRY_TIME = 2;
 } // namespace
 DistributedInputAdapter::DistributedInputAdapter()
 {
-    mouseListener_ = new (std::nothrow) MouseStateChangeCallbackImpl();
-    CHKPL(mouseListener_);
-    DistributedInputKit::RegisterSimulationEventListener(mouseListener_);
+    simulationEventListener_ = new (std::nothrow) SimulateEventCallbackImpl();
+    CHKPL(simulationEventListener_);
+    DistributedInputKit::RegisterSimulationEventListener(simulationEventListener_);
 }
 
 DistributedInputAdapter::~DistributedInputAdapter()
 {
     std::lock_guard<std::mutex> guard(adapterLock_);
-    DistributedInputKit::UnregisterSimulationEventListener(mouseListener_);
-    mouseListener_ = nullptr;
+    DistributedInputKit::UnregisterSimulationEventListener(simulationEventListener_);
+    simulationEventListener_ = nullptr;
     callbackMap_.clear();
 }
 
@@ -50,12 +50,6 @@ bool DistributedInputAdapter::IsNeedFilterOut(const std::string &deviceId, const
     return DistributedInputKit::IsNeedFilterOut(deviceId, event);
 }
 
-bool DistributedInputAdapter::IsTouchEventNeedFilterOut(uint32_t absX, uint32_t absY)
-{
-    TouchScreenEvent touchScreenEvent{ absX, absY };
-    return DistributedInputKit::IsTouchEventNeedFilterOut(touchScreenEvent);
-}
-
 int32_t DistributedInputAdapter::StartRemoteInput(const std::string &deviceId, const std::vector<std::string> &dhIds,
                                                   DInputCallback callback)
 {
@@ -77,9 +71,9 @@ int32_t DistributedInputAdapter::StartRemoteInput(const std::string &srcId, cons
 int32_t DistributedInputAdapter::StartRemoteInput(const std::string &srcId, const std::string &sinkId,
                                                   const std::vector<std::string> &dhIds, DInputCallback callback)
 {
-    sptr<IStartStopDInputsCallback> cb = new (std::nothrow) StartDInputCallbackFds();
+    sptr<IStartStopDInputsCallback> cb = new (std::nothrow) StartDInputCallbackSink();
     CHKPR(cb, ERROR_NULL_POINTER);
-    SaveCallback(CallbackType::StartDInputCallbackFds, callback);
+    SaveCallback(CallbackType::StartDInputCallbackSink, callback);
     return DistributedInputKit::StartRemoteInput(srcId, sinkId, dhIds, cb);
 }
 
@@ -104,9 +98,9 @@ int32_t DistributedInputAdapter::StopRemoteInput(const std::string &srcId, const
 int32_t DistributedInputAdapter::StopRemoteInput(const std::string &srcId, const std::string &sinkId,
                                                  const std::vector<std::string> &dhIds, DInputCallback callback)
 {
-    sptr<IStartStopDInputsCallback> cb = new (std::nothrow) StopDInputCallbackFds();
+    sptr<IStartStopDInputsCallback> cb = new (std::nothrow) StopDInputCallbackSink();
     CHKPR(cb, ERROR_NULL_POINTER);
-    SaveCallback(CallbackType::StopDInputCallbackFds, callback);
+    SaveCallback(CallbackType::StopDInputCallbackSink, callback);
     return DistributedInputKit::StopRemoteInput(srcId, sinkId, dhIds, cb);
 }
 
@@ -144,18 +138,18 @@ int32_t DistributedInputAdapter::UnPrepareRemoteInput(const std::string &deviceI
     return DistributedInputKit::UnprepareRemoteInput(deviceId, cb);
 }
 
-int32_t DistributedInputAdapter::RegisterEventCallback(MouseStateChangeCallback callback)
+int32_t DistributedInputAdapter::RegisterEventCallback(SimulateEventCallback callback)
 {
     std::lock_guard<std::mutex> guard(adapterLock_);
     CHKPR(callback, RET_ERR);
-    mouseStateChangeCallback_ = callback;
+    SimulateEventCallback_ = callback;
     return RET_OK;
 }
-int32_t DistributedInputAdapter::UnregisterEventCallback(MouseStateChangeCallback callback)
+int32_t DistributedInputAdapter::UnregisterEventCallback(SimulateEventCallback callback)
 {
     std::lock_guard<std::mutex> guard(adapterLock_);
     CHKPR(callback, RET_ERR);
-    mouseStateChangeCallback_ = nullptr;
+    SimulateEventCallback_ = nullptr;
     return RET_OK;
 }
 
@@ -217,8 +211,8 @@ void DistributedInputAdapter::ProcessDInputCallback(CallbackType type, int32_t s
 void DistributedInputAdapter::OnSimulationEvent(uint32_t type, uint32_t code, int32_t value)
 {
     std::lock_guard<std::mutex> guard(adapterLock_);
-    CHKPV(mouseStateChangeCallback_);
-    mouseStateChangeCallback_(type, code, value);
+    CHKPV(SimulateEventCallback_);
+    SimulateEventCallback_(type, code, value);
 }
 
 void DistributedInputAdapter::StartDInputCallback::OnResult(const std::string &devId, const uint32_t &inputTypes,
@@ -243,14 +237,14 @@ void DistributedInputAdapter::StopDInputCallbackDHIds::OnResultDhids(const std::
     DistributedAdapter->ProcessDInputCallback(CallbackType::StopDInputCallbackDHIds, status);
 }
 
-void DistributedInputAdapter::StartDInputCallbackFds::OnResultDhids(const std::string &devId, const int32_t &status)
+void DistributedInputAdapter::StartDInputCallbackSink::OnResultDhids(const std::string &devId, const int32_t &status)
 {
-    DistributedAdapter->ProcessDInputCallback(CallbackType::StartDInputCallbackFds, status);
+    DistributedAdapter->ProcessDInputCallback(CallbackType::StartDInputCallbackSink, status);
 }
 
-void DistributedInputAdapter::StopDInputCallbackFds::OnResultDhids(const std::string &devId, const int32_t &status)
+void DistributedInputAdapter::StopDInputCallbackSink::OnResultDhids(const std::string &devId, const int32_t &status)
 {
-    DistributedAdapter->ProcessDInputCallback(CallbackType::StopDInputCallbackFds, status);
+    DistributedAdapter->ProcessDInputCallback(CallbackType::StopDInputCallbackSink, status);
 }
 
 void DistributedInputAdapter::PrepareStartDInputCallback::OnResult(const std::string &devId, const int32_t &status)
@@ -273,7 +267,7 @@ void DistributedInputAdapter::UnPrepareStopDInputCallbackSink::OnResult(const st
     DistributedAdapter->ProcessDInputCallback(CallbackType::UnPrepareStopDInputCallbackSink, status);
 }
 
-int32_t DistributedInputAdapter::MouseStateChangeCallbackImpl::OnSimulationEvent(uint32_t type, uint32_t code,
+int32_t DistributedInputAdapter::SimulateEventCallbackImpl::OnSimulationEvent(uint32_t type, uint32_t code,
     int32_t value)
 {
     DistributedAdapter->OnSimulationEvent(type, code, value);
diff --git a/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp b/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp
index e0794cad05..80271fc8f5 100755
--- a/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp
+++ b/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp
@@ -47,7 +47,7 @@ int32_t IInputDeviceCooperateState::PrepareAndStart(const std::string &srcNetwor
                 this->OnPrepareDistributedInput(isSuccess, srcNetworkId, startInputDeviceId);
             });
         if (ret != RET_OK) {
-            MMI_HILOGE("Prepare remoteNetworkId input fail");
+            MMI_HILOGE("Prepare remote input fail");
             InputDevCooSM->OnStartFinish(false, sinkNetworkId, startInputDeviceId);
             InputDevCooSM->UpdatePreparedDevices("", "");
         }
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index d477827553..87d6cfd627 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -16,21 +16,22 @@
 
 #include <cstdio>
 
+#include "device_manager.h"
 #include "hitrace_meter.h"
 
 #include "bytrace_adapter.h"
 #include "cooperate_event_manager.h"
 #include "cooperation_message.h"
+#include "device_cooperate_softbus_adapter.h"
 #include "define_multimodal.h"
-#include "device_manager.h"
 #include "device_profile_adapter.h"
 #include "i_pointer_drawing_manager.h"
 #include "input_device_cooperate_state_free.h"
 #include "input_device_cooperate_state_in.h"
 #include "input_device_cooperate_state_out.h"
+#include "input_device_cooperate_util.h"
 #include "input_device_manager.h"
 #include "mouse_event_normalize.h"
-#include "multimodal_input_connect_remoter.h"
 #include "timer_manager.h"
 #include "util_ex.h"
 
@@ -38,7 +39,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateSM"};
-const std::string BUNDLE_NAME = "ohos.multimodalinput.input";
 constexpr int32_t INTERVAL_MS = 2000;
 constexpr int32_t MOUSE_ABS_LOCATION = 100;
 constexpr int32_t MOUSE_ABS_LOCATION_X = 50;
@@ -77,6 +77,8 @@ void InputDeviceCooperateSM::Reset(bool adjustAbsolutionLocation)
 void InputDeviceCooperateSM::OnCooperateChanged(const std::string &networkId, bool isOpen)
 {
     CALL_DEBUG_ENTER;
+    CooperationMessage msg = isOpen ? CooperationMessage::STATE_ON : CooperationMessage::STATE_OFF;
+    CooperateEventMgr->OnCooperateMessage(msg, networkId);
     if (!isOpen) {
         OnCloseCooperation(networkId, false);
     }
@@ -88,6 +90,7 @@ void InputDeviceCooperateSM::OnCloseCooperation(const std::string &networkId, bo
     std::lock_guard<std::mutex> guard(mutex_);
     if (!preparedNetworkId_.first.empty() && !preparedNetworkId_.second.empty()) {
         if (networkId == preparedNetworkId_.first || networkId == preparedNetworkId_.second) {
+            DevCooperateSoftbusAdapter->CloseInputSoftbus(networkId);
             DistributedAdapter->UnPrepareRemoteInput(preparedNetworkId_.first, preparedNetworkId_.second,
                 [](bool isSuccess) {});
         }
@@ -118,12 +121,13 @@ void InputDeviceCooperateSM::EnableInputDeviceCooperate(bool enabled)
     CALL_INFO_TRACE;
     if (enabled) {
         BytraceAdapter::StartBytrace(BytraceAdapter::TRACE_START, BytraceAdapter::START_EVENT);
+        DevCooperateSoftbusAdapter->Init();
         DProfileAdapter->UpdateCrossingSwitchState(enabled, onlineDevice_);
         BytraceAdapter::StartBytrace(BytraceAdapter::TRACE_STOP, BytraceAdapter::START_EVENT);
     } else {
         DProfileAdapter->UpdateCrossingSwitchState(enabled, onlineDevice_);
         std::string localNetworkId;
-        InputDevMgr->GetLocalDeviceId(localNetworkId);
+        GetLocalDeviceId(localNetworkId);
         OnCloseCooperation(localNetworkId, true);
     }
 }
@@ -140,6 +144,7 @@ int32_t InputDeviceCooperateSM::StartInputDeviceCooperate(
     CHKPR(currentStateSM_, ERROR_NULL_POINTER);
     BytraceAdapter::StartBytrace(BytraceAdapter::TRACE_START, BytraceAdapter::LAUNCH_EVENT);
     isStarting_ = true;
+    DevCooperateSoftbusAdapter->OpenInputSoftbus(remoteNetworkId);
     int32_t ret = currentStateSM_->StartInputDeviceCooperate(remoteNetworkId, startInputDeviceId);
     if (ret != RET_OK) {
         MMI_HILOGE("Start remote input fail");
@@ -220,7 +225,6 @@ void InputDeviceCooperateSM::StartRemoteCooperateResult(bool isSuccess,
 void InputDeviceCooperateSM::StopRemoteCooperate()
 {
     CALL_INFO_TRACE;
-    CooperateEventMgr->OnCooperateMessage(CooperationMessage::STOP);
     std::lock_guard<std::mutex> guard(mutex_);
     isStopping_ = true;
 }
@@ -233,9 +237,6 @@ void InputDeviceCooperateSM::StopRemoteCooperateResult(bool isSuccess)
         MMI_HILOGI("Not in stopping");
         return;
     }
-    CooperationMessage msg =
-        isSuccess ? CooperationMessage::STOP_SUCCESS : CooperationMessage::STOP_FAIL;
-    CooperateEventMgr->OnCooperateMessage(msg);
     if (isSuccess) {
         Reset(true);
     }
@@ -271,7 +272,7 @@ void InputDeviceCooperateSM::OnStartFinish(bool isSuccess,
         } else if (cooperateState_ == CooperateState::STATE_IN) {
             std::string sink = InputDevMgr->GetOriginNetworkId(startInputDeviceId);
             if (!sink.empty() && remoteNetworkId != sink) {
-                RemoteMgr->StartCooperateOtherResult(sink, remoteNetworkId);
+                DevCooperateSoftbusAdapter->StartCooperateOtherResult(sink, remoteNetworkId);
             }
             UpdateState(CooperateState::STATE_FREE);
         } else {
@@ -307,14 +308,14 @@ void InputDeviceCooperateSM::OnStopFinish(bool isSuccess, const std::string &rem
 void InputDeviceCooperateSM::NotifyRemoteStartFail(const std::string &remoteNetworkId)
 {
     CALL_DEBUG_ENTER;
-    RemoteMgr->StartRemoteCooperateResult(remoteNetworkId, false, "",  0, 0);
+    DevCooperateSoftbusAdapter->StartRemoteCooperateResult(remoteNetworkId, false, "",  0, 0);
     CooperateEventMgr->OnStart(CooperationMessage::INFO_FAIL);
 }
 
 void InputDeviceCooperateSM::NotifyRemoteStartSucess(const std::string &remoteNetworkId, const std::string& startDhid)
 {
     CALL_DEBUG_ENTER;
-    RemoteMgr->StartRemoteCooperateResult(remoteNetworkId,
+    DevCooperateSoftbusAdapter->StartRemoteCooperateResult(remoteNetworkId,
         true, startDhid, mouseLocation_.first, mouseLocation_.second);
     CooperateEventMgr->OnStart(CooperationMessage::INFO_SUCCESS);
 }
@@ -322,7 +323,7 @@ void InputDeviceCooperateSM::NotifyRemoteStartSucess(const std::string &remoteNe
 void InputDeviceCooperateSM::NotifyRemoteStopFinish(bool isSuccess, const std::string &remoteNetworkId)
 {
     CALL_DEBUG_ENTER;
-    RemoteMgr->StopRemoteCooperateResult(remoteNetworkId, isSuccess);
+    DevCooperateSoftbusAdapter->StopRemoteCooperateResult(remoteNetworkId, isSuccess);
     if (!isSuccess) {
         CooperateEventMgr->OnStop(CooperationMessage::STOP_FAIL);
     } else {
@@ -512,35 +513,20 @@ void InputDeviceCooperateSM::CheckPointerEvent(struct libinput_event *event)
     inputEventNormalizeHandler->HandleEvent(event);
 }
 
-bool InputDeviceCooperateSM::CheckTouchEvent(struct libinput_event* event)
-{
-    CALL_INFO_TRACE;
-    CHKPF(event);
-    auto device = libinput_event_get_device(event);
-    int32_t deviceId = InputDevMgr->FindInputDeviceId(device);
-    std::string dhid = InputDevMgr->GetDhid(deviceId);
-    auto touchEvent = libinput_event_get_touch_event(event);
-    CHKPF(touchEvent);
-    uint32_t absX = static_cast<uint32_t>(libinput_event_touch_get_x(touchEvent));
-    uint32_t absY = static_cast<uint32_t>(libinput_event_touch_get_y(touchEvent));
-    MMI_HILOGI("Check touch event absX:%{public}d, absY:%{public}d", absX, absY);
-    return DistributedAdapter->IsTouchEventNeedFilterOut(absX, absY);
-}
-
 bool InputDeviceCooperateSM::InitDeviceManager()
 {
     CALL_DEBUG_ENTER;
     initCallback_ = std::make_shared<DeviceInitCallBack>();
     CHKPR(initCallback_, false);
     int32_t ret =
-        DistributedHardware::DeviceManager::GetInstance().InitDeviceManager(BUNDLE_NAME, initCallback_);
+        DistributedHardware::DeviceManager::GetInstance().InitDeviceManager(MMI_DSOFTBUS_PKG_NAME, initCallback_);
     if (ret != 0) {
         MMI_HILOGE("Init device manager failed, ret:%{public}d", ret);
         return false;
     }
     stateCallback_ = std::make_shared<MmiDeviceStateCallback>();
     ret =
-        DistributedHardware::DeviceManager::GetInstance().RegisterDevStateCallback(BUNDLE_NAME, "", stateCallback_);
+        DistributedHardware::DeviceManager::GetInstance().RegisterDevStateCallback(MMI_DSOFTBUS_PKG_NAME, "", stateCallback_);
     if (ret != 0) {
         MMI_HILOGE("Register devStateCallback failed, ret:%{public}d", ret);
         return false;
diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp
index 350554dca1..86053560da 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp
@@ -15,10 +15,9 @@
 
 #include "input_device_cooperate_state_free.h"
 
+#include "device_cooperate_softbus_adapter.h"
 #include "input_device_cooperate_sm.h"
-#include "input_device_manager.h"
-#include "mouse_event_normalize.h"
-#include "multimodal_input_connect_remoter.h"
+#include "input_device_cooperate_util.h"
 
 namespace OHOS {
 namespace MMI {
@@ -35,12 +34,12 @@ int32_t InputDeviceCooperateStateFree::StartInputDeviceCooperate(
         return RET_ERR;
     }
     std::string localNetworkId;
-    InputDevMgr->GetLocalDeviceId(localNetworkId);
+    GetLocalDeviceId(localNetworkId);
     if (localNetworkId.empty() || remoteNetworkId == localNetworkId) {
         MMI_HILOGE("Input Parameters error");
         return RET_ERR;
     }
-    int32_t ret = RemoteMgr->StartRemoteCooperate(localNetworkId, remoteNetworkId);
+    int32_t ret = DevCooperateSoftbusAdapter->StartRemoteCooperate(localNetworkId, remoteNetworkId);
     if (ret != RET_OK) {
         MMI_HILOGE("Start input device cooperate fail");
         return ret;
diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp
index 5bec864a50..57fc03c342 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp
@@ -16,11 +16,12 @@
 #include "input_device_cooperate_state_in.h"
 
 #include "cooperation_message.h"
+#include "device_cooperate_softbus_adapter.h"
 #include "distributed_input_adapter.h"
 #include "input_device_cooperate_sm.h"
+#include "input_device_cooperate_util.h"
 #include "input_device_manager.h"
 #include "mouse_event_normalize.h"
-#include "multimodal_input_connect_remoter.h"
 
 namespace OHOS {
 namespace MMI {
@@ -39,12 +40,12 @@ int32_t InputDeviceCooperateStateIn::StartInputDeviceCooperate(const std::string
         return RET_ERR;
     }
     std::string localNetworkId;
-    InputDevMgr->GetLocalDeviceId(localNetworkId);
+    GetLocalDeviceId(localNetworkId);
     if (localNetworkId.empty() || remoteNetworkId == localNetworkId) {
         MMI_HILOGE("Input Parameters error");
         return RET_ERR;
     }
-    int32_t ret = RemoteMgr->StartRemoteCooperate(localNetworkId, remoteNetworkId);
+    int32_t ret = DevCooperateSoftbusAdapter->StartRemoteCooperate(localNetworkId, remoteNetworkId);
     if (ret != RET_OK) {
         MMI_HILOGE("Start input device cooperate fail");
         return ret;
@@ -72,7 +73,7 @@ int32_t InputDeviceCooperateStateIn::ProcessStart(const std::string &remoteNetwo
 int32_t InputDeviceCooperateStateIn::StopInputDeviceCooperate(const std::string &networkId)
 {
     CALL_DEBUG_ENTER;
-    int32_t ret = RemoteMgr->StopRemoteCooperate(networkId);
+    int32_t ret = DevCooperateSoftbusAdapter->StopRemoteCooperate(networkId);
     if (ret != RET_OK) {
         MMI_HILOGE("Stop input device cooperate fail");
         return ret;
diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
index 5e823f63c0..37eb50cb77 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
@@ -16,11 +16,11 @@
 #include "input_device_cooperate_state_out.h"
 
 #include "cooperation_message.h"
+#include "device_cooperate_softbus_adapter.h"
 #include "distributed_input_adapter.h"
 #include "input_device_cooperate_sm.h"
+#include "input_device_cooperate_util.h"
 #include "input_device_manager.h"
-#include "mouse_event_normalize.h"
-#include "multimodal_input_connect_remoter.h"
 
 namespace OHOS {
 namespace MMI {
@@ -41,7 +41,7 @@ int32_t InputDeviceCooperateStateOut::StopInputDeviceCooperate(const std::string
         std::pair<std::string, std::string> prepared = InputDevCooSM->GetPreparedDevices();
         srcNetworkId = prepared.first;
     }
-    int32_t ret = RemoteMgr->StopRemoteCooperate(networkId);
+    int32_t ret = DevCooperateSoftbusAdapter->StopRemoteCooperate(networkId);
     if (ret != RET_OK) {
         MMI_HILOGE("Stop input device cooperate fail");
         return ret;
@@ -58,7 +58,8 @@ int32_t InputDeviceCooperateStateOut::StopInputDeviceCooperate(const std::string
 void InputDeviceCooperateStateOut::ProcessStop(const std::string& srcNetworkId)
 {
     CALL_DEBUG_ENTER;
-    std::string sink = InputDevMgr->GetOriginNetworkId(startDhid_);
+    std::string sink;
+    GetLocalDeviceId(sink);
     std::vector<std::string>  dhids = InputDevMgr->GetCooperateDhids(startDhid_);
     int32_t ret = DistributedAdapter->StopRemoteInput(srcNetworkId, sink, dhids, [this, srcNetworkId](bool isSuccess) {
         this->OnStopRemoteInput(isSuccess, srcNetworkId);
diff --git a/service/input_device_cooperate/src/input_device_cooperate_util.cpp b/service/input_device_cooperate/src/input_device_cooperate_util.cpp
new file mode 100644
index 0000000000..fca65d9625
--- /dev/null
+++ b/service/input_device_cooperate/src/input_device_cooperate_util.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "input_device_cooperate_util.h"
+
+#include "softbus_bus_center.h"
+
+#include "config_multimodal.h"
+#include "define_multimodal.h"
+namespace OHOS {
+namespace MMI {
+namespace {
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateUtil"};
+} // namespace
+void GetLocalDeviceId(std::string &local)
+{
+    local = "";
+    auto localNode = std::make_unique<NodeBasicInfo>();
+    CHKPV(localNode);
+    int32_t errCode = GetLocalNodeDeviceInfo(MMI_DSOFTBUS_PKG_NAME, localNode.get());
+    if (errCode != RET_OK) {
+        MMI_HILOGE("GetLocalNodeDeviceInfo errCode: %{public}d", errCode);
+        return;
+    }
+    local = localNode->networkId;
+}
+} // namespace MMI
+} // namespace OHOS
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index 701a6c12dd..cebe3043d3 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -80,12 +80,6 @@ public:
     virtual int32_t StopDeviceCooperate(int32_t userData) override;
     virtual int32_t GetInputDeviceCooperateState(int32_t userData, const std::string &deviceId) override;
     virtual int32_t SetInputDevice(const std::string& dhid, const std::string& screenId) override;
-    virtual int32_t StartRemoteCooperate(const std::string& localDeviceId) override;
-    virtual int32_t StartRemoteCooperateResult(bool isSuccess, const std::string& startDhid,
-        int32_t xPercent, int32_t yPercent) override;
-    virtual int32_t StopRemoteCooperate() override;
-    virtual int32_t StopRemoteCooperateResult(bool isSuccess) override;
-    virtual int32_t StartCooperateOtherResult(const std::string& srcNetworkId) override;
     virtual int32_t GetFunctionKeyState(int32_t funcKey, bool &state) override;
     virtual int32_t SetFunctionKeyState(int32_t funcKey, bool enable) override;
 
@@ -130,12 +124,6 @@ protected:
         int32_t srcInputDeviceId);
     int32_t OnStopDeviceCooperate(int32_t pid, int32_t userData);
     int32_t OnGetInputDeviceCooperateState(int32_t pid, int32_t userData, const std::string &deviceId);
-    int32_t OnStartRemoteCooperate(const std::string& remoteDeviceId);
-    int32_t OnStartRemoteCooperateResult(bool isSuccess,
-        const std::string& startDhid, int32_t xPercent, int32_t yPercent);
-    int32_t OnStopRemoteCooperate();
-    int32_t OnStopRemoteCooperateResult(bool isSuccess);
-    int32_t OnStartCooperateOtherResult(const std::string& srcNetworkId);
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     bool InitLibinputService();
     bool InitService();
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 44f627af6d..ac6009c8ae 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -1269,119 +1269,5 @@ int32_t MMIService::OnGetInputDeviceCooperateState(int32_t pid, int32_t userData
     return RET_OK;
 }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-
-int32_t MMIService::StartRemoteCooperate(const std::string& remoteDeviceId)
-{
-    CALL_DEBUG_ENTER;
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
-    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MMIService::OnStartRemoteCooperate,
-        this, remoteDeviceId));
-    if (ret != RET_OK) {
-        MMI_HILOGE("Start remote cooperate failed,return %{public}d", ret);
-        return ret;
-    }
-#endif // OHOS_BUILD_ENABLE_COOPERATE
-    return RET_OK;
-}
-
-int32_t MMIService::StartRemoteCooperateResult(bool isSuccess,
-    const std::string& startDhid, int32_t xPercent, int32_t yPercent)
-{
-    CALL_DEBUG_ENTER;
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
-    MMI_HILOGI("StartRemoteCooperateResult:[%{public}d]", isSuccess);
-    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MMIService::OnStartRemoteCooperateResult,
-        this, isSuccess, startDhid, xPercent, yPercent));
-    if (ret != RET_OK) {
-        MMI_HILOGE("Start remote cooperate res failed,return %{public}d", ret);
-        return ret;
-    }
-#else
-    (void)(isSuccess);
-    (void)(xPercent);
-    (void)(yPercent);
-#endif // OHOS_BUILD_ENABLE_COOPERATE
-    return RET_OK;
-}
-
-int32_t MMIService::StopRemoteCooperate()
-{
-    CALL_DEBUG_ENTER;
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
-    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MMIService::OnStopRemoteCooperate, this));
-    if (ret != RET_OK) {
-        MMI_HILOGE("Stop remote cooperate failed,return %{public}d", ret);
-        return ret;
-    }
-#endif // OHOS_BUILD_ENABLE_COOPERATE
-    return RET_OK;
-}
-
-int32_t MMIService::StopRemoteCooperateResult(bool isSuccess)
-{
-    CALL_DEBUG_ENTER;
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
-    MMI_HILOGI("Enter MMI StopRemoteCooperateResult [%{public}d]", isSuccess);
-    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MMIService::OnStopRemoteCooperateResult,
-        this, isSuccess));
-    if (ret != RET_OK) {
-        MMI_HILOGE("Stop remote cooperate res failed,return %{public}d", ret);
-        return ret;
-    }
-#else
-    (void)(isSuccess);
-#endif // OHOS_BUILD_ENABLE_COOPERATE
-    return RET_OK;
-}
-
-int32_t MMIService::StartCooperateOtherResult(const std::string& srcNetworkId)
-{
-    CALL_DEBUG_ENTER;
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
-    MMI_HILOGI("Enter MMI StartCooperateOtherResult [%{public}s]", srcNetworkId.c_str());
-    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MMIService::OnStartCooperateOtherResult,
-        this, srcNetworkId));
-    if (ret != RET_OK) {
-        MMI_HILOGE("Start remote other res failed,return %{public}d", ret);
-        return ret;
-    }
-#else
-    (void)(srcNetworkId);
-#endif // OHOS_BUILD_ENABLE_COOPERATE
-    return RET_OK;
-}
-
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
-int32_t MMIService::OnStartRemoteCooperate(const std::string& remoteDeviceId)
-{
-    InputDevCooSM->StartRemoteCooperate(remoteDeviceId);
-    return RET_OK;
-}
-
-int32_t MMIService::OnStartRemoteCooperateResult(bool isSuccess,
-    const std::string& startDhid, int32_t xPercent, int32_t yPercent)
-{
-    InputDevCooSM->StartRemoteCooperateResult(isSuccess, startDhid, xPercent, yPercent);
-    return RET_OK;
-}
-
-int32_t MMIService::OnStopRemoteCooperate()
-{
-    InputDevCooSM->StopRemoteCooperate();
-    return RET_OK;
-}
-
-int32_t MMIService::OnStopRemoteCooperateResult(bool isSuccess)
-{
-    InputDevCooSM->StopRemoteCooperateResult(isSuccess);
-    return RET_OK;
-}
-
-int32_t MMIService::OnStartCooperateOtherResult(const std::string& srcNetworkId)
-{
-    InputDevCooSM->StartCooperateOtherResult(srcNetworkId);
-    return RET_OK;
-}
-#endif // OHOS_BUILD_ENABLE_COOPERATE
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index f1f1932285..c483ef73c0 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -450,7 +450,7 @@ void MouseEventNormalize::SetDxDyForDInput(PointerEvent::PointerItem& pointerIte
 
 void MouseEventNormalize::SetAbsolutionLocation(double xPercent, double yPercent)
 {
-    MMI_HILOGI("MouseEventNormalize cross screen location : xPercent:%{public}d, yPercent:%{public}d",
+    MMI_HILOGI("Cross screen location : xPercent:%{public}f, yPercent:%{public}f",
         xPercent, yPercent);
     auto displayGroupInfo = WinMgr->GetDisplayGroupInfo();
     if (currentDisplayId_ == -1) {
diff --git a/util/common/include/config_multimodal.h b/util/common/include/config_multimodal.h
index cb6137ec1d..4fb17fa352 100644
--- a/util/common/include/config_multimodal.h
+++ b/util/common/include/config_multimodal.h
@@ -57,6 +57,7 @@ namespace MMI {
 #define ONCE_PROCESS_NETPACKET_LIMIT 100
 #define MAX_RECV_LIMIT 32
 #define INPUT_POINTER_DEVICE "input.pointer.device"
+#define MMI_DSOFTBUS_PKG_NAME "ohos.mmi"
 } // namespace MMI
 } // namespace OHOS
 #endif // CONFIG_MULTIMODAL_H
-- 
Gitee


From 1fec37dfbf3ac35834700524708bf588497a63fc Mon Sep 17 00:00:00 2001
From: fuchao33 <fuchao33@huawei.com>
Date: Wed, 21 Sep 2022 15:18:56 +0800
Subject: [PATCH 033/360] =?UTF-8?q?Description:=20=E6=8C=87=E6=91=98?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=20Sig:=20SIG=5FBscSoftSrv=20Feature=20or=20B?=
 =?UTF-8?q?ugfix:=20Feature=20Binary=20Source:=20No=20Signed-off-by:=20<zh?=
 =?UTF-8?q?enying.wu@thundersoft.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/js_event_target.cpp                   |   3 +-
 service/BUILD.gn                              |   1 -
 .../src/input_device_manager.cpp              |   2 +-
 .../device_cooperate_softbus_adapter.h        |  12 +-
 ...ne.h => device_cooperate_softbus_define.h} |   1 -
 .../src/device_cooperate_softbus_adapter.cpp  | 302 ++++++++----------
 .../src/device_profile_adapter.cpp            |  43 ++-
 7 files changed, 178 insertions(+), 186 deletions(-)
 rename service/input_device_cooperate/include/{mmi_softbus_define.h => device_cooperate_softbus_define.h} (97%)

diff --git a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
index 2ab9122e73..9707ac2d72 100755
--- a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
@@ -515,9 +515,8 @@ void JsEventTarget::CallGetStateAsyncWork(uv_work_t *work, int32_t status)
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
     napi_value resultObj[2] = {0};
-    napi_get_undefined(cb->env, &resultObj[0]);
+    CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &resultObj[0]), GET_UNDEFINED, scope);
     resultObj[1] = JsUtil::GetStateInfo(cb);
-    CHKPV(resultObj[0]);
     if (resultObj[1] == nullptr) {
         MMI_HILOGE("object is nullptr");
         napi_close_handle_scope(cb->env, scope);
diff --git a/service/BUILD.gn b/service/BUILD.gn
index 8a97f186b4..0881b77a32 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -560,7 +560,6 @@ ohos_shared_library("libmmi-server") {
     "//foundation/multimodalinput/input/service/filter:mmi_event_filter_proxy",
     "//foundation/multimodalinput/input/util:libmmi-util",
     "//third_party/cJSON:cjson_static",
-    "//third_party/json:nlohmann_json_static",
   ]
 
   if (input_feature_libinput || input_feature_hdf) {
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index b141dbb5e4..a807f732aa 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -678,7 +678,7 @@ std::string InputDeviceManager::GenerateDescriptor(struct libinput_device *input
         rawDescriptor += "uniqueId:" + std::string(uniqueId);
     }
     if (physicalPath != nullptr) {
-        rawDescriptor += "location:" + std::string(physicalPath);
+        rawDescriptor += "physicalPath:" + std::string(physicalPath);
     }
     if (name != nullptr && name[0] != '\0') {
         rawDescriptor += "name:" + regex_replace(name, std::regex(" "), "");
diff --git a/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h b/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
index 6a8d834364..fb6bea9142 100755
--- a/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
+++ b/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
@@ -20,7 +20,6 @@
 #include <memory>
 #include <string>
 
-#include "nlohmann/json.hpp"
 #include "nocopyable.h"
 #include "session.h"
 
@@ -51,21 +50,14 @@ public:
 private:
     DeviceCooperateSoftbusAdapter() = default;
     DISALLOW_COPY_AND_MOVE(DeviceCooperateSoftbusAdapter);
-    std::string FindDeviceBySession(int32_t sessionId);
+    std::string FindDevice(int32_t sessionId);
     int32_t SendMsg(int32_t sessionId, std::string &message);
     int32_t CheckDeviceSessionState(const std::string &remoteDevId);
     void HandleSessionData(int32_t sessionId, const std::string& messageData);
-
-    void NotifyResponseStartRemoteCooperate(int32_t sessionId, const nlohmann::json &recMsg);
-    void NotifyResponseStartRemoteCooperateResult(int32_t sessionId, const nlohmann::json &recMsg);
-    void NotifyResponseStopRemoteCooperate(int32_t sessionId, const nlohmann::json &recMsg);
-    void NotifyResponseStopRemoteCooperateResult(int32_t sessionId, const nlohmann::json &recMsg);
-    void NotifyResponseStartCooperateOtherResult(int32_t sessionId, const nlohmann::json &recMsg);
-
     std::map<std::string, int32_t> sessionDevMap_;
     std::map<std::string, bool> channelStatusMap_;
     std::mutex operationMutex_;
-    std::string mySessionName_ = "";
+    std::string mySessionName_;
     std::condition_variable openSessionWaitCond_;
     ISessionListener sessListener_;
 };
diff --git a/service/input_device_cooperate/include/mmi_softbus_define.h b/service/input_device_cooperate/include/device_cooperate_softbus_define.h
similarity index 97%
rename from service/input_device_cooperate/include/mmi_softbus_define.h
rename to service/input_device_cooperate/include/device_cooperate_softbus_define.h
index d229c1f3dc..47f0b9c20f 100644
--- a/service/input_device_cooperate/include/mmi_softbus_define.h
+++ b/service/input_device_cooperate/include/device_cooperate_softbus_define.h
@@ -21,7 +21,6 @@
 
 namespace OHOS {
 namespace MMI {
-
 constexpr int32_t ENCRYPT_TAG_LEN = 32;
 constexpr int32_t MSG_MAX_SIZE = 45 * 1024;
 
diff --git a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
index 7b95312453..90721728f4 100755
--- a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
+++ b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
@@ -18,16 +18,16 @@
 #include <chrono>
 #include <thread>
 
+#include "cJSON.h"
 #include "softbus_bus_center.h"
 #include "softbus_common.h"
 
 #include "config_multimodal.h"
+#include "device_cooperate_softbus_define.h"
+#include "input_device_cooperate_sm.h"
 #include "input_device_cooperate_util.h"
 #include "mmi_log.h"
-#include "mmi_softbus_define.h"
 #include "util.h"
-#include "multimodal_input_connect_define.h"
-#include "input_device_cooperate_sm.h"
 
 namespace OHOS {
 namespace MMI {
@@ -35,7 +35,7 @@ namespace {
 std::shared_ptr<DeviceCooperateSoftbusAdapter> g_instance = nullptr;
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "DeviceCooperateSoftbusAdapter"};
 const int32_t DINPUT_LINK_TYPE_MAX = 4;
-static SessionAttribute g_sessionAttr = {
+SessionAttribute g_sessionAttr = {
     .dataType = SessionType::TYPE_BYTES,
     .linkTypeNum = DINPUT_LINK_TYPE_MAX,
     .linkType = {
@@ -45,6 +45,74 @@ static SessionAttribute g_sessionAttr = {
         LINK_TYPE_BR
     }
 };
+struct JsonParser {
+    JsonParser() = default;
+    ~JsonParser()
+    {
+        if (json_ != nullptr) {
+            cJSON_Delete(json_);
+        }
+    }
+    operator cJSON *()
+    {
+        return json_;
+    }
+    cJSON *json_ { nullptr };
+};
+
+void ResponseStartRemoteCooperate(int32_t sessionId, const JsonParser& parser)
+{
+    CALL_DEBUG_ENTER;
+    cJSON* deviceId = cJSON_GetObjectItemCaseSensitive(parser.json_, MMI_SOFTBUS_KEY_LOCAL_DEVICE_ID);
+    if (!cJSON_IsString(deviceId)) {
+        MMI_HILOGE("OnBytesReceived cmdType is TRANS_SINK_MSG_ONPREPARE, data type is error");
+        return;
+    }
+    InputDevCooSM->StartRemoteCooperate(deviceId->valuestring);
+}
+
+void ResponseStartRemoteCooperateResult(int32_t sessionId, const JsonParser& parser)
+{
+    CALL_DEBUG_ENTER;
+    cJSON* result = cJSON_GetObjectItemCaseSensitive(parser.json_, MMI_SOFTBUS_KEY_RESULT);
+    cJSON* dhid = cJSON_GetObjectItemCaseSensitive(parser.json_, MMI_SOFTBUS_KEY_START_DHID);
+    cJSON* x = cJSON_GetObjectItemCaseSensitive(parser.json_, MMI_SOFTBUS_KEY_POINTER_X);
+    cJSON* y = cJSON_GetObjectItemCaseSensitive(parser.json_, MMI_SOFTBUS_KEY_POINTER_Y);
+    if (!cJSON_IsBool(result) || !cJSON_IsString(dhid) || !cJSON_IsNumber(x) || !cJSON_IsNumber(y)) {
+        MMI_HILOGE("OnBytesReceived cmdType is TRANS_SINK_MSG_ONPREPARE, data type is error");
+        return;
+    }
+    InputDevCooSM->StartRemoteCooperateResult(cJSON_IsTrue(result), dhid->valuestring, x->valueint, y->valueint);
+}
+
+void ResponseStopRemoteCooperate(int32_t sessionId, const JsonParser& parser)
+{
+    InputDevCooSM->StopRemoteCooperate();
+}
+
+void ResponseStopRemoteCooperateResult(int32_t sessionId, const JsonParser& parser)
+{
+    CALL_DEBUG_ENTER;
+    cJSON* result = cJSON_GetObjectItemCaseSensitive(parser.json_, MMI_SOFTBUS_KEY_RESULT);
+
+    if (!cJSON_IsBool(result)) {
+        MMI_HILOGE("OnBytesReceived cmdType is TRANS_SINK_MSG_ONPREPARE, data type is error");
+        return;
+    }
+    InputDevCooSM->StopRemoteCooperateResult(cJSON_IsTrue(result));
+}
+
+void ResponseStartCooperateOtherResult(int32_t sessionId, const JsonParser& parser)
+{
+    CALL_DEBUG_ENTER;
+    cJSON* deviceId = cJSON_GetObjectItemCaseSensitive(parser.json_, MMI_SOFTBUS_KEY_OTHER_DEVICE_ID);
+
+    if (!cJSON_IsString(deviceId)) {
+        MMI_HILOGE("OnBytesReceived cmdType is TRANS_SINK_MSG_ONPREPARE, data type is error");
+        return;
+    }
+    InputDevCooSM->StartCooperateOtherResult(deviceId->valuestring);
+}
 } // namespace
 
 static int32_t SessionOpened(int32_t sessionId, int32_t result)
@@ -98,7 +166,7 @@ int32_t DeviceCooperateSoftbusAdapter::Init()
     mySessionName_ = SESSION_NAME + networkId.substr(0, INTERCEPT_STRING_LENGTH);
     int32_t ret = CreateSessionServer(MMI_DSOFTBUS_PKG_NAME, mySessionName_.c_str(), &sessListener_);
     if (ret != RET_OK) {
-        MMI_HILOGE("Init create session server failed, error code %{public}d.", ret);
+        MMI_HILOGE("Create session server failed, error code %{public}d", ret);
         return RET_ERR;
     }
     return RET_OK;
@@ -108,7 +176,8 @@ void DeviceCooperateSoftbusAdapter::Release()
 {
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
     std::for_each(sessionDevMap_.begin(), sessionDevMap_.end(), [](auto item) { CloseSession(item.second); });
-    (void)RemoveSessionServer(MMI_DSOFTBUS_PKG_NAME, mySessionName_.c_str());
+    int32_t ret = RemoveSessionServer(MMI_DSOFTBUS_PKG_NAME, mySessionName_.c_str());
+    MMI_HILOGD("RemoveSessionServer result:%{public}d", ret);
     sessionDevMap_.clear();
     channelStatusMap_.clear();
 }
@@ -116,7 +185,7 @@ void DeviceCooperateSoftbusAdapter::Release()
 int32_t DeviceCooperateSoftbusAdapter::CheckDeviceSessionState(const std::string &devId)
 {
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.count(devId) != 0) {
+    if (sessionDevMap_.find(devId) != sessionDevMap_.end()) {
         return RET_OK;
     } else {
         MMI_HILOGE("Check session state error");
@@ -135,7 +204,7 @@ int32_t DeviceCooperateSoftbusAdapter::OpenInputSoftbus(const std::string &remot
 
     ret = Init();
     if (ret != RET_OK) {
-        MMI_HILOGE("CreateSessionServer failed.");
+        MMI_HILOGE("CreateSessionServer failed");
         return RET_ERR;
     }
 
@@ -153,7 +222,7 @@ int32_t DeviceCooperateSoftbusAdapter::OpenInputSoftbus(const std::string &remot
         sessionDevMap_[remoteDevId] = sessionId;
     }
 
-    MMI_HILOGI("Wait for channel session opened.");
+    MMI_HILOGI("Wait for channel session opened");
     {
         std::unique_lock<std::mutex> waitLock(operationMutex_);
         auto status = openSessionWaitCond_.wait_for(waitLock, std::chrono::seconds(SESSION_WAIT_TIMEOUT_SECOND),
@@ -171,7 +240,7 @@ int32_t DeviceCooperateSoftbusAdapter::OpenInputSoftbus(const std::string &remot
 void DeviceCooperateSoftbusAdapter::CloseInputSoftbus(const std::string &remoteDevId)
 {
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.count(remoteDevId) == 0) {
+    if (sessionDevMap_.find(remoteDevId) == sessionDevMap_.end()) {
         MMI_HILOGI("SessionDevIdMap Not find");
         return;
     }
@@ -197,13 +266,13 @@ int32_t DeviceCooperateSoftbusAdapter::StartRemoteCooperate(const std::string &l
 {
     CALL_DEBUG_ENTER;
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.count(remoteDeviceId) > 0) {
+    if (sessionDevMap_.find(remoteDeviceId) != sessionDevMap_.end()) {
         int32_t sessionId = sessionDevMap_[remoteDeviceId];
-        nlohmann::json jsonStr;
-        jsonStr[MMI_SOFTBUS_KEY_CMD_TYPE] = REMOTE_COOPERATE_START;
-        jsonStr[MMI_SOFTBUS_KEY_LOCAL_DEVICE_ID] = localDeviceId;
-        jsonStr[MMI_SOFTBUS_KEY_SESSION_ID] = sessionId;
-        std::string smsg = jsonStr.dump();
+        cJSON *jsonStr = cJSON_CreateObject();
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_START));
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_LOCAL_DEVICE_ID, cJSON_CreateString(localDeviceId.c_str()));
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
+        std::string smsg = cJSON_Print(jsonStr);
         int32_t ret = SendMsg(sessionId, smsg);
         if (ret != RET_OK) {
             MMI_HILOGE("Start remote cooperate send session msg failed");
@@ -211,7 +280,7 @@ int32_t DeviceCooperateSoftbusAdapter::StartRemoteCooperate(const std::string &l
         }
         return RET_OK;
     } else {
-        MMI_HILOGE("Start remote cooperate error, not find this device.");
+        MMI_HILOGE("Start remote cooperate error, not find this device");
         return RET_ERR;
     }
 }
@@ -221,16 +290,16 @@ int32_t DeviceCooperateSoftbusAdapter::StartRemoteCooperateResult(const std::str
 {
     CALL_DEBUG_ENTER;
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.count(remoteDeviceId) > 0) {
+    if (sessionDevMap_.find(remoteDeviceId) != sessionDevMap_.end()) {
         int32_t sessionId = sessionDevMap_[remoteDeviceId];
-        nlohmann::json jsonStr;
-        jsonStr[MMI_SOFTBUS_KEY_CMD_TYPE] = REMOTE_COOPERATE_START_RES;
-        jsonStr[MMI_SOFTBUS_KEY_RESULT] = isSuccess;
-        jsonStr[MMI_SOFTBUS_KEY_START_DHID] = startDhid;
-        jsonStr[MMI_SOFTBUS_KEY_POINTER_X] = xPercent;
-        jsonStr[MMI_SOFTBUS_KEY_POINTER_Y] = yPercent;
-        jsonStr[MMI_SOFTBUS_KEY_SESSION_ID] = sessionId;
-        std::string smsg = jsonStr.dump();
+        cJSON *jsonStr = cJSON_CreateObject();
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_START_RES));
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_RESULT, cJSON_CreateBool(isSuccess));
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_START_DHID, cJSON_CreateString(startDhid.c_str()));
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_POINTER_X, cJSON_CreateNumber(xPercent));
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_POINTER_Y, cJSON_CreateNumber(yPercent));
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
+        std::string smsg = cJSON_Print(jsonStr);
         int32_t ret = SendMsg(sessionId, smsg);
         if (ret != RET_OK) {
             MMI_HILOGE("Start remote cooperate result send session msg failed");
@@ -238,7 +307,7 @@ int32_t DeviceCooperateSoftbusAdapter::StartRemoteCooperateResult(const std::str
         }
         return RET_OK;
     } else {
-        MMI_HILOGE("Start remote cooperate result error, not find this device.");
+        MMI_HILOGE("Start remote cooperate result error, not find this device");
         return RET_ERR;
     }
 }
@@ -247,12 +316,12 @@ int32_t DeviceCooperateSoftbusAdapter::StopRemoteCooperate(const std::string &re
 {
     CALL_DEBUG_ENTER;
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.count(remoteDeviceId) > 0) {
+    if (sessionDevMap_.find(remoteDeviceId) != sessionDevMap_.end()) {
         int32_t sessionId = sessionDevMap_[remoteDeviceId];
-        nlohmann::json jsonStr;
-        jsonStr[MMI_SOFTBUS_KEY_CMD_TYPE] = REMOTE_COOPERATE_STOP;
-        jsonStr[MMI_SOFTBUS_KEY_SESSION_ID] = sessionId;
-        std::string smsg = jsonStr.dump();
+        cJSON *jsonStr = cJSON_CreateObject();
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_STOP));
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
+        std::string smsg = cJSON_Print(jsonStr);
         int32_t ret = SendMsg(sessionId, smsg);
         if (ret != RET_OK) {
             MMI_HILOGE("Stop remote cooperate send session msg failed");
@@ -260,7 +329,7 @@ int32_t DeviceCooperateSoftbusAdapter::StopRemoteCooperate(const std::string &re
         }
         return RET_OK;
     } else {
-        MMI_HILOGE("Stop remote cooperate error, not find this device.");
+        MMI_HILOGE("Stop remote cooperate error, not find this device");
         return RET_ERR;
     }
 }
@@ -269,13 +338,13 @@ int32_t DeviceCooperateSoftbusAdapter::StopRemoteCooperateResult(const std::stri
 {
     CALL_DEBUG_ENTER;
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.count(remoteDeviceId) > 0) {
+    if (sessionDevMap_.find(remoteDeviceId) != sessionDevMap_.end()) {
         int32_t sessionId = sessionDevMap_[remoteDeviceId];
-        nlohmann::json jsonStr;
-        jsonStr[MMI_SOFTBUS_KEY_CMD_TYPE] = REMOTE_COOPERATE_STOP_RES;
-        jsonStr[MMI_SOFTBUS_KEY_RESULT] = isSuccess;
-        jsonStr[MMI_SOFTBUS_KEY_SESSION_ID] = sessionId;
-        std::string smsg = jsonStr.dump();
+        cJSON *jsonStr = cJSON_CreateObject();
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_STOP_RES));
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_RESULT, cJSON_CreateBool(isSuccess));
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
+        std::string smsg = cJSON_Print(jsonStr);
         int32_t ret = SendMsg(sessionId, smsg);
         if (ret != RET_OK) {
             MMI_HILOGE("Stop remote cooperate result send session msg failed");
@@ -283,7 +352,7 @@ int32_t DeviceCooperateSoftbusAdapter::StopRemoteCooperateResult(const std::stri
         }
         return RET_OK;
     } else {
-        MMI_HILOGE("Stop remote cooperate result error, not find this device.");
+        MMI_HILOGE("Stop remote cooperate result error, not find this device");
         return RET_ERR;
     }
 }
@@ -293,13 +362,13 @@ int32_t DeviceCooperateSoftbusAdapter::StartCooperateOtherResult(const std::stri
 {
     CALL_DEBUG_ENTER;
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.count(remoteDeviceId) > 0) {
+    if (sessionDevMap_.find(remoteDeviceId) != sessionDevMap_.end()) {
         int32_t sessionId = sessionDevMap_[remoteDeviceId];
-        nlohmann::json jsonStr;
-        jsonStr[MMI_SOFTBUS_KEY_CMD_TYPE] = REMOTE_COOPERATE_STOP_OTHER_RES;
-        jsonStr[MMI_SOFTBUS_KEY_OTHER_DEVICE_ID] = srcNetworkId;
-        jsonStr[MMI_SOFTBUS_KEY_SESSION_ID] = sessionId;
-        std::string smsg = jsonStr.dump();
+        cJSON *jsonStr = cJSON_CreateObject();
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_STOP_OTHER_RES));
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_OTHER_DEVICE_ID, cJSON_CreateString(srcNetworkId.c_str()));
+        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
+        std::string smsg = cJSON_Print(jsonStr);
         int32_t ret = SendMsg(sessionId, smsg);
         if (ret != RET_OK) {
             MMI_HILOGE("Start cooperate other result send session msg failed");
@@ -307,53 +376,48 @@ int32_t DeviceCooperateSoftbusAdapter::StartCooperateOtherResult(const std::stri
         }
         return RET_OK;
     } else {
-        MMI_HILOGE("Start cooperate other result error, not find this device.");
+        MMI_HILOGE("Start cooperate other result error, not find this device");
         return RET_ERR;
     }
 }
 
 void DeviceCooperateSoftbusAdapter::HandleSessionData(int32_t sessionId, const std::string& message)
 {
-    nlohmann::json recMsg = nlohmann::json::parse(message);
-    if (recMsg.is_discarded()) {
-        MMI_HILOGE("OnBytesReceived jsonStr error.");
+    // nlohmann::json recMsg = nlohmann::json::parse(message);
+    JsonParser parser;
+    parser.json_ = cJSON_Parse(message.c_str());
+    if (!cJSON_IsObject(parser.json_)) {
+        MMI_HILOGE("Parser.json_ is not object");
         return;
     }
-
-    if (recMsg.contains(MMI_SOFTBUS_KEY_CMD_TYPE) != true) {
-        MMI_HILOGE("OnBytesReceived message:%{public}s is error, not contain cmdType.", message.c_str());
-        return;
-    }
-
-    if (recMsg[MMI_SOFTBUS_KEY_CMD_TYPE].is_number() != true) {
-        MMI_HILOGE("OnBytesReceived cmdType is not number type.");
+    cJSON* comType = cJSON_GetObjectItemCaseSensitive(parser.json_, MMI_SOFTBUS_KEY_CMD_TYPE);
+    if (!cJSON_IsNumber(comType)) {
+        MMI_HILOGE("OnBytesReceived cmdType is not number type");
         return;
     }
-
-    int cmdType = recMsg[MMI_SOFTBUS_KEY_CMD_TYPE];
-    switch (cmdType) {
+    switch (comType->valueint) {
         case REMOTE_COOPERATE_START: {
-            NotifyResponseStartRemoteCooperate(sessionId, recMsg);
+            ResponseStartRemoteCooperate(sessionId, parser);
             break;
         }
         case REMOTE_COOPERATE_START_RES: {
-            NotifyResponseStartRemoteCooperateResult(sessionId, recMsg);
+            ResponseStartRemoteCooperateResult(sessionId, parser);
             break;
         }
         case REMOTE_COOPERATE_STOP: {
-            NotifyResponseStopRemoteCooperate(sessionId, recMsg);
+            ResponseStopRemoteCooperate(sessionId, parser);
             break;
         }
         case REMOTE_COOPERATE_STOP_RES: {
-            NotifyResponseStopRemoteCooperateResult(sessionId, recMsg);
+            ResponseStopRemoteCooperateResult(sessionId, parser);
             break;
         }
         case REMOTE_COOPERATE_STOP_OTHER_RES: {
-            NotifyResponseStartCooperateOtherResult(sessionId, recMsg);
+            ResponseStartCooperateOtherResult(sessionId, parser);
             break;
         }
         default: {
-            MMI_HILOGE("OnBytesReceived cmdType is undefined.");
+            MMI_HILOGE("OnBytesReceived cmdType is undefined");
             break;
         }
     }
@@ -361,30 +425,14 @@ void DeviceCooperateSoftbusAdapter::HandleSessionData(int32_t sessionId, const s
 
 void DeviceCooperateSoftbusAdapter::OnBytesReceived(int32_t sessionId, const void *data, uint32_t dataLen)
 {
-    MMI_HILOGD("OnBytesReceived, sessionId:%{public}d, dataLen:%{public}d", sessionId, dataLen);
+    MMI_HILOGD("sessionId:%{public}d, dataLen:%{public}d", sessionId, dataLen);
     if (sessionId < 0 || data == nullptr || dataLen <= 0) {
-        MMI_HILOGE("OnBytesReceived param check failed");
-        return;
-    }
-
-    uint8_t *buf = (uint8_t *)calloc(dataLen + 1, sizeof(uint8_t));
-    if (buf == nullptr) {
-        MMI_HILOGE("OnBytesReceived: malloc memory failed");
+        MMI_HILOGE("param check failed");
         return;
     }
-
-    if (memcpy_s(buf, dataLen + 1, (const uint8_t *)data, dataLen) != RET_OK) {
-        MMI_HILOGE("OnBytesReceived: memcpy memory failed");
-        free(buf);
-        return;
-    }
-
-    std::string message(buf, buf + dataLen);
-    MMI_HILOGD("OnBytesReceived message:%{public}s.", message.c_str());
+    std::string message = std::string((const char *)data, dataLen);
+    MMI_HILOGD("message:%{public}s", message.c_str());
     HandleSessionData(sessionId, message);
-
-    free(buf);
-    MMI_HILOGD("OnBytesReceived completed");
     return;
 }
 
@@ -396,24 +444,10 @@ int32_t DeviceCooperateSoftbusAdapter::SendMsg(int32_t sessionId, std::string &m
         MMI_HILOGW("error: message.size() > MSG_MAX_SIZE");
         return RET_ERR;
     }
-    uint8_t *buf = (uint8_t *)calloc((MSG_MAX_SIZE), sizeof(uint8_t));
-    if (buf == nullptr) {
-        MMI_HILOGE("malloc memory failed");
-        return RET_ERR;
-    }
-    int32_t outLen = 0;
-    if (memcpy_s(buf, MSG_MAX_SIZE, (const uint8_t *)message.c_str(), message.size()) != RET_OK) {
-        MMI_HILOGE("memcpy memory failed");
-        free(buf);
-        return RET_ERR;
-    }
-    outLen = (int32_t)message.size();
-    int32_t ret = SendBytes(sessionId, buf, outLen);
-    free(buf);
-    return ret;
+    return SendBytes(sessionId, message.c_str(), strlen(message.c_str()));
 }
 
-std::string DeviceCooperateSoftbusAdapter::FindDeviceBySession(int32_t sessionId)
+std::string DeviceCooperateSoftbusAdapter::FindDevice(int32_t sessionId)
 {
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
     auto find_item = std::find_if(sessionDevMap_.begin(), sessionDevMap_.end(),
@@ -425,7 +459,7 @@ std::string DeviceCooperateSoftbusAdapter::FindDeviceBySession(int32_t sessionId
     if (find_item != sessionDevMap_.end()) {
         devId = (*find_item).first;
     } else {
-        MMI_HILOGE("findKeyByValue error.");
+        MMI_HILOGE("findKeyByValue error");
     }
     return devId;
 }
@@ -436,10 +470,10 @@ int32_t DeviceCooperateSoftbusAdapter::OnSessionOpened(int32_t sessionId, int32_
     char peerDevId[DEVICE_ID_SIZE_MAX] = "";
     int32_t ret = GetPeerDeviceId(sessionId, peerDevId, sizeof(peerDevId));
     if (result != RET_OK) {
-        std::string deviceId = FindDeviceBySession(sessionId);
+        std::string deviceId = FindDevice(sessionId);
         MMI_HILOGE("Session open failed result: %{public}d", result);
         std::unique_lock<std::mutex> sessionLock(operationMutex_);
-        if (sessionDevMap_.count(deviceId) > 0) {
+        if (sessionDevMap_.find(deviceId) != sessionDevMap_.end()) {
             sessionDevMap_.erase(deviceId);
         }
         channelStatusMap_[peerDevId] = true;
@@ -466,9 +500,9 @@ int32_t DeviceCooperateSoftbusAdapter::OnSessionOpened(int32_t sessionId, int32_
 void DeviceCooperateSoftbusAdapter::OnSessionClosed(int32_t sessionId)
 {
     CALL_DEBUG_ENTER;
-    std::string deviceId = FindDeviceBySession(sessionId);
+    std::string deviceId = FindDevice(sessionId);
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.count(deviceId) > 0) {
+    if (sessionDevMap_.find(deviceId) != sessionDevMap_.end()) {
         sessionDevMap_.erase(deviceId);
     }
     // 0 is server
@@ -476,57 +510,5 @@ void DeviceCooperateSoftbusAdapter::OnSessionClosed(int32_t sessionId)
         channelStatusMap_.erase(deviceId);
     }
 }
-
-void DeviceCooperateSoftbusAdapter::NotifyResponseStartRemoteCooperate(int32_t sessionId, const nlohmann::json &recMsg)
-{
-    CALL_DEBUG_ENTER;
-    if (!recMsg[MMI_SOFTBUS_KEY_LOCAL_DEVICE_ID].is_string()) {
-        MMI_HILOGE("OnBytesReceived cmdType is TRANS_SINK_MSG_ONPREPARE, data type is error.");
-        return;
-    }
-    InputDevCooSM->StartRemoteCooperate(recMsg[MMI_SOFTBUS_KEY_LOCAL_DEVICE_ID]);
-}
-
-void DeviceCooperateSoftbusAdapter::NotifyResponseStartRemoteCooperateResult(int32_t sessionId, const nlohmann::json &recMsg)
-{
-    CALL_DEBUG_ENTER;
-    if (!recMsg[MMI_SOFTBUS_KEY_RESULT].is_boolean() ||
-        !recMsg[MMI_SOFTBUS_KEY_START_DHID].is_string() ||
-        !recMsg[MMI_SOFTBUS_KEY_POINTER_X].is_number() ||
-        !recMsg[MMI_SOFTBUS_KEY_POINTER_Y].is_number()) {
-        MMI_HILOGE("OnBytesReceived cmdType is TRANS_SINK_MSG_ONPREPARE, data type is error.");
-        return;
-    }
-    bool result = recMsg[MMI_SOFTBUS_KEY_RESULT];
-    std::string dhid = recMsg[MMI_SOFTBUS_KEY_START_DHID];
-    int32_t x = recMsg[MMI_SOFTBUS_KEY_POINTER_X];
-    int32_t y = recMsg[MMI_SOFTBUS_KEY_POINTER_Y];
-    InputDevCooSM->StartRemoteCooperateResult(result, dhid, x, y);
-}
-
-void DeviceCooperateSoftbusAdapter::NotifyResponseStopRemoteCooperate(int32_t sessionId, const nlohmann::json &recMsg)
-{
-    InputDevCooSM->StopRemoteCooperate();
-}
-
-void DeviceCooperateSoftbusAdapter::NotifyResponseStopRemoteCooperateResult(int32_t sessionId, const nlohmann::json &recMsg)
-{
-    CALL_DEBUG_ENTER;
-    if (!recMsg[MMI_SOFTBUS_KEY_RESULT].is_boolean()) {
-        MMI_HILOGE("OnBytesReceived cmdType is TRANS_SINK_MSG_ONPREPARE, data type is error.");
-        return;
-    }
-    InputDevCooSM->StopRemoteCooperateResult(recMsg[MMI_SOFTBUS_KEY_RESULT]);
-}
-
-void DeviceCooperateSoftbusAdapter::NotifyResponseStartCooperateOtherResult(int32_t sessionId, const nlohmann::json &recMsg)
-{
-    CALL_DEBUG_ENTER;
-    if (!recMsg[MMI_SOFTBUS_KEY_OTHER_DEVICE_ID].is_string()) {
-        MMI_HILOGE("OnBytesReceived cmdType is TRANS_SINK_MSG_ONPREPARE, data type is error.");
-        return;
-    }
-    InputDevCooSM->StartCooperateOtherResult(recMsg[MMI_SOFTBUS_KEY_OTHER_DEVICE_ID]);
-}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/input_device_cooperate/src/device_profile_adapter.cpp b/service/input_device_cooperate/src/device_profile_adapter.cpp
index 41a9434ec2..a1f91671fa 100755
--- a/service/input_device_cooperate/src/device_profile_adapter.cpp
+++ b/service/input_device_cooperate/src/device_profile_adapter.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <mutex>
 
-#include "nlohmann/json.hpp"
+#include "cJSON.h"
 
 #include "distributed_device_profile_client.h"
 #include "service_characteristic_profile.h"
@@ -32,6 +32,20 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Devic
 const std::string SERVICE_ID = "InputDeviceCooperation";
 const std::string SERVICE_TYPE = "InputDeviceCooperation";
 const std::string CHARACTERISTICS_NAME = "CurrentState";
+struct JsonParser {
+    JsonParser() = default;
+    ~JsonParser()
+    {
+        if (json_ != nullptr) {
+            cJSON_Delete(json_);
+        }
+    }
+    operator cJSON *()
+    {
+        return json_;
+    }
+    cJSON *json_ { nullptr };
+};
 } // namespace
 
 DeviceProfileAdapter::DeviceProfileAdapter() {}
@@ -48,9 +62,9 @@ int32_t DeviceProfileAdapter::UpdateCrossingSwitchState(bool state, const std::v
     ServiceCharacteristicProfile profile;
     profile.SetServiceId(SERVICE_ID);
     profile.SetServiceType(SERVICE_TYPE);
-    nlohmann::json data;
-    data[CHARACTERISTICS_NAME] = state;
-    profile.SetCharacteristicProfileJson(data.dump());
+    cJSON *data = cJSON_CreateObject();
+    cJSON_AddItemToObject(data, CHARACTERISTICS_NAME.c_str(), cJSON_CreateBool(state));
+    profile.SetCharacteristicProfileJson(cJSON_Print(data));
 
     int32_t ret = DistributedDeviceProfileClient::GetInstance().PutDeviceProfile(profile);
     if (ret != 0) {
@@ -74,9 +88,10 @@ int32_t DeviceProfileAdapter::UpdateCrossingSwitchState(bool state)
     ServiceCharacteristicProfile profile;
     profile.SetServiceId(SERVICE_ID);
     profile.SetServiceType(SERVICE_TYPE);
-    nlohmann::json data;
-    data[CHARACTERISTICS_NAME] = state;
-    profile.SetCharacteristicProfileJson(data.dump());
+    cJSON *data = cJSON_CreateObject();
+    cJSON_AddItemToObject(data, CHARACTERISTICS_NAME.c_str(), cJSON_CreateBool(state));
+    profile.SetCharacteristicProfileJson(cJSON_Print(data));
+
     return DistributedDeviceProfileClient::GetInstance().PutDeviceProfile(profile);
 }
 
@@ -85,12 +100,18 @@ bool DeviceProfileAdapter::GetCrossingSwitchState(const std::string &deviceId)
     ServiceCharacteristicProfile profile;
     DistributedDeviceProfileClient::GetInstance().GetDeviceProfile(deviceId, SERVICE_ID, profile);
     std::string jsonData = profile.GetCharacteristicProfileJson();
-    nlohmann::json jsonObject = nlohmann::json::parse(jsonData, nullptr, false);
-    if (jsonObject.is_discarded()) {
-        MMI_HILOGE("JsonData is discarded");
+    JsonParser parser;
+    parser.json_ = cJSON_Parse(jsonData.c_str());
+    if (!cJSON_IsObject(parser.json_)) {
+        MMI_HILOGE("Parser.json_ is not object");
+        return false;
+    }
+    cJSON* state = cJSON_GetObjectItemCaseSensitive(parser.json_, CHARACTERISTICS_NAME.c_str());
+    if (!cJSON_IsBool(state)) {
+        MMI_HILOGE("state is not bool type.");
         return false;
     }
-    return jsonObject[CHARACTERISTICS_NAME].get<bool>();
+    return cJSON_IsTrue(state);
 }
 
 int32_t DeviceProfileAdapter::RegisterCrossingStateListener(const std::string &deviceId, DPCallback callback)
-- 
Gitee


From 8ed2a02796133ab26bb6d60c77e1b17291ca152a Mon Sep 17 00:00:00 2001
From: fuchao33 <fuchao33@huawei.com>
Date: Thu, 22 Sep 2022 14:33:38 +0800
Subject: [PATCH 034/360] =?UTF-8?q?Description:=20=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=E4=BF=AE=E6=94=B9=20Sig:=20SIG=5FBscSoftSrv=20Feature?=
 =?UTF-8?q?=20or=20Bugfix:=20Feature=20Binary=20Source:=20No=20Signed-off-?=
 =?UTF-8?q?by:=20<zhenying.wu@thundersoft.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/BUILD.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/BUILD.gn b/service/BUILD.gn
index 0881b77a32..665e39929b 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -448,6 +448,7 @@ ohos_shared_library("libmmi-server") {
     sources += [
       "input_device_cooperate/src/cooperate_event_handler.cpp",
       "input_device_cooperate/src/cooperate_event_manager.cpp",
+      "input_device_cooperate/src/device_cooperate_softbus_adapter.cpp",
       "input_device_cooperate/src/device_profile_adapter.cpp",
       "input_device_cooperate/src/distributed_input_adapter.cpp",
       "input_device_cooperate/src/i_input_device_cooperate_state.cpp",
@@ -455,7 +456,6 @@ ohos_shared_library("libmmi-server") {
       "input_device_cooperate/src/input_device_cooperate_state_free.cpp",
       "input_device_cooperate/src/input_device_cooperate_state_in.cpp",
       "input_device_cooperate/src/input_device_cooperate_state_out.cpp",
-      "input_device_cooperate/src/device_cooperate_softbus_adapter.cpp",
       "input_device_cooperate/src/input_device_cooperate_util.cpp",
     ]
   }
-- 
Gitee


From 9e158bc4849aa2376cee2770a6dbb605e3932721 Mon Sep 17 00:00:00 2001
From: fuchao33 <fuchao33@huawei.com>
Date: Thu, 22 Sep 2022 14:33:38 +0800
Subject: [PATCH 035/360] =?UTF-8?q?Description:=20=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=E4=BF=AE=E6=94=B9=20Sig:=20SIG=5FBscSoftSrv=20Feature?=
 =?UTF-8?q?=20or=20Bugfix:=20Feature=20Binary=20Source:=20No=20Signed-off-?=
 =?UTF-8?q?by:=20<zhenying.wu@thundersoft.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: fuchao33 <fuchao33@huawei.com>
---
 service/BUILD.gn                                             | 2 +-
 .../include/device_cooperate_softbus_adapter.h               | 2 +-
 .../src/device_cooperate_softbus_adapter.cpp                 | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/service/BUILD.gn b/service/BUILD.gn
index 0881b77a32..665e39929b 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -448,6 +448,7 @@ ohos_shared_library("libmmi-server") {
     sources += [
       "input_device_cooperate/src/cooperate_event_handler.cpp",
       "input_device_cooperate/src/cooperate_event_manager.cpp",
+      "input_device_cooperate/src/device_cooperate_softbus_adapter.cpp",
       "input_device_cooperate/src/device_profile_adapter.cpp",
       "input_device_cooperate/src/distributed_input_adapter.cpp",
       "input_device_cooperate/src/i_input_device_cooperate_state.cpp",
@@ -455,7 +456,6 @@ ohos_shared_library("libmmi-server") {
       "input_device_cooperate/src/input_device_cooperate_state_free.cpp",
       "input_device_cooperate/src/input_device_cooperate_state_in.cpp",
       "input_device_cooperate/src/input_device_cooperate_state_out.cpp",
-      "input_device_cooperate/src/device_cooperate_softbus_adapter.cpp",
       "input_device_cooperate/src/input_device_cooperate_util.cpp",
     ]
   }
diff --git a/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h b/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
index fb6bea9142..fe30191c0b 100755
--- a/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
+++ b/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
@@ -29,7 +29,7 @@ namespace OHOS {
 namespace MMI {
 class DeviceCooperateSoftbusAdapter {
 public:
-    virtual ~DeviceCooperateSoftbusAdapter() = default;
+    virtual ~DeviceCooperateSoftbusAdapter();
     static std::shared_ptr<DeviceCooperateSoftbusAdapter> GetInstance();
     int32_t StartRemoteCooperate(const std::string &localDeviceId, const std::string &remoteDeviceId);
     int32_t StartRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess,
diff --git a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
index 90721728f4..cfd80d43e0 100755
--- a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
+++ b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
@@ -172,6 +172,11 @@ int32_t DeviceCooperateSoftbusAdapter::Init()
     return RET_OK;
 }
 
+DeviceCooperateSoftbusAdapter::~DeviceCooperateSoftbusAdapter()
+{
+    Release();
+}
+
 void DeviceCooperateSoftbusAdapter::Release()
 {
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-- 
Gitee


From ed943ae547343752bd29af11791bdbbbe63e71d6 Mon Sep 17 00:00:00 2001
From: fuchao33 <fuchao33@huawei.com>
Date: Wed, 28 Sep 2022 16:15:49 +0800
Subject: [PATCH 036/360] =?UTF-8?q?Description:=20sendmsg=E5=A7=94?=
 =?UTF-8?q?=E6=89=98=E5=88=B0=E5=A4=9A=E6=A8=A1=E5=B7=A5=E4=BD=9C=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B=20Sig:=20SIG=5FBscSoftSrv=20Feature=20or=20Bugfix:=20?=
 =?UTF-8?q?Feature=20Binary=20Source:=20No=20Signed-off-by:=20<zhenying.wu?=
 =?UTF-8?q?@thundersoft.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../include/input_device_cooperate_sm.h           |  2 ++
 .../src/input_device_cooperate_sm.cpp             | 15 +++++++++++----
 service/module_loader/src/mmi_service.cpp         |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/service/input_device_cooperate/include/input_device_cooperate_sm.h b/service/input_device_cooperate/include/input_device_cooperate_sm.h
index 7523ee97f8..dfe6c4b0aa 100755
--- a/service/input_device_cooperate/include/input_device_cooperate_sm.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_sm.h
@@ -61,6 +61,7 @@ class InputDeviceCooperateSM final {
         void OnDeviceOffline(const DistributedHardware::DmDeviceInfo &deviceInfo) override;
     };
 public:
+    using DelegateTasksCallback = std::function<int32_t(std::function<int32_t()>)>;
     DISALLOW_COPY_AND_MOVE(InputDeviceCooperateSM);
     void Init();
     void EnableInputDeviceCooperate(bool enabled);
@@ -110,6 +111,7 @@ private:
     std::atomic<bool> isStarting_ { false };
     std::atomic<bool> isStopping_ { false };
     std::pair<int32_t, int32_t> mouseLocation_ { std::make_pair(0, 0) };
+    DelegateTasksCallback delegateTasksCallback_ { nullptr };
 };
 
 #define InputDevCooSM ::OHOS::DelayedSingleton<InputDeviceCooperateSM>::GetInstance()
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index 87d6cfd627..ea51a6c0db 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -48,8 +48,10 @@ constexpr int32_t MOUSE_ABS_LOCATION_Y = 50;
 InputDeviceCooperateSM::InputDeviceCooperateSM() {}
 InputDeviceCooperateSM::~InputDeviceCooperateSM() {}
 
-void InputDeviceCooperateSM::Init()
+void InputDeviceCooperateSM::Init(DelegateTasksCallback delegateTasksCallback)
 {
+    CHKPL(delegateTasksCallback);
+    delegateTasksCallback_ = delegateTasksCallback;
     preparedNetworkId_ = std::make_pair("", "");
     currentStateSM_ = std::make_shared<InputDeviceCooperateStateFree>();
     TimerMgr->AddTimer(INTERVAL_MS, 1, [this]() {
@@ -78,7 +80,8 @@ void InputDeviceCooperateSM::OnCooperateChanged(const std::string &networkId, bo
 {
     CALL_DEBUG_ENTER;
     CooperationMessage msg = isOpen ? CooperationMessage::STATE_ON : CooperationMessage::STATE_OFF;
-    CooperateEventMgr->OnCooperateMessage(msg, networkId);
+    delegateTasksCallback_(std::bind(&CooperateEventManager::OnCooperateMessage, CooperateEventMgr, msg, networkId));
+    // CooperateEventMgr->OnCooperateMessage(msg, networkId);
     if (!isOpen) {
         OnCloseCooperation(networkId, false);
     }
@@ -189,7 +192,9 @@ int32_t InputDeviceCooperateSM::StopInputDeviceCooperate()
 void InputDeviceCooperateSM::StartRemoteCooperate(const std::string &remoteNetworkId)
 {
     CALL_INFO_TRACE;
-    CooperateEventMgr->OnCooperateMessage(CooperationMessage::INFO_START, remoteNetworkId);
+    CHKPV(delegateTasksCallback_);
+    delegateTasksCallback_(std::bind(&CooperateEventManager::OnCooperateMessage, CooperateEventMgr, CooperationMessage::INFO_START, remoteNetworkId));
+    // CooperateEventMgr->OnCooperateMessage(CooperationMessage::INFO_START, remoteNetworkId);
     std::lock_guard<std::mutex> guard(mutex_);
     isStarting_ = true;
 }
@@ -206,7 +211,9 @@ void InputDeviceCooperateSM::StartRemoteCooperateResult(bool isSuccess,
     startDhid_ = startDhid;
     CooperationMessage msg =
             isSuccess ? CooperationMessage::INFO_SUCCESS : CooperationMessage::INFO_FAIL;
-        CooperateEventMgr->OnCooperateMessage(msg);
+    delegateTasksCallback_(std::bind(&CooperateEventManager::OnCooperateMessage, CooperateEventMgr, msg));
+
+    // CooperateEventMgr->OnCooperateMessage(msg);
     if (!isSuccess || cooperateState_ == CooperateState::STATE_IN) {
         isStarting_ = false;
         return;
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index ac6009c8ae..9fcdcd6278 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -269,7 +269,7 @@ int32_t MMIService::Init()
         return SASERVICE_INIT_FAIL;
     }
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-    InputDevCooSM->Init();
+    InputDevCooSM->Init(std::bind(&DelegateTasks::PostSyncTask, &delegateTasks_, std::placeholders::_1));
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     MMI_HILOGD("Input msg handler init");
     InputHandler->Init(*this);
-- 
Gitee


From bcf806ba3c0714d675912db4557c5a2f8625edbc Mon Sep 17 00:00:00 2001
From: fuchao33 <fuchao33@huawei.com>
Date: Fri, 30 Sep 2022 17:45:33 +0800
Subject: [PATCH 037/360] =?UTF-8?q?Description:=20=E6=8C=87=E6=91=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20+=20=E6=8B=86session=E6=97=B6=E6=9C=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20+=20=E6=96=AD=E7=BD=91=E7=9B=91=E5=90=ACon?=
 =?UTF-8?q?sessionclosed=20Sig:=20SIG=5FBscSoftSrv=20Feature=20or=20Bugfix?=
 =?UTF-8?q?:=20Feature=20Binary=20Source:=20No=20Signed-off-by:=20<zhenyin?=
 =?UTF-8?q?g.wu@thundersoft.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/input_device_manager.cpp              |  12 +-
 .../src/event_dispatch_handler.cpp            |   4 +-
 .../src/event_normalize_handler.cpp           |   3 +-
 .../include/cooperate_event_manager.h         |   2 +-
 .../device_cooperate_softbus_adapter.h        |   5 +-
 .../include/input_device_cooperate_sm.h       |   2 +-
 .../include/input_device_cooperate_util.h     |  18 +-
 .../src/cooperate_event_manager.cpp           |   5 +-
 .../src/device_cooperate_softbus_adapter.cpp  | 230 +++++++++---------
 .../src/device_profile_adapter.cpp            |  27 +-
 .../src/input_device_cooperate_sm.cpp         |  16 +-
 .../src/input_device_cooperate_state_free.cpp |   3 +-
 .../src/input_device_cooperate_state_in.cpp   |   3 +-
 .../src/input_device_cooperate_state_out.cpp  |   3 +-
 .../src/input_device_cooperate_util.cpp       |  11 +-
 util/common/include/config_multimodal.h       |   2 +-
 16 files changed, 168 insertions(+), 178 deletions(-)

diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index a807f732aa..4206fb5e85 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -510,19 +510,21 @@ std::vector<std::string> InputDeviceManager::GetCooperateDhids(int32_t deviceId)
         return dhids;
     }
     dhids.push_back(iter->second.dhid_);
-    MMI_HILOGI("unq: %{public}s, type:%{public}s", dhids.back().c_str(), "pointer");
+    MMI_HILOGE("wuwu:size: %{public}d, unq: %{public}s, type:%{public}s", inputDevice_.size(), dhids.back().c_str(), "pointer");
     auto pointerNetworkId = iter->second.networkIdOrigin_;
-    std::string localNetworkId;
-    GetLocalDeviceId(localNetworkId);
+    std::string localNetworkId = GetLocalDeviceId();
     pointerNetworkId = iter->second.isRemote_ ? iter->second.networkIdOrigin_ : localNetworkId;
     for (const auto &item : inputDevice_) {
         auto networkId = item.second.isRemote_ ? item.second.networkIdOrigin_ : localNetworkId;
+        MMI_HILOGE("wuwu:devtargs: %{public}d, isRemote_: %{public}d, Supportkey:%{public}d, networkId: %{public}s", 
+        libinput_device_get_tags(item.second.inputDeviceOrigin_), item.second.isRemote_
+        , GetDeviceSupportKey(item.first), networkId.c_str());
         if (networkId != pointerNetworkId) {
             continue;
         }
         if (GetDeviceSupportKey(item.first) == KEYBOARD_TYPE_ALPHABETICKEYBOARD) {
             dhids.push_back(item.second.dhid_);
-            MMI_HILOGI("unq: %{public}s, type:%{public}s", dhids.back().c_str(), "supportkey");
+            MMI_HILOGE("wuwu: unq: %{public}s, type:%{public}s", dhids.back().c_str(), "supportkey");
         }
     }
     return dhids;
@@ -549,7 +551,7 @@ std::string InputDeviceManager::GetOriginNetworkId(int32_t id)
     }
     auto networkId = iter->second.networkIdOrigin_;
     if (networkId.empty()) {
-        GetLocalDeviceId(networkId);
+        networkId = GetLocalDeviceId();
     }
     return networkId;
 }
diff --git a/service/event_dispatch/src/event_dispatch_handler.cpp b/service/event_dispatch/src/event_dispatch_handler.cpp
index d96f00e6e6..79b0ff4c8e 100644
--- a/service/event_dispatch/src/event_dispatch_handler.cpp
+++ b/service/event_dispatch/src/event_dispatch_handler.cpp
@@ -186,8 +186,8 @@ bool EventDispatchHandler::CheckPointerEvent(std::shared_ptr<PointerEvent> point
         pointerAction = PointerEvent::POINTER_ACTION_BUTTON_UP;
     }
     if ((EV_KEY == dinputSimulateEvent_[0].type == EV_KEY) &&
-        (MouseState->LibinputChangeToPointer(dinputSimulateEvent_[0].code) == pointerEvent->GetButtonId()) &&
-        (pointerAction == pointerEvent->GetPointerAction())) {
+        (pointerAction == pointerEvent->GetPointerAction()) &&
+        (MouseState->LibinputChangeToPointer(dinputSimulateEvent_[0].code) == pointerEvent->GetButtonId())) {
         dinputSimulateEvent_.clear();
         return true;
     }
diff --git a/service/event_handler/src/event_normalize_handler.cpp b/service/event_handler/src/event_normalize_handler.cpp
index 202cce8fe6..41a22257ff 100644
--- a/service/event_handler/src/event_normalize_handler.cpp
+++ b/service/event_handler/src/event_normalize_handler.cpp
@@ -262,8 +262,7 @@ bool EventNormalizeHandler::CheckKeyboardWhiteList(std::shared_ptr<KeyEvent> key
             return !IsNeedFilterOut(networkId, keyEvent);
         }
     } else if (state == CooperateState::STATE_OUT) {
-        std::string networkId;
-        GetLocalDeviceId(networkId);
+        std::string networkId = GetLocalDeviceId();
         if (!IsNeedFilterOut(networkId, keyEvent)) {
             if (keyEvent->GetKeyAction() == KeyEvent::KEY_ACTION_UP) {
                 KeyRepeat->SelectAutoRepeat(keyEvent);
diff --git a/service/input_device_cooperate/include/cooperate_event_manager.h b/service/input_device_cooperate/include/cooperate_event_manager.h
index 10757f6850..cb34321b9c 100755
--- a/service/input_device_cooperate/include/cooperate_event_manager.h
+++ b/service/input_device_cooperate/include/cooperate_event_manager.h
@@ -48,7 +48,7 @@ public:
 
     void AddCooperationEvent(sptr<EventInfo> event);
     void RemoveCooperationEvent(sptr<EventInfo> event);
-    void OnCooperateMessage(CooperationMessage msg, const std::string &deviceId = "");
+    int32_t OnCooperateMessage(CooperationMessage msg, const std::string &deviceId = "");
     void OnEnable(CooperationMessage msg, const std::string &deviceId = "");
     void OnStart(CooperationMessage msg, const std::string &deviceId = "");
     void OnStop(CooperationMessage msg, const std::string &deviceId = "");
diff --git a/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h b/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
index fe30191c0b..c4e391e772 100755
--- a/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
+++ b/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
@@ -51,13 +51,14 @@ private:
     DeviceCooperateSoftbusAdapter() = default;
     DISALLOW_COPY_AND_MOVE(DeviceCooperateSoftbusAdapter);
     std::string FindDevice(int32_t sessionId);
-    int32_t SendMsg(int32_t sessionId, std::string &message);
+    int32_t SendMsg(int32_t sessionId, const std::string &message);
     int32_t CheckDeviceSessionState(const std::string &remoteDevId);
     void HandleSessionData(int32_t sessionId, const std::string& messageData);
+    int32_t WaitSessionOpend(const std::string &remoteDevId, int32_t sessionId);
     std::map<std::string, int32_t> sessionDevMap_;
     std::map<std::string, bool> channelStatusMap_;
     std::mutex operationMutex_;
-    std::string mySessionName_;
+    std::string localSessionName_;
     std::condition_variable openSessionWaitCond_;
     ISessionListener sessListener_;
 };
diff --git a/service/input_device_cooperate/include/input_device_cooperate_sm.h b/service/input_device_cooperate/include/input_device_cooperate_sm.h
index dfe6c4b0aa..0fcda177da 100755
--- a/service/input_device_cooperate/include/input_device_cooperate_sm.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_sm.h
@@ -63,7 +63,7 @@ class InputDeviceCooperateSM final {
 public:
     using DelegateTasksCallback = std::function<int32_t(std::function<int32_t()>)>;
     DISALLOW_COPY_AND_MOVE(InputDeviceCooperateSM);
-    void Init();
+    void Init(DelegateTasksCallback delegateTasksCallback);
     void EnableInputDeviceCooperate(bool enabled);
     int32_t StartInputDeviceCooperate(const std::string &remoteNetworkId, int32_t startInputDeviceId);
     int32_t StopInputDeviceCooperate();
diff --git a/service/input_device_cooperate/include/input_device_cooperate_util.h b/service/input_device_cooperate/include/input_device_cooperate_util.h
index fc7ebac8e4..f3d45b6e7b 100644
--- a/service/input_device_cooperate/include/input_device_cooperate_util.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_util.h
@@ -17,9 +17,25 @@
 
 #include <string>
 
+#include "cJSON.h"
+
 namespace OHOS {
 namespace MMI {
-void GetLocalDeviceId(std::string &local);
+struct JsonParser {
+    JsonParser() = default;
+    ~JsonParser()
+    {
+        if (json_ != nullptr) {
+            cJSON_Delete(json_);
+        }
+    }
+    operator cJSON *()
+    {
+        return json_;
+    }
+    cJSON *json_ { nullptr };
+};
+std::string GetLocalDeviceId();
 } // namespace MMI
 } // namespace OHOS
 #endif // INPUT_DEVICE_COOPERATE_UTIL_H
diff --git a/service/input_device_cooperate/src/cooperate_event_manager.cpp b/service/input_device_cooperate/src/cooperate_event_manager.cpp
index 783200f970..c03cbbe32d 100755
--- a/service/input_device_cooperate/src/cooperate_event_manager.cpp
+++ b/service/input_device_cooperate/src/cooperate_event_manager.cpp
@@ -52,19 +52,20 @@ void CooperateEventManager::RemoveCooperationEvent(sptr<EventInfo> event)
     }
 }
 
-void CooperateEventManager::OnCooperateMessage(CooperationMessage msg, const std::string &deviceId)
+int32_t CooperateEventManager::OnCooperateMessage(CooperationMessage msg, const std::string &deviceId)
 {
     CALL_DEBUG_ENTER;
     std::lock_guard<std::mutex> guard(lock_);
     if (remoteCooperateCallbacks_.empty()) {
         MMI_HILOGE("No listener, send cooperate message failed");
-        return;
+        return RET_ERR;
     }
     for (auto it = remoteCooperateCallbacks_.begin(); it != remoteCooperateCallbacks_.end(); ++it) {
         sptr<EventInfo> info = *it;
         CHKPC(info);
         NotifyCooperateMessage(info->sess, info->msgId, info->userData, deviceId, msg);
     }
+    return RET_OK;
 }
 
 void CooperateEventManager::OnEnable(CooperationMessage msg, const std::string &deviceId)
diff --git a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
index cfd80d43e0..9522b18bcb 100755
--- a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
+++ b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
@@ -18,7 +18,6 @@
 #include <chrono>
 #include <thread>
 
-#include "cJSON.h"
 #include "softbus_bus_center.h"
 #include "softbus_common.h"
 
@@ -35,7 +34,7 @@ namespace {
 std::shared_ptr<DeviceCooperateSoftbusAdapter> g_instance = nullptr;
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "DeviceCooperateSoftbusAdapter"};
 const int32_t DINPUT_LINK_TYPE_MAX = 4;
-SessionAttribute g_sessionAttr = {
+const SessionAttribute g_sessionAttr = {
     .dataType = SessionType::TYPE_BYTES,
     .linkTypeNum = DINPUT_LINK_TYPE_MAX,
     .linkType = {
@@ -45,20 +44,6 @@ SessionAttribute g_sessionAttr = {
         LINK_TYPE_BR
     }
 };
-struct JsonParser {
-    JsonParser() = default;
-    ~JsonParser()
-    {
-        if (json_ != nullptr) {
-            cJSON_Delete(json_);
-        }
-    }
-    operator cJSON *()
-    {
-        return json_;
-    }
-    cJSON *json_ { nullptr };
-};
 
 void ResponseStartRemoteCooperate(int32_t sessionId, const JsonParser& parser)
 {
@@ -156,15 +141,13 @@ int32_t DeviceCooperateSoftbusAdapter::Init()
         .OnMessageReceived = MessageReceived,
         .OnStreamReceived = StreamReceived
     };
-
-    std::string networkId;
-    GetLocalDeviceId(networkId);
+    std::string networkId = GetLocalDeviceId();
     if (networkId.empty()) {
         MMI_HILOGE("Local networkid is empty");
         return RET_ERR;
     }
-    mySessionName_ = SESSION_NAME + networkId.substr(0, INTERCEPT_STRING_LENGTH);
-    int32_t ret = CreateSessionServer(MMI_DSOFTBUS_PKG_NAME, mySessionName_.c_str(), &sessListener_);
+    localSessionName_ = SESSION_NAME + networkId.substr(0, INTERCEPT_STRING_LENGTH);
+    int32_t ret = CreateSessionServer(MMI_DINPUT_PKG_NAME, localSessionName_.c_str(), &sessListener_);
     if (ret != RET_OK) {
         MMI_HILOGE("Create session server failed, error code %{public}d", ret);
         return RET_ERR;
@@ -181,7 +164,7 @@ void DeviceCooperateSoftbusAdapter::Release()
 {
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
     std::for_each(sessionDevMap_.begin(), sessionDevMap_.end(), [](auto item) { CloseSession(item.second); });
-    int32_t ret = RemoveSessionServer(MMI_DSOFTBUS_PKG_NAME, mySessionName_.c_str());
+    int32_t ret = RemoveSessionServer(MMI_DINPUT_PKG_NAME, localSessionName_.c_str());
     MMI_HILOGD("RemoveSessionServer result:%{public}d", ret);
     sessionDevMap_.clear();
     channelStatusMap_.clear();
@@ -216,26 +199,24 @@ int32_t DeviceCooperateSoftbusAdapter::OpenInputSoftbus(const std::string &remot
     std::string peerSessionName = SESSION_NAME + remoteDevId.substr(0, INTERCEPT_STRING_LENGTH);
     MMI_HILOGI("OpenInputSoftbus peerSessionName:%{public}s", peerSessionName.c_str());
 
-    int sessionId = OpenSession(mySessionName_.c_str(), peerSessionName.c_str(), remoteDevId.c_str(),
+    int32_t sessionId = OpenSession(localSessionName_.c_str(), peerSessionName.c_str(), remoteDevId.c_str(),
         GROUP_ID.c_str(), &g_sessionAttr);
     if (sessionId < 0) {
         MMI_HILOGE("OpenSession failed");
         return RET_ERR;
     }
-    {
-        std::unique_lock<std::mutex> sessionLock(operationMutex_);
-        sessionDevMap_[remoteDevId] = sessionId;
-    }
+    return WaitSessionOpend(remoteDevId, sessionId);
+}
 
-    MMI_HILOGI("Wait for channel session opened");
-    {
-        std::unique_lock<std::mutex> waitLock(operationMutex_);
-        auto status = openSessionWaitCond_.wait_for(waitLock, std::chrono::seconds(SESSION_WAIT_TIMEOUT_SECOND),
-            [this, remoteDevId] () { return channelStatusMap_[remoteDevId]; });
-        if (!status) {
-            MMI_HILOGE("OpenSession timeout");
-            return RET_ERR;
-        }
+int32_t DeviceCooperateSoftbusAdapter::WaitSessionOpend(const std::string &remoteDevId, int32_t sessionId)
+{
+    std::unique_lock<std::mutex> waitLock(operationMutex_);
+    sessionDevMap_[remoteDevId] = sessionId;
+    auto status = openSessionWaitCond_.wait_for(waitLock, std::chrono::seconds(SESSION_WAIT_TIMEOUT_SECOND),
+        [this, remoteDevId] () { return channelStatusMap_[remoteDevId]; });
+    if (!status) {
+        MMI_HILOGE("OpenSession timeout");
+        return RET_ERR;
     }
     channelStatusMap_[remoteDevId] = false;
     MMI_HILOGI("OpenSession finish");
@@ -271,23 +252,24 @@ int32_t DeviceCooperateSoftbusAdapter::StartRemoteCooperate(const std::string &l
 {
     CALL_DEBUG_ENTER;
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.find(remoteDeviceId) != sessionDevMap_.end()) {
-        int32_t sessionId = sessionDevMap_[remoteDeviceId];
-        cJSON *jsonStr = cJSON_CreateObject();
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_START));
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_LOCAL_DEVICE_ID, cJSON_CreateString(localDeviceId.c_str()));
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
-        std::string smsg = cJSON_Print(jsonStr);
-        int32_t ret = SendMsg(sessionId, smsg);
-        if (ret != RET_OK) {
-            MMI_HILOGE("Start remote cooperate send session msg failed");
-            return RET_ERR;
-        }
-        return RET_OK;
-    } else {
+    if (sessionDevMap_.find(remoteDeviceId) == sessionDevMap_.end()) {
         MMI_HILOGE("Start remote cooperate error, not find this device");
         return RET_ERR;
     }
+    int32_t sessionId = sessionDevMap_[remoteDeviceId];
+    cJSON *jsonStr = cJSON_CreateObject();
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_START));
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_LOCAL_DEVICE_ID, cJSON_CreateString(localDeviceId.c_str()));
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
+    char *smsg = cJSON_Print(jsonStr);
+    cJSON_Delete(jsonStr);
+    int32_t ret = SendMsg(sessionId, smsg);
+    cJSON_free(smsg);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Start remote cooperate send session msg failed");
+        return RET_ERR;
+    }
+    return RET_OK;
 }
 
 int32_t DeviceCooperateSoftbusAdapter::StartRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess,
@@ -295,71 +277,74 @@ int32_t DeviceCooperateSoftbusAdapter::StartRemoteCooperateResult(const std::str
 {
     CALL_DEBUG_ENTER;
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.find(remoteDeviceId) != sessionDevMap_.end()) {
-        int32_t sessionId = sessionDevMap_[remoteDeviceId];
-        cJSON *jsonStr = cJSON_CreateObject();
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_START_RES));
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_RESULT, cJSON_CreateBool(isSuccess));
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_START_DHID, cJSON_CreateString(startDhid.c_str()));
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_POINTER_X, cJSON_CreateNumber(xPercent));
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_POINTER_Y, cJSON_CreateNumber(yPercent));
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
-        std::string smsg = cJSON_Print(jsonStr);
-        int32_t ret = SendMsg(sessionId, smsg);
-        if (ret != RET_OK) {
-            MMI_HILOGE("Start remote cooperate result send session msg failed");
-            return RET_ERR;
-        }
-        return RET_OK;
-    } else {
-        MMI_HILOGE("Start remote cooperate result error, not find this device");
+    if (sessionDevMap_.find(remoteDeviceId) == sessionDevMap_.end()) {
+        MMI_HILOGE("Stop remote cooperate error, not find this device");
+        return RET_ERR;
+    }
+    int32_t sessionId = sessionDevMap_[remoteDeviceId];
+    cJSON *jsonStr = cJSON_CreateObject();
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_START_RES));
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_RESULT, cJSON_CreateBool(isSuccess));
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_START_DHID, cJSON_CreateString(startDhid.c_str()));
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_POINTER_X, cJSON_CreateNumber(xPercent));
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_POINTER_Y, cJSON_CreateNumber(yPercent));
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
+    char *smsg = cJSON_Print(jsonStr);
+    cJSON_Delete(jsonStr);
+    int32_t ret = SendMsg(sessionId, smsg);
+    cJSON_free(smsg);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Start remote cooperate result send session msg failed");
         return RET_ERR;
     }
+    return RET_OK;
 }
 
 int32_t DeviceCooperateSoftbusAdapter::StopRemoteCooperate(const std::string &remoteDeviceId)
 {
     CALL_DEBUG_ENTER;
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.find(remoteDeviceId) != sessionDevMap_.end()) {
-        int32_t sessionId = sessionDevMap_[remoteDeviceId];
-        cJSON *jsonStr = cJSON_CreateObject();
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_STOP));
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
-        std::string smsg = cJSON_Print(jsonStr);
-        int32_t ret = SendMsg(sessionId, smsg);
-        if (ret != RET_OK) {
-            MMI_HILOGE("Stop remote cooperate send session msg failed");
-            return RET_ERR;
-        }
-        return RET_OK;
-    } else {
+    if (sessionDevMap_.find(remoteDeviceId) == sessionDevMap_.end()) {
         MMI_HILOGE("Stop remote cooperate error, not find this device");
         return RET_ERR;
     }
+    int32_t sessionId = sessionDevMap_[remoteDeviceId];
+    cJSON *jsonStr = cJSON_CreateObject();
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_STOP));
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
+    char *smsg = cJSON_Print(jsonStr);
+    cJSON_Delete(jsonStr);
+    int32_t ret = SendMsg(sessionId, smsg);
+    cJSON_free(smsg);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Stop remote cooperate send session msg failed");
+        return RET_ERR;
+    }
+    return RET_OK;
 }
 
 int32_t DeviceCooperateSoftbusAdapter::StopRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess)
 {
     CALL_DEBUG_ENTER;
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.find(remoteDeviceId) != sessionDevMap_.end()) {
-        int32_t sessionId = sessionDevMap_[remoteDeviceId];
-        cJSON *jsonStr = cJSON_CreateObject();
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_STOP_RES));
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_RESULT, cJSON_CreateBool(isSuccess));
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
-        std::string smsg = cJSON_Print(jsonStr);
-        int32_t ret = SendMsg(sessionId, smsg);
-        if (ret != RET_OK) {
-            MMI_HILOGE("Stop remote cooperate result send session msg failed");
-            return RET_ERR;
-        }
-        return RET_OK;
-    } else {
+    if (sessionDevMap_.find(remoteDeviceId) == sessionDevMap_.end()) {
         MMI_HILOGE("Stop remote cooperate result error, not find this device");
         return RET_ERR;
     }
+    int32_t sessionId = sessionDevMap_[remoteDeviceId];
+    cJSON *jsonStr = cJSON_CreateObject();
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_STOP_RES));
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_RESULT, cJSON_CreateBool(isSuccess));
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
+    char *smsg = cJSON_Print(jsonStr);
+    cJSON_Delete(jsonStr);
+    int32_t ret = SendMsg(sessionId, smsg);
+    cJSON_free(smsg);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Stop remote cooperate result send session msg failed");
+        return RET_ERR;
+    }
+    return RET_OK;
 }
 
 int32_t DeviceCooperateSoftbusAdapter::StartCooperateOtherResult(const std::string &remoteDeviceId,
@@ -367,28 +352,28 @@ int32_t DeviceCooperateSoftbusAdapter::StartCooperateOtherResult(const std::stri
 {
     CALL_DEBUG_ENTER;
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.find(remoteDeviceId) != sessionDevMap_.end()) {
-        int32_t sessionId = sessionDevMap_[remoteDeviceId];
-        cJSON *jsonStr = cJSON_CreateObject();
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_STOP_OTHER_RES));
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_OTHER_DEVICE_ID, cJSON_CreateString(srcNetworkId.c_str()));
-        cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
-        std::string smsg = cJSON_Print(jsonStr);
-        int32_t ret = SendMsg(sessionId, smsg);
-        if (ret != RET_OK) {
-            MMI_HILOGE("Start cooperate other result send session msg failed");
-            return RET_ERR;
-        }
-        return RET_OK;
-    } else {
+    if (sessionDevMap_.find(remoteDeviceId) == sessionDevMap_.end()) {
         MMI_HILOGE("Start cooperate other result error, not find this device");
         return RET_ERR;
     }
+    int32_t sessionId = sessionDevMap_[remoteDeviceId];
+    cJSON *jsonStr = cJSON_CreateObject();
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_CMD_TYPE, cJSON_CreateNumber(REMOTE_COOPERATE_STOP_OTHER_RES));
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_OTHER_DEVICE_ID, cJSON_CreateString(srcNetworkId.c_str()));
+    cJSON_AddItemToObject(jsonStr, MMI_SOFTBUS_KEY_SESSION_ID, cJSON_CreateNumber(sessionId));
+    char *smsg = cJSON_Print(jsonStr);
+    cJSON_Delete(jsonStr);
+    int32_t ret = SendMsg(sessionId, smsg);
+    cJSON_free(smsg);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Start cooperate other result send session msg failed");
+        return RET_ERR;
+    }
+    return RET_OK;
 }
 
 void DeviceCooperateSoftbusAdapter::HandleSessionData(int32_t sessionId, const std::string& message)
 {
-    // nlohmann::json recMsg = nlohmann::json::parse(message);
     JsonParser parser;
     parser.json_ = cJSON_Parse(message.c_str());
     if (!cJSON_IsObject(parser.json_)) {
@@ -400,6 +385,7 @@ void DeviceCooperateSoftbusAdapter::HandleSessionData(int32_t sessionId, const s
         MMI_HILOGE("OnBytesReceived cmdType is not number type");
         return;
     }
+    MMI_HILOGI("valueint: %{public}d", comType->valueint);
     switch (comType->valueint) {
         case REMOTE_COOPERATE_START: {
             ResponseStartRemoteCooperate(sessionId, parser);
@@ -441,12 +427,11 @@ void DeviceCooperateSoftbusAdapter::OnBytesReceived(int32_t sessionId, const voi
     return;
 }
 
-// send message by sessionId (channel opened)
-int32_t DeviceCooperateSoftbusAdapter::SendMsg(int32_t sessionId, std::string &message)
+int32_t DeviceCooperateSoftbusAdapter::SendMsg(int32_t sessionId, const std::string &message)
 {
     CALL_DEBUG_ENTER;
     if (message.size() > MSG_MAX_SIZE) {
-        MMI_HILOGW("error: message.size() > MSG_MAX_SIZE");
+        MMI_HILOGW("error: message.size() > MSG_MAX_SIZE msessage size: %{public}d", message.size());
         return RET_ERR;
     }
     return SendBytes(sessionId, message.c_str(), strlen(message.c_str()));
@@ -472,8 +457,8 @@ std::string DeviceCooperateSoftbusAdapter::FindDevice(int32_t sessionId)
 int32_t DeviceCooperateSoftbusAdapter::OnSessionOpened(int32_t sessionId, int32_t result)
 {
     CALL_INFO_TRACE;
-    char peerDevId[DEVICE_ID_SIZE_MAX] = "";
-    int32_t ret = GetPeerDeviceId(sessionId, peerDevId, sizeof(peerDevId));
+    char peerDevId[DEVICE_ID_SIZE_MAX] = {};
+    int32_t getPeerDeviceIdResult = GetPeerDeviceId(sessionId, peerDevId, sizeof(peerDevId));
     if (result != RET_OK) {
         std::string deviceId = FindDevice(sessionId);
         MMI_HILOGE("Session open failed result: %{public}d", result);
@@ -481,7 +466,9 @@ int32_t DeviceCooperateSoftbusAdapter::OnSessionOpened(int32_t sessionId, int32_
         if (sessionDevMap_.find(deviceId) != sessionDevMap_.end()) {
             sessionDevMap_.erase(deviceId);
         }
-        channelStatusMap_[peerDevId] = true;
+        if (getPeerDeviceIdResult == RET_OK) {
+            channelStatusMap_[peerDevId] = true;
+        }
         openSessionWaitCond_.notify_all();
         return RET_OK;
     }
@@ -489,14 +476,15 @@ int32_t DeviceCooperateSoftbusAdapter::OnSessionOpened(int32_t sessionId, int32_
     int32_t sessionSide = GetSessionSide(sessionId);
     MMI_HILOGI("session open succeed, sessionId:%{public}d, sessionSide:%{public}d(1 is client side)",
         sessionId, sessionSide);
-    // 0 is server
     if (sessionSide == SESSION_SIDE_SERVER){
-        if (ret == RET_OK) {
-            sessionDevMap_[peerDevId] = sessionId;
+        if (getPeerDeviceIdResult == RET_OK) {
+            channelStatusMap_[peerDevId] = true;
         }
     } else {
         std::lock_guard<std::mutex> notifyLock(operationMutex_);
-        channelStatusMap_[peerDevId] = true;
+        if (getPeerDeviceIdResult == RET_OK) {
+            channelStatusMap_[peerDevId] = true;
+        }
         openSessionWaitCond_.notify_all();
     }
     return RET_OK;
@@ -510,10 +498,10 @@ void DeviceCooperateSoftbusAdapter::OnSessionClosed(int32_t sessionId)
     if (sessionDevMap_.find(deviceId) != sessionDevMap_.end()) {
         sessionDevMap_.erase(deviceId);
     }
-    // 0 is server
     if (GetSessionSide(sessionId) != 0) {
         channelStatusMap_.erase(deviceId);
     }
+    InputDevCooSM->OnDeviceOffline(deviceId);
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/input_device_cooperate/src/device_profile_adapter.cpp b/service/input_device_cooperate/src/device_profile_adapter.cpp
index a1f91671fa..a16497d126 100755
--- a/service/input_device_cooperate/src/device_profile_adapter.cpp
+++ b/service/input_device_cooperate/src/device_profile_adapter.cpp
@@ -18,9 +18,8 @@
 #include <algorithm>
 #include <mutex>
 
-#include "cJSON.h"
-
 #include "distributed_device_profile_client.h"
+#include "input_device_cooperate_util.h"
 #include "service_characteristic_profile.h"
 #include "sync_options.h"
 
@@ -32,20 +31,6 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Devic
 const std::string SERVICE_ID = "InputDeviceCooperation";
 const std::string SERVICE_TYPE = "InputDeviceCooperation";
 const std::string CHARACTERISTICS_NAME = "CurrentState";
-struct JsonParser {
-    JsonParser() = default;
-    ~JsonParser()
-    {
-        if (json_ != nullptr) {
-            cJSON_Delete(json_);
-        }
-    }
-    operator cJSON *()
-    {
-        return json_;
-    }
-    cJSON *json_ { nullptr };
-};
 } // namespace
 
 DeviceProfileAdapter::DeviceProfileAdapter() {}
@@ -64,7 +49,10 @@ int32_t DeviceProfileAdapter::UpdateCrossingSwitchState(bool state, const std::v
     profile.SetServiceType(SERVICE_TYPE);
     cJSON *data = cJSON_CreateObject();
     cJSON_AddItemToObject(data, CHARACTERISTICS_NAME.c_str(), cJSON_CreateBool(state));
-    profile.SetCharacteristicProfileJson(cJSON_Print(data));
+    char *smsg = cJSON_Print(data);
+    cJSON_Delete(data);
+    profile.SetCharacteristicProfileJson(smsg);
+    cJSON_free(smsg);
 
     int32_t ret = DistributedDeviceProfileClient::GetInstance().PutDeviceProfile(profile);
     if (ret != 0) {
@@ -90,7 +78,10 @@ int32_t DeviceProfileAdapter::UpdateCrossingSwitchState(bool state)
     profile.SetServiceType(SERVICE_TYPE);
     cJSON *data = cJSON_CreateObject();
     cJSON_AddItemToObject(data, CHARACTERISTICS_NAME.c_str(), cJSON_CreateBool(state));
-    profile.SetCharacteristicProfileJson(cJSON_Print(data));
+    char *smsg = cJSON_Print(data);
+    cJSON_Delete(data);
+    profile.SetCharacteristicProfileJson(smsg);
+    cJSON_free(smsg);
 
     return DistributedDeviceProfileClient::GetInstance().PutDeviceProfile(profile);
 }
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index ea51a6c0db..8a9b4fc223 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -93,7 +93,6 @@ void InputDeviceCooperateSM::OnCloseCooperation(const std::string &networkId, bo
     std::lock_guard<std::mutex> guard(mutex_);
     if (!preparedNetworkId_.first.empty() && !preparedNetworkId_.second.empty()) {
         if (networkId == preparedNetworkId_.first || networkId == preparedNetworkId_.second) {
-            DevCooperateSoftbusAdapter->CloseInputSoftbus(networkId);
             DistributedAdapter->UnPrepareRemoteInput(preparedNetworkId_.first, preparedNetworkId_.second,
                 [](bool isSuccess) {});
         }
@@ -129,8 +128,7 @@ void InputDeviceCooperateSM::EnableInputDeviceCooperate(bool enabled)
         BytraceAdapter::StartBytrace(BytraceAdapter::TRACE_STOP, BytraceAdapter::START_EVENT);
     } else {
         DProfileAdapter->UpdateCrossingSwitchState(enabled, onlineDevice_);
-        std::string localNetworkId;
-        GetLocalDeviceId(localNetworkId);
+        std::string localNetworkId = GetLocalDeviceId();
         OnCloseCooperation(localNetworkId, true);
     }
 }
@@ -194,7 +192,6 @@ void InputDeviceCooperateSM::StartRemoteCooperate(const std::string &remoteNetwo
     CALL_INFO_TRACE;
     CHKPV(delegateTasksCallback_);
     delegateTasksCallback_(std::bind(&CooperateEventManager::OnCooperateMessage, CooperateEventMgr, CooperationMessage::INFO_START, remoteNetworkId));
-    // CooperateEventMgr->OnCooperateMessage(CooperationMessage::INFO_START, remoteNetworkId);
     std::lock_guard<std::mutex> guard(mutex_);
     isStarting_ = true;
 }
@@ -211,9 +208,8 @@ void InputDeviceCooperateSM::StartRemoteCooperateResult(bool isSuccess,
     startDhid_ = startDhid;
     CooperationMessage msg =
             isSuccess ? CooperationMessage::INFO_SUCCESS : CooperationMessage::INFO_FAIL;
-    delegateTasksCallback_(std::bind(&CooperateEventManager::OnCooperateMessage, CooperateEventMgr, msg));
+    delegateTasksCallback_(std::bind(&CooperateEventManager::OnCooperateMessage, CooperateEventMgr, msg, ""));
 
-    // CooperateEventMgr->OnCooperateMessage(msg);
     if (!isSuccess || cooperateState_ == CooperateState::STATE_IN) {
         isStarting_ = false;
         return;
@@ -302,6 +298,7 @@ void InputDeviceCooperateSM::OnStopFinish(bool isSuccess, const std::string &rem
     if (isSuccess) {
         if (InputDevMgr->HasLocalPointerDevice()) {
             MouseEventHdr->SetAbsolutionLocation(MOUSE_ABS_LOCATION_X, MOUSE_ABS_LOCATION_Y);
+            DevCooperateSoftbusAdapter->CloseInputSoftbus(remoteNetworkId);
         }
         if (cooperateState_ == CooperateState::STATE_IN || cooperateState_ == CooperateState::STATE_OUT) {
             UpdateState(CooperateState::STATE_FREE);
@@ -526,14 +523,14 @@ bool InputDeviceCooperateSM::InitDeviceManager()
     initCallback_ = std::make_shared<DeviceInitCallBack>();
     CHKPR(initCallback_, false);
     int32_t ret =
-        DistributedHardware::DeviceManager::GetInstance().InitDeviceManager(MMI_DSOFTBUS_PKG_NAME, initCallback_);
+        DistributedHardware::DeviceManager::GetInstance().InitDeviceManager(MMI_DINPUT_PKG_NAME, initCallback_);
     if (ret != 0) {
         MMI_HILOGE("Init device manager failed, ret:%{public}d", ret);
         return false;
     }
     stateCallback_ = std::make_shared<MmiDeviceStateCallback>();
     ret =
-        DistributedHardware::DeviceManager::GetInstance().RegisterDevStateCallback(MMI_DSOFTBUS_PKG_NAME, "", stateCallback_);
+        DistributedHardware::DeviceManager::GetInstance().RegisterDevStateCallback(MMI_DINPUT_PKG_NAME, "", stateCallback_);
     if (ret != 0) {
         MMI_HILOGE("Register devStateCallback failed, ret:%{public}d", ret);
         return false;
@@ -610,8 +607,7 @@ void InputDeviceCooperateSM::MmiDeviceStateCallback::OnDeviceOnline(
 void InputDeviceCooperateSM::MmiDeviceStateCallback::OnDeviceOffline(
     const DistributedHardware::DmDeviceInfo &deviceInfo)
 {
-    CALL_DEBUG_ENTER;
-    InputDevCooSM->OnDeviceOffline(deviceInfo.deviceId);
+    CALL_INFO_TRACE;
 }
 
 void InputDeviceCooperateSM::MmiDeviceStateCallback::OnDeviceChanged(
diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp
index 86053560da..8965d7d16e 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp
@@ -33,8 +33,7 @@ int32_t InputDeviceCooperateStateFree::StartInputDeviceCooperate(
         MMI_HILOGE("RemoteNetworkId is empty");
         return RET_ERR;
     }
-    std::string localNetworkId;
-    GetLocalDeviceId(localNetworkId);
+    std::string localNetworkId = GetLocalDeviceId();
     if (localNetworkId.empty() || remoteNetworkId == localNetworkId) {
         MMI_HILOGE("Input Parameters error");
         return RET_ERR;
diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp
index 57fc03c342..e24f1e4b5f 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp
@@ -39,8 +39,7 @@ int32_t InputDeviceCooperateStateIn::StartInputDeviceCooperate(const std::string
         MMI_HILOGE("RemoteNetworkId is empty");
         return RET_ERR;
     }
-    std::string localNetworkId;
-    GetLocalDeviceId(localNetworkId);
+    std::string localNetworkId = GetLocalDeviceId();
     if (localNetworkId.empty() || remoteNetworkId == localNetworkId) {
         MMI_HILOGE("Input Parameters error");
         return RET_ERR;
diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
index 37eb50cb77..822e78fd8c 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
@@ -58,8 +58,7 @@ int32_t InputDeviceCooperateStateOut::StopInputDeviceCooperate(const std::string
 void InputDeviceCooperateStateOut::ProcessStop(const std::string& srcNetworkId)
 {
     CALL_DEBUG_ENTER;
-    std::string sink;
-    GetLocalDeviceId(sink);
+    std::string sink = GetLocalDeviceId();
     std::vector<std::string>  dhids = InputDevMgr->GetCooperateDhids(startDhid_);
     int32_t ret = DistributedAdapter->StopRemoteInput(srcNetworkId, sink, dhids, [this, srcNetworkId](bool isSuccess) {
         this->OnStopRemoteInput(isSuccess, srcNetworkId);
diff --git a/service/input_device_cooperate/src/input_device_cooperate_util.cpp b/service/input_device_cooperate/src/input_device_cooperate_util.cpp
index fca65d9625..94f249aaf6 100644
--- a/service/input_device_cooperate/src/input_device_cooperate_util.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_util.cpp
@@ -24,17 +24,16 @@ namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateUtil"};
 } // namespace
-void GetLocalDeviceId(std::string &local)
+std::string GetLocalDeviceId()
 {
-    local = "";
     auto localNode = std::make_unique<NodeBasicInfo>();
-    CHKPV(localNode);
-    int32_t errCode = GetLocalNodeDeviceInfo(MMI_DSOFTBUS_PKG_NAME, localNode.get());
+    CHKPS(localNode);
+    int32_t errCode = GetLocalNodeDeviceInfo(MMI_DINPUT_PKG_NAME, localNode.get());
     if (errCode != RET_OK) {
         MMI_HILOGE("GetLocalNodeDeviceInfo errCode: %{public}d", errCode);
-        return;
+        return "";
     }
-    local = localNode->networkId;
+    return localNode->networkId;
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/util/common/include/config_multimodal.h b/util/common/include/config_multimodal.h
index 4fb17fa352..2d0b8dbbf7 100644
--- a/util/common/include/config_multimodal.h
+++ b/util/common/include/config_multimodal.h
@@ -57,7 +57,7 @@ namespace MMI {
 #define ONCE_PROCESS_NETPACKET_LIMIT 100
 #define MAX_RECV_LIMIT 32
 #define INPUT_POINTER_DEVICE "input.pointer.device"
-#define MMI_DSOFTBUS_PKG_NAME "ohos.mmi"
+#define MMI_DINPUT_PKG_NAME "ohos.mmi"
 } // namespace MMI
 } // namespace OHOS
 #endif // CONFIG_MULTIMODAL_H
-- 
Gitee


From 520e79fd83fbd682893f0b69056cf93ef8c015a9 Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Sat, 8 Oct 2022 02:05:00 +0000
Subject: [PATCH 038/360] update
 service/input_device_cooperate/src/input_device_cooperate_sm.cpp.

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 .../input_device_cooperate/src/input_device_cooperate_sm.cpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index 8a9b4fc223..13666773ac 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -298,7 +298,6 @@ void InputDeviceCooperateSM::OnStopFinish(bool isSuccess, const std::string &rem
     if (isSuccess) {
         if (InputDevMgr->HasLocalPointerDevice()) {
             MouseEventHdr->SetAbsolutionLocation(MOUSE_ABS_LOCATION_X, MOUSE_ABS_LOCATION_Y);
-            DevCooperateSoftbusAdapter->CloseInputSoftbus(remoteNetworkId);
         }
         if (cooperateState_ == CooperateState::STATE_IN || cooperateState_ == CooperateState::STATE_OUT) {
             UpdateState(CooperateState::STATE_FREE);
@@ -306,6 +305,7 @@ void InputDeviceCooperateSM::OnStopFinish(bool isSuccess, const std::string &rem
             MMI_HILOGI("Current state is free");
         }
     }
+    DevCooperateSoftbusAdapter->CloseInputSoftbus(remoteNetworkId);
     isStopping_ = false;
 }
 
-- 
Gitee


From 190e1979d39a727a123df9d4210910566d354074 Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Thu, 13 Oct 2022 01:24:27 +0000
Subject: [PATCH 039/360] RPC to P2P

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 .../src/js_event_target.cpp                   |  4 +--
 .../src/js_input_device_cooperate_context.cpp |  2 +-
 .../src/input_device_manager.cpp              | 10 +++----
 .../include/distributed_input_adapter.h       | 27 ++++++++++++-------
 .../include/input_device_cooperate_util.h     |  1 +
 .../src/device_cooperate_softbus_adapter.cpp  |  6 ++---
 .../src/input_device_cooperate_sm.cpp         |  8 +++---
 7 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
index 5f759bfc2c..f8504eb895 100755
--- a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
@@ -564,11 +564,11 @@ void JsEventTarget::CallGetStateAsyncWork(uv_work_t *work, int32_t status)
     CHKPV(cb);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
-    napi_value resultObj[2] = {0};
+    napi_value resultObj[2];
     CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &resultObj[0]), GET_UNDEFINED, scope);
     resultObj[1] = JsUtil::GetStateInfo(cb);
     if (resultObj[1] == nullptr) {
-        MMI_HILOGE("object is nullptr");
+        MMI_HILOGE("Object is nullptr");
         napi_close_handle_scope(cb->env, scope);
     }
     napi_value handler = nullptr;
diff --git a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
index 5e7982c2ff..2402c82896 100755
--- a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
@@ -210,7 +210,7 @@ napi_value JsInputDeviceCooperateContext::On(napi_env env, napi_callback_info in
     char type[MAX_STRING_LEN] = {};
     size_t length = 0;
     CHKRP(env, napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &length), GET_STRING);
-    if (std::strcmp(type, "cooperation") != 0) {
+    if (type == "cooperation") {
         THROWERR(env, "Register listener failed, the first parameter is invalid");
         MMI_HILOGE("Register listener failed, the first parameter is invalid");
         return nullptr;
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index fcd24dcc52..f7ba2b8aa5 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -520,14 +520,14 @@ std::vector<std::string> InputDeviceManager::GetCooperateDhids(int32_t deviceId)
     pointerNetworkId = iter->second.isRemote_ ? iter->second.networkIdOrigin_ : localNetworkId;
     for (const auto &item : inputDevice_) {
         auto networkId = item.second.isRemote_ ? item.second.networkIdOrigin_ : localNetworkId;
-        MMI_HILOGE("wuwu:devtargs: %{public}d, isRemote_: %{public}d, Supportkey:%{public}d, networkId: %{public}s", 
-        libinput_device_get_tags(item.second.inputDeviceOrigin_), item.second.isRemote_
-        , GetDeviceSupportKey(item.first), networkId.c_str());
+        MMI_HILOGE("wuwu:devtargs: %{public}d, isRemote_:%{public}d, Supportkey:%{public}d, networkId: %{public}s",
+            libinput_device_get_tags(item.second.inputDeviceOrigin_), item.second.isRemote_,
+            GetDeviceSupportKey(item.first), networkId.c_str());
         if (networkId != pointerNetworkId) {
             continue;
         }
-        if (GetDeviceSupportKey(item.first) == KEYBOARD_TYPE_ALPHABETICKEYBOARD) {
-            dhids.push_back(item.second.dhid_);
+        if (IsKeyboardDevice(item.second.inputDeviceOrigin_) {
+            dhids.emplace_back(item.second.dhid_);
             MMI_HILOGI("unq: %{public}s, type:%{public}s", dhids.back().c_str(), "supportkey");
         }
     }
diff --git a/service/input_device_cooperate/include/distributed_input_adapter.h b/service/input_device_cooperate/include/distributed_input_adapter.h
index 040ca84c6a..e2ab8a2304 100644
--- a/service/input_device_cooperate/include/distributed_input_adapter.h
+++ b/service/input_device_cooperate/include/distributed_input_adapter.h
@@ -101,47 +101,56 @@ private:
         void OnResult(const std::string &devId, const uint32_t &inputTypes, const int32_t &status) override;
     };
 
-    class StartDInputCallbackDHIds final : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
+    class StartDInputCallbackDHIds final :
+        public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
     public:
         void OnResultDhids(const std::string &devId, const int32_t &status) override;
     };
 
-    class StopDInputCallbackDHIds final : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
+    class StopDInputCallbackDHIds final :
+        public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
     public:
         void OnResultDhids(const std::string &devId, const int32_t &status) override;
     };
 
-    class StartDInputCallbackSink final : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
+    class StartDInputCallbackSink final :
+        public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
     public:
         void OnResultDhids(const std::string &devId, const int32_t &status) override;
     };
 
-    class StopDInputCallbackSink final : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
+    class StopDInputCallbackSink final :
+        public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
     public:
         void OnResultDhids(const std::string &devId, const int32_t &status) override;
     };
 
-    class PrepareStartDInputCallback final : public DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
+    class PrepareStartDInputCallback final :
+        public DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const int32_t &status) override;
     };
 
-    class UnPrepareStopDInputCallback final : public DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
+    class UnPrepareStopDInputCallback final :
+        public DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const int32_t &status) override;
     };
 
-    class PrepareStartDInputCallbackSink final : public DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
+    class PrepareStartDInputCallbackSink final :
+        public DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const int32_t &status) override;
     };
 
-    class UnPrepareStopDInputCallbackSink final : public DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
+    class UnPrepareStopDInputCallbackSink final :
+        public DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const int32_t &status) override;
     };
 
-    class SimulateEventCallbackImpl final : public DistributedHardware::DistributedInput::SimulationEventListenerStub {
+    class SimulateEventCallbackImpl final :
+        public DistributedHardware::DistributedInput::SimulationEventListenerStub {
     public:
         int32_t OnSimulationEvent(uint32_t type, uint32_t code, int32_t value) override;
     };
diff --git a/service/input_device_cooperate/include/input_device_cooperate_util.h b/service/input_device_cooperate/include/input_device_cooperate_util.h
index f3d45b6e7b..334684a1ee 100644
--- a/service/input_device_cooperate/include/input_device_cooperate_util.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_util.h
@@ -27,6 +27,7 @@ struct JsonParser {
     {
         if (json_ != nullptr) {
             cJSON_Delete(json_);
+            json_ = nullptr;
         }
     }
     operator cJSON *()
diff --git a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
index 9522b18bcb..c2d146e868 100755
--- a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
+++ b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
@@ -32,7 +32,7 @@ namespace OHOS {
 namespace MMI {
 namespace {
 std::shared_ptr<DeviceCooperateSoftbusAdapter> g_instance = nullptr;
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "DeviceCooperateSoftbusAdapter"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "DeviceCooperateSoftbusAdapter" };
 const int32_t DINPUT_LINK_TYPE_MAX = 4;
 const SessionAttribute g_sessionAttr = {
     .dataType = SessionType::TYPE_BYTES,
@@ -149,7 +149,7 @@ int32_t DeviceCooperateSoftbusAdapter::Init()
     localSessionName_ = SESSION_NAME + networkId.substr(0, INTERCEPT_STRING_LENGTH);
     int32_t ret = CreateSessionServer(MMI_DINPUT_PKG_NAME, localSessionName_.c_str(), &sessListener_);
     if (ret != RET_OK) {
-        MMI_HILOGE("Create session server failed, error code %{public}d", ret);
+        MMI_HILOGE("Create session server failed, error code: %{public}d", ret);
         return RET_ERR;
     }
     return RET_OK;
@@ -476,7 +476,7 @@ int32_t DeviceCooperateSoftbusAdapter::OnSessionOpened(int32_t sessionId, int32_
     int32_t sessionSide = GetSessionSide(sessionId);
     MMI_HILOGI("session open succeed, sessionId:%{public}d, sessionSide:%{public}d(1 is client side)",
         sessionId, sessionSide);
-    if (sessionSide == SESSION_SIDE_SERVER){
+    if (sessionSide == SESSION_SIDE_SERVER) {
         if (getPeerDeviceIdResult == RET_OK) {
             channelStatusMap_[peerDevId] = true;
         }
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index 4ba570a50b..6318e1e06d 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -81,7 +81,6 @@ void InputDeviceCooperateSM::OnCooperateChanged(const std::string &networkId, bo
     CALL_DEBUG_ENTER;
     CooperationMessage msg = isOpen ? CooperationMessage::STATE_ON : CooperationMessage::STATE_OFF;
     delegateTasksCallback_(std::bind(&CooperateEventManager::OnCooperateMessage, CooperateEventMgr, msg, networkId));
-    // CooperateEventMgr->OnCooperateMessage(msg, networkId);
     if (!isOpen) {
         OnCloseCooperation(networkId, false);
     }
@@ -191,7 +190,8 @@ void InputDeviceCooperateSM::StartRemoteCooperate(const std::string &remoteNetwo
 {
     CALL_INFO_TRACE;
     CHKPV(delegateTasksCallback_);
-    delegateTasksCallback_(std::bind(&CooperateEventManager::OnCooperateMessage, CooperateEventMgr, CooperationMessage::INFO_START, remoteNetworkId));
+    delegateTasksCallback_(std::bind(&CooperateEventManager::OnCooperateMessage,
+        CooperateEventMgr, CooperationMessage::INFO_START, remoteNetworkId));
     std::lock_guard<std::mutex> guard(mutex_);
     isStarting_ = true;
 }
@@ -529,8 +529,8 @@ bool InputDeviceCooperateSM::InitDeviceManager()
         return false;
     }
     stateCallback_ = std::make_shared<MmiDeviceStateCallback>();
-    ret =
-        DistributedHardware::DeviceManager::GetInstance().RegisterDevStateCallback(MMI_DINPUT_PKG_NAME, "", stateCallback_);
+    ret = DistributedHardware::DeviceManager::GetInstance().RegisterDevStateCallback(MMI_DINPUT_PKG_NAME,
+        "", stateCallback_);
     if (ret != 0) {
         MMI_HILOGE("Register devStateCallback failed, ret:%{public}d", ret);
         return false;
-- 
Gitee


From d1ad7bd0ae716da8ba52d058c17a86cc4763f1b7 Mon Sep 17 00:00:00 2001
From: fuchao33 <fuchao33@huawei.com>
Date: Sat, 15 Oct 2022 16:27:58 +0800
Subject: [PATCH 040/360] =?UTF-8?q?Description:=20=E6=8C=87=E6=91=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20Sig:=20SIG=5FBscSoftSrv=20Feature=20or=20B?=
 =?UTF-8?q?ugfix:=20Feature=20Binary=20Source:=20No=20Signed-off-by:=20<zh?=
 =?UTF-8?q?enying.wu@thundersoft.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/js_input_device_cooperate_context.cpp |  2 +-
 .../include/input_device_manager.h            |  4 +-
 .../src/input_device_manager.cpp              | 62 +++++++++----------
 .../device_cooperate_softbus_adapter.h        |  2 +-
 .../include/device_cooperate_softbus_define.h | 13 ++--
 .../src/device_cooperate_softbus_adapter.cpp  | 48 +++++++-------
 .../src/input_device_cooperate_sm.cpp         |  2 +-
 .../src/input_device_cooperate_util.cpp       |  2 +-
 util/common/include/config_multimodal.h       |  2 +-
 9 files changed, 66 insertions(+), 71 deletions(-)

diff --git a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
index 2402c82896..5e7982c2ff 100755
--- a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
@@ -210,7 +210,7 @@ napi_value JsInputDeviceCooperateContext::On(napi_env env, napi_callback_info in
     char type[MAX_STRING_LEN] = {};
     size_t length = 0;
     CHKRP(env, napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &length), GET_STRING);
-    if (type == "cooperation") {
+    if (std::strcmp(type, "cooperation") != 0) {
         THROWERR(env, "Register listener failed, the first parameter is invalid");
         MMI_HILOGE("Register listener failed, the first parameter is invalid");
         return nullptr;
diff --git a/service/device_manager/include/input_device_manager.h b/service/device_manager/include/input_device_manager.h
index c0f1a862f0..5ee9f9d5dc 100644
--- a/service/device_manager/include/input_device_manager.h
+++ b/service/device_manager/include/input_device_manager.h
@@ -60,6 +60,8 @@ public:
     void RemoveDevListener(SessionPtr sess);
     void Dump(int32_t fd, const std::vector<std::string> &args);
     void DumpDeviceList(int32_t fd, const std::vector<std::string> &args);
+    bool IsRemote(struct libinput_device *inputDevice) const;
+    bool IsRemote(int32_t id) const;
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     std::string GetOriginNetworkId(int32_t id);
     std::string GetOriginNetworkId(const std::string &dhid);
@@ -67,8 +69,6 @@ public:
     std::vector<std::string> GetCooperateDhids(int32_t deviceId);
     std::vector<std::string> GetCooperateDhids(const std::string &dhid);
     bool HasLocalPointerDevice() const;
-    bool IsRemote(struct libinput_device *inputDevice) const;
-    bool IsRemote(int32_t id) const;
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     bool IsKeyboardDevice(struct libinput_device* device) const;
     bool IsPointerDevice(struct libinput_device* device) const;
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 9ed7eee00a..80730c080a 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -318,8 +318,8 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
 void InputDeviceManager::MakeDeviceInfo(struct libinput_device *inputDevice, struct InputDeviceInfo& info)
 {
     info.inputDeviceOrigin_ = inputDevice;
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
     info.isRemote_ = IsRemote(inputDevice);
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
     if (info.isRemote_) {
         info.networkIdOrigin_ = MakeNetworkId(libinput_device_get_phys(inputDevice));
     }
@@ -500,6 +500,35 @@ void InputDeviceManager::DumpDeviceList(int32_t fd, const std::vector<std::strin
     }
 }
 
+bool InputDeviceManager::IsRemote(struct libinput_device *inputDevice) const
+{
+    CHKPR(inputDevice, false);
+    bool isRemote = false;
+    const char* name = libinput_device_get_name(inputDevice);
+    if (name == nullptr || name[0] == '\0') {
+        MMI_HILOGD("Device name is empty");
+        return false;
+    }
+    std::string strName = name;
+    std::string::size_type pos = strName.find(VIRTUAL_DEVICE_NAME);
+    if (pos != std::string::npos) {
+        isRemote = true;
+    }
+    MMI_HILOGD("isRemote: %{public}s", isRemote == true ? "true" : "false");
+    return isRemote;
+}
+
+bool InputDeviceManager::IsRemote(int32_t id) const
+{
+    bool isRemote = false;
+    auto device = inputDevice_.find(id);
+    if (device != inputDevice_.end()) {
+        isRemote = device->second.isRemote_;
+    }
+    MMI_HILOGD("isRemote: %{public}s", isRemote == true ? "true" : "false");
+    return isRemote;
+}
+
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
 std::vector<std::string> InputDeviceManager::GetCooperateDhids(int32_t deviceId)
 {
@@ -520,9 +549,6 @@ std::vector<std::string> InputDeviceManager::GetCooperateDhids(int32_t deviceId)
     pointerNetworkId = iter->second.isRemote_ ? iter->second.networkIdOrigin_ : localNetworkId;
     for (const auto &item : inputDevice_) {
         auto networkId = item.second.isRemote_ ? item.second.networkIdOrigin_ : localNetworkId;
-        MMI_HILOGE("wuwu:devtargs: %{public}d, isRemote_:%{public}d, Supportkey:%{public}d, networkId: %{public}s",
-            libinput_device_get_tags(item.second.inputDeviceOrigin_), item.second.isRemote_,
-            GetDeviceSupportKey(item.first), networkId.c_str());
         if (networkId != pointerNetworkId) {
             continue;
         }
@@ -599,34 +625,6 @@ bool InputDeviceManager::HasLocalPointerDevice() const
     return false;
 }
 
-bool InputDeviceManager::IsRemote(struct libinput_device *inputDevice) const
-{
-    CHKPR(inputDevice, false);
-    bool isRemote = false;
-    const char* name = libinput_device_get_name(inputDevice);
-    if (name == nullptr || name[0] == '\0') {
-        return false;
-    }
-    std::string strName = name;
-    std::string::size_type pos = strName.find(VIRTUAL_DEVICE_NAME);
-    if (pos != std::string::npos) {
-        isRemote = true;
-    }
-    MMI_HILOGD("isRemote: %{public}s", isRemote == true ? "true" : "false");
-    return isRemote;
-}
-
-bool InputDeviceManager::IsRemote(int32_t id) const
-{
-    bool isRemote = false;
-    auto device = inputDevice_.find(id);
-    if (device != inputDevice_.end()) {
-        isRemote = device->second.isRemote_;
-    }
-    MMI_HILOGD("isRemote: %{public}s", isRemote == true ? "true" : "false");
-    return isRemote;
-}
-
 std::string InputDeviceManager::MakeNetworkId(const char *phys) const
 {
     std::string networkId;
diff --git a/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h b/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
index c4e391e772..37b164043c 100755
--- a/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
+++ b/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
@@ -52,7 +52,7 @@ private:
     DISALLOW_COPY_AND_MOVE(DeviceCooperateSoftbusAdapter);
     std::string FindDevice(int32_t sessionId);
     int32_t SendMsg(int32_t sessionId, const std::string &message);
-    int32_t CheckDeviceSessionState(const std::string &remoteDevId);
+    bool CheckDeviceSessionState(const std::string &remoteDevId);
     void HandleSessionData(int32_t sessionId, const std::string& messageData);
     int32_t WaitSessionOpend(const std::string &remoteDevId, int32_t sessionId);
     std::map<std::string, int32_t> sessionDevMap_;
diff --git a/service/input_device_cooperate/include/device_cooperate_softbus_define.h b/service/input_device_cooperate/include/device_cooperate_softbus_define.h
index 47f0b9c20f..9f503a39cb 100644
--- a/service/input_device_cooperate/include/device_cooperate_softbus_define.h
+++ b/service/input_device_cooperate/include/device_cooperate_softbus_define.h
@@ -23,7 +23,6 @@ namespace OHOS {
 namespace MMI {
 constexpr int32_t ENCRYPT_TAG_LEN = 32;
 constexpr int32_t MSG_MAX_SIZE = 45 * 1024;
-
 constexpr uint32_t SESSION_NAME_SIZE_MAX = 256;
 constexpr uint32_t DEVICE_ID_SIZE_MAX = 65;
 constexpr uint32_t INTERCEPT_STRING_LENGTH = 20;
@@ -43,11 +42,13 @@ const std::string GROUP_ID = "mmi_softbus_group_id";
 #define MMI_SOFTBUS_KEY_OTHER_DEVICE_ID "mmi_softbus_key_other_device_id"
 #define MMI_SOFTBUS_KEY_SESSION_ID "mmi_softbus_key_session_id"
 
-const uint32_t  REMOTE_COOPERATE_START = 1;
-const uint32_t  REMOTE_COOPERATE_START_RES = 2;
-const uint32_t  REMOTE_COOPERATE_STOP = 3;
-const uint32_t  REMOTE_COOPERATE_STOP_RES = 4;
-const uint32_t  REMOTE_COOPERATE_STOP_OTHER_RES = 5;
+enum {
+    REMOTE_COOPERATE_START = 1,
+    REMOTE_COOPERATE_START_RES = 2,
+    REMOTE_COOPERATE_STOP = 3,
+    REMOTE_COOPERATE_STOP_RES = 4,
+    REMOTE_COOPERATE_STOP_OTHER_RES = 5
+};
 }  // namespace MMI
 }  // namespace OHOS
 #endif  // MMI_SOFTBUS_DEFINE_H
diff --git a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
index c2d146e868..541301f8cf 100755
--- a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
+++ b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
@@ -33,7 +33,7 @@ namespace MMI {
 namespace {
 std::shared_ptr<DeviceCooperateSoftbusAdapter> g_instance = nullptr;
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "DeviceCooperateSoftbusAdapter" };
-const int32_t DINPUT_LINK_TYPE_MAX = 4;
+constexpr int32_t DINPUT_LINK_TYPE_MAX = 4;
 const SessionAttribute g_sessionAttr = {
     .dataType = SessionType::TYPE_BYTES,
     .linkTypeNum = DINPUT_LINK_TYPE_MAX,
@@ -165,40 +165,36 @@ void DeviceCooperateSoftbusAdapter::Release()
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
     std::for_each(sessionDevMap_.begin(), sessionDevMap_.end(), [](auto item) { CloseSession(item.second); });
     int32_t ret = RemoveSessionServer(MMI_DINPUT_PKG_NAME, localSessionName_.c_str());
-    MMI_HILOGD("RemoveSessionServer result:%{public}d", ret);
+    MMI_HILOGD("RemoveSessionServer ret:%{public}d", ret);
     sessionDevMap_.clear();
     channelStatusMap_.clear();
 }
 
-int32_t DeviceCooperateSoftbusAdapter::CheckDeviceSessionState(const std::string &devId)
+bool DeviceCooperateSoftbusAdapter::CheckDeviceSessionState(const std::string &devId)
 {
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    if (sessionDevMap_.find(devId) != sessionDevMap_.end()) {
-        return RET_OK;
-    } else {
+    if (sessionDevMap_.find(devId) == sessionDevMap_.end()) {
         MMI_HILOGE("Check session state error");
-        return RET_ERR;
+        return false;
     }
+    return true;
 }
 
 int32_t DeviceCooperateSoftbusAdapter::OpenInputSoftbus(const std::string &remoteDevId)
 {
     CALL_INFO_TRACE;
-    int32_t ret = CheckDeviceSessionState(remoteDevId);
-    if (ret == RET_OK) {
+    if (CheckDeviceSessionState(remoteDevId)) {
         MMI_HILOGD("Softbus session has already opened");
         return RET_OK;
     }
 
-    ret = Init();
+    int32_t ret = Init();
     if (ret != RET_OK) {
         MMI_HILOGE("CreateSessionServer failed");
         return RET_ERR;
     }
 
     std::string peerSessionName = SESSION_NAME + remoteDevId.substr(0, INTERCEPT_STRING_LENGTH);
-    MMI_HILOGI("OpenInputSoftbus peerSessionName:%{public}s", peerSessionName.c_str());
-
     int32_t sessionId = OpenSession(localSessionName_.c_str(), peerSessionName.c_str(), remoteDevId.c_str(),
         GROUP_ID.c_str(), &g_sessionAttr);
     if (sessionId < 0) {
@@ -210,6 +206,7 @@ int32_t DeviceCooperateSoftbusAdapter::OpenInputSoftbus(const std::string &remot
 
 int32_t DeviceCooperateSoftbusAdapter::WaitSessionOpend(const std::string &remoteDevId, int32_t sessionId)
 {
+    CALL_INFO_TRACE;
     std::unique_lock<std::mutex> waitLock(operationMutex_);
     sessionDevMap_[remoteDevId] = sessionId;
     auto status = openSessionWaitCond_.wait_for(waitLock, std::chrono::seconds(SESSION_WAIT_TIMEOUT_SECOND),
@@ -219,15 +216,15 @@ int32_t DeviceCooperateSoftbusAdapter::WaitSessionOpend(const std::string &remot
         return RET_ERR;
     }
     channelStatusMap_[remoteDevId] = false;
-    MMI_HILOGI("OpenSession finish");
     return RET_OK;
 }
 
 void DeviceCooperateSoftbusAdapter::CloseInputSoftbus(const std::string &remoteDevId)
 {
+    CALL_INFO_TRACE;
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
     if (sessionDevMap_.find(remoteDevId) == sessionDevMap_.end()) {
-        MMI_HILOGI("SessionDevIdMap Not find");
+        MMI_HILOGI("SessionDevIdMap not find");
         return;
     }
     int32_t sessionId = sessionDevMap_[remoteDevId];
@@ -266,7 +263,7 @@ int32_t DeviceCooperateSoftbusAdapter::StartRemoteCooperate(const std::string &l
     int32_t ret = SendMsg(sessionId, smsg);
     cJSON_free(smsg);
     if (ret != RET_OK) {
-        MMI_HILOGE("Start remote cooperate send session msg failed");
+        MMI_HILOGE("Start remote cooperate send session msg failed, ret: %{public}d", ret);
         return RET_ERR;
     }
     return RET_OK;
@@ -416,13 +413,12 @@ void DeviceCooperateSoftbusAdapter::HandleSessionData(int32_t sessionId, const s
 
 void DeviceCooperateSoftbusAdapter::OnBytesReceived(int32_t sessionId, const void *data, uint32_t dataLen)
 {
-    MMI_HILOGD("sessionId:%{public}d, dataLen:%{public}d", sessionId, dataLen);
+    MMI_HILOGD("dataLen:%{public}d", dataLen);
     if (sessionId < 0 || data == nullptr || dataLen <= 0) {
-        MMI_HILOGE("param check failed");
+        MMI_HILOGE("Param check failed");
         return;
     }
-    std::string message = std::string((const char *)data, dataLen);
-    MMI_HILOGD("message:%{public}s", message.c_str());
+    std::string message = std::string(static_cast<const char *>(data), dataLen);
     HandleSessionData(sessionId, message);
     return;
 }
@@ -445,13 +441,11 @@ std::string DeviceCooperateSoftbusAdapter::FindDevice(int32_t sessionId)
         return item.second == sessionId;
     });
 
-    std::string devId = "";
-    if (find_item != sessionDevMap_.end()) {
-        devId = (*find_item).first;
-    } else {
-        MMI_HILOGE("findKeyByValue error");
+    if (find_item == sessionDevMap_.end()) {
+        MMI_HILOGE("FindKeyByValue error");
+        return "";
     }
-    return devId;
+    return find_item->first;
 }
 
 int32_t DeviceCooperateSoftbusAdapter::OnSessionOpened(int32_t sessionId, int32_t result)
@@ -459,6 +453,7 @@ int32_t DeviceCooperateSoftbusAdapter::OnSessionOpened(int32_t sessionId, int32_
     CALL_INFO_TRACE;
     char peerDevId[DEVICE_ID_SIZE_MAX] = {};
     int32_t getPeerDeviceIdResult = GetPeerDeviceId(sessionId, peerDevId, sizeof(peerDevId));
+    MMI_HILOGD("Get peer device id ret: %{public}d", getPeerDeviceIdResult);
     if (result != RET_OK) {
         std::string deviceId = FindDevice(sessionId);
         MMI_HILOGE("Session open failed result: %{public}d", result);
@@ -477,8 +472,9 @@ int32_t DeviceCooperateSoftbusAdapter::OnSessionOpened(int32_t sessionId, int32_
     MMI_HILOGI("session open succeed, sessionId:%{public}d, sessionSide:%{public}d(1 is client side)",
         sessionId, sessionSide);
     if (sessionSide == SESSION_SIDE_SERVER) {
+        std::lock_guard<std::mutex> notifyLock(operationMutex_);
         if (getPeerDeviceIdResult == RET_OK) {
-            channelStatusMap_[peerDevId] = true;
+            sessionDevMap_[peerDevId] = sessionId;
         }
     } else {
         std::lock_guard<std::mutex> notifyLock(operationMutex_);
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index 6318e1e06d..b0bb53d1a1 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -54,6 +54,7 @@ void InputDeviceCooperateSM::Init(DelegateTasksCallback delegateTasksCallback)
     delegateTasksCallback_ = delegateTasksCallback;
     preparedNetworkId_ = std::make_pair("", "");
     currentStateSM_ = std::make_shared<InputDeviceCooperateStateFree>();
+    DevCooperateSoftbusAdapter->Init();
     TimerMgr->AddTimer(INTERVAL_MS, 1, [this]() {
         this->InitDeviceManager();
     });
@@ -122,7 +123,6 @@ void InputDeviceCooperateSM::EnableInputDeviceCooperate(bool enabled)
     CALL_INFO_TRACE;
     if (enabled) {
         BytraceAdapter::StartBytrace(BytraceAdapter::TRACE_START, BytraceAdapter::START_EVENT);
-        DevCooperateSoftbusAdapter->Init();
         DProfileAdapter->UpdateCrossingSwitchState(enabled, onlineDevice_);
         BytraceAdapter::StartBytrace(BytraceAdapter::TRACE_STOP, BytraceAdapter::START_EVENT);
     } else {
diff --git a/service/input_device_cooperate/src/input_device_cooperate_util.cpp b/service/input_device_cooperate/src/input_device_cooperate_util.cpp
index 94f249aaf6..f36df7252a 100644
--- a/service/input_device_cooperate/src/input_device_cooperate_util.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_util.cpp
@@ -22,7 +22,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateUtil"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateUtil" };
 } // namespace
 std::string GetLocalDeviceId()
 {
diff --git a/util/common/include/config_multimodal.h b/util/common/include/config_multimodal.h
index 2d0b8dbbf7..4f4d3a28f3 100644
--- a/util/common/include/config_multimodal.h
+++ b/util/common/include/config_multimodal.h
@@ -57,7 +57,7 @@ namespace MMI {
 #define ONCE_PROCESS_NETPACKET_LIMIT 100
 #define MAX_RECV_LIMIT 32
 #define INPUT_POINTER_DEVICE "input.pointer.device"
-#define MMI_DINPUT_PKG_NAME "ohos.mmi"
+#define MMI_DINPUT_PKG_NAME "ohos.multimodalinput.dinput"
 } // namespace MMI
 } // namespace OHOS
 #endif // CONFIG_MULTIMODAL_H
-- 
Gitee


From 404202304f5f5a410388ac3250cae7bdd8ecf203 Mon Sep 17 00:00:00 2001
From: test <gchenghu@126.com>
Date: Sun, 16 Oct 2022 16:57:04 +0800
Subject: [PATCH 041/360] modify

Signed-off-by: test <gchenghu@126.com>
---
 .../input_device_cooperate/src/input_device_cooperate_util.cpp  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/input_device_cooperate/src/input_device_cooperate_util.cpp b/service/input_device_cooperate/src/input_device_cooperate_util.cpp
index f36df7252a..87f2951775 100644
--- a/service/input_device_cooperate/src/input_device_cooperate_util.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_util.cpp
@@ -30,7 +30,7 @@ std::string GetLocalDeviceId()
     CHKPS(localNode);
     int32_t errCode = GetLocalNodeDeviceInfo(MMI_DINPUT_PKG_NAME, localNode.get());
     if (errCode != RET_OK) {
-        MMI_HILOGE("GetLocalNodeDeviceInfo errCode: %{public}d", errCode);
+        MMI_HILOGE("GetLocalNodeDeviceInfo errCode:%{public}d", errCode);
         return "";
     }
     return localNode->networkId;
-- 
Gitee


From d6a31635aba27572735255f88b1272a18c5e3b7a Mon Sep 17 00:00:00 2001
From: fuchao33 <fuchao33@huawei.com>
Date: Mon, 17 Oct 2022 11:26:41 +0800
Subject: [PATCH 042/360] =?UTF-8?q?Description:=20=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=20Sig:=20SIG=5FBscSoftSrv?=
 =?UTF-8?q?=20Feature=20or=20Bugfix:=20Feature=20Binary=20Source:=20No=20S?=
 =?UTF-8?q?igned-off-by:=20<zhenying.wu@thundersoft.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/device_manager/src/input_device_manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 80730c080a..3934d4f235 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -48,7 +48,7 @@ const std::string UNKNOWN_SCREEN_ID = "";
 const char *SPLIT_SYMBOL = "|";
 const std::string DH_ID_PREFIX = "Input_";
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-
+const std::string INPUT_VIRTUAL_DEVICE_NAME = "Hos Distributed Virtual Device ";
 std::unordered_map<int32_t, std::string> axisType = {
     {ABS_MT_TOUCH_MAJOR, "TOUCH_MAJOR"},
     {ABS_MT_TOUCH_MINOR, "TOUCH_MINOR"},
@@ -510,7 +510,7 @@ bool InputDeviceManager::IsRemote(struct libinput_device *inputDevice) const
         return false;
     }
     std::string strName = name;
-    std::string::size_type pos = strName.find(VIRTUAL_DEVICE_NAME);
+    std::string::size_type pos = strName.find(INPUT_VIRTUAL_DEVICE_NAME);
     if (pos != std::string::npos) {
         isRemote = true;
     }
-- 
Gitee


From 301c3490b9132c6bc51085180568f57e3c50be01 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 17 Oct 2022 19:34:44 +0800
Subject: [PATCH 043/360] =?UTF-8?q?inputdevice=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ib9121cd709b6026b53c9432b2313b1fce1f638ee
---
 .../napi/input_device/src/js_event_target.cpp | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/frameworks/napi/input_device/src/js_event_target.cpp b/frameworks/napi/input_device/src/js_event_target.cpp
index c24c33d258..29770f1591 100755
--- a/frameworks/napi/input_device/src/js_event_target.cpp
+++ b/frameworks/napi/input_device/src/js_event_target.cpp
@@ -215,21 +215,21 @@ void JsEventTarget::CallIdsAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("scope is nullptr");
         return;
     }
-    napi_value arr = nullptr;
-    CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &arr), CREATE_ARRAY, scope);
+    napi_value arr[2];
+    CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &arr[0]), GET_UNDEFINED, scope);
+    CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &arr[1]), CREATE_ARRAY, scope);
     uint32_t index = 0;
     napi_value value = nullptr;
     for (const auto &item : cb->data.ids) {
         CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, item, &value), CREATE_INT32, scope);
-        CHKRV_SCOPE(cb->env, napi_set_element(cb->env, arr, index, value), SET_ELEMENT, scope);
+        CHKRV_SCOPE(cb->env, napi_set_element(cb->env, arr[1], index, value), SET_ELEMENT, scope);
         ++index;
     }
-
+    
     napi_value handler = nullptr;
     CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
     napi_value result = nullptr;
-    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 1, &arr, &result),
-         CALL_FUNCTION, scope);
+    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, arr, &result), CALL_FUNCTION, scope);
     napi_close_handle_scope(cb->env, scope);
     JsUtil::DeleteCallbackInfo(std::move(cb));
 }
@@ -335,16 +335,13 @@ void JsEventTarget::CallDevAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("scope is nullptr");
         return;
     }
-    napi_value object = JsUtil::GetDeviceInfo(cb);
-    if (object == nullptr) {
-        MMI_HILOGE("Check object is null");
-        napi_close_handle_scope(cb->env, scope);
-        return;
-    }
+    napi_value object[2];
+    CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &object[0]), GET_UNDEFINED, scope);
+    object[1] = JsUtil::GetDeviceInfo(cb);
     napi_value handler = nullptr;
     CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
     napi_value result = nullptr;
-    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 1, &object, &result), CALL_FUNCTION,
+    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, object, &result), CALL_FUNCTION,
         scope);
     napi_close_handle_scope(cb->env, scope);
     JsUtil::DeleteCallbackInfo(std::move(cb));
-- 
Gitee


From 5ba8961ed48619c29ce9847ae1005886b8c4e526 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 18 Oct 2022 10:07:54 +0800
Subject: [PATCH 044/360] =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83-?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I37eb4740ea9975cb6553bdb4095647485fe8b9f0
---
 .../events/test/input_manager_manual_test.cpp |   6 +-
 .../proxy/events/test/input_manager_test.cpp  | 164 +++++++++---------
 .../include/input_windows_manager.h           |   3 +-
 .../simulateinputevent_fuzzer.cpp             |  24 +--
 util/common/include/config_multimodal.h       |  36 ++--
 util/common/include/error_multimodal.h        | 159 +++++++++++------
 util/common/src/uuid.cpp                      |   3 +-
 util/socket/test/uds_session_test.cpp         |   3 +-
 8 files changed, 234 insertions(+), 164 deletions(-)

diff --git a/frameworks/proxy/events/test/input_manager_manual_test.cpp b/frameworks/proxy/events/test/input_manager_manual_test.cpp
index a5ad896a7c..a3bb1dad9c 100644
--- a/frameworks/proxy/events/test/input_manager_manual_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_manual_test.cpp
@@ -182,8 +182,10 @@ HWTEST_F(InputManagerManualTest, HandlePointerEventFilter_001, TestSize.Level1)
 {
     CALL_DEBUG_ENTER;
     AddInputEventFilter();
-    SimulateInputEventHelper(10, 10, 1); // set physical x and physical y are 10, will expect value is 1
-    SimulateInputEventHelper(0, 0, 2); // set physical x and physical y are not 10, will expect value is 2
+    // set physical x and physical y are 10, will expect value is 1
+    SimulateInputEventHelper(10, 10, 1);
+    // set physical x and physical y are not 10, will expect value is 2
+    SimulateInputEventHelper(0, 0, 2);
 }
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 } // namespace MMI
diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 4cf44cf301..92f14264cf 100755
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -101,22 +101,22 @@ std::shared_ptr<PointerEvent> InputManagerTest::SetupPointerEvent001()
     auto pointerEvent = PointerEvent::Create();
     CHKPP(pointerEvent);
     PointerEvent::PointerItem item;
-    item.SetPointerId(0);   // test code，set the PointerId = 0
-    item.SetDisplayX(523);   // test code，set the DisplayX = 523
-    item.SetDisplayY(723);   // test code，set the DisplayY = 723
-    item.SetPressure(5);    // test code，set the Pressure = 5
-    item.SetDeviceId(1);    // test code，set the DeviceId = 1
+    item.SetPointerId(0);
+    item.SetDisplayX(523);
+    item.SetDisplayY(723);
+    item.SetPressure(5);
+    item.SetDeviceId(1);
     pointerEvent->AddPointerItem(item);
 
-    item.SetPointerId(1);   // test code，set the PointerId = 1
-    item.SetDisplayX(610);   // test code，set the DisplayX = 610
-    item.SetDisplayY(910);   // test code，set the DisplayY = 910
-    item.SetPressure(7);    // test code，set the Pressure = 7
-    item.SetDeviceId(1);    // test code，set the DeviceId = 1
+    item.SetPointerId(1);
+    item.SetDisplayX(610);
+    item.SetDisplayY(910);
+    item.SetPressure(7);
+    item.SetDeviceId(1);
     pointerEvent->AddPointerItem(item);
 
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
-    pointerEvent->SetPointerId(1);  // test code，set the PointerId = 1
+    pointerEvent->SetPointerId(1);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
     return pointerEvent;
 }
@@ -126,22 +126,22 @@ std::shared_ptr<PointerEvent> InputManagerTest::SetupPointerEvent002()
     auto pointerEvent = PointerEvent::Create();
     CHKPP(pointerEvent);
     PointerEvent::PointerItem item;
-    item.SetPointerId(0);   // test code，set the PointerId = 0
-    item.SetDisplayX(523);   // test code，set the DisplayX = 523
-    item.SetDisplayY(723);   // test code，set the DisplayY = 723
-    item.SetPressure(5);    // test code，set the Pressure = 5
-    item.SetDeviceId(1);    // test code，set the DeviceId = 1
+    item.SetPointerId(0);
+    item.SetDisplayX(523);
+    item.SetDisplayY(723);
+    item.SetPressure(5);
+    item.SetDeviceId(1);
     pointerEvent->AddPointerItem(item);
 
-    item.SetPointerId(1);   // test code，set the PointerId = 1
-    item.SetDisplayX(600);   // test code，set the DisplayX = 600
-    item.SetDisplayY(610);   // test code，set the DisplayY = 610
-    item.SetPressure(7);    // test code，set the Pressure = 7
-    item.SetDeviceId(1);    // test code，set the DeviceId = 1
+    item.SetPointerId(1);
+    item.SetDisplayX(600);
+    item.SetDisplayY(610);
+    item.SetPressure(7);
+    item.SetDeviceId(1);
     pointerEvent->AddPointerItem(item);
 
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_MOVE);
-    pointerEvent->SetPointerId(1);  // test code，set the PointerId = 1
+    pointerEvent->SetPointerId(1);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
     return pointerEvent;
 }
@@ -151,22 +151,22 @@ std::shared_ptr<PointerEvent> InputManagerTest::SetupPointerEvent003()
     auto pointerEvent = PointerEvent::Create();
     CHKPP(pointerEvent);
     PointerEvent::PointerItem item;
-    item.SetPointerId(0);   // test code，set the PointerId = 0
-    item.SetDisplayX(523);   // test code，set the DisplayX = 523
-    item.SetDisplayY(723);   // test code，set the DisplayY = 723
-    item.SetPressure(5);    // test code，set the Pressure = 5
-    item.SetDeviceId(1);    // test code，set the DeviceId = 1
+    item.SetPointerId(0);
+    item.SetDisplayX(523);
+    item.SetDisplayY(723);
+    item.SetPressure(5);
+    item.SetDeviceId(1);
     pointerEvent->AddPointerItem(item);
 
-    item.SetPointerId(1);   // test code，set the PointerId = 1
-    item.SetDisplayX(623);   // test code，set the DisplayX = 623
-    item.SetDisplayY(823);   // test code，set the DisplayY = 823
-    item.SetPressure(0);    // test code，set the Pressure = 0
-    item.SetDeviceId(1);    // test code，set the DeviceId = 1
+    item.SetPointerId(1);
+    item.SetDisplayX(623);
+    item.SetDisplayY(823); 
+    item.SetPressure(0);
+    item.SetDeviceId(1);
     pointerEvent->AddPointerItem(item);
 
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_UP);
-    pointerEvent->SetPointerId(1);  // test code，set the PointerId = 1
+    pointerEvent->SetPointerId(1);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
     return pointerEvent;
 }
@@ -532,16 +532,16 @@ std::shared_ptr<PointerEvent> InputManagerTest::TestMarkConsumedStep1()
     auto pointerEvent = PointerEvent::Create();
     CHKPP(pointerEvent);
     PointerEvent::PointerItem item;
-    item.SetPointerId(0);   // test code，set the PointerId = 0
-    item.SetDisplayX(523);   // test code，set the DisplayX = 523
-    item.SetDisplayY(723);   // test code，set the DisplayY = 723
-    item.SetPressure(5);    // test code，set the Pressure = 5
-    item.SetDeviceId(1);    // test code，set the DeviceId = 1
+    item.SetPointerId(0);
+    item.SetDisplayX(523);
+    item.SetDisplayY(723);
+    item.SetPressure(5);
+    item.SetDeviceId(1);
     pointerEvent->AddPointerItem(item);
 
     pointerEvent->SetId(std::numeric_limits<int32_t>::max() - INDEX_THIRD);
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
-    pointerEvent->SetPointerId(0);  // test code，set the PointerId = 1
+    pointerEvent->SetPointerId(0);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
 
 #if defined(OHOS_BUILD_ENABLE_TOUCH) && defined(OHOS_BUILD_ENABLE_MONITOR)
@@ -556,16 +556,16 @@ std::shared_ptr<PointerEvent> InputManagerTest::TestMarkConsumedStep2()
     auto pointerEvent = PointerEvent::Create();
     CHKPP(pointerEvent);
     PointerEvent::PointerItem item;
-    item.SetPointerId(0);   // test code，set the PointerId = 0
-    item.SetDisplayX(623);  // test code，set the DisplayX = 623
-    item.SetDisplayY(723);   // test code，set the DisplayY = 723
-    item.SetPressure(5);    // test code，set the Pressure = 5
-    item.SetDeviceId(1);    // test code，set the DeviceId = 1
+    item.SetPointerId(0);
+    item.SetDisplayX(623);
+    item.SetDisplayY(723);
+    item.SetPressure(5);
+    item.SetDeviceId(1);
     pointerEvent->AddPointerItem(item);
 
     pointerEvent->SetId(std::numeric_limits<int32_t>::max() - INDEX_SECOND);
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_MOVE);
-    pointerEvent->SetPointerId(0);  // test code，set the PointerId = 1
+    pointerEvent->SetPointerId(0);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
 
 #if defined(OHOS_BUILD_ENABLE_TOUCH) && defined(OHOS_BUILD_ENABLE_MONITOR)
@@ -588,16 +588,16 @@ void InputManagerTest::TestMarkConsumedStep4()
     auto pointerEvent = PointerEvent::Create();
     CHKPV(pointerEvent);
     PointerEvent::PointerItem item;
-    item.SetPointerId(0);   // test code，set the PointerId = 0
-    item.SetDisplayX(523);  // test code，set the DisplayX = 523
-    item.SetDisplayY(723);   // test code，set the DisplayY = 723
-    item.SetPressure(5);    // test code，set the Pressure = 5
-    item.SetDeviceId(1);    // test code，set the DeviceId = 1
+    item.SetPointerId(0);
+    item.SetDisplayX(523);
+    item.SetDisplayY(723);
+    item.SetPressure(5);
+    item.SetDeviceId(1);
     pointerEvent->AddPointerItem(item);
 
     pointerEvent->SetId(std::numeric_limits<int32_t>::max() - INDEX_FIRST);
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_MOVE);
-    pointerEvent->SetPointerId(0);  // test code，set the PointerId = 1
+    pointerEvent->SetPointerId(0);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
 
 #if defined(OHOS_BUILD_ENABLE_TOUCH) && defined(OHOS_BUILD_ENABLE_MONITOR)
@@ -611,16 +611,16 @@ void InputManagerTest::TestMarkConsumedStep5()
     auto pointerEvent = PointerEvent::Create();
     CHKPV(pointerEvent);
     PointerEvent::PointerItem item;
-    item.SetPointerId(0);   // test code，set the PointerId = 0
-    item.SetDisplayX(523);  // test code，set the DisplayX = 523
-    item.SetDisplayY(723);   // test code，set the DisplayY = 723
-    item.SetPressure(5);    // test code，set the Pressure = 5
-    item.SetDeviceId(1);    // test code，set the DeviceId = 1
+    item.SetPointerId(0);
+    item.SetDisplayX(523);
+    item.SetDisplayY(723);
+    item.SetPressure(5);
+    item.SetDeviceId(1);
     pointerEvent->AddPointerItem(item);
 
     pointerEvent->SetId(std::numeric_limits<int32_t>::max());
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_UP);
-    pointerEvent->SetPointerId(0);  // test code，set the PointerId = 0
+    pointerEvent->SetPointerId(0);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
 
 #if defined(OHOS_BUILD_ENABLE_TOUCH) && defined(OHOS_BUILD_ENABLE_MONITOR)
@@ -635,16 +635,16 @@ void InputManagerTest::TestMarkConsumedStep6()
     auto pointerEvent = PointerEvent::Create();
     CHKPV(pointerEvent);
     PointerEvent::PointerItem item;
-    item.SetPointerId(0);   // test code，set the PointerId = 0
-    item.SetDisplayX(523);   // test code，set the DisplayX = 523
-    item.SetDisplayY(723);   // test code，set the DisplayY = 723
-    item.SetPressure(5);    // test code，set the Pressure = 5
-    item.SetDeviceId(1);    // test code，set the DeviceId = 1
+    item.SetPointerId(0);
+    item.SetDisplayX(523);
+    item.SetDisplayY(723);
+    item.SetPressure(5);
+    item.SetDeviceId(1);
     pointerEvent->AddPointerItem(item);
 
     pointerEvent->SetId(std::numeric_limits<int32_t>::max());
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
-    pointerEvent->SetPointerId(0);  // test code，set the PointerId = 0
+    pointerEvent->SetPointerId(0);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
 
     TestUtil->SetRecvFlag(RECV_FLAG::RECV_FOCUS);
@@ -1783,20 +1783,20 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_006, TestSize.Level1)
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     PointerEvent::PointerItem item;
-    item.SetPointerId(0);   // test code，set the PointerId = 0
-    item.SetDisplayX(523);   // test code，set the DisplayX = 523
-    item.SetDisplayY(723);   // test code，set the DisplayY = 723
-    item.SetPressure(5);    // test code，set the Pressure = 5
-    item.SetDeviceId(1);    // test code，set the DeviceId = 1
+    item.SetPointerId(0);
+    item.SetDisplayX(523);
+    item.SetDisplayY(723);
+    item.SetPressure(5);
+    item.SetDeviceId(1);
     pointerEvent->AddPointerItem(item);
-    item.SetPointerId(1);   // test code，set the PointerId = 1
-    item.SetDisplayX(710);   // test code，set the DisplayX = 710
-    item.SetDisplayY(910);   // test code，set the DisplayY = 910
-    item.SetPressure(7);    // test code，set the Pressure = 7
-    item.SetDeviceId(1);    // test code，set the DeviceId = 1
+    item.SetPointerId(1);
+    item.SetDisplayX(710);
+    item.SetDisplayY(910);
+    item.SetPressure(7);
+    item.SetDeviceId(1);
     pointerEvent->AddPointerItem(item);
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_UP);
-    pointerEvent->SetPointerId(1);  // test code，set the PointerId = 1
+    pointerEvent->SetPointerId(1);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
 
     auto interceptor = GetPtr<InputEventCallback>();
@@ -3413,18 +3413,18 @@ std::shared_ptr<PointerEvent> InputManagerTest::SetupTabletToolEvent001()
     auto pointerEvent = PointerEvent::Create();
     CHKPP(pointerEvent);
     PointerEvent::PointerItem item;
-    item.SetPointerId(DEFAULT_POINTER_ID);   // test code，set the PointerId = 0
-    item.SetDisplayX(523);   // test code，set the DisplayX = 523
-    item.SetDisplayY(723);   // test code，set the DisplayY = 723
-    item.SetPressure(0.7);    // test code，set the Pressure = 0.7
-    item.SetTiltX(10.0);     // test code，set the TiltX = 10.0
-    item.SetTiltY(-9.0);     // test code，set the TiltX = -9.0
-    item.SetDeviceId(DEFAULT_DEVICE_ID);    // test code，set the DeviceId = 0
+    item.SetPointerId(DEFAULT_POINTER_ID);
+    item.SetDisplayX(523);
+    item.SetDisplayY(723);
+    item.SetPressure(0.7);
+    item.SetTiltX(10.0);
+    item.SetTiltY(-9.0);
+    item.SetDeviceId(DEFAULT_DEVICE_ID);
     item.SetToolType(PointerEvent::TOOL_TYPE_PEN);
     pointerEvent->AddPointerItem(item);
 
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
-    pointerEvent->SetPointerId(DEFAULT_POINTER_ID);  // test code，set the PointerId = 0
+    pointerEvent->SetPointerId(DEFAULT_POINTER_ID);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
     return pointerEvent;
 }
diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
index 3deb8af47d..1e2e568168 100644
--- a/service/window_manager/include/input_windows_manager.h
+++ b/service/window_manager/include/input_windows_manager.h
@@ -140,7 +140,8 @@ private:
     std::map<int32_t, std::map<int32_t, int32_t>> pointerStyle_;
 #endif // OHOS_BUILD_ENABLE_POINTER
     DisplayGroupInfo displayGroupInfo_;
-    MouseLocation mouseLocation_ = { -1, -1 }; // physical coord
+    // physical coord
+    MouseLocation mouseLocation_ = { -1, -1 };
 };
 
 #define WinMgr ::OHOS::DelayedSingleton<InputWindowsManager>::GetInstance()
diff --git a/test/fuzztest/simulateinputevent_fuzzer/simulateinputevent_fuzzer.cpp b/test/fuzztest/simulateinputevent_fuzzer/simulateinputevent_fuzzer.cpp
index 7a30321e14..e2367cb98c 100644
--- a/test/fuzztest/simulateinputevent_fuzzer/simulateinputevent_fuzzer.cpp
+++ b/test/fuzztest/simulateinputevent_fuzzer/simulateinputevent_fuzzer.cpp
@@ -76,21 +76,21 @@ bool SimulateInputEventFuzzTest(const uint8_t* data, size_t size)
     auto pointerDownEvent = PointerEvent::Create();
     CHKPF(pointerDownEvent);
     PointerEvent::PointerItem downitem;
-    downitem.SetPointerId(0);   // test code，set the PointerId = 0
+    downitem.SetPointerId(0);
     int32_t physicalX;
     startPos += GetObject<int32_t>(physicalX, data + startPos, size - startPos);
-    downitem.SetDisplayX(physicalX);   // test code，set the DisplayX = 823
+    downitem.SetDisplayX(physicalX);
     int32_t physicalY;
     startPos += GetObject<int32_t>(physicalY, data + startPos, size - startPos);
-    downitem.SetDisplayY(physicalY);   // test code，set the DisplayY = 723
+    downitem.SetDisplayY(physicalY);
     int32_t pressure;
     startPos += GetObject<int32_t>(pressure, data + startPos, size - startPos);
-    downitem.SetPressure(pressure);    // test code，set the Pressure = 5
-    downitem.SetDeviceId(1);    // test code，set the DeviceId = 1
+    downitem.SetPressure(pressure);
+    downitem.SetDeviceId(1);
     pointerDownEvent->AddPointerItem(downitem);
     pointerDownEvent->SetId(std::numeric_limits<int32_t>::max());
     pointerDownEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
-    pointerDownEvent->SetPointerId(0);  // test code，set the PointerId = 1
+    pointerDownEvent->SetPointerId(0);
     pointerDownEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
     MMI_HILOGD("Call InputManager::SimulatePointerEvent");
     InputManager::GetInstance()->SimulateInputEvent(pointerDownEvent);
@@ -98,15 +98,15 @@ bool SimulateInputEventFuzzTest(const uint8_t* data, size_t size)
     auto pointerUpEvent = PointerEvent::Create();
     CHKPF(pointerUpEvent);
     PointerEvent::PointerItem upitem;
-    upitem.SetPointerId(0);   // test code，set the PointerId = 0
-    upitem.SetDisplayX(physicalX);   // test code，set the DisplayX = 823
-    upitem.SetDisplayY(physicalY);   // test code，set the DisplayY = 723
-    upitem.SetPressure(pressure);    // test code，set the Pressure = 5
-    upitem.SetDeviceId(1);    // test code，set the DeviceId = 1
+    upitem.SetPointerId(0);
+    upitem.SetDisplayX(physicalX);
+    upitem.SetDisplayY(physicalY);
+    upitem.SetPressure(pressure);
+    upitem.SetDeviceId(1);
     pointerUpEvent->AddPointerItem(upitem);
     pointerUpEvent->SetId(std::numeric_limits<int32_t>::max());
     pointerUpEvent->SetPointerAction(PointerEvent::POINTER_ACTION_UP);
-    pointerUpEvent->SetPointerId(0);  // test code，set the PointerId = 1
+    pointerUpEvent->SetPointerId(0);
     pointerUpEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
     MMI_HILOGD("Call InputManager::SimulatePointerEvent");
     InputManager::GetInstance()->SimulateInputEvent(pointerUpEvent);
diff --git a/util/common/include/config_multimodal.h b/util/common/include/config_multimodal.h
index cb6137ec1d..2fdd68f2a0 100644
--- a/util/common/include/config_multimodal.h
+++ b/util/common/include/config_multimodal.h
@@ -18,7 +18,8 @@
 
 namespace OHOS {
 namespace MMI {
-#define DEF_SEAT_ID "seat0"         // Default libinput seat
+// Default libinput seat
+#define DEF_SEAT_ID "seat0"
 
 #define DEF_MMI_EVENT_INJECTION "/system/bin/mmi-event-injection"
 #define DEF_MMI_VIRTUAL_DEVICE_MANAGER "/system/bin/mmi-virtual-device-manager"
@@ -32,22 +33,33 @@ namespace MMI {
 #define DEF_SCREEN_MAX_WIDTH 480
 #define DEF_SCREEN_MAX_HEIGHT 960
 
-#define MAX_PACKET_BUF_SIZE (1024*8)                // Maximum buffer size of network packets
-#define MAX_STREAM_BUF_SIZE (MAX_PACKET_BUF_SIZE*2) // Maximum buffer size of socket stream
+// Maximum buffer size of network packets
+#define MAX_PACKET_BUF_SIZE (1024*8)
+// Maximum buffer size of socket stream
+#define MAX_STREAM_BUF_SIZE (MAX_PACKET_BUF_SIZE*2)
 #define MAX_VECTOR_SIZE 1000
 #define MAX_INPUT_DEVICE 64
 #define MAX_SUPPORT_KEY 5
 #define MAX_KEY_SIZE 395
 
-#define MAX_LIST_SIZE 100                   // Instantaneous maximum listening buffer size of socket
-#define MAX_SESSON_ALARM 300                // Client quantity warning value
-#define MAX_EVENT_SIZE 100                  // Epoll create maximum event size
-#define DEFINE_EPOLL_TIMEOUT 1000           // Default epoll write timeout
-#define CLIENT_RECONNECT_COOLING_TIME 800   // Client reconnection cooldown
-#define SERVER_RESTART_COOLING_TIME 2000    // Server failure restart cooldown
-#define MAX_THREAD_DEATH_TIME (6*1000)      // Thread death threshold time
-#define MMISEVER_WMS_DEVICE_ADDED 1         // notifyDeviceChange@Device added
-#define MMISEVER_WMS_DEVICE_REMOVE 2        // notifyDeviceChange@Device removed
+// Instantaneous maximum listening buffer size of socket
+#define MAX_LIST_SIZE 100
+// Client quantity warning value
+#define MAX_SESSON_ALARM 300
+// Epoll create maximum event size
+#define MAX_EVENT_SIZE 100
+// Default epoll write timeout
+#define DEFINE_EPOLL_TIMEOUT 1000
+// Client reconnection cooldown
+#define CLIENT_RECONNECT_COOLING_TIME 800
+// Server failure restart cooldown
+#define SERVER_RESTART_COOLING_TIME 2000
+// Thread death threshold time
+#define MAX_THREAD_DEATH_TIME (6*1000)
+// notifyDeviceChange@Device added
+#define MMISEVER_WMS_DEVICE_ADDED 1
+// notifyDeviceChange@Device removed
+#define MMISEVER_WMS_DEVICE_REMOVE 2
 #ifndef OHOS_BUILD_ENABLE_COOPERATE
     #define SEND_RETRY_LIMIT 32
 #else
diff --git a/util/common/include/error_multimodal.h b/util/common/include/error_multimodal.h
index 55ddfe65af..778203b801 100644
--- a/util/common/include/error_multimodal.h
+++ b/util/common/include/error_multimodal.h
@@ -34,73 +34,125 @@ enum MmiModuleType {
 constexpr ErrCode CLIENT_ERR_OFFSET = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_CLIENT);
 
 enum {
-    EVENT_CONSUM_FAIL = CLIENT_ERR_OFFSET,     // 事件消费失败
-    CHECK_PERMISSION_FAIL                      // APL鉴权失败
+    // 事件消费失败
+    EVENT_CONSUM_FAIL = CLIENT_ERR_OFFSET,
+    // APL鉴权失败
+    CHECK_PERMISSION_FAIL
 };
 // Error code for event simulate
 constexpr ErrCode EVENT_SIMULATE_ERR_OFFSET = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_EVENT_SIMULATE);
 
 enum {
-    FILE_OPEN_FAIL = EVENT_SIMULATE_ERR_OFFSET, // 文件打开失败
-    STREAM_BUF_READ_FAIL,                       // 流缓冲读取失败
-    EVENT_REG_FAIL,                             // 事件注册失败
-    PARAM_INPUT_FAIL                            // 注入携带参数错误
+    // 文件打开失败
+    FILE_OPEN_FAIL = EVENT_SIMULATE_ERR_OFFSET,
+    // 流缓冲读取失败
+    STREAM_BUF_READ_FAIL,
+    // 事件注册失败
+    EVENT_REG_FAIL,
+    // 注入携带参数错误
+    PARAM_INPUT_FAIL
 };
 // Error code for server
 constexpr ErrCode SERVER_ERR_OFFSET = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_SERVER);
 
 enum {
-    MSG_SEND_FAIL = SERVER_ERR_OFFSET,          // 发送消息失败
-    UNKNOWN_EVENT,                              // 未知的事件
-    ERROR_NULL_POINTER,                         // 空指针
-    WINDOWS_MSG_INIT_FAIL,                      // 窗口管理器初始化失败
-    LIBINPUT_INIT_FAIL,                         // libinput初始化失败
-    PARAM_INPUT_INVALID,                        // 无效的输入参数
-    KEY_EVENT_DISP_FAIL,                        // 键盘事件派发失败
-    MEMCPY_SEC_FUN_FAIL,                        // memcpy安全函数错误
-    KEY_EVENT_PKG_FAIL,                         // 键盘事件封装失败
-    SPRINTF_S_SEC_FUN_FAIL,                     // sprintf_s安全函数错误
-    MULTIDEVICE_SAME_EVENT_MARK,                // 多设备相同事件返回标志
-    GESTURE_EVENT_PKG_FAIL,                     // GESTURE_SWIPE事件封装失败
-    GESTURE_EVENT_DISP_FAIL,                    // gesture swipe事件派发失败
-    SASERVICE_INIT_FAIL,                        // SA_Service初始化错误
-    SASERVICE_PERMISSION_FAIL,                  // SA_Service权限不足
-    ADD_SESSION_FAIL,                           // 增加session错误
-    MAKE_SHARED_FAIL,                           // make_shared错误
-    FCNTL_FAIL,                                 // fcntl 函数调用错误
-    PACKET_WRITE_FAIL,                          // 写入数据错误
-    PACKET_READ_FAIL,                           // 读取数据错误
-    POINTER_DRAW_INIT_FAIL,                     // 初始化画鼠标失败
-    MMISERVICE_NOT_RUNNING,                     // 多模服务未启动
-    ETASKS_INIT_FAIL,                           // 代理任务启动失败
-    ETASKS_QUEUE_FULL,                          // 委托任务队列已满
-    ETASKS_WAIT_TIMEOUT,                        // 委托任务wait超时
-    ETASKS_WAIT_DEFERRED,                       // 委托任务wait延期
-    ETASKS_POST_SYNCTASK_FAIL,                  // 生成同步任务失败
-    ETASKS_POST_ASYNCTASK_FAIL,                 // 生成异步任务失败
-    DUMP_PARAM_ERR                              // DUMP参数错误
+    // 发送消息失败
+    MSG_SEND_FAIL = SERVER_ERR_OFFSET,
+    // 未知的事件
+    UNKNOWN_EVENT,
+    // 空指针
+    ERROR_NULL_POINTER,
+    // 窗口管理器初始化失败
+    WINDOWS_MSG_INIT_FAIL,
+    // libinput初始化失败
+    LIBINPUT_INIT_FAIL,
+    // 无效的输入参数
+    PARAM_INPUT_INVALID,
+    // 键盘事件派发失败
+    KEY_EVENT_DISP_FAIL,
+    // memcpy安全函数错误
+    MEMCPY_SEC_FUN_FAIL,
+    // 键盘事件封装失败
+    KEY_EVENT_PKG_FAIL,
+    // sprintf_s安全函数错误
+    SPRINTF_S_SEC_FUN_FAIL,
+    // 多设备相同事件返回标志
+    MULTIDEVICE_SAME_EVENT_MARK,
+    // GESTURE_SWIPE事件封装失败
+    GESTURE_EVENT_PKG_FAIL,
+    // gesture swipe事件派发失败
+    GESTURE_EVENT_DISP_FAIL,
+    // SA_Service初始化错误
+    SASERVICE_INIT_FAIL,
+    // SA_Service权限不足
+    SASERVICE_PERMISSION_FAIL,
+    // 增加session错误
+    ADD_SESSION_FAIL,
+    // make_shared错误
+    MAKE_SHARED_FAIL,
+    // fcntl 函数调用错误
+    FCNTL_FAIL,
+    // 写入数据错误
+    PACKET_WRITE_FAIL,
+    // 读取数据错误
+    PACKET_READ_FAIL,
+    // 初始化画鼠标失败
+    POINTER_DRAW_INIT_FAIL,
+    // 多模服务未启动
+    MMISERVICE_NOT_RUNNING,
+    // 代理任务启动失败
+    ETASKS_INIT_FAIL,
+    // 委托任务队列已满
+    ETASKS_QUEUE_FULL,
+    // 委托任务wait超时
+    ETASKS_WAIT_TIMEOUT,
+    // 委托任务wait延期
+    ETASKS_WAIT_DEFERRED,
+    // 生成同步任务失败
+    ETASKS_POST_SYNCTASK_FAIL,
+    // 生成异步任务失败
+    ETASKS_POST_ASYNCTASK_FAIL,
+    // DUMP参数错误
+    DUMP_PARAM_ERR
 };
 // Error code for util
 constexpr ErrCode UTIL_ERR_OFFSET = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_UTIL);
 
 enum {
-    NON_STD_EVENT = UTIL_ERR_OFFSET,            // 非标准化事件
-    UNPROC_MSG,                                 // 未处理的消息
-    UNKNOWN_MSG_ID,                             // 未知消息ID
-    UNKNOWN_DEV,                                // 未知设备
-    FILE_READ_FAIL,                             // 文件读取失败
-    FILE_WRITE_FAIL,                            // 文件写入失败
-    API_PARAM_TYPE_FAIL,                        // api参数类型错误
-    API_OUT_OF_RANGE,                           // api返回值超出定义范围
-    FOCUS_ID_OBTAIN_FAIL,                       // 获取focus_id失败
-    EPOLL_CREATE_FAIL,                          // EPOLL创建失败
-    EPOLL_MODIFY_FAIL,                          // 修改EPOLL失败
-    STREAM_BUF_WRITE_FAIL,                      // 流缓冲写入失败
-    VAL_NOT_EXP,                                // 值不符合预期
-    MEM_NOT_ENOUGH,                             // 没有足够的内存
-    MEM_OUT_OF_BOUNDS,                          // 内存越界
-    SESSION_NOT_FOUND,                          // 没有找到session
-    INVALID_MONITOR_MON                         // 监听增加失败
+    // 非标准化事件
+    NON_STD_EVENT = UTIL_ERR_OFFSET,
+    // 未处理的消息
+    UNPROC_MSG,
+    // 未知消息ID
+    UNKNOWN_MSG_ID,
+    // 未知设备
+    UNKNOWN_DEV,
+    // 文件读取失败
+    FILE_READ_FAIL,
+    // 文件写入失败
+    FILE_WRITE_FAIL,
+    // api参数类型错误
+    API_PARAM_TYPE_FAIL,
+    // api返回值超出定义范围
+    API_OUT_OF_RANGE,
+    // 获取focus_id失败
+    FOCUS_ID_OBTAIN_FAIL,
+    // EPOLL创建失败
+    EPOLL_CREATE_FAIL,
+    // 修改EPOLL失败
+    EPOLL_MODIFY_FAIL,
+    // 流缓冲写入失败
+    STREAM_BUF_WRITE_FAIL,
+    // 值不符合预期
+    VAL_NOT_EXP,
+    // 没有足够的内存
+    MEM_NOT_ENOUGH,
+    // 内存越界
+    MEM_OUT_OF_BOUNDS,
+    // 没有找到session
+    SESSION_NOT_FOUND,
+    // 监听增加失败
+    INVALID_MONITOR_MON
 };
 
 enum REGISTER {
@@ -109,7 +161,8 @@ enum REGISTER {
 };
 
 enum MMI_SERVICE_STATUS {
-    MMI_SERVICE_INVALID = -1, // 多模服务不存在，多模输入服务异常
+    // 多模服务不存在，多模输入服务异常
+    MMI_SERVICE_INVALID = -1,
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/util/common/src/uuid.cpp b/util/common/src/uuid.cpp
index 346a73f1a4..7284e5e288 100644
--- a/util/common/src/uuid.cpp
+++ b/util/common/src/uuid.cpp
@@ -121,7 +121,8 @@ void Uuid::ConvertToStdString(std::string& s) const
         if (writePos <= uuidBufMaxSize) {
             uuidBuf[writePos++] = ConvertToHex(low4Bit);
             uuidBuf[writePos++] = ConvertToHex(high4Bit);
-            if (i == 3 || i == 5 || i == 7 || i == 9) { // 3 5 7 9 uuid 按标准格式(8-4-4-4-12)分隔符
+            // 3 5 7 9 uuid 按标准格式(8-4-4-4-12)分隔符
+            if (i == 3 || i == 5 || i == 7 || i == 9) {
                 uuidBuf[writePos++] = '-';
             }
         }
diff --git a/util/socket/test/uds_session_test.cpp b/util/socket/test/uds_session_test.cpp
index e7ebee167c..cb939d8baf 100644
--- a/util/socket/test/uds_session_test.cpp
+++ b/util/socket/test/uds_session_test.cpp
@@ -32,7 +32,8 @@ public:
     static void SetUpTestCase(void) {}
     static void TearDownTestCase(void) {}
     static constexpr char PROGRAM_NAME[] = "uds_sesion_test";
-    const int32_t moduleType_ = 3; // 3 CONNECT_MODULE_TYPE_ST_TEST
+    // 3 CONNECT_MODULE_TYPE_ST_TEST
+    const int32_t moduleType_ = 3;
     static inline int32_t pid_ = 0;
     int32_t writeFd_ = -1;
     int32_t readFd_ = -1;
-- 
Gitee


From f4a297c6c8eee56ecb8cec740c7d71b123ec2bb1 Mon Sep 17 00:00:00 2001
From: berlin <zhouwenxuan1@huawei.com>
Date: Tue, 18 Oct 2022 10:11:04 +0800
Subject: [PATCH 045/360] Remove qjs in multimodalinput_input

issue: https://gitee.com/openharmony/arkui_ace_engine/issues/I5W8A9

Signed-off-by: berlin <zhouwenxuan1@huawei.com>
Change-Id: I82bf41fff66e9822efb8d659f3169e230a97c9af
---
 bundle.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bundle.json b/bundle.json
index 103405cafb..cda255e45a 100644
--- a/bundle.json
+++ b/bundle.json
@@ -62,7 +62,6 @@
         "common"
       ],
       "third_party": [
-        "quickjs",
         "node",
         "libuv",
         "json"
-- 
Gitee


From 49c9a5986637da54f732fa3863bf64a653480077 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 18 Oct 2022 14:40:16 +0800
Subject: [PATCH 046/360] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E5=90=8E=EF=BC=8C=E5=8F=91=E5=B8=83sa=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ia2c6ee82c89cc31062024c9eba549bce6732b6ef
---
 service/module_loader/src/mmi_service.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index d83b7108ea..095119f40d 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -214,10 +214,6 @@ bool MMIService::InitService()
         MMI_HILOGE("Service running status is not enabled");
         return false;
     }
-    if (!(Publish(this))) {
-        MMI_HILOGE("Service initialization failed");
-        return false;
-    }
     if (EpollCreat(MAX_EVENT_SIZE) < 0) {
         MMI_HILOGE("Create epoll failed");
         return false;
@@ -228,6 +224,10 @@ bool MMIService::InitService()
         EpollClose();
         return false;
     }
+    if (!(Publish(this))) {
+        MMI_HILOGE("Service initialization failed");
+        return false;
+    }
     MMI_HILOGI("AddEpoll, epollfd:%{public}d,fd:%{public}d", mmiFd_, epollFd_);
     return true;
 }
@@ -268,10 +268,6 @@ int32_t MMIService::Init()
         MMI_HILOGE("Create epoll failed");
         return EPOLL_CREATE_FAIL;
     }
-    if (!InitService()) {
-        MMI_HILOGE("Saservice init failed");
-        return SASERVICE_INIT_FAIL;
-    }
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     InputDevCooSM->Init();
 #endif // OHOS_BUILD_ENABLE_COOPERATE
@@ -289,6 +285,10 @@ int32_t MMIService::Init()
         std::placeholders::_2));
     KeyMapMgr->GetConfigKeyValue("default_keymap", KeyMapMgr->GetDefaultKeyId());
     OHOS::system::SetParameter(INPUT_POINTER_DEVICE, "false");
+    if (!InitService()) {
+        MMI_HILOGE("Saservice init failed");
+        return SASERVICE_INIT_FAIL;
+    }
     MMI_HILOGI("Set para input.pointer.device false");
     return RET_OK;
 }
-- 
Gitee


From e18d8fa7b707b970ec1fdc400e7bd22e68192f0b Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 19 Oct 2022 20:28:16 +0800
Subject: [PATCH 047/360] clean code alarm

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I45bbf6cf9b5a1002527a134a7cdebc1f9369992c
---
 .../src/js_input_device_context.cpp           |  5 ++-
 .../input_monitor/src/js_input_monitor.cpp    |  7 ++--
 .../napi/pointer/src/js_pointer_context.cpp   |  4 +--
 .../event_handler/src/bytrace_adapter.cpp     | 34 +++++++++----------
 .../proxy/events/include/event_log_helper.h   |  6 ++--
 .../proxy/events/test/input_manager_test.cpp  |  4 +--
 service/event_handler/src/anr_manager.cpp     |  4 +--
 util/common/include/util.h                    |  3 +-
 util/common/src/util.cpp                      |  9 +++--
 9 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/frameworks/napi/input_device/src/js_input_device_context.cpp b/frameworks/napi/input_device/src/js_input_device_context.cpp
index b14f573a3d..111d03bc16 100644
--- a/frameworks/napi/input_device/src/js_input_device_context.cpp
+++ b/frameworks/napi/input_device/src/js_input_device_context.cpp
@@ -31,6 +31,8 @@ enum KeyboardType {
     HANDWRITING_PEN = 4,
     REMOTE_CONTROL = 5,
 };
+constexpr uint32_t MIN_N_SIZE = 1;
+constexpr uint32_t MAX_N_SIZE = 5;
 } // namespace
 
 JsInputDeviceContext::JsInputDeviceContext()
@@ -297,7 +299,7 @@ napi_value JsInputDeviceContext::SupportKeys(napi_env env, napi_callback_info in
     }
     uint32_t size = 0;
     CHKRP(env, napi_get_array_length(env, argv[1], &size), GET_ARRAY_LENGTH);
-    if (size < 1 || size > 5) {
+    if (size < MIN_N_SIZE || size > MAX_N_SIZE) {
         MMI_HILOGE("Size range error");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "size range error");
         return nullptr;
@@ -353,6 +355,7 @@ napi_value JsInputDeviceContext::GetKeyboardType(napi_env env, napi_callback_inf
     JsInputDeviceContext *jsDev = JsInputDeviceContext::GetInstance(env);
     CHKPP(jsDev);
     auto jsInputDeviceMgr = jsDev->GetJsInputDeviceMgr();
+    CHKPP(jsInputDeviceMgr);
     if (argc == 1) {
         return jsInputDeviceMgr->GetKeyboardType(env, id);
     }
diff --git a/frameworks/napi/input_monitor/src/js_input_monitor.cpp b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
index 0d23b047e0..5df9209d92 100644
--- a/frameworks/napi/input_monitor/src/js_input_monitor.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
@@ -120,7 +120,8 @@ void InputMonitor::OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) cons
     callback(pointerEvent);
 }
 
-void InputMonitor::SetId(int32_t id) {
+void InputMonitor::SetId(int32_t id)
+{
     id_ = id;
 }
 
@@ -154,7 +155,7 @@ JsInputMonitor::JsInputMonitor(napi_env jsEnv, const std::string &typeName, napi
         MMI_HILOGE("The monitor is null");
         return;
     }
-    monitor_->SetCallback([jsId=id](std::shared_ptr<PointerEvent> pointerEvent) {
+    monitor_->SetCallback([jsId = id](std::shared_ptr<PointerEvent> pointerEvent) {
         auto& jsMonitor {JsInputMonMgr.GetMonitor(jsId)};
         CHKPV(jsMonitor);
         jsMonitor->OnPointerEvent(pointerEvent);
@@ -729,7 +730,7 @@ void JsInputMonitor::OnPointerEvent(std::shared_ptr<PointerEvent> pointerEvent)
             }
             return;
         }
-        uv_queue_work(loop, work, [](uv_work_t *work){}, &JsInputMonitor::JsCallback);
+        uv_queue_work(loop, work, [](uv_work_t *work) {}, &JsInputMonitor::JsCallback);
     }
 }
 
diff --git a/frameworks/napi/pointer/src/js_pointer_context.cpp b/frameworks/napi/pointer/src/js_pointer_context.cpp
index f4849eeec0..4c08a18ca3 100644
--- a/frameworks/napi/pointer/src/js_pointer_context.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_context.cpp
@@ -120,12 +120,12 @@ napi_value JsPointerContext::SetPointerVisible(napi_env env, napi_callback_info
     CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc == 0) {
         MMI_HILOGE("At least one parameter is required");
-        THROWERR_API9(env, COMMON_PARAMETER_ERROR, "visible" , "boolean");
+        THROWERR_API9(env, COMMON_PARAMETER_ERROR, "visible", "boolean");
         return nullptr;
     }
     if (!JsCommon::TypeOf(env, argv[0], napi_boolean)) {
         MMI_HILOGE("visible parameter type is wrong");
-        THROWERR_API9(env, COMMON_PARAMETER_ERROR, "visible" , "boolean");
+        THROWERR_API9(env, COMMON_PARAMETER_ERROR, "visible", "boolean");
         return nullptr;
     }
     bool visible = true;
diff --git a/frameworks/proxy/event_handler/src/bytrace_adapter.cpp b/frameworks/proxy/event_handler/src/bytrace_adapter.cpp
index a5074b42a4..d769c06add 100644
--- a/frameworks/proxy/event_handler/src/bytrace_adapter.cpp
+++ b/frameworks/proxy/event_handler/src/bytrace_adapter.cpp
@@ -24,25 +24,23 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "BytraceAdapter" };
+const std::string onKeyEvent { "OnKeyEvent" };
+const std::string onTouchEvent { "OnTouchEvent" };
+const std::string onPointerEvent { "OnPointerEvent" };
+const std::string keyEventDispatch { "KeyEventDispatch" };
+const std::string touchEventDispatch { "touchEventDispatch" };
+const std::string pointerEventDispatch { "PointerEventDispatch" };
+const std::string keyEventSubscribe { "KeyEventSubscribe" };
+const std::string pointerEventIntercept { "PointerEventIntercept" };
+const std::string touchEventIntercept { "TouchEventIntercept" };
+const std::string keyEventIntercept { "KeyEventIntercept" };
+const std::string startEvent { "StartEvent" };
+const std::string launchEvent { "LaunchEvent" };
+const std::string stopEvent { "StopEvent" };
+constexpr int32_t START_ID = 1;
+constexpr int32_t LAUNCH_ID = 2;
+constexpr int32_t STOP_ID = 3;
 } // namespace
-namespace {
-    std::string onKeyEvent = "OnKeyEvent";
-    std::string onTouchEvent = "OnTouchEvent";
-    std::string onPointerEvent = "OnPointerEvent";
-    std::string keyEventDispatch = "KeyEventDispatch";
-    std::string touchEventDispatch = "touchEventDispatch";
-    std::string pointerEventDispatch = "PointerEventDispatch";
-    std::string keyEventSubscribe = "KeyEventSubscribe";
-    std::string pointerEventIntercept = "PointerEventIntercept";
-    std::string touchEventIntercept = "TouchEventIntercept";
-    std::string keyEventIntercept = "KeyEventIntercept";
-    std::string startEvent = "StartEvent";
-    std::string launchEvent = "LaunchEvent";
-    std::string stopEvent = "StopEvent";
-    constexpr int32_t START_ID = 1;
-    constexpr int32_t LAUNCH_ID = 2;
-    constexpr int32_t STOP_ID = 3;
-}
 
 void BytraceAdapter::StartBytrace(std::shared_ptr<KeyEvent> keyEvent)
 {
diff --git a/frameworks/proxy/events/include/event_log_helper.h b/frameworks/proxy/events/include/event_log_helper.h
index 936bc47a3a..77524d908e 100644
--- a/frameworks/proxy/events/include/event_log_helper.h
+++ b/frameworks/proxy/events/include/event_log_helper.h
@@ -92,9 +92,9 @@ private:
                 "Pressure:%{public}.2f,ToolType:%{public}d,LongAxis:%{public}d,ShortAxis:%{public}d",
                 pointerId, item.GetDownTime(), item.IsPressed(), item.GetDisplayX(),
                 item.GetDisplayY(), item.GetWindowX(), item.GetWindowY(), item.GetWidth(), item.GetHeight(),
-                item.GetTiltX(), item.GetTiltY(), item.GetToolDisplayX(), item.GetToolDisplayY(), item.GetToolWindowX(),
-                item.GetToolWindowY(), item.GetToolWidth(), item.GetToolHeight(), item.GetPressure(), item.GetToolType(),
-                item.GetLongAxis(), item.GetShortAxis());
+                item.GetTiltX(), item.GetTiltY(), item.GetToolDisplayX(), item.GetToolDisplayY(),
+                item.GetToolWindowX(), item.GetToolWindowY(), item.GetToolWidth(), item.GetToolHeight(),
+                item.GetPressure(), item.GetToolType(), item.GetLongAxis(), item.GetShortAxis());
         }
         std::vector<int32_t> pressedKeys = event->GetPressedKeys();
         std::vector<int32_t>::const_iterator cItr = pressedKeys.cbegin();
diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 4cf44cf301..b3ca0937c7 100755
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -2998,7 +2998,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SetWindowInputEventConsumer_001, Tes
     ASSERT_TRUE(eventHandler != nullptr);
     uint64_t runnerThreadId = 0;
 
-    auto fun = [&]() {
+    auto fun = [&runnerThreadId]() {
         runnerThreadId = GetThisThreadId();
         MMI_HILOGD("Create eventHandler is threadId:%{public}" PRIu64, runnerThreadId);
         ASSERT_TRUE(runnerThreadId != 0);
@@ -3036,7 +3036,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SetWindowInputEventConsumer_002, Tes
     ASSERT_TRUE(eventHandler != nullptr);
     uint64_t runnerThreadId = 0;
 
-    auto fun = [&]() {
+    auto fun = [&runnerThreadId]() {
         runnerThreadId = GetThisThreadId();
         MMI_HILOGD("Create eventHandler is threadId:%{public}" PRIu64, runnerThreadId);
         ASSERT_TRUE(runnerThreadId != 0);
diff --git a/service/event_handler/src/anr_manager.cpp b/service/event_handler/src/anr_manager.cpp
index fdb9995c9b..3fd907922a 100644
--- a/service/event_handler/src/anr_manager.cpp
+++ b/service/event_handler/src/anr_manager.cpp
@@ -52,8 +52,8 @@ void ANRManager::MarkProcessed(int32_t eventType, int32_t eventId, SessionPtr se
         if (item != -1) {
             TimerMgr->RemoveTimer(item);
             anrTimerCount_--;
-            MMI_HILOGD("Remove anr timer, anr type:%{public}d, eventId:%{public}d, timer id:%{public}d, count:%{public}d",
-                eventType, eventId, item, anrTimerCount_);
+            MMI_HILOGD("Remove anr timer, anr type:%{public}d, eventId:%{public}d, timer id:%{public}d,"
+                "count:%{public}d", eventType, eventId, item, anrTimerCount_);
         }
     }
 }
diff --git a/util/common/include/util.h b/util/common/include/util.h
index 89143fee26..34450aa9e9 100644
--- a/util/common/include/util.h
+++ b/util/common/include/util.h
@@ -96,8 +96,7 @@ bool AddInt(T op1, T op2, T minVal, T maxVal, T &res)
         if (op2 > maxVal - op1) {
             return false;
         }
-    }
-    else {
+    } else {
         if (op2 < minVal - op1) {
             return false;
         }
diff --git a/util/common/src/util.cpp b/util/common/src/util.cpp
index 96b271453d..592a57fa21 100644
--- a/util/common/src/util.cpp
+++ b/util/common/src/util.cpp
@@ -276,10 +276,13 @@ int32_t GetPid()
 std::string GetFileName(const std::string &strPath)
 {
     size_t nPos = strPath.find_last_of('/');
-    if (strPath.npos == nPos)
+    if (strPath.npos == nPos) {
         nPos = strPath.find_last_of('\\');
-    if (strPath.npos == nPos)
+    }
+    if (strPath.npos == nPos) {
         return strPath;
+    }
+
     return strPath.substr(nPos + 1, strPath.npos);
 }
 
@@ -738,7 +741,7 @@ std::string StringPrintf(const char *format, ...)
         result = space;
     } else {
         MMI_HILOGE("The buffer is overflow");
-    } 
+    }
     va_end(ap);
     return result;
 }
-- 
Gitee


From 0ea6367e7637fe01f920ab142539ccc8a79cedda Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 20 Oct 2022 09:06:40 +0800
Subject: [PATCH 048/360] =?UTF-8?q?=E5=A4=9A=E6=A8=A1=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=AB=AF=E7=BA=BF=E7=A8=8B=E5=A2=9E=E5=8A=A0watchdog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I95355f7d0e7760407b52911047ca605cfbe5521f
---
 service/BUILD.gn                            |  1 +
 service/module_loader/include/mmi_service.h |  2 ++
 service/module_loader/src/mmi_service.cpp   | 20 ++++++++++++++++++++
 service/timer_manager/src/timer_manager.cpp |  2 +-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/service/BUILD.gn b/service/BUILD.gn
index ea69d60e16..f73a3ad217 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -587,6 +587,7 @@ ohos_shared_library("libmmi-server") {
     "ability_runtime:ability_manager",
     "access_token:libaccesstoken_sdk",
     "config_policy:configpolicy_util",
+    "hicollie_native:libhicollie",
     "hisysevent_native:libhisysevent",
     "hitrace_native:hitrace_meter",
     "hiviewdfx_hilog_native:libhilog",
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index 701a6c12dd..7004974cb5 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -161,6 +161,8 @@ private:
     LibinputAdapter libinputAdapter_;
     ServerMsgHandler sMsgHandler_;
     DelegateTasks delegateTasks_;
+
+    std::atomic_bool watchdogFlg_ { false };
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 095119f40d..9d5d677813 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -50,12 +50,15 @@
 #include "timer_manager.h"
 #include "input_device_manager.h"
 #include "util.h"
+#include "xcollie/watchdog.h"
 
 namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MMIService" };
 const std::string DEF_INPUT_SEAT = "seat0";
+constexpr int32_t WATCHDOG_INTERVAL_TIME = 15000;
+constexpr int32_t WATCHDOG_DELAY_TIME = 20000;
 } // namespace
 
 const bool REGISTER_RESULT =
@@ -310,6 +313,23 @@ void MMIService::OnStart()
 #ifdef OHOS_RSS_CLIENT
     AddSystemAbilityListener(RES_SCHED_SYS_ABILITY_ID);
 #endif
+
+    TimerMgr->AddTimer(WATCHDOG_INTERVAL_TIME, -1, [this]() {
+        MMI_HILOGD("Set watchdog flag to true");
+        watchdogFlg_ = true;
+    });
+    auto taskFunc = [this]() {
+        if (watchdogFlg_) {
+            MMI_HILOGD("Set watchdog flag to false");
+            watchdogFlg_ = false;
+        } else {
+            MMI_HILOGD("kill MMIService");
+            abort();
+        }
+    };
+    HiviewDFX::Watchdog::GetInstance().RunPeriodicalTask("MMIService", taskFunc,
+        WATCHDOG_INTERVAL_TIME, WATCHDOG_DELAY_TIME);
+
     t_.join();
 }
 
diff --git a/service/timer_manager/src/timer_manager.cpp b/service/timer_manager/src/timer_manager.cpp
index ca4db87ed9..3613abe01d 100644
--- a/service/timer_manager/src/timer_manager.cpp
+++ b/service/timer_manager/src/timer_manager.cpp
@@ -20,7 +20,7 @@ namespace MMI {
 namespace {
 constexpr int32_t MIN_DELAY = -1;
 constexpr int32_t MIN_INTERVAL = 50;
-constexpr int32_t MAX_INTERVAL = 4096;
+constexpr int32_t MAX_INTERVAL = 15000;
 constexpr int32_t MAX_TIMER_COUNT = 64;
 constexpr int32_t NONEXISTENT_ID = -1;
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "TimerManager" };
-- 
Gitee


From 0e96f2ea554feba4719d9bec57d9f6eb625edb1a Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 20 Oct 2022 10:41:44 +0800
Subject: [PATCH 049/360] Joystick event injection

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I083f6fcb306428d7e9b33a75d6c1cc9bb1be3f07
---
 .../event_handler/src/client_msg_handler.cpp  |   3 +
 .../proxy/events/include/event_log_helper.h   |  16 +-
 frameworks/proxy/events/src/pointer_event.cpp |  10 +-
 .../innerkits/event/include/pointer_event.h   | 245 ++++++++++++++++++
 .../src/input_manager_command.cpp             | 176 ++++++++++++-
 .../src/input_event_data_transformation.cpp   |  28 +-
 6 files changed, 449 insertions(+), 29 deletions(-)
 mode change 100755 => 100644 tools/inject_event/src/input_manager_command.cpp

diff --git a/frameworks/proxy/event_handler/src/client_msg_handler.cpp b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
index 6625570063..57087c09c8 100644
--- a/frameworks/proxy/event_handler/src/client_msg_handler.cpp
+++ b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
@@ -165,6 +165,9 @@ int32_t ClientMsgHandler::OnPointerEvent(const UDSClient& client, NetPacket& pkt
     pointerEvent->SetProcessedCallback(dispatchCallback_);
     BytraceAdapter::StartBytrace(pointerEvent, BytraceAdapter::TRACE_START, BytraceAdapter::POINT_DISPATCH_EVENT);
     InputMgrImpl.OnPointerEvent(pointerEvent);
+    if (pointerEvent->GetSourceType() == PointerEvent::SOURCE_TYPE_JOYSTICK) {
+        pointerEvent->MarkProcessed();
+    }
     return RET_OK;
 }
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
diff --git a/frameworks/proxy/events/include/event_log_helper.h b/frameworks/proxy/events/include/event_log_helper.h
index 936bc47a3a..4e5a9a9968 100644
--- a/frameworks/proxy/events/include/event_log_helper.h
+++ b/frameworks/proxy/events/include/event_log_helper.h
@@ -69,14 +69,26 @@ private:
         MMI_HILOGD("EventType:%{public}s,ActionTime:%{public}" PRId64 ",Action:%{public}d,"
             "ActionStartTime:%{public}" PRId64 ",Flag:%{public}d,PointerAction:%{public}s,"
             "SourceType:%{public}s,ButtonId:%{public}d,VerticalAxisValue:%{public}.2f,"
-            "HorizontalAxisValue:%{public}.2f,PinchAxisValue:%{public}.2f,PointerId:%{public}d,"
-            "PointerCount:%{public}zu,EventNumber:%{public}d",
+            "HorizontalAxisValue:%{public}.2f,PinchAxisValue:%{public}.2f,"
+            "XAbsValue:%{public}.2f,YAbsValue:%{public}.2f,ZAbsValue:%{public}.2f,"
+            "RzAbsValue:%{public}.2f,GasAbsValue:%{public}.2f,BrakeAbsValue:%{public}.2f,"
+            "Hat0xAbsValue:%{public}.2f,Hat0yAbsValue:%{public}.2f,ThrottleAbsValue:%{public}.2f,"
+            "PointerId:%{public}d,PointerCount:%{public}zu,EventNumber:%{public}d",
             InputEvent::EventTypeToString(event->GetEventType()), event->GetActionTime(),
             event->GetAction(), event->GetActionStartTime(), event->GetFlag(),
             event->DumpPointerAction(), event->DumpSourceType(), event->GetButtonId(),
             event->GetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_VERTICAL),
             event->GetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_HORIZONTAL),
             event->GetAxisValue(PointerEvent::AXIS_TYPE_PINCH),
+            event->GetAxisValue(PointerEvent::AXIS_TYPE_ABS_X),
+            event->GetAxisValue(PointerEvent::AXIS_TYPE_ABS_Y),
+            event->GetAxisValue(PointerEvent::AXIS_TYPE_ABS_Z),
+            event->GetAxisValue(PointerEvent::AXIS_TYPE_ABS_RZ),
+            event->GetAxisValue(PointerEvent::AXIS_TYPE_ABS_GAS),
+            event->GetAxisValue(PointerEvent::AXIS_TYPE_ABS_BRAKE),
+            event->GetAxisValue(PointerEvent::AXIS_TYPE_ABS_HAT0X),
+            event->GetAxisValue(PointerEvent::AXIS_TYPE_ABS_HAT0Y),
+            event->GetAxisValue(PointerEvent::AXIS_TYPE_ABS_THROTTLE),
             event->GetPointerId(), pointerIds.size(), event->GetId());
 
         for (const auto& pointerId : pointerIds) {
diff --git a/frameworks/proxy/events/src/pointer_event.cpp b/frameworks/proxy/events/src/pointer_event.cpp
index e93f8d94ce..ed03c6a6a8 100644
--- a/frameworks/proxy/events/src/pointer_event.cpp
+++ b/frameworks/proxy/events/src/pointer_event.cpp
@@ -866,13 +866,7 @@ bool PointerEvent::IsValidCheckTouch() const
 bool PointerEvent::IsValid() const
 {
     CALL_DEBUG_ENTER;
-    int32_t sourceType = GetSourceType();
-    if (sourceType != SOURCE_TYPE_MOUSE && sourceType != SOURCE_TYPE_TOUCHSCREEN &&
-        sourceType != SOURCE_TYPE_TOUCHPAD) {
-        MMI_HILOGE("SourceType is invalid");
-        return false;
-    }
-    switch (sourceType) {
+    switch (GetSourceType()) {
         case SOURCE_TYPE_MOUSE: {
             if (!IsValidCheckMouse()) {
                 MMI_HILOGE("IsValidCheckMouse is invalid");
@@ -888,6 +882,8 @@ bool PointerEvent::IsValid() const
             }
             break;
         }
+        case SOURCE_TYPE_JOYSTICK:
+            break;
         default: {
             MMI_HILOGE("SourceType is invalid");
             return false;
diff --git a/interfaces/native/innerkits/event/include/pointer_event.h b/interfaces/native/innerkits/event/include/pointer_event.h
index b17a9b0658..99c1b144b2 100644
--- a/interfaces/native/innerkits/event/include/pointer_event.h
+++ b/interfaces/native/innerkits/event/include/pointer_event.h
@@ -148,6 +148,69 @@ public:
          */
         AXIS_TYPE_PINCH,
 
+        /**
+         * 表示x轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，x轴状态改变。
+         *
+         * @since 9
+         */
+        AXIS_TYPE_ABS_X,
+
+        /**
+         * 表示y轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，y轴状态改变。
+         *
+         * @since 9
+         */
+        AXIS_TYPE_ABS_Y,
+
+        /**
+         * 表示z轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，z轴状态改变。
+         *
+         * @since 9
+         */
+        AXIS_TYPE_ABS_Z,
+
+        /**
+         * 表示rz轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，rz轴状态改变。
+         *
+         * @since 9
+         */
+        AXIS_TYPE_ABS_RZ,
+
+        /**
+         * 表示gas轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，gas轴状态改变。
+         *
+         * @since 9
+         */
+        AXIS_TYPE_ABS_GAS,
+
+        /**
+         * 表示brake轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，brake轴状态改变。
+         *
+         * @since 9
+         */
+        AXIS_TYPE_ABS_BRAKE,
+
+        /**
+         * 表示hat0x轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，hat0x轴状态改变。
+         *
+         * @since 9
+         */
+        AXIS_TYPE_ABS_HAT0X,
+
+        /**
+         * 表示hat0y轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，hat0y轴状态改变。
+         *
+         * @since 9
+         */
+        AXIS_TYPE_ABS_HAT0Y,
+
+        /**
+         * 表示throttle轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，throttle轴状态改变。
+         *
+         * @since 9
+         */
+        AXIS_TYPE_ABS_THROTTLE,
+
         /**
          * Indicates the maximum number of defined axis types.
          *
@@ -311,6 +374,188 @@ public:
      */
     static constexpr int32_t TOOL_TYPE_LENS = 7;
 
+    /**
+     * 表示手柄的TL2按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_TL2 = 0;
+
+    /**
+     * 表示手柄的TR2按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_TR2 = 1;
+
+    /**
+     * 表示手柄的TL按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_TL = 2;
+
+    /**
+     * 表示手柄的TR按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_TR = 3;
+
+    /**
+     * 表示手柄的WEST按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_WEST = 4;
+
+    /**
+     * 表示手柄的SOUTH按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_SOUTH = 5;
+
+    /**
+     * 表示手柄的NORTH按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_NORTH = 6;
+
+    /**
+     * 表示手柄的EAST按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_EAST = 7;
+
+    /**
+     * 表示手柄的START按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_START = 8;
+
+    /**
+     * 表示手柄的SELECT按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_SELECT = 9;
+
+    /**
+     * 表示手柄的HOMEPAGE按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_HOMEPAGE = 10;
+
+    /**
+     * 表示手柄的THUMBL按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_THUMBL = 11;
+
+    /**
+     * 表示手柄的THUMBR按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_THUMBR = 12;
+
+    /**
+     * 表示操纵杆的TRIGGER按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_TRIGGER = 13;
+
+    /**
+     * 表示操纵杆的THUMB按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_THUMB = 14;
+
+    /**
+     * 表示操纵杆的THUMB2按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_THUMB2 = 15;
+
+    /**
+     * 表示操纵杆的TOP按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_TOP = 16;
+
+    /**
+     * 表示操纵杆的TOP2按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_TOP2 = 17;
+
+    /**
+     * 表示操纵杆的PINKIE按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_PINKIE = 18;
+
+    /**
+     * 表示操纵杆的BASE按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_BASE = 19;
+
+    /**
+     * 表示操纵杆的BASE2按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_BASE2 = 20;
+
+    /**
+     * 表示操纵杆的BASE3按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_BASE3 = 21;
+
+    /**
+     * 表示操纵杆的BASE4按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_BASE4 = 22;
+
+    /**
+     * 表示操纵杆的BASE5按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_BASE5 = 23;
+
+    /**
+     * 表示操纵杆的BASE6按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_BASE6 = 24;
+
+    /**
+     * 表示操纵杆的DEAD按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_DEAD = 25;
+
 public:
     static std::shared_ptr<PointerEvent> from(std::shared_ptr<InputEvent> inputEvent);
 
diff --git a/tools/inject_event/src/input_manager_command.cpp b/tools/inject_event/src/input_manager_command.cpp
old mode 100755
new mode 100644
index 23f32e37ca..c802e97a51
--- a/tools/inject_event/src/input_manager_command.cpp
+++ b/tools/inject_event/src/input_manager_command.cpp
@@ -53,11 +53,27 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputManagerCommand"};
 constexpr int32_t SLEEPTIME = 20;
 constexpr int32_t MOUSE_ID = 7;
+constexpr int32_t JOYSTICK_BUTTON_ID = 25;
 constexpr int32_t TWO_MORE_COMMAND = 2;
 constexpr int32_t THREE_MORE_COMMAND = 3;
 constexpr int32_t MAX_PRESSED_COUNT = 30;
 constexpr int32_t ACTION_TIME = 3000;
 constexpr int32_t BLOCK_TIME_MS = 10;
+constexpr int64_t MIN_TAKTTIME_MS = 1;
+constexpr int64_t MAX_TAKTTIME_MS = 15000;
+enum JoystickEvent {
+    JOYSTICK_BUTTON_UP,
+    JOYSTICK_BUTTON_PRESS,
+    JOYSTICK_MOVE,
+    JOYSTICK_CLICK,
+    JOYSTICK_INTERVAL
+};
+struct JoystickInfo {
+    int32_t buttonId { -1 };
+    int32_t absValue { -1 };
+    int32_t taktTime { 0 };
+    PointerEvent::AxisType absType;
+};
 } // namespace
 
 void InputManagerCommand::SleepAndUpdateTime(int64_t &currentTimeMs)
@@ -105,6 +121,7 @@ int32_t InputManagerCommand::ParseCommand(int32_t argc, char *argv[])
         {"mouse", no_argument, NULL, 'M'},
         {"keyboard", no_argument, NULL, 'K'},
         {"touch", no_argument, NULL, 'T'},
+        {"joystick", no_argument, NULL, 'J'},
         {"help", no_argument, NULL, '?'},
         {NULL, 0, NULL, 0}
     };
@@ -135,10 +152,18 @@ int32_t InputManagerCommand::ParseCommand(int32_t argc, char *argv[])
         {"drag", required_argument, NULL, 'g'},
         {NULL, 0, NULL, 0}
     };
+    struct option joystickSensorOptions[] = {
+        {"move", required_argument, NULL, 'm'},
+        {"down", required_argument, NULL, 'd'},
+        {"up", required_argument, NULL, 'u'},
+        {"click", required_argument, NULL, 'c'},
+        {"interval", required_argument, NULL, 'i'},
+        {NULL, 0, NULL, 0}
+    };
     int32_t c = 0;
     int32_t optionIndex = 0;
     optind = 0;
-    if ((c = getopt_long(argc, argv, "MKT?", headOptions, &optionIndex)) != -1) {
+    if ((c = getopt_long(argc, argv, "MKTJ?", headOptions, &optionIndex)) != -1) {
         switch (c) {
             case 'M': {
                 int32_t px = 0;
@@ -1053,6 +1078,155 @@ int32_t InputManagerCommand::ParseCommand(int32_t argc, char *argv[])
                 }
                 break;
             }
+            case 'J': {
+                JoystickInfo joyInfo;
+                std::vector<std::pair<int32_t, JoystickInfo>> state;
+                while ((c = getopt_long(argc, argv, "m:d:u:c:i:", joystickSensorOptions, &optionIndex)) != -1) {
+                    switch (c) {
+                        case 'm': {
+                            std::string arg(optarg);
+                            std::string::size_type pos = arg.find('=');
+                            if (pos == std::string::npos) {
+                                std::cout << "Parameter format is error" << std::endl;
+                                return EVENT_REG_FAIL;
+                            }
+                            std::string absAction = arg.substr(0, pos);
+                            if (absAction == "x") {
+                                joyInfo.absType = PointerEvent::AxisType::AXIS_TYPE_ABS_X;
+                            } else if (absAction == "y") {
+                                joyInfo.absType = PointerEvent::AxisType::AXIS_TYPE_ABS_Y;
+                            } else if (absAction == "z") {
+                                joyInfo.absType = PointerEvent::AxisType::AXIS_TYPE_ABS_Z;
+                            } else if (absAction == "rz") {
+                                joyInfo.absType = PointerEvent::AxisType::AXIS_TYPE_ABS_RZ;
+                            } else if (absAction == "gas") {
+                                joyInfo.absType = PointerEvent::AxisType::AXIS_TYPE_ABS_GAS;
+                            } else if (absAction == "brake") {
+                                joyInfo.absType = PointerEvent::AxisType::AXIS_TYPE_ABS_BRAKE;
+                            } else if (absAction == "hat0x") {
+                                joyInfo.absType = PointerEvent::AxisType::AXIS_TYPE_ABS_HAT0X;
+                            } else if (absAction == "hat0y") {
+                                joyInfo.absType = PointerEvent::AxisType::AXIS_TYPE_ABS_HAT0Y;
+                            } else if (absAction == "throttle") {
+                                joyInfo.absType = PointerEvent::AxisType::AXIS_TYPE_ABS_THROTTLE;
+                            } else {
+                                std::cout << "Invalid abstype" << std::endl;
+                                return RET_ERR;
+                            }
+                            if (!StrToInt(arg.substr(pos + 1), joyInfo.absValue)) {
+                                std::cout << "Invalid parameter to move absValue" << std::endl;
+                                return EVENT_REG_FAIL;
+                            }
+                            state.push_back(std::pair<int32_t, JoystickInfo>(JOYSTICK_MOVE, joyInfo));
+                            break;
+                        }
+                        case 'd': {
+                            if (!StrToInt(optarg, joyInfo.buttonId)) {
+                                std::cout << "Invalid button press command" << std::endl;
+                                return EVENT_REG_FAIL;
+                            }
+                            if (joyInfo.buttonId > JOYSTICK_BUTTON_ID) {
+                                std::cout << "Pressd button value is greater than the max value" << std::endl;
+                                return EVENT_REG_FAIL;
+                            }
+                            state.push_back(std::pair<int32_t, JoystickInfo>(JOYSTICK_BUTTON_PRESS, joyInfo));
+                            break;
+                        }
+                        case 'u': {
+                            if (!StrToInt(optarg, joyInfo.buttonId)) {
+                                std::cout << "Invalid raise button command" << std::endl;
+                                return EVENT_REG_FAIL;
+                            }
+                            if (joyInfo.buttonId > JOYSTICK_BUTTON_ID) {
+                                std::cout << "Raise button value is greater than the max value" << std::endl;
+                                return EVENT_REG_FAIL;
+                            }
+                            state.push_back(std::pair<int32_t, JoystickInfo>(JOYSTICK_BUTTON_UP, joyInfo));
+                            break;
+                        }
+                        case 'c': {
+                            if (!StrToInt(optarg, joyInfo.buttonId)) {
+                                std::cout << "Invalid click button command" << std::endl;
+                                return EVENT_REG_FAIL;
+                            }
+                            if (joyInfo.buttonId > JOYSTICK_BUTTON_ID) {
+                                std::cout << "Click button value is greater than the max value" << std::endl;
+                                return EVENT_REG_FAIL;
+                            }
+                            state.push_back(std::pair<int32_t, JoystickInfo>(JOYSTICK_CLICK, joyInfo));
+                            break;
+                        }
+                        case 'i': {
+                            if (!StrToInt(optarg, joyInfo.taktTime)) {
+                                std::cout << "Invalid command to interval time" << std::endl;
+                                return EVENT_REG_FAIL;
+                            }
+                            state.push_back(std::pair<int32_t, JoystickInfo>(JOYSTICK_INTERVAL, joyInfo));
+                            break;
+                        }
+                        default: {
+                            std::cout << "Invalid options" << std::endl;
+                            ShowUsage();
+                            return EVENT_REG_FAIL;
+                        }
+                    }
+                    std::this_thread::sleep_for(std::chrono::milliseconds(SLEEPTIME));
+                }
+                auto pointerEvent = PointerEvent::Create();
+                if (pointerEvent != nullptr) {
+                    if (optind < argc) {
+                        std::cout << "non-option argv elements: ";
+                        while (optind < argc) {
+                            std::cout << argv[optind++] << "\t";
+                        }
+                        std::cout << std::endl;
+                        return EVENT_REG_FAIL;
+                    }
+                    if (state.empty()) {
+                        std::cout << "Injection failed" << std::endl;
+                        return EVENT_REG_FAIL;
+                    }
+                    for (const auto &it : state) {
+                        if (it.first == JOYSTICK_BUTTON_PRESS) {
+                            std::cout << "Press down " << it.second.buttonId <<std::endl;
+                            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_BUTTON_DOWN);
+                            pointerEvent->SetButtonId(it.second.buttonId);
+                            pointerEvent->SetButtonPressed(it.second.buttonId);
+                        } else if (it.first == JOYSTICK_BUTTON_UP) {
+                            std::cout << "Lift up button " << it.second.buttonId << std::endl;
+                            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_BUTTON_UP);
+                            pointerEvent->SetButtonId(it.second.buttonId);
+                            pointerEvent->SetButtonPressed(it.second.buttonId);
+                        } else if (it.first == JOYSTICK_MOVE) {
+                            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_AXIS_UPDATE);
+                            pointerEvent->SetAxisValue(it.second.absType, it.second.absValue);
+                        } else if (it.first == JOYSTICK_CLICK) {
+                            std::cout << "Click " << it.second.buttonId << std::endl;
+                            pointerEvent->SetPointerId(0);
+                            pointerEvent->SetButtonId(it.second.buttonId);
+                            pointerEvent->SetButtonPressed(it.second.buttonId);
+                            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_BUTTON_DOWN);
+                            pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_JOYSTICK);
+                            InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
+
+                            pointerEvent->SetButtonId(it.second.buttonId);
+                            pointerEvent->SetButtonPressed(it.second.buttonId);
+                            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_BUTTON_UP);
+                        } else if (it.first == JOYSTICK_INTERVAL) {
+                            if ((MIN_TAKTTIME_MS > joyInfo.taktTime) || (MAX_TAKTTIME_MS < joyInfo.taktTime)) {
+                                std::cout << "TaktTime is out of range" << std::endl;
+                                return EVENT_REG_FAIL;
+                            }
+                            std::this_thread::sleep_for(std::chrono::milliseconds(joyInfo.taktTime));
+                            continue;
+                        }
+                        pointerEvent->SetPointerId(0);
+                        pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_JOYSTICK);
+                        InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
+                    }
+                }
+                break;
+            }
             case '?': {
                 ShowUsage();
                 return ERR_OK;
diff --git a/util/common/src/input_event_data_transformation.cpp b/util/common/src/input_event_data_transformation.cpp
index a0dd005805..f6c4d353cd 100644
--- a/util/common/src/input_event_data_transformation.cpp
+++ b/util/common/src/input_event_data_transformation.cpp
@@ -161,14 +161,10 @@ int32_t InputEventDataTransformation::Marshalling(std::shared_ptr<PointerEvent>
     pkt << event->GetPointerAction() << event->GetPointerId() << event->GetSourceType() << event->GetButtonId()
         << event->GetAxes();
 
-    if (event->HasAxis(PointerEvent::AXIS_TYPE_SCROLL_VERTICAL)) {
-        pkt << event->GetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_VERTICAL);
-    }
-    if (event->HasAxis(PointerEvent::AXIS_TYPE_SCROLL_HORIZONTAL)) {
-        pkt << event->GetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_HORIZONTAL);
-    }
-    if (event->HasAxis(PointerEvent::AXIS_TYPE_PINCH)) {
-        pkt << event->GetAxisValue(PointerEvent::AXIS_TYPE_PINCH);
+    for (int32_t i = PointerEvent::AXIS_TYPE_UNKNOWN; i < PointerEvent::AXIS_TYPE_MAX; ++i) {
+        if (event->HasAxis(static_cast<PointerEvent::AxisType>(i))) {
+            pkt << event->GetAxisValue(static_cast<PointerEvent::AxisType>(i));
+        }
     }
 
     std::set<int32_t> pressedBtns { event->GetPressedButtons() };
@@ -221,17 +217,11 @@ int32_t InputEventDataTransformation::Unmarshalling(NetPacket &pkt, std::shared_
     uint32_t tAxes;
     pkt >> tAxes;
     double axisValue;
-    if (PointerEvent::HasAxis(tAxes, PointerEvent::AXIS_TYPE_SCROLL_VERTICAL)) {
-        pkt >> axisValue;
-        event->SetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_VERTICAL, axisValue);
-    }
-    if (PointerEvent::HasAxis(tAxes, PointerEvent::AXIS_TYPE_SCROLL_HORIZONTAL)) {
-        pkt >> axisValue;
-        event->SetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_HORIZONTAL, axisValue);
-    }
-    if (PointerEvent::HasAxis(tAxes, PointerEvent::AXIS_TYPE_PINCH)) {
-        pkt >> axisValue;
-        event->SetAxisValue(PointerEvent::AXIS_TYPE_PINCH, axisValue);
+    for (int32_t i = PointerEvent::AXIS_TYPE_UNKNOWN; i < PointerEvent::AXIS_TYPE_MAX; ++i) {
+        if (PointerEvent::HasAxis(tAxes, static_cast<PointerEvent::AxisType>(i))) {
+            pkt >> axisValue;
+            event->SetAxisValue(static_cast<PointerEvent::AxisType>(i), axisValue);
+        }
     }
 
     std::set<int32_t>::size_type nPressed;
-- 
Gitee


From 7cbfdc0148ddfa20ffd7f0eb4c5c7e65e7eb4624 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Thu, 20 Oct 2022 03:11:00 +0000
Subject: [PATCH 050/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: Idb36b44f227344a45b9819a38f81ce582d141179
---
 service/module_loader/src/uds_server.cpp      |  0
 .../include/permission_helper.h               |  1 -
 .../src/permission_helper.cpp                 | 19 ++-----------------
 util/socket/src/uds_client.cpp                |  0
 4 files changed, 2 insertions(+), 18 deletions(-)
 mode change 100755 => 100644 service/module_loader/src/uds_server.cpp
 mode change 100755 => 100644 util/socket/src/uds_client.cpp

diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp
old mode 100755
new mode 100644
diff --git a/service/permission_helper/include/permission_helper.h b/service/permission_helper/include/permission_helper.h
index edfc87bb05..a6f6a722ac 100644
--- a/service/permission_helper/include/permission_helper.h
+++ b/service/permission_helper/include/permission_helper.h
@@ -37,7 +37,6 @@ public:
 
 private:
     bool CheckHapPermission(uint32_t tokenId, uint32_t required);
-    bool CheckNativePermission(uint32_t tokenId, uint32_t required);
     bool CheckMonitorPermission(uint32_t tokenId);
 };
 
diff --git a/service/permission_helper/src/permission_helper.cpp b/service/permission_helper/src/permission_helper.cpp
index f7ed467540..48bd55daba 100644
--- a/service/permission_helper/src/permission_helper.cpp
+++ b/service/permission_helper/src/permission_helper.cpp
@@ -35,7 +35,8 @@ bool PermissionHelper::CheckPermission(uint32_t required)
     if (tokenType == OHOS::Security::AccessToken::TOKEN_HAP) {
         return CheckHapPermission(tokenId, required);
     } else if (tokenType == OHOS::Security::AccessToken::TOKEN_NATIVE) {
-        return CheckNativePermission(tokenId, required);
+        MMI_HILOGI("Token type is native");
+        return true;
     } else if (tokenType == OHOS::Security::AccessToken::TOKEN_SHELL) {
         MMI_HILOGI("Token type is shell");
         return true;
@@ -78,22 +79,6 @@ bool PermissionHelper::CheckHapPermission(uint32_t tokenId, uint32_t required)
     return true;
 }
 
-bool PermissionHelper::CheckNativePermission(uint32_t tokenId, uint32_t required)
-{
-    OHOS::Security::AccessToken::NativeTokenInfo findInfo;
-    if (OHOS::Security::AccessToken::AccessTokenKit::GetNativeTokenInfo(tokenId, findInfo) != 0) {
-        MMI_HILOGE("GetNativeTokenInfo failed, name:%{public}s, apl:%{public}d, required:%{public}d",
-            findInfo.processName.c_str(), findInfo.apl, required);
-        return false;
-    }
-    if (!((1 << findInfo.apl) & required)) {
-        MMI_HILOGE("Check native permission failed");
-        return false;
-    }
-    MMI_HILOGI("Check native permission success");
-    return true;
-}
-
 bool PermissionHelper::CheckMonitorPermission(uint32_t tokenId)
 {
     static const std::string inputMonitor = "ohos.permission.INPUT_MONITORING";
diff --git a/util/socket/src/uds_client.cpp b/util/socket/src/uds_client.cpp
old mode 100755
new mode 100644
-- 
Gitee


From dcc9a722d4d46705775f7c29ee48a2cae442fcbe Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Thu, 20 Oct 2022 19:29:59 +0800
Subject: [PATCH 051/360] remove hdf marco in gn

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: I68e2d8ae4393c7bcfd3638cdcabf3812e76005ba
---
 examples/mmi/BUILD.gn                       |  4 ---
 frameworks/napi/distributed_input/BUILD.gn  |  4 ---
 frameworks/napi/input_consumer/BUILD.gn     |  4 ---
 frameworks/napi/input_device/BUILD.gn       |  4 ---
 frameworks/napi/input_event_client/BUILD.gn |  4 ---
 frameworks/napi/input_monitor/BUILD.gn      |  4 ---
 frameworks/napi/key_code/BUILD.gn           |  4 ---
 frameworks/napi/key_event/BUILD.gn          |  4 ---
 frameworks/napi/mouse_event/BUILD.gn        |  4 ---
 frameworks/napi/pointer/BUILD.gn            |  4 ---
 frameworks/napi/touch_event/BUILD.gn        |  4 ---
 frameworks/proxy/BUILD.gn                   | 20 -------------
 multimodalinput_mini.gni                    |  2 --
 patch/BUILD.gn                              |  7 -----
 patch/diff_libinput_mmi/BUILD.gn            | 25 ----------------
 service/BUILD.gn                            | 32 ++-------------------
 tools/vuinput/BUILD.gn                      | 20 ++-----------
 util/BUILD.gn                               | 12 --------
 18 files changed, 5 insertions(+), 157 deletions(-)

diff --git a/examples/mmi/BUILD.gn b/examples/mmi/BUILD.gn
index 9696c5f5ca..6551af8459 100644
--- a/examples/mmi/BUILD.gn
+++ b/examples/mmi/BUILD.gn
@@ -43,10 +43,6 @@ ohos_executable("mmi-server") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   install_enable = true
   part_name = "input"
   subsystem_name = "multimodalinput"
diff --git a/frameworks/napi/distributed_input/BUILD.gn b/frameworks/napi/distributed_input/BUILD.gn
index 49261c2cad..301fecb5bf 100644
--- a/frameworks/napi/distributed_input/BUILD.gn
+++ b/frameworks/napi/distributed_input/BUILD.gn
@@ -28,10 +28,6 @@ if (input_feature_distributed) {
     if (input_feature_libinput) {
       defines += [ "OHOS_BUILD_LIBINPUT" ]
     }
-
-    if (input_feature_hdf) {
-      defines += [ "OHOS_BUILD_HDF" ]
-    }
   }
 
   ohos_shared_library("distributedinput") {
diff --git a/frameworks/napi/input_consumer/BUILD.gn b/frameworks/napi/input_consumer/BUILD.gn
index 76d494b0f2..c89ae45b4f 100644
--- a/frameworks/napi/input_consumer/BUILD.gn
+++ b/frameworks/napi/input_consumer/BUILD.gn
@@ -27,10 +27,6 @@ config("inputconsumer_config") {
   if (input_feature_libinput) {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("inputconsumer") {
diff --git a/frameworks/napi/input_device/BUILD.gn b/frameworks/napi/input_device/BUILD.gn
index 9ce7ade106..f4dd5a11be 100644
--- a/frameworks/napi/input_device/BUILD.gn
+++ b/frameworks/napi/input_device/BUILD.gn
@@ -29,10 +29,6 @@ config("inputdevice_config") {
   if (input_feature_libinput) {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("inputdevice") {
diff --git a/frameworks/napi/input_event_client/BUILD.gn b/frameworks/napi/input_event_client/BUILD.gn
index 61077014f1..d18251a758 100644
--- a/frameworks/napi/input_event_client/BUILD.gn
+++ b/frameworks/napi/input_event_client/BUILD.gn
@@ -28,10 +28,6 @@ config("inputeventclient_config") {
   if (input_feature_libinput) {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("inputeventclient") {
diff --git a/frameworks/napi/input_monitor/BUILD.gn b/frameworks/napi/input_monitor/BUILD.gn
index 3e5d385555..b8f6fd76f3 100644
--- a/frameworks/napi/input_monitor/BUILD.gn
+++ b/frameworks/napi/input_monitor/BUILD.gn
@@ -27,10 +27,6 @@ config("inputmonitor_config") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
diff --git a/frameworks/napi/key_code/BUILD.gn b/frameworks/napi/key_code/BUILD.gn
index 2d0158f119..8e24a1ecaf 100644
--- a/frameworks/napi/key_code/BUILD.gn
+++ b/frameworks/napi/key_code/BUILD.gn
@@ -27,10 +27,6 @@ config("keyCode_config") {
   if (input_feature_libinput) {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("keycode") {
diff --git a/frameworks/napi/key_event/BUILD.gn b/frameworks/napi/key_event/BUILD.gn
index a2369b5151..0047725087 100644
--- a/frameworks/napi/key_event/BUILD.gn
+++ b/frameworks/napi/key_event/BUILD.gn
@@ -27,10 +27,6 @@ config("keyEvent_config") {
   if (input_feature_libinput) {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("keyevent") {
diff --git a/frameworks/napi/mouse_event/BUILD.gn b/frameworks/napi/mouse_event/BUILD.gn
index 77c6ec7cab..b806e5c0b5 100644
--- a/frameworks/napi/mouse_event/BUILD.gn
+++ b/frameworks/napi/mouse_event/BUILD.gn
@@ -27,10 +27,6 @@ config("mouseEvent_config") {
   if (input_feature_libinput) {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("mouseevent") {
diff --git a/frameworks/napi/pointer/BUILD.gn b/frameworks/napi/pointer/BUILD.gn
index 1437797fc1..eca502946a 100644
--- a/frameworks/napi/pointer/BUILD.gn
+++ b/frameworks/napi/pointer/BUILD.gn
@@ -26,10 +26,6 @@ config("pointer_config") {
   if (input_feature_libinput) {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("pointer") {
diff --git a/frameworks/napi/touch_event/BUILD.gn b/frameworks/napi/touch_event/BUILD.gn
index a7528c29b8..bb99cebee6 100644
--- a/frameworks/napi/touch_event/BUILD.gn
+++ b/frameworks/napi/touch_event/BUILD.gn
@@ -27,10 +27,6 @@ config("touchEvent_config") {
   if (input_feature_libinput) {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("touchevent") {
diff --git a/frameworks/proxy/BUILD.gn b/frameworks/proxy/BUILD.gn
index 4a9d0dccf7..597a1546a6 100755
--- a/frameworks/proxy/BUILD.gn
+++ b/frameworks/proxy/BUILD.gn
@@ -191,10 +191,6 @@ ohos_unittest("ut-mmi-proxy-out") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   sources = [ "module_loader/test/mmi_client_test.cpp" ]
 
   configs = [ ":libmmi_test_util" ]
@@ -230,10 +226,6 @@ ohos_unittest("KeyEventTest") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/window_utils_test.cpp",
@@ -281,10 +273,6 @@ ohos_unittest("InputManagerTest") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_keyboard) {
     defines += [ "OHOS_BUILD_ENABLE_KEYBOARD" ]
   }
@@ -348,10 +336,6 @@ ohos_unittest("InputManagerManualTest") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_mouse) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
   }
@@ -394,10 +378,6 @@ ohos_unittest("PointerEventTest") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_mouse) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
   }
diff --git a/multimodalinput_mini.gni b/multimodalinput_mini.gni
index 5db4f16d40..81207338b2 100644
--- a/multimodalinput_mini.gni
+++ b/multimodalinput_mini.gni
@@ -17,7 +17,6 @@ mmi_path = "//foundation/multimodalinput/input"
 ability_runtime_path = "//foundation/ability/ability_runtime"
 ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits"
 input_feature_libinput = true
-input_feature_hdf = false
 input_feature_debug = false
 input_feature_distributed = false
 
@@ -45,7 +44,6 @@ if (input_feature_joystick) {
 }
 
 print("input_feature_libinput = ${input_feature_libinput}")
-print("input_feature_hdf = ${input_feature_hdf}")
 print("input_feature_debug = ${input_feature_debug}")
 print("input_feature_combination_key = ${input_feature_combination_key}")
 print("input_feature_pointer_drawing = ${input_feature_pointer_drawing}")
diff --git a/patch/BUILD.gn b/patch/BUILD.gn
index ed05cf8beb..4921516d89 100644
--- a/patch/BUILD.gn
+++ b/patch/BUILD.gn
@@ -20,13 +20,6 @@ group("patch_packages") {
     "prebuild_eudev:prebuild_eudev",
   ]
 
-  if (input_feature_hdf) {
-    deps += [
-      "diff_libevdev_hdf:libevdev-hdf",
-      "diff_mtdev_hdf:libmtdev-hdf",
-    ]
-  }
-
   if (input_feature_libinput) {
     deps += [
       "prebuild_libinput:prebuild_libinput",
diff --git a/patch/diff_libinput_mmi/BUILD.gn b/patch/diff_libinput_mmi/BUILD.gn
index 08f78c70d0..f8e0d5f8eb 100644
--- a/patch/diff_libinput_mmi/BUILD.gn
+++ b/patch/diff_libinput_mmi/BUILD.gn
@@ -18,9 +18,6 @@ gen_src_dir = "//third_party/libinput"
 gen_dst_dir = root_out_dir + "/diff_libinput_mmi"
 patches_root_dir = "//foundation/multimodalinput/input/patch"
 build_gn_dir = "$patches_root_dir/diff_libinput_mmi/libinput"
-if (input_feature_hdf) {
-  build_gn_dir = "$patches_root_dir/diff_libinput_mmi/hdf"
-}
 
 action("apply_patch") {
   visibility = [ ":*" ]
@@ -102,10 +99,6 @@ config("libinput-third_config") {
     include_dirs += [ "$gen_dst_dir/hm_src" ]
   }
 
-  if (input_feature_hdf) {
-    include_dirs += [ "$root_out_dir/diff_mtdev_hdf/include" ]
-  }
-
   cflags = [
     "-Wno-unused-parameter",
     "-Wno-implicit-int",
@@ -130,10 +123,6 @@ config("libinput-third_public_config") {
     "$gen_dst_dir/src",
   ]
 
-  if (input_feature_hdf) {
-    include_dirs += [ "$root_out_dir/diff_mtdev_hdf/include" ]
-  }
-
   cflags = []
 }
 
@@ -191,13 +180,6 @@ ohos_source_set("patch_gen_libinput-third-mmi") {
       "//third_party/mtdev:libmtdev",
     ]
   }
-
-  if (input_feature_hdf) {
-    public_deps += [
-      "//foundation/multimodalinput/input/patch/diff_libevdev_hdf:libevdev-hdf",
-      "//foundation/multimodalinput/input/patch/diff_mtdev_hdf:libmtdev-hdf",
-    ]
-  }
 }
 
 ohos_shared_library("libinput-third-mmi") {
@@ -218,13 +200,6 @@ ohos_shared_library("libinput-third-mmi") {
     ]
   }
 
-  if (input_feature_hdf) {
-    public_deps += [
-      "//foundation/multimodalinput/input/patch/diff_libevdev_hdf:libevdev-hdf",
-      "//foundation/multimodalinput/input/patch/diff_mtdev_hdf:libmtdev-hdf",
-    ]
-  }
-
   part_name = "input"
   subsystem_name = "multimodalinput"
 }
diff --git a/service/BUILD.gn b/service/BUILD.gn
index ea69d60e16..998b54c4f2 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -62,17 +62,6 @@ config("libmmi_server_config") {
     ]
   }
 
-  if (input_feature_hdf) {
-    include_dirs += [
-      "hdf_adapter/include",
-      "hdi_inject/include",
-      "$root_out_dir/diff_libinput_mmi/export_include",
-      "//third_party/eudev/export_include/",
-      "$root_out_dir/diff_libevdev_hdf/export_include",
-      "$root_out_dir/diff_libinput_mmi/include/linux",
-    ]
-  }
-
   defines = []
 
   if (input_feature_debug) {
@@ -83,10 +72,6 @@ config("libmmi_server_config") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_combination_key) {
     defines += [ "OHOS_BUILD_ENABLE_COMBINATION_KEY" ]
   }
@@ -462,13 +447,6 @@ ohos_shared_library("libmmi-server") {
     ]
   }
 
-  if (input_feature_hdf) {
-    sources += [
-      "hdf_adapter/src/hdf_event_manager.cpp",
-      "hdi_inject/src/hdi_inject.cpp",
-    ]
-  }
-
   if (input_feature_keyboard) {
     sources += [
       "key_event_normalize/src/key_event_normalize.cpp",
@@ -565,7 +543,7 @@ ohos_shared_library("libmmi-server") {
     "//third_party/json:nlohmann_json_static",
   ]
 
-  if (input_feature_libinput || input_feature_hdf) {
+  if (input_feature_libinput) {
     deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
   }
 
@@ -657,7 +635,7 @@ ohos_unittest("ut-mmi-service-out") {
     "${mmi_path}/uinput",
   ]
 
-  if (input_feature_libinput || input_feature_hdf) {
+  if (input_feature_libinput) {
     include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
   }
 
@@ -679,10 +657,6 @@ ohos_unittest("ut-mmi-service-out") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_pointer_drawing) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
   }
@@ -709,7 +683,7 @@ ohos_unittest("ut-mmi-service-out") {
     "//third_party/googletest:gtest_main",
   ]
 
-  if (input_feature_libinput || input_feature_hdf) {
+  if (input_feature_libinput) {
     deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
   }
 
diff --git a/tools/vuinput/BUILD.gn b/tools/vuinput/BUILD.gn
index abd2db6c46..8f863894e9 100644
--- a/tools/vuinput/BUILD.gn
+++ b/tools/vuinput/BUILD.gn
@@ -33,10 +33,6 @@ config("libmmi_virtual_device_config") {
   if (input_feature_libinput) {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 config("virtual_device_public_config") {
@@ -88,10 +84,6 @@ ohos_source_set("libmmi-virtual-device") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   part_name = "input"
   subsystem_name = "multimodalinput"
   external_deps = [ "c_utils:utils" ]
@@ -119,10 +111,6 @@ ohos_executable("vuinput") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   install_enable = true
   part_name = "input"
   subsystem_name = "multimodalinput"
@@ -142,7 +130,7 @@ ohos_unittest("ut-virtual-device-out") {
     "${mmi_path}/util/socket/include",
   ]
 
-  if (input_feature_libinput || input_feature_hdf) {
+  if (input_feature_libinput) {
     include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
   }
 
@@ -160,10 +148,6 @@ ohos_unittest("ut-virtual-device-out") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   deps = [
     "${mmi_path}/tools/vuinput:libmmi-virtual-device",
     "${mmi_path}/util:libmmi-util",
@@ -171,7 +155,7 @@ ohos_unittest("ut-virtual-device-out") {
     "//third_party/googletest:gtest_main",
   ]
 
-  if (input_feature_libinput || input_feature_hdf) {
+  if (input_feature_libinput) {
     deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
   }
   external_deps = [
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 7b3c66529d..94de556152 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -35,10 +35,6 @@ config("libmmi_util_public_config") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
@@ -116,10 +112,6 @@ ohos_unittest("ut-mmi-util-out") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
@@ -182,10 +174,6 @@ ohos_unittest("RunShellUtilTest") {
     defines += [ "OHOS_BUILD_LIBINPUT" ]
   }
 
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
-- 
Gitee


From 14eff9fc64f93289ad3cbbfb88f0a291a7219723 Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Thu, 20 Oct 2022 19:31:54 +0800
Subject: [PATCH 052/360] remove hdf file and folder

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: I34a6d527d3fa9d2c3c4ae1f58d7b8f44287a6a99
---
 patch/diff_libevdev_hdf/BUILD.gn              |   89 -
 .../diff_libevdev_hdf/libevdev_hdf_0000.diff  |  310 --
 .../hdf/libinput_hdf_0000.diff                | 4956 -----------------
 patch/diff_mtdev_hdf/BUILD.gn                 |   85 -
 patch/diff_mtdev_hdf/mtdev_hdf_0000.diff      |  251 -
 .../hdf_adapter/include/hdf_event_manager.h   |   86 -
 service/hdf_adapter/include/hdf_inject_init.h |   31 -
 service/hdf_adapter/include/lib_hdf.h         |   56 -
 service/hdf_adapter/src/hdf_event_manager.cpp |  546 --
 service/hdf_adapter/src/hdf_inject_init.cpp   |  767 ---
 service/hdf_adapter/test/.gitkeep             |    0
 service/hdi_inject/include/hdi_inject.h       |   85 -
 service/hdi_inject/src/hdi_inject.cpp         |  407 --
 service/hdi_inject/test/hdi_inject_test.cpp   |   33 -
 14 files changed, 7702 deletions(-)
 delete mode 100644 patch/diff_libevdev_hdf/BUILD.gn
 delete mode 100644 patch/diff_libevdev_hdf/libevdev_hdf_0000.diff
 delete mode 100644 patch/diff_libinput_mmi/hdf/libinput_hdf_0000.diff
 delete mode 100644 patch/diff_mtdev_hdf/BUILD.gn
 delete mode 100644 patch/diff_mtdev_hdf/mtdev_hdf_0000.diff
 delete mode 100644 service/hdf_adapter/include/hdf_event_manager.h
 delete mode 100644 service/hdf_adapter/include/hdf_inject_init.h
 delete mode 100644 service/hdf_adapter/include/lib_hdf.h
 delete mode 100644 service/hdf_adapter/src/hdf_event_manager.cpp
 delete mode 100644 service/hdf_adapter/src/hdf_inject_init.cpp
 delete mode 100644 service/hdf_adapter/test/.gitkeep
 delete mode 100644 service/hdi_inject/include/hdi_inject.h
 delete mode 100644 service/hdi_inject/src/hdi_inject.cpp
 delete mode 100644 service/hdi_inject/test/hdi_inject_test.cpp

diff --git a/patch/diff_libevdev_hdf/BUILD.gn b/patch/diff_libevdev_hdf/BUILD.gn
deleted file mode 100644
index fa0b2c748c..0000000000
--- a/patch/diff_libevdev_hdf/BUILD.gn
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (c) 2021-2022 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build/ohos.gni")
-
-gen_src_dir = "//third_party/libevdev"
-gen_dst_dir = root_out_dir + "/diff_libevdev_hdf"
-patches_root_dir = "//foundation/multimodalinput/input/patch"
-build_gn_dir = "$patches_root_dir/diff_libevdev_hdf"
-
-action("apply_patch") {
-  visibility = [ ":*" ]
-  script = "$patches_root_dir/apply_patch.sh"
-  inputs = [ "$gen_src_dir" ]
-  outputs = [
-    "$gen_dst_dir/export_include",
-    "$gen_dst_dir/libevdev",
-    "$gen_dst_dir/include",
-    "$gen_dst_dir/libevdev/libevdev-uinput.c",
-    "$gen_dst_dir/libevdev/libevdev.c",
-    "$gen_dst_dir/libevdev/libevdev-names.c",
-  ]
-  args = [
-    rebase_path(gen_src_dir, root_build_dir),
-    rebase_path(gen_dst_dir, root_build_dir),
-    rebase_path(build_gn_dir, root_build_dir),
-  ]
-}
-
-config("libevdev_config") {
-  visibility = [ ":*" ]
-
-  include_dirs = [
-    "$gen_dst_dir/libevdev",
-    "$gen_dst_dir/include",
-  ]
-
-  cflags = [
-    "-Wno-unused-parameter",
-    "-Wno-missing-braces",
-  ]
-}
-
-config("libevdev_public_config") {
-  include_dirs = [ "$gen_dst_dir/export_include" ]
-
-  cflags = []
-}
-
-ohos_source_set("patch_gen_libevdev") {
-  sources = [
-    "$gen_dst_dir/libevdev/libevdev-names.c",
-    "$gen_dst_dir/libevdev/libevdev-uinput.c",
-    "$gen_dst_dir/libevdev/libevdev.c",
-  ]
-
-  configs = [ ":libevdev_config" ]
-
-  public_configs = [ ":libevdev_public_config" ]
-
-  deps = [ ":apply_patch" ]
-
-  public_deps = []
-}
-
-ohos_shared_library("libevdev-hdf") {
-  sources = []
-
-  configs = [ ":libevdev_config" ]
-
-  public_configs = [ ":libevdev_public_config" ]
-
-  deps = [ ":patch_gen_libevdev" ]
-
-  public_deps = []
-
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-}
diff --git a/patch/diff_libevdev_hdf/libevdev_hdf_0000.diff b/patch/diff_libevdev_hdf/libevdev_hdf_0000.diff
deleted file mode 100644
index ae28bf7eac..0000000000
--- a/patch/diff_libevdev_hdf/libevdev_hdf_0000.diff
+++ /dev/null
@@ -1,310 +0,0 @@
-Copyright (c) 2021-2022 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
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-diff -Naur old/BUILD.gn new/BUILD.gn
---- old/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
-+++ new/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
-@@ -24,7 +24,7 @@
-   ]
- }
-
--ohos_shared_library("libevdev") {
-+ohos_shared_library("libevdev-hdf") {
-   sources = [
-     "libevdev/libevdev-uinput.c",
-     "libevdev/libevdev.c",
-diff -Naur old/export_include/libevdev/libevdev.h new/export_include/libevdev/libevdev.h
---- old/export_include/libevdev/libevdev.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/export_include/libevdev/libevdev.h	2021-01-01 00:00:00.000000000 +0800
-@@ -2359,6 +2359,10 @@
-  */
- int libevdev_get_repeat(const struct libevdev *dev, int *delay, int *period);
-
-+/* for hdf drv interface */
-+typedef int (*libevdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-+int libevdev_new_from_index(int index, struct libevdev **dev,libevdev_ioctl func);
-+
- /********* DEPRECATED SECTION *********/
- #if defined(__GNUC__) && __GNUC__ >= 4
- #define LIBEVDEV_DEPRECATED __attribute__ ((deprecated))
-diff -Naur old/libevdev/libevdev-int.h new/libevdev/libevdev-int.h
---- old/libevdev/libevdev-int.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/libevdev/libevdev-int.h	2021-01-01 00:00:00.000000000 +0800
-@@ -37,6 +37,8 @@
- #define ABS_MT_CNT (ABS_MT_MAX - ABS_MT_MIN + 1)
- #define LIBEVDEV_EXPORT __attribute__((visibility("default")))
- #define ALIAS(_to) __attribute__((alias(#_to)))
-+/*for hdf drv interface*/
-+typedef int (*libevdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-
- /**
-  * Sync state machine:
-@@ -108,6 +110,7 @@
- 	struct timeval last_event_time;
-
- 	struct logdata log;
-+	libevdev_ioctl fn;  //新增加数据必须放到结尾
- };
-
- #define log_msg_cond(dev, priority, ...) \
-diff -Naur old/libevdev/libevdev-uinput.c new/libevdev/libevdev-uinput.c
---- old/libevdev/libevdev-uinput.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/libevdev/libevdev-uinput.c	2021-01-01 00:00:00.000000000 +0800
-@@ -488,7 +488,12 @@
- #ifndef __MUSL__
- 	struct input_event ev = { {0,0}, type, code, value };
- #else
--	struct input_event ev = { type, code, value };
-+	struct input_event ev;
-+	ev.input_event_sec = 0;
-+	ev.input_event_usec = 0;
-+	ev.type = type;
-+	ev.code = code;
-+	ev.value = value;
- #endif
- 	int fd = libevdev_uinput_get_fd(uinput_dev);
- 	int rc, max;
-diff -Naur old/libevdev/libevdev.c new/libevdev/libevdev.c
---- old/libevdev/libevdev.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/libevdev/libevdev.c	2021-01-01 00:00:00.000000000 +0800
-@@ -1401,8 +1401,8 @@
- 	e.code = code;
- 	e.value = value;
-
--	if (sanitize_event(dev, &e, SYNC_NONE) != EVENT_FILTER_NONE)
--		return -1;
-+	// if (sanitize_event(dev, &e, SYNC_NONE) != EVENT_FILTER_NONE)
-+		// return -1;
-
- 	switch(type) {
- 		case EV_ABS: rc = update_abs_state(dev, &e); break;
-@@ -1885,3 +1885,205 @@
-
- 	return ioctl(dev->fd, EVIOCSCLOCKID, &clockid) ? -errno : 0;
- }
-+
-+LIBEVDEV_EXPORT int
-+libevdev_set_index(struct libevdev* dev, int index,libevdev_ioctl func)
-+{
-+
-+	int rc;
-+	int i;
-+	char buf[256];
-+
-+	if (dev->initialized) {
-+		log_bug(dev, "device already initialized.\n");
-+		return -EBADF;
-+	}
-+
-+	if (index < 0) {
-+		return -EBADF;
-+	}
-+
-+	libevdev_reset(dev);
-+	dev->fn = func;
-+	dev->fd =index;
-+	rc = func(index, EVIOCGBIT(0, sizeof(dev->bits)), dev->bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	memset(buf, 0, sizeof(buf));
-+	rc = func(index, EVIOCGNAME(sizeof(buf) - 1), buf);
-+	if (rc < 0)
-+		goto out;
-+
-+	free(dev->name);
-+	dev->name = strdup(buf);
-+	if (!dev->name) {
-+		errno = ENOMEM;
-+		goto out;
-+	}
-+
-+	free(dev->phys);
-+	dev->phys = NULL;
-+	memset(buf, 0, sizeof(buf));
-+	rc = func(index, EVIOCGPHYS(sizeof(buf) - 1), buf);
-+	if (rc < 0) {
-+		/* uinput has no phys */
-+		if (errno != ENOENT)
-+			goto out;
-+	} else {
-+		dev->phys = strdup(buf);
-+		if (!dev->phys) {
-+			errno = ENOMEM;
-+			goto out;
-+		}
-+	}
-+
-+	free(dev->uniq);
-+	dev->uniq = NULL;
-+	memset(buf, 0, sizeof(buf));
-+	rc = func(index, EVIOCGUNIQ(sizeof(buf) - 1), buf);
-+	if (rc < 0) {
-+		if (errno != ENOENT)
-+			goto out;
-+	} else	{
-+		dev->uniq = strdup(buf);
-+		if (!dev->uniq) {
-+			errno = ENOMEM;
-+			goto out;
-+		}
-+	}
-+
-+	rc = func(index, EVIOCGID, &dev->ids);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGVERSION, &dev->driver_version);
-+	if (rc < 0)
-+		goto out;
-+
-+	/* Built on a kernel with props, running against a kernel without property
-+	   support. This should not be a fatal case, we'll be missing properties but other
-+	   than that everything is as expected.
-+	 */
-+	rc = func(index, EVIOCGPROP(sizeof(dev->props)), dev->props);
-+	if (rc < 0 && errno != EINVAL)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_REL, sizeof(dev->rel_bits)), dev->rel_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_ABS, sizeof(dev->abs_bits)), dev->abs_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_LED, sizeof(dev->led_bits)), dev->led_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_KEY, sizeof(dev->key_bits)), dev->key_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_SW, sizeof(dev->sw_bits)), dev->sw_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_MSC, sizeof(dev->msc_bits)), dev->msc_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_FF, sizeof(dev->ff_bits)), dev->ff_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_SND, sizeof(dev->snd_bits)), dev->snd_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGKEY(sizeof(dev->key_values)), dev->key_values);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGLED(sizeof(dev->led_values)), dev->led_values);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGSW(sizeof(dev->sw_values)), dev->sw_values);
-+	if (rc < 0)
-+		goto out;
-+
-+	/* rep is a special case, always set it to 1 for both values if EV_REP is set */
-+	if (bit_is_set(dev->bits, EV_REP)) {
-+		for (i = 0; i < REP_CNT; i++)
-+			set_bit(dev->rep_bits, i);
-+		func(index, EVIOCGREP, dev->rep_values);
-+		if (rc < 0)
-+			goto out;
-+	}
-+
-+	for (i = ABS_X; i <= ABS_MAX; i++) {
-+		if (bit_is_set(dev->abs_bits, i)) {
-+			struct input_absinfo abs_info;
-+			rc = func(index, EVIOCGABS(i), &abs_info);
-+			if (rc < 0)
-+				goto out;
-+
-+			fix_invalid_absinfo(dev, i, &abs_info);
-+
-+			dev->abs_info[i] = abs_info;
-+		}
-+	}
-+
-+	dev->fd = index;
-+
-+	rc = init_slots(dev);
-+	if (rc != 0)
-+		goto out;
-+
-+	if (dev->num_slots != -1) {
-+		struct slot_change_state unused[dev->num_slots];
-+		sync_mt_state(dev, unused);
-+	}
-+
-+	rc = init_event_queue(dev);
-+	if (rc < 0) {
-+		dev->fd = -1;
-+		return -rc;
-+	}
-+
-+	/* not copying key state because we won't know when we'll start to
-+	 * use this fd and key's are likely to change state by then.
-+	 * Same with the valuators, really, but they may not change.
-+	 */
-+
-+	dev->initialized = true;
-+out:
-+	if (rc)
-+		libevdev_reset(dev);
-+	return rc ? -errno : 0;
-+
-+
-+
-+}
-+
-+
-+int
-+libevdev_new_from_index(int index, struct libevdev **dev,libevdev_ioctl func)
-+{
-+	struct libevdev *d;
-+	int rc;
-+
-+	d = libevdev_new();
-+	if (!d)
-+		return -ENOMEM;
-+
-+	rc = libevdev_set_index(d, index,func);
-+
-+
-+	if (rc < 0)
-+		libevdev_free(d);
-+	else
-+		*dev = d;
-+	return rc;
-+}
-diff -Naur old/libevdev/libevdev.h new/libevdev/libevdev.h
---- old/libevdev/libevdev.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/libevdev/libevdev.h	2021-01-01 00:00:00.000000000 +0800
-@@ -2359,6 +2359,10 @@
-  */
- int libevdev_get_repeat(const struct libevdev *dev, int *delay, int *period);
-
-+/* for hdf drv interface */
-+typedef int (*libevdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-+int libevdev_new_from_index(int index, struct libevdev **dev,libevdev_ioctl func);
-+
- /********* DEPRECATED SECTION *********/
- #if defined(__GNUC__) && __GNUC__ >= 4
- #define LIBEVDEV_DEPRECATED __attribute__ ((deprecated))
diff --git a/patch/diff_libinput_mmi/hdf/libinput_hdf_0000.diff b/patch/diff_libinput_mmi/hdf/libinput_hdf_0000.diff
deleted file mode 100644
index d0ef53907e..0000000000
--- a/patch/diff_libinput_mmi/hdf/libinput_hdf_0000.diff
+++ /dev/null
@@ -1,4956 +0,0 @@
-Copyright (c) 2021-2022 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
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-diff -Naur old/BUILD.gn new/BUILD.gn
---- old/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
-+++ new/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
-@@ -15,19 +15,23 @@
-     "-Wno-return-type",
-     "-Wno-unused-function",
-     "-Wno-string-conversion",
-+    "-Bsymbolic",
-   ]
- }
-
- config("libinput-third_public_config") {
-   include_dirs = [
-     "export_include",
-+    "include",
-+    "include/linux/linux",
-+    "src",
-   ]
-
-   cflags = [
-   ]
- }
-
--ohos_shared_library("libinput-third") {
-+ohos_shared_library("libinput-third-hdf") {
-   sources = [
-     "src/util-list.c",
-     "src/util-ratelimit.c",
-@@ -61,7 +65,8 @@
-     "src/path-seat.c",
-     "src/udev-seat.c",
-     "src/timer.c",
--#    "src/libinput-util.c",
-+    "src/libinput-util.c",
-+    "src/evdev-joystick.c",
-   ]
-
-   configs = [
-@@ -76,9 +81,9 @@
-   ]
-
-   public_deps = [
--    "//third_party/libevdev:libevdev",
-+    "//third_party/patch_libevdev_hdf:libevdev-hdf",
-     "//third_party/eudev:libudev",
--    "//third_party/mtdev:libmtdev",
-+    "//third_party/patch_mtdev_hdf:libmtdev-hdf",
-   ]
-
-   part_name = "input"
-@@ -86,92 +91,3 @@
- ## Build libinput-third.so }}}
-
--ohos_executable("libinput-debug") {
--  install_enable = true
--
--  sources = [
--    "tools/shared.h",
--    "tools/shared.c",
--    "tools/libinput-debug-events.c",
--  ]
--
--  configs = [
--    ":libinput-third_config",
--  ]
--
--  public_configs = [
--    ":libinput-third_public_config",
--  ]
--
--  deps = [
--    ":libinput-third",
--  ]
--
--  public_deps = [
--    "//third_party/libevdev:libevdev",
--    "//third_party/eudev:libudev",
--    "//third_party/mtdev:libmtdev",
--  ]
--
--  part_name = "multimodalinput_base"
--}
--
--ohos_executable("libinput-list") {
--  install_enable = true
--
--  sources = [
--    "tools/shared.h",
--    "tools/shared.c",
--    "tools/libinput-list-devices.c",
--  ]
--
--  configs = [
--    ":libinput-third_config",
--  ]
--
--  public_configs = [
--    ":libinput-third_public_config",
--  ]
--
--  deps = [
--    ":libinput-third",
--  ]
--
--  public_deps = [
--    "//third_party/libevdev:libevdev",
--    "//third_party/eudev:libudev",
--    "//third_party/mtdev:libmtdev",
--  ]
--
--  part_name = "multimodalinput_base"
--}
--
--ohos_executable("libinput-tablet") {
--  install_enable = true
--
--  sources = [
--    "tools/shared.h",
--    "tools/shared.c",
--    "tools/libinput-debug-tablet.c",
--  ]
--
--  configs = [
--    ":libinput-third_config",
--  ]
--
--  public_configs = [
--    ":libinput-third_public_config",
--  ]
--
--  deps = [
--    ":libinput-third",
--  ]
--
--  public_deps = [
--    "//third_party/libevdev:libevdev",
--    "//third_party/eudev:libudev",
--    "//third_party/mtdev:libmtdev",
--  ]
--
--  part_name = "multimodalinput_base"
--}
-\ No newline at end of file
-diff -Naur old/export_include/libinput.h new/export_include/libinput.h
---- old/export_include/libinput.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/export_include/libinput.h	2021-01-01 00:00:00.000000000 +0800
-@@ -33,6 +33,7 @@
- #include <stdint.h>
- #include <stdarg.h>
- #include <libudev.h>
-+#include "util-bits.h"
-
- #define LIBINPUT_ATTRIBUTE_PRINTF(_format, _args) \
- 	__attribute__ ((format (printf, _format, _args)))
-@@ -196,6 +197,22 @@
- 	LIBINPUT_DEVICE_CAP_TABLET_PAD = 4,
- 	LIBINPUT_DEVICE_CAP_GESTURE = 5,
- 	LIBINPUT_DEVICE_CAP_SWITCH = 6,
-+	LIBINPUT_DEVICE_CAP_JOYSTICK = 7,
-+};
-+
-+enum evdev_device_udev_tags {
-+    EVDEV_UDEV_TAG_INPUT = bit(0),
-+    EVDEV_UDEV_TAG_KEYBOARD = bit(1),
-+    EVDEV_UDEV_TAG_MOUSE = bit(2),
-+    EVDEV_UDEV_TAG_TOUCHPAD = bit(3),
-+    EVDEV_UDEV_TAG_TOUCHSCREEN = bit(4),
-+    EVDEV_UDEV_TAG_TABLET = bit(5),
-+    EVDEV_UDEV_TAG_JOYSTICK = bit(6),
-+    EVDEV_UDEV_TAG_ACCELEROMETER = bit(7),
-+    EVDEV_UDEV_TAG_TABLET_PAD = bit(8),
-+    EVDEV_UDEV_TAG_POINTINGSTICK = bit(9),
-+    EVDEV_UDEV_TAG_TRACKBALL = bit(10),
-+    EVDEV_UDEV_TAG_SWITCH = bit(11),
- };
-
- /**
-@@ -315,6 +332,49 @@
- };
-
- /**
-+ * @ingroup event_joystick
-+ *
-+ * The source for a @ref LIBINPUT_EVENT_POINTER_AXIS event. See
-+ * libinput_event_get_joystick_axis_event() for details.
-+ *
-+ * @since 1.16.4
-+ */
-+enum libinput_joystick_axis_source {
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_UNKNOW = 0,
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_X = bit(0),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Y = bit(1),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Z = bit(2),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RX = bit(3),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RY = bit(4),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RZ = bit(5),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_THROTTLE = bit(6),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RUDDER = bit(7),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_WHEEL = bit(8),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_GAS = bit(9),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_BRAKE = bit(10),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0X = bit(11),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0Y = bit(12),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT1X = bit(13),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT1Y = bit(14),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT2X = bit(15),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT2Y = bit(16),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT3X = bit(17),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT3Y = bit(18),
-+};
-+
-+#define MAX_SOLTED_COORDS_NUM 10
-+struct sloted_coords {
-+	bool is_active;
-+	float x;
-+	float y;
-+};
-+
-+struct sloted_coords_info {
-+	struct sloted_coords coords[MAX_SOLTED_COORDS_NUM];
-+	unsigned int active_count;
-+};
-+
-+/**
-  * @ingroup device
-  *
-  * Available tool types for a device with the @ref
-@@ -387,6 +447,17 @@
- 	LIBINPUT_TABLET_TOOL_TIP_DOWN = 1,
- };
-
-+struct libinput_event_joystick_axis_abs_info {
-+	int32_t code;
-+	int32_t value;
-+	int32_t minimum;
-+	int32_t maximum;
-+	int32_t fuzz;
-+	int32_t flat;
-+	int32_t resolution;
-+	float	standardValue;
-+};
-+
- /**
-  * @defgroup tablet_pad_modes Tablet pad modes
-  *
-@@ -1893,6 +1964,12 @@
- libinput_event_gesture_get_angle_delta(struct libinput_event_gesture *event);
-
- /**
-+ * 获取带slot的touches信息, 仅支持LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE
-+ */
-+struct sloted_coords_info *
-+libinput_event_gesture_get_solt_touches(struct libinput_event_gesture *event);
-+
-+/**
-  * @defgroup event_tablet Tablet events
-  *
-  * Events that come from tools on tablet devices. For events from the pad,
-@@ -3466,6 +3543,46 @@
- int
- libinput_dispatch(struct libinput *libinput);
-
-+/****************************************************************************
-+* @brief : brief
-+* @author : fms
-+* @date : 2021/3/8 20:55
-+* @version : ver 1.0
-+* @inparam :libinput  event
-+* @outparam :
-+*****************************************************************************/
-+void
-+libinput_post_handle_event(struct libinput* libinput,
-+	struct libinput_event* event);
-+
-+/****************************************************************************
-+* @brief : get joystick button event
-+* @author : fms
-+* @date : 2021/3/12 10:56
-+* @version : ver 1.0
-+* @inparam :
-+* @outparam :
-+*****************************************************************************/
-+struct libinput_event_joystick_axis *
-+libinput_event_get_joystick_axis_event(struct libinput_event *event);
-+
-+/**
-+ * @brief 获取轴事件的时间
-+ */
-+uint64_t
-+libinput_event_get_joystick_axis_time(struct libinput_event_joystick_axis *event);
-+
-+/**
-+ * @brief 获取joystick指定轴的数据是否变化
-+*/
-+bool libinput_event_get_joystick_axis_value_is_changed(struct libinput_event_joystick_axis *event, enum libinput_joystick_axis_source axis);
-+
-+/**
-+ * @brief 获取joystick指定轴的abs信息
-+*/
-+struct libinput_event_joystick_axis_abs_info *
-+libinput_event_get_joystick_axis_abs_info(struct libinput_event_joystick_axis *event, enum libinput_joystick_axis_source axis);
-+
- /**
-  * @ingroup base
-  *
-@@ -3936,6 +4053,10 @@
- const char *
- libinput_device_get_name(struct libinput_device *device);
-
-+/**  @brief   获取设备类型*/
-+enum evdev_device_udev_tags
-+libinput_device_get_tags(struct libinput_device* device);
-+
- /**
-  * @ingroup device
-  *
-@@ -5928,7 +6049,97 @@
- unsigned int
- libinput_device_config_rotation_get_default_angle(struct libinput_device *device);
-
-+struct uhdf;
-+
-+int uhdfdevice_added(struct libinput *input,struct uhdf *uhdf,const char *seat_name);
-+
-+struct libinput * libinput_hdf_create_context(const struct libinput_interface *interface,void *user_data);
-+
-+void uhdfdevice_removed(struct uhdf *uhdf);
-+
-+struct evdev_device;
-+struct input_event;
-+void evdev_device_dispatch_two(struct evdev_device *device,
-+                struct input_event *ev);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the struct libinput_event_joystick_button from the event.
-+ *
-+ * @param event The libinput event
-+ * @return The libinput_event_joystick_button for this event.
-+ */
-+struct libinput_event_joystick_button*
-+libinput_event_get_joystick_pointer_button_event(struct libinput_event* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the time from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The time for this event.
-+ */
-+uint64_t libinput_event_joystick_button_time(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the key value from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The key value for this event.
-+ */
-+uint32_t libinput_event_joystick_button_get_key(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the seat key count from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The seat key count for this event.
-+ */
-+uint32_t libinput_event_joystick_button_get_seat_key_count(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the value count from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The value for this event.
-+ */
-+int libinput_event_joystick_button_get_value(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup config
-+ *
-+ * Get the pressure of the touch screen
-+ *
-+ * @param Carried libinput event
-+ * @return Pressure value of touch screen
-+ *
-+ * @since 1.4
-+ */
-+double
-+libinput_event_get_touch_pressure(struct libinput_event* event);
-+
-+const char*
-+libinput_device_get_phys(struct libinput_device* device);
-+bool libinput_pipe(struct libinput *libinput);
-+int libinput_pipe_write(struct libinput *libinput, int index,const void *buf, int count);
-+
-+int libinput_pipe_read(struct libinput *libinput, int index,void *buf, int count);
-+int libinput_devpipe_write(struct libinput *libinput,void *buf, int count);
-+int libinput_devpipe_read(struct libinput *libinput, void *buf, int count);
-+int libinput_get_pipe_bytes(struct libinput *libinput, int index);
-+
-+enum libinput_key_state
-+libinput_event_joystick_button_get_key_state(struct libinput_event_joystick_button* event);
- #ifdef __cplusplus
- }
- #endif
- #endif /* LIBINPUT_H */
-+
-diff -Naur old/include/config.h new/include/config.h
---- old/include/config.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/include/config.h	2021-01-01 00:00:00.000000000 +0800
-@@ -18,14 +18,17 @@
- #endif
- #define HTTP_DOC_LINK "https://wayland.freedesktop.org/libinput/doc/latest"
-
--#define LIBINPUT_QUIRKS_DIR "/usr/share/libinput"
-+#define LIBINPUT_QUIRKS_DIR "/etc/libinput/quirks"
-
--#define LIBINPUT_QUIRKS_OVERRIDE_FILE "/etc/libinput/local-overrides.quirks"
-+#define LIBINPUT_QUIRKS_OVERRIDE_FILE "/etc/libinput/quirks/local-overrides.quirks"
-+
-+#define LIBINPUT_QUIRKS_SRCDIR "/etc/libinput/quirks"
-+
-+#define LIBINPUT_TOOL_PATH "/data/libinput"
-+
-+#define MESON_BUILD_ROOT "/data/libinput"
-
- #undef NDEBUG
--#define LIBINPUT_TOOL_PATH ""
--#define LIBINPUT_QUIRKS_SRCDIR ""
--#define MESON_BUILD_ROOT ""
- #ifndef static_assert
- # ifdef _Static_assert
- #  define static_assert(cond, msg) _Static_assert(cond, msg)
-@@ -36,3 +39,10 @@
-
- #define index strchr
- #define ffs __builtin_ffs
-+
-+#ifdef HAVE_LIBINPUT_LOG_ENABLE
-+#define _LIBINPUT_LOG_DIR "/data/log/libinput"
-+#define _LIBINPUT_LOG_PATH "/data/log/libinput/libinput.log"
-+#endif
-+
-+
-diff -Naur old/include/linux/linux/input-event-codes.h new/include/linux/linux/input-event-codes.h
---- old/include/linux/linux/input-event-codes.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/include/linux/linux/input-event-codes.h	1970-01-01 08:00:00.000000000 +0800
-@@ -1,945 +0,0 @@
--/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
--/*
-- * Input event codes
-- *
-- *    *** IMPORTANT ***
-- * This file is not only included from C-code but also from devicetree source
-- * files. As such this file MUST only contain comments and defines.
-- *
-- * Copyright (c) 1999-2002 Vojtech Pavlik
-- * Copyright (c) 2015 Hans de Goede <hdegoede@redhat.com>
-- *
-- * This program is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 as published by
-- * the Free Software Foundation.
-- */
--#ifndef _UAPI_INPUT_EVENT_CODES_H
--#define _UAPI_INPUT_EVENT_CODES_H
--
--/*
-- * Device properties and quirks
-- */
--
--#define INPUT_PROP_POINTER		0x00	/* needs a pointer */
--#define INPUT_PROP_DIRECT		0x01	/* direct input devices */
--#define INPUT_PROP_BUTTONPAD		0x02	/* has button(s) under pad */
--#define INPUT_PROP_SEMI_MT		0x03	/* touch rectangle only */
--#define INPUT_PROP_TOPBUTTONPAD		0x04	/* softbuttons at top of pad */
--#define INPUT_PROP_POINTING_STICK	0x05	/* is a pointing stick */
--#define INPUT_PROP_ACCELEROMETER	0x06	/* has accelerometer */
--
--#define INPUT_PROP_MAX			0x1f
--#define INPUT_PROP_CNT			(INPUT_PROP_MAX + 1)
--
--/*
-- * Event types
-- */
--
--#define EV_SYN			0x00
--#define EV_KEY			0x01
--#define EV_REL			0x02
--#define EV_ABS			0x03
--#define EV_MSC			0x04
--#define EV_SW			0x05
--#define EV_LED			0x11
--#define EV_SND			0x12
--#define EV_REP			0x14
--#define EV_FF			0x15
--#define EV_PWR			0x16
--#define EV_FF_STATUS		0x17
--#define EV_MAX			0x1f
--#define EV_CNT			(EV_MAX+1)
--
--/*
-- * Synchronization events.
-- */
--
--#define SYN_REPORT		0
--#define SYN_CONFIG		1
--#define SYN_MT_REPORT		2
--#define SYN_DROPPED		3
--#define SYN_MAX			0xf
--#define SYN_CNT			(SYN_MAX+1)
--
--/*
-- * Keys and buttons
-- *
-- * Most of the keys/buttons are modeled after USB HUT 1.12
-- * (see http://www.usb.org/developers/hidpage).
-- * Abbreviations in the comments:
-- * AC - Application Control
-- * AL - Application Launch Button
-- * SC - System Control
-- */
--
--#define KEY_RESERVED		0
--#define KEY_ESC			1
--#define KEY_1			2
--#define KEY_2			3
--#define KEY_3			4
--#define KEY_4			5
--#define KEY_5			6
--#define KEY_6			7
--#define KEY_7			8
--#define KEY_8			9
--#define KEY_9			10
--#define KEY_0			11
--#define KEY_MINUS		12
--#define KEY_EQUAL		13
--#define KEY_BACKSPACE		14
--#define KEY_TAB			15
--#define KEY_Q			16
--#define KEY_W			17
--#define KEY_E			18
--#define KEY_R			19
--#define KEY_T			20
--#define KEY_Y			21
--#define KEY_U			22
--#define KEY_I			23
--#define KEY_O			24
--#define KEY_P			25
--#define KEY_LEFTBRACE		26
--#define KEY_RIGHTBRACE		27
--#define KEY_ENTER		28
--#define KEY_LEFTCTRL		29
--#define KEY_A			30
--#define KEY_S			31
--#define KEY_D			32
--#define KEY_F			33
--#define KEY_G			34
--#define KEY_H			35
--#define KEY_J			36
--#define KEY_K			37
--#define KEY_L			38
--#define KEY_SEMICOLON		39
--#define KEY_APOSTROPHE		40
--#define KEY_GRAVE		41
--#define KEY_LEFTSHIFT		42
--#define KEY_BACKSLASH		43
--#define KEY_Z			44
--#define KEY_X			45
--#define KEY_C			46
--#define KEY_V			47
--#define KEY_B			48
--#define KEY_N			49
--#define KEY_M			50
--#define KEY_COMMA		51
--#define KEY_DOT			52
--#define KEY_SLASH		53
--#define KEY_RIGHTSHIFT		54
--#define KEY_KPASTERISK		55
--#define KEY_LEFTALT		56
--#define KEY_SPACE		57
--#define KEY_CAPSLOCK		58
--#define KEY_F1			59
--#define KEY_F2			60
--#define KEY_F3			61
--#define KEY_F4			62
--#define KEY_F5			63
--#define KEY_F6			64
--#define KEY_F7			65
--#define KEY_F8			66
--#define KEY_F9			67
--#define KEY_F10			68
--#define KEY_NUMLOCK		69
--#define KEY_SCROLLLOCK		70
--#define KEY_KP7			71
--#define KEY_KP8			72
--#define KEY_KP9			73
--#define KEY_KPMINUS		74
--#define KEY_KP4			75
--#define KEY_KP5			76
--#define KEY_KP6			77
--#define KEY_KPPLUS		78
--#define KEY_KP1			79
--#define KEY_KP2			80
--#define KEY_KP3			81
--#define KEY_KP0			82
--#define KEY_KPDOT		83
--
--#define KEY_ZENKAKUHANKAKU	85
--#define KEY_102ND		86
--#define KEY_F11			87
--#define KEY_F12			88
--#define KEY_RO			89
--#define KEY_KATAKANA		90
--#define KEY_HIRAGANA		91
--#define KEY_HENKAN		92
--#define KEY_KATAKANAHIRAGANA	93
--#define KEY_MUHENKAN		94
--#define KEY_KPJPCOMMA		95
--#define KEY_KPENTER		96
--#define KEY_RIGHTCTRL		97
--#define KEY_KPSLASH		98
--#define KEY_SYSRQ		99
--#define KEY_RIGHTALT		100
--#define KEY_LINEFEED		101
--#define KEY_HOME		102
--#define KEY_UP			103
--#define KEY_PAGEUP		104
--#define KEY_LEFT		105
--#define KEY_RIGHT		106
--#define KEY_END			107
--#define KEY_DOWN		108
--#define KEY_PAGEDOWN		109
--#define KEY_INSERT		110
--#define KEY_DELETE		111
--#define KEY_MACRO		112
--#define KEY_MUTE		113
--#define KEY_VOLUMEDOWN		114
--#define KEY_VOLUMEUP		115
--#define KEY_POWER		116	/* SC System Power Down */
--#define KEY_KPEQUAL		117
--#define KEY_KPPLUSMINUS		118
--#define KEY_PAUSE		119
--#define KEY_SCALE		120	/* AL Compiz Scale (Expose) */
--
--#define KEY_KPCOMMA		121
--#define KEY_HANGEUL		122
--#define KEY_HANGUEL		KEY_HANGEUL
--#define KEY_HANJA		123
--#define KEY_YEN			124
--#define KEY_LEFTMETA		125
--#define KEY_RIGHTMETA		126
--#define KEY_COMPOSE		127
--
--#define KEY_STOP		128	/* AC Stop */
--#define KEY_AGAIN		129
--#define KEY_PROPS		130	/* AC Properties */
--#define KEY_UNDO		131	/* AC Undo */
--#define KEY_FRONT		132
--#define KEY_COPY		133	/* AC Copy */
--#define KEY_OPEN		134	/* AC Open */
--#define KEY_PASTE		135	/* AC Paste */
--#define KEY_FIND		136	/* AC Search */
--#define KEY_CUT			137	/* AC Cut */
--#define KEY_HELP		138	/* AL Integrated Help Center */
--#define KEY_MENU		139	/* Menu (show menu) */
--#define KEY_CALC		140	/* AL Calculator */
--#define KEY_SETUP		141
--#define KEY_SLEEP		142	/* SC System Sleep */
--#define KEY_WAKEUP		143	/* System Wake Up */
--#define KEY_FILE		144	/* AL Local Machine Browser */
--#define KEY_SENDFILE		145
--#define KEY_DELETEFILE		146
--#define KEY_XFER		147
--#define KEY_PROG1		148
--#define KEY_PROG2		149
--#define KEY_WWW			150	/* AL Internet Browser */
--#define KEY_MSDOS		151
--#define KEY_COFFEE		152	/* AL Terminal Lock/Screensaver */
--#define KEY_SCREENLOCK		KEY_COFFEE
--#define KEY_ROTATE_DISPLAY	153	/* Display orientation for e.g. tablets */
--#define KEY_DIRECTION		KEY_ROTATE_DISPLAY
--#define KEY_CYCLEWINDOWS	154
--#define KEY_MAIL		155
--#define KEY_BOOKMARKS		156	/* AC Bookmarks */
--#define KEY_COMPUTER		157
--#define KEY_BACK		158	/* AC Back */
--#define KEY_FORWARD		159	/* AC Forward */
--#define KEY_CLOSECD		160
--#define KEY_EJECTCD		161
--#define KEY_EJECTCLOSECD	162
--#define KEY_NEXTSONG		163
--#define KEY_PLAYPAUSE		164
--#define KEY_PREVIOUSSONG	165
--#define KEY_STOPCD		166
--#define KEY_RECORD		167
--#define KEY_REWIND		168
--#define KEY_PHONE		169	/* Media Select Telephone */
--#define KEY_ISO			170
--#define KEY_CONFIG		171	/* AL Consumer Control Configuration */
--#define KEY_HOMEPAGE		172	/* AC Home */
--#define KEY_REFRESH		173	/* AC Refresh */
--#define KEY_EXIT		174	/* AC Exit */
--#define KEY_MOVE		175
--#define KEY_EDIT		176
--#define KEY_SCROLLUP		177
--#define KEY_SCROLLDOWN		178
--#define KEY_KPLEFTPAREN		179
--#define KEY_KPRIGHTPAREN	180
--#define KEY_NEW			181	/* AC New */
--#define KEY_REDO		182	/* AC Redo/Repeat */
--
--#define KEY_F13			183
--#define KEY_F14			184
--#define KEY_F15			185
--#define KEY_F16			186
--#define KEY_F17			187
--#define KEY_F18			188
--#define KEY_F19			189
--#define KEY_F20			190
--#define KEY_F21			191
--#define KEY_F22			192
--#define KEY_F23			193
--#define KEY_F24			194
--
--#define KEY_PLAYCD		200
--#define KEY_PAUSECD		201
--#define KEY_PROG3		202
--#define KEY_PROG4		203
--#define KEY_DASHBOARD		204	/* AL Dashboard */
--#define KEY_SUSPEND		205
--#define KEY_CLOSE		206	/* AC Close */
--#define KEY_PLAY		207
--#define KEY_FASTFORWARD		208
--#define KEY_BASSBOOST		209
--#define KEY_PRINT		210	/* AC Print */
--#define KEY_HP			211
--#define KEY_CAMERA		212
--#define KEY_SOUND		213
--#define KEY_QUESTION		214
--#define KEY_EMAIL		215
--#define KEY_CHAT		216
--#define KEY_SEARCH		217
--#define KEY_CONNECT		218
--#define KEY_FINANCE		219	/* AL Checkbook/Finance */
--#define KEY_SPORT		220
--#define KEY_SHOP		221
--#define KEY_ALTERASE		222
--#define KEY_CANCEL		223	/* AC Cancel */
--#define KEY_BRIGHTNESSDOWN	224
--#define KEY_BRIGHTNESSUP	225
--#define KEY_MEDIA		226
--
--#define KEY_SWITCHVIDEOMODE	227	/* Cycle between available video
--					   outputs (Monitor/LCD/TV-out/etc) */
--#define KEY_KBDILLUMTOGGLE	228
--#define KEY_KBDILLUMDOWN	229
--#define KEY_KBDILLUMUP		230
--
--#define KEY_SEND		231	/* AC Send */
--#define KEY_REPLY		232	/* AC Reply */
--#define KEY_FORWARDMAIL		233	/* AC Forward Msg */
--#define KEY_SAVE		234	/* AC Save */
--#define KEY_DOCUMENTS		235
--
--#define KEY_BATTERY		236
--
--#define KEY_BLUETOOTH		237
--#define KEY_WLAN		238
--#define KEY_UWB			239
--
--#define KEY_UNKNOWN		240
--
--#define KEY_VIDEO_NEXT		241	/* drive next video source */
--#define KEY_VIDEO_PREV		242	/* drive previous video source */
--#define KEY_BRIGHTNESS_CYCLE	243	/* brightness up, after max is min */
--#define KEY_BRIGHTNESS_AUTO	244	/* Set Auto Brightness: manual
--					  brightness control is off,
--					  rely on ambient */
--#define KEY_BRIGHTNESS_ZERO	KEY_BRIGHTNESS_AUTO
--#define KEY_DISPLAY_OFF		245	/* display device to off state */
--
--#define KEY_WWAN		246	/* Wireless WAN (LTE, UMTS, GSM, etc.) */
--#define KEY_WIMAX		KEY_WWAN
--#define KEY_RFKILL		247	/* Key that controls all radios */
--
--#define KEY_MICMUTE		248	/* Mute / unmute the microphone */
--
--/* Code 255 is reserved for special needs of AT keyboard driver */
--
--#define BTN_MISC		0x100
--#define BTN_0			0x100
--#define BTN_1			0x101
--#define BTN_2			0x102
--#define BTN_3			0x103
--#define BTN_4			0x104
--#define BTN_5			0x105
--#define BTN_6			0x106
--#define BTN_7			0x107
--#define BTN_8			0x108
--#define BTN_9			0x109
--
--#define BTN_MOUSE		0x110
--#define BTN_LEFT		0x110
--#define BTN_RIGHT		0x111
--#define BTN_MIDDLE		0x112
--#define BTN_SIDE		0x113
--#define BTN_EXTRA		0x114
--#define BTN_FORWARD		0x115
--#define BTN_BACK		0x116
--#define BTN_TASK		0x117
--
--#define BTN_JOYSTICK		0x120
--#define BTN_TRIGGER		0x120
--#define BTN_THUMB		0x121
--#define BTN_THUMB2		0x122
--#define BTN_TOP			0x123
--#define BTN_TOP2		0x124
--#define BTN_PINKIE		0x125
--#define BTN_BASE		0x126
--#define BTN_BASE2		0x127
--#define BTN_BASE3		0x128
--#define BTN_BASE4		0x129
--#define BTN_BASE5		0x12a
--#define BTN_BASE6		0x12b
--#define BTN_DEAD		0x12f
--
--#define BTN_GAMEPAD		0x130
--#define BTN_SOUTH		0x130
--#define BTN_A			BTN_SOUTH
--#define BTN_EAST		0x131
--#define BTN_B			BTN_EAST
--#define BTN_C			0x132
--#define BTN_NORTH		0x133
--#define BTN_X			BTN_NORTH
--#define BTN_WEST		0x134
--#define BTN_Y			BTN_WEST
--#define BTN_Z			0x135
--#define BTN_TL			0x136
--#define BTN_TR			0x137
--#define BTN_TL2			0x138
--#define BTN_TR2			0x139
--#define BTN_SELECT		0x13a
--#define BTN_START		0x13b
--#define BTN_MODE		0x13c
--#define BTN_THUMBL		0x13d
--#define BTN_THUMBR		0x13e
--
--#define BTN_DIGI		0x140
--#define BTN_TOOL_PEN		0x140
--#define BTN_TOOL_RUBBER		0x141
--#define BTN_TOOL_BRUSH		0x142
--#define BTN_TOOL_PENCIL		0x143
--#define BTN_TOOL_AIRBRUSH	0x144
--#define BTN_TOOL_FINGER		0x145
--#define BTN_TOOL_MOUSE		0x146
--#define BTN_TOOL_LENS		0x147
--#define BTN_TOOL_QUINTTAP	0x148	/* Five fingers on trackpad */
--#define BTN_STYLUS3		0x149
--#define BTN_TOUCH		0x14a
--#define BTN_STYLUS		0x14b
--#define BTN_STYLUS2		0x14c
--#define BTN_TOOL_DOUBLETAP	0x14d
--#define BTN_TOOL_TRIPLETAP	0x14e
--#define BTN_TOOL_QUADTAP	0x14f	/* Four fingers on trackpad */
--
--#define BTN_WHEEL		0x150
--#define BTN_GEAR_DOWN		0x150
--#define BTN_GEAR_UP		0x151
--
--#define KEY_OK			0x160
--#define KEY_SELECT		0x161
--#define KEY_GOTO		0x162
--#define KEY_CLEAR		0x163
--#define KEY_POWER2		0x164
--#define KEY_OPTION		0x165
--#define KEY_INFO		0x166	/* AL OEM Features/Tips/Tutorial */
--#define KEY_TIME		0x167
--#define KEY_VENDOR		0x168
--#define KEY_ARCHIVE		0x169
--#define KEY_PROGRAM		0x16a	/* Media Select Program Guide */
--#define KEY_CHANNEL		0x16b
--#define KEY_FAVORITES		0x16c
--#define KEY_EPG			0x16d
--#define KEY_PVR			0x16e	/* Media Select Home */
--#define KEY_MHP			0x16f
--#define KEY_LANGUAGE		0x170
--#define KEY_TITLE		0x171
--#define KEY_SUBTITLE		0x172
--#define KEY_ANGLE		0x173
--#define KEY_FULL_SCREEN		0x174	/* AC View Toggle */
--#define KEY_ZOOM		KEY_FULL_SCREEN
--#define KEY_MODE		0x175
--#define KEY_KEYBOARD		0x176
--#define KEY_ASPECT_RATIO	0x177	/* HUTRR37: Aspect */
--#define KEY_SCREEN		KEY_ASPECT_RATIO
--#define KEY_PC			0x178	/* Media Select Computer */
--#define KEY_TV			0x179	/* Media Select TV */
--#define KEY_TV2			0x17a	/* Media Select Cable */
--#define KEY_VCR			0x17b	/* Media Select VCR */
--#define KEY_VCR2		0x17c	/* VCR Plus */
--#define KEY_SAT			0x17d	/* Media Select Satellite */
--#define KEY_SAT2		0x17e
--#define KEY_CD			0x17f	/* Media Select CD */
--#define KEY_TAPE		0x180	/* Media Select Tape */
--#define KEY_RADIO		0x181
--#define KEY_TUNER		0x182	/* Media Select Tuner */
--#define KEY_PLAYER		0x183
--#define KEY_TEXT		0x184
--#define KEY_DVD			0x185	/* Media Select DVD */
--#define KEY_AUX			0x186
--#define KEY_MP3			0x187
--#define KEY_AUDIO		0x188	/* AL Audio Browser */
--#define KEY_VIDEO		0x189	/* AL Movie Browser */
--#define KEY_DIRECTORY		0x18a
--#define KEY_LIST		0x18b
--#define KEY_MEMO		0x18c	/* Media Select Messages */
--#define KEY_CALENDAR		0x18d
--#define KEY_RED			0x18e
--#define KEY_GREEN		0x18f
--#define KEY_YELLOW		0x190
--#define KEY_BLUE		0x191
--#define KEY_CHANNELUP		0x192	/* Channel Increment */
--#define KEY_CHANNELDOWN		0x193	/* Channel Decrement */
--#define KEY_FIRST		0x194
--#define KEY_LAST		0x195	/* Recall Last */
--#define KEY_AB			0x196
--#define KEY_NEXT		0x197
--#define KEY_RESTART		0x198
--#define KEY_SLOW		0x199
--#define KEY_SHUFFLE		0x19a
--#define KEY_BREAK		0x19b
--#define KEY_PREVIOUS		0x19c
--#define KEY_DIGITS		0x19d
--#define KEY_TEEN		0x19e
--#define KEY_TWEN		0x19f
--#define KEY_VIDEOPHONE		0x1a0	/* Media Select Video Phone */
--#define KEY_GAMES		0x1a1	/* Media Select Games */
--#define KEY_ZOOMIN		0x1a2	/* AC Zoom In */
--#define KEY_ZOOMOUT		0x1a3	/* AC Zoom Out */
--#define KEY_ZOOMRESET		0x1a4	/* AC Zoom */
--#define KEY_WORDPROCESSOR	0x1a5	/* AL Word Processor */
--#define KEY_EDITOR		0x1a6	/* AL Text Editor */
--#define KEY_SPREADSHEET		0x1a7	/* AL Spreadsheet */
--#define KEY_GRAPHICSEDITOR	0x1a8	/* AL Graphics Editor */
--#define KEY_PRESENTATION	0x1a9	/* AL Presentation App */
--#define KEY_DATABASE		0x1aa	/* AL Database App */
--#define KEY_NEWS		0x1ab	/* AL Newsreader */
--#define KEY_VOICEMAIL		0x1ac	/* AL Voicemail */
--#define KEY_ADDRESSBOOK		0x1ad	/* AL Contacts/Address Book */
--#define KEY_MESSENGER		0x1ae	/* AL Instant Messaging */
--#define KEY_DISPLAYTOGGLE	0x1af	/* Turn display (LCD) on and off */
--#define KEY_BRIGHTNESS_TOGGLE	KEY_DISPLAYTOGGLE
--#define KEY_SPELLCHECK		0x1b0   /* AL Spell Check */
--#define KEY_LOGOFF		0x1b1   /* AL Logoff */
--
--#define KEY_DOLLAR		0x1b2
--#define KEY_EURO		0x1b3
--
--#define KEY_FRAMEBACK		0x1b4	/* Consumer - transport controls */
--#define KEY_FRAMEFORWARD	0x1b5
--#define KEY_CONTEXT_MENU	0x1b6	/* GenDesc - system context menu */
--#define KEY_MEDIA_REPEAT	0x1b7	/* Consumer - transport control */
--#define KEY_10CHANNELSUP	0x1b8	/* 10 channels up (10+) */
--#define KEY_10CHANNELSDOWN	0x1b9	/* 10 channels down (10-) */
--#define KEY_IMAGES		0x1ba	/* AL Image Browser */
--
--#define KEY_DEL_EOL		0x1c0
--#define KEY_DEL_EOS		0x1c1
--#define KEY_INS_LINE		0x1c2
--#define KEY_DEL_LINE		0x1c3
--
--#define KEY_FN			0x1d0
--#define KEY_FN_ESC		0x1d1
--#define KEY_FN_F1		0x1d2
--#define KEY_FN_F2		0x1d3
--#define KEY_FN_F3		0x1d4
--#define KEY_FN_F4		0x1d5
--#define KEY_FN_F5		0x1d6
--#define KEY_FN_F6		0x1d7
--#define KEY_FN_F7		0x1d8
--#define KEY_FN_F8		0x1d9
--#define KEY_FN_F9		0x1da
--#define KEY_FN_F10		0x1db
--#define KEY_FN_F11		0x1dc
--#define KEY_FN_F12		0x1dd
--#define KEY_FN_1		0x1de
--#define KEY_FN_2		0x1df
--#define KEY_FN_D		0x1e0
--#define KEY_FN_E		0x1e1
--#define KEY_FN_F		0x1e2
--#define KEY_FN_S		0x1e3
--#define KEY_FN_B		0x1e4
--
--#define KEY_BRL_DOT1		0x1f1
--#define KEY_BRL_DOT2		0x1f2
--#define KEY_BRL_DOT3		0x1f3
--#define KEY_BRL_DOT4		0x1f4
--#define KEY_BRL_DOT5		0x1f5
--#define KEY_BRL_DOT6		0x1f6
--#define KEY_BRL_DOT7		0x1f7
--#define KEY_BRL_DOT8		0x1f8
--#define KEY_BRL_DOT9		0x1f9
--#define KEY_BRL_DOT10		0x1fa
--
--#define KEY_NUMERIC_0		0x200	/* used by phones, remote controls, */
--#define KEY_NUMERIC_1		0x201	/* and other keypads */
--#define KEY_NUMERIC_2		0x202
--#define KEY_NUMERIC_3		0x203
--#define KEY_NUMERIC_4		0x204
--#define KEY_NUMERIC_5		0x205
--#define KEY_NUMERIC_6		0x206
--#define KEY_NUMERIC_7		0x207
--#define KEY_NUMERIC_8		0x208
--#define KEY_NUMERIC_9		0x209
--#define KEY_NUMERIC_STAR	0x20a
--#define KEY_NUMERIC_POUND	0x20b
--#define KEY_NUMERIC_A		0x20c	/* Phone key A - HUT Telephony 0xb9 */
--#define KEY_NUMERIC_B		0x20d
--#define KEY_NUMERIC_C		0x20e
--#define KEY_NUMERIC_D		0x20f
--
--#define KEY_CAMERA_FOCUS	0x210
--#define KEY_WPS_BUTTON		0x211	/* WiFi Protected Setup key */
--
--#define KEY_TOUCHPAD_TOGGLE	0x212	/* Request switch touchpad on or off */
--#define KEY_TOUCHPAD_ON		0x213
--#define KEY_TOUCHPAD_OFF	0x214
--
--#define KEY_CAMERA_ZOOMIN	0x215
--#define KEY_CAMERA_ZOOMOUT	0x216
--#define KEY_CAMERA_UP		0x217
--#define KEY_CAMERA_DOWN		0x218
--#define KEY_CAMERA_LEFT		0x219
--#define KEY_CAMERA_RIGHT	0x21a
--
--#define KEY_ATTENDANT_ON	0x21b
--#define KEY_ATTENDANT_OFF	0x21c
--#define KEY_ATTENDANT_TOGGLE	0x21d	/* Attendant call on or off */
--#define KEY_LIGHTS_TOGGLE	0x21e	/* Reading light on or off */
--
--#define BTN_DPAD_UP		0x220
--#define BTN_DPAD_DOWN		0x221
--#define BTN_DPAD_LEFT		0x222
--#define BTN_DPAD_RIGHT		0x223
--
--#define KEY_ALS_TOGGLE		0x230	/* Ambient light sensor */
--#define KEY_ROTATE_LOCK_TOGGLE	0x231	/* Display rotation lock */
--
--#define KEY_BUTTONCONFIG		0x240	/* AL Button Configuration */
--#define KEY_TASKMANAGER		0x241	/* AL Task/Project Manager */
--#define KEY_JOURNAL		0x242	/* AL Log/Journal/Timecard */
--#define KEY_CONTROLPANEL		0x243	/* AL Control Panel */
--#define KEY_APPSELECT		0x244	/* AL Select Task/Application */
--#define KEY_SCREENSAVER		0x245	/* AL Screen Saver */
--#define KEY_VOICECOMMAND		0x246	/* Listening Voice Command */
--#define KEY_ASSISTANT		0x247	/* AL Context-aware desktop assistant */
--#define KEY_KBD_LAYOUT_NEXT	0x248	/* AC Next Keyboard Layout Select */
--
--#define KEY_BRIGHTNESS_MIN		0x250	/* Set Brightness to Minimum */
--#define KEY_BRIGHTNESS_MAX		0x251	/* Set Brightness to Maximum */
--
--#define KEY_KBDINPUTASSIST_PREV		0x260
--#define KEY_KBDINPUTASSIST_NEXT		0x261
--#define KEY_KBDINPUTASSIST_PREVGROUP		0x262
--#define KEY_KBDINPUTASSIST_NEXTGROUP		0x263
--#define KEY_KBDINPUTASSIST_ACCEPT		0x264
--#define KEY_KBDINPUTASSIST_CANCEL		0x265
--
--/* Diagonal movement keys */
--#define KEY_RIGHT_UP			0x266
--#define KEY_RIGHT_DOWN			0x267
--#define KEY_LEFT_UP			0x268
--#define KEY_LEFT_DOWN			0x269
--
--#define KEY_ROOT_MENU			0x26a /* Show Device's Root Menu */
--/* Show Top Menu of the Media (e.g. DVD) */
--#define KEY_MEDIA_TOP_MENU		0x26b
--#define KEY_NUMERIC_11			0x26c
--#define KEY_NUMERIC_12			0x26d
--/*
-- * Toggle Audio Description: refers to an audio service that helps blind and
-- * visually impaired consumers understand the action in a program. Note: in
-- * some countries this is referred to as "Video Description".
-- */
--#define KEY_AUDIO_DESC			0x26e
--#define KEY_3D_MODE			0x26f
--#define KEY_NEXT_FAVORITE		0x270
--#define KEY_STOP_RECORD			0x271
--#define KEY_PAUSE_RECORD		0x272
--#define KEY_VOD				0x273 /* Video on Demand */
--#define KEY_UNMUTE			0x274
--#define KEY_FASTREVERSE			0x275
--#define KEY_SLOWREVERSE			0x276
--/*
-- * Control a data application associated with the currently viewed channel,
-- * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)
-- */
--#define KEY_DATA			0x277
--#define KEY_ONSCREEN_KEYBOARD		0x278
--/* Electronic privacy screen control */
--#define KEY_PRIVACY_SCREEN_TOGGLE	0x279
--
--/* Select an area of screen to be copied */
--#define KEY_SELECTIVE_SCREENSHOT	0x27a
--
--/*
-- * Some keyboards have keys which do not have a defined meaning, these keys
-- * are intended to be programmed / bound to macros by the user. For most
-- * keyboards with these macro-keys the key-sequence to inject, or action to
-- * take, is all handled by software on the host side. So from the kernel's
-- * point of view these are just normal keys.
-- *
-- * The KEY_MACRO# codes below are intended for such keys, which may be labeled
-- * e.g. G1-G18, or S1 - S30. The KEY_MACRO# codes MUST NOT be used for keys
-- * where the marking on the key does indicate a defined meaning / purpose.
-- *
-- * The KEY_MACRO# codes MUST also NOT be used as fallback for when no existing
-- * KEY_FOO define matches the marking / purpose. In this case a new KEY_FOO
-- * define MUST be added.
-- */
--#define KEY_MACRO1			0x290
--#define KEY_MACRO2			0x291
--#define KEY_MACRO3			0x292
--#define KEY_MACRO4			0x293
--#define KEY_MACRO5			0x294
--#define KEY_MACRO6			0x295
--#define KEY_MACRO7			0x296
--#define KEY_MACRO8			0x297
--#define KEY_MACRO9			0x298
--#define KEY_MACRO10			0x299
--#define KEY_MACRO11			0x29a
--#define KEY_MACRO12			0x29b
--#define KEY_MACRO13			0x29c
--#define KEY_MACRO14			0x29d
--#define KEY_MACRO15			0x29e
--#define KEY_MACRO16			0x29f
--#define KEY_MACRO17			0x2a0
--#define KEY_MACRO18			0x2a1
--#define KEY_MACRO19			0x2a2
--#define KEY_MACRO20			0x2a3
--#define KEY_MACRO21			0x2a4
--#define KEY_MACRO22			0x2a5
--#define KEY_MACRO23			0x2a6
--#define KEY_MACRO24			0x2a7
--#define KEY_MACRO25			0x2a8
--#define KEY_MACRO26			0x2a9
--#define KEY_MACRO27			0x2aa
--#define KEY_MACRO28			0x2ab
--#define KEY_MACRO29			0x2ac
--#define KEY_MACRO30			0x2ad
--
--/*
-- * Some keyboards with the macro-keys described above have some extra keys
-- * for controlling the host-side software responsible for the macro handling:
-- * -A macro recording start/stop key. Note that not all keyboards which emit
-- *  KEY_MACRO_RECORD_START will also emit KEY_MACRO_RECORD_STOP if
-- *  KEY_MACRO_RECORD_STOP is not advertised, then KEY_MACRO_RECORD_START
-- *  should be interpreted as a recording start/stop toggle;
-- * -Keys for switching between different macro (pre)sets, either a key for
-- *  cycling through the configured presets or keys to directly select a preset.
-- */
--#define KEY_MACRO_RECORD_START		0x2b0
--#define KEY_MACRO_RECORD_STOP		0x2b1
--#define KEY_MACRO_PRESET_CYCLE		0x2b2
--#define KEY_MACRO_PRESET1		0x2b3
--#define KEY_MACRO_PRESET2		0x2b4
--#define KEY_MACRO_PRESET3		0x2b5
--
--/*
-- * Some keyboards have a buildin LCD panel where the contents are controlled
-- * by the host. Often these have a number of keys directly below the LCD
-- * intended for controlling a menu shown on the LCD. These keys often don't
-- * have any labeling so we just name them KEY_KBD_LCD_MENU#
-- */
--#define KEY_KBD_LCD_MENU1		0x2b8
--#define KEY_KBD_LCD_MENU2		0x2b9
--#define KEY_KBD_LCD_MENU3		0x2ba
--#define KEY_KBD_LCD_MENU4		0x2bb
--#define KEY_KBD_LCD_MENU5		0x2bc
--
--#define BTN_TRIGGER_HAPPY		0x2c0
--#define BTN_TRIGGER_HAPPY1		0x2c0
--#define BTN_TRIGGER_HAPPY2		0x2c1
--#define BTN_TRIGGER_HAPPY3		0x2c2
--#define BTN_TRIGGER_HAPPY4		0x2c3
--#define BTN_TRIGGER_HAPPY5		0x2c4
--#define BTN_TRIGGER_HAPPY6		0x2c5
--#define BTN_TRIGGER_HAPPY7		0x2c6
--#define BTN_TRIGGER_HAPPY8		0x2c7
--#define BTN_TRIGGER_HAPPY9		0x2c8
--#define BTN_TRIGGER_HAPPY10		0x2c9
--#define BTN_TRIGGER_HAPPY11		0x2ca
--#define BTN_TRIGGER_HAPPY12		0x2cb
--#define BTN_TRIGGER_HAPPY13		0x2cc
--#define BTN_TRIGGER_HAPPY14		0x2cd
--#define BTN_TRIGGER_HAPPY15		0x2ce
--#define BTN_TRIGGER_HAPPY16		0x2cf
--#define BTN_TRIGGER_HAPPY17		0x2d0
--#define BTN_TRIGGER_HAPPY18		0x2d1
--#define BTN_TRIGGER_HAPPY19		0x2d2
--#define BTN_TRIGGER_HAPPY20		0x2d3
--#define BTN_TRIGGER_HAPPY21		0x2d4
--#define BTN_TRIGGER_HAPPY22		0x2d5
--#define BTN_TRIGGER_HAPPY23		0x2d6
--#define BTN_TRIGGER_HAPPY24		0x2d7
--#define BTN_TRIGGER_HAPPY25		0x2d8
--#define BTN_TRIGGER_HAPPY26		0x2d9
--#define BTN_TRIGGER_HAPPY27		0x2da
--#define BTN_TRIGGER_HAPPY28		0x2db
--#define BTN_TRIGGER_HAPPY29		0x2dc
--#define BTN_TRIGGER_HAPPY30		0x2dd
--#define BTN_TRIGGER_HAPPY31		0x2de
--#define BTN_TRIGGER_HAPPY32		0x2df
--#define BTN_TRIGGER_HAPPY33		0x2e0
--#define BTN_TRIGGER_HAPPY34		0x2e1
--#define BTN_TRIGGER_HAPPY35		0x2e2
--#define BTN_TRIGGER_HAPPY36		0x2e3
--#define BTN_TRIGGER_HAPPY37		0x2e4
--#define BTN_TRIGGER_HAPPY38		0x2e5
--#define BTN_TRIGGER_HAPPY39		0x2e6
--#define BTN_TRIGGER_HAPPY40		0x2e7
--
--/* We avoid low common keys in module aliases so they don't get huge. */
--#define KEY_MIN_INTERESTING	KEY_MUTE
--#define KEY_MAX			0x2ff
--#define KEY_CNT			(KEY_MAX+1)
--
--/*
-- * Relative axes
-- */
--
--#define REL_X			0x00
--#define REL_Y			0x01
--#define REL_Z			0x02
--#define REL_RX			0x03
--#define REL_RY			0x04
--#define REL_RZ			0x05
--#define REL_HWHEEL		0x06
--#define REL_DIAL		0x07
--#define REL_WHEEL		0x08
--#define REL_MISC		0x09
--/*
-- * 0x0a is reserved and should not be used in input drivers.
-- * It was used by HID as REL_MISC+1 and userspace needs to detect if
-- * the next REL_* event is correct or is just REL_MISC + n.
-- * We define here REL_RESERVED so userspace can rely on it and detect
-- * the situation described above.
-- */
--#define REL_RESERVED		0x0a
--#define REL_WHEEL_HI_RES	0x0b
--#define REL_HWHEEL_HI_RES	0x0c
--#define REL_MAX			0x0f
--#define REL_CNT			(REL_MAX+1)
--
--/*
-- * Absolute axes
-- */
--
--#define ABS_X			0x00
--#define ABS_Y			0x01
--#define ABS_Z			0x02
--#define ABS_RX			0x03
--#define ABS_RY			0x04
--#define ABS_RZ			0x05
--#define ABS_THROTTLE		0x06
--#define ABS_RUDDER		0x07
--#define ABS_WHEEL		0x08
--#define ABS_GAS			0x09
--#define ABS_BRAKE		0x0a
--#define ABS_HAT0X		0x10
--#define ABS_HAT0Y		0x11
--#define ABS_HAT1X		0x12
--#define ABS_HAT1Y		0x13
--#define ABS_HAT2X		0x14
--#define ABS_HAT2Y		0x15
--#define ABS_HAT3X		0x16
--#define ABS_HAT3Y		0x17
--#define ABS_PRESSURE		0x18
--#define ABS_DISTANCE		0x19
--#define ABS_TILT_X		0x1a
--#define ABS_TILT_Y		0x1b
--#define ABS_TOOL_WIDTH		0x1c
--
--#define ABS_VOLUME		0x20
--
--#define ABS_MISC		0x28
--
--/*
-- * 0x2e is reserved and should not be used in input drivers.
-- * It was used by HID as ABS_MISC+6 and userspace needs to detect if
-- * the next ABS_* event is correct or is just ABS_MISC + n.
-- * We define here ABS_RESERVED so userspace can rely on it and detect
-- * the situation described above.
-- */
--#define ABS_RESERVED		0x2e
--
--#define ABS_MT_SLOT		0x2f	/* MT slot being modified */
--#define ABS_MT_TOUCH_MAJOR	0x30	/* Major axis of touching ellipse */
--#define ABS_MT_TOUCH_MINOR	0x31	/* Minor axis (omit if circular) */
--#define ABS_MT_WIDTH_MAJOR	0x32	/* Major axis of approaching ellipse */
--#define ABS_MT_WIDTH_MINOR	0x33	/* Minor axis (omit if circular) */
--#define ABS_MT_ORIENTATION	0x34	/* Ellipse orientation */
--#define ABS_MT_POSITION_X	0x35	/* Center X touch position */
--#define ABS_MT_POSITION_Y	0x36	/* Center Y touch position */
--#define ABS_MT_TOOL_TYPE	0x37	/* Type of touching device */
--#define ABS_MT_BLOB_ID		0x38	/* Group a set of packets as a blob */
--#define ABS_MT_TRACKING_ID	0x39	/* Unique ID of initiated contact */
--#define ABS_MT_PRESSURE		0x3a	/* Pressure on contact area */
--#define ABS_MT_DISTANCE		0x3b	/* Contact hover distance */
--#define ABS_MT_TOOL_X		0x3c	/* Center X tool position */
--#define ABS_MT_TOOL_Y		0x3d	/* Center Y tool position */
--
--
--#define ABS_MAX			0x3f
--#define ABS_CNT			(ABS_MAX+1)
--
--/*
-- * Switch events
-- */
--
--#define SW_LID			0x00  /* set = lid shut */
--#define SW_TABLET_MODE		0x01  /* set = tablet mode */
--#define SW_HEADPHONE_INSERT	0x02  /* set = inserted */
--#define SW_RFKILL_ALL		0x03  /* rfkill master switch, type "any"
--					 set = radio enabled */
--#define SW_RADIO		SW_RFKILL_ALL	/* deprecated */
--#define SW_MICROPHONE_INSERT	0x04  /* set = inserted */
--#define SW_DOCK			0x05  /* set = plugged into dock */
--#define SW_LINEOUT_INSERT	0x06  /* set = inserted */
--#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
--#define SW_VIDEOOUT_INSERT	0x08  /* set = inserted */
--#define SW_CAMERA_LENS_COVER	0x09  /* set = lens covered */
--#define SW_KEYPAD_SLIDE		0x0a  /* set = keypad slide out */
--#define SW_FRONT_PROXIMITY	0x0b  /* set = front proximity sensor active */
--#define SW_ROTATE_LOCK		0x0c  /* set = rotate locked/disabled */
--#define SW_LINEIN_INSERT	0x0d  /* set = inserted */
--#define SW_MUTE_DEVICE		0x0e  /* set = device disabled */
--#define SW_PEN_INSERTED		0x0f  /* set = pen inserted */
--#define SW_MACHINE_COVER	0x10  /* set = cover closed */
--#define SW_MAX			0x10
--#define SW_CNT			(SW_MAX+1)
--
--/*
-- * Misc events
-- */
--
--#define MSC_SERIAL		0x00
--#define MSC_PULSELED		0x01
--#define MSC_GESTURE		0x02
--#define MSC_RAW			0x03
--#define MSC_SCAN		0x04
--#define MSC_TIMESTAMP		0x05
--#define MSC_MAX			0x07
--#define MSC_CNT			(MSC_MAX+1)
--
--/*
-- * LEDs
-- */
--
--#define LED_NUML		0x00
--#define LED_CAPSL		0x01
--#define LED_SCROLLL		0x02
--#define LED_COMPOSE		0x03
--#define LED_KANA		0x04
--#define LED_SLEEP		0x05
--#define LED_SUSPEND		0x06
--#define LED_MUTE		0x07
--#define LED_MISC		0x08
--#define LED_MAIL		0x09
--#define LED_CHARGING		0x0a
--#define LED_MAX			0x0f
--#define LED_CNT			(LED_MAX+1)
--
--/*
-- * Autorepeat values
-- */
--
--#define REP_DELAY		0x00
--#define REP_PERIOD		0x01
--#define REP_MAX			0x01
--#define REP_CNT			(REP_MAX+1)
--
--/*
-- * Sounds
-- */
--
--#define SND_CLICK		0x00
--#define SND_BELL		0x01
--#define SND_TONE		0x02
--#define SND_MAX			0x07
--#define SND_CNT			(SND_MAX+1)
--
--#endif
-diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
---- old/src/evdev-fallback.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-fallback.c	2021-01-01 00:00:00.000000000 +0800
-@@ -689,26 +689,9 @@
-
- 	if (event->type != LIBINPUT_EVENT_KEYBOARD_KEY)
- 		return;
--
--	if (dispatch->lid.reliability == RELIABILITY_WRITE_OPEN) {
--		int fd = libevdev_get_fd(dispatch->device->evdev);
--		int rc;
--		struct input_event ev[2];
--
--		ev[0] = input_event_init(0, EV_SW, SW_LID, 0);
--		ev[1] = input_event_init(0, EV_SYN, SYN_REPORT, 0);
--
--		rc = write(fd, ev, sizeof(ev));
--
--		if (rc < 0)
--			evdev_log_error(dispatch->device,
--					"failed to write SW_LID state (%s)",
--					strerror(errno));
--
--		/* In case write() fails, we sync the lid state manually
--		 * regardless. */
--	}
--
-+
-+    // hdf has no write fd operation.
-+
- 	/* Posting the event here means we preempt the keyboard events that
- 	 * caused us to wake up, so the lid event is always passed on before
- 	 * the key event.
-@@ -1031,6 +1014,9 @@
- 	if (dispatch->arbitration.in_arbitration)
- 		return;
-
-+	libinput_log_printf("1.event divice_name:%s divice_fd:%d type:%d code:%d value:%d  time:%llu  curtime:%llu \r\n",
-+        device->devname, device->fd, event->type, event->code, event->value, getTranTime(event), getMicrotime());
-+
- 	switch (event->type) {
- 	case EV_REL:
- 		fallback_process_relative(dispatch, device, event, time);
-@@ -1575,7 +1561,7 @@
- 	   Devices with ABS_MT_POSITION_* but not ABS_MT_SLOT
- 	   require mtdev for conversion. */
- 	if (evdev_need_mtdev(device)) {
--		device->mtdev = mtdev_new_open(device->fd);
-+		device->mtdev = mtdev_new_open_hdi(device->uhdf->index,device->uhdf->fn);
- 		if (!device->mtdev)
- 			return -1;
-
-diff -Naur old/src/evdev-fallback.h new/src/evdev-fallback.h
---- old/src/evdev-fallback.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-fallback.h	2021-01-01 00:00:00.000000000 +0800
-@@ -169,6 +169,7 @@
- static inline enum key_type
- get_key_type(uint16_t code)
- {
-+	const uint16_t KEY_ENDCALL = 0x2e8;
- 	switch (code) {
- 	case BTN_TOOL_PEN:
- 	case BTN_TOOL_RUBBER:
-@@ -198,6 +199,8 @@
- 		return KEY_TYPE_KEY;
- 	if (code >= BTN_TRIGGER_HAPPY && code <= BTN_TRIGGER_HAPPY40)
- 		return KEY_TYPE_BUTTON;
-+	if (code == KEY_ENDCALL)
-+		return KEY_TYPE_KEY;
- 	return KEY_TYPE_NONE;
- }
-
-diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
---- old/src/evdev-joystick.c	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/evdev-joystick.c	2021-01-01 00:00:00.000000000 +0800
-@@ -0,0 +1,583 @@
-+/*
-+ * Copyright (c) 2021-2022 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
-+ *
-+ *     http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+#include <stdbool.h>
-+#include <string.h>
-+
-+#include "config.h"
-+#include "libinput-version.h"
-+#include "evdev-joystick.h"
-+#include "input-event-codes.h"
-+#include "libinput.h"
-+#include "libinput-util.h"
-+
-+static inline struct
-+joystick_dispatch* get_joystick_dispatch(struct evdev_dispatch* dispatch)
-+{
-+    if (dispatch == NULL) {
-+        return NULL;
-+    }
-+    evdev_verify_dispatch_type(dispatch, DISPATCH_JOYSTICK);
-+
-+    struct joystick_dispatch* joystick_dispatch = NULL;
-+    joystick_dispatch = container_of(dispatch, struct joystick_dispatch, base);
-+
-+    return joystick_dispatch;
-+}
-+
-+static int
-+update_seat_joystick_button_count(struct libinput_seat* pSeat, int32_t key, uint32_t *pRetcount, enum libinput_key_state state)
-+{
-+    if (pSeat == NULL || pRetcount == NULL || key < SYN_REPORT || key > KEY_MAX) {
-+        return false;
-+    }
-+
-+    switch (state) {
-+        case LIBINPUT_KEY_STATE_PRESSED:
-+        {
-+            *(pRetcount) = ++pSeat->button_count[key];
-+        }
-+        break;
-+        case LIBINPUT_KEY_STATE_RELEASED:
-+        {
-+            if (pSeat->button_count[key] == 0) {
-+                *(pRetcount) = pSeat->button_count[key];
-+            }
-+            else {
-+                *(pRetcount) = --pSeat->button_count[key];
-+            }
-+        }
-+        break;
-+        default:
-+            *(pRetcount) = 0;
-+            break;
-+    }
-+    return true;
-+}
-+
-+static void
-+joystick_notify_axis(struct evdev_device* device, uint64_t time)
-+{
-+    if (device == NULL) {
-+        return;
-+    }
-+
-+	struct joystick_dispatch *joystick_dispatch = get_joystick_dispatch(device->dispatch);
-+	if (joystick_dispatch == NULL) {
-+        libinput_log_printf("joystick_dispatch is NULL.\n");
-+		return;
-+	}
-+
-+    struct libinput_event_joystick_axis* joystick_axis_event = zalloc(sizeof * joystick_axis_event);
-+    if (joystick_axis_event == NULL) {
-+        libinput_log_printf("pJoystickEvent is NULL.\n");
-+        return;
-+    }
-+
-+    *joystick_axis_event = (struct libinput_event_joystick_axis){
-+	    .base.type = LIBINPUT_EVENT_POINTER_AXIS,
-+	    .base.device = &device->base,
-+        .type = EV_ABS,
-+        .time = time,
-+        .axis_value_mask = joystick_dispatch->axis_value_mask,
-+	    .abs_throttle = joystick_dispatch->abs_throttle,
-+	    .abs_hat0x = joystick_dispatch->abs_hat0x,
-+	    .abs_hat0y = joystick_dispatch->abs_hat0y,
-+	    .abs_x = joystick_dispatch->abs_x,
-+		.abs_y = joystick_dispatch->abs_y,
-+		.abs_z = joystick_dispatch->abs_z,
-+		.abs_rx = joystick_dispatch->abs_rx,
-+		.abs_ry = joystick_dispatch->abs_ry,
-+		.abs_rz = joystick_dispatch->abs_rz,
-+    };
-+
-+    struct libinput_event_listener* listener = NULL;
-+    struct libinput_event_listener* tmp_listener = NULL;
-+    list_for_each_safe(listener, tmp_listener, &device->base.event_listeners, link) {
-+        listener->notify_func(time, &joystick_axis_event->base, listener->notify_func_data);
-+    }
-+
-+    libinput_post_handle_event(device->base.seat->libinput, &joystick_axis_event->base);
-+}
-+
-+static void
-+joystick_notify_key_event(struct evdev_device* device, struct input_event* pEvent, uint64_t time)
-+{
-+    if (device == NULL || pEvent == NULL) {
-+        return;
-+    }
-+
-+    struct libinput_event_joystick_button* pKeyEvent = {0};
-+    uint32_t uiSeatCount = 0;
-+
-+    int iRet = update_seat_joystick_button_count(device->base.seat, pEvent->code, &uiSeatCount, pEvent->value);
-+    if (iRet == false) {
-+        return;
-+    }
-+
-+    pKeyEvent = zalloc(sizeof * pKeyEvent);
-+    if (pKeyEvent == NULL) {
-+        return;
-+    }
-+
-+	*pKeyEvent = (struct libinput_event_joystick_button) {
-+			.base.type = LIBINPUT_EVENT_POINTER_BUTTON,
-+			.base.device = &device->base,
-+            .time = time,
-+            .type = pEvent->type,
-+            .key = pEvent->code,
-+            .value = pEvent->value,
-+            .seat_key_count = uiSeatCount,
-+            .state = pEvent->value,
-+    };
-+
-+    struct libinput_event_listener* listener = NULL;
-+    struct libinput_event_listener* tmp_listener = NULL;
-+    list_for_each_safe(listener, tmp_listener, &device->base.event_listeners, link)
-+    {
-+        listener->notify_func(time, &pKeyEvent->base, listener->notify_func_data);
-+    }
-+
-+    libinput_post_handle_event(device->base.seat->libinput, &pKeyEvent->base);
-+}
-+
-+static float
-+abs_value_standardize(int32_t value, int32_t minimum, int32_t maximum, float standard_min, float standard_max)
-+{
-+    return standard_min + ((float)value - (float)minimum) * ((float)(standard_max - standard_min)) / ((float)(maximum - minimum));
-+}
-+
-+static float
-+get_joystick_abs_standard_value(struct libinput_event_joystick_axis_abs_info *absinfo)
-+{
-+    const int32_t value = absinfo->value;
-+    const int32_t minimum = absinfo->minimum;
-+    const int32_t maximum = absinfo->maximum;
-+    if (minimum >= maximum) {
-+		libinput_log_printf("joystick abs: minimum(%u) >= maximum(%u).\n", minimum, maximum);
-+        return 0.f;
-+    } else if (value < minimum || value > maximum) {
-+		libinput_log_printf("joystick abs: value(%d) not between minimum(%u) and maximum(%u).\n", value, minimum, maximum);
-+		return 0.f;
-+    }
-+
-+    const int32_t code = absinfo->code;
-+    switch (code) {
-+	case ABS_THROTTLE:
-+	{
-+		return abs_value_standardize(value, minimum, maximum, 0, 1.0);
-+	}
-+	case ABS_X:
-+	case ABS_Y:
-+	case ABS_Z:
-+	case ABS_RX:
-+	case ABS_RY:
-+	case ABS_RZ:
-+    {
-+        return abs_value_standardize(value, minimum, maximum, -1.0, 1.0);
-+	}
-+    case ABS_HAT0X:
-+    case ABS_HAT0Y:
-+    {
-+        return (float)value;
-+    }
-+    default:
-+    return (float)value;
-+    }
-+}
-+
-+static void joystick_set_axis_value_mask(struct joystick_dispatch *joystick_dispatch, enum libinput_joystick_axis_source axis)
-+{
-+    joystick_dispatch->axis_value_mask |= (uint32_t)axis;
-+}
-+
-+static void joystick_reset_axis_value_mask(struct joystick_dispatch *joystick_dispatch)
-+{
-+	joystick_dispatch->axis_value_mask = 0;
-+}
-+
-+static bool joystick_is_axis_value_mask(struct joystick_dispatch *joystick_dispatch)
-+{
-+	return (joystick_dispatch->axis_value_mask != 0);
-+}
-+
-+static void joystick_get_one_abs_info(struct joystick_dispatch *joystick_dispatch, struct evdev_device *device, struct input_event *event,
-+    const uint32_t code)
-+{
-+    struct libinput_event_joystick_axis_abs_info *absinfo = NULL;
-+    switch (code) {
-+    case ABS_THROTTLE:
-+    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_THROTTLE);
-+    absinfo = &joystick_dispatch->abs_throttle;
-+    break;
-+    case ABS_HAT0X:
-+    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0X);
-+    absinfo = &joystick_dispatch->abs_hat0x;
-+    break;
-+    case ABS_HAT0Y:
-+    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0Y);
-+    absinfo = &joystick_dispatch->abs_hat0y;
-+    break;
-+    case ABS_X:
-+    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_X);
-+    absinfo = &joystick_dispatch->abs_x;
-+    break;
-+    case ABS_Y:
-+    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Y);
-+    absinfo = &joystick_dispatch->abs_y;
-+    break;
-+	case ABS_Z:
-+	joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Z);
-+	absinfo = &joystick_dispatch->abs_z;
-+    break;
-+	case ABS_RX:
-+	joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RX);
-+	absinfo = &joystick_dispatch->abs_rx;
-+	break;
-+	case ABS_RY:
-+	joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RY);
-+	absinfo = &joystick_dispatch->abs_ry;
-+	break;
-+    case ABS_RZ:
-+    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RZ);
-+    absinfo = &joystick_dispatch->abs_rz;
-+    break;
-+    default:
-+    break;
-+    }
-+
-+    if (absinfo == NULL) {
-+        libinput_log_printf("unsupported joystick abs event: divice_name:%s code:%d value:%d.\n",
-+            device->devname, code, event->value);
-+        return;
-+    }
-+
-+    struct libevdev *evdev = device->evdev;
-+    evdev_device_check_abs_axis_range(device, event->code, event->value);
-+    const struct input_absinfo *absinfo_raw = libevdev_get_abs_info(evdev, event->code);
-+    absinfo->code = event->code;
-+    absinfo->value = event->value;
-+    absinfo->minimum = absinfo_raw->minimum;
-+    absinfo->maximum = absinfo_raw->maximum;
-+    absinfo->fuzz = absinfo_raw->fuzz;
-+    absinfo->flat = absinfo_raw->flat;
-+    absinfo->resolution = absinfo_raw->resolution;
-+    absinfo->standardValue = get_joystick_abs_standard_value(absinfo);
-+}
-+
-+static void
-+joystick_notify_absolute_event(struct joystick_dispatch* pJoystick,
-+    struct evdev_device* device, struct input_event* event, uint64_t time)
-+{
-+    if (pJoystick == NULL || device == NULL || event == NULL) {
-+        return;
-+    }
-+
-+    joystick_get_one_abs_info(pJoystick, device, event, event->code);
-+}
-+
-+static void
-+joystick_flush(struct joystick_dispatch* joystick_dispatch, struct evdev_device* device, uint64_t time)
-+{
-+    if (joystick_dispatch == NULL || device == NULL) {
-+        return;
-+    }
-+
-+    if (joystick_dispatch->axis_value_mask != 0) {
-+        joystick_notify_axis(device, time);
-+        joystick_reset_axis_value_mask(joystick_dispatch);
-+    }
-+}
-+
-+static void
-+joystick_process(struct evdev_dispatch* dispatch, struct evdev_device* device,
-+    struct input_event* event, uint64_t time)
-+{
-+    if (dispatch == NULL || device == NULL || event == NULL) {
-+        return;
-+    }
-+
-+    struct joystick_dispatch* joystick_dispatch = get_joystick_dispatch(dispatch);
-+    if (joystick_dispatch == NULL) {
-+        return;
-+    }
-+
-+    libinput_log_printf("1.event divice_name:%s divice_fd:%d type:%d code:%d value:%d  time:%llu  curtime:%llu\r\n",
-+            device->devname, device->fd, event->type, event->code, event->value, getTranTime(event), getMicrotime());
-+
-+    switch (event->type) {
-+    case EV_ABS: {
-+        joystick_notify_absolute_event(joystick_dispatch, device, event, time);
-+    }
-+    break;
-+    case EV_KEY: {
-+        joystick_notify_key_event(device, event, time);
-+    }
-+    break;
-+    case EV_SYN: {
-+        joystick_flush(joystick_dispatch, device, time);
-+    }
-+    break;
-+    case EV_MSC:
-+    /* ignore do not process */
-+    break;
-+    case EV_REL:
-+    case EV_SW:
-+    case EV_LED:
-+    case EV_SND:
-+    case EV_REP:
-+    case EV_FF:
-+    case EV_PWR:
-+    case EV_FF_STATUS:
-+    case EV_MAX:
-+    case EV_CNT:
-+    default:
-+        libinput_log_printf("unsupported joystick event type: %d, devname: %s.\n", event->type, device->devname);
-+    break;
-+    }
-+}
-+
-+static void joystick_suspend(struct evdev_dispatch* dispatch, struct evdev_device* device)
-+{
-+    if (dispatch == NULL || device == NULL) {
-+        return;
-+    }
-+    struct joystick_dispatch* joystick_dispatch = get_joystick_dispatch(dispatch);
-+    if (joystick_dispatch == NULL) {
-+        return;
-+    }
-+   joystick_flush(joystick_dispatch, device, 0);
-+}
-+
-+static void
-+joystick_destroy(struct evdev_dispatch* dispatch)
-+{
-+    if (dispatch == NULL) {
-+        return;
-+    }
-+    struct joystick_dispatch* joystick_dispatch = get_joystick_dispatch(dispatch);
-+    if (dispatch == NULL) {
-+        return;
-+    }
-+
-+    free(joystick_dispatch);
-+}
-+
-+static void
-+joystick_device_added(struct evdev_device* device,
-+    struct evdev_device* added_device)
-+{
-+    if (device == NULL || added_device == NULL) {
-+        return;
-+    }
-+    struct joystick_dispatch* joystick_dispatch = get_joystick_dispatch(device->dispatch);
-+    if (joystick_dispatch == NULL) {
-+        return;
-+    }
-+
-+    bool is_joystick = false;
-+    if (libinput_device_get_device_group(&device->base) !=
-+        libinput_device_get_device_group(&added_device->base)) {
-+        return;
-+    }
-+    is_joystick = evdev_device_has_capability(added_device,
-+        LIBINPUT_DEVICE_CAP_JOYSTICK);
-+
-+    if (is_joystick) {
-+        evdev_log_debug(device,
-+            "joystick: activated for %s<->%s\n",
-+            device->devname,
-+            added_device->devname);
-+        joystick_dispatch->device = added_device;
-+    }
-+}
-+
-+static void
-+joystick_device_removed(struct evdev_device* device,
-+    struct evdev_device* removed_device)
-+{
-+    if (device == NULL || removed_device == NULL) {
-+        return;
-+    }
-+    struct joystick_dispatch* joystick_dispatch = get_joystick_dispatch(device->dispatch);
-+    if (joystick_dispatch == NULL) {
-+        return;
-+    }
-+
-+    if (joystick_dispatch->device == removed_device) {
-+        joystick_dispatch->device = NULL;
-+    }
-+}
-+
-+static struct evdev_dispatch_interface joystick_interface = {
-+    .process = joystick_process,
-+    .suspend = joystick_suspend,
-+    .remove = NULL,
-+    .destroy = joystick_destroy,
-+    .device_added = joystick_device_added,
-+    .device_removed = joystick_device_removed,
-+    .device_suspended = NULL,
-+    .device_resumed = NULL,
-+    .post_added = NULL,
-+    .touch_arbitration_toggle = NULL,
-+    .touch_arbitration_update_rect = NULL,
-+    .get_switch_state = NULL,
-+};
-+
-+static enum libinput_config_status
-+joystick_sendevents_set_mode(struct libinput_device* device,
-+    enum libinput_config_send_events_mode mode)
-+{
-+    if (device == NULL)     {
-+        return LIBINPUT_CONFIG_STATUS_INVALID;
-+    }
-+
-+    struct evdev_device* ev_device = evdev_device(device);
-+    struct joystick_dispatch* joystick_dispatch = (struct joystick_dispatch*)ev_device->dispatch;
-+
-+    if (ev_device == NULL || joystick_dispatch == NULL) {
-+        return LIBINPUT_CONFIG_STATUS_INVALID;
-+    }
-+
-+    if (mode == joystick_dispatch->sendevents.current_mode) {
-+        return LIBINPUT_CONFIG_STATUS_SUCCESS;
-+    }
-+
-+    switch (mode) {
-+    case LIBINPUT_CONFIG_SEND_EVENTS_ENABLED:
-+        break;
-+    case LIBINPUT_CONFIG_SEND_EVENTS_DISABLED:
-+        joystick_suspend(ev_device->dispatch, ev_device);
-+        break;
-+    default:
-+        return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
-+    }
-+
-+    joystick_dispatch->sendevents.current_mode = mode;
-+
-+    return LIBINPUT_CONFIG_STATUS_SUCCESS;
-+}
-+
-+static uint32_t
-+joystick_sendevents_get_modes(struct libinput_device* device)
-+{
-+    return LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
-+}
-+
-+static enum libinput_config_send_events_mode
-+joystick_sendevents_get_mode(struct libinput_device* device)
-+{
-+    if (device == NULL) {
-+        return LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
-+    }
-+
-+    struct evdev_device* ev_device = evdev_device(device);
-+    struct joystick_dispatch* pDispatch = (struct joystick_dispatch*)ev_device->dispatch;
-+
-+    if (ev_device == NULL || pDispatch == NULL) {
-+        return LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
-+    }
-+
-+    return pDispatch->sendevents.current_mode;
-+}
-+
-+static enum libinput_config_send_events_mode
-+joystick_sendevents_get_default_mode(struct libinput_device* device)
-+{
-+    return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
-+}
-+
-+#ifdef _DEBUG
-+void printf_joystick_absinfo(const char *abs_name, struct libinput_event_joystick_axis_abs_info *absinfo)
-+{
-+    printf("%s: code: %d, value: %d, minimum: %d, maximum: %d, fuzz: %d, flat: %d, resolution: %d, standardValue: %f\n",
-+        abs_name,
-+        absinfo->code,
-+        absinfo->value,
-+        absinfo->minimum,
-+        absinfo->maximum,
-+        absinfo->fuzz,
-+        absinfo->flat,
-+        absinfo->resolution,
-+        absinfo->standardValue
-+        );
-+}
-+
-+void print_libinput_event_joystick_axis(struct libinput_event_joystick_axis *p)
-+{
-+    printf("JOYSTICK:\n"
-+        "type: %d, device: %p, type: %d, time: 0x%x\n",
-+        p->base.type,
-+        p->base.device,
-+        p->type,
-+        p->time);
-+    printf_joystick_absinfo("abs_throttle", &p->abs_throttle);
-+    printf_joystick_absinfo("abs_hat0x", &p->abs_hat0x);
-+    printf_joystick_absinfo("abs_hat0y", &p->abs_hat0y);
-+    printf_joystick_absinfo("abs_x", &p->abs_x);
-+	printf_joystick_absinfo("abs_y", &p->abs_y);
-+	printf_joystick_absinfo("abs_z", &p->abs_z);
-+	printf_joystick_absinfo("abs_rx", &p->abs_rx);
-+	printf_joystick_absinfo("abs_ry", &p->abs_ry);
-+    printf_joystick_absinfo("abs_rz", &p->abs_rz);
-+}
-+#endif // _DEBUG
-+
-+/**
-+ * @brief 初始化joystick_dispatch
-+ * @param joystick
-+ * @param device
-+ * @return bool true - 成功, false - 失败
-+*/
-+bool
-+joystick_init(struct joystick_dispatch* pJoystick, struct evdev_device* device)
-+{
-+    if (pJoystick == NULL || device == NULL) {
-+        return false;
-+    }
-+
-+    pJoystick->base.dispatch_type = DISPATCH_JOYSTICK;
-+    pJoystick->base.interface = &joystick_interface;
-+    pJoystick->device = device;
-+
-+    return true;
-+}
-+
-+struct evdev_dispatch*
-+evdev_joystick_create(struct evdev_device* device)
-+{
-+    if (device == NULL) {
-+        return NULL;
-+    }
-+
-+    struct joystick_dispatch* joystick = {0};
-+    joystick = zalloc(sizeof * joystick);
-+
-+    if (joystick_init(joystick, device) != true) {
-+        joystick_destroy(&joystick->base);
-+        joystick = NULL;
-+        return NULL;
-+    }
-+
-+    device->base.config.sendevents = &joystick->sendevents.config;
-+    joystick->sendevents.current_mode = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
-+    joystick->sendevents.config.get_modes = joystick_sendevents_get_modes;
-+    joystick->sendevents.config.set_mode = joystick_sendevents_set_mode;
-+    joystick->sendevents.config.get_mode = joystick_sendevents_get_mode;
-+    joystick->sendevents.config.get_default_mode = joystick_sendevents_get_default_mode;
-+
-+    return &joystick->base;
-+}
-+
-diff -Naur old/src/evdev-joystick.h new/src/evdev-joystick.h
---- old/src/evdev-joystick.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/evdev-joystick.h	2021-01-01 00:00:00.000000000 +0800
-@@ -0,0 +1,77 @@
-+/*
-+ * Copyright (c) 2021-2022 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
-+ *
-+ *     http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+#ifndef LIBINPUT_EVDEV_JOYSTICK_H
-+#define LIBINPUT_EVDEV_JOYSTICK_H
-+
-+#include "evdev.h"
-+#include "libinput-private.h"
-+
-+struct joystick_dispatch {
-+	struct evdev_dispatch base;
-+	struct evdev_device* device;
-+	uint32_t axis_value_mask;
-+	struct libinput_event_joystick_axis_abs_info abs_throttle;
-+	struct libinput_event_joystick_axis_abs_info abs_hat0x;
-+	struct libinput_event_joystick_axis_abs_info abs_hat0y;
-+	struct libinput_event_joystick_axis_abs_info abs_x;
-+	struct libinput_event_joystick_axis_abs_info abs_y;
-+	struct libinput_event_joystick_axis_abs_info abs_z;
-+	struct libinput_event_joystick_axis_abs_info abs_rx;
-+	struct libinput_event_joystick_axis_abs_info abs_ry;
-+	struct libinput_event_joystick_axis_abs_info abs_rz;
-+	struct {
-+		struct libinput_device_config_send_events config;
-+		enum libinput_config_send_events_mode current_mode;
-+	} sendevents;
-+};
-+
-+struct libinput_event_joystick_button {
-+	struct libinput_event base;
-+	uint32_t type;
-+	uint64_t time;
-+	uint32_t key;
-+	uint32_t seat_key_count;
-+	enum libinput_key_state state;
-+	int value;
-+};
-+
-+struct libinput_event_joystick_axis {
-+	struct libinput_event base;
-+    uint32_t type;
-+	uint64_t time;
-+	uint32_t axis_value_mask;
-+	struct libinput_event_joystick_axis_abs_info abs_throttle;
-+	struct libinput_event_joystick_axis_abs_info abs_hat0x;
-+	struct libinput_event_joystick_axis_abs_info abs_hat0y;
-+	struct libinput_event_joystick_axis_abs_info abs_x;
-+	struct libinput_event_joystick_axis_abs_info abs_y;
-+	struct libinput_event_joystick_axis_abs_info abs_z;
-+	struct libinput_event_joystick_axis_abs_info abs_rx;
-+	struct libinput_event_joystick_axis_abs_info abs_ry;
-+	struct libinput_event_joystick_axis_abs_info abs_rz;
-+};
-+
-+#ifdef _DEBUG
-+void print_libinput_event_joystick_axis(struct libinput_event_joystick_axis* p);
-+#endif // _DEBUG
-+
-+/**
-+ * @brief 创建evdev_dispatch结构体
-+ * @param device
-+ * @return struct evdev_dispatch*
-+*/
-+struct evdev_dispatch* evdev_joystick_create(struct evdev_device* device);
-+
-+#endif
-diff -Naur old/src/evdev-mt-touchpad-gestures.c new/src/evdev-mt-touchpad-gestures.c
---- old/src/evdev-mt-touchpad-gestures.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-mt-touchpad-gestures.c	2021-01-01 00:00:00.000000000 +0800
-@@ -80,6 +80,37 @@
- }
-
- static void
-+tp_get_raw_touches(struct tp_dispatch *tp, struct sloted_coords_info *raw_touches)
-+{
-+	struct tp_touch *t;
-+	unsigned int i;
-+	raw_touches->active_count = 0;
-+
-+	if (tp->num_slots > MAX_SOLTED_COORDS_NUM) {
-+		evdev_log_bug_libinput(tp->device,
-+				       "in %s, num_slots: %d, more than %d\n",
-+				       __func__, tp->num_slots, MAX_SOLTED_COORDS_NUM);
-+	}
-+	const unsigned int num_slots = (tp->num_slots > MAX_SOLTED_COORDS_NUM) ? MAX_SOLTED_COORDS_NUM : tp->num_slots;
-+
-+	for (i = 0; i < num_slots; i++) {
-+		t = &tp->touches[i];
-+
-+		if (!tp_touch_active_for_gesture(tp, t))
-+			continue;
-+
-+		if (t->dirty) {
-+			struct device_coords d;
-+			d = tp_get_delta(t);
-+			raw_touches->coords[i].x = d.x;
-+			raw_touches->coords[i].y = d.y;
-+		}
-+		raw_touches->coords[i].is_active = true;
-+		raw_touches->active_count++;
-+	}
-+}
-+
-+static void
- tp_gesture_init_scroll(struct tp_dispatch *tp)
- {
- 	struct phys_coords zero = {0.0, 0.0};
-@@ -131,7 +162,7 @@
- 		gesture_notify_swipe(&tp->device->base, time,
- 				     LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN,
- 				     tp->gesture.finger_count,
--				     &zero, &zero);
-+				     &zero, &zero, NULL);
- 		break;
- 	}
-
-@@ -630,10 +661,12 @@
- tp_gesture_handle_state_swipe(struct tp_dispatch *tp, uint64_t time)
- {
- 	struct device_float_coords raw;
-+	struct sloted_coords_info raw_touches = {};
- 	struct normalized_coords delta, unaccel;
-
- 	raw = tp_get_average_touches_delta(tp);
- 	delta = tp_filter_motion(tp, &raw, time);
-+	tp_get_raw_touches(tp, &raw_touches);
-
- 	if (!normalized_is_zero(delta) || !device_float_is_zero(raw)) {
- 		unaccel = tp_normalize_delta(tp, raw);
-@@ -641,7 +674,7 @@
- 		gesture_notify_swipe(&tp->device->base, time,
- 				     LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE,
- 				     tp->gesture.finger_count,
--				     &delta, &unaccel);
-+				     &delta, &unaccel, &raw_touches);
- 	}
-
- 	return GESTURE_STATE_SWIPE;
-diff -Naur old/src/evdev-mt-touchpad-thumb.c new/src/evdev-mt-touchpad-thumb.c
---- old/src/evdev-mt-touchpad-thumb.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-mt-touchpad-thumb.c	2021-01-01 00:00:00.000000000 +0800
-@@ -418,7 +418,7 @@
- 	tp->thumb.lower_thumb_line = edges.y;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
-
- 	if (libevdev_has_event_code(device->evdev, EV_ABS, ABS_MT_PRESSURE)) {
- 		if (quirks_get_uint32(q,
-diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
---- old/src/evdev-mt-touchpad.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-mt-touchpad.c	2021-01-01 00:00:00.000000000 +0800
-@@ -1936,6 +1936,9 @@
- 		     uint64_t time)
- {
- 	struct tp_dispatch *tp = tp_dispatch(dispatch);
-+
-+	libinput_log_printf("1.event divice_name:%s divice_fd:%d type:%d code:%d value:%d  time:%llu curtime:%llu\r\n",
-+		device->devname, device->fd, e->type, e->code, e->value, getTranTime(e), getMicrotime());
-
- 	switch (e->type) {
- 	case EV_ABS:
-@@ -2686,12 +2689,12 @@
-
- static void
- evdev_tag_touchpad(struct evdev_device *device,
--		   struct udev_device *udev_device)
-+           struct uhdf *uhdf )
- {
- 	int bustype, vendor;
- 	const char *prop;
-
--	prop = udev_device_get_property_value(udev_device,
-+	prop = uhdf_device_get_property_value(uhdf,
- 					      "ID_INPUT_TOUCHPAD_INTEGRATION");
- 	if (prop) {
- 		if (streq(prop, "internal")) {
-@@ -3197,7 +3200,7 @@
- 	int rc = false;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q)
- 		return false;
-
-@@ -3281,7 +3284,7 @@
- 	struct quirks *q;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q)
- 		return threshold;
-
-@@ -3317,7 +3320,7 @@
- 	uint32_t threshold;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q)
- 		return;
-
-@@ -3511,7 +3514,7 @@
- 	assert(abs);
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (q && quirks_get_range(q, QUIRK_ATTR_PRESSURE_RANGE, &r)) {
- 		hi = r.upper;
- 		lo = r.lower;
-@@ -3567,7 +3570,7 @@
- 	}
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (q && quirks_get_range(q, QUIRK_ATTR_TOUCH_SIZE_RANGE, &r)) {
- 		hi = r.upper;
- 		lo = r.lower;
-@@ -3839,7 +3842,7 @@
- {
- 	struct tp_dispatch *tp;
-
--	evdev_tag_touchpad(device, device->udev_device);
-+	evdev_tag_touchpad(device,device->uhdf);
-
- 	tp = zalloc(sizeof *tp);
-
-diff -Naur old/src/evdev-tablet-pad-leds.c new/src/evdev-tablet-pad-leds.c
---- old/src/evdev-tablet-pad-leds.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-tablet-pad-leds.c	2021-01-01 00:00:00.000000000 +0800
-@@ -186,7 +186,7 @@
- static inline bool
- is_litest_device(struct evdev_device *device)
- {
--	return !!udev_device_get_property_value(device->udev_device,
-+	return !!uhdf_device_get_property_value(device->uhdf,
- 						"LIBINPUT_TEST_DEVICE");
- }
-
-@@ -239,34 +239,7 @@
- 			    char *path_out,
- 			    size_t path_out_sz)
- {
--	struct udev_device *parent, *udev_device;
--	const char *test_path;
--	int rc;
--
--	udev_device = device->udev_device;
--
--	/* For testing purposes only allow for a base path set through a
--	 * udev rule. We still expect the normal directory hierarchy inside */
--	test_path = udev_device_get_property_value(udev_device,
--						   "LIBINPUT_TEST_TABLET_PAD_SYSFS_PATH");
--	if (test_path) {
--		rc = snprintf(path_out, path_out_sz, "%s", test_path);
--		return rc != -1;
--	}
--
--	parent = udev_device_get_parent_with_subsystem_devtype(udev_device,
--							       "input",
--							       NULL);
--	if (!parent)
--		return false;
--
--	rc = snprintf(path_out,
--		      path_out_sz,
--		      "%s/%s::wacom-",
--		      udev_device_get_syspath(parent),
--		      udev_device_get_sysname(parent));
--
--	return rc != -1;
-+	return false;
- }
-
- #if HAVE_LIBWACOM
-diff -Naur old/src/evdev-tablet-pad.c new/src/evdev-tablet-pad.c
---- old/src/evdev-tablet-pad.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-tablet-pad.c	2021-01-01 00:00:00.000000000 +0800
-@@ -482,6 +482,9 @@
- {
- 	struct pad_dispatch *pad = pad_dispatch(dispatch);
-
-+	libinput_log_printf("1.event divice_name:%s divice_fd:%d type:%d code:%d value:%d  time:%llu  curtime:%llu\r\n",
-+		device->devname, device->fd, e->type, e->code, e->value, getTranTime(e), getMicrotime());
-+
- 	switch (e->type) {
- 	case EV_ABS:
- 		pad_process_absolute(pad, device, e, time);
-diff -Naur old/src/evdev-tablet.c new/src/evdev-tablet.c
---- old/src/evdev-tablet.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-tablet.c	2021-01-01 00:00:00.000000000 +0800
-@@ -1089,7 +1089,7 @@
- 		goto out;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
-
- 	tool->pressure_offset = pressure->minimum;
-
-diff -Naur old/src/evdev-totem.c new/src/evdev-totem.c
---- old/src/evdev-totem.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-totem.c	2021-01-01 00:00:00.000000000 +0800
-@@ -520,6 +520,9 @@
- 	enum totem_slot_state global_state;
- 	bool enable_touch;
-
-+	libinput_log_printf("1.event divice_name:%s divice_fd:%d type:%d code:%d value:%d  time:%llu  curtime:%llu\r\n",
-+        device->devname, device->fd, e->type, e->code, e->value, getTranTime(e), getMicrotime());
-+
- 	switch(e->type) {
- 	case EV_ABS:
- 		totem_process_abs(totem, device, e, time);
-diff -Naur old/src/evdev.c new/src/evdev.c
---- old/src/evdev.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev.c	2021-01-01 00:00:00.000000000 +0800
-@@ -38,7 +38,7 @@
- #include <assert.h>
- #include <math.h>
- #include <stdint.h>
--
-+#include <stdatomic.h>
- #include "libinput.h"
- #include "evdev.h"
- #include "filter.h"
-@@ -54,25 +54,7 @@
- #define DEFAULT_BUTTON_SCROLL_TIMEOUT ms2us(200)
- #define MAX_RETRY_OPEN_DEVICE_COUNT 10
-
--enum evdev_device_udev_tags {
--        EVDEV_UDEV_TAG_INPUT		= bit(0),
--        EVDEV_UDEV_TAG_KEYBOARD		= bit(1),
--        EVDEV_UDEV_TAG_MOUSE		= bit(2),
--        EVDEV_UDEV_TAG_TOUCHPAD		= bit(3),
--        EVDEV_UDEV_TAG_TOUCHSCREEN	= bit(4),
--        EVDEV_UDEV_TAG_TABLET		= bit(5),
--        EVDEV_UDEV_TAG_JOYSTICK		= bit(6),
--        EVDEV_UDEV_TAG_ACCELEROMETER	= bit(7),
--        EVDEV_UDEV_TAG_TABLET_PAD	= bit(8),
--        EVDEV_UDEV_TAG_POINTINGSTICK	= bit(9),
--        EVDEV_UDEV_TAG_TRACKBALL	= bit(10),
--        EVDEV_UDEV_TAG_SWITCH		= bit(11),
--};
-
--struct evdev_udev_tag_match {
--	const char *name;
--	enum evdev_device_udev_tags tag;
--};
-
- static const struct evdev_udev_tag_match evdev_udev_tag_matches[] = {
- 	{"ID_INPUT",			EVDEV_UDEV_TAG_INPUT},
-@@ -90,14 +72,20 @@
- 	{"ID_INPUT_SWITCH",		EVDEV_UDEV_TAG_SWITCH},
- };
-
-+const char *  uhdf_device_get_property_value(struct uhdf *uhdf,
-+						   const char *key)
-+{
-+    return NULL;
-+}
-+
- static inline bool
- parse_udev_flag(struct evdev_device *device,
--		struct udev_device *udev_device,
-+		struct uhdf *uhdf,
- 		const char *property)
- {
- 	const char *val;
-
--	val = udev_device_get_property_value(udev_device, property);
-+	val = uhdf_device_get_property_value(uhdf, property);
- 	if (!val)
- 		return false;
-
-@@ -409,7 +397,7 @@
-
- static void
- evdev_tag_external_mouse(struct evdev_device *device,
--			 struct udev_device *udev_device)
-+			 struct uhdf *uhdf)
- {
- 	int bustype;
-
-@@ -420,7 +408,7 @@
-
- static void
- evdev_tag_trackpoint(struct evdev_device *device,
--		     struct udev_device *udev_device)
-+             struct uhdf *uhdf)
- {
- 	struct quirks_context *quirks;
- 	struct quirks *q;
-@@ -428,13 +416,13 @@
-
- 	if (!libevdev_has_property(device->evdev,
- 				  INPUT_PROP_POINTING_STICK) &&
--	    !parse_udev_flag(device, udev_device, "ID_INPUT_POINTINGSTICK"))
-+	    !parse_udev_flag(device, uhdf, "ID_INPUT_POINTINGSTICK"))
- 		return;
-
- 	device->tags |= EVDEV_TAG_TRACKPOINT;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (q && quirks_get_string(q, QUIRK_ATTR_TRACKPOINT_INTEGRATION, &prop)) {
- 		if (streq(prop, "internal")) {
- 			/* noop, this is the default anyway */
-@@ -467,8 +455,7 @@
- }
-
- static void
--evdev_tag_keyboard(struct evdev_device *device,
--		   struct udev_device *udev_device)
-+evdev_tag_keyboard(struct evdev_device *device)
- {
- 	struct quirks_context *quirks;
- 	struct quirks *q;
-@@ -486,7 +473,7 @@
- 	}
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (q && quirks_get_string(q, QUIRK_ATTR_KEYBOARD_INTEGRATION, &prop)) {
- 		if (streq(prop, "internal")) {
- 			evdev_tag_keyboard_internal(device);
-@@ -918,7 +905,7 @@
- 	char *prop;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q || !quirks_get_string(q, QUIRK_ATTR_LID_SWITCH_RELIABILITY, &prop)) {
- 		r = RELIABILITY_UNKNOWN;
- 	} else if (!parse_switch_reliability_property(prop, &r)) {
-@@ -1003,6 +990,24 @@
- 	}
- }
-
-+void
-+evdev_device_dispatch_two(struct evdev_device *device,
-+			  struct input_event *ev)
-+{
-+	if (!device->mtdev) {
-+		evdev_process_event(device, ev);
-+	} else {
-+		mtdev_put_event(device->mtdev, ev);
-+		if (libevdev_event_is_code(ev, EV_SYN, SYN_REPORT)) {
-+			while (!mtdev_empty(device->mtdev)) {
-+				struct input_event e;
-+				mtdev_get_event(device->mtdev, &e);
-+				evdev_process_event(device, &e);
-+			}
-+		}
-+	}
-+}
-+
- static int
- evdev_sync_device(struct evdev_device *device)
- {
-@@ -1045,6 +1050,34 @@
- 	}
- }
-
-+void
-+evdev_device_hdfdispatch(void *data)
-+{
-+	struct libinput *libinput = data;
-+	int len;
-+    int readcount = 0;
-+    struct input_event event[256];
-+    int index = -1;
-+    do {
-+        len = read(libinput->pipes[0], event, sizeof(event));
-+        atomic_fetch_sub_explicit(&libinput->pipesbytes,len,memory_order_release);
-+        if(len > 0 && len % sizeof(struct input_event) != 0) {
-+
-+            return ;
-+        }
-+        if(len < 0){
-+            break;
-+        }
-+		for(unsigned int i = 0;i<len/sizeof(struct input_event); i++) {
-+            index = (event[i].type>>8)&0xff;
-+            event[i].type = event[i].type&0xff;
-+            libevdev_set_event_value(libinput->device[index]->evdev, event[i].type,event[i].code,event[i].value);
-+            evdev_device_dispatch_one(libinput->device[index], &event[i]);
-+        }
-+        readcount =atomic_load_explicit(&libinput->pipesbytes,__ATOMIC_SEQ_CST);
-+	} while (readcount > 0);
-+}
-+
- static void
- evdev_device_dispatch(void *data)
- {
-@@ -1238,7 +1271,7 @@
- 	int val;
-
- 	*angle = DEFAULT_WHEEL_CLICK_ANGLE;
--	prop = udev_device_get_property_value(device->udev_device, prop);
-+	prop = uhdf_device_get_property_value(device->uhdf, prop);
- 	if (!prop)
- 		return false;
-
-@@ -1263,7 +1296,7 @@
- {
- 	int val;
-
--	prop = udev_device_get_property_value(device->udev_device, prop);
-+	prop = uhdf_device_get_property_value(device->uhdf, prop);
- 	if (!prop)
- 		return false;
-
-@@ -1319,7 +1352,7 @@
- 		return 1.0;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (q) {
- 		quirks_get_double(q, QUIRK_ATTR_TRACKPOINT_MULTIPLIER, &multiplier);
- 		quirks_unref(q);
-@@ -1348,7 +1381,7 @@
- 	bool use_velocity_averaging = false; /* default off unless we have quirk */
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (q) {
- 		quirks_get_bool(q,
- 				QUIRK_ATTR_USE_VELOCITY_AVERAGING,
-@@ -1372,7 +1405,7 @@
- 	if (device->tags & EVDEV_TAG_TRACKPOINT)
- 		return DEFAULT_MOUSE_DPI;
-
--	mouse_dpi = udev_device_get_property_value(device->udev_device,
-+	mouse_dpi = uhdf_device_get_property_value(device->uhdf,
- 						   "MOUSE_DPI");
- 	if (mouse_dpi) {
- 		dpi = parse_mouse_dpi_property(mouse_dpi);
-@@ -1416,7 +1449,7 @@
- 	struct quirks *q;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
-
- 	while (q && m->quirk) {
- 		bool is_set;
-@@ -1445,7 +1478,7 @@
- 	quirks_unref(q);
-
- 	if (parse_udev_flag(device,
--			    device->udev_device,
-+			    device->uhdf,
- 			    "ID_INPUT_TRACKBALL")) {
- 		evdev_log_debug(device, "tagged as trackball\n");
- 		model_flags |= EVDEV_MODEL_TRACKBALL;
-@@ -1457,13 +1490,13 @@
- 	 * usage, so we need to keep this for backwards compat.
- 	 */
- 	if (parse_udev_flag(device,
--			    device->udev_device,
-+			    device->uhdf,
- 			    "LIBINPUT_MODEL_LENOVO_X220_TOUCHPAD_FW81")) {
- 		evdev_log_debug(device, "tagged as trackball\n");
- 		model_flags |= EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81;
- 	}
-
--	if (parse_udev_flag(device, device->udev_device,
-+	if (parse_udev_flag(device, device->uhdf,
- 			    "LIBINPUT_TEST_DEVICE")) {
- 		evdev_log_debug(device, "is a test device\n");
- 		model_flags |= EVDEV_MODEL_TEST_DEVICE;
-@@ -1483,7 +1516,7 @@
- 	bool rc = false;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q)
- 		return false;
-
-@@ -1509,7 +1542,7 @@
- 	bool rc = false;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q)
- 		return false;
-
-@@ -1572,21 +1605,17 @@
-
- static enum evdev_device_udev_tags
- evdev_device_get_udev_tags(struct evdev_device *device,
--			   struct udev_device *udev_device)
-+			   struct uhdf *uhdf)
- {
-+
- 	enum evdev_device_udev_tags tags = 0;
--	int i;
-
--	for (i = 0; i < 2 && udev_device; i++) {
--		unsigned j;
--		for (j = 0; j < ARRAY_LENGTH(evdev_udev_tag_matches); j++) {
--			const struct evdev_udev_tag_match match = evdev_udev_tag_matches[j];
--			if (parse_udev_flag(device,
--					    udev_device,
--					    match.name))
--				tags |= match.tag;
--		}
--		udev_device = udev_device_get_parent(udev_device);
-+	unsigned j;
-+	for (j = 0; j < ARRAY_LENGTH(evdev_udev_tag_matches); j++) {
-+	    const struct evdev_udev_tag_match match = evdev_udev_tag_matches[j];
-+
-+		if(uhdf->type & match.tag)
-+		    tags |= match.tag;
- 	}
-
- 	return tags;
-@@ -1778,13 +1807,18 @@
- 	enum evdev_device_udev_tags udev_tags;
- 	unsigned int tablet_tags;
- 	struct evdev_dispatch *dispatch;
-+
-+	udev_tags = evdev_device_get_udev_tags(device, device->uhdf);
-+
-+	device->model_flags = udev_tags;
-
--	udev_tags = evdev_device_get_udev_tags(device, device->udev_device);
-+    libinput_log_printf("----evdev_configure_device  tagged as supported input device---- %d \r\n", udev_tags);
-
- 	if ((udev_tags & EVDEV_UDEV_TAG_INPUT) == 0 ||
- 	    (udev_tags & ~EVDEV_UDEV_TAG_INPUT) == 0) {
- 		evdev_log_info(device,
- 			       "not tagged as supported input device\n");
-+        libinput_log_printf("----evdev_configure_device not tagged as supported input device---- \r\n");
- 		return NULL;
- 	}
-
-@@ -1812,12 +1846,6 @@
- 		evdev_disable_accelerometer_axes(device);
- 	}
-
--	if (udev_tags == (EVDEV_UDEV_TAG_INPUT|EVDEV_UDEV_TAG_JOYSTICK)) {
--		evdev_log_info(device,
--			       "device is a joystick, ignoring\n");
--		return NULL;
--	}
--
- 	if (evdev_reject_device(device)) {
- 		evdev_log_info(device, "was rejected\n");
- 		return NULL;
-@@ -1833,8 +1861,16 @@
- 			udev_tags &= ~EVDEV_UDEV_TAG_TOUCHSCREEN;
- 	}
-
-+    if (udev_tags & EVDEV_UDEV_TAG_JOYSTICK) {
-+        libinput_log_printf("----evdev_configure_device--_LIBINPUT_JOYSTICK_BULID-- \r\n");
-+        dispatch = evdev_joystick_create(device);
-+        device->seat_caps |= EVDEV_DEVICE_JOYSTICK;
-+		return dispatch;
-+    }
-+
- 	if (evdev_device_has_model_quirk(device,
- 					 QUIRK_MODEL_DELL_CANVAS_TOTEM)) {
-+        libinput_log_printf("----evdev_configure_device--_LIBINPUT_TOTEM_BULID-- \r\n");
- 		dispatch = evdev_totem_create(device);
- 		device->seat_caps |= EVDEV_DEVICE_TABLET;
- 		evdev_log_info(device, "device is a totem\n");
-@@ -1850,12 +1886,14 @@
-
- 	/* libwacom assigns tablet _and_ tablet_pad to the pad devices */
- 	if (udev_tags & EVDEV_UDEV_TAG_TABLET_PAD) {
-+        libinput_log_printf("----evdev_configure_device--_LIBINPUT_TABLET_PAD_BULID-- \r\n");
- 		dispatch = evdev_tablet_pad_create(device);
- 		device->seat_caps |= EVDEV_DEVICE_TABLET_PAD;
- 		evdev_log_info(device, "device is a tablet pad\n");
- 		return dispatch;
-
- 	} else if ((udev_tags & tablet_tags) == EVDEV_UDEV_TAG_TABLET) {
-+        libinput_log_printf("----evdev_configure_device--_LIBINPUT_TABLET_BULID-- \r\n");
- 		dispatch = evdev_tablet_create(device);
- 		device->seat_caps |= EVDEV_DEVICE_TABLET;
- 		evdev_log_info(device, "device is a tablet\n");
-@@ -1863,6 +1901,7 @@
- 	}
-
- 	if (udev_tags & EVDEV_UDEV_TAG_TOUCHPAD) {
-+        libinput_log_printf("----evdev_configure_device--_LIBINPUT_TOUCHPAD_BULID-- \r\n");
- 		if (udev_tags & EVDEV_UDEV_TAG_TABLET)
- 			evdev_tag_tablet_touchpad(device);
- 		/* whether velocity should be averaged, false by default */
-@@ -1874,8 +1913,8 @@
-
- 	if (udev_tags & EVDEV_UDEV_TAG_MOUSE ||
- 	    udev_tags & EVDEV_UDEV_TAG_POINTINGSTICK) {
--		evdev_tag_external_mouse(device, device->udev_device);
--		evdev_tag_trackpoint(device, device->udev_device);
-+		evdev_tag_external_mouse(device, device->uhdf);
-+		evdev_tag_trackpoint(device, device->uhdf);
- 		device->dpi = evdev_read_dpi_prop(device);
- 		device->trackpoint_multiplier = evdev_get_trackpoint_multiplier(device);
- 		/* whether velocity should be averaged, false by default */
-@@ -1906,7 +1945,7 @@
- 			device->seat_caps |= EVDEV_DEVICE_POINTER;
- 		}
-
--		evdev_tag_keyboard(device, device->udev_device);
-+		evdev_tag_keyboard(device);
- 	}
-
- 	if (udev_tags & EVDEV_UDEV_TAG_TOUCHSCREEN) {
-@@ -1987,38 +2026,18 @@
- }
-
- static bool
--evdev_device_have_same_syspath(struct udev_device *udev_device, int fd)
-+evdev_device_have_same_syspath(struct uhdf *uhdf, int fd)
- {
--	struct udev *udev = udev_device_get_udev(udev_device);
--	struct udev_device *udev_device_new = NULL;
--	struct stat st;
--	bool rc = false;
--
--	if (fstat(fd, &st) < 0)
--		goto out;
--
--	udev_device_new = udev_device_new_from_devnum(udev, 'c', st.st_rdev);
--	if (!udev_device_new)
--		goto out;
--
--	rc = streq(udev_device_get_syspath(udev_device_new),
--		   udev_device_get_syspath(udev_device));
--out:
--	if (udev_device_new)
--		udev_device_unref(udev_device_new);
--	return rc;
-+	return false;
- }
-
- static bool
- evdev_set_device_group(struct evdev_device *device,
--		       struct udev_device *udev_device)
-+		       struct uhdf *uhdf)
- {
- 	struct libinput *libinput = evdev_libinput_context(device);
- 	struct libinput_device_group *group = NULL;
--	const char *udev_group;
--
--	udev_group = udev_device_get_property_value(udev_device,
--						    "LIBINPUT_DEVICE_GROUP");
-+	const char *udev_group = "LIBINPUT_DEVICE_GROUP";
- 	if (udev_group)
- 		group = libinput_device_group_find_group(libinput, udev_group);
-
-@@ -2078,7 +2097,7 @@
- 	 * unnecessary wakeups but on some devices we need to watch it for
- 	 * pointer jumps */
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q ||
- 	    !quirks_get_string(q, QUIRK_ATTR_MSC_TIMESTAMP, &prop) ||
- 	    !streq(prop, "watch")) {
-@@ -2145,11 +2164,11 @@
- }
-
- static bool
--udev_device_should_be_ignored(struct udev_device *udev_device)
-+udev_device_should_be_ignored(struct uhdf *uhdf)
- {
- 	const char *value;
-
--	value = udev_device_get_property_value(udev_device,
-+	value = uhdf_device_get_property_value(uhdf,
- 					       "LIBINPUT_IGNORE_DEVICE");
-
- 	return value && !streq(value, "0");
-@@ -2157,73 +2176,38 @@
-
- struct evdev_device *
- evdev_device_create(struct libinput_seat *seat,
--		    struct udev_device *udev_device)
-+		    struct uhdf *uhdf)
- {
-+    char devname[256]={0};
- 	struct libinput *libinput = seat->libinput;
- 	struct evdev_device *device = NULL;
- 	int rc;
--	int fd;
- 	int unhandled_device = 0;
--	const char *devnode = udev_device_get_devnode(udev_device);
--	const char *sysname = udev_device_get_sysname(udev_device);
--
--	if (!devnode) {
--		log_info(libinput, "%s: no device node associated\n", sysname);
--		return NULL;
--	}
--
--	if (udev_device_should_be_ignored(udev_device)) {
--		log_debug(libinput, "%s: device is ignored\n", sysname);
--		return NULL;
--	}
--
--	int loop_count = 0;
--	loop_open_restricted:
--	/* Use non-blocking mode so that we can loop on read on
--	 * evdev_device_data() until all events on the fd are
--	 * read.  mtdev_get() also expects this. */
--	fd = open_restricted(libinput, devnode,
--			     O_RDWR | O_NONBLOCK | O_CLOEXEC);
--	loop_count++;
--	if (fd < 0) {
--		log_info(libinput,
--			 "%s: opening input device '%s' failed (%s).\n",
--			 sysname,
--			 devnode,
--			 strerror(-fd));
--		if (loop_count < MAX_RETRY_OPEN_DEVICE_COUNT) {
--			usleep(1 * 1000);
--			goto loop_open_restricted;
--		}
--		return NULL;
--	}
--
--	if (!evdev_device_have_same_syspath(udev_device, fd))
--		goto err;
-
- 	device = zalloc(sizeof *device);
-
- 	libinput_device_init(&device->base, seat);
- 	libinput_seat_ref(seat);
-
--	evdev_drain_fd(fd);
--
--	rc = libevdev_new_from_fd(fd, &device->evdev);
-+	rc = libevdev_new_from_index(uhdf->index, &device->evdev,uhdf->fn);
- 	if (rc != 0)
- 		goto err;
--
--	libevdev_set_clock_id(device->evdev, CLOCK_MONOTONIC);
-+
- 	libevdev_set_device_log_function(device->evdev,
- 					 libevdev_log_func,
- 					 LIBEVDEV_LOG_ERROR,
- 					 libinput);
- 	device->seat_caps = 0;
- 	device->is_mt = 0;
-+	device->udev_device = NULL;
- 	device->mtdev = NULL;
--	device->udev_device = udev_device_ref(udev_device);
-+	device->uhdf = uhdf;
- 	device->dispatch = NULL;
--	device->fd = fd;
--	device->devname = libevdev_get_name(device->evdev);
-+	device->fd = -1;//uhdf->index;
-+    device->source = NULL;
-+    device->output_name = NULL;
-+    sprintf(devname,"HDI_%2d",uhdf->index);
-+	device->devname = strdup(devname);//libevdev_get_name(device->evdev);
- 	device->scroll.threshold = 5.0; /* Default may be overridden */
- 	device->scroll.direction_lock_threshold = 5.0; /* Default may be overridden */
- 	device->scroll.direction = 0;
-@@ -2231,7 +2215,7 @@
- 		evdev_read_wheel_click_props(device);
- 	device->model_flags = evdev_read_model_flags(device);
- 	device->dpi = DEFAULT_MOUSE_DPI;
--
-+    libinput->device[uhdf->index] = device;
- 	/* at most 5 SYN_DROPPED log-messages per 30s */
- 	ratelimit_init(&device->syn_drop_limit, s2us(30), 5);
- 	/* at most 5 "delayed processing" log messages per hour */
-@@ -2242,19 +2226,18 @@
- 	matrix_init_identity(&device->abs.calibration);
- 	matrix_init_identity(&device->abs.usermatrix);
- 	matrix_init_identity(&device->abs.default_calibration);
--
-+
- 	evdev_pre_configure_model_quirks(device);
--
-+
- 	device->dispatch = evdev_configure_device(device);
- 	if (device->dispatch == NULL || device->seat_caps == 0)
--		goto err;
--
--	device->source =
--		libinput_add_fd(libinput, fd, evdev_device_dispatch, device);
-+		goto err;
-+
-+  	device->source = NULL;
-+/*		libinput_add_fd(libinput, libinput->pipes[0], evdev_device_hdfdispatch, libinput);
- 	if (!device->source)
--		goto err;
--
--	if (!evdev_set_device_group(device, udev_device))
-+		goto err;*/
-+	if (!evdev_set_device_group(device, uhdf))
- 		goto err;
-
- 	list_insert(seat->devices_list.prev, &device->base.link);
-@@ -2264,7 +2247,6 @@
- 	return device;
-
- err:
--	close_restricted(libinput, fd);
- 	if (device) {
- 		unhandled_device = device->seat_caps == 0;
- 		evdev_device_destroy(device);
-@@ -2282,7 +2264,7 @@
- const char *
- evdev_device_get_sysname(struct evdev_device *device)
- {
--	return udev_device_get_sysname(device->udev_device);
-+	return "hdf_path";
- }
-
- const char *
-@@ -2306,7 +2288,8 @@
- struct udev_device *
- evdev_device_get_udev_device(struct evdev_device *device)
- {
--	return udev_device_ref(device->udev_device);
-+
-+	return NULL;
- }
-
- void
-@@ -2387,7 +2370,7 @@
- 	const char *prop;
- 	float calibration[6];
-
--	prop = udev_device_get_property_value(device->udev_device,
-+	prop = uhdf_device_get_property_value(device->uhdf,
- 					      "LIBINPUT_CALIBRATION_MATRIX");
-
- 	if (prop == NULL)
-@@ -2423,7 +2406,7 @@
- 	if (rc == -1)
- 		return 0;
-
--	prop = udev_device_get_property_value(device->udev_device, name);
-+	prop = uhdf_device_get_property_value(device->uhdf, name);
- 	if (prop && (safe_atoi(prop, &fuzz) == false || fuzz < 0)) {
- 		evdev_log_bug_libinput(device,
- 				       "invalid LIBINPUT_FUZZ property value: %s\n",
-@@ -2476,6 +2459,9 @@
- 		return !!(device->seat_caps & EVDEV_DEVICE_TABLET_PAD);
- 	case LIBINPUT_DEVICE_CAP_SWITCH:
- 		return !!(device->seat_caps & EVDEV_DEVICE_SWITCH);
-+	case LIBINPUT_DEVICE_CAP_JOYSTICK:
-+		return !!(device->seat_caps & EVDEV_DEVICE_JOYSTICK);
-+
- 	default:
- 		return false;
- 	}
-@@ -2751,64 +2737,6 @@
- int
- evdev_device_resume(struct evdev_device *device)
- {
--	struct libinput *libinput = evdev_libinput_context(device);
--	int fd;
--	const char *devnode;
--	struct input_event ev;
--	enum libevdev_read_status status;
--
--	if (device->fd != -1)
--		return 0;
--
--	if (device->was_removed)
--		return -ENODEV;
--
--	devnode = udev_device_get_devnode(device->udev_device);
--	if (!devnode)
--		return -ENODEV;
--
--	fd = open_restricted(libinput, devnode,
--			     O_RDWR | O_NONBLOCK | O_CLOEXEC);
--
--	if (fd < 0)
--		return -errno;
--
--	if (!evdev_device_have_same_syspath(device->udev_device, fd)) {
--		close_restricted(libinput, fd);
--		return -ENODEV;
--	}
--
--	evdev_drain_fd(fd);
--
--	device->fd = fd;
--
--	if (evdev_need_mtdev(device)) {
--		device->mtdev = mtdev_new_open(device->fd);
--		if (!device->mtdev)
--			return -ENODEV;
--	}
--
--	libevdev_change_fd(device->evdev, fd);
--	libevdev_set_clock_id(device->evdev, CLOCK_MONOTONIC);
--
--	/* re-sync libevdev's view of the device, but discard the actual
--	   events. Our device is in a neutral state already */
--	libevdev_next_event(device->evdev,
--			    LIBEVDEV_READ_FLAG_FORCE_SYNC,
--			    &ev);
--	do {
--		status = libevdev_next_event(device->evdev,
--					     LIBEVDEV_READ_FLAG_SYNC,
--					     &ev);
--	} while (status == LIBEVDEV_READ_STATUS_SYNC);
--
--	device->source =
--		libinput_add_fd(libinput, fd, evdev_device_dispatch, device);
--	if (!device->source) {
--		mtdev_close_delete(device->mtdev);
--		return -ENOMEM;
--	}
--
- 	evdev_notify_resumed_device(device);
-
- 	return 0;
-@@ -2861,12 +2789,12 @@
- 		libinput_device_group_unref(device->base.group);
-
- 	free(device->output_name);
-+    free((char*)device->devname);
- 	filter_destroy(device->pointer.filter);
- 	libinput_timer_destroy(&device->scroll.timer);
- 	libinput_timer_destroy(&device->middlebutton.timer);
- 	libinput_seat_unref(device->base.seat);
- 	libevdev_free(device->evdev);
--	udev_device_unref(device->udev_device);
- 	free(device);
- }
-
-diff -Naur old/src/evdev.h new/src/evdev.h
---- old/src/evdev.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev.h	2021-01-01 00:00:00.000000000 +0800
-@@ -61,6 +61,7 @@
- 	EVDEV_DEVICE_TABLET_PAD		= bit(4),
- 	EVDEV_DEVICE_GESTURE		= bit(5),
- 	EVDEV_DEVICE_SWITCH		= bit(6),
-+	EVDEV_DEVICE_JOYSTICK = bit(7),
- };
-
- enum evdev_device_tags {
-@@ -76,6 +77,11 @@
- 	EVDEV_TAG_TABLET_TOUCHPAD	= bit(9),
- };
-
-+struct evdev_udev_tag_match {
-+    const char* name;
-+    enum evdev_device_udev_tags tag;
-+};
-+
- enum evdev_middlebutton_state {
- 	MIDDLEBUTTON_IDLE,
- 	MIDDLEBUTTON_LEFT_DOWN,
-@@ -159,6 +165,8 @@
- 	ARBITRATION_IGNORE_RECT,
- };
-
-+struct uhdf;
-+
- struct evdev_device {
- 	struct libinput_device base;
-
-@@ -269,6 +277,7 @@
- 		uint32_t button_mask;
- 		uint64_t first_event_time;
- 	} middlebutton;
-+	struct uhdf *uhdf;
- };
-
- static inline struct evdev_device *
-@@ -353,6 +362,7 @@
- 	DISPATCH_TABLET,
- 	DISPATCH_TABLET_PAD,
- 	DISPATCH_TOTEM,
-+	DISPATCH_JOYSTICK,
- };
-
- struct evdev_dispatch {
-@@ -375,7 +385,7 @@
-
- struct evdev_device *
- evdev_device_create(struct libinput_seat *seat,
--		    struct udev_device *device);
-+		    struct uhdf *uhdf);
-
- static inline struct libinput *
- evdev_libinput_context(const struct evdev_device *device)
-@@ -386,19 +396,8 @@
- static inline bool
- evdev_device_has_model_quirk(struct evdev_device *device,
- 			     enum quirk model_quirk)
--{
--	struct quirks_context *quirks;
--	struct quirks *q;
--	bool result = false;
--
--	assert(quirk_get_name(model_quirk) != NULL);
--
--	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
--	quirks_get_bool(q, model_quirk, &result);
--	quirks_unref(q);
--
--	return result;
-+{
-+	return model_quirk == (enum quirk)(device->uhdf->modeltype);
- }
-
- void
-@@ -430,6 +429,10 @@
- evdev_device_init_pointer_acceleration(struct evdev_device *device,
- 				       struct motion_filter *filter);
-
-+struct evdev_dispatch*
-+evdev_joystick_create(struct evdev_device* device);
-+
-+
- struct evdev_dispatch *
- evdev_touchpad_create(struct evdev_device *device);
-
-@@ -481,6 +484,11 @@
- struct udev_device *
- evdev_device_get_udev_device(struct evdev_device *device);
-
-+/**  @brief   获取设备类型 */
-+enum evdev_device_udev_tags
-+evdev_device_get_udev_device_tags(struct evdev_device* device);
-+
-+
- void
- evdev_device_set_default_calibration(struct evdev_device *device,
- 				     const float calibration[6]);
-@@ -1005,7 +1013,8 @@
- 				   "Axis %#x value %d is outside expected range [%d, %d]\n"
- 				   "See %sabsolute_coordinate_ranges.html for details\n",
- 				   code, value, min, max,
--				   HTTP_DOC_LINK);
-+				   "");
-+				//HTTP_DOC_LINK);
- 	}
- }
-
-@@ -1024,4 +1033,7 @@
- 	free(kbd);
- }
-
-+const char *  uhdf_device_get_property_value(struct uhdf *uhdf,
-+						   const char *key);
-+
- #endif /* EVDEV_H */
-diff -Naur old/src/libinput-git-version.h new/src/libinput-git-version.h
---- old/src/libinput-git-version.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-git-version.h	2021-01-01 00:00:00.000000000 +0800
-@@ -0,0 +1,3 @@
-+#pragma once
-+
-+#define LIBINPUT_GIT_VERSION "@VCS_TAG@"
-diff -Naur old/src/libinput-private.h new/src/libinput-private.h
---- old/src/libinput-private.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/libinput-private.h	2021-01-01 00:00:00.000000000 +0800
-@@ -30,7 +30,7 @@
- #include <errno.h>
- #include <math.h>
- #include <stdarg.h>
--
-+#include <stdatomic.h>
- #if HAVE_LIBWACOM
- #include <libwacom/libwacom.h>
- #endif
-@@ -118,7 +118,7 @@
- 	int (*device_change_seat)(struct libinput_device *device,
- 				  const char *seat_name);
- };
--
-+#define PIPE_NUM 64
- struct libinput {
- 	int epoll_fd;
- 	struct list source_destroy_list;
-@@ -162,6 +162,14 @@
- 		size_t refcount;
- 	} libwacom;
- #endif
-+    int pipes[2];
-+    atomic_int pipesbytes;
-+    atomic_int pipesbytesbyindex[PIPE_NUM];
-+    bool pipesstatus[PIPE_NUM];
-+    struct evdev_device *device[PIPE_NUM];
-+    int devpipes[2];
-+    struct libinput_source *devsource;
-+    struct libinput_source *eventsource;
- };
-
- typedef void (*libinput_seat_destroy_func) (struct libinput_seat *seat);
-@@ -600,7 +608,8 @@
- 		     enum libinput_event_type type,
- 		     int finger_count,
- 		     const struct normalized_coords *delta,
--		     const struct normalized_coords *unaccel);
-+		     const struct normalized_coords *unaccel,
-+		     const struct sloted_coords_info *raw_touches);
-
- void
- gesture_notify_swipe_end(struct libinput_device *device,
-@@ -867,5 +876,6 @@
- static inline void libinput_libwacom_unref(struct libinput *li) {}
- #endif
-
-+struct libinput * uhdflibinput_unref(struct libinput *libinput);
-
- #endif /* LIBINPUT_PRIVATE_H */
-diff -Naur old/src/libinput-util.c new/src/libinput-util.c
---- old/src/libinput-util.c	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-util.c	2021-01-01 00:00:00.000000000 +0800
-@@ -0,0 +1,102 @@
-+/*
-+ * Copyright © 2008-2011 Kristian Høgsberg
-+ * Copyright © 2011 Intel Corporation
-+ * Copyright © 2013-2015 Red Hat, Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * This list data structure is verbatim copy from wayland-util.h from the
-+ * Wayland project; except that wl_ prefix has been removed.
-+ */
-+
-+#include "libinput-util.h"
-+
-+#ifdef HAVE_LIBINPUT_LOG_ENABLE
-+
-+static FILE* p_log_fp = NULL;
-+
-+FILE *libinput_get_log_fp()
-+{
-+    if (p_log_fp == NULL) {
-+        const char *pLogDir = getenv("LIBINPUT_LOG_DIR");
-+        if (pLogDir == NULL) {
-+            pLogDir = (char *)_LIBINPUT_LOG_DIR;
-+        }
-+
-+        const int r = mkdir(pLogDir, 0755);
-+        if (r < 0 && errno != EEXIST) {
-+            const int saved_errno = errno;
-+            printf("could not create %s, errno: %d\n", pLogDir, saved_errno);
-+            return NULL;
-+        }
-+
-+        const char *p_log_path = getenv("LIBINPUT_LOG_PATH");
-+        if (p_log_path == NULL) {
-+            p_log_path = (char *)_LIBINPUT_LOG_PATH;
-+        }
-+        p_log_fp = fopen(p_log_path, "w+");
-+    }
-+
-+    return p_log_fp;
-+}
-+
-+void libinput_log_printf(const char* fmt, ...)
-+{
-+    p_log_fp = libinput_get_log_fp();
-+#ifdef HAVE_LIBINPUT_LOG_CONSOLE_ENABLE
-+    char buf[1024] = {0};
-+
-+    va_list args;
-+    va_start(args, fmt);
-+    vsprintf(buf, fmt, args);
-+    va_end(args);
-+    buf[1024 - 1] = '\0';
-+
-+    printf("%s\n", buf);
-+
-+    if (p_log_fp != NULL) {
-+        fputs(buf, p_log_fp);
-+        fflush(p_log_fp);
-+    }
-+#else
-+    if (p_log_fp != NULL) {
-+        va_list args;
-+        va_start(args, fmt);
-+        vfprintf(p_log_fp, fmt, args);
-+        va_end(args);
-+        fflush(p_log_fp);
-+    }
-+#endif
-+}
-+
-+uint64_t getMicrotime()
-+{
-+    struct timeval currentTime;
-+    gettimeofday(&currentTime, NULL);
-+    return currentTime.tv_sec * 1000000 + currentTime.tv_usec;
-+}
-+
-+uint64_t getTranTime(struct input_event *event)
-+{
-+    return event->input_event_sec * 1000000 + event->input_event_usec;
-+}
-+#endif
-diff -Naur old/src/libinput-util.h new/src/libinput-util.h
---- old/src/libinput-util.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/libinput-util.h	2021-01-01 00:00:00.000000000 +0800
-@@ -27,10 +27,9 @@
-
- #include "config.h"
-
--#ifdef NDEBUG
--#warning "libinput relies on assert(). #defining NDEBUG is not recommended"
--#endif
--
-+//#ifdef NDEBUG
-+//#warning "libinput relies on assert(). #defining NDEBUG is not recommended"
-+//#endif
-
- #include "libinput.h"
-
-@@ -57,6 +56,15 @@
- #define DEFAULT_MOUSE_DPI 1000
- #define DEFAULT_TRACKPOINT_SENSITIVITY 128
-
-+
-+#ifdef HAVE_LIBINPUT_LOG_ENABLE
-+void libinput_log_printf(const char* fmt, ...);
-+uint64_t getMicrotime();
-+uint64_t getTranTime(struct input_event *event);
-+#else
-+#define libinput_log_printf(fmt, ...)
-+#endif
-+
- #define trace(...) \
- 	do { \
- 	printf("%s() - \033[0;31m", __func__); \
-diff -Naur old/src/libinput-version.h new/src/libinput-version.h
---- old/src/libinput-version.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-version.h	2021-01-01 00:00:00.000000000 +0800
-@@ -0,0 +1,32 @@
-+/*
-+ * Copyright © 2013 Jonas Ådahl
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef LIBINPUT_VERSION_H
-+#define LIBINPUT_VERSION_H
-+
-+#define LIBINPUT_VERSION_MAJOR //@LIBINPUT_VERSION_MAJOR@
-+#define LIBINPUT_VERSION_MINOR //@LIBINPUT_VERSION_MINOR@
-+#define LIBINPUT_VERSION_MICRO //@LIBINPUT_VERSION_MICRO@
-+#define LIBINPUT_VERSION "@LIBINPUT_VERSION@"
-+
-+#endif
-diff -Naur old/src/libinput.c new/src/libinput.c
---- old/src/libinput.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/libinput.c	2021-01-01 00:00:00.000000000 +0800
-@@ -33,12 +33,13 @@
- #include <sys/epoll.h>
- #include <unistd.h>
- #include <assert.h>
--
-+#include <stdatomic.h>
- #include "libinput.h"
- #include "libinput-private.h"
- #include "evdev.h"
- #include "timer.h"
- #include "quirks.h"
-+#include "evdev-joystick.h"
-
- #define require_event_type(li_, type_, retval_, ...)	\
- 	if (type_ == LIBINPUT_EVENT_NONE) abort(); \
-@@ -193,6 +194,7 @@
- 	int cancelled;
- 	struct normalized_coords delta;
- 	struct normalized_coords delta_unaccel;
-+	struct sloted_coords_info solt_touches;
- 	double scale;
- 	double angle;
- };
-@@ -1031,6 +1033,18 @@
- 	return event->angle;
- }
-
-+LIBINPUT_EXPORT struct sloted_coords_info *
-+libinput_event_gesture_get_solt_touches(
-+	struct libinput_event_gesture *event)
-+{
-+	require_event_type(libinput_event_get_context(&event->base),
-+			   event->base.type,
-+			   NULL,
-+			   LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE);
-+
-+	return &event->solt_touches;
-+}
-+
- LIBINPUT_EXPORT int
- libinput_event_tablet_tool_x_has_changed(
- 				struct libinput_event_tablet_tool *event)
-@@ -1757,7 +1771,122 @@
- 	source->fd = -1;
- 	list_insert(&libinput->source_destroy_list, &source->link);
- }
-+extern void *
-+libinput_load_module(const char *name, const char *entrypoint);
-+typedef int (*HdfDevHandle)(int index,int cmd);
-+static void
-+evdev_dev_handler(void *data)
-+{
-+    struct libinput *libinput = (struct libinput *)data;
-+    int cmd[2];
-+    int len = sizeof(int);
-+    static HdfDevHandle handle = NULL;
-+    printf("libinput_add_fd epoll_fd =%d,fd=%d ,function addr = %p \n",libinput->epoll_fd,libinput->devpipes[0], evdev_dev_handler);
-+    if( handle == NULL) {
-+        handle = (HdfDevHandle)libinput_load_module("libmmi-server.z.so","HdfDevHandle");
-+    }
-+    {
-+        len = read(libinput->devpipes[0],cmd,sizeof(cmd));
-+        //printf("evdev_dev_handler cmd len =%d\n" ,len);
-+        if(len >= 0 ) {
-+            if(handle) {
-+                handle(cmd[0],cmd[1]);
-+            }
-+        }
-+    }
-+    return;
-+}
-+void uhdflibinput_unpipe(struct libinput *libinput)
-+{
-+    close(libinput->devpipes[0]);
-+    close(libinput->devpipes[1]);
-+    close(libinput->pipes[0]);
-+    close(libinput->pipes[1]);
-+}
-+bool libinput_pipe(struct libinput *libinput) {
-+
-+
-+	libinput->pipes[0]=-1;
-+    libinput->pipes[1]=-1;
-+    libinput->pipesbytes = 0;
-+    if (0 != pipe(libinput->pipes)) {
-+		return false;
-+	}
-+    if (fcntl(libinput->pipes[0], F_SETFL, O_NONBLOCK) == -1) {
-+		return false;
-+	}
-+    if (fcntl(libinput->pipes[1], F_SETFL, O_NONBLOCK) == -1) {
-+		return false;
-+	}
-+    libinput->devpipes[0]=-1;
-+    libinput->devpipes[1]=-1;
-+    if (0 != pipe(libinput->devpipes)) {
-+		    return false;
-+	}
-+
-+
-+    libinput->devsource = libinput_add_fd(libinput,
-+						     libinput->devpipes[0],
-+						     evdev_dev_handler,
-+						     libinput);
-+	if (!libinput->devsource) {
-+		return false;
-+	}
-+
-+	libinput->eventsource =
-+		libinput_add_fd(libinput, libinput->pipes[0], evdev_device_hdfdispatch, libinput);
-+	if (!libinput->eventsource) {
-+		return false;
-+    }
-+    libinput->pipesbytes = 0 ;
-+	return true;
-+}
-+
-+/**
-+* Write in a pipe.
-+*/
-+LIBINPUT_EXPORT int libinput_pipe_write(struct libinput *libinput, int index , const void *buf, int count) {
-+    int readcount =atomic_load_explicit(&libinput->pipesbytes,__ATOMIC_SEQ_CST);
-+
-+    if(readcount > 56*1024) { // more then 56k data will be discard
-+        libinput->pipesstatus[index] = true;
-+    }
-+    if(readcount < 1024) {//less then 1k data will  do translate
-+        libinput->pipesstatus[index] = false;
-+    }
-+    if(!libinput->pipesstatus[index]) {
-+        write(libinput->pipes[1], buf, count);
-+        atomic_fetch_add_explicit(&libinput->pipesbytes, count, memory_order_release);
-+    }
-+    return count ;
-+}
-
-+
-+LIBINPUT_EXPORT int libinput_get_pipe_bytes(struct libinput *libinput, int index) {
-+    return libinput->pipesbytes;
-+}
-+
-+/**
-+* Read in a pipe.
-+*/
-+LIBINPUT_EXPORT int libinput_pipe_read(struct libinput *libinput,  int index , void *buf, int count) {
-+	return (int) read(libinput->pipes[0], buf, count);
-+}
-+
-+/**
-+* Write in a pipe.
-+*/
-+LIBINPUT_EXPORT int libinput_devpipe_write(struct libinput *libinput, void *buf, int count) {
-+	return (int) write(libinput->devpipes[1], buf, count);
-+}
-+
-+/**
-+* Read in a pipe.
-+*/
-+LIBINPUT_EXPORT int libinput_devpipe_read(struct libinput *libinput,void *buf, int count) {
-+
-+	return (int) read(libinput->devpipes[0], buf, count);
-+}
- int
- libinput_init(struct libinput *libinput,
- 	      const struct libinput_interface *interface,
-@@ -1770,7 +1899,11 @@
- 	libinput->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
- 	if (libinput->epoll_fd < 0)
- 		return -1;
--
-+    if (!libinput_pipe(libinput)) {
-+        uhdflibinput_unpipe(libinput);
-+        close(libinput->epoll_fd);
-+        return -1;
-+    }
- 	libinput->events_len = 4;
- 	libinput->events = zalloc(libinput->events_len * sizeof(*libinput->events));
- 	libinput->log_handler = libinput_default_log_func;
-@@ -1806,11 +1939,8 @@
- 	/* If we fail, we'll fail next time too */
- 	libinput->quirks_initialized = true;
-
--	data_path = getenv("LIBINPUT_QUIRKS_DIR");
--	if (!data_path) {
--		data_path = LIBINPUT_QUIRKS_DIR;
--		override_file = LIBINPUT_QUIRKS_OVERRIDE_FILE;
--	}
-+		data_path = (char *)LIBINPUT_QUIRKS_DIR;
-+		override_file = (char *)LIBINPUT_QUIRKS_OVERRIDE_FILE;
-
- 	quirks = quirks_init_subsystem(data_path,
- 				       override_file,
-@@ -1856,10 +1986,9 @@
- 	return libinput;
- }
-
--LIBINPUT_EXPORT struct libinput *
--libinput_unref(struct libinput *libinput)
-+struct libinput * uhdflibinput_unref(struct libinput *libinput)
- {
--	struct libinput_event *event;
-+    struct libinput_event *event;
- 	struct libinput_device *device, *next_device;
- 	struct libinput_seat *seat, *next_seat;
- 	struct libinput_tablet_tool *tool, *next_tool;
-@@ -1873,10 +2002,6 @@
- 	if (libinput->refcount > 0)
- 		return libinput;
-
--	libinput_suspend(libinput);
--
--	libinput->interface_backend->destroy(libinput);
--
- 	while ((event = libinput_get_event(libinput)))
- 	       libinput_event_destroy(event);
-
-@@ -1901,16 +2026,25 @@
- 	list_for_each_safe(tool, next_tool, &libinput->tool_list, link) {
- 		libinput_tablet_tool_unref(tool);
- 	}
--
-+    libinput_remove_source(libinput,libinput->devsource);
-+    libinput_remove_source(libinput,libinput->eventsource);
-+    uhdflibinput_unpipe(libinput);
- 	libinput_timer_subsys_destroy(libinput);
- 	libinput_drop_destroyed_sources(libinput);
--	quirks_context_unref(libinput->quirks);
- 	close(libinput->epoll_fd);
- 	free(libinput);
-
- 	return NULL;
- }
-
-+LIBINPUT_EXPORT struct libinput *
-+libinput_unref(struct libinput *libinput)
-+{
-+    uhdflibinput_unref(libinput);
-+
-+	return NULL;
-+}
-+
- static void
- libinput_event_tablet_tool_destroy(struct libinput_event_tablet_tool *event)
- {
-@@ -2311,6 +2445,9 @@
- 	case LIBINPUT_DEVICE_CAP_SWITCH:
- 		capability = "CAP_SWITCH";
- 		break;
-+	case LIBINPUT_DEVICE_CAP_JOYSTICK:
-+        capability = "CAP_JOYSTICK";
-+        break;
- 	}
-
- 	log_bug_libinput(device->seat->libinput,
-@@ -2814,6 +2951,7 @@
- 	       int cancelled,
- 	       const struct normalized_coords *delta,
- 	       const struct normalized_coords *unaccel,
-+	       const struct sloted_coords_info *solt_touches,
- 	       double scale,
- 	       double angle)
- {
-@@ -2834,6 +2972,12 @@
- 		.angle = angle,
- 	};
-
-+	if (solt_touches != NULL) {
-+		gesture_event->solt_touches = *solt_touches;
-+	} else {
-+        memset(&gesture_event->solt_touches, 0, sizeof(struct sloted_coords_info));
-+    }
-+
- 	post_device_event(device, time, type,
- 			  &gesture_event->base);
- }
-@@ -2844,9 +2988,10 @@
- 		     enum libinput_event_type type,
- 		     int finger_count,
- 		     const struct normalized_coords *delta,
--		     const struct normalized_coords *unaccel)
-+		     const struct normalized_coords *unaccel,
-+		     const struct sloted_coords_info *solt_touches)
- {
--	gesture_notify(device, time, type, finger_count, 0, delta, unaccel,
-+	gesture_notify(device, time, type, finger_count, 0, delta, unaccel, solt_touches,
- 		       0.0, 0.0);
- }
-
-@@ -2859,7 +3004,7 @@
- 	const struct normalized_coords zero = { 0.0, 0.0 };
-
- 	gesture_notify(device, time, LIBINPUT_EVENT_GESTURE_SWIPE_END,
--		       finger_count, cancelled, &zero, &zero, 0.0, 0.0);
-+		       finger_count, cancelled, &zero, &zero, NULL, 0.0, 0.0);
- }
-
- void
-@@ -2873,7 +3018,7 @@
- 		     double angle)
- {
- 	gesture_notify(device, time, type, finger_count, 0,
--		       delta, unaccel, scale, angle);
-+		       delta, unaccel, NULL, scale, angle);
- }
-
- void
-@@ -2886,7 +3031,7 @@
- 	const struct normalized_coords zero = { 0.0, 0.0 };
-
- 	gesture_notify(device, time, LIBINPUT_EVENT_GESTURE_PINCH_END,
--		       finger_count, cancelled, &zero, &zero, scale, 0.0);
-+		       finger_count, cancelled, &zero, &zero, NULL, scale, 0.0);
- }
-
- void
-@@ -2972,6 +3117,92 @@
- 	libinput->events_in = (libinput->events_in + 1) % libinput->events_len;
- }
-
-+
-+LIBINPUT_EXPORT void
-+libinput_post_handle_event(struct libinput* libinput, struct libinput_event* event)
-+{
-+	libinput_post_event(libinput, event);
-+}
-+
-+LIBINPUT_EXPORT struct libinput_event_joystick_button*
-+libinput_event_get_joystick_button_event(struct libinput_event* event)
-+{
-+    require_event_type(libinput_event_get_context(event),
-+        event->type,
-+        NULL,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+    return (struct libinput_event_joystick_button*)event;
-+}
-+
-+LIBINPUT_EXPORT struct libinput_event_joystick_axis*
-+libinput_event_get_joystick_axis_event(struct libinput_event* event)
-+{
-+	require_event_type(libinput_event_get_context(event),
-+        event->type,
-+        NULL,
-+		LIBINPUT_EVENT_POINTER_AXIS);
-+
-+    return (struct libinput_event_joystick_axis*)event;
-+}
-+
-+/**
-+ * @brief 获取joystick指定轴的数据是否变化
-+*/
-+bool libinput_event_get_joystick_axis_value_is_changed(struct libinput_event_joystick_axis *event, enum libinput_joystick_axis_source axis)
-+{
-+	if (event == NULL) {
-+		return 0;
-+	}
-+
-+	return (bool)(event->axis_value_mask & (uint32_t)axis);
-+}
-+
-+/**
-+ * @brief 获取轴事件的时间
-+ */
-+uint64_t
-+libinput_event_get_joystick_axis_time(struct libinput_event_joystick_axis *event)
-+{
-+	if (event == NULL) {
-+		return 0;
-+	}
-+
-+	return event->time;
-+}
-+
-+/**
-+ * @brief 获取joystick指定轴的abs信息
-+*/
-+struct libinput_event_joystick_axis_abs_info *
-+libinput_event_get_joystick_axis_abs_info(struct libinput_event_joystick_axis *event, enum libinput_joystick_axis_source axis)
-+{
-+	switch (axis) {
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_X:
-+	return &event->abs_x;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Y:
-+	return &event->abs_y;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Z:
-+	return &event->abs_z;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RX:
-+	return &event->abs_rx;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RY:
-+	return &event->abs_ry;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RZ:
-+	return &event->abs_rz;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_THROTTLE:
-+	return &event->abs_throttle;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0X:
-+	return &event->abs_hat0x;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0Y:
-+	return &event->abs_hat0y;
-+	default:
-+	break;
-+	}
-+
-+	return NULL;
-+}
-+
- LIBINPUT_EXPORT struct libinput_event *
- libinput_get_event(struct libinput *libinput)
- {
-@@ -3016,13 +3247,13 @@
- LIBINPUT_EXPORT int
- libinput_resume(struct libinput *libinput)
- {
--	return libinput->interface_backend->resume(libinput);
-+	return 0;
- }
-
- LIBINPUT_EXPORT void
- libinput_suspend(struct libinput *libinput)
- {
--	libinput->interface_backend->suspend(libinput);
-+
- }
-
- LIBINPUT_EXPORT void
-@@ -3055,12 +3286,37 @@
- 	return evdev_device_get_sysname((struct evdev_device *) device);
- }
-
-+LIBINPUT_EXPORT const char*
-+libinput_device_get_phys(struct libinput_device* device)
-+{
-+	struct libevdev* evdev = ((struct evdev_device*)device)->evdev;
-+	if (evdev == NULL) {
-+		return NULL;
-+	}
-+	return libevdev_get_phys(evdev);
-+}
-+
- LIBINPUT_EXPORT const char *
- libinput_device_get_name(struct libinput_device *device)
- {
- 	return evdev_device_get_name((struct evdev_device *) device);
- }
-
-+LIBINPUT_EXPORT enum evdev_device_udev_tags
-+libinput_device_get_tags(struct libinput_device* device)
-+{
-+	if(device == NULL)
-+        return EVDEV_UDEV_TAG_INPUT;
-+
-+	struct evdev_device* evdevDevice = (struct evdev_device*)device;
-+	enum evdev_device_udev_tags udev_tags;
-+
-+	if (evdevDevice->udev_device)
-+	    return EVDEV_UDEV_TAG_INPUT;
-+
-+	return udev_tags = (enum evdev_device_udev_tags)evdevDevice->model_flags;
-+}
-+
- LIBINPUT_EXPORT unsigned int
- libinput_device_get_id_product(struct libinput_device *device)
- {
-@@ -3076,7 +3332,7 @@
- LIBINPUT_EXPORT const char *
- libinput_device_get_output_name(struct libinput_device *device)
- {
--	return evdev_device_get_output((struct evdev_device *) device);
-+    return NULL;
- }
-
- LIBINPUT_EXPORT struct libinput_seat *
-@@ -4378,3 +4634,93 @@
- 	}
- }
- #endif
-+
-+LIBINPUT_EXPORT struct libinput_event_joystick_button*
-+libinput_event_get_joystick_pointer_button_event(struct libinput_event* event)
-+{
-+	if (!event)
-+		return 0;
-+
-+	require_event_type(libinput_event_get_context(event),
-+		event->type,
-+		NULL,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+	return (struct libinput_event_joystick_button*)event;
-+}
-+
-+LIBINPUT_EXPORT uint64_t
-+libinput_event_joystick_button_time(struct libinput_event_joystick_button* event)
-+{
-+    if (!event)
-+        return 0;
-+
-+    require_event_type(libinput_event_get_context(&event->base),
-+        event->base.type,
-+        0,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+    return event->time;
-+}
-+
-+LIBINPUT_EXPORT uint32_t
-+libinput_event_joystick_button_get_key(struct libinput_event_joystick_button* event)
-+{
-+    if (!event)
-+        return 0;
-+
-+    require_event_type(libinput_event_get_context(&event->base),
-+		event->base.type,
-+        0,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+    return event->key;
-+}
-+
-+LIBINPUT_EXPORT enum libinput_key_state
-+libinput_event_joystick_button_get_key_state(struct libinput_event_joystick_button* event)
-+{
-+	if (!event)
-+		return 0;
-+
-+	require_event_type(libinput_event_get_context(&event->base),
-+		event->base.type,
-+		0,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+	return event->state;
-+}
-+
-+LIBINPUT_EXPORT uint32_t
-+libinput_event_joystick_button_get_seat_key_count(struct libinput_event_joystick_button* event)
-+{
-+    if (!event)
-+        return 0;
-+
-+    require_event_type(libinput_event_get_context(&event->base),
-+		event->base.type,
-+        0,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+    return event->seat_key_count;
-+}
-+
-+LIBINPUT_EXPORT int
-+libinput_event_joystick_button_get_value(struct libinput_event_joystick_button* event)
-+{
-+    if (!event)
-+        return 0;
-+
-+    require_event_type(libinput_event_get_context(&event->base),
-+		event->base.type,
-+        0,
-+        LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+    return event->value;
-+}
-+
-+LIBINPUT_EXPORT double
-+libinput_event_get_touch_pressure(struct libinput_event *event)
-+{
-+    return 0.0F;
-+}
-diff -Naur old/src/libinput.h new/src/libinput.h
---- old/src/libinput.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/libinput.h	2021-01-01 00:00:00.000000000 +0800
-@@ -33,6 +33,7 @@
- #include <stdint.h>
- #include <stdarg.h>
- #include <libudev.h>
-+#include "util-bits.h"
-
- #define LIBINPUT_ATTRIBUTE_PRINTF(_format, _args) \
- 	__attribute__ ((format (printf, _format, _args)))
-@@ -196,6 +197,22 @@
- 	LIBINPUT_DEVICE_CAP_TABLET_PAD = 4,
- 	LIBINPUT_DEVICE_CAP_GESTURE = 5,
- 	LIBINPUT_DEVICE_CAP_SWITCH = 6,
-+	LIBINPUT_DEVICE_CAP_JOYSTICK = 7,
-+};
-+
-+enum evdev_device_udev_tags {
-+    EVDEV_UDEV_TAG_INPUT = bit(0),
-+    EVDEV_UDEV_TAG_KEYBOARD = bit(1),
-+    EVDEV_UDEV_TAG_MOUSE = bit(2),
-+    EVDEV_UDEV_TAG_TOUCHPAD = bit(3),
-+    EVDEV_UDEV_TAG_TOUCHSCREEN = bit(4),
-+    EVDEV_UDEV_TAG_TABLET = bit(5),
-+    EVDEV_UDEV_TAG_JOYSTICK = bit(6),
-+    EVDEV_UDEV_TAG_ACCELEROMETER = bit(7),
-+    EVDEV_UDEV_TAG_TABLET_PAD = bit(8),
-+    EVDEV_UDEV_TAG_POINTINGSTICK = bit(9),
-+    EVDEV_UDEV_TAG_TRACKBALL = bit(10),
-+    EVDEV_UDEV_TAG_SWITCH = bit(11),
- };
-
- /**
-@@ -315,6 +332,49 @@
- };
-
- /**
-+ * @ingroup event_joystick
-+ *
-+ * The source for a @ref LIBINPUT_EVENT_POINTER_AXIS event. See
-+ * libinput_event_get_joystick_axis_event() for details.
-+ *
-+ * @since 1.16.4
-+ */
-+enum libinput_joystick_axis_source {
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_UNKNOW = 0,
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_X = bit(0),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Y = bit(1),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Z = bit(2),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RX = bit(3),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RY = bit(4),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RZ = bit(5),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_THROTTLE = bit(6),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RUDDER = bit(7),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_WHEEL = bit(8),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_GAS = bit(9),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_BRAKE = bit(10),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0X = bit(11),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0Y = bit(12),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT1X = bit(13),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT1Y = bit(14),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT2X = bit(15),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT2Y = bit(16),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT3X = bit(17),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT3Y = bit(18),
-+};
-+
-+#define MAX_SOLTED_COORDS_NUM 10
-+struct sloted_coords {
-+	bool is_active;
-+	float x;
-+	float y;
-+};
-+
-+struct sloted_coords_info {
-+	struct sloted_coords coords[MAX_SOLTED_COORDS_NUM];
-+	unsigned int active_count;
-+};
-+
-+/**
-  * @ingroup device
-  *
-  * Available tool types for a device with the @ref
-@@ -387,6 +447,17 @@
- 	LIBINPUT_TABLET_TOOL_TIP_DOWN = 1,
- };
-
-+struct libinput_event_joystick_axis_abs_info {
-+	int32_t code;
-+	int32_t value;
-+	int32_t minimum;
-+	int32_t maximum;
-+	int32_t fuzz;
-+	int32_t flat;
-+	int32_t resolution;
-+	float	standardValue;
-+};
-+
- /**
-  * @defgroup tablet_pad_modes Tablet pad modes
-  *
-@@ -1893,6 +1964,12 @@
- libinput_event_gesture_get_angle_delta(struct libinput_event_gesture *event);
-
- /**
-+ * 获取带slot的touches信息, 仅支持LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE
-+ */
-+struct sloted_coords_info *
-+libinput_event_gesture_get_solt_touches(struct libinput_event_gesture *event);
-+
-+/**
-  * @defgroup event_tablet Tablet events
-  *
-  * Events that come from tools on tablet devices. For events from the pad,
-@@ -3466,6 +3543,46 @@
- int
- libinput_dispatch(struct libinput *libinput);
-
-+/****************************************************************************
-+* @brief : brief
-+* @author : fms
-+* @date : 2021/3/8 20:55
-+* @version : ver 1.0
-+* @inparam :libinput  event
-+* @outparam :
-+*****************************************************************************/
-+void
-+libinput_post_handle_event(struct libinput* libinput,
-+	struct libinput_event* event);
-+
-+/****************************************************************************
-+* @brief : get joystick button event
-+* @author : fms
-+* @date : 2021/3/12 10:56
-+* @version : ver 1.0
-+* @inparam :
-+* @outparam :
-+*****************************************************************************/
-+struct libinput_event_joystick_axis *
-+libinput_event_get_joystick_axis_event(struct libinput_event *event);
-+
-+/**
-+ * @brief 获取轴事件的时间
-+ */
-+uint64_t
-+libinput_event_get_joystick_axis_time(struct libinput_event_joystick_axis *event);
-+
-+/**
-+ * @brief 获取joystick指定轴的数据是否变化
-+*/
-+bool libinput_event_get_joystick_axis_value_is_changed(struct libinput_event_joystick_axis *event, enum libinput_joystick_axis_source axis);
-+
-+/**
-+ * @brief 获取joystick指定轴的abs信息
-+*/
-+struct libinput_event_joystick_axis_abs_info *
-+libinput_event_get_joystick_axis_abs_info(struct libinput_event_joystick_axis *event, enum libinput_joystick_axis_source axis);
-+
- /**
-  * @ingroup base
-  *
-@@ -3936,6 +4053,10 @@
- const char *
- libinput_device_get_name(struct libinput_device *device);
-
-+/**  @brief   获取设备类型*/
-+enum evdev_device_udev_tags
-+libinput_device_get_tags(struct libinput_device* device);
-+
- /**
-  * @ingroup device
-  *
-@@ -5928,7 +6049,96 @@
- unsigned int
- libinput_device_config_rotation_get_default_angle(struct libinput_device *device);
-
-+struct uhdf;
-+
-+int uhdfdevice_added(struct libinput *input,struct uhdf *uhdf,const char *seat_name);
-+
-+struct libinput * libinput_hdf_create_context(const struct libinput_interface *interface,void *user_data);
-+
-+void uhdfdevice_removed(struct uhdf *uhdf);
-+
-+struct evdev_device;
-+struct input_event;
-+void evdev_device_dispatch_two(struct evdev_device *device,
-+                struct input_event *ev);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the struct libinput_event_joystick_button from the event.
-+ *
-+ * @param event The libinput event
-+ * @return The libinput_event_joystick_button for this event.
-+ */
-+struct libinput_event_joystick_button*
-+libinput_event_get_joystick_pointer_button_event(struct libinput_event* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the time from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The time for this event.
-+ */
-+uint64_t libinput_event_joystick_button_time(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the key value from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The key value for this event.
-+ */
-+uint32_t libinput_event_joystick_button_get_key(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the seat key count from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The seat key count for this event.
-+ */
-+uint32_t libinput_event_joystick_button_get_seat_key_count(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the value count from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The value for this event.
-+ */
-+int libinput_event_joystick_button_get_value(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup config
-+ *
-+ * Get the pressure of the touch screen
-+ *
-+ * @param Carried libinput event
-+ * @return Pressure value of touch screen
-+ *
-+ * @since 1.4
-+ */
-+double
-+libinput_event_get_touch_pressure(struct libinput_event* event);
-+
-+const char*
-+libinput_device_get_phys(struct libinput_device* device);bool libinput_pipe(struct libinput *libinput);
-+bool libinput_pipe(struct libinput *libinput);
-+int libinput_pipe_write(struct libinput *libinput, int index,const void *buf, int count);
-+int libinput_pipe_read(struct libinput *libinput, int index,void *buf, int count);
-+int libinput_devpipe_write(struct libinput *libinput,void *buf, int count);
-+int libinput_devpipe_read(struct libinput *libinput, void *buf, int count);
-+int libinput_get_pipe_bytes(struct libinput *libinput, int index);
-+void evdev_device_hdfdispatch(void *data);
-+enum libinput_key_state
-+libinput_event_joystick_button_get_key_state(struct libinput_event_joystick_button* event);
- #ifdef __cplusplus
- }
- #endif
- #endif /* LIBINPUT_H */
-+
-diff -Naur old/src/path-seat.c new/src/path-seat.c
---- old/src/path-seat.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/path-seat.c	2021-01-01 00:00:00.000000000 +0800
-@@ -176,42 +176,7 @@
- 		   struct udev_device *udev_device,
- 		   const char *seat_logical_name_override)
- {
--	struct path_seat *seat;
--	struct evdev_device *device = NULL;
--	const char *output_name;
--	const char *devnode, *sysname;
--
--	devnode = udev_device_get_devnode(udev_device);
--	sysname = udev_device_get_sysname(udev_device);
--
--	seat = path_seat_get_for_device(input, udev_device, seat_logical_name_override);
--	if (!seat)
--		goto out;
--
--	device = evdev_device_create(&seat->base, udev_device);
--	libinput_seat_unref(&seat->base);
--
--	if (device == EVDEV_UNHANDLED_DEVICE) {
--		device = NULL;
--		log_info(&input->base,
--			 "%-7s - not using input device '%s'.\n",
--			 sysname,
--			 devnode);
--		goto out;
--	} else if (device == NULL) {
--		log_info(&input->base,
--			 "%-7s - failed to create input device '%s'.\n",
--			 sysname,
--			 devnode);
--		goto out;
--	}
--
--	evdev_read_calibration_prop(device);
--	output_name = udev_device_get_property_value(udev_device, "WL_OUTPUT");
--	device->output_name = safe_strdup(output_name);
--
--out:
--	return device ? &device->base : NULL;
-+    return NULL;
- }
-
- static int
-@@ -277,19 +242,7 @@
- path_device_change_seat(struct libinput_device *device,
- 			const char *seat_name)
- {
--	struct libinput *libinput = device->seat->libinput;
--	struct evdev_device *evdev = evdev_device(device);
--	struct udev_device *udev_device = NULL;
--	int rc = -1;
--
--	udev_device = evdev->udev_device;
--	udev_device_ref(udev_device);
--	libinput_path_remove_device(device);
--
--	if (path_create_device(libinput, udev_device, seat_name) != NULL)
--		rc = 0;
--	udev_device_unref(udev_device);
--	return rc;
-+	return -1;
- }
-
- static const struct libinput_interface_backend interface_backend = {
-@@ -404,26 +357,5 @@
- LIBINPUT_EXPORT void
- libinput_path_remove_device(struct libinput_device *device)
- {
--	struct libinput *libinput = device->seat->libinput;
--	struct path_input *input = (struct path_input*)libinput;
--	struct libinput_seat *seat;
--	struct evdev_device *evdev = evdev_device(device);
--	struct path_device *dev;
--
--	if (libinput->interface_backend != &interface_backend) {
--		log_bug_client(libinput, "Mismatching backends.\n");
--		return;
--	}
--
--	list_for_each(dev, &input->path_list, link) {
--		if (dev->udev_device == evdev->udev_device) {
--			path_device_destroy(dev);
--			break;
--		}
--	}
--
--	seat = device->seat;
--	libinput_seat_ref(seat);
--	path_disable_device(libinput, evdev);
--	libinput_seat_unref(seat);
-+    // hdf no need
- }
-diff -Naur old/src/quirks.c new/src/quirks.c
---- old/src/quirks.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/quirks.c	2021-01-01 00:00:00.000000000 +0800
-@@ -1382,36 +1382,9 @@
-
- struct quirks *
- quirks_fetch_for_device(struct quirks_context *ctx,
--			struct udev_device *udev_device)
-+            struct uhdf *uhdf)
- {
--	struct quirks *q = NULL;
--	struct section *s;
--	struct match *m;
--
--	if (!ctx)
--		return NULL;
--
--	qlog_debug(ctx, "%s: fetching quirks\n",
--		   udev_device_get_devnode(udev_device));
--
--	q = quirks_new();
--
--	m = match_new(udev_device, ctx->dmi, ctx->dt);
--
--	list_for_each(s, &ctx->sections, link) {
--		quirk_match_section(ctx, q, s, m, udev_device);
--	}
--
--	match_free(m);
--
--	if (q->nproperties == 0) {
--		quirks_unref(q);
--		return NULL;
--	}
--
--	list_insert(&ctx->quirks, &q->link);
--
--	return q;
-+	return uhdf->quirkpop;
- }
-
-
-diff -Naur old/src/quirks.h new/src/quirks.h
---- old/src/quirks.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/quirks.h	2021-01-01 00:00:00.000000000 +0800
-@@ -31,6 +31,7 @@
- #include <libudev.h>
-
- #include "libinput.h"
-+#include "udev-seat.h"
-
- /**
-  * Handle to the quirks context.
-@@ -189,7 +190,7 @@
-  */
- struct quirks *
- quirks_fetch_for_device(struct quirks_context *ctx,
--			struct udev_device *device);
-+			struct uhdf *uhdf);
-
- /**
-  * Reduce the refcount by one. When the refcount reaches zero, the
-diff -Naur old/src/udev-seat.c new/src/udev-seat.c
---- old/src/udev-seat.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/udev-seat.c	2021-01-01 00:00:00.000000000 +0800
-@@ -27,10 +27,17 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
--
-+#include <dlfcn.h>
- #include "evdev.h"
- #include "udev-seat.h"
-
-+#ifdef __aarch64__
-+#define LIB_MODULEDIR "/system/lib64"
-+#define MODULEDIR "/system/lib64"
-+#else
-+#define LIB_MODULEDIR "/system/lib"
-+#define MODULEDIR "/system/lib"
-+#endif
- static const char default_seat[] = "seat0";
- static const char default_seat_name[] = "default";
-
-@@ -40,6 +47,86 @@
- 		 const char *seat_name);
- static struct udev_seat *
- udev_seat_get_named(struct udev_input *input, const char *seat_name);
-+size_t
-+module_path_from_env(const char *name, char *path, size_t path_len)
-+{
-+	const char *mapping = getenv("WESTON_MODULE_MAP");
-+	const char *end;
-+	const int name_len = strlen(name);
-+
-+	if (!mapping)
-+		return 0;
-+
-+	end = mapping + strlen(mapping);
-+	while (mapping < end && *mapping) {
-+		const char *filename, *next;
-+
-+		/* early out: impossibly short string */
-+		if (end - mapping < name_len + 1)
-+			return 0;
-+
-+		filename = &mapping[name_len + 1];
-+		next = strchrnul(mapping, ';');
-+
-+		if (strncmp(mapping, name, name_len) == 0 &&
-+		    mapping[name_len] == '=') {
-+			size_t file_len = next - filename; /* no trailing NUL */
-+			if (file_len >= path_len)
-+				return 0;
-+			strncpy(path, filename, file_len);
-+			path[file_len] = '\0';
-+			return file_len;
-+		}
-+
-+		mapping = next + 1;
-+	}
-+
-+	return 0;
-+}
-+
-+void *
-+libinput_load_module(const char *name, const char *entrypoint)
-+{
-+	char path[PATH_MAX];
-+	void *module, *init;
-+	size_t len;
-+
-+	if (name == NULL)
-+		return NULL;
-+	if (name[0] != '/') {
-+		len = module_path_from_env(name, path, sizeof path);
-+		if (len == 0)
-+			len = snprintf(path, sizeof path, "%s/%s",
-+				       LIB_MODULEDIR, name);
-+	} else {
-+		len = snprintf(path, sizeof path, "%s", name);
-+	}
-+    len = snprintf(path, sizeof path, "%s", name);
-+	/* snprintf returns the length of the string it would've written,
-+	 * _excluding_ the NUL byte. So even being equal to the size of
-+	 * our buffer is an error here. */
-+	if (len >= sizeof path)
-+		return NULL;
-+
-+	module = dlopen(path, RTLD_NOW | RTLD_NOLOAD);
-+	if (module) {
-+		libinput_log_printf("Module '%s' already loaded\n", path);
-+	} else {
-+		libinput_log_printf("Loading module '%s'\n", path);
-+		module = dlopen(path, RTLD_NOW);
-+		if (!module) {
-+			libinput_log_printf("Failed to load module: %s\n", dlerror());
-+			return NULL;
-+		}
-+	}
-+
-+	init = dlsym(module, entrypoint);
-+	if (!init) {
-+		return NULL;
-+	}
-+
-+	return init;
-+}
-
-
- static inline bool
-@@ -78,90 +165,12 @@
- 	     struct udev_input *input,
- 	     const char *seat_name)
- {
--	struct evdev_device *device;
--	const char *devnode, *sysname;
--	const char *device_seat, *output_name;
--	struct udev_seat *seat;
--
--	device_seat = udev_device_get_property_value(udev_device, "ID_SEAT");
--	if (!device_seat)
--		device_seat = default_seat;
--
--	if (!streq(device_seat, input->seat_id))
--		return 0;
--
--	if (ignore_litest_test_suite_device(udev_device))
--		return 0;
--
--	devnode = udev_device_get_devnode(udev_device);
--	sysname = udev_device_get_sysname(udev_device);
--
--	/* Search for matching logical seat */
--	if (!seat_name)
--		seat_name = udev_device_get_property_value(udev_device, "WL_SEAT");
--	if (!seat_name)
--		seat_name = default_seat_name;
--
--	seat = udev_seat_get_named(input, seat_name);
--
--	/* There is a race at startup: a device added between setting
--	 * up the udev monitor and enumerating all current devices may show
--	 * up in both lists. Filter those out.
--	 */
--	if (filter_duplicates(seat, udev_device))
--		return 0;
--
--	if (seat)
--		libinput_seat_ref(&seat->base);
--	else {
--		seat = udev_seat_create(input, device_seat, seat_name);
--		if (!seat)
--			return -1;
--	}
--
--	device = evdev_device_create(&seat->base, udev_device);
--	libinput_seat_unref(&seat->base);
--
--	if (device == EVDEV_UNHANDLED_DEVICE) {
--		log_info(&input->base,
--			 "%-7s - not using input device '%s'\n",
--			 sysname,
--			 devnode);
--		return 0;
--	} else if (device == NULL) {
--		log_info(&input->base,
--			 "%-7s - failed to create input device '%s'\n",
--			 sysname,
--			 devnode);
--		return 0;
--	}
--
--	evdev_read_calibration_prop(device);
--
--	output_name = udev_device_get_property_value(udev_device, "WL_OUTPUT");
--	device->output_name = safe_strdup(output_name);
--
- 	return 0;
- }
-
- static void
- device_removed(struct udev_device *udev_device, struct udev_input *input)
- {
--	struct evdev_device *device, *next;
--	struct udev_seat *seat;
--	const char *syspath;
--
--	syspath = udev_device_get_syspath(udev_device);
--	list_for_each(seat, &input->base.seat_list, base.link) {
--		list_for_each_safe(device, next,
--				   &seat->base.devices_list, base.link) {
--			if (streq(syspath,
--				  udev_device_get_syspath(device->udev_device))) {
--				evdev_device_remove(device);
--				break;
--			}
--		}
--	}
- }
-
- static int
-@@ -368,55 +377,36 @@
- udev_device_change_seat(struct libinput_device *device,
- 			const char *seat_name)
- {
--	struct libinput *libinput = device->seat->libinput;
--	struct udev_input *input = (struct udev_input *)libinput;
--	struct evdev_device *evdev = evdev_device(device);
--	struct udev_device *udev_device = evdev->udev_device;
--	int rc;
--
--	udev_device_ref(udev_device);
--	device_removed(udev_device, input);
--	rc = device_added(udev_device, input, seat_name);
--	udev_device_unref(udev_device);
--
--	return rc;
-+    return 0;
- }
--
-+#if 0
- static const struct libinput_interface_backend interface_backend = {
- 	.resume = udev_input_enable,
- 	.suspend = udev_input_disable,
- 	.destroy = udev_input_destroy,
- 	.device_change_seat = udev_device_change_seat,
- };
--
-+#endif
-+typedef struct libinput *  (*HdfAdfInit)();
- LIBINPUT_EXPORT struct libinput *
- libinput_udev_create_context(const struct libinput_interface *interface,
- 			     void *user_data,
- 			     struct udev *udev)
- {
--	struct udev_input *input;
--
--	if (!interface || !udev)
--		return NULL;
--
--	input = zalloc(sizeof *input);
--
--	if (libinput_init(&input->base, interface,
--			  &interface_backend, user_data) != 0) {
--		libinput_unref(&input->base);
--		free(input);
--		return NULL;
--	}
--
--	input->udev = udev_ref(udev);
--
--	return &input->base;
-+    HdfAdfInit init = (HdfAdfInit)libinput_load_module("libmmi-server.z.so","HdfAdfInit");
-+    if(init == NULL) {
-+        return NULL;
-+    }
-+     struct libinput * plibinput = init();
-+     libinput_set_user_data(plibinput,user_data);
-+     return plibinput;
- }
-
- LIBINPUT_EXPORT int
- libinput_udev_assign_seat(struct libinput *libinput,
- 			  const char *seat_id)
- {
-+#if 0
- 	struct udev_input *input = (struct udev_input*)libinput;
-
- 	if (!seat_id)
-@@ -447,6 +437,109 @@
-
- 	if (udev_input_enable(&input->base) < 0)
- 		return -1;
--
-+#endif
- 	return 0;
- }
-+
-+// change libinput for hdf frame
-+static const struct libinput_interface_backend simplyinterface_backend = {
-+    .resume = NULL,
-+    .suspend = NULL,
-+    .destroy = NULL,
-+    .device_change_seat = NULL,
-+};
-+
-+static struct udev_seat *
-+uhdf_seat_get_named(struct uhdf_input *input, const char *seat_name)
-+{
-+    struct udev_seat *seat;
-+
-+    list_for_each(seat, &input->base.seat_list, base.link) {
-+        if (streq(seat->base.logical_name, seat_name))
-+            return seat;
-+    }
-+
-+    return NULL;
-+}
-+
-+static struct udev_seat *
-+uhdf_seat_create(struct uhdf_input *input,
-+    const char *device_seat,
-+    const char *seat_name)
-+{
-+    struct udev_seat *seat;
-+
-+    seat = zalloc(sizeof *seat);
-+
-+    libinput_seat_init(&seat->base, &input->base,
-+            device_seat, seat_name,
-+            udev_seat_destroy);
-+
-+    return seat;
-+}
-+
-+struct libinput *
-+libinput_hdf_create_context(const struct libinput_interface *interface,
-+                           void *user_data)
-+{
-+    struct uhdf_input *input;
-+    input = zalloc(sizeof *input);
-+
-+    if (libinput_init(&input->base, interface,
-+        &simplyinterface_backend, user_data) != 0) {
-+            free(input);
-+            return NULL;
-+    }
-+
-+    return &input->base;
-+}
-+
-+void uhdfdevice_removed(struct uhdf *uhdf)
-+{
-+    evdev_device_remove(uhdf->device);
-+}
-+
-+int
-+uhdfdevice_added(struct libinput  *libinput,
-+		  struct uhdf *uhdf,
-+		  const char *seat_name)
-+{
-+    struct uhdf_input *input =(struct uhdf_input *)libinput;
-+	struct udev_seat *seat;
-+	struct evdev_device *device;
-+	const char *device_seat;
-+    device_seat = default_seat;
-+
-+	if (!seat_name)
-+		seat_name = default_seat_name;
-+
-+	seat = uhdf_seat_get_named(input, seat_name);
-+
-+	if (seat)
-+		libinput_seat_ref(&seat->base);
-+	else {
-+		seat = uhdf_seat_create(input, device_seat, seat_name);
-+		if (!seat)
-+		return -1;
-+	}
-+
-+	device = evdev_device_create(&seat->base, uhdf);
-+	libinput_seat_unref(&seat->base);
-+
-+	if (device == EVDEV_UNHANDLED_DEVICE) {
-+	    log_info(&input->base,
-+				  "- not using input device \n");
-+			return 0;
-+	} else if (device == NULL) {
-+		log_info(&input->base,
-+				  " - failed to create input device\n");
-+		return 0;
-+	}
-+
-+	uhdf->device = device;
-+    libinput->pipesbytesbyindex[uhdf->index] = 0;
-+    libinput->pipesstatus[uhdf->index] = false ;
-+	evdev_read_calibration_prop(device);
-+
-+    return 0;
-+}
-diff -Naur old/src/udev-seat.h new/src/udev-seat.h
---- old/src/udev-seat.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/udev-seat.h	2021-01-01 00:00:00.000000000 +0800
-@@ -41,4 +41,23 @@
- 	char *seat_id;
- };
-
-+struct quirks;
-+struct uhdf
-+{
-+    int index;
-+    int type;
-+    int modeltype;
-+    int prop;
-+    struct quirks *quirkpop;
-+    int nproperties;
-+    int (*fn)(int index,int code, void * iobuff);
-+    struct evdev_device *device;
-+    void * deviceinfo;
-+};
-+
-+struct uhdf_input {
-+	struct libinput base;
-+	char *seat_id;
-+};
-+
- #endif
-diff -Naur old/src/util-strings.h new/src/util-strings.h
---- old/src/util-strings.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/util-strings.h	2021-01-01 00:00:00.000000000 +0800
-@@ -281,7 +281,7 @@
- 	if (npairs == 0)
- 		goto error;
-
--	result = zalloc(npairs * sizeof *result);
-+	result = (struct key_value_double *)zalloc(npairs * sizeof *result);
-
- 	for (pair = pairs; *pair; pair++) {
- 		char **kv = strv_from_string(*pair, kv_separator);
-diff -Naur old/src/util-time.h new/src/util-time.h
---- old/src/util-time.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/util-time.h	2021-01-01 00:00:00.000000000 +0800
-@@ -97,7 +97,8 @@
- static inline struct human_time
- to_human_time(uint64_t us)
- {
--	struct human_time t;
-+	uint64_t l = 0;
-+	struct human_time t = {0, NULL};
- 	struct c {
- 		const char *unit;
- 		unsigned int change_from_previous;
-@@ -108,7 +109,7 @@
- 		{"s", 1000, 120},
- 		{"min", 60, 120},
- 		{"h", 60, 48},
--		{"d", 24, ~0},
-+		{"d", 24, ~l},
- 	};
- 	struct c *c;
- 	uint64_t value = us;
-@@ -121,6 +122,6 @@
- 			return t;
- 		}
- 	}
--
--	assert(!"We should never get here");
-+return t;
-+	//assert(1);
- }
-diff -Naur old/tools/libinput-debug-events.c new/tools/libinput-debug-events.c
---- old/tools/libinput-debug-events.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/tools/libinput-debug-events.c	2021-01-01 00:00:00.000000000 +0800
-@@ -274,6 +274,10 @@
- 					   LIBINPUT_DEVICE_CAP_SWITCH))
- 		printq("S");
-
-+    if (libinput_device_has_capability(dev,
-+        LIBINPUT_DEVICE_CAP_JOYSTICK))
-+        printq("JOYSTICK");
-+
- 	if (libinput_device_get_size(dev, &w, &h) == 0)
- 		printq("  size %.0fx%.0fmm", w, h);
-
-diff -Naur old/udev/libinput-device-group.c new/udev/libinput-device-group.c
---- old/udev/libinput-device-group.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/udev/libinput-device-group.c	2021-01-01 00:00:00.000000000 +0800
-@@ -138,7 +138,7 @@
- 				*product_id = pid;
- 				best_dist = dist;
-
--				free(*phys_attr);
-+				free((char*)*phys_attr);
- 				*phys_attr = strdup(phys);
- 			}
- 		}
diff --git a/patch/diff_mtdev_hdf/BUILD.gn b/patch/diff_mtdev_hdf/BUILD.gn
deleted file mode 100644
index 5f51caf69c..0000000000
--- a/patch/diff_mtdev_hdf/BUILD.gn
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright (c) 2021-2022 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build/ohos.gni")
-
-gen_src_dir = "//third_party/mtdev"
-gen_dst_dir = root_out_dir + "/diff_mtdev_hdf"
-patches_root_dir = "//foundation/multimodalinput/input/patch"
-build_gn_dir = "$patches_root_dir/diff_mtdev_hdf"
-
-action("apply_patch") {
-  visibility = [ ":*" ]
-  script = "$patches_root_dir/apply_patch.sh"
-  inputs = [ "$gen_src_dir" ]
-  outputs = [
-    "$gen_dst_dir/include",
-    "$gen_dst_dir/src",
-    "$gen_dst_dir/src/caps.c",
-    "$gen_dst_dir/src/core.c",
-    "$gen_dst_dir/src/iobuf.c",
-    "$gen_dst_dir/src/match.c",
-    "$gen_dst_dir/src/match_four.c",
-  ]
-  args = [
-    rebase_path(gen_src_dir, root_build_dir),
-    rebase_path(gen_dst_dir, root_build_dir),
-    rebase_path(build_gn_dir, root_build_dir),
-  ]
-}
-
-config("libmtdev_config") {
-  visibility = [ ":*" ]
-
-  include_dirs = [ "$gen_dst_dir/src" ]
-
-  cflags = [
-    "-Wno-unused-parameter",
-    "-Wno-sign-compare",
-  ]
-}
-
-config("libmtdev_public_config") {
-  include_dirs = [ "$gen_dst_dir/include" ]
-
-  cflags = []
-}
-
-ohos_source_set("patch_gen_mtdev-third") {
-  sources = [
-    "$gen_dst_dir/src/caps.c",
-    "$gen_dst_dir/src/core.c",
-    "$gen_dst_dir/src/iobuf.c",
-    "$gen_dst_dir/src/match.c",
-    "$gen_dst_dir/src/match_four.c",
-  ]
-
-  configs = [ ":libmtdev_config" ]
-
-  deps = [ ":apply_patch" ]
-
-  public_deps = []
-}
-
-ohos_shared_library("libmtdev-hdf") {
-  sources = []
-
-  configs = [ ":libmtdev_config" ]
-
-  deps = []
-
-  public_deps = [ ":patch_gen_mtdev-third" ]
-
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-}
diff --git a/patch/diff_mtdev_hdf/mtdev_hdf_0000.diff b/patch/diff_mtdev_hdf/mtdev_hdf_0000.diff
deleted file mode 100644
index 9544c1dbce..0000000000
--- a/patch/diff_mtdev_hdf/mtdev_hdf_0000.diff
+++ /dev/null
@@ -1,251 +0,0 @@
-Copyright (c) 2021-2022 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
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-diff -Naur old/BUILD.gn new/BUILD.gn
---- old/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
-+++ new/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
-@@ -23,7 +23,7 @@
-   ]
- }
-
--ohos_shared_library("libmtdev") {
-+ohos_shared_library("libmtdev-hdf") {
-   sources = [
-     "src/caps.c",
-     "src/core.c",
-diff -Naur old/include/mtdev.h new/include/mtdev.h
---- old/include/mtdev.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/include/mtdev.h	2021-01-01 00:00:00.000000000 +0800
-@@ -77,6 +77,21 @@
- #define MT_ID_MIN	0
- #define MT_ID_MAX	65535
-
-+typedef int (*mtdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-+
-+/**
-+ * mtdev_new_open - create and open a new mtdev
-+ * @fd: file descriptor of the kernel device
-+ *
-+ * Create a new mtdev and open the conversion.
-+ *
-+ * Returns zero in case of failure.
-+ *
-+ * This call combines the plumbing functions mtdev_new() and
-+ * mtdev_open().
-+ */
-+struct mtdev *mtdev_new_open_hdi(int fd,mtdev_ioctl func);
-+
- /**
-  * mtdev_new_open - create and open a new mtdev
-  * @fd: file descriptor of the kernel device
-diff -Naur old/src/caps.c new/src/caps.c
---- old/src/caps.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/caps.c	2021-01-01 00:00:00.000000000 +0800
-@@ -35,6 +35,8 @@
- #define LONG_BITS (sizeof(long) * 8)
- #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS)
-
-+typedef int (*mtdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-+
- static inline int getbit(const unsigned long *map, int key)
- {
- 	return (map[key / LONG_BITS] >> (key % LONG_BITS)) & 0x01;
-@@ -47,6 +49,13 @@
- 	return rc >= 0;
- }
-
-+static int hdigetabs(struct input_absinfo *abs, int key, int fd,mtdev_ioctl func)
-+{
-+	int rc;
-+	rc = func(fd, EVIOCGABS(key), abs);
-+	return rc >= 0;
-+}
-+
- static struct input_absinfo *get_info(struct mtdev *dev, int code)
- {
- 	int ix;
-@@ -70,6 +79,13 @@
- 	mtdev_set_mt_event(dev, code, has);
- }
-
-+static void hdiset_info(struct mtdev *dev, int code,
-+						  const unsigned long *bits, int fd,mtdev_ioctl func)
-+{
-+		int has = getbit(bits, code) && hdigetabs(get_info(dev, code), code, fd,func);
-+		mtdev_set_mt_event(dev, code, has);
-+}
-+
- static void default_fuzz(struct mtdev *dev, int code, int sn)
- {
- 	struct input_absinfo *abs = get_info(dev, code);
-@@ -78,6 +94,29 @@
- 	abs->fuzz = (abs->maximum - abs->minimum) / sn;
- }
-
-+static int hdimtdev_set_slots(struct mtdev *dev, int fd,mtdev_ioctl func)
-+{
-+	struct { unsigned code; int values[DIM_FINGER]; } req;
-+	struct mtdev_state *state = dev->state;
-+	int rc, i, s, nslot;
-+
-+	nslot = mtdev_get_abs_maximum(dev, ABS_MT_SLOT) + 1;
-+
-+	for (i = 0; i < MT_ABS_SIZE; i++) {
-+		req.code = mtdev_mt2abs(i);
-+		if (!mtdev_has_mt_event(dev, req.code))
-+			continue;
-+		rc = func(fd, EVIOCGMTSLOTS(sizeof(req)), &req);
-+		if (rc < 0)
-+			return rc;
-+		for (s = 0; s < DIM_FINGER && s < nslot; s++)
-+			set_sval(&state->data[s], i, req.values[s]);
-+	}
-+
-+	return 0;
-+}
-+
-+
- static int mtdev_set_slots(struct mtdev *dev, int fd)
- {
- 	struct { unsigned code; int values[DIM_FINGER]; } req;
-@@ -99,6 +138,48 @@
-
- 	return 0;
- }
-+
-+int mtdev_configure_hdi(struct mtdev *dev, int fd,mtdev_ioctl func)
-+{
-+	unsigned long absbits[NLONGS(ABS_MAX)];
-+	int rc, i;
-+
-+	rc = func(fd, EVIOCGBIT(EV_ABS, sizeof(absbits)), absbits);
-+	if (rc < 0)
-+		return rc;
-+
-+	hdiset_info(dev, ABS_MT_SLOT, absbits, fd,func);
-+	for (i = 0; i < MT_ABS_SIZE; i++)
-+		hdiset_info(dev, mtdev_mt2abs(i), absbits, fd,func);
-+
-+	dev->has_mtdata = mtdev_has_mt_event(dev, ABS_MT_POSITION_X) &&
-+		mtdev_has_mt_event(dev, ABS_MT_POSITION_Y);
-+
-+	if (!mtdev_has_mt_event(dev, ABS_MT_POSITION_X))
-+		hdigetabs(get_info(dev, ABS_MT_POSITION_X), ABS_X, fd,func);
-+	if (!mtdev_has_mt_event(dev, ABS_MT_POSITION_Y))
-+		hdigetabs(get_info(dev, ABS_MT_POSITION_Y), ABS_Y, fd,func);
-+	if (!mtdev_has_mt_event(dev, ABS_MT_PRESSURE))
-+		hdigetabs(get_info(dev, ABS_MT_PRESSURE), ABS_PRESSURE, fd,func);
-+
-+	if (!mtdev_has_mt_event(dev, ABS_MT_TRACKING_ID)) {
-+		mtdev_set_abs_minimum(dev, ABS_MT_TRACKING_ID, MT_ID_MIN);
-+		mtdev_set_abs_maximum(dev, ABS_MT_TRACKING_ID, MT_ID_MAX);
-+	}
-+
-+	default_fuzz(dev, ABS_MT_POSITION_X, SN_COORD);
-+	default_fuzz(dev, ABS_MT_POSITION_Y, SN_COORD);
-+	default_fuzz(dev, ABS_MT_TOUCH_MAJOR, SN_WIDTH);
-+	default_fuzz(dev, ABS_MT_TOUCH_MINOR, SN_WIDTH);
-+	default_fuzz(dev, ABS_MT_WIDTH_MAJOR, SN_WIDTH);
-+	default_fuzz(dev, ABS_MT_WIDTH_MINOR, SN_WIDTH);
-+	default_fuzz(dev, ABS_MT_ORIENTATION, SN_ORIENT);
-+
-+	if (dev->has_slot)
-+		hdimtdev_set_slots(dev, fd,func);
-+
-+	return 0;
-+}
-
- int mtdev_configure(struct mtdev *dev, int fd)
- {
-diff -Naur old/src/common.h new/src/common.h
---- old/src/common.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/common.h	2021-01-01 00:00:00.000000000 +0800
-@@ -95,6 +95,8 @@
-  */
- #define LEGACY_API_NUM_MT_AXES 11
-
-+typedef int (*mtdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-+
- /**
-  * struct mtdev - represents an input MT device
-  * @has_mtdata: true if the device has MT capabilities
-diff -Naur old/src/core.c new/src/core.c
---- old/src/core.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/core.c	2021-01-01 00:00:00.000000000 +0800
-@@ -36,6 +36,8 @@
- #define input_event_usec time.tv_usec
- #endif
-
-+typedef int (*mtdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-+
- static inline int istouch(const struct mtdev_slot *data,
- 			  const struct mtdev *dev)
- {
-@@ -382,6 +384,36 @@
- 	return ret;
- }
-
-+extern int mtdev_configure_hdi(struct mtdev *dev, int fd,mtdev_ioctl func);
-+
-+struct mtdev *mtdev_new_open_hdi(int fd,mtdev_ioctl func)
-+{
-+	struct mtdev *dev;
-+	int ret;
-+
-+	dev = mtdev_new();
-+	if (!dev)
-+		return NULL;
-+
-+	if (!dev || fd < 0)
-+		goto error;
-+
-+	ret = mtdev_init(dev);
-+	if (ret)
-+		goto error;
-+	ret = mtdev_configure_hdi(dev, fd,func);
-+
-+	if (ret)
-+		goto error;
-+
-+	return dev;
-+
-+error:
-+	mtdev_close(dev);
-+	mtdev_delete(dev);
-+	return NULL;
-+}
-+
- struct mtdev *mtdev_new_open(int fd)
- {
- 	struct mtdev *dev;
-diff -Naur old/src/iobuf.c new/src/iobuf.c
---- old/src/iobuf.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/iobuf.c	2021-01-01 00:00:00.000000000 +0800
-@@ -65,6 +65,17 @@
- 	return evbuf_empty(&dev->state->outbuf);
- }
-
-+int mtdev_count(struct mtdev *dev)
-+{
-+	return dev->state->outbuf.head - dev->state->outbuf.tail;
-+}
-+
-+
-+int mtdev_countin(struct mtdev *dev)
-+{
-+	return dev->state->inbuf.head - dev->state->inbuf.tail;
-+}
-+
- void mtdev_get_event(struct mtdev *dev, struct input_event* ev)
- {
- 	evbuf_get(&dev->state->outbuf, ev);
diff --git a/service/hdf_adapter/include/hdf_event_manager.h b/service/hdf_adapter/include/hdf_event_manager.h
deleted file mode 100644
index c37c78295e..0000000000
--- a/service/hdf_adapter/include/hdf_event_manager.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef HDF_EVENT_MANAGER_H
-#define HDF_EVENT_MANAGER_H
-
-#include <functional>
-#include <iostream>
-#include <list>
-#include <map>
-
-#include "evdev.h"
-#include "input_type.h"
-#include "libinput.h"
-#include "nocopyable.h"
-
-#include "input_manager.h"
-#include "libinput_adapter.h"
-
-#define MAX_INPUT_DEVICE_COUNT MAX_INPUT_DEV_NUM
-#define TOTAL_INPUT_DEVICE_COUNT (2 * MAX_INPUT_DEV_NUM)
-#define TOTAL_INPUT_DEVICE_STATUS_COUNT (TOTAL_INPUT_DEVICE_COUNT + 1)
-#define IOCTL_CMD_MASK (0x3fff)
-#define IOCTL_CMD_SHIFT (16)
-#define USEC_PER_SEC (1000000)
-#define MAX_EVENT_PKG_NUM (256)
-
-namespace OHOS {
-namespace MMI {
-enum hdf_event_type {
-    HDF_NONE = 0,
-    HDF_EVENT,
-    HDF_ADD_DEVICE,
-    HDF_RMV_DEVICE,
-};
-struct Devcmd {
-    int32_t index { 0 };
-    int32_t cmd { 0 };
-};
-class HdfEventManager {
-public:
-    static int32_t EvdevSimIoctl(int32_t hdindex, int32_t pcmd, void *iobuff);
-    static int32_t EvdevIoctl(int32_t hdiindex, int32_t pcmd, void *iobuff);
-    static void HotPlugCallback(const HotPlugEvent *event);
-    static void GetEventCallback(const KeyEventNormalize **pkgs, uint32_t count, uint32_t devIndex);
-    static int32_t DeviceAddHandle(uint32_t devIndex, uint32_t devType);
-    static int32_t DeviceRemoveHandle(uint32_t devIndex, uint32_t devType);
-    static libinput *HdfLibinputInit();
-    static int32_t HdfDevHandle(int32_t index, hdf_event_type cmd);
-    HdfEventManager();
-    DISALLOW_COPY_AND_MOVE(HdfEventManager);
-    virtual ~HdfEventManager();
-    bool Init();
-    void SetupCallback();
-    bool OpenHdfDevice(uint32_t devIndex, bool oper);
-    int32_t GetDeviceCount();
-    int32_t GetJectDeviceCount();
-    void AddDevice(uint32_t devIndex, uint32_t typeIndex);
-    int32_t HdfdevtypeMapLibinputType(uint32_t devIndex, uint32_t devType);
-private:
-    static HdfEventManager *globleThis_;
-    libinput *hdiinput_ { nullptr };
-    std::list<uhdf *> hdflist_;
-    bool devStatus[TOTAL_INPUT_DEVICE_STATUS_COUNT] { false };
-    DevDesc mountDevIndex_[TOTAL_INPUT_DEVICE_COUNT];
-    IInputInterface *inputInterface_ { nullptr };
-    IInputInterface *injectInterface_ { nullptr };
-    InputEventCb eventCallBack_;
-    InputHostCb  hostPlugCallBack_;
-};
-
-extern HdfEventManager  hdfEventManager;
-} // namespace MMI
-} // namespace OHOS
-#endif // HDF_EVENT_MANAGER_H
\ No newline at end of file
diff --git a/service/hdf_adapter/include/hdf_inject_init.h b/service/hdf_adapter/include/hdf_inject_init.h
deleted file mode 100644
index 2c03ce1da5..0000000000
--- a/service/hdf_adapter/include/hdf_inject_init.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef HDF_INJECT_INIT_H
-#define HDF_INJECT_INIT_H
-enum  DrvType {
-    TOUCH = 0,
-    MOUSE,
-    KEYBOARD,
-    PEN,
-    PAD,
-    FINGER,
-    JOYSTICK,
-    SWITCH5,
-    TRACKPAD5,
-    GAMEPAD,
-    TRACKBALL,
-    INVALD = 100,
-};
-#endif // HDF_INJECT_INIT_H
\ No newline at end of file
diff --git a/service/hdf_adapter/include/lib_hdf.h b/service/hdf_adapter/include/lib_hdf.h
deleted file mode 100644
index 668d22d85f..0000000000
--- a/service/hdf_adapter/include/lib_hdf.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef LIB_HDF_H
-#define LIB_HDF_H
-extern int32_t GetInputInterfaceFromInject(IInputInterface** interface);
-#define hdfbit(y_) (1UL << (y_))
-
-enum hdf_device_tags {
-    HDF_INPUT       = hdfbit(0),
-    HDF_KEYBOARD        = hdfbit(1),
-    HDF_MOUSE       = hdfbit(2),
-    HDF_TOUCHPAD        = hdfbit(3),
-    HDF_TOUCHSCREEN = hdfbit(4),
-    HDF_TABLET      = hdfbit(5),
-    HDF_JOYSTICK        = hdfbit(6),
-    HDF_ACCELEROMETER   = hdfbit(7),
-    HDF_TABLET_PAD  = hdfbit(8),
-    HDF_POINTINGSTICK   = hdfbit(9),
-    HDF_TRACKBALL   = hdfbit(10),
-    HDF_SWITCH      = hdfbit(11),
-};
-
-enum io_ctl_cmd {
-    IO_BITS     = 0x20,
-    IO_KEYBITS      = 0x21,
-    IO_RELBITS      = 0x22,
-    IO_ABSBITS      = 0x23,
-    IO_MSCBITS  = 0x24,
-    IO_SWBITS       = 0x25,
-    IO_LEDBITS      = 0x31,
-    IO_SNDBITS  = 0x32,
-    IO_FFBITS   = 0x35,
-    IO_PROPBITS = 0x9,
-    IO_KEYVALUES    = 0x18,
-    IO_LEDVALUES    = 0x19,
-    IO_SWVALUES     = 0x1b,
-    IO_NAMES        = 0x6,
-    IO_MTVABS       = 0xa,
-    IO_IDS      = 0x2,
-    IO_ABSBEGIN     = 0x40,
-    IO_ABEND        = 0x80,
-};
-#endif // LIB_HDF_H
\ No newline at end of file
diff --git a/service/hdf_adapter/src/hdf_event_manager.cpp b/service/hdf_adapter/src/hdf_event_manager.cpp
deleted file mode 100644
index ae80e9029e..0000000000
--- a/service/hdf_adapter/src/hdf_event_manager.cpp
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "hdf_event_manager.h"
-
-#include <cstring>
-#include <ctime>
-#include <thread>
-
-#include <sys/time.h>
-#include <unistd.h>
-
-#include "hdf_inject_init.cpp"
-#include "lib_hdf.h"
-#include "define_multimodal.h"
-#include "mmi_log.h"
-#include "util.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "HdfEventManager"};
-} // namespace
-
-HdfEventManager *HdfEventManager::m_globleThis;
-int32_t HdfEventManager::EvdevSimIoctl(int32_t hdindex, int32_t pcmd, void *iobuff)
-{
-    const int32_t size = (pcmd >> IOCTL_CMD_SHIFT) & IOCTL_CMD_MASK;
-    int32_t cmd = pcmd & 0xff;
-
-    MMI_HILOGD("evdev_simioctl index:%{public}d,cmd:%{public}02x,size:%{public}d,"
-               "pcmd:%{public}04x", hdindex, cmd, size, pcmd);
-    DrvType drvtype = g_index2DrvType[hdindex - MAX_INPUT_DEVICE_COUNT];
-    MMI_HILOGD("evdev_simioctl drvtype:%{public}d", drvtype);
-    if (drvtype >= INVALD) {
-        MMI_HILOGE("Unknown device type");
-        return 0;
-    }
-    for (const auto &item : m_globleThis->hdflist_) {
-        if (item.index == hdindex) {
-            break;
-        }
-    }
-    const int32_t iobuffSize = size;
-    errno_t ret = 0;
-    switch (cmd) {
-        case IO_BITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayBits[drvtype], size);
-            break;
-        }
-        case IO_KEYBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayKeyBits[drvtype], size);
-            break;
-        }
-        case IO_RELBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayRelBits[drvtype], size);
-            break;
-        }
-        case IO_ABSBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayAbsBits[drvtype], size);
-            break;
-        }
-        case IO_MSCBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayMscBits[drvtype], size);
-            break;
-        }
-        case IO_SWBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arraySwBits[drvtype], size);
-            break;
-        }
-        case IO_LEDBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayLedBits[drvtype], size);
-            break;
-        }
-        case IO_SNDBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arraySndBits[drvtype], size);
-            break;
-        }
-        case IO_PROPBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayPropsBits[drvtype], size);
-            break;
-        }
-        case IO_KEYVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayKeyValues[drvtype], size);
-            break;
-        }
-        case IO_LEDVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayLedValues[drvtype], size);
-            break;
-        }
-        case IO_SWVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arraySwValues[drvtype], size);
-            break;
-        }
-        case IO_MTVABS: {
-            break;
-        }
-        case IO_IDS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayIds[drvtype], size);
-            break;
-        }
-        case IO_FFBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayFfBits[drvtype], size);
-            break;
-        }
-        default: {
-            if (cmd >= IO_ABSBEGIN && cmd < IO_ABEND) {
-                ret = memcpy_s(iobuff, iobuffSize, &g_arrayAxisInfo[drvtype][cmd - IO_ABSBEGIN], size);
-            }
-            break;
-        }
-    }
-    if (ret != EOK) {
-        MMI_HILOGE("Call memcpy_s failed, cmd = %d, ret = %d", cmd, ret);
-    }
-    return RET_OK;
-}
-int32_t HdfEventManager::EvdevIoctl(int32_t hdiindex, int32_t pcmd, void *iobuff)
-{
-    int32_t size = (pcmd >> IOCTL_CMD_SHIFT) & IOCTL_CMD_MASK;
-    int32_t cmd = pcmd & 0xff;
-    MMI_HILOGD("index:%{public}d,cmd:%{public}02x,size:%{public}d,"
-        "pcmd:%{public}04x", hdiindex, cmd, size, pcmd);
-    DeviceInfo *deviceinfo = nullptr;
-    for (const auto &item : globleThis_->hdflist_) {
-        if (item.index == hdiindex) {
-            deviceinfo = static_cast<DeviceInfo*>(item->deviceinfo);
-            break;
-        }
-    }
-    if (deviceinfo == nullptr) {
-        MMI_HILOGE("Deviceinfo is null");
-        return 0;
-    }
-    const int32_t iobuffSize = size;
-    errno_t ret = 0;
-    switch (cmd) {
-        case IO_BITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.eventType, size);
-            break;
-        }
-        case IO_KEYBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.keyCode, size);
-            break;
-        }
-        case IO_RELBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.relCode, size);
-            break;
-        }
-        case IO_ABSBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.absCode, size);
-            break;
-        }
-        case IO_MSCBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.miscCode, size);
-            break;
-        }
-        case IO_SWBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.switchCode, size);
-            break;
-        }
-        case IO_LEDBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.ledCode, size);
-            break;
-        }
-        case IO_SNDBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.forceCode, size);
-            break;
-        }
-        case IO_PROPBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.devProp, size);
-            break;
-        }
-        case IO_KEYVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.keyType, size);
-            break;
-        }
-        case IO_LEDVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.ledType, size);
-            break;
-        }
-        case IO_SWVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.switchType, size);
-            break;
-        }
-        case IO_MTVABS: {
-            break;
-        }
-        case IO_IDS: {
-            ret = memcpy_s(iobuff, iobuffSize, &deviceinfo->attrSet.id, size);
-            break;
-        }
-        case IO_FFBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &deviceinfo->abilitySet.forceCode, size);
-            break;
-        }
-        default: {
-            if (cmd >= IO_ABSBEGIN && cmd < IO_ABEND) {
-                ret = memcpy_s(iobuff, iobuffSize, &deviceinfo->attrSet.axisInfo[cmd - IO_ABSBEGIN], size);
-            }
-            break;
-        }
-    }
-    if (ret != EOK) {
-        MMI_HILOGE("Call memcpy_s failed, cmd = %d, ret = %d", cmd, ret);
-    }
-    return 0;
-}
-
-HdfEventManager::HdfEventManager()
-{
-    globleThis_ = this;
-    hdiinput_ = nullptr;
-}
-HdfEventManager::~HdfEventManager()
-{
-    uint32_t ret = inputInterface_->iInputReporter->UnregisterHotPlugCallback();
-    if (ret == INPUT_SUCCESS) {
-        MMI_HILOGI("%{public}s:%{public}d INPUT_SUCCESS", __func__, __LINE__);
-    } else {
-        MMI_HILOGE("%{public}s:%{public}d INPUT_ERROR", __func__, __LINE__);
-    }
-}
-int32_t HdfEventManager::HdfdevtypeMapLibinputType(uint32_t devIndex, uint32_t devType)
-{
-    if (devIndex >= MAX_INPUT_DEVICE_COUNT) {
-        MMI_HILOGE("The maximum number of devices exceeded, devIndex:%{public}d", devIndex);
-        return devType;
-    }
-    int32_t ret = 0;
-    switch (devType) {
-        case INDEV_TYPE_TOUCH: {
-            ret = HDF_INPUT | HDF_TOUCHSCREEN;
-            break;
-        }
-        case INDEV_TYPE_MOUSE: {
-            ret = HDF_INPUT | HDF_MOUSE;
-            break;
-        }
-        case INDEV_TYPE_KEYBOARD: {
-            ret = HDF_INPUT | HDF_KEYBOARD;
-            break;
-        }
-        default: {
-            ret = devType;
-            break;
-        }
-    }
-    return ret;
-}
-#ifdef  OHOS_BUILD_HDF
-int32_t HdfEventManager::GetDeviceCount()
-{
-    errno_t ret = memset_s(mountDevIndex_, sizeof(DevDesc) * TOTAL_INPUT_DEVICE_COUNT, 0,
-                           sizeof(DevDesc) * TOTAL_INPUT_DEVICE_COUNT);
-    if (ret != EOK) {
-        MMI_HILOGE("Call memset_s failed. ret = %d", ret);
-    }
-    int32_t devcount = 0;
-    if (inputInterface_ != nullptr || inputInterface_->iInputManager != nullptr) {
-        int32_t ret = inputInterface_->iInputManager->ScanInputDevice(MAX_INPUT_DEVICE_COUNT, mountDevIndex_);
-        if (ret) {
-            MMI_HILOGE("%{public}s:%{public}d Error:ScanInputDevice failed", __func__, __LINE__);
-            return 0;
-        }
-
-        for (int32_t i = 0; i < MAX_INPUT_DEVICE_COUNT; i++) {
-            if (mountDevIndex_[i].devIndex != 0) {
-                devcount = devcount + 1;
-            }
-        }
-    }
-    int32_t jectcount = 0;
-    if (injectInterface_ != nullptr || injectInterface_->iInputManager != nullptr) {
-        int32_t ret = injectInterface_->iInputManager->ScanInputDevice(MAX_INPUT_DEVICE_COUNT,
-                                                                       &mountDevIndex_[devcount]);
-        if (ret) {
-            MMI_HILOGE("%{public}s:%{public}d Error:injectInterface_ ScanInputDevice failed",
-                __func__, __LINE__);
-            return devcount;
-        }
-
-        for (int32_t i = 0; i < MAX_INPUT_DEVICE_COUNT; i++) {
-            if (mountDevIndex_[devcount + i].devIndex != 0) {
-                jectcount = jectcount + 1;
-            }
-        }
-    }
-    return devcount + jectcount;
-}
-void HdfEventManager::SetupCallback()
-{
-    MMI_HILOGD("%{public}s:%{public}d ThreadSetupCallback start", __func__, __LINE__);
-    uint32_t ret = GetInputInterface(&inputInterface_);
-    if (ret != 0 || inputInterface_ == nullptr
-        || inputInterface_->iInputManager == nullptr
-        || inputInterface_->iInputReporter == nullptr) {
-        MMI_HILOGD("%{public}s:%{public}d inputInterface_ init failed", __func__, __LINE__);
-    }
-
-    ret = GetInputInterfaceFromInject(&injectInterface_);
-    if (ret != 0 || injectInterface_ == nullptr
-        || injectInterface_->iInputManager == nullptr
-        || injectInterface_->iInputReporter == nullptr) {
-        MMI_HILOGD("%{public}s:%{public}d injectInterface_ init failed", __func__, __LINE__);
-    }
-
-    eventCallBack_.EventPkgCallback = globleThis_->GetEventCallback;
-    hostPlugCallBack_.HotPlugCallback = globleThis_->HotPlugCallback;
-    if (inputInterface_) {
-        ret = inputInterface_->iInputReporter->RegisterHotPlugCallback(&hostPlugCallBack_);
-        if (ret == INPUT_SUCCESS) {
-            MMI_HILOGI("%{public}s:%{public}d RegisterHotPlugCallback INPUT_SUCCESS", __func__, __LINE__);
-        } else {
-            MMI_HILOGE("%{public}s:%{public}d RegisterHotPlugCallback INPUT_ERROR", __func__, __LINE__);
-        }
-    }
-
-    if (injectInterface_) {
-        ret = injectInterface_->iInputReporter->RegisterHotPlugCallback(&hostPlugCallBack_);
-        if (ret == INPUT_SUCCESS) {
-            MMI_HILOGI("%{public}s:%{public}d injectInterface_ RegisterHotPlugCallback INPUT_SUCCESS",
-                __func__, __LINE__);
-        } else {
-            MMI_HILOGE("%{public}s:%{public}d injectInterface_ RegisterHotPlugCallback INPUT_ERROR",
-                __func__, __LINE__);
-        }
-    }
-
-    int32_t count = GetDeviceCount();
-    MMI_HILOGD("ThreadSetupCallback count:%{public}d",                                 count);
-    for (int32_t i = 0; i < count; i++) {
-        DeviceAddHandle(mountDevIndex_[i].devIndex, mountDevIndex_[i].devType);
-    }
-}
-
-void HdfEventManager::AddDevice(uint32_t devIndex, uint32_t devType)
-{
-    uint32_t ret = 0;
-    if (devIndex >= MAX_INPUT_DEVICE_COUNT) {
-        ret = injectInterface_->iInputReporter->RegisterReportCallback(devIndex, &eventCallBack_);
-        return;
-    }
-    if (!OpenHdfDevice(devIndex, true)) {
-        return;
-    }
-    ret = inputInterface_->iInputReporter->RegisterReportCallback(devIndex, &eventcallback);
-    if (ret == INPUT_SUCCESS) {
-        MMI_HILOGI("%{public}s:%{public}d RegisterReportCallback eventcallback INPUT_SUCCESS"
-            "devindex:%{public}u, devType:%{public}u", __func__, __LINE__, devIndex, devType);
-    } else {
-        MMI_HILOGE("%{public}s:%{public}d RegisterReportCallback eventcallback INPUT_ERROR"
-            "devindex:%{public}u,devType:%{public}u", __func__, __LINE__, devIndex, devType);
-    }
-}
-bool HdfEventManager::OpenHdfDevice(uint32_t devIndex, bool oper)
-{
-    if (devIndex >= MAX_INPUT_DEVICE_COUNT) {
-        return true;
-    }
-    int32_t ret = -1;
-    if (oper) {
-        ret = inputInterface_->iInputManager->OpenInputDevice(devIndex);
-    } else {
-        ret = inputInterface_->iInputManager->CloseInputDevice(devIndex);
-    }
-    if (ret == 0) {
-        MMI_HILOGI("%{public}s:%{public}d Info: device success!", __func__, __LINE__);
-        return true;
-    }
-
-    if (ret != 0) {
-        MMI_HILOGE("%{public}s:%{public}d Error: device fail! code:%{public}u", __func__, __LINE__, ret);
-    }
-    return false;
-}
-void HdfEventManager::HotPlugCallback(const HotPlugEvent *event)
-{
-    MMI_HILOGD("%{public}s:%{public}d HotPlugCallback status:%{public}u,devindex:%{public}u"
-        "devType:%{public}u", __func__, __LINE__, event->status, event->devIndex, event->devType);
-
-    if (!event->status) {
-        DeviceAddHandle(event->devIndex, event->devType);
-    } else {
-        DeviceRemoveHandle(event->devIndex, event->devType);
-    }
-}
-int32_t HdfEventManager::DeviceRemoveHandle(uint32_t devIndex, uint32_t devType)
-{
-    MMI_HILOGD("%{public}s:%{public}d DeviceRemoveHandle devindex:%{public}u,devType:%{public}u",
-        __func__, __LINE__, devIndex, devType);
-    Devcmd cmd;
-    cmd.index = devIndex;
-    cmd.cmd = static_cast<int32_t>(HDF_RMV_DEVICE);
-    libinput_devpipe_write(m_globleThis->hdiinput_, &cmd, sizeof(Devcmd));
-    if (devIndex < MAX_INPUT_DEVICE_COUNT) {
-        uint32_t ret = m_globleThis->inputInterface_->iInputReporter->UnregisterReportCallback(devIndex);
-        if (ret == INPUT_SUCCESS) {
-            MMI_HILOGI("%{public}s:%{public}d REMOVE_SUCCESS devindex:%{public}u,devType:%{public}u",
-                __func__, __LINE__, devIndex, devType);
-        } else {
-            MMI_HILOGE("%{public}s:%{public}d REMOVE_ERROR devindex:%{public}u,devType:%{public}u",
-                __func__, __LINE__, devIndex, devType);
-        }
-    }
-    globleThis_->OpenHdfDevice(devIndex, false);
-    return RET_OK;
-}
-
-
-void HdfEventManager::GetEventCallback(const KeyEventNormalize **pkgs, uint32_t count, uint32_t devIndex)
-{
-    static constexpr uint16_t byteSize = 8;
-    CHKPV(pkgs);
-    struct input_event eventarry[MAX_EVENT_PKG_NUM];
-    for (uint32_t i = 0; i < count && i < MAX_EVENT_PKG_NUM; i++) {
-        eventarry[i].code = pkgs[i]->code;
-        eventarry[i].type = (pkgs[i]->type) | static_cast<uint16_t>(devIndex<<byteSize);
-        eventarry[i].value = pkgs[i]->value;
-        eventarry[i].input_event_sec = (pkgs[i]->timestamp) / (USEC_PER_SEC);
-        eventarry[i].input_event_usec = (pkgs[i]->timestamp) % (USEC_PER_SEC);
-    }
-    if (!globleThis_->devStatus[devIndex]) {
-        return;
-    }
-    libinput_pipe_write(globleThis_->hdiinput_, devIndex, eventarry, count * sizeof(struct input_event));
-}
-
-int32_t HdfEventManager::DeviceAddHandle(uint32_t devIndex, uint32_t devType)
-{
-    MMI_HILOGD("%{public}s:%{public}d DeviceAddHandle devindex:%{public}u,devType:%{public}u",
-        __func__, __LINE__, devIndex, devType);
-    globleThis_->devStatus[devIndex] = false;
-    uhdf *hdiuhdf = nullptr;
-    hdiuhdf = new(uhdf);
-    hdiuhdf->index = devIndex;
-    hdiuhdf->type = globleThis_->HdfdevtypeMapLibinputType(devIndex, devType);
-    hdiuhdf->nproperties = 0;
-    hdiuhdf->quirkpop = nullptr;
-    hdiuhdf->modeltype = 0;
-    hdiuhdf->fn = (hdiuhdf->index >= MAX_INPUT_DEV_NUM) ? EvdevSimIoctl : EvdevIoctl;
-    globleThis_->hdflist_.push_back(hdiuhdf);
-    Devcmd cmd;
-    cmd.index = devIndex;
-    cmd.cmd = static_cast<int32_t>(HDF_ADD_DEVICE);
-    libinput_devpipe_write(globleThis_->hdiinput_, &cmd, sizeof(Devcmd));
-    return RET_OK;
-}
-constexpr struct libinput_interface _hdfinterface = {
-    .open_restricted = [](const char *path, int32_t flags, void *user_data)->int32_t {
-        int32_t fd = -1;
-        MMI_HILOGI("libinput .open_restricted path:%{public}s,fd:%{public}d", path, fd);
-        return fd < 0 ? -errno : fd;
-    },
-    .close_restricted = [](int32_t fd, void *user_data)
-    {
-        MMI_HILOGI("libinput .close_restricted fd:%{public}d", fd);
-    },
-};
-libinput *HdfEventManager::HdfLibinputInit()
-{
-    if (globleThis_->hdiinput_ == nullptr) {
-        globleThis_->hdiinput_ = libinput_hdf_create_context(&_hdfinterface, nullptr);
-    }
-    MMI_HILOGD("HdfLibinputInit function end");
-    return globleThis_->hdiinput_;
-}
-int32_t HdfEventManager::HdfDevHandle(int32_t index, hdf_event_type cmd)
-{
-    if (cmd != HDF_ADD_DEVICE) {
-        MMI_HILOGD("HdfRmv function start");
-        uhdf *hdiuhdf = nullptr;
-        for (std::list<uhdf*>::iterator it = globleThis_->hdflist_.begin();
-             it != globleThis_->hdflist_.end(); ++it) {
-            uhdf *hdiuhdfit = *it;
-            if (hdiuhdfit->index == static_cast<int32_t>(index)) {
-                hdiuhdf = *it;
-                globleThis_->hdflist_.remove(*it);
-                break;
-            }
-        }
-        if (hdiuhdf == nullptr) {
-            return RET_OK;
-        }
-        uhdfdevice_removed(hdiuhdf);
-        delete(hdiuhdf);
-        return RET_OK;
-    }
-
-    uhdf *hdiuhdf = nullptr;
-    for (std::list<uhdf*>::iterator it = globleThis_->hdflist_.begin();
-        it != globleThis_->hdflist_.end(); ++it) {
-        uhdf *hdiuhdfit = *it;
-        if (hdiuhdfit->index != static_cast<int32_t>(index)) {
-            continue;
-        }
-
-        hdiuhdf = *it;
-        DeviceInfo *deviceinfo = nullptr;
-        globleThis_->AddDevice(index, hdiuhdf->type);
-        if (index < MAX_INPUT_DEVICE_COUNT) {
-            uint32_t ret = globleThis_->inputInterface_->iInputManager->GetInputDevice(index, &deviceinfo);
-            if (ret != 0 || (deviceinfo == nullptr)) {
-                MMI_HILOGE("%{public}s:%{public}d inputInterface_ GetInputDevice ret:%{public}d",
-                           __func__, __LINE__, ret);
-                return RET_ERR;
-            }
-            hdiuhdf->deviceinfo = (void*)deviceinfo;
-        }
-        uhdfdevice_added(globleThis_->hdiinput_, hdiuhdf, "default");
-        globleThis_->devStatus[index] = true;
-        return RET_OK;
-    }
-    return RET_OK;
-}
-bool HdfEventManager::Init()
-{
-    return true;
-}
-HdfEventManager  hdfEventManager;
-extern "C" libinput *HdfAdfInit()
-{
-    MMI_HILOGD("HdfAdfInit function start");
-    return hdfEventManager.HdfLibinputInit();
-}
-
-extern "C" int32_t HdfDevHandle(int32_t index, hdf_event_type cmd)
-{
-    MMI_HILOGD("HdfDevHandle function start index:%{public}d,cmd:%{public}d", index, cmd);
-    return hdfEventManager.HdfDevHandle(index, cmd);
-}
-#endif
-} // namespace MMI
-} // namespace OHOS
\ No newline at end of file
diff --git a/service/hdf_adapter/src/hdf_inject_init.cpp b/service/hdf_adapter/src/hdf_inject_init.cpp
deleted file mode 100644
index a2c812dad7..0000000000
--- a/service/hdf_adapter/src/hdf_inject_init.cpp
+++ /dev/null
@@ -1,767 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "hdf_inject_init.h"
-
-static DrvType g_index2DrvType[] = {
-    MOUSE, KEYBOARD, TOUCH, PEN, PAD, INVALD, FINGER, JOYSTICK, INVALD, INVALD, KEYBOARD, SWITCH5, TRACKPAD5, GAMEPAD
-};
-static short g_arrayIds[][4] = {
-    {3, 24582, 24582, 1}, {3, 24582, 24582, 1}, {3, 24582, 24582, 1}, {3, 1386, 914, 272},
-    {3, 1386, 914, 272}, {3, 1386, 914, 272}, {3, 1386, 914, 272}, {3, 1386, 914, 272},
-    {3, 1386, 914, 272}, {3, 1386, 914, 272}
-};
-static uint32_t g_arrayBits[] = {
-    11, 7, 31, 27, 11, 43, 31, 1179671, 23, 31s
-};
-static uint32_t g_arrayPropsBits[] = {
-    2, 0, 0, 1, 0, 1, 0, 0, 0, 0
-};
-static uint32_t g_arrayKeyBits[][24] = {
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1024, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 1073741824, 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff, 0, 0, 0, 0, 0, 0, 0, 0,
-     0, 0, 0, 0, 0},
-    {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-     0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-     0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7903, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 127, 0, 2048, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58656, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 65535, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-     2031617, 0, 0, 3209970758, 397407021, 75759615, 0, 0, 0, 0, 196863, 0, 0, 0, 0, 0},
-    {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-     2031616, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-};
-static uint32_t g_arrayRelBits[] = {
-    0, 2307, 64, 0, 0, 0, 0, 323, 323, 0
-};
-static uint32_t g_arrayAbsBits[][2] = {
-    {16777219, 124977152},
-    { 0, 0},
-    { 0, 1},
-    {251658503, 256},
-    {259, 256},
-    {3, 41123840},
-    {196707, 0},
-    {0, 1},
-    {0, 0},
-    {198207, 0},
-};
-static uint32_t g_arrayLedBits[] = {
-    0, 0, 0, 0, 0, 0, 0, 7, 7, 0
-};
-static uint32_t g_arraySwBits[] = {
-    0, 0, 0, 0, 0, 16384, 0, 0, 0, 0
-};
-static uint32_t g_arrayMscBits[] = {
-    0, 0, 16, 1, 0, 0, 16, 16, 16, 0
-};
-static uint32_t g_arrayFfBits[][4] = {
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-};
-static uint32_t g_arraySndBits[] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-static uint32_t g_arrayLedValues[] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-static uint32_t g_arraySwValues[] = {
-    0, 0, 0, 0, 0, 16384, 0, 0, 0, 0
-};
-static uint32_t g_arrayKeyValues[][24] = {
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16384, 0, 6400, 0, 0, 4000, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-};
-static input_absinfo g_arrayAxisInfo[][64] = {
-    {
-        {0, 0, 480, 0, 0, 0},
-        {0, 0, 960, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 100, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 1, 0, 0, 0},
-        {0, 0, 1, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, -90, 90, 0, 0, 0},
-        {0, 0, 480, 0, 0, 0},
-        {0, 0, 960, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 10, 0, 0, 0},
-        {0, 0, 9, 0, 0, 0},
-        {0, 0, 100, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 1300, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 31920, 4, 0, 200},
-        {0, 0, 19950, 4, 0, 200},
-        {0, -900, 899, 0, 0, 287},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 2047, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 8191, 0, 0, 0},
-        {0, 0, 63, 0, 0, 0},
-        {0, -64, 63, 0, 0, 57},
-        {0, -64, 63, 0, 0, 57},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, -2147483648, 2147483647, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 1, 0, 0, 0},
-        {0, 0, 1, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 71, 0, 0, 11 },
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 6400, 0, 0, 40},
-        {0, 0, 4000, 0, 0, 40},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 9, 0, 0, 0},
-        {0, 0, 21, 0, 0, 2},
-        {0, 0, 21, 0, 0, 2},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 1, 0, 0, 0},
-        {0, 0, 6400, 0, 0, 40},
-        {0, 0, 4000, 0, 0, 40},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 65535, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 16383, 63, 1023, 0},
-        {0, 0, 16383, 63, 1023, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, -1, 1, 0, 0, 0},
-        {0, -1, 1, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 572, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, -32768, 32767, 16, 128, 0},
-        {0, -32768, 32767, 16, 128, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, -1, 1, 0, 0, 0},
-        {0, -1, 1, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-};
diff --git a/service/hdf_adapter/test/.gitkeep b/service/hdf_adapter/test/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/service/hdi_inject/include/hdi_inject.h b/service/hdi_inject/include/hdi_inject.h
deleted file mode 100644
index 0e9c588a37..0000000000
--- a/service/hdi_inject/include/hdi_inject.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef HDI_INJECT_H
-#define HDI_INJECT_H
-#ifdef OHOS_BUILD_HDF
-
-#include <list>
-#include <vector>
-
-#include "input_type.h"
-
-#include "input_manager.h"
-#include "uds_server.h"
-
-namespace OHOS {
-namespace MMI {
-class HdiInject final {
-    DECLARE_DELAYED_SINGLETON(HdiInject);
-
-enum HdiInfoType {
-    GET_STATUS_INFO = 1001,
-    SET_HOT_PLUGS = 1002,
-    SET_EVENT_INJECT = 1003,
-    GET_DEVICE_INFO = 1004,
-    SHOW_DEVICE_INFO = 1005,
-    REPLY_STATUS_INFO = 2001,
-};
-
-enum HdiDeviceStatus {
-    HDI_DEVICE_ADD_STATUS = 0,
-    HDI_DEVICE_REMOVE_STATUS = 1,
-};
-
-struct DeviceInformation {
-    bool status { false };
-    int32_t devIndex { 0 };
-    int32_t devType { 0 };
-    int16_t fd { 0 };
-    char chipName[32];
-};
-public:
-    DISALLOW_COPY_AND_MOVE(HdiInject);
-    bool Init(UDSServer &sess);
-    void StartHdiserver();
-    void ShowAllDeviceInfo();
-    void InitDeviceInfo();
-    int32_t GetDeviceCount();
-    bool SyncDeviceHotStatus();
-    bool ReportHotPlugEvent();
-    void OnInitHdiServerStatus();
-    int32_t GetDevTypeIndex(int32_t devIndex);
-    int32_t GetDevIndexType(int32_t devType);
-    int32_t ManageHdfInject(const MMI::SessionPtr sess, MMI::NetPacket &pkt);
-    void OnSetHotPlugs(uint32_t devIndex, uint32_t devSatatus);
-    int32_t OnSetEventInject(const RawInputEvent& allEvent, int32_t devType);
-    bool SetDeviceHotStatus(int32_t devIndex, int32_t status);
-    int32_t ScanInputDevice(uint32_t arrLen, DevDesc *staArr);
-    bool ReportHotPlugEvent(uint32_t devIndex, uint32_t status);
-public:
-    InputHostCb hotPlugcallback_;
-    InputEventCb eventcallback_;
-private:
-    bool initStatus_ { false };
-    HotPlugEvent** event_ { nullptr };
-    MMI::UDSServer* udsServerPtr_ { nullptr };
-    std::vector<DeviceInformation> deviceArray_ = {};
-};
-
-#define MMIHdiInject ::OHOS::DelayedSingleton<HdiInject>::GetInstance()
-} // namespace MMI
-} // namespace OHOS
-#endif // OHOS_BUILD_HDF
-#endif // HDI_INJECT_H
\ No newline at end of file
diff --git a/service/hdi_inject/src/hdi_inject.cpp b/service/hdi_inject/src/hdi_inject.cpp
deleted file mode 100644
index 75566c9675..0000000000
--- a/service/hdi_inject/src/hdi_inject.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "hdi_inject.h"
-
-#include <iostream>
-
-#include "singleton.h"
-
-#include "define_multimodal.h"
-#include "proto.h"
-#include "util.h"
-
-
-#ifdef OHOS_BUILD_HDF
-using namespace std;
-using namespace OHOS::MMI;
-
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "HdiInject" };
-constexpr int32_t HDF_MOUSE_DEV_TYPE = 5;
-constexpr int32_t HDF_KEYBOARD_DEV_TYPE = 3;
-constexpr int32_t HDF_TOUCH_DEV_TYPE = 17;
-constexpr int32_t HDF_TABLET_DEV_TYPE = 33;
-constexpr int32_t HDF_TABLET_PAD_DEV_TYPE = 289;
-constexpr int32_t HDF_SWITH_PAD_DEV_TYPE = 2089;
-constexpr int32_t HDF_TOUCH_FINGER_DEV_TYPE = 2089;
-constexpr int32_t HDF_SWITCH_DEV_TYPE = 7;
-constexpr int32_t HDF_TRACK_PAD_DEV_TYPE = 7;
-constexpr int32_t HDF_JOYSTICK_DEV_TYPE = 65;
-constexpr int32_t HDF_GAMEPAD_DEV_TYPE = 65;
-constexpr int32_t HDF_TOUCH_PAD_DEV_TYPE = 5;
-constexpr int32_t HDF_TRACK_BALL_DEV_TYPE = 3;
-constexpr int32_t HDF_DEVICE_FD_DEFAULT_STATUS = -1;
-constexpr int32_t EVENT_PACKAGE_ARROW_SIZE = 1;
-} // namespace
-
-HdiInject::HdiInject() {}
-HdiInject::~HdiInject() {}
-
-bool HdiInject::Init(UDSServer &sess)
-{
-    udsServerPtr_ = &sess;
-    StartHdiserver();
-    return true;
-}
-
-int32_t HdiInject::ManageHdfInject(const SessionPtr sess, NetPacket &pkt)
-{
-    MMI_HILOGI("Into function ManageHdfInject");
-    int32_t sendType = 0;
-    pkt >> sendType;
-    uint32_t devIndex = 0;
-    uint32_t devSatatus = 0;
-    RawInputEvent speechEvent = {};
-    switch (sendType) {
-        case GET_STATUS_INFO: {
-            OnInitHdiServerStatus();
-            return RET_OK;
-        }
-        case SET_EVENT_INJECT: {
-            pkt >> devIndex >> speechEvent;
-            if (pkt.ChkRWError()) {
-                MMI_HILOGE("Packet read recv massage failed");
-                return RET_ERR;
-            }
-            MMI_HILOGI("Hdi server recv massage: devIndex:%{public}d", devIndex);
-            OnSetEventInject(speechEvent, devIndex);
-            return RET_OK;
-        }
-        case SHOW_DEVICE_INFO: {
-            ShowAllDeviceInfo();
-            return RET_OK;
-        }
-        case SET_HOT_PLUGS: {
-            pkt >> devIndex >> devSatatus;
-            if (pkt.ChkRWError()) {
-                MMI_HILOGE("Packet read tool hot data failed");
-                return RET_ERR;
-            }
-            MMI_HILOGI("Recv inject tool hot data, devIndex:%{public}d,status:%{public}d", devIndex, devSatatus);
-            OnSetHotPlugs(devIndex, devSatatus);
-            return RET_OK;
-        }
-        default: {
-            MMI_HILOGE("The message type:%{public}d cannot be processed", sendType);
-            return RET_ERR;
-        }
-    }
-}
-
-int32_t HdiInject::OnSetEventInject(const RawInputEvent& allEvent, int32_t devIndex)
-{
-    CALL_DEBUG_ENTER;
-    KeyEventNormalize* pack[EVENT_PACKAGE_ARROW_SIZE];
-    pack[0] = (KeyEventNormalize*)malloc(sizeof(KeyEventNormalize));
-    pack[0]->type = static_cast<int32_t>(allEvent.ev_type);
-    pack[0]->code = static_cast<uint32_t>allEvent.ev_code;
-    pack[0]->value = static_cast<int32_t>(allEvent.ev_value);
-    pack[0]->timestamp = static_cast<uint64_t>(GetSysClockTime());
-    MMIHdiInject->eventcallback_.EventPkgCallback((const KeyEventNormalize**)pack, 1, devIndex);
-    free(pack[0]);
-    return RET_OK;
-}
-
-void HdiInject::OnSetHotPlugs(uint32_t devIndex, uint32_t devSatatus)
-{
-    if (!(ReportHotPlugEvent(devIndex, devSatatus))) {
-        MMI_HILOGE("ReportHotPlugEvent failed");
-        return;
-    }
-    MMI_HILOGI("ReportHotPlugEvent success");
-}
-
-void HdiInject::InitDeviceInfo()
-{
-    DeviceInformation deviceInfoArray[] = {
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_POINTER_INDEX, HDF_MOUSE_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "mouse"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_KEYBOARD_INDEX, HDF_KEYBOARD_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "keyboard"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_TOUCH_INDEX, HDF_TOUCH_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "touch"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_TABLET_TOOL_INDEX, HDF_TABLET_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "pen"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_TABLET_PAD_INDEX, HDF_TABLET_PAD_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "pad"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_FINGER_INDEX, HDF_TOUCH_FINGER_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "finger"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_SWITCH_INDEX, HDF_SWITCH_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "knob"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_TRACKPAD5_INDEX, HDF_TRACK_PAD_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "trackPad"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_JOYSTICK_INDEX, HDF_JOYSTICK_DEV_TYPE,
-            HDF_DEVICE_FD_DEFAULT_STATUS, "joyStick"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_GAMEPAD_INDEX, HDF_GAMEPAD_DEV_TYPE,
-            HDF_DEVICE_FD_DEFAULT_STATUS, "gamePad"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_TOUCH_PAD, HDF_TOUCH_PAD_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "touchPad"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_REMOTE_CONTROL, HDF_TRACK_BALL_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "remoteControl"},
-    };
-    int32_t counts = sizeof(deviceInfoArray) / sizeof(DeviceInformation);
-    auto iter = deviceArray_.insert(deviceArray_.begin(), deviceInfoArray, deviceInfoArray + counts);
-    if (!iter.second) {
-        MMI_HILOGE("Insert value failed");
-    }
-}
-
-void HdiInject::StartHdiserver()
-{
-    initStatus_ = true;
-}
-
-void HdiInject::OnInitHdiServerStatus()
-{
-    StartHdiserver();
-}
-
-void HdiInject::ShowAllDeviceInfo()
-{
-    for (const auto &item : deviceArray_) {
-        MMI_HILOGI("deviceName:%{public}s,devIndex:%{public}d,status:%{public}d,devType:%{public}d",
-            item.chipName, item.devIndex, item.status, item.devType);
-    }
-}
-
-int32_t HdiInject::GetDeviceCount()
-{
-    return static_cast<int32_t>(deviceArray_.size());
-}
-
-bool HdiInject::SetDeviceHotStatus(int32_t devIndex, int32_t status)
-{
-    for (auto iter = deviceArray_.begin(); iter != deviceArray_.end(); ++iter) {
-        if (iter->devIndex == devIndex) {
-            if (iter->status == status) {
-                MMI_HILOGE("Failed to find status");
-                return false;
-            }
-            iter->status = ~status + 1;
-            return true;
-        }
-    }
-    return false;
-}
-
-bool HdiInject::SyncDeviceHotStatus()
-{
-    const uint16_t count = static_cast<uint16_t>(deviceArray_.size());
-    event_ = (HotPlugEvent**)malloc(count * sizeof(HotPlugEvent));
-    CHKPF(event_);
-    for (int32_t i = 0; i < count; i++) {
-        event_[i]->devIndex = deviceArray_[i].devIndex;
-        event_[i]->devType = deviceArray_[i].devType;
-        event_[i]->status = deviceArray_[i].status;
-        MMIHdiInject->hotPlugcallback_.HotPlugCallback((const HotPlugEvent*)&event_[i]);
-    }
-    return true;
-}
-
-bool HdiInject::ReportHotPlugEvent()
-{
-    SyncDeviceHotStatus();
-    MMIHdiInject->hotPlugcallback_.HotPlugCallback(*event_);
-    return true;
-}
-
-bool HdiInject::ReportHotPlugEvent(uint32_t devIndex, uint32_t status)
-{
-    if (!(SetDeviceHotStatus(devIndex, status))) {
-        MMI_HILOGE("SetDeviceHotStatus error devIndex:%{public}d,status:%{public}d", devIndex, status);
-        return false;
-    }
-    int32_t devType = GetDevTypeIndex(devIndex);
-    if (devType == -1) {
-        return false;
-    }
-    HotPlugEvent event = {
-        static_cast<uint32_t>(devIndex),
-        static_cast<uint32_t>(devType),
-        static_cast<uint32_t>(status)
-    };
-    MMIHdiInject->hotPlugcallback_.HotPlugCallback(&event);
-    return true;
-}
-
-int32_t HdiInject::GetDevTypeIndex(int32_t devIndex)
-{
-    for (const auto &item : deviceArray_) {
-        if (item.devIndex == devIndex) {
-            return item.devType;
-        }
-    }
-    return RET_ERR;
-}
-
-int32_t HdiInject::GetDevIndexType(int32_t devType)
-{
-    vector<DeviceInformation>::iterator iter;
-    for (const auto &item : deviceArray_) {
-        if (item.devType == devType) {
-            return item.devIndex;
-        }
-    }
-    return RET_ERR;
-}
-
-int32_t HdiInject::ScanInputDevice(uint32_t arrLen, DevDesc *staArr)
-{
-    uint16_t count = static_cast<uint16_t>(deviceArray_.size());
-    int32_t index = 0;
-    for (int i = 0; i < count; i++) {
-        if (deviceArray_[i].status == 1) {
-            continue;
-        }
-        staArr[index].devIndex = deviceArray_[i].devIndex;
-        staArr[index].devType = deviceArray_[i].devType;
-        index++;
-    }
-    return 0;
-}
-
-static int32_t ScanInputDevice(uint32_t arrLen, DevDesc *staArr)
-{
-    return MMIHdiInject->ScanInputDevice(arrLen, staArr);
-}
-
-static int32_t OpenInputDevice(uint32_t devIndex)
-{
-    return 0;
-}
-
-static int32_t CloseInputDevice(uint32_t devIndex)
-{
-    return 0;
-}
-
-static int32_t GetInputDevice(uint32_t devIndex, DeviceInfo **devInfo)
-{
-    return 0;
-}
-
-static int32_t GetInputDeviceList(uint32_t *devNum, DeviceInfo **devList, uint32_t size)
-{
-    return 0;
-}
-
-static int32_t SetPowerStatus(uint32_t devIndex, uint32_t status)
-{
-    return 0;
-}
-
-static int32_t GetPowerStatus(uint32_t devIndex, uint32_t *status)
-{
-    return 0;
-}
-
-static int32_t GetDeviceType(uint32_t devIndex, uint32_t *deviceType)
-{
-    return 0;
-}
-
-static int32_t GetChipInfo(uint32_t devIndex, char *chipInfo, uint32_t length)
-{
-    return 0;
-}
-
-static int32_t GetVendorName(uint32_t devIndex, char *vendorName, uint32_t length)
-{
-    return 0;
-}
-
-
-static int32_t GetChipName(uint32_t devIndex, char *chipName, uint32_t length)
-{
-    return 0;
-}
-
-static int32_t SetGestureMode(uint32_t devIndex, uint32_t gestureMode)
-{
-    return 0;
-}
-
-static int32_t RunCapacitanceTest(uint32_t devIndex, uint32_t testType, char *result, uint32_t length)
-{
-    return 0;
-}
-
-static int32_t RunExtraCommand(uint32_t devIndex, InputExtraCmd *cmd)
-{
-    return 0;
-}
-
-static int32_t RegisterReportCallback(uint32_t devIndex, InputEventCb *callback)
-{
-    MMIHdiInject->eventcallback_.EventPkgCallback = callback->EventPkgCallback;
-    return 0;
-}
-
-static int32_t UnregisterReportCallback(uint32_t devIndex)
-{
-    return 0;
-}
-
-static int32_t RegisterHotPlugCallback(InputHostCb *callback)
-{
-    MMIHdiInject->hotPlugcallback_.HotPlugCallback = callback->HotPlugCallback;
-    return 0;
-}
-
-static int32_t UnregisterHotPlugCallback(void)
-{
-    return 0;
-}
-
-static InputManager interfaceManager = {
-    .ScanInputDevice = ScanInputDevice,
-    .OpenInputDevice = OpenInputDevice,
-    .CloseInputDevice = CloseInputDevice,
-    .GetInputDevice = GetInputDevice,
-    .GetInputDeviceList = GetInputDeviceList,
-};
-
-static InputController interfaceControl = {
-    .SetPowerStatus = SetPowerStatus,
-    .GetPowerStatus = GetPowerStatus,
-    .GetDeviceType = GetDeviceType,
-    .GetChipInfo = GetChipInfo,
-    .GetVendorName = GetVendorName,
-    .GetChipName = GetChipName,
-    .SetGestureMode = SetGestureMode,
-    .RunCapacitanceTest = RunCapacitanceTest,
-    .RunExtraCommand = RunExtraCommand,
-};
-
-static InputReporter interfaceReport = {
-    .RegisterReportCallback = RegisterReportCallback,
-    .UnregisterReportCallback = UnregisterReportCallback,
-    .RegisterHotPlugCallback = RegisterHotPlugCallback,
-    .UnregisterHotPlugCallback = UnregisterHotPlugCallback,
-};
-
-int32_t GetInputInterfaceFromInject(IInputInterface **interface)
-{
-    MMIHdiInject->InitDeviceInfo();
-    int32_t ret = 0;
-    IInputInterface* injectInterface = new(IInputInterface);
-    *interface = injectInterface;
-    injectInterface->iInputController = &interfaceControl;
-    injectInterface->iInputManager = &interfaceManager;
-    injectInterface->iInputReporter = &interfaceReport;
-    return ret;
-}
-#endif
\ No newline at end of file
diff --git a/service/hdi_inject/test/hdi_inject_test.cpp b/service/hdi_inject/test/hdi_inject_test.cpp
deleted file mode 100644
index 27746d2b2f..0000000000
--- a/service/hdi_inject/test/hdi_inject_test.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include "define_multimodal.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-using namespace testing::ext;
-using namespace OHOS::MMI;
-} // namespace
-
-class HdiInjectTest : public testing::Test {
-public:
-    static void SetUpTestCase(void) {}
-    static void TearDownTestCase(void) {}
-};
-} // namespace MMI
-} // namespace OHOS
-- 
Gitee


From 88aee0cfb28514b5680d570020e014b55acc026b Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Thu, 20 Oct 2022 19:32:54 +0800
Subject: [PATCH 053/360] remove hdf marco in gn

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: I981a67547f185e44a4532f1040d5592e6938bb89
---
 service/BUILD.gn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/service/BUILD.gn b/service/BUILD.gn
index 998b54c4f2..d5f12d417d 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -627,7 +627,6 @@ ohos_unittest("ut-mmi-service-out") {
     "${mmi_path}/service/event_handler/include",
     "${mmi_path}/service/hdi_inject/include",
     "${mmi_path}/service/event_dump/include",
-    "${mmi_path}/service/hdf_adapter/include",
     "${mmi_path}/service/libinput_adapter/include",
     "${mmi_path}/service/message_handle/include",
     "${mmi_path}/service/module_loader/include",
-- 
Gitee


From bea8a1900c28901e81b5efa57ae3a5c32068c87e Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Thu, 20 Oct 2022 19:37:40 +0800
Subject: [PATCH 054/360] remove hdf marco in gn

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: I0a8ac1583705ba8fe62b35155e1cb018090b2bde
---
 service/event_dump/src/event_dump.cpp         |  3 --
 .../include/server_msg_handler.h              |  3 --
 .../message_handle/src/server_msg_handler.cpp | 33 -------------------
 .../test/server_msg_handler_test.cpp          |  8 -----
 service/module_loader/include/mmi_service.h   |  4 ---
 service/module_loader/src/mmi_service.cpp     |  7 ----
 6 files changed, 58 deletions(-)

diff --git a/service/event_dump/src/event_dump.cpp b/service/event_dump/src/event_dump.cpp
index 4d30ac2aa8..403c0a021c 100644
--- a/service/event_dump/src/event_dump.cpp
+++ b/service/event_dump/src/event_dump.cpp
@@ -55,9 +55,6 @@ void ChkConfig(int32_t fd)
 #ifdef OHOS_BUILD_LIBINPUT
     mprintf(fd, "OHOS_BUILD_LIBINPUT");
 #endif
-#ifdef OHOS_BUILD_HDF
-    mprintf(fd, "OHOS_BUILD_HDF");
-#endif
 #ifdef OHOS_BUILD_MMI_DEBUG
     mprintf(fd, "OHOS_BUILD_MMI_DEBUG");
 #endif // OHOS_BUILD_MMI_DEBUG
diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
index 48aa33d124..66fad64561 100644
--- a/service/message_handle/include/server_msg_handler.h
+++ b/service/message_handle/include/server_msg_handler.h
@@ -64,9 +64,6 @@ public:
 protected:
     int32_t MarkProcessed(SessionPtr sess, NetPacket& pkt);
     int32_t OnRegisterMsgHandler(SessionPtr sess, NetPacket& pkt);
-#ifdef OHOS_BUILD_HDF
-    int32_t OnHdiInject(SessionPtr sess, NetPacket& pkt);
-#endif
     int32_t OnDisplayInfo(SessionPtr sess, NetPacket& pkt);
 #ifdef OHOS_BUILD_MMI_DEBUG
     int32_t OnBigPacketTest(SessionPtr sess, NetPacket& pkt);
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index e4111e62a4..e8d36ec19c 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -34,9 +34,6 @@
 #include "mmi_func_callback.h"
 #include "mouse_event_normalize.h"
 #include "time_cost_chk.h"
-#ifdef OHOS_BUILD_HDF
-#include "hdi_inject.h"
-#endif
 
 namespace OHOS {
 namespace MMI {
@@ -51,21 +48,12 @@ ServerMsgHandler::~ServerMsgHandler() {}
 void ServerMsgHandler::Init(UDSServer& udsServer)
 {
     udsServer_ = &udsServer;
-#ifdef OHOS_BUILD_HDF
-    if (!(MMIHdiInject->Init(udsServer))) {
-        MMI_HILOGE("Input device initialization failed");
-        return;
-    }
-#endif
     MsgCallback funs[] = {
         {MmiMessageId::MARK_PROCESS, MsgCallbackBind2(&ServerMsgHandler::MarkProcessed, this)},
         {MmiMessageId::DISPLAY_INFO, MsgCallbackBind2(&ServerMsgHandler::OnDisplayInfo, this)},
 #ifdef OHOS_BUILD_MMI_DEBUG
         {MmiMessageId::BIGPACKET_TEST, MsgCallbackBind2(&ServerMsgHandler::OnBigPacketTest, this)},
 #endif // OHOS_BUILD_MMI_DEBUG
-#ifdef OHOS_BUILD_HDF
-        {MmiMessageId::HDI_INJECT, MsgCallbackBind2(&ServerMsgHandler::OnHdiInject, this)},
-#endif // OHOS_BUILD_HDF
     };
     for (auto &it : funs) {
         if (!RegistrationEvent(it)) {
@@ -91,27 +79,6 @@ void ServerMsgHandler::OnMsgHandler(SessionPtr sess, NetPacket& pkt)
     }
 }
 
-#ifdef OHOS_BUILD_HDF
-int32_t ServerMsgHandler::OnHdiInject(SessionPtr sess, NetPacket& pkt)
-{
-    MMI_HILOGI("Hdfinject server access hditools info");
-    CHKPR(sess, ERROR_NULL_POINTER);
-    CHKPR(udsServer_, ERROR_NULL_POINTER);
-    const int32_t processingCode = MMIHdiInject->ManageHdfInject(sess, pkt);
-    NetPacket pkt(MmiMessageId::HDI_INJECT);
-    pkt << processingCode;
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet write reply message failed");
-        return RET_ERR;
-    }
-    if (!sess->SendMsg(pkt)) {
-        MMI_HILOGE("OnHdiInject reply message error");
-        return RET_ERR;
-    }
-    return RET_OK;
-}
-#endif // OHOS_BUILD_HDF
-
 int32_t ServerMsgHandler::MarkProcessed(SessionPtr sess, NetPacket& pkt)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/message_handle/test/server_msg_handler_test.cpp b/service/message_handle/test/server_msg_handler_test.cpp
index 64c6c8c6a3..e77f0d90a4 100644
--- a/service/message_handle/test/server_msg_handler_test.cpp
+++ b/service/message_handle/test/server_msg_handler_test.cpp
@@ -32,14 +32,6 @@ public:
 
 class ServerMsgHandlerUnitTest : public ServerMsgHandler {
 public:
-
-#ifdef OHOS_BUILD_HDF
-    int32_t OnHdiInjectTest(SessionPtr sess, NetPacket& pkt)
-    {
-        return OnHdiInject(sess, pkt);
-    }
-#endif // OHOS_BUILD_HDF
-
     int32_t OnInjectKeyEventTest(SessionPtr sess, std::shared_ptr<KeyEvent> keyEvent)
     {
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index 701a6c12dd..b2a370f4b8 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -31,10 +31,6 @@
 #include "server_msg_handler.h"
 #include "uds_server.h"
 
-#ifdef OHOS_BUILD_HDF
-    #include "hdf_event_manager.h"
-#endif
-
 namespace OHOS {
 namespace MMI {
 
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 095119f40d..025ac874c6 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -87,9 +87,6 @@ static void CheckDefine()
 #ifdef OHOS_BUILD_LIBINPUT
     CheckDefineOutput("%-40s", "OHOS_BUILD_LIBINPUT");
 #endif
-#ifdef OHOS_BUILD_HDF
-    CheckDefineOutput("%-40s", "OHOS_BUILD_HDF");
-#endif
 #ifdef OHOS_BUILD_MMI_DEBUG
     CheckDefineOutput("%-40s", "OHOS_BUILD_MMI_DEBUG");
 #endif
@@ -186,10 +183,6 @@ bool MMIService::IsRunning() const
 
 bool MMIService::InitLibinputService()
 {
-#ifdef OHOS_BUILD_HDF
-    MMI_HILOGD("HDF Init");
-    hdfEventManager.SetupCallback();
-#endif
     if (!(libinputAdapter_.Init(std::bind(&InputEventHandler::OnEvent, InputHandler, std::placeholders::_1),
         DEF_INPUT_SEAT))) {
         MMI_HILOGE("Libinput init, bind failed");
-- 
Gitee


From 4d8beebdfa2a481f88f232c67fb81a0b8d243bf1 Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Thu, 20 Oct 2022 19:56:32 +0800
Subject: [PATCH 055/360] remove libinput in macro

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: I3dfe094499306e9e8cc10d520391533d329df967
---
 examples/mmi/BUILD.gn                       |   9 +-
 frameworks/napi/distributed_input/BUILD.gn  |   5 -
 frameworks/napi/input_consumer/BUILD.gn     |   5 -
 frameworks/napi/input_device/BUILD.gn       |   5 -
 frameworks/napi/input_event_client/BUILD.gn |   5 -
 frameworks/napi/input_monitor/BUILD.gn      |   4 -
 frameworks/napi/key_code/BUILD.gn           |   5 -
 frameworks/napi/key_event/BUILD.gn          |   5 -
 frameworks/napi/mouse_event/BUILD.gn        |   5 -
 frameworks/napi/pointer/BUILD.gn            |   5 -
 frameworks/napi/touch_event/BUILD.gn        |   5 -
 frameworks/proxy/BUILD.gn                   |  61 +--
 multimodalinput_mini.gni                    |   2 -
 patch/BUILD.gn                              |  15 +-
 patch/diff_libinput_mmi/BUILD.gn            | 539 ++++++++++----------
 service/BUILD.gn                            |  23 +-
 tools/event_inject/BUILD.gn                 |  32 +-
 tools/vuinput/BUILD.gn                      |  30 +-
 util/BUILD.gn                               |  22 +-
 19 files changed, 292 insertions(+), 490 deletions(-)

diff --git a/examples/mmi/BUILD.gn b/examples/mmi/BUILD.gn
index 6551af8459..6eb108855a 100644
--- a/examples/mmi/BUILD.gn
+++ b/examples/mmi/BUILD.gn
@@ -20,12 +20,9 @@ ohos_executable("mmi-server") {
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
     "//foundation/multimodalinput/input/service:libmmi-server",
     "//foundation/multimodalinput/input/util:libmmi-util",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
 
-  if (input_feature_libinput) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
-
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
@@ -39,10 +36,6 @@ ohos_executable("mmi-server") {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   install_enable = true
   part_name = "input"
   subsystem_name = "multimodalinput"
diff --git a/frameworks/napi/distributed_input/BUILD.gn b/frameworks/napi/distributed_input/BUILD.gn
index 301fecb5bf..63cea33fb9 100644
--- a/frameworks/napi/distributed_input/BUILD.gn
+++ b/frameworks/napi/distributed_input/BUILD.gn
@@ -23,11 +23,6 @@ if (input_feature_distributed) {
       "//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include",
       "${distributed_input_path}/include",
     ]
-
-    defines = []
-    if (input_feature_libinput) {
-      defines += [ "OHOS_BUILD_LIBINPUT" ]
-    }
   }
 
   ohos_shared_library("distributedinput") {
diff --git a/frameworks/napi/input_consumer/BUILD.gn b/frameworks/napi/input_consumer/BUILD.gn
index c89ae45b4f..6416ac0b79 100644
--- a/frameworks/napi/input_consumer/BUILD.gn
+++ b/frameworks/napi/input_consumer/BUILD.gn
@@ -22,11 +22,6 @@ config("inputconsumer_config") {
     "//foundation/multimodalinput/input/tools/event_inject/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
 }
 
 ohos_shared_library("inputconsumer") {
diff --git a/frameworks/napi/input_device/BUILD.gn b/frameworks/napi/input_device/BUILD.gn
index f4dd5a11be..5cff3fbdd9 100644
--- a/frameworks/napi/input_device/BUILD.gn
+++ b/frameworks/napi/input_device/BUILD.gn
@@ -24,11 +24,6 @@ config("inputdevice_config") {
     "//foundation/multimodalinput/input/frameworks/proxy/event_handler/include",
     "//foundation/multimodalinput/input/frameworks/proxy/module_loader/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
 }
 
 ohos_shared_library("inputdevice") {
diff --git a/frameworks/napi/input_event_client/BUILD.gn b/frameworks/napi/input_event_client/BUILD.gn
index d18251a758..72b6171970 100644
--- a/frameworks/napi/input_event_client/BUILD.gn
+++ b/frameworks/napi/input_event_client/BUILD.gn
@@ -23,11 +23,6 @@ config("inputeventclient_config") {
     "//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include",
     "//commonlibrary/c_utils/base/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
 }
 
 ohos_shared_library("inputeventclient") {
diff --git a/frameworks/napi/input_monitor/BUILD.gn b/frameworks/napi/input_monitor/BUILD.gn
index b8f6fd76f3..c65178b567 100644
--- a/frameworks/napi/input_monitor/BUILD.gn
+++ b/frameworks/napi/input_monitor/BUILD.gn
@@ -23,10 +23,6 @@ config("inputmonitor_config") {
   ]
 
   defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
diff --git a/frameworks/napi/key_code/BUILD.gn b/frameworks/napi/key_code/BUILD.gn
index 8e24a1ecaf..419b565071 100644
--- a/frameworks/napi/key_code/BUILD.gn
+++ b/frameworks/napi/key_code/BUILD.gn
@@ -22,11 +22,6 @@ config("keyCode_config") {
     "//foundation/multimodalinput/input/util/network/include",
     "//commonlibrary/c_utils/base/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
 }
 
 ohos_shared_library("keycode") {
diff --git a/frameworks/napi/key_event/BUILD.gn b/frameworks/napi/key_event/BUILD.gn
index 0047725087..18cba57691 100644
--- a/frameworks/napi/key_event/BUILD.gn
+++ b/frameworks/napi/key_event/BUILD.gn
@@ -22,11 +22,6 @@ config("keyEvent_config") {
     "//foundation/multimodalinput/input/util/network/include",
     "//commonlibrary/c_utils/base/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
 }
 
 ohos_shared_library("keyevent") {
diff --git a/frameworks/napi/mouse_event/BUILD.gn b/frameworks/napi/mouse_event/BUILD.gn
index b806e5c0b5..5bbbf920ca 100644
--- a/frameworks/napi/mouse_event/BUILD.gn
+++ b/frameworks/napi/mouse_event/BUILD.gn
@@ -22,11 +22,6 @@ config("mouseEvent_config") {
     "//foundation/multimodalinput/input/util/network/include",
     "//commonlibrary/c_utils/base/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
 }
 
 ohos_shared_library("mouseevent") {
diff --git a/frameworks/napi/pointer/BUILD.gn b/frameworks/napi/pointer/BUILD.gn
index eca502946a..3df7a24a75 100644
--- a/frameworks/napi/pointer/BUILD.gn
+++ b/frameworks/napi/pointer/BUILD.gn
@@ -21,11 +21,6 @@ config("pointer_config") {
     "//foundation/multimodalinput/input/util/common/include",
     "//foundation/multimodalinput/input/util/network/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
 }
 
 ohos_shared_library("pointer") {
diff --git a/frameworks/napi/touch_event/BUILD.gn b/frameworks/napi/touch_event/BUILD.gn
index bb99cebee6..173f2c7bcf 100644
--- a/frameworks/napi/touch_event/BUILD.gn
+++ b/frameworks/napi/touch_event/BUILD.gn
@@ -22,11 +22,6 @@ config("touchEvent_config") {
     "//foundation/multimodalinput/input/util/network/include",
     "//commonlibrary/c_utils/base/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
 }
 
 ohos_shared_library("touchevent") {
diff --git a/frameworks/proxy/BUILD.gn b/frameworks/proxy/BUILD.gn
index 597a1546a6..b8503a743b 100755
--- a/frameworks/proxy/BUILD.gn
+++ b/frameworks/proxy/BUILD.gn
@@ -175,11 +175,10 @@ ohos_shared_library("libmmi-client") {
 
 ohos_unittest("ut-mmi-proxy-out") {
   module_out_path = module_output_path
-  include_dirs = [ "//commonlibrary/c_utils/base/include" ]
-
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
+  include_dirs = [
+    "//commonlibrary/c_utils/base/include",
+    "$root_out_dir/diff_libinput_mmi/export_include",
+  ]
 
   defines = []
 
@@ -187,10 +186,6 @@ ohos_unittest("ut-mmi-proxy-out") {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   sources = [ "module_loader/test/mmi_client_test.cpp" ]
 
   configs = [ ":libmmi_test_util" ]
@@ -210,11 +205,10 @@ ohos_unittest("ut-mmi-proxy-out") {
 
 ohos_unittest("KeyEventTest") {
   module_out_path = module_output_path
-  include_dirs = [ "//commonlibrary/c_utils/base/include" ]
-
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
+  include_dirs = [
+    "//commonlibrary/c_utils/base/include",
+    "$root_out_dir/diff_libinput_mmi/export_include",
+  ]
 
   defines = []
 
@@ -222,10 +216,6 @@ ohos_unittest("KeyEventTest") {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/window_utils_test.cpp",
@@ -253,11 +243,10 @@ ohos_unittest("KeyEventTest") {
 
 ohos_unittest("InputManagerTest") {
   module_out_path = module_output_path
-  include_dirs = [ "${mmi_path}/frameworks/proxy/events/test" ]
-
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
+  include_dirs = [
+    "${mmi_path}/frameworks/proxy/events/test",
+    "$root_out_dir/diff_libinput_mmi/export_include",
+  ]
 
   defines = []
 
@@ -269,10 +258,6 @@ ohos_unittest("InputManagerTest") {
     defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   if (input_feature_keyboard) {
     defines += [ "OHOS_BUILD_ENABLE_KEYBOARD" ]
   }
@@ -320,11 +305,10 @@ ohos_unittest("InputManagerTest") {
 
 ohos_unittest("InputManagerManualTest") {
   module_out_path = module_output_path
-  include_dirs = [ "//commonlibrary/c_utils/base/include" ]
-
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
+  include_dirs = [
+    "//commonlibrary/c_utils/base/include",
+    "$root_out_dir/diff_libinput_mmi/export_include",
+  ]
 
   defines = []
 
@@ -332,10 +316,6 @@ ohos_unittest("InputManagerManualTest") {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   if (input_feature_mouse) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
   }
@@ -363,10 +343,7 @@ ohos_unittest("InputManagerManualTest") {
 
 ohos_unittest("PointerEventTest") {
   module_out_path = module_output_path
-
-  if (input_feature_libinput) {
-    include_dirs = [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
+  include_dirs = [ "$root_out_dir/diff_libinput_mmi/export_include" ]
 
   defines = []
 
@@ -374,10 +351,6 @@ ohos_unittest("PointerEventTest") {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   if (input_feature_mouse) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
   }
diff --git a/multimodalinput_mini.gni b/multimodalinput_mini.gni
index 81207338b2..2a4ee38666 100644
--- a/multimodalinput_mini.gni
+++ b/multimodalinput_mini.gni
@@ -16,7 +16,6 @@ import("//build/ohos.gni")
 mmi_path = "//foundation/multimodalinput/input"
 ability_runtime_path = "//foundation/ability/ability_runtime"
 ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits"
-input_feature_libinput = true
 input_feature_debug = false
 input_feature_distributed = false
 
@@ -43,7 +42,6 @@ if (input_feature_joystick) {
   input_feature_mouse = true
 }
 
-print("input_feature_libinput = ${input_feature_libinput}")
 print("input_feature_debug = ${input_feature_debug}")
 print("input_feature_combination_key = ${input_feature_combination_key}")
 print("input_feature_pointer_drawing = ${input_feature_pointer_drawing}")
diff --git a/patch/BUILD.gn b/patch/BUILD.gn
index 4921516d89..6915135e3d 100644
--- a/patch/BUILD.gn
+++ b/patch/BUILD.gn
@@ -18,15 +18,10 @@ group("patch_packages") {
   deps = [
     "diff_libinput_mmi:libinput-third-mmi",
     "prebuild_eudev:prebuild_eudev",
+    "prebuild_libinput:prebuild_libinput",
+    "//third_party/eudev:libudev",
+    "//third_party/eudev:udev_conf",
+    "//third_party/eudev:udevd",
+    "//third_party/eudev:udevd.rc",
   ]
-
-  if (input_feature_libinput) {
-    deps += [
-      "prebuild_libinput:prebuild_libinput",
-      "//third_party/eudev:libudev",
-      "//third_party/eudev:udev_conf",
-      "//third_party/eudev:udevd",
-      "//third_party/eudev:udevd.rc",
-    ]
-  }
 }
diff --git a/patch/diff_libinput_mmi/BUILD.gn b/patch/diff_libinput_mmi/BUILD.gn
index f8e0d5f8eb..35708afd30 100644
--- a/patch/diff_libinput_mmi/BUILD.gn
+++ b/patch/diff_libinput_mmi/BUILD.gn
@@ -63,23 +63,14 @@ action("apply_patch") {
     "$gen_dst_dir/tools/libinput-debug-events.c",
     "$gen_dst_dir/tools/libinput-list-devices.c",
     "$gen_dst_dir/tools/libinput-debug-tablet.c",
+    "$gen_dst_dir/hm_src/hm_missing.h",
+    "$gen_dst_dir/hm_src/hm_missing.c",
+    "$gen_dst_dir/tools/libinput-record.c",
+    "$gen_dst_dir/tools/libinput-analyze.c",
+    "$gen_dst_dir/tools/libinput-measure.c",
+    "$gen_dst_dir/tools/libinput-quirks.c",
   ]
 
-  if (input_feature_libinput) {
-    outputs += [
-      "$gen_dst_dir/hm_src/hm_missing.h",
-      "$gen_dst_dir/hm_src/hm_missing.c",
-
-      "$gen_dst_dir/tools/libinput-record.c",
-
-      "$gen_dst_dir/tools/libinput-analyze.c",
-
-      "$gen_dst_dir/tools/libinput-measure.c",
-
-      "$gen_dst_dir/tools/libinput-quirks.c",
-    ]
-  }
-
   args = [
     rebase_path(gen_src_dir, root_build_dir),
     rebase_path(gen_dst_dir, root_build_dir),
@@ -93,26 +84,18 @@ config("libinput-third_config") {
   include_dirs = [
     "$gen_dst_dir/src",
     "$gen_dst_dir/include",
+    "$gen_dst_dir/hm_src",
   ]
 
-  if (input_feature_libinput) {
-    include_dirs += [ "$gen_dst_dir/hm_src" ]
-  }
-
   cflags = [
     "-Wno-unused-parameter",
     "-Wno-implicit-int",
     "-Wno-return-type",
     "-Wno-unused-function",
     "-Wno-string-conversion",
+    "-DHAVE_LIBINPUT_LOG_CONSOLE_ENABLE",
+    "-DHAVE_LIBINPUT_LOG_ENABLE",
   ]
-
-  if (input_feature_libinput) {
-    cflags += [
-      "-DHAVE_LIBINPUT_LOG_CONSOLE_ENABLE",
-      "-DHAVE_LIBINPUT_LOG_ENABLE",
-    ]
-  }
 }
 
 config("libinput-third_public_config") {
@@ -172,14 +155,11 @@ ohos_source_set("patch_gen_libinput-third-mmi") {
 
   deps = [ ":apply_patch" ]
 
-  public_deps = [ "//third_party/eudev:libudev" ]
-
-  if (input_feature_libinput) {
-    public_deps += [
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 }
 
 ohos_shared_library("libinput-third-mmi") {
@@ -191,340 +171,335 @@ ohos_shared_library("libinput-third-mmi") {
 
   deps = [ ":patch_gen_libinput-third-mmi" ]
 
-  public_deps = [ "//third_party/eudev:libudev" ]
-
-  if (input_feature_libinput) {
-    public_deps += [
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
   part_name = "input"
   subsystem_name = "multimodalinput"
 }
 
-if (input_feature_libinput) {
-  ohos_source_set("patch_gen_libinput-debug") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/tools/libinput-debug-events.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-debug") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/tools/libinput-debug-events.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-debug-mmi") {
-    install_enable = true
+ohos_executable("libinput-debug-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-debug",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-debug",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+}
 
-  ohos_source_set("patch_gen_libinput-list") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/tools/libinput-list-devices.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-list") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/tools/libinput-list-devices.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-list-mmi") {
-    install_enable = true
+ohos_executable("libinput-list-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-list",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-list",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+}
 
-  ohos_source_set("patch_gen_libinput-tablet") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/tools/libinput-debug-tablet.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-tablet") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/tools/libinput-debug-tablet.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-tablet-mmi") {
-    install_enable = true
+ohos_executable("libinput-tablet-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-tablet",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-tablet",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+}
 
-  ohos_source_set("patch_gen_libinput-record") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/hm_src/hm_missing.c",
-      "$gen_dst_dir/tools/libinput-record.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-record") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/hm_src/hm_missing.c",
+    "$gen_dst_dir/tools/libinput-record.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-record-mmi") {
-    install_enable = true
+ohos_executable("libinput-record-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-record",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-record",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+}
 
-  ohos_source_set("patch_gen_libinput-analyze") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/tools/libinput-analyze.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-analyze") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/tools/libinput-analyze.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-analyze-mmi") {
-    install_enable = true
+ohos_executable("libinput-analyze-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-analyze",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-analyze",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+}
 
-  ohos_source_set("patch_gen_libinput-measure") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/tools/libinput-measure.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-measure") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/tools/libinput-measure.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-measure-mmi") {
-    install_enable = true
+ohos_executable("libinput-measure-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-measure",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-measure",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+}
 
-  ohos_source_set("patch_gen_libinput-quirks") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/tools/libinput-quirks.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-quirks") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/tools/libinput-quirks.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-quirks-mmi") {
-    install_enable = true
+ohos_executable("libinput-quirks-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-quirks",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-quirks",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
 }
diff --git a/service/BUILD.gn b/service/BUILD.gn
index d5f12d417d..48a5bbf1b3 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -68,10 +68,6 @@ config("libmmi_server_config") {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   if (input_feature_combination_key) {
     defines += [ "OHOS_BUILD_ENABLE_COMBINATION_KEY" ]
   }
@@ -541,12 +537,9 @@ ohos_shared_library("libmmi-server") {
     "//foundation/multimodalinput/input/util:libmmi-util",
     "//third_party/cJSON:cjson_static",
     "//third_party/json:nlohmann_json_static",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
 
-  if (input_feature_libinput) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
-
   if (resource_schedule_service_enabled) {
     deps += [ "//foundation/resourceschedule/resource_schedule_service/ressched/interfaces/innerkits/ressched_client:ressched_client" ]
   }
@@ -632,12 +625,9 @@ ohos_unittest("ut-mmi-service-out") {
     "${mmi_path}/service/module_loader/include",
     "${mmi_path}/service/window_manager/include",
     "${mmi_path}/uinput",
+    "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
-
   sources = [
     "event_dispatch/test/event_dispatch_test.cpp",
     "hdi_inject/test/hdi_inject_test.cpp",
@@ -652,10 +642,6 @@ ohos_unittest("ut-mmi-service-out") {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   if (input_feature_pointer_drawing) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
   }
@@ -680,12 +666,9 @@ ohos_unittest("ut-mmi-service-out") {
     "${mmi_path}/util:libmmi-util",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
 
-  if (input_feature_libinput) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
-
   external_deps = [
     "c_utils:utils",
     "drivers_interface_input:hdi_input",
diff --git a/tools/event_inject/BUILD.gn b/tools/event_inject/BUILD.gn
index 03f2da866c..63b86f04c4 100644
--- a/tools/event_inject/BUILD.gn
+++ b/tools/event_inject/BUILD.gn
@@ -31,10 +31,6 @@ config("event_injection_config") {
   if (input_feature_debug) {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
 }
 
 config("event_injection_public_config") {
@@ -77,12 +73,9 @@ ohos_source_set("event-injection") {
     "//foundation/multimodalinput/input/service/filter:mmi_event_filter_service",
     "//foundation/multimodalinput/input/util:libmmi-util",
     "//third_party/cJSON:cjson_static",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
 
-  if (input_feature_libinput) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
-
   external_deps = [ "ipc:ipc_core" ]
 
   part_name = "input"
@@ -124,12 +117,9 @@ ohos_unittest("ut-event-injection-out") {
     "${mmi_path}/service/window_manager/include",
     "${mmi_path}/tools/event_inject/include",
     "${mmi_path}/uinput",
+    "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
-
   sources = [
     "test/device_base_test.cpp",
     "test/get_device_node_test.cpp",
@@ -152,10 +142,6 @@ ohos_unittest("ut-event-injection-out") {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   deps = [
     "${mmi_path}/frameworks/proxy:libmmi-client",
     "${mmi_path}/service:libmmi-server",
@@ -164,12 +150,9 @@ ohos_unittest("ut-event-injection-out") {
     "//third_party/cJSON:cjson_static",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
 
-  if (input_feature_libinput) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
-
   external_deps = [
     "c_utils:utils",
     "hiviewdfx_hilog_native:libhilog",
@@ -185,21 +168,14 @@ ohos_executable("mmi-event-injection") {
   deps = [
     "//foundation/multimodalinput/input/tools/event_inject:event-injection",
     "//foundation/multimodalinput/input/util:libmmi-util",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
-
-  if (input_feature_libinput) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
   defines = []
 
   if (input_feature_debug) {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   install_enable = true
   part_name = "input"
   subsystem_name = "multimodalinput"
diff --git a/tools/vuinput/BUILD.gn b/tools/vuinput/BUILD.gn
index 8f863894e9..0961728417 100644
--- a/tools/vuinput/BUILD.gn
+++ b/tools/vuinput/BUILD.gn
@@ -29,10 +29,6 @@ config("libmmi_virtual_device_config") {
   if (input_feature_debug) {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
 }
 
 config("virtual_device_public_config") {
@@ -80,10 +76,6 @@ ohos_source_set("libmmi-virtual-device") {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   part_name = "input"
   subsystem_name = "multimodalinput"
   external_deps = [ "c_utils:utils" ]
@@ -96,21 +88,14 @@ ohos_executable("vuinput") {
 
   deps = [
     "//foundation/multimodalinput/input/tools/vuinput:libmmi-virtual-device",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
-
-  if (input_feature_libinput) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
   defines = []
 
   if (input_feature_debug) {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   install_enable = true
   part_name = "input"
   subsystem_name = "multimodalinput"
@@ -128,12 +113,9 @@ ohos_unittest("ut-virtual-device-out") {
     "${mmi_path}/util/network/include",
     "${mmi_path}/util/socket",
     "${mmi_path}/util/socket/include",
+    "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
-
   sources = [ "test/virtual_device_test.cpp" ]
 
   configs = [ ":virtual_device_public_config" ]
@@ -144,20 +126,14 @@ ohos_unittest("ut-virtual-device-out") {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   deps = [
     "${mmi_path}/tools/vuinput:libmmi-virtual-device",
     "${mmi_path}/util:libmmi-util",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
 
-  if (input_feature_libinput) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
   external_deps = [
     "c_utils:utils",
     "hiviewdfx_hilog_native:libhilog",
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 94de556152..f93fa627a4 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -31,10 +31,6 @@ config("libmmi_util_public_config") {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
@@ -96,22 +92,15 @@ ohos_unittest("ut-mmi-util-out") {
     "${mmi_path}/interfaces/native/innerkits/common/include",
     "${mmi_path}/interfaces/native/innerkits/proxy/include",
     "${mmi_path}/interfaces/native/innerkits/event/include",
+    "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
-
   defines = []
 
   if (input_feature_debug) {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
@@ -158,22 +147,15 @@ ohos_unittest("RunShellUtilTest") {
     "${mmi_path}/interfaces/native/innerkits/proxy/include",
     "${mmi_path}/interfaces/native/innerkits/event/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
+    "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
-
   defines = []
 
   if (input_feature_debug) {
     defines += [ "OHOS_BUILD_MMI_DEBUG" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
-- 
Gitee


From 782ece1cefba757ad97acfdf2208713eef705548 Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Thu, 20 Oct 2022 19:57:44 +0800
Subject: [PATCH 056/360] remove libinput in source

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: I983011f2b5bcfa34533158758af1727e75a76526
---
 service/event_dump/src/event_dump.cpp     | 3 ---
 service/module_loader/src/mmi_service.cpp | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/service/event_dump/src/event_dump.cpp b/service/event_dump/src/event_dump.cpp
index 403c0a021c..f54ac221a6 100644
--- a/service/event_dump/src/event_dump.cpp
+++ b/service/event_dump/src/event_dump.cpp
@@ -52,9 +52,6 @@ EventDump::~EventDump() {}
 void ChkConfig(int32_t fd)
 {
     mprintf(fd, "ChkMMIConfig: ");
-#ifdef OHOS_BUILD_LIBINPUT
-    mprintf(fd, "OHOS_BUILD_LIBINPUT");
-#endif
 #ifdef OHOS_BUILD_MMI_DEBUG
     mprintf(fd, "OHOS_BUILD_MMI_DEBUG");
 #endif // OHOS_BUILD_MMI_DEBUG
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 025ac874c6..40188e0324 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -84,9 +84,6 @@ void CheckDefineOutput(const char* fmt, Ts... args)
 static void CheckDefine()
 {
     CheckDefineOutput("ChkDefs:");
-#ifdef OHOS_BUILD_LIBINPUT
-    CheckDefineOutput("%-40s", "OHOS_BUILD_LIBINPUT");
-#endif
 #ifdef OHOS_BUILD_MMI_DEBUG
     CheckDefineOutput("%-40s", "OHOS_BUILD_MMI_DEBUG");
 #endif
-- 
Gitee


From c49f1153e0a46e91cd4d4b0eb7a64025ce1e28ec Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Thu, 20 Oct 2022 20:01:54 +0800
Subject: [PATCH 057/360] remove mmi_debug in gn

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: Ie4f786ad9146d8cc44adc4f4bf175a156c5d1283
---
 examples/mmi/BUILD.gn       |  6 ------
 frameworks/proxy/BUILD.gn   | 28 ----------------------------
 multimodalinput_mini.gni    |  2 --
 service/BUILD.gn            | 12 ------------
 tools/event_inject/BUILD.gn | 17 -----------------
 tools/vuinput/BUILD.gn      | 23 -----------------------
 util/BUILD.gn               | 16 ----------------
 7 files changed, 104 deletions(-)

diff --git a/examples/mmi/BUILD.gn b/examples/mmi/BUILD.gn
index 6eb108855a..86e778ac66 100644
--- a/examples/mmi/BUILD.gn
+++ b/examples/mmi/BUILD.gn
@@ -30,12 +30,6 @@ ohos_executable("mmi-server") {
     "samgr:samgr_proxy",
   ]
 
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   install_enable = true
   part_name = "input"
   subsystem_name = "multimodalinput"
diff --git a/frameworks/proxy/BUILD.gn b/frameworks/proxy/BUILD.gn
index b8503a743b..8cdbe0bc8c 100755
--- a/frameworks/proxy/BUILD.gn
+++ b/frameworks/proxy/BUILD.gn
@@ -66,10 +66,6 @@ ohos_source_set("libmmi-common") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
@@ -103,10 +99,6 @@ ohos_shared_library("libmmi-client") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   if (input_feature_pointer_drawing) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
   }
@@ -182,10 +174,6 @@ ohos_unittest("ut-mmi-proxy-out") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   sources = [ "module_loader/test/mmi_client_test.cpp" ]
 
   configs = [ ":libmmi_test_util" ]
@@ -212,10 +200,6 @@ ohos_unittest("KeyEventTest") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/window_utils_test.cpp",
@@ -250,10 +234,6 @@ ohos_unittest("InputManagerTest") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   if (input_feature_pointer_drawing) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
   }
@@ -312,10 +292,6 @@ ohos_unittest("InputManagerManualTest") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   if (input_feature_mouse) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
   }
@@ -347,10 +323,6 @@ ohos_unittest("PointerEventTest") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   if (input_feature_mouse) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
   }
diff --git a/multimodalinput_mini.gni b/multimodalinput_mini.gni
index 2a4ee38666..643d2bbf75 100644
--- a/multimodalinput_mini.gni
+++ b/multimodalinput_mini.gni
@@ -16,7 +16,6 @@ import("//build/ohos.gni")
 mmi_path = "//foundation/multimodalinput/input"
 ability_runtime_path = "//foundation/ability/ability_runtime"
 ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits"
-input_feature_debug = false
 input_feature_distributed = false
 
 declare_args() {
@@ -42,7 +41,6 @@ if (input_feature_joystick) {
   input_feature_mouse = true
 }
 
-print("input_feature_debug = ${input_feature_debug}")
 print("input_feature_combination_key = ${input_feature_combination_key}")
 print("input_feature_pointer_drawing = ${input_feature_pointer_drawing}")
 print("input_feature_monitor = ${input_feature_monitor}")
diff --git a/service/BUILD.gn b/service/BUILD.gn
index 48a5bbf1b3..d32796e5b5 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -64,10 +64,6 @@ config("libmmi_server_config") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   if (input_feature_combination_key) {
     defines += [ "OHOS_BUILD_ENABLE_COMBINATION_KEY" ]
   }
@@ -638,10 +634,6 @@ ohos_unittest("ut-mmi-service-out") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   if (input_feature_pointer_drawing) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
   }
@@ -688,10 +680,6 @@ ohos_unittest("TransformPointTest") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   deps = [
     "${mmi_path}/tools/vuinput:libmmi-virtual-device",
     "//third_party/googletest:gmock_main",
diff --git a/tools/event_inject/BUILD.gn b/tools/event_inject/BUILD.gn
index 63b86f04c4..70d2a84041 100644
--- a/tools/event_inject/BUILD.gn
+++ b/tools/event_inject/BUILD.gn
@@ -25,12 +25,6 @@ config("event_injection_config") {
     "//foundation/multimodalinput/input/util/common/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/common/include",
   ]
-
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
 }
 
 config("event_injection_public_config") {
@@ -136,12 +130,6 @@ ohos_unittest("ut-event-injection-out") {
     "test/send_message_test.cpp",
   ]
 
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   deps = [
     "${mmi_path}/frameworks/proxy:libmmi-client",
     "${mmi_path}/service:libmmi-server",
@@ -170,11 +158,6 @@ ohos_executable("mmi-event-injection") {
     "//foundation/multimodalinput/input/util:libmmi-util",
     "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
 
   install_enable = true
   part_name = "input"
diff --git a/tools/vuinput/BUILD.gn b/tools/vuinput/BUILD.gn
index 0961728417..00e1e00ee9 100644
--- a/tools/vuinput/BUILD.gn
+++ b/tools/vuinput/BUILD.gn
@@ -23,12 +23,6 @@ config("libmmi_virtual_device_config") {
     "//commonlibrary/c_utils/base/include",
     "//util/common/include",
   ]
-
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
 }
 
 config("virtual_device_public_config") {
@@ -70,12 +64,6 @@ ohos_source_set("libmmi-virtual-device") {
 
   configs = [ ":libmmi_virtual_device_config" ]
 
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   part_name = "input"
   subsystem_name = "multimodalinput"
   external_deps = [ "c_utils:utils" ]
@@ -90,11 +78,6 @@ ohos_executable("vuinput") {
     "//foundation/multimodalinput/input/tools/vuinput:libmmi-virtual-device",
     "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
 
   install_enable = true
   part_name = "input"
@@ -120,12 +103,6 @@ ohos_unittest("ut-virtual-device-out") {
 
   configs = [ ":virtual_device_public_config" ]
 
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   deps = [
     "${mmi_path}/tools/vuinput:libmmi-virtual-device",
     "${mmi_path}/util:libmmi-util",
diff --git a/util/BUILD.gn b/util/BUILD.gn
index f93fa627a4..47eb30e0ca 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -25,12 +25,6 @@ config("libmmi_util_public_config") {
     "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
   ]
 
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
@@ -96,11 +90,6 @@ ohos_unittest("ut-mmi-util-out") {
   ]
 
   defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
@@ -151,11 +140,6 @@ ohos_unittest("RunShellUtilTest") {
   ]
 
   defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
-- 
Gitee


From cf1e74b14111c1b778b4d72a089076c553df317a Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Thu, 20 Oct 2022 20:06:31 +0800
Subject: [PATCH 058/360] remove mmi_debug in source

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: I58beb75e5b570f354599c20ccfc7f0291f20b8fa
---
 .../module_loader/test/mmi_client_test.cpp    | 122 ------------------
 service/event_dump/src/event_dump.cpp         |   4 -
 .../include/server_msg_handler.h              |   3 -
 .../message_handle/src/server_msg_handler.cpp |  54 --------
 service/module_loader/src/mmi_service.cpp     |   3 -
 service/module_loader/src/uds_server.cpp      |   3 -
 util/common/include/proto.h                   |   4 -
 util/socket/include/uds_session.h             |  11 --
 util/socket/src/uds_session.cpp               |   3 -
 9 files changed, 207 deletions(-)

diff --git a/frameworks/proxy/module_loader/test/mmi_client_test.cpp b/frameworks/proxy/module_loader/test/mmi_client_test.cpp
index d357673843..ac0d410775 100644
--- a/frameworks/proxy/module_loader/test/mmi_client_test.cpp
+++ b/frameworks/proxy/module_loader/test/mmi_client_test.cpp
@@ -17,24 +17,11 @@
 
 #include "mmi_client.h"
 
-#ifdef OHOS_BUILD_MMI_DEBUG
-#include <chrono>
-#include <cinttypes>
-#include <random>
-#include "display_info.h"
-#include "multimodal_event_handler.h"
-#include "util.h"
-#endif // OHOS_BUILD_MMI_DEBUG
-
 namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
 using namespace OHOS::MMI;
-#ifdef OHOS_BUILD_MMI_DEBUG
-constexpr int32_t DISPLAY_WIDTH = 720;
-constexpr int32_t DISPLAY_HEIGHT = 1280;
-#endif // OHOS_BUILD_MMI_DEBUG
 } // namespace
 
 class MMIClientTest : public testing::Test {
@@ -43,95 +30,6 @@ public:
     static void TearDownTestCase(void) {}
 };
 
-class MMIClientUnitTest {
-public:
-#ifdef OHOS_BUILD_MMI_DEBUG
-public:
-    static bool Write(const WindowInfo& info, NetPacket& pkt)
-    {
-        pkt << info.id << info.pid << info.uid << info.area << info.defaultHotAreas << info.pointerHotAreas
-            << info.agentWindowId << info.flags;
-        return (!pkt.ChkRWError());
-    }
-    static bool Write(const DisplayInfo& info, NetPacket& pkt)
-    {
-        pkt << info.id << info.x << info.y << info.width << info.height << info.name << info.uniq
-            << info.direction;
-        return (!pkt.ChkRWError());
-    }
-    static int32_t GetRandomInt(int32_t min, int32_t max)
-    {
-        std::mt19937 gen(std::random_device{}());
-        std::uniform_int_distribution<> dis(min, max);
-        return dis(gen);
-    }
-    static void RandomHotAreasInfo(std::vector<Rect>& hotAreas)
-    {
-        Rect area;
-        area.x = 0;
-        area.y = 0;
-        area.width = DISPLAY_WIDTH;
-        area.height = DISPLAY_HEIGHT;
-        hotAreas.push_back(area);
-    }
-    static void RandomWindowInfo(int32_t id, int32_t pid, WindowInfo& info)
-    {
-        info.id = id;
-        info.pid = pid;
-        info.uid = pid;
-        Rect area;
-        area.x = 0;
-        area.y = 0;
-        area.width = DISPLAY_WIDTH;
-        area.height = DISPLAY_HEIGHT;
-        info.area = area;
-        RandomHotAreasInfo(info.defaultHotAreas);
-        RandomHotAreasInfo(info.pointerHotAreas);
-        info.agentWindowId = id;
-        info.flags = 0;
-    }
-    static void RandomDisplayInfo(int32_t id, DisplayInfo& info)
-    {
-        info.id = id;
-        info.x = 0;
-        info.y = 0;
-        info.width = DISPLAY_WIDTH;
-        info.height = DISPLAY_HEIGHT;
-        info.name = StringFmt("pd-%d", id);
-        info.uniq = "default0";
-        info.direction = Direction::Direction0;
-    }
-    static bool RandomDisplayPacket(NetPacket& pkt, int32_t pid)
-    {
-        int32_t width = DISPLAY_WIDTH;
-        int32_t height = DISPLAY_HEIGHT;
-        int32_t focusWindowId = 1;
-        pkt << width << height << focusWindowId;
-        uint32_t windowNum = 1;
-        pkt << windowNum;
-        for (auto i = 0; i < windowNum; i++) {
-            WindowInfo info = {};
-            RandomWindowInfo(i + 1, pid, info);
-            if (!Write(info, pkt)) {
-                printf("write WindowInfo failed\n");
-                return false;
-            }
-        }
-        uint32_t displayNum = 1;
-        pkt << displayNum;
-        for (auto i = 0; i < displayNum; i++) {
-            DisplayInfo info = {};
-            RandomDisplayInfo(i + 1, info);
-            if (!Write(info, pkt)) {
-                printf("write DisplayInfo failed\n");
-                return false;
-            }
-        }
-        return true;
-    }
-#endif // OHOS_BUILD_MMI_DEBUG
-};
-
 ConnectCallback connectFun;
 
 /**
@@ -157,25 +55,5 @@ HWTEST_F(MMIClientTest, RegisterDisconnectedFunction, TestSize.Level1)
     MMIClient mmiClient;
     mmiClient.RegisterDisconnectedFunction(connectFun);
 }
-
-#ifdef OHOS_BUILD_MMI_DEBUG
-HWTEST_F(MMIClientTest, BigPacketTest, TestSize.Level1)
-{
-    ASSERT_TRUE(MMIEventHdl.InitClient());
-    auto client = MMIEventHdl.GetMMIClient();
-    ASSERT_NE(client, nullptr);
-    const int32_t pid = GetPid();
-    const int32_t maxLimit = MMIClientUnitTest::GetRandomInt(1000, 2000);
-    auto beginTime = GetSysClockTime();
-    printf(" begin: maxLimit:%d beginTime:%" PRId64 "\n", maxLimit, beginTime);
-    for (auto i = 1; i <= maxLimit; i++) {
-        NetPacket pkt(MmiMessageId::BIGPACKET_TEST);
-        ASSERT_TRUE(MMIClientUnitTest::RandomDisplayPacket(pkt, pid));
-        EXPECT_TRUE(client->SendMessage(pkt));
-    }
-    auto endTime = GetSysClockTime();
-    printf(" end: endTime:%" PRId64 " D-Value:%" PRId64 "\n", endTime, (endTime - beginTime));
-}
-#endif // OHOS_BUILD_MMI_DEBUG
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/service/event_dump/src/event_dump.cpp b/service/event_dump/src/event_dump.cpp
index f54ac221a6..af6c8e5bbf 100644
--- a/service/event_dump/src/event_dump.cpp
+++ b/service/event_dump/src/event_dump.cpp
@@ -52,10 +52,6 @@ EventDump::~EventDump() {}
 void ChkConfig(int32_t fd)
 {
     mprintf(fd, "ChkMMIConfig: ");
-#ifdef OHOS_BUILD_MMI_DEBUG
-    mprintf(fd, "OHOS_BUILD_MMI_DEBUG");
-#endif // OHOS_BUILD_MMI_DEBUG
-
     mprintf(fd, "DEF_MMI_DATA_ROOT: %s\n", DEF_MMI_DATA_ROOT);
     mprintf(fd, "EXP_CONFIG: %s\n", DEF_EXP_CONFIG);
     mprintf(fd, "EXP_SOPATH: %s\n", DEF_EXP_SOPATH);
diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
index 66fad64561..28a252e7cf 100644
--- a/service/message_handle/include/server_msg_handler.h
+++ b/service/message_handle/include/server_msg_handler.h
@@ -65,9 +65,6 @@ protected:
     int32_t MarkProcessed(SessionPtr sess, NetPacket& pkt);
     int32_t OnRegisterMsgHandler(SessionPtr sess, NetPacket& pkt);
     int32_t OnDisplayInfo(SessionPtr sess, NetPacket& pkt);
-#ifdef OHOS_BUILD_MMI_DEBUG
-    int32_t OnBigPacketTest(SessionPtr sess, NetPacket& pkt);
-#endif // OHOS_BUILD_MMI_DEBUG
 private:
     UDSServer *udsServer_ { nullptr };
     int32_t targetWindowId_ { -1 };
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index e8d36ec19c..7c8cbb9ff7 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -51,9 +51,6 @@ void ServerMsgHandler::Init(UDSServer& udsServer)
     MsgCallback funs[] = {
         {MmiMessageId::MARK_PROCESS, MsgCallbackBind2(&ServerMsgHandler::MarkProcessed, this)},
         {MmiMessageId::DISPLAY_INFO, MsgCallbackBind2(&ServerMsgHandler::OnDisplayInfo, this)},
-#ifdef OHOS_BUILD_MMI_DEBUG
-        {MmiMessageId::BIGPACKET_TEST, MsgCallbackBind2(&ServerMsgHandler::OnBigPacketTest, this)},
-#endif // OHOS_BUILD_MMI_DEBUG
     };
     for (auto &it : funs) {
         if (!RegistrationEvent(it)) {
@@ -349,56 +346,5 @@ int32_t ServerMsgHandler::AddInputEventFilter(sptr<IEventFilter> filter)
     return RET_OK;
 }
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
-
-#ifdef OHOS_BUILD_MMI_DEBUG
-int32_t ServerMsgHandler::OnBigPacketTest(SessionPtr sess, NetPacket& pkt)
-{
-    CHKPR(sess, ERROR_NULL_POINTER);
-    int32_t width = 0;
-    int32_t height = 0;
-    int32_t focusWindowId = 0;
-    pkt >> width >> height >> focusWindowId;
-    MMI_HILOGD("logicalInfo,width:%{public}d,height:%{public}d,focusWindowId:%{public}d",
-        width, height, focusWindowId);
-    uint32_t num = 0;
-    pkt >> num;
-    for (uint32_t i = 0; i < num; i++) {
-        WindowInfo info;
-        pkt >> info.id >> info.pid >> info.uid >> info.area >> info.defaultHotAreas
-            >> info.pointerHotAreas >> info.agentWindowId >> info.flags;
-        MMI_HILOGD("windowsInfos,id:%{public}d,pid:%{public}d,uid:%{public}d,"
-            "area.x:%{public}d,area.y:%{public}d,area.width:%{public}d,area.height:%{public}d,"
-            "defaultHotAreas:size:%{public}zu,pointerHotAreas:size:%{public}zu,"
-            "agentWindowId:%{public}d,flags:%{public}d",
-            info.id, info.pid, info.uid, info.area.x, info.area.y, info.area.width,
-            info.area.height, info.defaultHotAreas.size(), info.pointerHotAreas.size(),
-            info.agentWindowId, info.flags);
-        for (const auto &win : info.defaultHotAreas) {
-            MMI_HILOGD("defaultHotAreas,x:%{public}d,y:%{public}d,width:%{public}d,height:%{public}d",
-                win.x, win.y, win.width, win.height);
-        }
-        for (const auto &pointer : info.pointerHotAreas) {
-            MMI_HILOGD("pointerHotAreas,x:%{public}d,y:%{public}d,width:%{public}d,height:%{public}d",
-                pointer.x, pointer.y, pointer.width, pointer.height);
-        }
-    }
-    pkt >> num;
-    for (uint32_t i = 0; i < num; i++) {
-        DisplayInfo info;
-        pkt >> info.id >> info.x >> info.y >> info.width >> info.height
-            >> info.name >> info.uniq >> info.direction;
-        MMI_HILOGD("displaysInfos,id:%{public}d,x:%{public}d,y:%{public}d,"
-            "width:%{public}d,height:%{public}d,name:%{public}s,"
-            "uniq:%{public}s,direction:%{public}d",
-            info.id, info.x, info.y, info.width, info.height, info.name.c_str(),
-            info.uniq.c_str(), info.direction);
-    }
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet read data failed");
-        return PACKET_READ_FAIL;
-    }
-    return RET_OK;
-}
-#endif // OHOS_BUILD_MMI_DEBUG
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 40188e0324..ecac09d357 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -84,9 +84,6 @@ void CheckDefineOutput(const char* fmt, Ts... args)
 static void CheckDefine()
 {
     CheckDefineOutput("ChkDefs:");
-#ifdef OHOS_BUILD_MMI_DEBUG
-    CheckDefineOutput("%-40s", "OHOS_BUILD_MMI_DEBUG");
-#endif
 #ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
     CheckDefineOutput("%-40s", "OHOS_BUILD_ENABLE_POINTER_DRAWING");
 #endif
diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp
index 1677e4a3d6..cac34aa782 100644
--- a/service/module_loader/src/uds_server.cpp
+++ b/service/module_loader/src/uds_server.cpp
@@ -156,9 +156,6 @@ int32_t UDSServer::AddSocketPairInfo(const std::string& programName,
         return RET_ERR;
     }
     sess->SetTokenType(tokenType);
-#ifdef OHOS_BUILD_MMI_DEBUG
-    sess->SetClientFd(toReturnClientFd);
-#endif // OHOS__BUILD_MMI_DEBUG
 
     if (!AddSession(sess)) {
         cleanTaskWhenError();
diff --git a/util/common/include/proto.h b/util/common/include/proto.h
index fd9c64f0bb..1570fa59a5 100644
--- a/util/common/include/proto.h
+++ b/util/common/include/proto.h
@@ -132,10 +132,6 @@ enum class MmiMessageId : int32_t {
     ON_EXCEPTION = 13050,
     ON_LIST,
 
-#ifdef OHOS_BUILD_MMI_DEBUG
-    BIGPACKET_TEST = 91000,
-#endif // OHOS_BUILD_MMI_DEBUG
-
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     COOPERATION_ADD_LISTENER = 15000,
     COOPERATION_MESSAGE,
diff --git a/util/socket/include/uds_session.h b/util/socket/include/uds_session.h
index 580d27b749..d82b8e1e37 100644
--- a/util/socket/include/uds_session.h
+++ b/util/socket/include/uds_session.h
@@ -103,14 +103,6 @@ public:
     int64_t GetEarliestEventTime(int32_t type = 0) const;
     bool IsEventQueueEmpty(int32_t type = 0);
 
-#ifdef OHOS_BUILD_MMI_DEBUG
-    void SetClientFd(const int32_t clientFd)
-    {
-        clientFd_ = clientFd;
-        UpdateDescript();
-    }
-#endif
-
 protected:
     struct EventTime {
         int32_t id { 0 };
@@ -126,9 +118,6 @@ protected:
     const int32_t uid_ { -1 };
     const int32_t pid_ { -1 };
     int32_t tokenType_ { TokenType::TOKEN_INVALID };
-#ifdef OHOS_BUILD_MMI_DEBUG
-    int32_t clientFd_ { -1 };
-#endif // OHOS_BUILD_MMI_DEBUG
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/util/socket/src/uds_session.cpp b/util/socket/src/uds_session.cpp
index 209a5f49b3..e0bdeaa65f 100644
--- a/util/socket/src/uds_session.cpp
+++ b/util/socket/src/uds_session.cpp
@@ -109,9 +109,6 @@ void UDSSession::UpdateDescript()
         << ", programName = " << programName_
         << ", moduleType = " << moduleType_
         << ((fd_ < 0) ? ", closed" : ", opened")
-#ifdef OHOS_BUILD_MMI_DEBUG
-        << ", clientFd = " << clientFd_
-#endif // OHOS_BUILD_MMI_DEBUG
         << ", uid = " << uid_
         << ", pid = " << pid_
         << ", tokenType = " << tokenType_
-- 
Gitee


From e3398f1541740c6fadff260a67fd56df78ede068 Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Thu, 20 Oct 2022 20:17:34 +0800
Subject: [PATCH 059/360] remove hdi

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: I0d0583ea4f4af4e0dcff1455fb73ca35762f8e89
---
 service/BUILD.gn                                  | 3 ---
 tools/event_inject/include/manage_inject_device.h | 1 -
 util/common/include/proto.h                       | 1 -
 3 files changed, 5 deletions(-)

diff --git a/service/BUILD.gn b/service/BUILD.gn
index d32796e5b5..33a12c6f2e 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -614,7 +614,6 @@ ohos_unittest("ut-mmi-service-out") {
     "${mmi_path}/service/event_dispatch/include",
     "${mmi_path}/service/key_event_normalize/include",
     "${mmi_path}/service/event_handler/include",
-    "${mmi_path}/service/hdi_inject/include",
     "${mmi_path}/service/event_dump/include",
     "${mmi_path}/service/libinput_adapter/include",
     "${mmi_path}/service/message_handle/include",
@@ -626,7 +625,6 @@ ohos_unittest("ut-mmi-service-out") {
 
   sources = [
     "event_dispatch/test/event_dispatch_test.cpp",
-    "hdi_inject/test/hdi_inject_test.cpp",
     "message_handle/test/server_msg_handler_test.cpp",
     "module_loader/test/uds_server_test.cpp",
     "window_manager/test/input_windows_manager_test.cpp",
@@ -663,7 +661,6 @@ ohos_unittest("ut-mmi-service-out") {
 
   external_deps = [
     "c_utils:utils",
-    "drivers_interface_input:hdi_input",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }
diff --git a/tools/event_inject/include/manage_inject_device.h b/tools/event_inject/include/manage_inject_device.h
index f8ce4b8518..6f157f5f47 100644
--- a/tools/event_inject/include/manage_inject_device.h
+++ b/tools/event_inject/include/manage_inject_device.h
@@ -30,7 +30,6 @@ public:
     int32_t TransformJsonData(const DeviceItems &configData);
 private:
     int32_t SendEvent(const InputEventArray &inputEventArray);
-    int32_t SendEventToHdi(const InputEventArray &inputEventArray);
     int32_t SendEventToDeviceNode(const InputEventArray &inputEventArray);
 private:
     GetDeviceNode getDeviceNodeObject_;
diff --git a/util/common/include/proto.h b/util/common/include/proto.h
index 1570fa59a5..f8327aa92f 100644
--- a/util/common/include/proto.h
+++ b/util/common/include/proto.h
@@ -120,7 +120,6 @@ enum class MmiMessageId : int32_t {
 
     ON_STANDARD = 9000,
     SENIOR_INPUT_FUNC = 9050,
-    HDI_INJECT = 9051,
     ON_JOYSTICK = 10000,
     ON_WINDOW = 11000,
 
-- 
Gitee


From 06bad48952d65cfa271f2bb347a57dfe699244ca Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Thu, 20 Oct 2022 20:36:33 +0800
Subject: [PATCH 060/360] format gn

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: If984469f4bcfc32778be9f458bbeb016e3836f45
---
 examples/mmi/BUILD.gn       | 2 +-
 service/BUILD.gn            | 4 ++--
 tools/event_inject/BUILD.gn | 6 +++---
 tools/vuinput/BUILD.gn      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/mmi/BUILD.gn b/examples/mmi/BUILD.gn
index 86e778ac66..47060335b4 100644
--- a/examples/mmi/BUILD.gn
+++ b/examples/mmi/BUILD.gn
@@ -18,9 +18,9 @@ ohos_executable("mmi-server") {
   sources = [ "src/mmi_service_main.cpp" ]
   deps = [
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//foundation/multimodalinput/input/service:libmmi-server",
     "//foundation/multimodalinput/input/util:libmmi-util",
-    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
 
   external_deps = [
diff --git a/service/BUILD.gn b/service/BUILD.gn
index 33a12c6f2e..b50a1294a3 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -528,12 +528,12 @@ ohos_shared_library("libmmi-server") {
     "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//foundation/multimodalinput/input/service/connect_manager:mmi_connect_manager_service",
     "//foundation/multimodalinput/input/service/filter:mmi_event_filter_proxy",
     "//foundation/multimodalinput/input/util:libmmi-util",
     "//third_party/cJSON:cjson_static",
     "//third_party/json:nlohmann_json_static",
-    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
 
   if (resource_schedule_service_enabled) {
@@ -654,9 +654,9 @@ ohos_unittest("ut-mmi-service-out") {
     "${mmi_path}/frameworks/proxy:libmmi-client",
     "${mmi_path}/service:libmmi-server",
     "${mmi_path}/util:libmmi-util",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
-    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
 
   external_deps = [
diff --git a/tools/event_inject/BUILD.gn b/tools/event_inject/BUILD.gn
index 70d2a84041..81af1938b9 100644
--- a/tools/event_inject/BUILD.gn
+++ b/tools/event_inject/BUILD.gn
@@ -63,11 +63,11 @@ ohos_source_set("event-injection") {
   ]
 
   deps = [
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//foundation/multimodalinput/input/service/connect_manager:mmi_connect_manager_proxy",
     "//foundation/multimodalinput/input/service/filter:mmi_event_filter_service",
     "//foundation/multimodalinput/input/util:libmmi-util",
     "//third_party/cJSON:cjson_static",
-    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
 
   external_deps = [ "ipc:ipc_core" ]
@@ -135,10 +135,10 @@ ohos_unittest("ut-event-injection-out") {
     "${mmi_path}/service:libmmi-server",
     "${mmi_path}/tools/event_inject:event-injection",
     "${mmi_path}/util:libmmi-util",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//third_party/cJSON:cjson_static",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
-    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
 
   external_deps = [
@@ -154,9 +154,9 @@ ohos_executable("mmi-event-injection") {
   configs = [ ":event_injection_public_config" ]
 
   deps = [
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//foundation/multimodalinput/input/tools/event_inject:event-injection",
     "//foundation/multimodalinput/input/util:libmmi-util",
-    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
 
   install_enable = true
diff --git a/tools/vuinput/BUILD.gn b/tools/vuinput/BUILD.gn
index 00e1e00ee9..7d1b6f0588 100644
--- a/tools/vuinput/BUILD.gn
+++ b/tools/vuinput/BUILD.gn
@@ -75,8 +75,8 @@ ohos_executable("vuinput") {
   configs = [ ":virtual_device_public_config" ]
 
   deps = [
-    "//foundation/multimodalinput/input/tools/vuinput:libmmi-virtual-device",
     "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
+    "//foundation/multimodalinput/input/tools/vuinput:libmmi-virtual-device",
   ]
 
   install_enable = true
@@ -106,9 +106,9 @@ ohos_unittest("ut-virtual-device-out") {
   deps = [
     "${mmi_path}/tools/vuinput:libmmi-virtual-device",
     "${mmi_path}/util:libmmi-util",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
-    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
   ]
 
   external_deps = [
-- 
Gitee


From 0218e253e42f4f70122109a77a87d440b43e6894 Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Fri, 21 Oct 2022 02:05:51 +0000
Subject: [PATCH 061/360] fixed

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
---
 util/BUILD.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/BUILD.gn b/util/BUILD.gn
index 47eb30e0ca..cc03c5def7 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -24,7 +24,7 @@ config("libmmi_util_public_config") {
     "//foundation/multimodalinput/input/interfaces/native/innerkits/common/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
   ]
-
+  defines = []
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
-- 
Gitee


From ac74d67788faaac8988337726aaaf6d7addf9c0c Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 21 Oct 2022 11:58:30 +0800
Subject: [PATCH 062/360] service thread mmi_service add watchdog

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I4410f1306f0a8f5ba3c1fcbd82f598fc40ab7ed0
---
 service/module_loader/src/mmi_service.cpp   | 4 ++--
 service/timer_manager/src/timer_manager.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 9d5d677813..523e416d50 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -57,8 +57,8 @@ namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MMIService" };
 const std::string DEF_INPUT_SEAT = "seat0";
-constexpr int32_t WATCHDOG_INTERVAL_TIME = 15000;
-constexpr int32_t WATCHDOG_DELAY_TIME = 20000;
+constexpr int32_t WATCHDOG_INTERVAL_TIME = 10000;
+constexpr int32_t WATCHDOG_DELAY_TIME = 15000;
 } // namespace
 
 const bool REGISTER_RESULT =
diff --git a/service/timer_manager/src/timer_manager.cpp b/service/timer_manager/src/timer_manager.cpp
index 3613abe01d..33319566d6 100644
--- a/service/timer_manager/src/timer_manager.cpp
+++ b/service/timer_manager/src/timer_manager.cpp
@@ -20,7 +20,7 @@ namespace MMI {
 namespace {
 constexpr int32_t MIN_DELAY = -1;
 constexpr int32_t MIN_INTERVAL = 50;
-constexpr int32_t MAX_INTERVAL = 15000;
+constexpr int32_t MAX_INTERVAL = 10000;
 constexpr int32_t MAX_TIMER_COUNT = 64;
 constexpr int32_t NONEXISTENT_ID = -1;
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "TimerManager" };
-- 
Gitee


From 2c5965f0abec187c526b21d0376e9730f2fa2e50 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 21 Oct 2022 14:05:35 +0800
Subject: [PATCH 063/360] remove hdf code

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I5cdb894909eeec7cf2bbb1e0d3f4c1863d845098
---
 examples/mmi/BUILD.gn                         |   19 +-
 frameworks/napi/distributed_input/BUILD.gn    |    9 -
 frameworks/napi/input_consumer/BUILD.gn       |    9 -
 frameworks/napi/input_device/BUILD.gn         |    9 -
 frameworks/napi/input_event_client/BUILD.gn   |    9 -
 frameworks/napi/input_monitor/BUILD.gn        |    8 -
 frameworks/napi/key_code/BUILD.gn             |    9 -
 frameworks/napi/key_event/BUILD.gn            |    9 -
 frameworks/napi/mouse_event/BUILD.gn          |    9 -
 frameworks/napi/pointer/BUILD.gn              |    9 -
 frameworks/napi/touch_event/BUILD.gn          |    9 -
 frameworks/proxy/BUILD.gn                     |  109 +-
 .../module_loader/test/mmi_client_test.cpp    |  122 -
 multimodalinput_mini.gni                      |    6 -
 patch/BUILD.gn                                |   22 +-
 patch/diff_libevdev_hdf/BUILD.gn              |   89 -
 .../diff_libevdev_hdf/libevdev_hdf_0000.diff  |  310 --
 patch/diff_libinput_mmi/BUILD.gn              |  564 +-
 .../hdf/libinput_hdf_0000.diff                | 4956 -----------------
 patch/diff_mtdev_hdf/BUILD.gn                 |   85 -
 patch/diff_mtdev_hdf/mtdev_hdf_0000.diff      |  251 -
 service/BUILD.gn                              |   65 +-
 service/event_dump/src/event_dump.cpp         |   10 -
 .../hdf_adapter/include/hdf_event_manager.h   |   86 -
 service/hdf_adapter/include/hdf_inject_init.h |   31 -
 service/hdf_adapter/include/lib_hdf.h         |   56 -
 service/hdf_adapter/src/hdf_event_manager.cpp |  546 --
 service/hdf_adapter/src/hdf_inject_init.cpp   |  767 ---
 service/hdf_adapter/test/.gitkeep             |    0
 service/hdi_inject/include/hdi_inject.h       |   85 -
 service/hdi_inject/src/hdi_inject.cpp         |  407 --
 service/hdi_inject/test/hdi_inject_test.cpp   |   33 -
 .../include/server_msg_handler.h              |    6 -
 .../message_handle/src/server_msg_handler.cpp |   87 -
 .../test/server_msg_handler_test.cpp          |    8 -
 service/module_loader/include/mmi_service.h   |    4 -
 service/module_loader/src/mmi_service.cpp     |   13 -
 service/module_loader/src/uds_server.cpp      |    3 -
 tools/event_inject/BUILD.gn                   |   49 +-
 .../include/manage_inject_device.h            |    1 -
 tools/vuinput/BUILD.gn                        |   69 +-
 util/BUILD.gn                                 |   50 +-
 util/common/include/proto.h                   |    5 -
 util/socket/include/uds_session.h             |   11 -
 util/socket/src/uds_session.cpp               |    3 -
 45 files changed, 292 insertions(+), 8725 deletions(-)
 delete mode 100644 patch/diff_libevdev_hdf/BUILD.gn
 delete mode 100644 patch/diff_libevdev_hdf/libevdev_hdf_0000.diff
 delete mode 100644 patch/diff_libinput_mmi/hdf/libinput_hdf_0000.diff
 delete mode 100644 patch/diff_mtdev_hdf/BUILD.gn
 delete mode 100644 patch/diff_mtdev_hdf/mtdev_hdf_0000.diff
 delete mode 100644 service/hdf_adapter/include/hdf_event_manager.h
 delete mode 100644 service/hdf_adapter/include/hdf_inject_init.h
 delete mode 100644 service/hdf_adapter/include/lib_hdf.h
 delete mode 100644 service/hdf_adapter/src/hdf_event_manager.cpp
 delete mode 100644 service/hdf_adapter/src/hdf_inject_init.cpp
 delete mode 100644 service/hdf_adapter/test/.gitkeep
 delete mode 100644 service/hdi_inject/include/hdi_inject.h
 delete mode 100644 service/hdi_inject/src/hdi_inject.cpp
 delete mode 100644 service/hdi_inject/test/hdi_inject_test.cpp

diff --git a/examples/mmi/BUILD.gn b/examples/mmi/BUILD.gn
index 9696c5f5ca..47060335b4 100644
--- a/examples/mmi/BUILD.gn
+++ b/examples/mmi/BUILD.gn
@@ -18,14 +18,11 @@ ohos_executable("mmi-server") {
   sources = [ "src/mmi_service_main.cpp" ]
   deps = [
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//foundation/multimodalinput/input/service:libmmi-server",
     "//foundation/multimodalinput/input/util:libmmi-util",
   ]
 
-  if (input_feature_libinput) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
-
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
@@ -33,20 +30,6 @@ ohos_executable("mmi-server") {
     "samgr:samgr_proxy",
   ]
 
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   install_enable = true
   part_name = "input"
   subsystem_name = "multimodalinput"
diff --git a/frameworks/napi/distributed_input/BUILD.gn b/frameworks/napi/distributed_input/BUILD.gn
index 49261c2cad..63cea33fb9 100644
--- a/frameworks/napi/distributed_input/BUILD.gn
+++ b/frameworks/napi/distributed_input/BUILD.gn
@@ -23,15 +23,6 @@ if (input_feature_distributed) {
       "//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include",
       "${distributed_input_path}/include",
     ]
-
-    defines = []
-    if (input_feature_libinput) {
-      defines += [ "OHOS_BUILD_LIBINPUT" ]
-    }
-
-    if (input_feature_hdf) {
-      defines += [ "OHOS_BUILD_HDF" ]
-    }
   }
 
   ohos_shared_library("distributedinput") {
diff --git a/frameworks/napi/input_consumer/BUILD.gn b/frameworks/napi/input_consumer/BUILD.gn
index 76d494b0f2..6416ac0b79 100644
--- a/frameworks/napi/input_consumer/BUILD.gn
+++ b/frameworks/napi/input_consumer/BUILD.gn
@@ -22,15 +22,6 @@ config("inputconsumer_config") {
     "//foundation/multimodalinput/input/tools/event_inject/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("inputconsumer") {
diff --git a/frameworks/napi/input_device/BUILD.gn b/frameworks/napi/input_device/BUILD.gn
index 9ce7ade106..5cff3fbdd9 100644
--- a/frameworks/napi/input_device/BUILD.gn
+++ b/frameworks/napi/input_device/BUILD.gn
@@ -24,15 +24,6 @@ config("inputdevice_config") {
     "//foundation/multimodalinput/input/frameworks/proxy/event_handler/include",
     "//foundation/multimodalinput/input/frameworks/proxy/module_loader/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("inputdevice") {
diff --git a/frameworks/napi/input_event_client/BUILD.gn b/frameworks/napi/input_event_client/BUILD.gn
index 61077014f1..72b6171970 100644
--- a/frameworks/napi/input_event_client/BUILD.gn
+++ b/frameworks/napi/input_event_client/BUILD.gn
@@ -23,15 +23,6 @@ config("inputeventclient_config") {
     "//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include",
     "//commonlibrary/c_utils/base/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("inputeventclient") {
diff --git a/frameworks/napi/input_monitor/BUILD.gn b/frameworks/napi/input_monitor/BUILD.gn
index 3e5d385555..c65178b567 100644
--- a/frameworks/napi/input_monitor/BUILD.gn
+++ b/frameworks/napi/input_monitor/BUILD.gn
@@ -23,14 +23,6 @@ config("inputmonitor_config") {
   ]
 
   defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
diff --git a/frameworks/napi/key_code/BUILD.gn b/frameworks/napi/key_code/BUILD.gn
index 2d0158f119..419b565071 100644
--- a/frameworks/napi/key_code/BUILD.gn
+++ b/frameworks/napi/key_code/BUILD.gn
@@ -22,15 +22,6 @@ config("keyCode_config") {
     "//foundation/multimodalinput/input/util/network/include",
     "//commonlibrary/c_utils/base/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("keycode") {
diff --git a/frameworks/napi/key_event/BUILD.gn b/frameworks/napi/key_event/BUILD.gn
index a2369b5151..18cba57691 100644
--- a/frameworks/napi/key_event/BUILD.gn
+++ b/frameworks/napi/key_event/BUILD.gn
@@ -22,15 +22,6 @@ config("keyEvent_config") {
     "//foundation/multimodalinput/input/util/network/include",
     "//commonlibrary/c_utils/base/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("keyevent") {
diff --git a/frameworks/napi/mouse_event/BUILD.gn b/frameworks/napi/mouse_event/BUILD.gn
index 77c6ec7cab..5bbbf920ca 100644
--- a/frameworks/napi/mouse_event/BUILD.gn
+++ b/frameworks/napi/mouse_event/BUILD.gn
@@ -22,15 +22,6 @@ config("mouseEvent_config") {
     "//foundation/multimodalinput/input/util/network/include",
     "//commonlibrary/c_utils/base/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("mouseevent") {
diff --git a/frameworks/napi/pointer/BUILD.gn b/frameworks/napi/pointer/BUILD.gn
index 1437797fc1..3df7a24a75 100644
--- a/frameworks/napi/pointer/BUILD.gn
+++ b/frameworks/napi/pointer/BUILD.gn
@@ -21,15 +21,6 @@ config("pointer_config") {
     "//foundation/multimodalinput/input/util/common/include",
     "//foundation/multimodalinput/input/util/network/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("pointer") {
diff --git a/frameworks/napi/touch_event/BUILD.gn b/frameworks/napi/touch_event/BUILD.gn
index a7528c29b8..173f2c7bcf 100644
--- a/frameworks/napi/touch_event/BUILD.gn
+++ b/frameworks/napi/touch_event/BUILD.gn
@@ -22,15 +22,6 @@ config("touchEvent_config") {
     "//foundation/multimodalinput/input/util/network/include",
     "//commonlibrary/c_utils/base/include",
   ]
-
-  defines = []
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 ohos_shared_library("touchevent") {
diff --git a/frameworks/proxy/BUILD.gn b/frameworks/proxy/BUILD.gn
index 4a9d0dccf7..8cdbe0bc8c 100755
--- a/frameworks/proxy/BUILD.gn
+++ b/frameworks/proxy/BUILD.gn
@@ -66,10 +66,6 @@ ohos_source_set("libmmi-common") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
@@ -103,10 +99,6 @@ ohos_shared_library("libmmi-client") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   if (input_feature_pointer_drawing) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
   }
@@ -175,26 +167,13 @@ ohos_shared_library("libmmi-client") {
 
 ohos_unittest("ut-mmi-proxy-out") {
   module_out_path = module_output_path
-  include_dirs = [ "//commonlibrary/c_utils/base/include" ]
-
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
+  include_dirs = [
+    "//commonlibrary/c_utils/base/include",
+    "$root_out_dir/diff_libinput_mmi/export_include",
+  ]
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   sources = [ "module_loader/test/mmi_client_test.cpp" ]
 
   configs = [ ":libmmi_test_util" ]
@@ -214,26 +193,13 @@ ohos_unittest("ut-mmi-proxy-out") {
 
 ohos_unittest("KeyEventTest") {
   module_out_path = module_output_path
-  include_dirs = [ "//commonlibrary/c_utils/base/include" ]
-
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
+  include_dirs = [
+    "//commonlibrary/c_utils/base/include",
+    "$root_out_dir/diff_libinput_mmi/export_include",
+  ]
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/window_utils_test.cpp",
@@ -261,30 +227,17 @@ ohos_unittest("KeyEventTest") {
 
 ohos_unittest("InputManagerTest") {
   module_out_path = module_output_path
-  include_dirs = [ "${mmi_path}/frameworks/proxy/events/test" ]
-
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
+  include_dirs = [
+    "${mmi_path}/frameworks/proxy/events/test",
+    "$root_out_dir/diff_libinput_mmi/export_include",
+  ]
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   if (input_feature_pointer_drawing) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
   }
 
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_keyboard) {
     defines += [ "OHOS_BUILD_ENABLE_KEYBOARD" ]
   }
@@ -332,26 +285,13 @@ ohos_unittest("InputManagerTest") {
 
 ohos_unittest("InputManagerManualTest") {
   module_out_path = module_output_path
-  include_dirs = [ "//commonlibrary/c_utils/base/include" ]
-
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
+  include_dirs = [
+    "//commonlibrary/c_utils/base/include",
+    "$root_out_dir/diff_libinput_mmi/export_include",
+  ]
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_mouse) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
   }
@@ -379,25 +319,10 @@ ohos_unittest("InputManagerManualTest") {
 
 ohos_unittest("PointerEventTest") {
   module_out_path = module_output_path
-
-  if (input_feature_libinput) {
-    include_dirs = [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
+  include_dirs = [ "$root_out_dir/diff_libinput_mmi/export_include" ]
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_mouse) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
   }
diff --git a/frameworks/proxy/module_loader/test/mmi_client_test.cpp b/frameworks/proxy/module_loader/test/mmi_client_test.cpp
index d357673843..ac0d410775 100644
--- a/frameworks/proxy/module_loader/test/mmi_client_test.cpp
+++ b/frameworks/proxy/module_loader/test/mmi_client_test.cpp
@@ -17,24 +17,11 @@
 
 #include "mmi_client.h"
 
-#ifdef OHOS_BUILD_MMI_DEBUG
-#include <chrono>
-#include <cinttypes>
-#include <random>
-#include "display_info.h"
-#include "multimodal_event_handler.h"
-#include "util.h"
-#endif // OHOS_BUILD_MMI_DEBUG
-
 namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
 using namespace OHOS::MMI;
-#ifdef OHOS_BUILD_MMI_DEBUG
-constexpr int32_t DISPLAY_WIDTH = 720;
-constexpr int32_t DISPLAY_HEIGHT = 1280;
-#endif // OHOS_BUILD_MMI_DEBUG
 } // namespace
 
 class MMIClientTest : public testing::Test {
@@ -43,95 +30,6 @@ public:
     static void TearDownTestCase(void) {}
 };
 
-class MMIClientUnitTest {
-public:
-#ifdef OHOS_BUILD_MMI_DEBUG
-public:
-    static bool Write(const WindowInfo& info, NetPacket& pkt)
-    {
-        pkt << info.id << info.pid << info.uid << info.area << info.defaultHotAreas << info.pointerHotAreas
-            << info.agentWindowId << info.flags;
-        return (!pkt.ChkRWError());
-    }
-    static bool Write(const DisplayInfo& info, NetPacket& pkt)
-    {
-        pkt << info.id << info.x << info.y << info.width << info.height << info.name << info.uniq
-            << info.direction;
-        return (!pkt.ChkRWError());
-    }
-    static int32_t GetRandomInt(int32_t min, int32_t max)
-    {
-        std::mt19937 gen(std::random_device{}());
-        std::uniform_int_distribution<> dis(min, max);
-        return dis(gen);
-    }
-    static void RandomHotAreasInfo(std::vector<Rect>& hotAreas)
-    {
-        Rect area;
-        area.x = 0;
-        area.y = 0;
-        area.width = DISPLAY_WIDTH;
-        area.height = DISPLAY_HEIGHT;
-        hotAreas.push_back(area);
-    }
-    static void RandomWindowInfo(int32_t id, int32_t pid, WindowInfo& info)
-    {
-        info.id = id;
-        info.pid = pid;
-        info.uid = pid;
-        Rect area;
-        area.x = 0;
-        area.y = 0;
-        area.width = DISPLAY_WIDTH;
-        area.height = DISPLAY_HEIGHT;
-        info.area = area;
-        RandomHotAreasInfo(info.defaultHotAreas);
-        RandomHotAreasInfo(info.pointerHotAreas);
-        info.agentWindowId = id;
-        info.flags = 0;
-    }
-    static void RandomDisplayInfo(int32_t id, DisplayInfo& info)
-    {
-        info.id = id;
-        info.x = 0;
-        info.y = 0;
-        info.width = DISPLAY_WIDTH;
-        info.height = DISPLAY_HEIGHT;
-        info.name = StringFmt("pd-%d", id);
-        info.uniq = "default0";
-        info.direction = Direction::Direction0;
-    }
-    static bool RandomDisplayPacket(NetPacket& pkt, int32_t pid)
-    {
-        int32_t width = DISPLAY_WIDTH;
-        int32_t height = DISPLAY_HEIGHT;
-        int32_t focusWindowId = 1;
-        pkt << width << height << focusWindowId;
-        uint32_t windowNum = 1;
-        pkt << windowNum;
-        for (auto i = 0; i < windowNum; i++) {
-            WindowInfo info = {};
-            RandomWindowInfo(i + 1, pid, info);
-            if (!Write(info, pkt)) {
-                printf("write WindowInfo failed\n");
-                return false;
-            }
-        }
-        uint32_t displayNum = 1;
-        pkt << displayNum;
-        for (auto i = 0; i < displayNum; i++) {
-            DisplayInfo info = {};
-            RandomDisplayInfo(i + 1, info);
-            if (!Write(info, pkt)) {
-                printf("write DisplayInfo failed\n");
-                return false;
-            }
-        }
-        return true;
-    }
-#endif // OHOS_BUILD_MMI_DEBUG
-};
-
 ConnectCallback connectFun;
 
 /**
@@ -157,25 +55,5 @@ HWTEST_F(MMIClientTest, RegisterDisconnectedFunction, TestSize.Level1)
     MMIClient mmiClient;
     mmiClient.RegisterDisconnectedFunction(connectFun);
 }
-
-#ifdef OHOS_BUILD_MMI_DEBUG
-HWTEST_F(MMIClientTest, BigPacketTest, TestSize.Level1)
-{
-    ASSERT_TRUE(MMIEventHdl.InitClient());
-    auto client = MMIEventHdl.GetMMIClient();
-    ASSERT_NE(client, nullptr);
-    const int32_t pid = GetPid();
-    const int32_t maxLimit = MMIClientUnitTest::GetRandomInt(1000, 2000);
-    auto beginTime = GetSysClockTime();
-    printf(" begin: maxLimit:%d beginTime:%" PRId64 "\n", maxLimit, beginTime);
-    for (auto i = 1; i <= maxLimit; i++) {
-        NetPacket pkt(MmiMessageId::BIGPACKET_TEST);
-        ASSERT_TRUE(MMIClientUnitTest::RandomDisplayPacket(pkt, pid));
-        EXPECT_TRUE(client->SendMessage(pkt));
-    }
-    auto endTime = GetSysClockTime();
-    printf(" end: endTime:%" PRId64 " D-Value:%" PRId64 "\n", endTime, (endTime - beginTime));
-}
-#endif // OHOS_BUILD_MMI_DEBUG
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/multimodalinput_mini.gni b/multimodalinput_mini.gni
index 5db4f16d40..643d2bbf75 100644
--- a/multimodalinput_mini.gni
+++ b/multimodalinput_mini.gni
@@ -16,9 +16,6 @@ import("//build/ohos.gni")
 mmi_path = "//foundation/multimodalinput/input"
 ability_runtime_path = "//foundation/ability/ability_runtime"
 ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits"
-input_feature_libinput = true
-input_feature_hdf = false
-input_feature_debug = false
 input_feature_distributed = false
 
 declare_args() {
@@ -44,9 +41,6 @@ if (input_feature_joystick) {
   input_feature_mouse = true
 }
 
-print("input_feature_libinput = ${input_feature_libinput}")
-print("input_feature_hdf = ${input_feature_hdf}")
-print("input_feature_debug = ${input_feature_debug}")
 print("input_feature_combination_key = ${input_feature_combination_key}")
 print("input_feature_pointer_drawing = ${input_feature_pointer_drawing}")
 print("input_feature_monitor = ${input_feature_monitor}")
diff --git a/patch/BUILD.gn b/patch/BUILD.gn
index ed05cf8beb..6915135e3d 100644
--- a/patch/BUILD.gn
+++ b/patch/BUILD.gn
@@ -18,22 +18,10 @@ group("patch_packages") {
   deps = [
     "diff_libinput_mmi:libinput-third-mmi",
     "prebuild_eudev:prebuild_eudev",
+    "prebuild_libinput:prebuild_libinput",
+    "//third_party/eudev:libudev",
+    "//third_party/eudev:udev_conf",
+    "//third_party/eudev:udevd",
+    "//third_party/eudev:udevd.rc",
   ]
-
-  if (input_feature_hdf) {
-    deps += [
-      "diff_libevdev_hdf:libevdev-hdf",
-      "diff_mtdev_hdf:libmtdev-hdf",
-    ]
-  }
-
-  if (input_feature_libinput) {
-    deps += [
-      "prebuild_libinput:prebuild_libinput",
-      "//third_party/eudev:libudev",
-      "//third_party/eudev:udev_conf",
-      "//third_party/eudev:udevd",
-      "//third_party/eudev:udevd.rc",
-    ]
-  }
 }
diff --git a/patch/diff_libevdev_hdf/BUILD.gn b/patch/diff_libevdev_hdf/BUILD.gn
deleted file mode 100644
index fa0b2c748c..0000000000
--- a/patch/diff_libevdev_hdf/BUILD.gn
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (c) 2021-2022 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build/ohos.gni")
-
-gen_src_dir = "//third_party/libevdev"
-gen_dst_dir = root_out_dir + "/diff_libevdev_hdf"
-patches_root_dir = "//foundation/multimodalinput/input/patch"
-build_gn_dir = "$patches_root_dir/diff_libevdev_hdf"
-
-action("apply_patch") {
-  visibility = [ ":*" ]
-  script = "$patches_root_dir/apply_patch.sh"
-  inputs = [ "$gen_src_dir" ]
-  outputs = [
-    "$gen_dst_dir/export_include",
-    "$gen_dst_dir/libevdev",
-    "$gen_dst_dir/include",
-    "$gen_dst_dir/libevdev/libevdev-uinput.c",
-    "$gen_dst_dir/libevdev/libevdev.c",
-    "$gen_dst_dir/libevdev/libevdev-names.c",
-  ]
-  args = [
-    rebase_path(gen_src_dir, root_build_dir),
-    rebase_path(gen_dst_dir, root_build_dir),
-    rebase_path(build_gn_dir, root_build_dir),
-  ]
-}
-
-config("libevdev_config") {
-  visibility = [ ":*" ]
-
-  include_dirs = [
-    "$gen_dst_dir/libevdev",
-    "$gen_dst_dir/include",
-  ]
-
-  cflags = [
-    "-Wno-unused-parameter",
-    "-Wno-missing-braces",
-  ]
-}
-
-config("libevdev_public_config") {
-  include_dirs = [ "$gen_dst_dir/export_include" ]
-
-  cflags = []
-}
-
-ohos_source_set("patch_gen_libevdev") {
-  sources = [
-    "$gen_dst_dir/libevdev/libevdev-names.c",
-    "$gen_dst_dir/libevdev/libevdev-uinput.c",
-    "$gen_dst_dir/libevdev/libevdev.c",
-  ]
-
-  configs = [ ":libevdev_config" ]
-
-  public_configs = [ ":libevdev_public_config" ]
-
-  deps = [ ":apply_patch" ]
-
-  public_deps = []
-}
-
-ohos_shared_library("libevdev-hdf") {
-  sources = []
-
-  configs = [ ":libevdev_config" ]
-
-  public_configs = [ ":libevdev_public_config" ]
-
-  deps = [ ":patch_gen_libevdev" ]
-
-  public_deps = []
-
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-}
diff --git a/patch/diff_libevdev_hdf/libevdev_hdf_0000.diff b/patch/diff_libevdev_hdf/libevdev_hdf_0000.diff
deleted file mode 100644
index ae28bf7eac..0000000000
--- a/patch/diff_libevdev_hdf/libevdev_hdf_0000.diff
+++ /dev/null
@@ -1,310 +0,0 @@
-Copyright (c) 2021-2022 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
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-diff -Naur old/BUILD.gn new/BUILD.gn
---- old/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
-+++ new/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
-@@ -24,7 +24,7 @@
-   ]
- }
-
--ohos_shared_library("libevdev") {
-+ohos_shared_library("libevdev-hdf") {
-   sources = [
-     "libevdev/libevdev-uinput.c",
-     "libevdev/libevdev.c",
-diff -Naur old/export_include/libevdev/libevdev.h new/export_include/libevdev/libevdev.h
---- old/export_include/libevdev/libevdev.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/export_include/libevdev/libevdev.h	2021-01-01 00:00:00.000000000 +0800
-@@ -2359,6 +2359,10 @@
-  */
- int libevdev_get_repeat(const struct libevdev *dev, int *delay, int *period);
-
-+/* for hdf drv interface */
-+typedef int (*libevdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-+int libevdev_new_from_index(int index, struct libevdev **dev,libevdev_ioctl func);
-+
- /********* DEPRECATED SECTION *********/
- #if defined(__GNUC__) && __GNUC__ >= 4
- #define LIBEVDEV_DEPRECATED __attribute__ ((deprecated))
-diff -Naur old/libevdev/libevdev-int.h new/libevdev/libevdev-int.h
---- old/libevdev/libevdev-int.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/libevdev/libevdev-int.h	2021-01-01 00:00:00.000000000 +0800
-@@ -37,6 +37,8 @@
- #define ABS_MT_CNT (ABS_MT_MAX - ABS_MT_MIN + 1)
- #define LIBEVDEV_EXPORT __attribute__((visibility("default")))
- #define ALIAS(_to) __attribute__((alias(#_to)))
-+/*for hdf drv interface*/
-+typedef int (*libevdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-
- /**
-  * Sync state machine:
-@@ -108,6 +110,7 @@
- 	struct timeval last_event_time;
-
- 	struct logdata log;
-+	libevdev_ioctl fn;  //新增加数据必须放到结尾
- };
-
- #define log_msg_cond(dev, priority, ...) \
-diff -Naur old/libevdev/libevdev-uinput.c new/libevdev/libevdev-uinput.c
---- old/libevdev/libevdev-uinput.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/libevdev/libevdev-uinput.c	2021-01-01 00:00:00.000000000 +0800
-@@ -488,7 +488,12 @@
- #ifndef __MUSL__
- 	struct input_event ev = { {0,0}, type, code, value };
- #else
--	struct input_event ev = { type, code, value };
-+	struct input_event ev;
-+	ev.input_event_sec = 0;
-+	ev.input_event_usec = 0;
-+	ev.type = type;
-+	ev.code = code;
-+	ev.value = value;
- #endif
- 	int fd = libevdev_uinput_get_fd(uinput_dev);
- 	int rc, max;
-diff -Naur old/libevdev/libevdev.c new/libevdev/libevdev.c
---- old/libevdev/libevdev.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/libevdev/libevdev.c	2021-01-01 00:00:00.000000000 +0800
-@@ -1401,8 +1401,8 @@
- 	e.code = code;
- 	e.value = value;
-
--	if (sanitize_event(dev, &e, SYNC_NONE) != EVENT_FILTER_NONE)
--		return -1;
-+	// if (sanitize_event(dev, &e, SYNC_NONE) != EVENT_FILTER_NONE)
-+		// return -1;
-
- 	switch(type) {
- 		case EV_ABS: rc = update_abs_state(dev, &e); break;
-@@ -1885,3 +1885,205 @@
-
- 	return ioctl(dev->fd, EVIOCSCLOCKID, &clockid) ? -errno : 0;
- }
-+
-+LIBEVDEV_EXPORT int
-+libevdev_set_index(struct libevdev* dev, int index,libevdev_ioctl func)
-+{
-+
-+	int rc;
-+	int i;
-+	char buf[256];
-+
-+	if (dev->initialized) {
-+		log_bug(dev, "device already initialized.\n");
-+		return -EBADF;
-+	}
-+
-+	if (index < 0) {
-+		return -EBADF;
-+	}
-+
-+	libevdev_reset(dev);
-+	dev->fn = func;
-+	dev->fd =index;
-+	rc = func(index, EVIOCGBIT(0, sizeof(dev->bits)), dev->bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	memset(buf, 0, sizeof(buf));
-+	rc = func(index, EVIOCGNAME(sizeof(buf) - 1), buf);
-+	if (rc < 0)
-+		goto out;
-+
-+	free(dev->name);
-+	dev->name = strdup(buf);
-+	if (!dev->name) {
-+		errno = ENOMEM;
-+		goto out;
-+	}
-+
-+	free(dev->phys);
-+	dev->phys = NULL;
-+	memset(buf, 0, sizeof(buf));
-+	rc = func(index, EVIOCGPHYS(sizeof(buf) - 1), buf);
-+	if (rc < 0) {
-+		/* uinput has no phys */
-+		if (errno != ENOENT)
-+			goto out;
-+	} else {
-+		dev->phys = strdup(buf);
-+		if (!dev->phys) {
-+			errno = ENOMEM;
-+			goto out;
-+		}
-+	}
-+
-+	free(dev->uniq);
-+	dev->uniq = NULL;
-+	memset(buf, 0, sizeof(buf));
-+	rc = func(index, EVIOCGUNIQ(sizeof(buf) - 1), buf);
-+	if (rc < 0) {
-+		if (errno != ENOENT)
-+			goto out;
-+	} else	{
-+		dev->uniq = strdup(buf);
-+		if (!dev->uniq) {
-+			errno = ENOMEM;
-+			goto out;
-+		}
-+	}
-+
-+	rc = func(index, EVIOCGID, &dev->ids);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGVERSION, &dev->driver_version);
-+	if (rc < 0)
-+		goto out;
-+
-+	/* Built on a kernel with props, running against a kernel without property
-+	   support. This should not be a fatal case, we'll be missing properties but other
-+	   than that everything is as expected.
-+	 */
-+	rc = func(index, EVIOCGPROP(sizeof(dev->props)), dev->props);
-+	if (rc < 0 && errno != EINVAL)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_REL, sizeof(dev->rel_bits)), dev->rel_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_ABS, sizeof(dev->abs_bits)), dev->abs_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_LED, sizeof(dev->led_bits)), dev->led_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_KEY, sizeof(dev->key_bits)), dev->key_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_SW, sizeof(dev->sw_bits)), dev->sw_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_MSC, sizeof(dev->msc_bits)), dev->msc_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_FF, sizeof(dev->ff_bits)), dev->ff_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGBIT(EV_SND, sizeof(dev->snd_bits)), dev->snd_bits);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGKEY(sizeof(dev->key_values)), dev->key_values);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGLED(sizeof(dev->led_values)), dev->led_values);
-+	if (rc < 0)
-+		goto out;
-+
-+	rc = func(index, EVIOCGSW(sizeof(dev->sw_values)), dev->sw_values);
-+	if (rc < 0)
-+		goto out;
-+
-+	/* rep is a special case, always set it to 1 for both values if EV_REP is set */
-+	if (bit_is_set(dev->bits, EV_REP)) {
-+		for (i = 0; i < REP_CNT; i++)
-+			set_bit(dev->rep_bits, i);
-+		func(index, EVIOCGREP, dev->rep_values);
-+		if (rc < 0)
-+			goto out;
-+	}
-+
-+	for (i = ABS_X; i <= ABS_MAX; i++) {
-+		if (bit_is_set(dev->abs_bits, i)) {
-+			struct input_absinfo abs_info;
-+			rc = func(index, EVIOCGABS(i), &abs_info);
-+			if (rc < 0)
-+				goto out;
-+
-+			fix_invalid_absinfo(dev, i, &abs_info);
-+
-+			dev->abs_info[i] = abs_info;
-+		}
-+	}
-+
-+	dev->fd = index;
-+
-+	rc = init_slots(dev);
-+	if (rc != 0)
-+		goto out;
-+
-+	if (dev->num_slots != -1) {
-+		struct slot_change_state unused[dev->num_slots];
-+		sync_mt_state(dev, unused);
-+	}
-+
-+	rc = init_event_queue(dev);
-+	if (rc < 0) {
-+		dev->fd = -1;
-+		return -rc;
-+	}
-+
-+	/* not copying key state because we won't know when we'll start to
-+	 * use this fd and key's are likely to change state by then.
-+	 * Same with the valuators, really, but they may not change.
-+	 */
-+
-+	dev->initialized = true;
-+out:
-+	if (rc)
-+		libevdev_reset(dev);
-+	return rc ? -errno : 0;
-+
-+
-+
-+}
-+
-+
-+int
-+libevdev_new_from_index(int index, struct libevdev **dev,libevdev_ioctl func)
-+{
-+	struct libevdev *d;
-+	int rc;
-+
-+	d = libevdev_new();
-+	if (!d)
-+		return -ENOMEM;
-+
-+	rc = libevdev_set_index(d, index,func);
-+
-+
-+	if (rc < 0)
-+		libevdev_free(d);
-+	else
-+		*dev = d;
-+	return rc;
-+}
-diff -Naur old/libevdev/libevdev.h new/libevdev/libevdev.h
---- old/libevdev/libevdev.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/libevdev/libevdev.h	2021-01-01 00:00:00.000000000 +0800
-@@ -2359,6 +2359,10 @@
-  */
- int libevdev_get_repeat(const struct libevdev *dev, int *delay, int *period);
-
-+/* for hdf drv interface */
-+typedef int (*libevdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-+int libevdev_new_from_index(int index, struct libevdev **dev,libevdev_ioctl func);
-+
- /********* DEPRECATED SECTION *********/
- #if defined(__GNUC__) && __GNUC__ >= 4
- #define LIBEVDEV_DEPRECATED __attribute__ ((deprecated))
diff --git a/patch/diff_libinput_mmi/BUILD.gn b/patch/diff_libinput_mmi/BUILD.gn
index 08f78c70d0..35708afd30 100644
--- a/patch/diff_libinput_mmi/BUILD.gn
+++ b/patch/diff_libinput_mmi/BUILD.gn
@@ -18,9 +18,6 @@ gen_src_dir = "//third_party/libinput"
 gen_dst_dir = root_out_dir + "/diff_libinput_mmi"
 patches_root_dir = "//foundation/multimodalinput/input/patch"
 build_gn_dir = "$patches_root_dir/diff_libinput_mmi/libinput"
-if (input_feature_hdf) {
-  build_gn_dir = "$patches_root_dir/diff_libinput_mmi/hdf"
-}
 
 action("apply_patch") {
   visibility = [ ":*" ]
@@ -66,23 +63,14 @@ action("apply_patch") {
     "$gen_dst_dir/tools/libinput-debug-events.c",
     "$gen_dst_dir/tools/libinput-list-devices.c",
     "$gen_dst_dir/tools/libinput-debug-tablet.c",
+    "$gen_dst_dir/hm_src/hm_missing.h",
+    "$gen_dst_dir/hm_src/hm_missing.c",
+    "$gen_dst_dir/tools/libinput-record.c",
+    "$gen_dst_dir/tools/libinput-analyze.c",
+    "$gen_dst_dir/tools/libinput-measure.c",
+    "$gen_dst_dir/tools/libinput-quirks.c",
   ]
 
-  if (input_feature_libinput) {
-    outputs += [
-      "$gen_dst_dir/hm_src/hm_missing.h",
-      "$gen_dst_dir/hm_src/hm_missing.c",
-
-      "$gen_dst_dir/tools/libinput-record.c",
-
-      "$gen_dst_dir/tools/libinput-analyze.c",
-
-      "$gen_dst_dir/tools/libinput-measure.c",
-
-      "$gen_dst_dir/tools/libinput-quirks.c",
-    ]
-  }
-
   args = [
     rebase_path(gen_src_dir, root_build_dir),
     rebase_path(gen_dst_dir, root_build_dir),
@@ -96,30 +84,18 @@ config("libinput-third_config") {
   include_dirs = [
     "$gen_dst_dir/src",
     "$gen_dst_dir/include",
+    "$gen_dst_dir/hm_src",
   ]
 
-  if (input_feature_libinput) {
-    include_dirs += [ "$gen_dst_dir/hm_src" ]
-  }
-
-  if (input_feature_hdf) {
-    include_dirs += [ "$root_out_dir/diff_mtdev_hdf/include" ]
-  }
-
   cflags = [
     "-Wno-unused-parameter",
     "-Wno-implicit-int",
     "-Wno-return-type",
     "-Wno-unused-function",
     "-Wno-string-conversion",
+    "-DHAVE_LIBINPUT_LOG_CONSOLE_ENABLE",
+    "-DHAVE_LIBINPUT_LOG_ENABLE",
   ]
-
-  if (input_feature_libinput) {
-    cflags += [
-      "-DHAVE_LIBINPUT_LOG_CONSOLE_ENABLE",
-      "-DHAVE_LIBINPUT_LOG_ENABLE",
-    ]
-  }
 }
 
 config("libinput-third_public_config") {
@@ -130,10 +106,6 @@ config("libinput-third_public_config") {
     "$gen_dst_dir/src",
   ]
 
-  if (input_feature_hdf) {
-    include_dirs += [ "$root_out_dir/diff_mtdev_hdf/include" ]
-  }
-
   cflags = []
 }
 
@@ -183,21 +155,11 @@ ohos_source_set("patch_gen_libinput-third-mmi") {
 
   deps = [ ":apply_patch" ]
 
-  public_deps = [ "//third_party/eudev:libudev" ]
-
-  if (input_feature_libinput) {
-    public_deps += [
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
-
-  if (input_feature_hdf) {
-    public_deps += [
-      "//foundation/multimodalinput/input/patch/diff_libevdev_hdf:libevdev-hdf",
-      "//foundation/multimodalinput/input/patch/diff_mtdev_hdf:libmtdev-hdf",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 }
 
 ohos_shared_library("libinput-third-mmi") {
@@ -209,347 +171,335 @@ ohos_shared_library("libinput-third-mmi") {
 
   deps = [ ":patch_gen_libinput-third-mmi" ]
 
-  public_deps = [ "//third_party/eudev:libudev" ]
-
-  if (input_feature_libinput) {
-    public_deps += [
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
-
-  if (input_feature_hdf) {
-    public_deps += [
-      "//foundation/multimodalinput/input/patch/diff_libevdev_hdf:libevdev-hdf",
-      "//foundation/multimodalinput/input/patch/diff_mtdev_hdf:libmtdev-hdf",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
   part_name = "input"
   subsystem_name = "multimodalinput"
 }
 
-if (input_feature_libinput) {
-  ohos_source_set("patch_gen_libinput-debug") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/tools/libinput-debug-events.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-debug") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/tools/libinput-debug-events.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-debug-mmi") {
-    install_enable = true
+ohos_executable("libinput-debug-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-debug",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-debug",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+}
 
-  ohos_source_set("patch_gen_libinput-list") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/tools/libinput-list-devices.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-list") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/tools/libinput-list-devices.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-list-mmi") {
-    install_enable = true
+ohos_executable("libinput-list-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-list",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-list",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+}
 
-  ohos_source_set("patch_gen_libinput-tablet") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/tools/libinput-debug-tablet.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-tablet") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/tools/libinput-debug-tablet.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-tablet-mmi") {
-    install_enable = true
+ohos_executable("libinput-tablet-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-tablet",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-tablet",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+}
 
-  ohos_source_set("patch_gen_libinput-record") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/hm_src/hm_missing.c",
-      "$gen_dst_dir/tools/libinput-record.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-record") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/hm_src/hm_missing.c",
+    "$gen_dst_dir/tools/libinput-record.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-record-mmi") {
-    install_enable = true
+ohos_executable("libinput-record-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-record",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-record",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+}
 
-  ohos_source_set("patch_gen_libinput-analyze") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/tools/libinput-analyze.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-analyze") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/tools/libinput-analyze.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-analyze-mmi") {
-    install_enable = true
+ohos_executable("libinput-analyze-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-analyze",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-analyze",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+}
 
-  ohos_source_set("patch_gen_libinput-measure") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/tools/libinput-measure.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-measure") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/tools/libinput-measure.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-measure-mmi") {
-    install_enable = true
+ohos_executable("libinput-measure-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-measure",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-measure",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+}
 
-  ohos_source_set("patch_gen_libinput-quirks") {
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-    sources = [
-      "$gen_dst_dir/tools/libinput-quirks.c",
-      "$gen_dst_dir/tools/shared.c",
-      "$gen_dst_dir/tools/shared.h",
-    ]
+ohos_source_set("patch_gen_libinput-quirks") {
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  sources = [
+    "$gen_dst_dir/tools/libinput-quirks.c",
+    "$gen_dst_dir/tools/shared.c",
+    "$gen_dst_dir/tools/shared.h",
+  ]
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [ ":apply_patch" ]
+  deps = [ ":apply_patch" ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
-  }
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
+}
 
-  ohos_executable("libinput-quirks-mmi") {
-    install_enable = true
+ohos_executable("libinput-quirks-mmi") {
+  install_enable = true
 
-    sources = []
+  sources = []
 
-    configs = [ ":libinput-third_config" ]
+  configs = [ ":libinput-third_config" ]
 
-    public_configs = [ ":libinput-third_public_config" ]
+  public_configs = [ ":libinput-third_public_config" ]
 
-    deps = [
-      ":libinput-third-mmi",
-      ":patch_gen_libinput-quirks",
-    ]
+  deps = [
+    ":libinput-third-mmi",
+    ":patch_gen_libinput-quirks",
+  ]
 
-    public_deps = [
-      "//third_party/eudev:libudev",
-      "//third_party/libevdev:libevdev",
-      "//third_party/mtdev:libmtdev",
-    ]
+  public_deps = [
+    "//third_party/eudev:libudev",
+    "//third_party/libevdev:libevdev",
+    "//third_party/mtdev:libmtdev",
+  ]
 
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
+  part_name = "input"
+  subsystem_name = "multimodalinput"
 }
diff --git a/patch/diff_libinput_mmi/hdf/libinput_hdf_0000.diff b/patch/diff_libinput_mmi/hdf/libinput_hdf_0000.diff
deleted file mode 100644
index d0ef53907e..0000000000
--- a/patch/diff_libinput_mmi/hdf/libinput_hdf_0000.diff
+++ /dev/null
@@ -1,4956 +0,0 @@
-Copyright (c) 2021-2022 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
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-diff -Naur old/BUILD.gn new/BUILD.gn
---- old/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
-+++ new/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
-@@ -15,19 +15,23 @@
-     "-Wno-return-type",
-     "-Wno-unused-function",
-     "-Wno-string-conversion",
-+    "-Bsymbolic",
-   ]
- }
-
- config("libinput-third_public_config") {
-   include_dirs = [
-     "export_include",
-+    "include",
-+    "include/linux/linux",
-+    "src",
-   ]
-
-   cflags = [
-   ]
- }
-
--ohos_shared_library("libinput-third") {
-+ohos_shared_library("libinput-third-hdf") {
-   sources = [
-     "src/util-list.c",
-     "src/util-ratelimit.c",
-@@ -61,7 +65,8 @@
-     "src/path-seat.c",
-     "src/udev-seat.c",
-     "src/timer.c",
--#    "src/libinput-util.c",
-+    "src/libinput-util.c",
-+    "src/evdev-joystick.c",
-   ]
-
-   configs = [
-@@ -76,9 +81,9 @@
-   ]
-
-   public_deps = [
--    "//third_party/libevdev:libevdev",
-+    "//third_party/patch_libevdev_hdf:libevdev-hdf",
-     "//third_party/eudev:libudev",
--    "//third_party/mtdev:libmtdev",
-+    "//third_party/patch_mtdev_hdf:libmtdev-hdf",
-   ]
-
-   part_name = "input"
-@@ -86,92 +91,3 @@
- ## Build libinput-third.so }}}
-
--ohos_executable("libinput-debug") {
--  install_enable = true
--
--  sources = [
--    "tools/shared.h",
--    "tools/shared.c",
--    "tools/libinput-debug-events.c",
--  ]
--
--  configs = [
--    ":libinput-third_config",
--  ]
--
--  public_configs = [
--    ":libinput-third_public_config",
--  ]
--
--  deps = [
--    ":libinput-third",
--  ]
--
--  public_deps = [
--    "//third_party/libevdev:libevdev",
--    "//third_party/eudev:libudev",
--    "//third_party/mtdev:libmtdev",
--  ]
--
--  part_name = "multimodalinput_base"
--}
--
--ohos_executable("libinput-list") {
--  install_enable = true
--
--  sources = [
--    "tools/shared.h",
--    "tools/shared.c",
--    "tools/libinput-list-devices.c",
--  ]
--
--  configs = [
--    ":libinput-third_config",
--  ]
--
--  public_configs = [
--    ":libinput-third_public_config",
--  ]
--
--  deps = [
--    ":libinput-third",
--  ]
--
--  public_deps = [
--    "//third_party/libevdev:libevdev",
--    "//third_party/eudev:libudev",
--    "//third_party/mtdev:libmtdev",
--  ]
--
--  part_name = "multimodalinput_base"
--}
--
--ohos_executable("libinput-tablet") {
--  install_enable = true
--
--  sources = [
--    "tools/shared.h",
--    "tools/shared.c",
--    "tools/libinput-debug-tablet.c",
--  ]
--
--  configs = [
--    ":libinput-third_config",
--  ]
--
--  public_configs = [
--    ":libinput-third_public_config",
--  ]
--
--  deps = [
--    ":libinput-third",
--  ]
--
--  public_deps = [
--    "//third_party/libevdev:libevdev",
--    "//third_party/eudev:libudev",
--    "//third_party/mtdev:libmtdev",
--  ]
--
--  part_name = "multimodalinput_base"
--}
-\ No newline at end of file
-diff -Naur old/export_include/libinput.h new/export_include/libinput.h
---- old/export_include/libinput.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/export_include/libinput.h	2021-01-01 00:00:00.000000000 +0800
-@@ -33,6 +33,7 @@
- #include <stdint.h>
- #include <stdarg.h>
- #include <libudev.h>
-+#include "util-bits.h"
-
- #define LIBINPUT_ATTRIBUTE_PRINTF(_format, _args) \
- 	__attribute__ ((format (printf, _format, _args)))
-@@ -196,6 +197,22 @@
- 	LIBINPUT_DEVICE_CAP_TABLET_PAD = 4,
- 	LIBINPUT_DEVICE_CAP_GESTURE = 5,
- 	LIBINPUT_DEVICE_CAP_SWITCH = 6,
-+	LIBINPUT_DEVICE_CAP_JOYSTICK = 7,
-+};
-+
-+enum evdev_device_udev_tags {
-+    EVDEV_UDEV_TAG_INPUT = bit(0),
-+    EVDEV_UDEV_TAG_KEYBOARD = bit(1),
-+    EVDEV_UDEV_TAG_MOUSE = bit(2),
-+    EVDEV_UDEV_TAG_TOUCHPAD = bit(3),
-+    EVDEV_UDEV_TAG_TOUCHSCREEN = bit(4),
-+    EVDEV_UDEV_TAG_TABLET = bit(5),
-+    EVDEV_UDEV_TAG_JOYSTICK = bit(6),
-+    EVDEV_UDEV_TAG_ACCELEROMETER = bit(7),
-+    EVDEV_UDEV_TAG_TABLET_PAD = bit(8),
-+    EVDEV_UDEV_TAG_POINTINGSTICK = bit(9),
-+    EVDEV_UDEV_TAG_TRACKBALL = bit(10),
-+    EVDEV_UDEV_TAG_SWITCH = bit(11),
- };
-
- /**
-@@ -315,6 +332,49 @@
- };
-
- /**
-+ * @ingroup event_joystick
-+ *
-+ * The source for a @ref LIBINPUT_EVENT_POINTER_AXIS event. See
-+ * libinput_event_get_joystick_axis_event() for details.
-+ *
-+ * @since 1.16.4
-+ */
-+enum libinput_joystick_axis_source {
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_UNKNOW = 0,
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_X = bit(0),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Y = bit(1),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Z = bit(2),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RX = bit(3),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RY = bit(4),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RZ = bit(5),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_THROTTLE = bit(6),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RUDDER = bit(7),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_WHEEL = bit(8),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_GAS = bit(9),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_BRAKE = bit(10),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0X = bit(11),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0Y = bit(12),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT1X = bit(13),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT1Y = bit(14),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT2X = bit(15),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT2Y = bit(16),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT3X = bit(17),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT3Y = bit(18),
-+};
-+
-+#define MAX_SOLTED_COORDS_NUM 10
-+struct sloted_coords {
-+	bool is_active;
-+	float x;
-+	float y;
-+};
-+
-+struct sloted_coords_info {
-+	struct sloted_coords coords[MAX_SOLTED_COORDS_NUM];
-+	unsigned int active_count;
-+};
-+
-+/**
-  * @ingroup device
-  *
-  * Available tool types for a device with the @ref
-@@ -387,6 +447,17 @@
- 	LIBINPUT_TABLET_TOOL_TIP_DOWN = 1,
- };
-
-+struct libinput_event_joystick_axis_abs_info {
-+	int32_t code;
-+	int32_t value;
-+	int32_t minimum;
-+	int32_t maximum;
-+	int32_t fuzz;
-+	int32_t flat;
-+	int32_t resolution;
-+	float	standardValue;
-+};
-+
- /**
-  * @defgroup tablet_pad_modes Tablet pad modes
-  *
-@@ -1893,6 +1964,12 @@
- libinput_event_gesture_get_angle_delta(struct libinput_event_gesture *event);
-
- /**
-+ * 获取带slot的touches信息, 仅支持LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE
-+ */
-+struct sloted_coords_info *
-+libinput_event_gesture_get_solt_touches(struct libinput_event_gesture *event);
-+
-+/**
-  * @defgroup event_tablet Tablet events
-  *
-  * Events that come from tools on tablet devices. For events from the pad,
-@@ -3466,6 +3543,46 @@
- int
- libinput_dispatch(struct libinput *libinput);
-
-+/****************************************************************************
-+* @brief : brief
-+* @author : fms
-+* @date : 2021/3/8 20:55
-+* @version : ver 1.0
-+* @inparam :libinput  event
-+* @outparam :
-+*****************************************************************************/
-+void
-+libinput_post_handle_event(struct libinput* libinput,
-+	struct libinput_event* event);
-+
-+/****************************************************************************
-+* @brief : get joystick button event
-+* @author : fms
-+* @date : 2021/3/12 10:56
-+* @version : ver 1.0
-+* @inparam :
-+* @outparam :
-+*****************************************************************************/
-+struct libinput_event_joystick_axis *
-+libinput_event_get_joystick_axis_event(struct libinput_event *event);
-+
-+/**
-+ * @brief 获取轴事件的时间
-+ */
-+uint64_t
-+libinput_event_get_joystick_axis_time(struct libinput_event_joystick_axis *event);
-+
-+/**
-+ * @brief 获取joystick指定轴的数据是否变化
-+*/
-+bool libinput_event_get_joystick_axis_value_is_changed(struct libinput_event_joystick_axis *event, enum libinput_joystick_axis_source axis);
-+
-+/**
-+ * @brief 获取joystick指定轴的abs信息
-+*/
-+struct libinput_event_joystick_axis_abs_info *
-+libinput_event_get_joystick_axis_abs_info(struct libinput_event_joystick_axis *event, enum libinput_joystick_axis_source axis);
-+
- /**
-  * @ingroup base
-  *
-@@ -3936,6 +4053,10 @@
- const char *
- libinput_device_get_name(struct libinput_device *device);
-
-+/**  @brief   获取设备类型*/
-+enum evdev_device_udev_tags
-+libinput_device_get_tags(struct libinput_device* device);
-+
- /**
-  * @ingroup device
-  *
-@@ -5928,7 +6049,97 @@
- unsigned int
- libinput_device_config_rotation_get_default_angle(struct libinput_device *device);
-
-+struct uhdf;
-+
-+int uhdfdevice_added(struct libinput *input,struct uhdf *uhdf,const char *seat_name);
-+
-+struct libinput * libinput_hdf_create_context(const struct libinput_interface *interface,void *user_data);
-+
-+void uhdfdevice_removed(struct uhdf *uhdf);
-+
-+struct evdev_device;
-+struct input_event;
-+void evdev_device_dispatch_two(struct evdev_device *device,
-+                struct input_event *ev);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the struct libinput_event_joystick_button from the event.
-+ *
-+ * @param event The libinput event
-+ * @return The libinput_event_joystick_button for this event.
-+ */
-+struct libinput_event_joystick_button*
-+libinput_event_get_joystick_pointer_button_event(struct libinput_event* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the time from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The time for this event.
-+ */
-+uint64_t libinput_event_joystick_button_time(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the key value from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The key value for this event.
-+ */
-+uint32_t libinput_event_joystick_button_get_key(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the seat key count from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The seat key count for this event.
-+ */
-+uint32_t libinput_event_joystick_button_get_seat_key_count(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the value count from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The value for this event.
-+ */
-+int libinput_event_joystick_button_get_value(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup config
-+ *
-+ * Get the pressure of the touch screen
-+ *
-+ * @param Carried libinput event
-+ * @return Pressure value of touch screen
-+ *
-+ * @since 1.4
-+ */
-+double
-+libinput_event_get_touch_pressure(struct libinput_event* event);
-+
-+const char*
-+libinput_device_get_phys(struct libinput_device* device);
-+bool libinput_pipe(struct libinput *libinput);
-+int libinput_pipe_write(struct libinput *libinput, int index,const void *buf, int count);
-+
-+int libinput_pipe_read(struct libinput *libinput, int index,void *buf, int count);
-+int libinput_devpipe_write(struct libinput *libinput,void *buf, int count);
-+int libinput_devpipe_read(struct libinput *libinput, void *buf, int count);
-+int libinput_get_pipe_bytes(struct libinput *libinput, int index);
-+
-+enum libinput_key_state
-+libinput_event_joystick_button_get_key_state(struct libinput_event_joystick_button* event);
- #ifdef __cplusplus
- }
- #endif
- #endif /* LIBINPUT_H */
-+
-diff -Naur old/include/config.h new/include/config.h
---- old/include/config.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/include/config.h	2021-01-01 00:00:00.000000000 +0800
-@@ -18,14 +18,17 @@
- #endif
- #define HTTP_DOC_LINK "https://wayland.freedesktop.org/libinput/doc/latest"
-
--#define LIBINPUT_QUIRKS_DIR "/usr/share/libinput"
-+#define LIBINPUT_QUIRKS_DIR "/etc/libinput/quirks"
-
--#define LIBINPUT_QUIRKS_OVERRIDE_FILE "/etc/libinput/local-overrides.quirks"
-+#define LIBINPUT_QUIRKS_OVERRIDE_FILE "/etc/libinput/quirks/local-overrides.quirks"
-+
-+#define LIBINPUT_QUIRKS_SRCDIR "/etc/libinput/quirks"
-+
-+#define LIBINPUT_TOOL_PATH "/data/libinput"
-+
-+#define MESON_BUILD_ROOT "/data/libinput"
-
- #undef NDEBUG
--#define LIBINPUT_TOOL_PATH ""
--#define LIBINPUT_QUIRKS_SRCDIR ""
--#define MESON_BUILD_ROOT ""
- #ifndef static_assert
- # ifdef _Static_assert
- #  define static_assert(cond, msg) _Static_assert(cond, msg)
-@@ -36,3 +39,10 @@
-
- #define index strchr
- #define ffs __builtin_ffs
-+
-+#ifdef HAVE_LIBINPUT_LOG_ENABLE
-+#define _LIBINPUT_LOG_DIR "/data/log/libinput"
-+#define _LIBINPUT_LOG_PATH "/data/log/libinput/libinput.log"
-+#endif
-+
-+
-diff -Naur old/include/linux/linux/input-event-codes.h new/include/linux/linux/input-event-codes.h
---- old/include/linux/linux/input-event-codes.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/include/linux/linux/input-event-codes.h	1970-01-01 08:00:00.000000000 +0800
-@@ -1,945 +0,0 @@
--/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
--/*
-- * Input event codes
-- *
-- *    *** IMPORTANT ***
-- * This file is not only included from C-code but also from devicetree source
-- * files. As such this file MUST only contain comments and defines.
-- *
-- * Copyright (c) 1999-2002 Vojtech Pavlik
-- * Copyright (c) 2015 Hans de Goede <hdegoede@redhat.com>
-- *
-- * This program is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 as published by
-- * the Free Software Foundation.
-- */
--#ifndef _UAPI_INPUT_EVENT_CODES_H
--#define _UAPI_INPUT_EVENT_CODES_H
--
--/*
-- * Device properties and quirks
-- */
--
--#define INPUT_PROP_POINTER		0x00	/* needs a pointer */
--#define INPUT_PROP_DIRECT		0x01	/* direct input devices */
--#define INPUT_PROP_BUTTONPAD		0x02	/* has button(s) under pad */
--#define INPUT_PROP_SEMI_MT		0x03	/* touch rectangle only */
--#define INPUT_PROP_TOPBUTTONPAD		0x04	/* softbuttons at top of pad */
--#define INPUT_PROP_POINTING_STICK	0x05	/* is a pointing stick */
--#define INPUT_PROP_ACCELEROMETER	0x06	/* has accelerometer */
--
--#define INPUT_PROP_MAX			0x1f
--#define INPUT_PROP_CNT			(INPUT_PROP_MAX + 1)
--
--/*
-- * Event types
-- */
--
--#define EV_SYN			0x00
--#define EV_KEY			0x01
--#define EV_REL			0x02
--#define EV_ABS			0x03
--#define EV_MSC			0x04
--#define EV_SW			0x05
--#define EV_LED			0x11
--#define EV_SND			0x12
--#define EV_REP			0x14
--#define EV_FF			0x15
--#define EV_PWR			0x16
--#define EV_FF_STATUS		0x17
--#define EV_MAX			0x1f
--#define EV_CNT			(EV_MAX+1)
--
--/*
-- * Synchronization events.
-- */
--
--#define SYN_REPORT		0
--#define SYN_CONFIG		1
--#define SYN_MT_REPORT		2
--#define SYN_DROPPED		3
--#define SYN_MAX			0xf
--#define SYN_CNT			(SYN_MAX+1)
--
--/*
-- * Keys and buttons
-- *
-- * Most of the keys/buttons are modeled after USB HUT 1.12
-- * (see http://www.usb.org/developers/hidpage).
-- * Abbreviations in the comments:
-- * AC - Application Control
-- * AL - Application Launch Button
-- * SC - System Control
-- */
--
--#define KEY_RESERVED		0
--#define KEY_ESC			1
--#define KEY_1			2
--#define KEY_2			3
--#define KEY_3			4
--#define KEY_4			5
--#define KEY_5			6
--#define KEY_6			7
--#define KEY_7			8
--#define KEY_8			9
--#define KEY_9			10
--#define KEY_0			11
--#define KEY_MINUS		12
--#define KEY_EQUAL		13
--#define KEY_BACKSPACE		14
--#define KEY_TAB			15
--#define KEY_Q			16
--#define KEY_W			17
--#define KEY_E			18
--#define KEY_R			19
--#define KEY_T			20
--#define KEY_Y			21
--#define KEY_U			22
--#define KEY_I			23
--#define KEY_O			24
--#define KEY_P			25
--#define KEY_LEFTBRACE		26
--#define KEY_RIGHTBRACE		27
--#define KEY_ENTER		28
--#define KEY_LEFTCTRL		29
--#define KEY_A			30
--#define KEY_S			31
--#define KEY_D			32
--#define KEY_F			33
--#define KEY_G			34
--#define KEY_H			35
--#define KEY_J			36
--#define KEY_K			37
--#define KEY_L			38
--#define KEY_SEMICOLON		39
--#define KEY_APOSTROPHE		40
--#define KEY_GRAVE		41
--#define KEY_LEFTSHIFT		42
--#define KEY_BACKSLASH		43
--#define KEY_Z			44
--#define KEY_X			45
--#define KEY_C			46
--#define KEY_V			47
--#define KEY_B			48
--#define KEY_N			49
--#define KEY_M			50
--#define KEY_COMMA		51
--#define KEY_DOT			52
--#define KEY_SLASH		53
--#define KEY_RIGHTSHIFT		54
--#define KEY_KPASTERISK		55
--#define KEY_LEFTALT		56
--#define KEY_SPACE		57
--#define KEY_CAPSLOCK		58
--#define KEY_F1			59
--#define KEY_F2			60
--#define KEY_F3			61
--#define KEY_F4			62
--#define KEY_F5			63
--#define KEY_F6			64
--#define KEY_F7			65
--#define KEY_F8			66
--#define KEY_F9			67
--#define KEY_F10			68
--#define KEY_NUMLOCK		69
--#define KEY_SCROLLLOCK		70
--#define KEY_KP7			71
--#define KEY_KP8			72
--#define KEY_KP9			73
--#define KEY_KPMINUS		74
--#define KEY_KP4			75
--#define KEY_KP5			76
--#define KEY_KP6			77
--#define KEY_KPPLUS		78
--#define KEY_KP1			79
--#define KEY_KP2			80
--#define KEY_KP3			81
--#define KEY_KP0			82
--#define KEY_KPDOT		83
--
--#define KEY_ZENKAKUHANKAKU	85
--#define KEY_102ND		86
--#define KEY_F11			87
--#define KEY_F12			88
--#define KEY_RO			89
--#define KEY_KATAKANA		90
--#define KEY_HIRAGANA		91
--#define KEY_HENKAN		92
--#define KEY_KATAKANAHIRAGANA	93
--#define KEY_MUHENKAN		94
--#define KEY_KPJPCOMMA		95
--#define KEY_KPENTER		96
--#define KEY_RIGHTCTRL		97
--#define KEY_KPSLASH		98
--#define KEY_SYSRQ		99
--#define KEY_RIGHTALT		100
--#define KEY_LINEFEED		101
--#define KEY_HOME		102
--#define KEY_UP			103
--#define KEY_PAGEUP		104
--#define KEY_LEFT		105
--#define KEY_RIGHT		106
--#define KEY_END			107
--#define KEY_DOWN		108
--#define KEY_PAGEDOWN		109
--#define KEY_INSERT		110
--#define KEY_DELETE		111
--#define KEY_MACRO		112
--#define KEY_MUTE		113
--#define KEY_VOLUMEDOWN		114
--#define KEY_VOLUMEUP		115
--#define KEY_POWER		116	/* SC System Power Down */
--#define KEY_KPEQUAL		117
--#define KEY_KPPLUSMINUS		118
--#define KEY_PAUSE		119
--#define KEY_SCALE		120	/* AL Compiz Scale (Expose) */
--
--#define KEY_KPCOMMA		121
--#define KEY_HANGEUL		122
--#define KEY_HANGUEL		KEY_HANGEUL
--#define KEY_HANJA		123
--#define KEY_YEN			124
--#define KEY_LEFTMETA		125
--#define KEY_RIGHTMETA		126
--#define KEY_COMPOSE		127
--
--#define KEY_STOP		128	/* AC Stop */
--#define KEY_AGAIN		129
--#define KEY_PROPS		130	/* AC Properties */
--#define KEY_UNDO		131	/* AC Undo */
--#define KEY_FRONT		132
--#define KEY_COPY		133	/* AC Copy */
--#define KEY_OPEN		134	/* AC Open */
--#define KEY_PASTE		135	/* AC Paste */
--#define KEY_FIND		136	/* AC Search */
--#define KEY_CUT			137	/* AC Cut */
--#define KEY_HELP		138	/* AL Integrated Help Center */
--#define KEY_MENU		139	/* Menu (show menu) */
--#define KEY_CALC		140	/* AL Calculator */
--#define KEY_SETUP		141
--#define KEY_SLEEP		142	/* SC System Sleep */
--#define KEY_WAKEUP		143	/* System Wake Up */
--#define KEY_FILE		144	/* AL Local Machine Browser */
--#define KEY_SENDFILE		145
--#define KEY_DELETEFILE		146
--#define KEY_XFER		147
--#define KEY_PROG1		148
--#define KEY_PROG2		149
--#define KEY_WWW			150	/* AL Internet Browser */
--#define KEY_MSDOS		151
--#define KEY_COFFEE		152	/* AL Terminal Lock/Screensaver */
--#define KEY_SCREENLOCK		KEY_COFFEE
--#define KEY_ROTATE_DISPLAY	153	/* Display orientation for e.g. tablets */
--#define KEY_DIRECTION		KEY_ROTATE_DISPLAY
--#define KEY_CYCLEWINDOWS	154
--#define KEY_MAIL		155
--#define KEY_BOOKMARKS		156	/* AC Bookmarks */
--#define KEY_COMPUTER		157
--#define KEY_BACK		158	/* AC Back */
--#define KEY_FORWARD		159	/* AC Forward */
--#define KEY_CLOSECD		160
--#define KEY_EJECTCD		161
--#define KEY_EJECTCLOSECD	162
--#define KEY_NEXTSONG		163
--#define KEY_PLAYPAUSE		164
--#define KEY_PREVIOUSSONG	165
--#define KEY_STOPCD		166
--#define KEY_RECORD		167
--#define KEY_REWIND		168
--#define KEY_PHONE		169	/* Media Select Telephone */
--#define KEY_ISO			170
--#define KEY_CONFIG		171	/* AL Consumer Control Configuration */
--#define KEY_HOMEPAGE		172	/* AC Home */
--#define KEY_REFRESH		173	/* AC Refresh */
--#define KEY_EXIT		174	/* AC Exit */
--#define KEY_MOVE		175
--#define KEY_EDIT		176
--#define KEY_SCROLLUP		177
--#define KEY_SCROLLDOWN		178
--#define KEY_KPLEFTPAREN		179
--#define KEY_KPRIGHTPAREN	180
--#define KEY_NEW			181	/* AC New */
--#define KEY_REDO		182	/* AC Redo/Repeat */
--
--#define KEY_F13			183
--#define KEY_F14			184
--#define KEY_F15			185
--#define KEY_F16			186
--#define KEY_F17			187
--#define KEY_F18			188
--#define KEY_F19			189
--#define KEY_F20			190
--#define KEY_F21			191
--#define KEY_F22			192
--#define KEY_F23			193
--#define KEY_F24			194
--
--#define KEY_PLAYCD		200
--#define KEY_PAUSECD		201
--#define KEY_PROG3		202
--#define KEY_PROG4		203
--#define KEY_DASHBOARD		204	/* AL Dashboard */
--#define KEY_SUSPEND		205
--#define KEY_CLOSE		206	/* AC Close */
--#define KEY_PLAY		207
--#define KEY_FASTFORWARD		208
--#define KEY_BASSBOOST		209
--#define KEY_PRINT		210	/* AC Print */
--#define KEY_HP			211
--#define KEY_CAMERA		212
--#define KEY_SOUND		213
--#define KEY_QUESTION		214
--#define KEY_EMAIL		215
--#define KEY_CHAT		216
--#define KEY_SEARCH		217
--#define KEY_CONNECT		218
--#define KEY_FINANCE		219	/* AL Checkbook/Finance */
--#define KEY_SPORT		220
--#define KEY_SHOP		221
--#define KEY_ALTERASE		222
--#define KEY_CANCEL		223	/* AC Cancel */
--#define KEY_BRIGHTNESSDOWN	224
--#define KEY_BRIGHTNESSUP	225
--#define KEY_MEDIA		226
--
--#define KEY_SWITCHVIDEOMODE	227	/* Cycle between available video
--					   outputs (Monitor/LCD/TV-out/etc) */
--#define KEY_KBDILLUMTOGGLE	228
--#define KEY_KBDILLUMDOWN	229
--#define KEY_KBDILLUMUP		230
--
--#define KEY_SEND		231	/* AC Send */
--#define KEY_REPLY		232	/* AC Reply */
--#define KEY_FORWARDMAIL		233	/* AC Forward Msg */
--#define KEY_SAVE		234	/* AC Save */
--#define KEY_DOCUMENTS		235
--
--#define KEY_BATTERY		236
--
--#define KEY_BLUETOOTH		237
--#define KEY_WLAN		238
--#define KEY_UWB			239
--
--#define KEY_UNKNOWN		240
--
--#define KEY_VIDEO_NEXT		241	/* drive next video source */
--#define KEY_VIDEO_PREV		242	/* drive previous video source */
--#define KEY_BRIGHTNESS_CYCLE	243	/* brightness up, after max is min */
--#define KEY_BRIGHTNESS_AUTO	244	/* Set Auto Brightness: manual
--					  brightness control is off,
--					  rely on ambient */
--#define KEY_BRIGHTNESS_ZERO	KEY_BRIGHTNESS_AUTO
--#define KEY_DISPLAY_OFF		245	/* display device to off state */
--
--#define KEY_WWAN		246	/* Wireless WAN (LTE, UMTS, GSM, etc.) */
--#define KEY_WIMAX		KEY_WWAN
--#define KEY_RFKILL		247	/* Key that controls all radios */
--
--#define KEY_MICMUTE		248	/* Mute / unmute the microphone */
--
--/* Code 255 is reserved for special needs of AT keyboard driver */
--
--#define BTN_MISC		0x100
--#define BTN_0			0x100
--#define BTN_1			0x101
--#define BTN_2			0x102
--#define BTN_3			0x103
--#define BTN_4			0x104
--#define BTN_5			0x105
--#define BTN_6			0x106
--#define BTN_7			0x107
--#define BTN_8			0x108
--#define BTN_9			0x109
--
--#define BTN_MOUSE		0x110
--#define BTN_LEFT		0x110
--#define BTN_RIGHT		0x111
--#define BTN_MIDDLE		0x112
--#define BTN_SIDE		0x113
--#define BTN_EXTRA		0x114
--#define BTN_FORWARD		0x115
--#define BTN_BACK		0x116
--#define BTN_TASK		0x117
--
--#define BTN_JOYSTICK		0x120
--#define BTN_TRIGGER		0x120
--#define BTN_THUMB		0x121
--#define BTN_THUMB2		0x122
--#define BTN_TOP			0x123
--#define BTN_TOP2		0x124
--#define BTN_PINKIE		0x125
--#define BTN_BASE		0x126
--#define BTN_BASE2		0x127
--#define BTN_BASE3		0x128
--#define BTN_BASE4		0x129
--#define BTN_BASE5		0x12a
--#define BTN_BASE6		0x12b
--#define BTN_DEAD		0x12f
--
--#define BTN_GAMEPAD		0x130
--#define BTN_SOUTH		0x130
--#define BTN_A			BTN_SOUTH
--#define BTN_EAST		0x131
--#define BTN_B			BTN_EAST
--#define BTN_C			0x132
--#define BTN_NORTH		0x133
--#define BTN_X			BTN_NORTH
--#define BTN_WEST		0x134
--#define BTN_Y			BTN_WEST
--#define BTN_Z			0x135
--#define BTN_TL			0x136
--#define BTN_TR			0x137
--#define BTN_TL2			0x138
--#define BTN_TR2			0x139
--#define BTN_SELECT		0x13a
--#define BTN_START		0x13b
--#define BTN_MODE		0x13c
--#define BTN_THUMBL		0x13d
--#define BTN_THUMBR		0x13e
--
--#define BTN_DIGI		0x140
--#define BTN_TOOL_PEN		0x140
--#define BTN_TOOL_RUBBER		0x141
--#define BTN_TOOL_BRUSH		0x142
--#define BTN_TOOL_PENCIL		0x143
--#define BTN_TOOL_AIRBRUSH	0x144
--#define BTN_TOOL_FINGER		0x145
--#define BTN_TOOL_MOUSE		0x146
--#define BTN_TOOL_LENS		0x147
--#define BTN_TOOL_QUINTTAP	0x148	/* Five fingers on trackpad */
--#define BTN_STYLUS3		0x149
--#define BTN_TOUCH		0x14a
--#define BTN_STYLUS		0x14b
--#define BTN_STYLUS2		0x14c
--#define BTN_TOOL_DOUBLETAP	0x14d
--#define BTN_TOOL_TRIPLETAP	0x14e
--#define BTN_TOOL_QUADTAP	0x14f	/* Four fingers on trackpad */
--
--#define BTN_WHEEL		0x150
--#define BTN_GEAR_DOWN		0x150
--#define BTN_GEAR_UP		0x151
--
--#define KEY_OK			0x160
--#define KEY_SELECT		0x161
--#define KEY_GOTO		0x162
--#define KEY_CLEAR		0x163
--#define KEY_POWER2		0x164
--#define KEY_OPTION		0x165
--#define KEY_INFO		0x166	/* AL OEM Features/Tips/Tutorial */
--#define KEY_TIME		0x167
--#define KEY_VENDOR		0x168
--#define KEY_ARCHIVE		0x169
--#define KEY_PROGRAM		0x16a	/* Media Select Program Guide */
--#define KEY_CHANNEL		0x16b
--#define KEY_FAVORITES		0x16c
--#define KEY_EPG			0x16d
--#define KEY_PVR			0x16e	/* Media Select Home */
--#define KEY_MHP			0x16f
--#define KEY_LANGUAGE		0x170
--#define KEY_TITLE		0x171
--#define KEY_SUBTITLE		0x172
--#define KEY_ANGLE		0x173
--#define KEY_FULL_SCREEN		0x174	/* AC View Toggle */
--#define KEY_ZOOM		KEY_FULL_SCREEN
--#define KEY_MODE		0x175
--#define KEY_KEYBOARD		0x176
--#define KEY_ASPECT_RATIO	0x177	/* HUTRR37: Aspect */
--#define KEY_SCREEN		KEY_ASPECT_RATIO
--#define KEY_PC			0x178	/* Media Select Computer */
--#define KEY_TV			0x179	/* Media Select TV */
--#define KEY_TV2			0x17a	/* Media Select Cable */
--#define KEY_VCR			0x17b	/* Media Select VCR */
--#define KEY_VCR2		0x17c	/* VCR Plus */
--#define KEY_SAT			0x17d	/* Media Select Satellite */
--#define KEY_SAT2		0x17e
--#define KEY_CD			0x17f	/* Media Select CD */
--#define KEY_TAPE		0x180	/* Media Select Tape */
--#define KEY_RADIO		0x181
--#define KEY_TUNER		0x182	/* Media Select Tuner */
--#define KEY_PLAYER		0x183
--#define KEY_TEXT		0x184
--#define KEY_DVD			0x185	/* Media Select DVD */
--#define KEY_AUX			0x186
--#define KEY_MP3			0x187
--#define KEY_AUDIO		0x188	/* AL Audio Browser */
--#define KEY_VIDEO		0x189	/* AL Movie Browser */
--#define KEY_DIRECTORY		0x18a
--#define KEY_LIST		0x18b
--#define KEY_MEMO		0x18c	/* Media Select Messages */
--#define KEY_CALENDAR		0x18d
--#define KEY_RED			0x18e
--#define KEY_GREEN		0x18f
--#define KEY_YELLOW		0x190
--#define KEY_BLUE		0x191
--#define KEY_CHANNELUP		0x192	/* Channel Increment */
--#define KEY_CHANNELDOWN		0x193	/* Channel Decrement */
--#define KEY_FIRST		0x194
--#define KEY_LAST		0x195	/* Recall Last */
--#define KEY_AB			0x196
--#define KEY_NEXT		0x197
--#define KEY_RESTART		0x198
--#define KEY_SLOW		0x199
--#define KEY_SHUFFLE		0x19a
--#define KEY_BREAK		0x19b
--#define KEY_PREVIOUS		0x19c
--#define KEY_DIGITS		0x19d
--#define KEY_TEEN		0x19e
--#define KEY_TWEN		0x19f
--#define KEY_VIDEOPHONE		0x1a0	/* Media Select Video Phone */
--#define KEY_GAMES		0x1a1	/* Media Select Games */
--#define KEY_ZOOMIN		0x1a2	/* AC Zoom In */
--#define KEY_ZOOMOUT		0x1a3	/* AC Zoom Out */
--#define KEY_ZOOMRESET		0x1a4	/* AC Zoom */
--#define KEY_WORDPROCESSOR	0x1a5	/* AL Word Processor */
--#define KEY_EDITOR		0x1a6	/* AL Text Editor */
--#define KEY_SPREADSHEET		0x1a7	/* AL Spreadsheet */
--#define KEY_GRAPHICSEDITOR	0x1a8	/* AL Graphics Editor */
--#define KEY_PRESENTATION	0x1a9	/* AL Presentation App */
--#define KEY_DATABASE		0x1aa	/* AL Database App */
--#define KEY_NEWS		0x1ab	/* AL Newsreader */
--#define KEY_VOICEMAIL		0x1ac	/* AL Voicemail */
--#define KEY_ADDRESSBOOK		0x1ad	/* AL Contacts/Address Book */
--#define KEY_MESSENGER		0x1ae	/* AL Instant Messaging */
--#define KEY_DISPLAYTOGGLE	0x1af	/* Turn display (LCD) on and off */
--#define KEY_BRIGHTNESS_TOGGLE	KEY_DISPLAYTOGGLE
--#define KEY_SPELLCHECK		0x1b0   /* AL Spell Check */
--#define KEY_LOGOFF		0x1b1   /* AL Logoff */
--
--#define KEY_DOLLAR		0x1b2
--#define KEY_EURO		0x1b3
--
--#define KEY_FRAMEBACK		0x1b4	/* Consumer - transport controls */
--#define KEY_FRAMEFORWARD	0x1b5
--#define KEY_CONTEXT_MENU	0x1b6	/* GenDesc - system context menu */
--#define KEY_MEDIA_REPEAT	0x1b7	/* Consumer - transport control */
--#define KEY_10CHANNELSUP	0x1b8	/* 10 channels up (10+) */
--#define KEY_10CHANNELSDOWN	0x1b9	/* 10 channels down (10-) */
--#define KEY_IMAGES		0x1ba	/* AL Image Browser */
--
--#define KEY_DEL_EOL		0x1c0
--#define KEY_DEL_EOS		0x1c1
--#define KEY_INS_LINE		0x1c2
--#define KEY_DEL_LINE		0x1c3
--
--#define KEY_FN			0x1d0
--#define KEY_FN_ESC		0x1d1
--#define KEY_FN_F1		0x1d2
--#define KEY_FN_F2		0x1d3
--#define KEY_FN_F3		0x1d4
--#define KEY_FN_F4		0x1d5
--#define KEY_FN_F5		0x1d6
--#define KEY_FN_F6		0x1d7
--#define KEY_FN_F7		0x1d8
--#define KEY_FN_F8		0x1d9
--#define KEY_FN_F9		0x1da
--#define KEY_FN_F10		0x1db
--#define KEY_FN_F11		0x1dc
--#define KEY_FN_F12		0x1dd
--#define KEY_FN_1		0x1de
--#define KEY_FN_2		0x1df
--#define KEY_FN_D		0x1e0
--#define KEY_FN_E		0x1e1
--#define KEY_FN_F		0x1e2
--#define KEY_FN_S		0x1e3
--#define KEY_FN_B		0x1e4
--
--#define KEY_BRL_DOT1		0x1f1
--#define KEY_BRL_DOT2		0x1f2
--#define KEY_BRL_DOT3		0x1f3
--#define KEY_BRL_DOT4		0x1f4
--#define KEY_BRL_DOT5		0x1f5
--#define KEY_BRL_DOT6		0x1f6
--#define KEY_BRL_DOT7		0x1f7
--#define KEY_BRL_DOT8		0x1f8
--#define KEY_BRL_DOT9		0x1f9
--#define KEY_BRL_DOT10		0x1fa
--
--#define KEY_NUMERIC_0		0x200	/* used by phones, remote controls, */
--#define KEY_NUMERIC_1		0x201	/* and other keypads */
--#define KEY_NUMERIC_2		0x202
--#define KEY_NUMERIC_3		0x203
--#define KEY_NUMERIC_4		0x204
--#define KEY_NUMERIC_5		0x205
--#define KEY_NUMERIC_6		0x206
--#define KEY_NUMERIC_7		0x207
--#define KEY_NUMERIC_8		0x208
--#define KEY_NUMERIC_9		0x209
--#define KEY_NUMERIC_STAR	0x20a
--#define KEY_NUMERIC_POUND	0x20b
--#define KEY_NUMERIC_A		0x20c	/* Phone key A - HUT Telephony 0xb9 */
--#define KEY_NUMERIC_B		0x20d
--#define KEY_NUMERIC_C		0x20e
--#define KEY_NUMERIC_D		0x20f
--
--#define KEY_CAMERA_FOCUS	0x210
--#define KEY_WPS_BUTTON		0x211	/* WiFi Protected Setup key */
--
--#define KEY_TOUCHPAD_TOGGLE	0x212	/* Request switch touchpad on or off */
--#define KEY_TOUCHPAD_ON		0x213
--#define KEY_TOUCHPAD_OFF	0x214
--
--#define KEY_CAMERA_ZOOMIN	0x215
--#define KEY_CAMERA_ZOOMOUT	0x216
--#define KEY_CAMERA_UP		0x217
--#define KEY_CAMERA_DOWN		0x218
--#define KEY_CAMERA_LEFT		0x219
--#define KEY_CAMERA_RIGHT	0x21a
--
--#define KEY_ATTENDANT_ON	0x21b
--#define KEY_ATTENDANT_OFF	0x21c
--#define KEY_ATTENDANT_TOGGLE	0x21d	/* Attendant call on or off */
--#define KEY_LIGHTS_TOGGLE	0x21e	/* Reading light on or off */
--
--#define BTN_DPAD_UP		0x220
--#define BTN_DPAD_DOWN		0x221
--#define BTN_DPAD_LEFT		0x222
--#define BTN_DPAD_RIGHT		0x223
--
--#define KEY_ALS_TOGGLE		0x230	/* Ambient light sensor */
--#define KEY_ROTATE_LOCK_TOGGLE	0x231	/* Display rotation lock */
--
--#define KEY_BUTTONCONFIG		0x240	/* AL Button Configuration */
--#define KEY_TASKMANAGER		0x241	/* AL Task/Project Manager */
--#define KEY_JOURNAL		0x242	/* AL Log/Journal/Timecard */
--#define KEY_CONTROLPANEL		0x243	/* AL Control Panel */
--#define KEY_APPSELECT		0x244	/* AL Select Task/Application */
--#define KEY_SCREENSAVER		0x245	/* AL Screen Saver */
--#define KEY_VOICECOMMAND		0x246	/* Listening Voice Command */
--#define KEY_ASSISTANT		0x247	/* AL Context-aware desktop assistant */
--#define KEY_KBD_LAYOUT_NEXT	0x248	/* AC Next Keyboard Layout Select */
--
--#define KEY_BRIGHTNESS_MIN		0x250	/* Set Brightness to Minimum */
--#define KEY_BRIGHTNESS_MAX		0x251	/* Set Brightness to Maximum */
--
--#define KEY_KBDINPUTASSIST_PREV		0x260
--#define KEY_KBDINPUTASSIST_NEXT		0x261
--#define KEY_KBDINPUTASSIST_PREVGROUP		0x262
--#define KEY_KBDINPUTASSIST_NEXTGROUP		0x263
--#define KEY_KBDINPUTASSIST_ACCEPT		0x264
--#define KEY_KBDINPUTASSIST_CANCEL		0x265
--
--/* Diagonal movement keys */
--#define KEY_RIGHT_UP			0x266
--#define KEY_RIGHT_DOWN			0x267
--#define KEY_LEFT_UP			0x268
--#define KEY_LEFT_DOWN			0x269
--
--#define KEY_ROOT_MENU			0x26a /* Show Device's Root Menu */
--/* Show Top Menu of the Media (e.g. DVD) */
--#define KEY_MEDIA_TOP_MENU		0x26b
--#define KEY_NUMERIC_11			0x26c
--#define KEY_NUMERIC_12			0x26d
--/*
-- * Toggle Audio Description: refers to an audio service that helps blind and
-- * visually impaired consumers understand the action in a program. Note: in
-- * some countries this is referred to as "Video Description".
-- */
--#define KEY_AUDIO_DESC			0x26e
--#define KEY_3D_MODE			0x26f
--#define KEY_NEXT_FAVORITE		0x270
--#define KEY_STOP_RECORD			0x271
--#define KEY_PAUSE_RECORD		0x272
--#define KEY_VOD				0x273 /* Video on Demand */
--#define KEY_UNMUTE			0x274
--#define KEY_FASTREVERSE			0x275
--#define KEY_SLOWREVERSE			0x276
--/*
-- * Control a data application associated with the currently viewed channel,
-- * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)
-- */
--#define KEY_DATA			0x277
--#define KEY_ONSCREEN_KEYBOARD		0x278
--/* Electronic privacy screen control */
--#define KEY_PRIVACY_SCREEN_TOGGLE	0x279
--
--/* Select an area of screen to be copied */
--#define KEY_SELECTIVE_SCREENSHOT	0x27a
--
--/*
-- * Some keyboards have keys which do not have a defined meaning, these keys
-- * are intended to be programmed / bound to macros by the user. For most
-- * keyboards with these macro-keys the key-sequence to inject, or action to
-- * take, is all handled by software on the host side. So from the kernel's
-- * point of view these are just normal keys.
-- *
-- * The KEY_MACRO# codes below are intended for such keys, which may be labeled
-- * e.g. G1-G18, or S1 - S30. The KEY_MACRO# codes MUST NOT be used for keys
-- * where the marking on the key does indicate a defined meaning / purpose.
-- *
-- * The KEY_MACRO# codes MUST also NOT be used as fallback for when no existing
-- * KEY_FOO define matches the marking / purpose. In this case a new KEY_FOO
-- * define MUST be added.
-- */
--#define KEY_MACRO1			0x290
--#define KEY_MACRO2			0x291
--#define KEY_MACRO3			0x292
--#define KEY_MACRO4			0x293
--#define KEY_MACRO5			0x294
--#define KEY_MACRO6			0x295
--#define KEY_MACRO7			0x296
--#define KEY_MACRO8			0x297
--#define KEY_MACRO9			0x298
--#define KEY_MACRO10			0x299
--#define KEY_MACRO11			0x29a
--#define KEY_MACRO12			0x29b
--#define KEY_MACRO13			0x29c
--#define KEY_MACRO14			0x29d
--#define KEY_MACRO15			0x29e
--#define KEY_MACRO16			0x29f
--#define KEY_MACRO17			0x2a0
--#define KEY_MACRO18			0x2a1
--#define KEY_MACRO19			0x2a2
--#define KEY_MACRO20			0x2a3
--#define KEY_MACRO21			0x2a4
--#define KEY_MACRO22			0x2a5
--#define KEY_MACRO23			0x2a6
--#define KEY_MACRO24			0x2a7
--#define KEY_MACRO25			0x2a8
--#define KEY_MACRO26			0x2a9
--#define KEY_MACRO27			0x2aa
--#define KEY_MACRO28			0x2ab
--#define KEY_MACRO29			0x2ac
--#define KEY_MACRO30			0x2ad
--
--/*
-- * Some keyboards with the macro-keys described above have some extra keys
-- * for controlling the host-side software responsible for the macro handling:
-- * -A macro recording start/stop key. Note that not all keyboards which emit
-- *  KEY_MACRO_RECORD_START will also emit KEY_MACRO_RECORD_STOP if
-- *  KEY_MACRO_RECORD_STOP is not advertised, then KEY_MACRO_RECORD_START
-- *  should be interpreted as a recording start/stop toggle;
-- * -Keys for switching between different macro (pre)sets, either a key for
-- *  cycling through the configured presets or keys to directly select a preset.
-- */
--#define KEY_MACRO_RECORD_START		0x2b0
--#define KEY_MACRO_RECORD_STOP		0x2b1
--#define KEY_MACRO_PRESET_CYCLE		0x2b2
--#define KEY_MACRO_PRESET1		0x2b3
--#define KEY_MACRO_PRESET2		0x2b4
--#define KEY_MACRO_PRESET3		0x2b5
--
--/*
-- * Some keyboards have a buildin LCD panel where the contents are controlled
-- * by the host. Often these have a number of keys directly below the LCD
-- * intended for controlling a menu shown on the LCD. These keys often don't
-- * have any labeling so we just name them KEY_KBD_LCD_MENU#
-- */
--#define KEY_KBD_LCD_MENU1		0x2b8
--#define KEY_KBD_LCD_MENU2		0x2b9
--#define KEY_KBD_LCD_MENU3		0x2ba
--#define KEY_KBD_LCD_MENU4		0x2bb
--#define KEY_KBD_LCD_MENU5		0x2bc
--
--#define BTN_TRIGGER_HAPPY		0x2c0
--#define BTN_TRIGGER_HAPPY1		0x2c0
--#define BTN_TRIGGER_HAPPY2		0x2c1
--#define BTN_TRIGGER_HAPPY3		0x2c2
--#define BTN_TRIGGER_HAPPY4		0x2c3
--#define BTN_TRIGGER_HAPPY5		0x2c4
--#define BTN_TRIGGER_HAPPY6		0x2c5
--#define BTN_TRIGGER_HAPPY7		0x2c6
--#define BTN_TRIGGER_HAPPY8		0x2c7
--#define BTN_TRIGGER_HAPPY9		0x2c8
--#define BTN_TRIGGER_HAPPY10		0x2c9
--#define BTN_TRIGGER_HAPPY11		0x2ca
--#define BTN_TRIGGER_HAPPY12		0x2cb
--#define BTN_TRIGGER_HAPPY13		0x2cc
--#define BTN_TRIGGER_HAPPY14		0x2cd
--#define BTN_TRIGGER_HAPPY15		0x2ce
--#define BTN_TRIGGER_HAPPY16		0x2cf
--#define BTN_TRIGGER_HAPPY17		0x2d0
--#define BTN_TRIGGER_HAPPY18		0x2d1
--#define BTN_TRIGGER_HAPPY19		0x2d2
--#define BTN_TRIGGER_HAPPY20		0x2d3
--#define BTN_TRIGGER_HAPPY21		0x2d4
--#define BTN_TRIGGER_HAPPY22		0x2d5
--#define BTN_TRIGGER_HAPPY23		0x2d6
--#define BTN_TRIGGER_HAPPY24		0x2d7
--#define BTN_TRIGGER_HAPPY25		0x2d8
--#define BTN_TRIGGER_HAPPY26		0x2d9
--#define BTN_TRIGGER_HAPPY27		0x2da
--#define BTN_TRIGGER_HAPPY28		0x2db
--#define BTN_TRIGGER_HAPPY29		0x2dc
--#define BTN_TRIGGER_HAPPY30		0x2dd
--#define BTN_TRIGGER_HAPPY31		0x2de
--#define BTN_TRIGGER_HAPPY32		0x2df
--#define BTN_TRIGGER_HAPPY33		0x2e0
--#define BTN_TRIGGER_HAPPY34		0x2e1
--#define BTN_TRIGGER_HAPPY35		0x2e2
--#define BTN_TRIGGER_HAPPY36		0x2e3
--#define BTN_TRIGGER_HAPPY37		0x2e4
--#define BTN_TRIGGER_HAPPY38		0x2e5
--#define BTN_TRIGGER_HAPPY39		0x2e6
--#define BTN_TRIGGER_HAPPY40		0x2e7
--
--/* We avoid low common keys in module aliases so they don't get huge. */
--#define KEY_MIN_INTERESTING	KEY_MUTE
--#define KEY_MAX			0x2ff
--#define KEY_CNT			(KEY_MAX+1)
--
--/*
-- * Relative axes
-- */
--
--#define REL_X			0x00
--#define REL_Y			0x01
--#define REL_Z			0x02
--#define REL_RX			0x03
--#define REL_RY			0x04
--#define REL_RZ			0x05
--#define REL_HWHEEL		0x06
--#define REL_DIAL		0x07
--#define REL_WHEEL		0x08
--#define REL_MISC		0x09
--/*
-- * 0x0a is reserved and should not be used in input drivers.
-- * It was used by HID as REL_MISC+1 and userspace needs to detect if
-- * the next REL_* event is correct or is just REL_MISC + n.
-- * We define here REL_RESERVED so userspace can rely on it and detect
-- * the situation described above.
-- */
--#define REL_RESERVED		0x0a
--#define REL_WHEEL_HI_RES	0x0b
--#define REL_HWHEEL_HI_RES	0x0c
--#define REL_MAX			0x0f
--#define REL_CNT			(REL_MAX+1)
--
--/*
-- * Absolute axes
-- */
--
--#define ABS_X			0x00
--#define ABS_Y			0x01
--#define ABS_Z			0x02
--#define ABS_RX			0x03
--#define ABS_RY			0x04
--#define ABS_RZ			0x05
--#define ABS_THROTTLE		0x06
--#define ABS_RUDDER		0x07
--#define ABS_WHEEL		0x08
--#define ABS_GAS			0x09
--#define ABS_BRAKE		0x0a
--#define ABS_HAT0X		0x10
--#define ABS_HAT0Y		0x11
--#define ABS_HAT1X		0x12
--#define ABS_HAT1Y		0x13
--#define ABS_HAT2X		0x14
--#define ABS_HAT2Y		0x15
--#define ABS_HAT3X		0x16
--#define ABS_HAT3Y		0x17
--#define ABS_PRESSURE		0x18
--#define ABS_DISTANCE		0x19
--#define ABS_TILT_X		0x1a
--#define ABS_TILT_Y		0x1b
--#define ABS_TOOL_WIDTH		0x1c
--
--#define ABS_VOLUME		0x20
--
--#define ABS_MISC		0x28
--
--/*
-- * 0x2e is reserved and should not be used in input drivers.
-- * It was used by HID as ABS_MISC+6 and userspace needs to detect if
-- * the next ABS_* event is correct or is just ABS_MISC + n.
-- * We define here ABS_RESERVED so userspace can rely on it and detect
-- * the situation described above.
-- */
--#define ABS_RESERVED		0x2e
--
--#define ABS_MT_SLOT		0x2f	/* MT slot being modified */
--#define ABS_MT_TOUCH_MAJOR	0x30	/* Major axis of touching ellipse */
--#define ABS_MT_TOUCH_MINOR	0x31	/* Minor axis (omit if circular) */
--#define ABS_MT_WIDTH_MAJOR	0x32	/* Major axis of approaching ellipse */
--#define ABS_MT_WIDTH_MINOR	0x33	/* Minor axis (omit if circular) */
--#define ABS_MT_ORIENTATION	0x34	/* Ellipse orientation */
--#define ABS_MT_POSITION_X	0x35	/* Center X touch position */
--#define ABS_MT_POSITION_Y	0x36	/* Center Y touch position */
--#define ABS_MT_TOOL_TYPE	0x37	/* Type of touching device */
--#define ABS_MT_BLOB_ID		0x38	/* Group a set of packets as a blob */
--#define ABS_MT_TRACKING_ID	0x39	/* Unique ID of initiated contact */
--#define ABS_MT_PRESSURE		0x3a	/* Pressure on contact area */
--#define ABS_MT_DISTANCE		0x3b	/* Contact hover distance */
--#define ABS_MT_TOOL_X		0x3c	/* Center X tool position */
--#define ABS_MT_TOOL_Y		0x3d	/* Center Y tool position */
--
--
--#define ABS_MAX			0x3f
--#define ABS_CNT			(ABS_MAX+1)
--
--/*
-- * Switch events
-- */
--
--#define SW_LID			0x00  /* set = lid shut */
--#define SW_TABLET_MODE		0x01  /* set = tablet mode */
--#define SW_HEADPHONE_INSERT	0x02  /* set = inserted */
--#define SW_RFKILL_ALL		0x03  /* rfkill master switch, type "any"
--					 set = radio enabled */
--#define SW_RADIO		SW_RFKILL_ALL	/* deprecated */
--#define SW_MICROPHONE_INSERT	0x04  /* set = inserted */
--#define SW_DOCK			0x05  /* set = plugged into dock */
--#define SW_LINEOUT_INSERT	0x06  /* set = inserted */
--#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
--#define SW_VIDEOOUT_INSERT	0x08  /* set = inserted */
--#define SW_CAMERA_LENS_COVER	0x09  /* set = lens covered */
--#define SW_KEYPAD_SLIDE		0x0a  /* set = keypad slide out */
--#define SW_FRONT_PROXIMITY	0x0b  /* set = front proximity sensor active */
--#define SW_ROTATE_LOCK		0x0c  /* set = rotate locked/disabled */
--#define SW_LINEIN_INSERT	0x0d  /* set = inserted */
--#define SW_MUTE_DEVICE		0x0e  /* set = device disabled */
--#define SW_PEN_INSERTED		0x0f  /* set = pen inserted */
--#define SW_MACHINE_COVER	0x10  /* set = cover closed */
--#define SW_MAX			0x10
--#define SW_CNT			(SW_MAX+1)
--
--/*
-- * Misc events
-- */
--
--#define MSC_SERIAL		0x00
--#define MSC_PULSELED		0x01
--#define MSC_GESTURE		0x02
--#define MSC_RAW			0x03
--#define MSC_SCAN		0x04
--#define MSC_TIMESTAMP		0x05
--#define MSC_MAX			0x07
--#define MSC_CNT			(MSC_MAX+1)
--
--/*
-- * LEDs
-- */
--
--#define LED_NUML		0x00
--#define LED_CAPSL		0x01
--#define LED_SCROLLL		0x02
--#define LED_COMPOSE		0x03
--#define LED_KANA		0x04
--#define LED_SLEEP		0x05
--#define LED_SUSPEND		0x06
--#define LED_MUTE		0x07
--#define LED_MISC		0x08
--#define LED_MAIL		0x09
--#define LED_CHARGING		0x0a
--#define LED_MAX			0x0f
--#define LED_CNT			(LED_MAX+1)
--
--/*
-- * Autorepeat values
-- */
--
--#define REP_DELAY		0x00
--#define REP_PERIOD		0x01
--#define REP_MAX			0x01
--#define REP_CNT			(REP_MAX+1)
--
--/*
-- * Sounds
-- */
--
--#define SND_CLICK		0x00
--#define SND_BELL		0x01
--#define SND_TONE		0x02
--#define SND_MAX			0x07
--#define SND_CNT			(SND_MAX+1)
--
--#endif
-diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
---- old/src/evdev-fallback.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-fallback.c	2021-01-01 00:00:00.000000000 +0800
-@@ -689,26 +689,9 @@
-
- 	if (event->type != LIBINPUT_EVENT_KEYBOARD_KEY)
- 		return;
--
--	if (dispatch->lid.reliability == RELIABILITY_WRITE_OPEN) {
--		int fd = libevdev_get_fd(dispatch->device->evdev);
--		int rc;
--		struct input_event ev[2];
--
--		ev[0] = input_event_init(0, EV_SW, SW_LID, 0);
--		ev[1] = input_event_init(0, EV_SYN, SYN_REPORT, 0);
--
--		rc = write(fd, ev, sizeof(ev));
--
--		if (rc < 0)
--			evdev_log_error(dispatch->device,
--					"failed to write SW_LID state (%s)",
--					strerror(errno));
--
--		/* In case write() fails, we sync the lid state manually
--		 * regardless. */
--	}
--
-+
-+    // hdf has no write fd operation.
-+
- 	/* Posting the event here means we preempt the keyboard events that
- 	 * caused us to wake up, so the lid event is always passed on before
- 	 * the key event.
-@@ -1031,6 +1014,9 @@
- 	if (dispatch->arbitration.in_arbitration)
- 		return;
-
-+	libinput_log_printf("1.event divice_name:%s divice_fd:%d type:%d code:%d value:%d  time:%llu  curtime:%llu \r\n",
-+        device->devname, device->fd, event->type, event->code, event->value, getTranTime(event), getMicrotime());
-+
- 	switch (event->type) {
- 	case EV_REL:
- 		fallback_process_relative(dispatch, device, event, time);
-@@ -1575,7 +1561,7 @@
- 	   Devices with ABS_MT_POSITION_* but not ABS_MT_SLOT
- 	   require mtdev for conversion. */
- 	if (evdev_need_mtdev(device)) {
--		device->mtdev = mtdev_new_open(device->fd);
-+		device->mtdev = mtdev_new_open_hdi(device->uhdf->index,device->uhdf->fn);
- 		if (!device->mtdev)
- 			return -1;
-
-diff -Naur old/src/evdev-fallback.h new/src/evdev-fallback.h
---- old/src/evdev-fallback.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-fallback.h	2021-01-01 00:00:00.000000000 +0800
-@@ -169,6 +169,7 @@
- static inline enum key_type
- get_key_type(uint16_t code)
- {
-+	const uint16_t KEY_ENDCALL = 0x2e8;
- 	switch (code) {
- 	case BTN_TOOL_PEN:
- 	case BTN_TOOL_RUBBER:
-@@ -198,6 +199,8 @@
- 		return KEY_TYPE_KEY;
- 	if (code >= BTN_TRIGGER_HAPPY && code <= BTN_TRIGGER_HAPPY40)
- 		return KEY_TYPE_BUTTON;
-+	if (code == KEY_ENDCALL)
-+		return KEY_TYPE_KEY;
- 	return KEY_TYPE_NONE;
- }
-
-diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
---- old/src/evdev-joystick.c	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/evdev-joystick.c	2021-01-01 00:00:00.000000000 +0800
-@@ -0,0 +1,583 @@
-+/*
-+ * Copyright (c) 2021-2022 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
-+ *
-+ *     http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+#include <stdbool.h>
-+#include <string.h>
-+
-+#include "config.h"
-+#include "libinput-version.h"
-+#include "evdev-joystick.h"
-+#include "input-event-codes.h"
-+#include "libinput.h"
-+#include "libinput-util.h"
-+
-+static inline struct
-+joystick_dispatch* get_joystick_dispatch(struct evdev_dispatch* dispatch)
-+{
-+    if (dispatch == NULL) {
-+        return NULL;
-+    }
-+    evdev_verify_dispatch_type(dispatch, DISPATCH_JOYSTICK);
-+
-+    struct joystick_dispatch* joystick_dispatch = NULL;
-+    joystick_dispatch = container_of(dispatch, struct joystick_dispatch, base);
-+
-+    return joystick_dispatch;
-+}
-+
-+static int
-+update_seat_joystick_button_count(struct libinput_seat* pSeat, int32_t key, uint32_t *pRetcount, enum libinput_key_state state)
-+{
-+    if (pSeat == NULL || pRetcount == NULL || key < SYN_REPORT || key > KEY_MAX) {
-+        return false;
-+    }
-+
-+    switch (state) {
-+        case LIBINPUT_KEY_STATE_PRESSED:
-+        {
-+            *(pRetcount) = ++pSeat->button_count[key];
-+        }
-+        break;
-+        case LIBINPUT_KEY_STATE_RELEASED:
-+        {
-+            if (pSeat->button_count[key] == 0) {
-+                *(pRetcount) = pSeat->button_count[key];
-+            }
-+            else {
-+                *(pRetcount) = --pSeat->button_count[key];
-+            }
-+        }
-+        break;
-+        default:
-+            *(pRetcount) = 0;
-+            break;
-+    }
-+    return true;
-+}
-+
-+static void
-+joystick_notify_axis(struct evdev_device* device, uint64_t time)
-+{
-+    if (device == NULL) {
-+        return;
-+    }
-+
-+	struct joystick_dispatch *joystick_dispatch = get_joystick_dispatch(device->dispatch);
-+	if (joystick_dispatch == NULL) {
-+        libinput_log_printf("joystick_dispatch is NULL.\n");
-+		return;
-+	}
-+
-+    struct libinput_event_joystick_axis* joystick_axis_event = zalloc(sizeof * joystick_axis_event);
-+    if (joystick_axis_event == NULL) {
-+        libinput_log_printf("pJoystickEvent is NULL.\n");
-+        return;
-+    }
-+
-+    *joystick_axis_event = (struct libinput_event_joystick_axis){
-+	    .base.type = LIBINPUT_EVENT_POINTER_AXIS,
-+	    .base.device = &device->base,
-+        .type = EV_ABS,
-+        .time = time,
-+        .axis_value_mask = joystick_dispatch->axis_value_mask,
-+	    .abs_throttle = joystick_dispatch->abs_throttle,
-+	    .abs_hat0x = joystick_dispatch->abs_hat0x,
-+	    .abs_hat0y = joystick_dispatch->abs_hat0y,
-+	    .abs_x = joystick_dispatch->abs_x,
-+		.abs_y = joystick_dispatch->abs_y,
-+		.abs_z = joystick_dispatch->abs_z,
-+		.abs_rx = joystick_dispatch->abs_rx,
-+		.abs_ry = joystick_dispatch->abs_ry,
-+		.abs_rz = joystick_dispatch->abs_rz,
-+    };
-+
-+    struct libinput_event_listener* listener = NULL;
-+    struct libinput_event_listener* tmp_listener = NULL;
-+    list_for_each_safe(listener, tmp_listener, &device->base.event_listeners, link) {
-+        listener->notify_func(time, &joystick_axis_event->base, listener->notify_func_data);
-+    }
-+
-+    libinput_post_handle_event(device->base.seat->libinput, &joystick_axis_event->base);
-+}
-+
-+static void
-+joystick_notify_key_event(struct evdev_device* device, struct input_event* pEvent, uint64_t time)
-+{
-+    if (device == NULL || pEvent == NULL) {
-+        return;
-+    }
-+
-+    struct libinput_event_joystick_button* pKeyEvent = {0};
-+    uint32_t uiSeatCount = 0;
-+
-+    int iRet = update_seat_joystick_button_count(device->base.seat, pEvent->code, &uiSeatCount, pEvent->value);
-+    if (iRet == false) {
-+        return;
-+    }
-+
-+    pKeyEvent = zalloc(sizeof * pKeyEvent);
-+    if (pKeyEvent == NULL) {
-+        return;
-+    }
-+
-+	*pKeyEvent = (struct libinput_event_joystick_button) {
-+			.base.type = LIBINPUT_EVENT_POINTER_BUTTON,
-+			.base.device = &device->base,
-+            .time = time,
-+            .type = pEvent->type,
-+            .key = pEvent->code,
-+            .value = pEvent->value,
-+            .seat_key_count = uiSeatCount,
-+            .state = pEvent->value,
-+    };
-+
-+    struct libinput_event_listener* listener = NULL;
-+    struct libinput_event_listener* tmp_listener = NULL;
-+    list_for_each_safe(listener, tmp_listener, &device->base.event_listeners, link)
-+    {
-+        listener->notify_func(time, &pKeyEvent->base, listener->notify_func_data);
-+    }
-+
-+    libinput_post_handle_event(device->base.seat->libinput, &pKeyEvent->base);
-+}
-+
-+static float
-+abs_value_standardize(int32_t value, int32_t minimum, int32_t maximum, float standard_min, float standard_max)
-+{
-+    return standard_min + ((float)value - (float)minimum) * ((float)(standard_max - standard_min)) / ((float)(maximum - minimum));
-+}
-+
-+static float
-+get_joystick_abs_standard_value(struct libinput_event_joystick_axis_abs_info *absinfo)
-+{
-+    const int32_t value = absinfo->value;
-+    const int32_t minimum = absinfo->minimum;
-+    const int32_t maximum = absinfo->maximum;
-+    if (minimum >= maximum) {
-+		libinput_log_printf("joystick abs: minimum(%u) >= maximum(%u).\n", minimum, maximum);
-+        return 0.f;
-+    } else if (value < minimum || value > maximum) {
-+		libinput_log_printf("joystick abs: value(%d) not between minimum(%u) and maximum(%u).\n", value, minimum, maximum);
-+		return 0.f;
-+    }
-+
-+    const int32_t code = absinfo->code;
-+    switch (code) {
-+	case ABS_THROTTLE:
-+	{
-+		return abs_value_standardize(value, minimum, maximum, 0, 1.0);
-+	}
-+	case ABS_X:
-+	case ABS_Y:
-+	case ABS_Z:
-+	case ABS_RX:
-+	case ABS_RY:
-+	case ABS_RZ:
-+    {
-+        return abs_value_standardize(value, minimum, maximum, -1.0, 1.0);
-+	}
-+    case ABS_HAT0X:
-+    case ABS_HAT0Y:
-+    {
-+        return (float)value;
-+    }
-+    default:
-+    return (float)value;
-+    }
-+}
-+
-+static void joystick_set_axis_value_mask(struct joystick_dispatch *joystick_dispatch, enum libinput_joystick_axis_source axis)
-+{
-+    joystick_dispatch->axis_value_mask |= (uint32_t)axis;
-+}
-+
-+static void joystick_reset_axis_value_mask(struct joystick_dispatch *joystick_dispatch)
-+{
-+	joystick_dispatch->axis_value_mask = 0;
-+}
-+
-+static bool joystick_is_axis_value_mask(struct joystick_dispatch *joystick_dispatch)
-+{
-+	return (joystick_dispatch->axis_value_mask != 0);
-+}
-+
-+static void joystick_get_one_abs_info(struct joystick_dispatch *joystick_dispatch, struct evdev_device *device, struct input_event *event,
-+    const uint32_t code)
-+{
-+    struct libinput_event_joystick_axis_abs_info *absinfo = NULL;
-+    switch (code) {
-+    case ABS_THROTTLE:
-+    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_THROTTLE);
-+    absinfo = &joystick_dispatch->abs_throttle;
-+    break;
-+    case ABS_HAT0X:
-+    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0X);
-+    absinfo = &joystick_dispatch->abs_hat0x;
-+    break;
-+    case ABS_HAT0Y:
-+    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0Y);
-+    absinfo = &joystick_dispatch->abs_hat0y;
-+    break;
-+    case ABS_X:
-+    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_X);
-+    absinfo = &joystick_dispatch->abs_x;
-+    break;
-+    case ABS_Y:
-+    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Y);
-+    absinfo = &joystick_dispatch->abs_y;
-+    break;
-+	case ABS_Z:
-+	joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Z);
-+	absinfo = &joystick_dispatch->abs_z;
-+    break;
-+	case ABS_RX:
-+	joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RX);
-+	absinfo = &joystick_dispatch->abs_rx;
-+	break;
-+	case ABS_RY:
-+	joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RY);
-+	absinfo = &joystick_dispatch->abs_ry;
-+	break;
-+    case ABS_RZ:
-+    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RZ);
-+    absinfo = &joystick_dispatch->abs_rz;
-+    break;
-+    default:
-+    break;
-+    }
-+
-+    if (absinfo == NULL) {
-+        libinput_log_printf("unsupported joystick abs event: divice_name:%s code:%d value:%d.\n",
-+            device->devname, code, event->value);
-+        return;
-+    }
-+
-+    struct libevdev *evdev = device->evdev;
-+    evdev_device_check_abs_axis_range(device, event->code, event->value);
-+    const struct input_absinfo *absinfo_raw = libevdev_get_abs_info(evdev, event->code);
-+    absinfo->code = event->code;
-+    absinfo->value = event->value;
-+    absinfo->minimum = absinfo_raw->minimum;
-+    absinfo->maximum = absinfo_raw->maximum;
-+    absinfo->fuzz = absinfo_raw->fuzz;
-+    absinfo->flat = absinfo_raw->flat;
-+    absinfo->resolution = absinfo_raw->resolution;
-+    absinfo->standardValue = get_joystick_abs_standard_value(absinfo);
-+}
-+
-+static void
-+joystick_notify_absolute_event(struct joystick_dispatch* pJoystick,
-+    struct evdev_device* device, struct input_event* event, uint64_t time)
-+{
-+    if (pJoystick == NULL || device == NULL || event == NULL) {
-+        return;
-+    }
-+
-+    joystick_get_one_abs_info(pJoystick, device, event, event->code);
-+}
-+
-+static void
-+joystick_flush(struct joystick_dispatch* joystick_dispatch, struct evdev_device* device, uint64_t time)
-+{
-+    if (joystick_dispatch == NULL || device == NULL) {
-+        return;
-+    }
-+
-+    if (joystick_dispatch->axis_value_mask != 0) {
-+        joystick_notify_axis(device, time);
-+        joystick_reset_axis_value_mask(joystick_dispatch);
-+    }
-+}
-+
-+static void
-+joystick_process(struct evdev_dispatch* dispatch, struct evdev_device* device,
-+    struct input_event* event, uint64_t time)
-+{
-+    if (dispatch == NULL || device == NULL || event == NULL) {
-+        return;
-+    }
-+
-+    struct joystick_dispatch* joystick_dispatch = get_joystick_dispatch(dispatch);
-+    if (joystick_dispatch == NULL) {
-+        return;
-+    }
-+
-+    libinput_log_printf("1.event divice_name:%s divice_fd:%d type:%d code:%d value:%d  time:%llu  curtime:%llu\r\n",
-+            device->devname, device->fd, event->type, event->code, event->value, getTranTime(event), getMicrotime());
-+
-+    switch (event->type) {
-+    case EV_ABS: {
-+        joystick_notify_absolute_event(joystick_dispatch, device, event, time);
-+    }
-+    break;
-+    case EV_KEY: {
-+        joystick_notify_key_event(device, event, time);
-+    }
-+    break;
-+    case EV_SYN: {
-+        joystick_flush(joystick_dispatch, device, time);
-+    }
-+    break;
-+    case EV_MSC:
-+    /* ignore do not process */
-+    break;
-+    case EV_REL:
-+    case EV_SW:
-+    case EV_LED:
-+    case EV_SND:
-+    case EV_REP:
-+    case EV_FF:
-+    case EV_PWR:
-+    case EV_FF_STATUS:
-+    case EV_MAX:
-+    case EV_CNT:
-+    default:
-+        libinput_log_printf("unsupported joystick event type: %d, devname: %s.\n", event->type, device->devname);
-+    break;
-+    }
-+}
-+
-+static void joystick_suspend(struct evdev_dispatch* dispatch, struct evdev_device* device)
-+{
-+    if (dispatch == NULL || device == NULL) {
-+        return;
-+    }
-+    struct joystick_dispatch* joystick_dispatch = get_joystick_dispatch(dispatch);
-+    if (joystick_dispatch == NULL) {
-+        return;
-+    }
-+   joystick_flush(joystick_dispatch, device, 0);
-+}
-+
-+static void
-+joystick_destroy(struct evdev_dispatch* dispatch)
-+{
-+    if (dispatch == NULL) {
-+        return;
-+    }
-+    struct joystick_dispatch* joystick_dispatch = get_joystick_dispatch(dispatch);
-+    if (dispatch == NULL) {
-+        return;
-+    }
-+
-+    free(joystick_dispatch);
-+}
-+
-+static void
-+joystick_device_added(struct evdev_device* device,
-+    struct evdev_device* added_device)
-+{
-+    if (device == NULL || added_device == NULL) {
-+        return;
-+    }
-+    struct joystick_dispatch* joystick_dispatch = get_joystick_dispatch(device->dispatch);
-+    if (joystick_dispatch == NULL) {
-+        return;
-+    }
-+
-+    bool is_joystick = false;
-+    if (libinput_device_get_device_group(&device->base) !=
-+        libinput_device_get_device_group(&added_device->base)) {
-+        return;
-+    }
-+    is_joystick = evdev_device_has_capability(added_device,
-+        LIBINPUT_DEVICE_CAP_JOYSTICK);
-+
-+    if (is_joystick) {
-+        evdev_log_debug(device,
-+            "joystick: activated for %s<->%s\n",
-+            device->devname,
-+            added_device->devname);
-+        joystick_dispatch->device = added_device;
-+    }
-+}
-+
-+static void
-+joystick_device_removed(struct evdev_device* device,
-+    struct evdev_device* removed_device)
-+{
-+    if (device == NULL || removed_device == NULL) {
-+        return;
-+    }
-+    struct joystick_dispatch* joystick_dispatch = get_joystick_dispatch(device->dispatch);
-+    if (joystick_dispatch == NULL) {
-+        return;
-+    }
-+
-+    if (joystick_dispatch->device == removed_device) {
-+        joystick_dispatch->device = NULL;
-+    }
-+}
-+
-+static struct evdev_dispatch_interface joystick_interface = {
-+    .process = joystick_process,
-+    .suspend = joystick_suspend,
-+    .remove = NULL,
-+    .destroy = joystick_destroy,
-+    .device_added = joystick_device_added,
-+    .device_removed = joystick_device_removed,
-+    .device_suspended = NULL,
-+    .device_resumed = NULL,
-+    .post_added = NULL,
-+    .touch_arbitration_toggle = NULL,
-+    .touch_arbitration_update_rect = NULL,
-+    .get_switch_state = NULL,
-+};
-+
-+static enum libinput_config_status
-+joystick_sendevents_set_mode(struct libinput_device* device,
-+    enum libinput_config_send_events_mode mode)
-+{
-+    if (device == NULL)     {
-+        return LIBINPUT_CONFIG_STATUS_INVALID;
-+    }
-+
-+    struct evdev_device* ev_device = evdev_device(device);
-+    struct joystick_dispatch* joystick_dispatch = (struct joystick_dispatch*)ev_device->dispatch;
-+
-+    if (ev_device == NULL || joystick_dispatch == NULL) {
-+        return LIBINPUT_CONFIG_STATUS_INVALID;
-+    }
-+
-+    if (mode == joystick_dispatch->sendevents.current_mode) {
-+        return LIBINPUT_CONFIG_STATUS_SUCCESS;
-+    }
-+
-+    switch (mode) {
-+    case LIBINPUT_CONFIG_SEND_EVENTS_ENABLED:
-+        break;
-+    case LIBINPUT_CONFIG_SEND_EVENTS_DISABLED:
-+        joystick_suspend(ev_device->dispatch, ev_device);
-+        break;
-+    default:
-+        return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
-+    }
-+
-+    joystick_dispatch->sendevents.current_mode = mode;
-+
-+    return LIBINPUT_CONFIG_STATUS_SUCCESS;
-+}
-+
-+static uint32_t
-+joystick_sendevents_get_modes(struct libinput_device* device)
-+{
-+    return LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
-+}
-+
-+static enum libinput_config_send_events_mode
-+joystick_sendevents_get_mode(struct libinput_device* device)
-+{
-+    if (device == NULL) {
-+        return LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
-+    }
-+
-+    struct evdev_device* ev_device = evdev_device(device);
-+    struct joystick_dispatch* pDispatch = (struct joystick_dispatch*)ev_device->dispatch;
-+
-+    if (ev_device == NULL || pDispatch == NULL) {
-+        return LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
-+    }
-+
-+    return pDispatch->sendevents.current_mode;
-+}
-+
-+static enum libinput_config_send_events_mode
-+joystick_sendevents_get_default_mode(struct libinput_device* device)
-+{
-+    return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
-+}
-+
-+#ifdef _DEBUG
-+void printf_joystick_absinfo(const char *abs_name, struct libinput_event_joystick_axis_abs_info *absinfo)
-+{
-+    printf("%s: code: %d, value: %d, minimum: %d, maximum: %d, fuzz: %d, flat: %d, resolution: %d, standardValue: %f\n",
-+        abs_name,
-+        absinfo->code,
-+        absinfo->value,
-+        absinfo->minimum,
-+        absinfo->maximum,
-+        absinfo->fuzz,
-+        absinfo->flat,
-+        absinfo->resolution,
-+        absinfo->standardValue
-+        );
-+}
-+
-+void print_libinput_event_joystick_axis(struct libinput_event_joystick_axis *p)
-+{
-+    printf("JOYSTICK:\n"
-+        "type: %d, device: %p, type: %d, time: 0x%x\n",
-+        p->base.type,
-+        p->base.device,
-+        p->type,
-+        p->time);
-+    printf_joystick_absinfo("abs_throttle", &p->abs_throttle);
-+    printf_joystick_absinfo("abs_hat0x", &p->abs_hat0x);
-+    printf_joystick_absinfo("abs_hat0y", &p->abs_hat0y);
-+    printf_joystick_absinfo("abs_x", &p->abs_x);
-+	printf_joystick_absinfo("abs_y", &p->abs_y);
-+	printf_joystick_absinfo("abs_z", &p->abs_z);
-+	printf_joystick_absinfo("abs_rx", &p->abs_rx);
-+	printf_joystick_absinfo("abs_ry", &p->abs_ry);
-+    printf_joystick_absinfo("abs_rz", &p->abs_rz);
-+}
-+#endif // _DEBUG
-+
-+/**
-+ * @brief 初始化joystick_dispatch
-+ * @param joystick
-+ * @param device
-+ * @return bool true - 成功, false - 失败
-+*/
-+bool
-+joystick_init(struct joystick_dispatch* pJoystick, struct evdev_device* device)
-+{
-+    if (pJoystick == NULL || device == NULL) {
-+        return false;
-+    }
-+
-+    pJoystick->base.dispatch_type = DISPATCH_JOYSTICK;
-+    pJoystick->base.interface = &joystick_interface;
-+    pJoystick->device = device;
-+
-+    return true;
-+}
-+
-+struct evdev_dispatch*
-+evdev_joystick_create(struct evdev_device* device)
-+{
-+    if (device == NULL) {
-+        return NULL;
-+    }
-+
-+    struct joystick_dispatch* joystick = {0};
-+    joystick = zalloc(sizeof * joystick);
-+
-+    if (joystick_init(joystick, device) != true) {
-+        joystick_destroy(&joystick->base);
-+        joystick = NULL;
-+        return NULL;
-+    }
-+
-+    device->base.config.sendevents = &joystick->sendevents.config;
-+    joystick->sendevents.current_mode = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
-+    joystick->sendevents.config.get_modes = joystick_sendevents_get_modes;
-+    joystick->sendevents.config.set_mode = joystick_sendevents_set_mode;
-+    joystick->sendevents.config.get_mode = joystick_sendevents_get_mode;
-+    joystick->sendevents.config.get_default_mode = joystick_sendevents_get_default_mode;
-+
-+    return &joystick->base;
-+}
-+
-diff -Naur old/src/evdev-joystick.h new/src/evdev-joystick.h
---- old/src/evdev-joystick.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/evdev-joystick.h	2021-01-01 00:00:00.000000000 +0800
-@@ -0,0 +1,77 @@
-+/*
-+ * Copyright (c) 2021-2022 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
-+ *
-+ *     http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+#ifndef LIBINPUT_EVDEV_JOYSTICK_H
-+#define LIBINPUT_EVDEV_JOYSTICK_H
-+
-+#include "evdev.h"
-+#include "libinput-private.h"
-+
-+struct joystick_dispatch {
-+	struct evdev_dispatch base;
-+	struct evdev_device* device;
-+	uint32_t axis_value_mask;
-+	struct libinput_event_joystick_axis_abs_info abs_throttle;
-+	struct libinput_event_joystick_axis_abs_info abs_hat0x;
-+	struct libinput_event_joystick_axis_abs_info abs_hat0y;
-+	struct libinput_event_joystick_axis_abs_info abs_x;
-+	struct libinput_event_joystick_axis_abs_info abs_y;
-+	struct libinput_event_joystick_axis_abs_info abs_z;
-+	struct libinput_event_joystick_axis_abs_info abs_rx;
-+	struct libinput_event_joystick_axis_abs_info abs_ry;
-+	struct libinput_event_joystick_axis_abs_info abs_rz;
-+	struct {
-+		struct libinput_device_config_send_events config;
-+		enum libinput_config_send_events_mode current_mode;
-+	} sendevents;
-+};
-+
-+struct libinput_event_joystick_button {
-+	struct libinput_event base;
-+	uint32_t type;
-+	uint64_t time;
-+	uint32_t key;
-+	uint32_t seat_key_count;
-+	enum libinput_key_state state;
-+	int value;
-+};
-+
-+struct libinput_event_joystick_axis {
-+	struct libinput_event base;
-+    uint32_t type;
-+	uint64_t time;
-+	uint32_t axis_value_mask;
-+	struct libinput_event_joystick_axis_abs_info abs_throttle;
-+	struct libinput_event_joystick_axis_abs_info abs_hat0x;
-+	struct libinput_event_joystick_axis_abs_info abs_hat0y;
-+	struct libinput_event_joystick_axis_abs_info abs_x;
-+	struct libinput_event_joystick_axis_abs_info abs_y;
-+	struct libinput_event_joystick_axis_abs_info abs_z;
-+	struct libinput_event_joystick_axis_abs_info abs_rx;
-+	struct libinput_event_joystick_axis_abs_info abs_ry;
-+	struct libinput_event_joystick_axis_abs_info abs_rz;
-+};
-+
-+#ifdef _DEBUG
-+void print_libinput_event_joystick_axis(struct libinput_event_joystick_axis* p);
-+#endif // _DEBUG
-+
-+/**
-+ * @brief 创建evdev_dispatch结构体
-+ * @param device
-+ * @return struct evdev_dispatch*
-+*/
-+struct evdev_dispatch* evdev_joystick_create(struct evdev_device* device);
-+
-+#endif
-diff -Naur old/src/evdev-mt-touchpad-gestures.c new/src/evdev-mt-touchpad-gestures.c
---- old/src/evdev-mt-touchpad-gestures.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-mt-touchpad-gestures.c	2021-01-01 00:00:00.000000000 +0800
-@@ -80,6 +80,37 @@
- }
-
- static void
-+tp_get_raw_touches(struct tp_dispatch *tp, struct sloted_coords_info *raw_touches)
-+{
-+	struct tp_touch *t;
-+	unsigned int i;
-+	raw_touches->active_count = 0;
-+
-+	if (tp->num_slots > MAX_SOLTED_COORDS_NUM) {
-+		evdev_log_bug_libinput(tp->device,
-+				       "in %s, num_slots: %d, more than %d\n",
-+				       __func__, tp->num_slots, MAX_SOLTED_COORDS_NUM);
-+	}
-+	const unsigned int num_slots = (tp->num_slots > MAX_SOLTED_COORDS_NUM) ? MAX_SOLTED_COORDS_NUM : tp->num_slots;
-+
-+	for (i = 0; i < num_slots; i++) {
-+		t = &tp->touches[i];
-+
-+		if (!tp_touch_active_for_gesture(tp, t))
-+			continue;
-+
-+		if (t->dirty) {
-+			struct device_coords d;
-+			d = tp_get_delta(t);
-+			raw_touches->coords[i].x = d.x;
-+			raw_touches->coords[i].y = d.y;
-+		}
-+		raw_touches->coords[i].is_active = true;
-+		raw_touches->active_count++;
-+	}
-+}
-+
-+static void
- tp_gesture_init_scroll(struct tp_dispatch *tp)
- {
- 	struct phys_coords zero = {0.0, 0.0};
-@@ -131,7 +162,7 @@
- 		gesture_notify_swipe(&tp->device->base, time,
- 				     LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN,
- 				     tp->gesture.finger_count,
--				     &zero, &zero);
-+				     &zero, &zero, NULL);
- 		break;
- 	}
-
-@@ -630,10 +661,12 @@
- tp_gesture_handle_state_swipe(struct tp_dispatch *tp, uint64_t time)
- {
- 	struct device_float_coords raw;
-+	struct sloted_coords_info raw_touches = {};
- 	struct normalized_coords delta, unaccel;
-
- 	raw = tp_get_average_touches_delta(tp);
- 	delta = tp_filter_motion(tp, &raw, time);
-+	tp_get_raw_touches(tp, &raw_touches);
-
- 	if (!normalized_is_zero(delta) || !device_float_is_zero(raw)) {
- 		unaccel = tp_normalize_delta(tp, raw);
-@@ -641,7 +674,7 @@
- 		gesture_notify_swipe(&tp->device->base, time,
- 				     LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE,
- 				     tp->gesture.finger_count,
--				     &delta, &unaccel);
-+				     &delta, &unaccel, &raw_touches);
- 	}
-
- 	return GESTURE_STATE_SWIPE;
-diff -Naur old/src/evdev-mt-touchpad-thumb.c new/src/evdev-mt-touchpad-thumb.c
---- old/src/evdev-mt-touchpad-thumb.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-mt-touchpad-thumb.c	2021-01-01 00:00:00.000000000 +0800
-@@ -418,7 +418,7 @@
- 	tp->thumb.lower_thumb_line = edges.y;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
-
- 	if (libevdev_has_event_code(device->evdev, EV_ABS, ABS_MT_PRESSURE)) {
- 		if (quirks_get_uint32(q,
-diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
---- old/src/evdev-mt-touchpad.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-mt-touchpad.c	2021-01-01 00:00:00.000000000 +0800
-@@ -1936,6 +1936,9 @@
- 		     uint64_t time)
- {
- 	struct tp_dispatch *tp = tp_dispatch(dispatch);
-+
-+	libinput_log_printf("1.event divice_name:%s divice_fd:%d type:%d code:%d value:%d  time:%llu curtime:%llu\r\n",
-+		device->devname, device->fd, e->type, e->code, e->value, getTranTime(e), getMicrotime());
-
- 	switch (e->type) {
- 	case EV_ABS:
-@@ -2686,12 +2689,12 @@
-
- static void
- evdev_tag_touchpad(struct evdev_device *device,
--		   struct udev_device *udev_device)
-+           struct uhdf *uhdf )
- {
- 	int bustype, vendor;
- 	const char *prop;
-
--	prop = udev_device_get_property_value(udev_device,
-+	prop = uhdf_device_get_property_value(uhdf,
- 					      "ID_INPUT_TOUCHPAD_INTEGRATION");
- 	if (prop) {
- 		if (streq(prop, "internal")) {
-@@ -3197,7 +3200,7 @@
- 	int rc = false;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q)
- 		return false;
-
-@@ -3281,7 +3284,7 @@
- 	struct quirks *q;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q)
- 		return threshold;
-
-@@ -3317,7 +3320,7 @@
- 	uint32_t threshold;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q)
- 		return;
-
-@@ -3511,7 +3514,7 @@
- 	assert(abs);
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (q && quirks_get_range(q, QUIRK_ATTR_PRESSURE_RANGE, &r)) {
- 		hi = r.upper;
- 		lo = r.lower;
-@@ -3567,7 +3570,7 @@
- 	}
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (q && quirks_get_range(q, QUIRK_ATTR_TOUCH_SIZE_RANGE, &r)) {
- 		hi = r.upper;
- 		lo = r.lower;
-@@ -3839,7 +3842,7 @@
- {
- 	struct tp_dispatch *tp;
-
--	evdev_tag_touchpad(device, device->udev_device);
-+	evdev_tag_touchpad(device,device->uhdf);
-
- 	tp = zalloc(sizeof *tp);
-
-diff -Naur old/src/evdev-tablet-pad-leds.c new/src/evdev-tablet-pad-leds.c
---- old/src/evdev-tablet-pad-leds.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-tablet-pad-leds.c	2021-01-01 00:00:00.000000000 +0800
-@@ -186,7 +186,7 @@
- static inline bool
- is_litest_device(struct evdev_device *device)
- {
--	return !!udev_device_get_property_value(device->udev_device,
-+	return !!uhdf_device_get_property_value(device->uhdf,
- 						"LIBINPUT_TEST_DEVICE");
- }
-
-@@ -239,34 +239,7 @@
- 			    char *path_out,
- 			    size_t path_out_sz)
- {
--	struct udev_device *parent, *udev_device;
--	const char *test_path;
--	int rc;
--
--	udev_device = device->udev_device;
--
--	/* For testing purposes only allow for a base path set through a
--	 * udev rule. We still expect the normal directory hierarchy inside */
--	test_path = udev_device_get_property_value(udev_device,
--						   "LIBINPUT_TEST_TABLET_PAD_SYSFS_PATH");
--	if (test_path) {
--		rc = snprintf(path_out, path_out_sz, "%s", test_path);
--		return rc != -1;
--	}
--
--	parent = udev_device_get_parent_with_subsystem_devtype(udev_device,
--							       "input",
--							       NULL);
--	if (!parent)
--		return false;
--
--	rc = snprintf(path_out,
--		      path_out_sz,
--		      "%s/%s::wacom-",
--		      udev_device_get_syspath(parent),
--		      udev_device_get_sysname(parent));
--
--	return rc != -1;
-+	return false;
- }
-
- #if HAVE_LIBWACOM
-diff -Naur old/src/evdev-tablet-pad.c new/src/evdev-tablet-pad.c
---- old/src/evdev-tablet-pad.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-tablet-pad.c	2021-01-01 00:00:00.000000000 +0800
-@@ -482,6 +482,9 @@
- {
- 	struct pad_dispatch *pad = pad_dispatch(dispatch);
-
-+	libinput_log_printf("1.event divice_name:%s divice_fd:%d type:%d code:%d value:%d  time:%llu  curtime:%llu\r\n",
-+		device->devname, device->fd, e->type, e->code, e->value, getTranTime(e), getMicrotime());
-+
- 	switch (e->type) {
- 	case EV_ABS:
- 		pad_process_absolute(pad, device, e, time);
-diff -Naur old/src/evdev-tablet.c new/src/evdev-tablet.c
---- old/src/evdev-tablet.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-tablet.c	2021-01-01 00:00:00.000000000 +0800
-@@ -1089,7 +1089,7 @@
- 		goto out;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
-
- 	tool->pressure_offset = pressure->minimum;
-
-diff -Naur old/src/evdev-totem.c new/src/evdev-totem.c
---- old/src/evdev-totem.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-totem.c	2021-01-01 00:00:00.000000000 +0800
-@@ -520,6 +520,9 @@
- 	enum totem_slot_state global_state;
- 	bool enable_touch;
-
-+	libinput_log_printf("1.event divice_name:%s divice_fd:%d type:%d code:%d value:%d  time:%llu  curtime:%llu\r\n",
-+        device->devname, device->fd, e->type, e->code, e->value, getTranTime(e), getMicrotime());
-+
- 	switch(e->type) {
- 	case EV_ABS:
- 		totem_process_abs(totem, device, e, time);
-diff -Naur old/src/evdev.c new/src/evdev.c
---- old/src/evdev.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev.c	2021-01-01 00:00:00.000000000 +0800
-@@ -38,7 +38,7 @@
- #include <assert.h>
- #include <math.h>
- #include <stdint.h>
--
-+#include <stdatomic.h>
- #include "libinput.h"
- #include "evdev.h"
- #include "filter.h"
-@@ -54,25 +54,7 @@
- #define DEFAULT_BUTTON_SCROLL_TIMEOUT ms2us(200)
- #define MAX_RETRY_OPEN_DEVICE_COUNT 10
-
--enum evdev_device_udev_tags {
--        EVDEV_UDEV_TAG_INPUT		= bit(0),
--        EVDEV_UDEV_TAG_KEYBOARD		= bit(1),
--        EVDEV_UDEV_TAG_MOUSE		= bit(2),
--        EVDEV_UDEV_TAG_TOUCHPAD		= bit(3),
--        EVDEV_UDEV_TAG_TOUCHSCREEN	= bit(4),
--        EVDEV_UDEV_TAG_TABLET		= bit(5),
--        EVDEV_UDEV_TAG_JOYSTICK		= bit(6),
--        EVDEV_UDEV_TAG_ACCELEROMETER	= bit(7),
--        EVDEV_UDEV_TAG_TABLET_PAD	= bit(8),
--        EVDEV_UDEV_TAG_POINTINGSTICK	= bit(9),
--        EVDEV_UDEV_TAG_TRACKBALL	= bit(10),
--        EVDEV_UDEV_TAG_SWITCH		= bit(11),
--};
-
--struct evdev_udev_tag_match {
--	const char *name;
--	enum evdev_device_udev_tags tag;
--};
-
- static const struct evdev_udev_tag_match evdev_udev_tag_matches[] = {
- 	{"ID_INPUT",			EVDEV_UDEV_TAG_INPUT},
-@@ -90,14 +72,20 @@
- 	{"ID_INPUT_SWITCH",		EVDEV_UDEV_TAG_SWITCH},
- };
-
-+const char *  uhdf_device_get_property_value(struct uhdf *uhdf,
-+						   const char *key)
-+{
-+    return NULL;
-+}
-+
- static inline bool
- parse_udev_flag(struct evdev_device *device,
--		struct udev_device *udev_device,
-+		struct uhdf *uhdf,
- 		const char *property)
- {
- 	const char *val;
-
--	val = udev_device_get_property_value(udev_device, property);
-+	val = uhdf_device_get_property_value(uhdf, property);
- 	if (!val)
- 		return false;
-
-@@ -409,7 +397,7 @@
-
- static void
- evdev_tag_external_mouse(struct evdev_device *device,
--			 struct udev_device *udev_device)
-+			 struct uhdf *uhdf)
- {
- 	int bustype;
-
-@@ -420,7 +408,7 @@
-
- static void
- evdev_tag_trackpoint(struct evdev_device *device,
--		     struct udev_device *udev_device)
-+             struct uhdf *uhdf)
- {
- 	struct quirks_context *quirks;
- 	struct quirks *q;
-@@ -428,13 +416,13 @@
-
- 	if (!libevdev_has_property(device->evdev,
- 				  INPUT_PROP_POINTING_STICK) &&
--	    !parse_udev_flag(device, udev_device, "ID_INPUT_POINTINGSTICK"))
-+	    !parse_udev_flag(device, uhdf, "ID_INPUT_POINTINGSTICK"))
- 		return;
-
- 	device->tags |= EVDEV_TAG_TRACKPOINT;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (q && quirks_get_string(q, QUIRK_ATTR_TRACKPOINT_INTEGRATION, &prop)) {
- 		if (streq(prop, "internal")) {
- 			/* noop, this is the default anyway */
-@@ -467,8 +455,7 @@
- }
-
- static void
--evdev_tag_keyboard(struct evdev_device *device,
--		   struct udev_device *udev_device)
-+evdev_tag_keyboard(struct evdev_device *device)
- {
- 	struct quirks_context *quirks;
- 	struct quirks *q;
-@@ -486,7 +473,7 @@
- 	}
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (q && quirks_get_string(q, QUIRK_ATTR_KEYBOARD_INTEGRATION, &prop)) {
- 		if (streq(prop, "internal")) {
- 			evdev_tag_keyboard_internal(device);
-@@ -918,7 +905,7 @@
- 	char *prop;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q || !quirks_get_string(q, QUIRK_ATTR_LID_SWITCH_RELIABILITY, &prop)) {
- 		r = RELIABILITY_UNKNOWN;
- 	} else if (!parse_switch_reliability_property(prop, &r)) {
-@@ -1003,6 +990,24 @@
- 	}
- }
-
-+void
-+evdev_device_dispatch_two(struct evdev_device *device,
-+			  struct input_event *ev)
-+{
-+	if (!device->mtdev) {
-+		evdev_process_event(device, ev);
-+	} else {
-+		mtdev_put_event(device->mtdev, ev);
-+		if (libevdev_event_is_code(ev, EV_SYN, SYN_REPORT)) {
-+			while (!mtdev_empty(device->mtdev)) {
-+				struct input_event e;
-+				mtdev_get_event(device->mtdev, &e);
-+				evdev_process_event(device, &e);
-+			}
-+		}
-+	}
-+}
-+
- static int
- evdev_sync_device(struct evdev_device *device)
- {
-@@ -1045,6 +1050,34 @@
- 	}
- }
-
-+void
-+evdev_device_hdfdispatch(void *data)
-+{
-+	struct libinput *libinput = data;
-+	int len;
-+    int readcount = 0;
-+    struct input_event event[256];
-+    int index = -1;
-+    do {
-+        len = read(libinput->pipes[0], event, sizeof(event));
-+        atomic_fetch_sub_explicit(&libinput->pipesbytes,len,memory_order_release);
-+        if(len > 0 && len % sizeof(struct input_event) != 0) {
-+
-+            return ;
-+        }
-+        if(len < 0){
-+            break;
-+        }
-+		for(unsigned int i = 0;i<len/sizeof(struct input_event); i++) {
-+            index = (event[i].type>>8)&0xff;
-+            event[i].type = event[i].type&0xff;
-+            libevdev_set_event_value(libinput->device[index]->evdev, event[i].type,event[i].code,event[i].value);
-+            evdev_device_dispatch_one(libinput->device[index], &event[i]);
-+        }
-+        readcount =atomic_load_explicit(&libinput->pipesbytes,__ATOMIC_SEQ_CST);
-+	} while (readcount > 0);
-+}
-+
- static void
- evdev_device_dispatch(void *data)
- {
-@@ -1238,7 +1271,7 @@
- 	int val;
-
- 	*angle = DEFAULT_WHEEL_CLICK_ANGLE;
--	prop = udev_device_get_property_value(device->udev_device, prop);
-+	prop = uhdf_device_get_property_value(device->uhdf, prop);
- 	if (!prop)
- 		return false;
-
-@@ -1263,7 +1296,7 @@
- {
- 	int val;
-
--	prop = udev_device_get_property_value(device->udev_device, prop);
-+	prop = uhdf_device_get_property_value(device->uhdf, prop);
- 	if (!prop)
- 		return false;
-
-@@ -1319,7 +1352,7 @@
- 		return 1.0;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (q) {
- 		quirks_get_double(q, QUIRK_ATTR_TRACKPOINT_MULTIPLIER, &multiplier);
- 		quirks_unref(q);
-@@ -1348,7 +1381,7 @@
- 	bool use_velocity_averaging = false; /* default off unless we have quirk */
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (q) {
- 		quirks_get_bool(q,
- 				QUIRK_ATTR_USE_VELOCITY_AVERAGING,
-@@ -1372,7 +1405,7 @@
- 	if (device->tags & EVDEV_TAG_TRACKPOINT)
- 		return DEFAULT_MOUSE_DPI;
-
--	mouse_dpi = udev_device_get_property_value(device->udev_device,
-+	mouse_dpi = uhdf_device_get_property_value(device->uhdf,
- 						   "MOUSE_DPI");
- 	if (mouse_dpi) {
- 		dpi = parse_mouse_dpi_property(mouse_dpi);
-@@ -1416,7 +1449,7 @@
- 	struct quirks *q;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
-
- 	while (q && m->quirk) {
- 		bool is_set;
-@@ -1445,7 +1478,7 @@
- 	quirks_unref(q);
-
- 	if (parse_udev_flag(device,
--			    device->udev_device,
-+			    device->uhdf,
- 			    "ID_INPUT_TRACKBALL")) {
- 		evdev_log_debug(device, "tagged as trackball\n");
- 		model_flags |= EVDEV_MODEL_TRACKBALL;
-@@ -1457,13 +1490,13 @@
- 	 * usage, so we need to keep this for backwards compat.
- 	 */
- 	if (parse_udev_flag(device,
--			    device->udev_device,
-+			    device->uhdf,
- 			    "LIBINPUT_MODEL_LENOVO_X220_TOUCHPAD_FW81")) {
- 		evdev_log_debug(device, "tagged as trackball\n");
- 		model_flags |= EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81;
- 	}
-
--	if (parse_udev_flag(device, device->udev_device,
-+	if (parse_udev_flag(device, device->uhdf,
- 			    "LIBINPUT_TEST_DEVICE")) {
- 		evdev_log_debug(device, "is a test device\n");
- 		model_flags |= EVDEV_MODEL_TEST_DEVICE;
-@@ -1483,7 +1516,7 @@
- 	bool rc = false;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q)
- 		return false;
-
-@@ -1509,7 +1542,7 @@
- 	bool rc = false;
-
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q)
- 		return false;
-
-@@ -1572,21 +1605,17 @@
-
- static enum evdev_device_udev_tags
- evdev_device_get_udev_tags(struct evdev_device *device,
--			   struct udev_device *udev_device)
-+			   struct uhdf *uhdf)
- {
-+
- 	enum evdev_device_udev_tags tags = 0;
--	int i;
-
--	for (i = 0; i < 2 && udev_device; i++) {
--		unsigned j;
--		for (j = 0; j < ARRAY_LENGTH(evdev_udev_tag_matches); j++) {
--			const struct evdev_udev_tag_match match = evdev_udev_tag_matches[j];
--			if (parse_udev_flag(device,
--					    udev_device,
--					    match.name))
--				tags |= match.tag;
--		}
--		udev_device = udev_device_get_parent(udev_device);
-+	unsigned j;
-+	for (j = 0; j < ARRAY_LENGTH(evdev_udev_tag_matches); j++) {
-+	    const struct evdev_udev_tag_match match = evdev_udev_tag_matches[j];
-+
-+		if(uhdf->type & match.tag)
-+		    tags |= match.tag;
- 	}
-
- 	return tags;
-@@ -1778,13 +1807,18 @@
- 	enum evdev_device_udev_tags udev_tags;
- 	unsigned int tablet_tags;
- 	struct evdev_dispatch *dispatch;
-+
-+	udev_tags = evdev_device_get_udev_tags(device, device->uhdf);
-+
-+	device->model_flags = udev_tags;
-
--	udev_tags = evdev_device_get_udev_tags(device, device->udev_device);
-+    libinput_log_printf("----evdev_configure_device  tagged as supported input device---- %d \r\n", udev_tags);
-
- 	if ((udev_tags & EVDEV_UDEV_TAG_INPUT) == 0 ||
- 	    (udev_tags & ~EVDEV_UDEV_TAG_INPUT) == 0) {
- 		evdev_log_info(device,
- 			       "not tagged as supported input device\n");
-+        libinput_log_printf("----evdev_configure_device not tagged as supported input device---- \r\n");
- 		return NULL;
- 	}
-
-@@ -1812,12 +1846,6 @@
- 		evdev_disable_accelerometer_axes(device);
- 	}
-
--	if (udev_tags == (EVDEV_UDEV_TAG_INPUT|EVDEV_UDEV_TAG_JOYSTICK)) {
--		evdev_log_info(device,
--			       "device is a joystick, ignoring\n");
--		return NULL;
--	}
--
- 	if (evdev_reject_device(device)) {
- 		evdev_log_info(device, "was rejected\n");
- 		return NULL;
-@@ -1833,8 +1861,16 @@
- 			udev_tags &= ~EVDEV_UDEV_TAG_TOUCHSCREEN;
- 	}
-
-+    if (udev_tags & EVDEV_UDEV_TAG_JOYSTICK) {
-+        libinput_log_printf("----evdev_configure_device--_LIBINPUT_JOYSTICK_BULID-- \r\n");
-+        dispatch = evdev_joystick_create(device);
-+        device->seat_caps |= EVDEV_DEVICE_JOYSTICK;
-+		return dispatch;
-+    }
-+
- 	if (evdev_device_has_model_quirk(device,
- 					 QUIRK_MODEL_DELL_CANVAS_TOTEM)) {
-+        libinput_log_printf("----evdev_configure_device--_LIBINPUT_TOTEM_BULID-- \r\n");
- 		dispatch = evdev_totem_create(device);
- 		device->seat_caps |= EVDEV_DEVICE_TABLET;
- 		evdev_log_info(device, "device is a totem\n");
-@@ -1850,12 +1886,14 @@
-
- 	/* libwacom assigns tablet _and_ tablet_pad to the pad devices */
- 	if (udev_tags & EVDEV_UDEV_TAG_TABLET_PAD) {
-+        libinput_log_printf("----evdev_configure_device--_LIBINPUT_TABLET_PAD_BULID-- \r\n");
- 		dispatch = evdev_tablet_pad_create(device);
- 		device->seat_caps |= EVDEV_DEVICE_TABLET_PAD;
- 		evdev_log_info(device, "device is a tablet pad\n");
- 		return dispatch;
-
- 	} else if ((udev_tags & tablet_tags) == EVDEV_UDEV_TAG_TABLET) {
-+        libinput_log_printf("----evdev_configure_device--_LIBINPUT_TABLET_BULID-- \r\n");
- 		dispatch = evdev_tablet_create(device);
- 		device->seat_caps |= EVDEV_DEVICE_TABLET;
- 		evdev_log_info(device, "device is a tablet\n");
-@@ -1863,6 +1901,7 @@
- 	}
-
- 	if (udev_tags & EVDEV_UDEV_TAG_TOUCHPAD) {
-+        libinput_log_printf("----evdev_configure_device--_LIBINPUT_TOUCHPAD_BULID-- \r\n");
- 		if (udev_tags & EVDEV_UDEV_TAG_TABLET)
- 			evdev_tag_tablet_touchpad(device);
- 		/* whether velocity should be averaged, false by default */
-@@ -1874,8 +1913,8 @@
-
- 	if (udev_tags & EVDEV_UDEV_TAG_MOUSE ||
- 	    udev_tags & EVDEV_UDEV_TAG_POINTINGSTICK) {
--		evdev_tag_external_mouse(device, device->udev_device);
--		evdev_tag_trackpoint(device, device->udev_device);
-+		evdev_tag_external_mouse(device, device->uhdf);
-+		evdev_tag_trackpoint(device, device->uhdf);
- 		device->dpi = evdev_read_dpi_prop(device);
- 		device->trackpoint_multiplier = evdev_get_trackpoint_multiplier(device);
- 		/* whether velocity should be averaged, false by default */
-@@ -1906,7 +1945,7 @@
- 			device->seat_caps |= EVDEV_DEVICE_POINTER;
- 		}
-
--		evdev_tag_keyboard(device, device->udev_device);
-+		evdev_tag_keyboard(device);
- 	}
-
- 	if (udev_tags & EVDEV_UDEV_TAG_TOUCHSCREEN) {
-@@ -1987,38 +2026,18 @@
- }
-
- static bool
--evdev_device_have_same_syspath(struct udev_device *udev_device, int fd)
-+evdev_device_have_same_syspath(struct uhdf *uhdf, int fd)
- {
--	struct udev *udev = udev_device_get_udev(udev_device);
--	struct udev_device *udev_device_new = NULL;
--	struct stat st;
--	bool rc = false;
--
--	if (fstat(fd, &st) < 0)
--		goto out;
--
--	udev_device_new = udev_device_new_from_devnum(udev, 'c', st.st_rdev);
--	if (!udev_device_new)
--		goto out;
--
--	rc = streq(udev_device_get_syspath(udev_device_new),
--		   udev_device_get_syspath(udev_device));
--out:
--	if (udev_device_new)
--		udev_device_unref(udev_device_new);
--	return rc;
-+	return false;
- }
-
- static bool
- evdev_set_device_group(struct evdev_device *device,
--		       struct udev_device *udev_device)
-+		       struct uhdf *uhdf)
- {
- 	struct libinput *libinput = evdev_libinput_context(device);
- 	struct libinput_device_group *group = NULL;
--	const char *udev_group;
--
--	udev_group = udev_device_get_property_value(udev_device,
--						    "LIBINPUT_DEVICE_GROUP");
-+	const char *udev_group = "LIBINPUT_DEVICE_GROUP";
- 	if (udev_group)
- 		group = libinput_device_group_find_group(libinput, udev_group);
-
-@@ -2078,7 +2097,7 @@
- 	 * unnecessary wakeups but on some devices we need to watch it for
- 	 * pointer jumps */
- 	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
-+	q = quirks_fetch_for_device(quirks, device->uhdf);
- 	if (!q ||
- 	    !quirks_get_string(q, QUIRK_ATTR_MSC_TIMESTAMP, &prop) ||
- 	    !streq(prop, "watch")) {
-@@ -2145,11 +2164,11 @@
- }
-
- static bool
--udev_device_should_be_ignored(struct udev_device *udev_device)
-+udev_device_should_be_ignored(struct uhdf *uhdf)
- {
- 	const char *value;
-
--	value = udev_device_get_property_value(udev_device,
-+	value = uhdf_device_get_property_value(uhdf,
- 					       "LIBINPUT_IGNORE_DEVICE");
-
- 	return value && !streq(value, "0");
-@@ -2157,73 +2176,38 @@
-
- struct evdev_device *
- evdev_device_create(struct libinput_seat *seat,
--		    struct udev_device *udev_device)
-+		    struct uhdf *uhdf)
- {
-+    char devname[256]={0};
- 	struct libinput *libinput = seat->libinput;
- 	struct evdev_device *device = NULL;
- 	int rc;
--	int fd;
- 	int unhandled_device = 0;
--	const char *devnode = udev_device_get_devnode(udev_device);
--	const char *sysname = udev_device_get_sysname(udev_device);
--
--	if (!devnode) {
--		log_info(libinput, "%s: no device node associated\n", sysname);
--		return NULL;
--	}
--
--	if (udev_device_should_be_ignored(udev_device)) {
--		log_debug(libinput, "%s: device is ignored\n", sysname);
--		return NULL;
--	}
--
--	int loop_count = 0;
--	loop_open_restricted:
--	/* Use non-blocking mode so that we can loop on read on
--	 * evdev_device_data() until all events on the fd are
--	 * read.  mtdev_get() also expects this. */
--	fd = open_restricted(libinput, devnode,
--			     O_RDWR | O_NONBLOCK | O_CLOEXEC);
--	loop_count++;
--	if (fd < 0) {
--		log_info(libinput,
--			 "%s: opening input device '%s' failed (%s).\n",
--			 sysname,
--			 devnode,
--			 strerror(-fd));
--		if (loop_count < MAX_RETRY_OPEN_DEVICE_COUNT) {
--			usleep(1 * 1000);
--			goto loop_open_restricted;
--		}
--		return NULL;
--	}
--
--	if (!evdev_device_have_same_syspath(udev_device, fd))
--		goto err;
-
- 	device = zalloc(sizeof *device);
-
- 	libinput_device_init(&device->base, seat);
- 	libinput_seat_ref(seat);
-
--	evdev_drain_fd(fd);
--
--	rc = libevdev_new_from_fd(fd, &device->evdev);
-+	rc = libevdev_new_from_index(uhdf->index, &device->evdev,uhdf->fn);
- 	if (rc != 0)
- 		goto err;
--
--	libevdev_set_clock_id(device->evdev, CLOCK_MONOTONIC);
-+
- 	libevdev_set_device_log_function(device->evdev,
- 					 libevdev_log_func,
- 					 LIBEVDEV_LOG_ERROR,
- 					 libinput);
- 	device->seat_caps = 0;
- 	device->is_mt = 0;
-+	device->udev_device = NULL;
- 	device->mtdev = NULL;
--	device->udev_device = udev_device_ref(udev_device);
-+	device->uhdf = uhdf;
- 	device->dispatch = NULL;
--	device->fd = fd;
--	device->devname = libevdev_get_name(device->evdev);
-+	device->fd = -1;//uhdf->index;
-+    device->source = NULL;
-+    device->output_name = NULL;
-+    sprintf(devname,"HDI_%2d",uhdf->index);
-+	device->devname = strdup(devname);//libevdev_get_name(device->evdev);
- 	device->scroll.threshold = 5.0; /* Default may be overridden */
- 	device->scroll.direction_lock_threshold = 5.0; /* Default may be overridden */
- 	device->scroll.direction = 0;
-@@ -2231,7 +2215,7 @@
- 		evdev_read_wheel_click_props(device);
- 	device->model_flags = evdev_read_model_flags(device);
- 	device->dpi = DEFAULT_MOUSE_DPI;
--
-+    libinput->device[uhdf->index] = device;
- 	/* at most 5 SYN_DROPPED log-messages per 30s */
- 	ratelimit_init(&device->syn_drop_limit, s2us(30), 5);
- 	/* at most 5 "delayed processing" log messages per hour */
-@@ -2242,19 +2226,18 @@
- 	matrix_init_identity(&device->abs.calibration);
- 	matrix_init_identity(&device->abs.usermatrix);
- 	matrix_init_identity(&device->abs.default_calibration);
--
-+
- 	evdev_pre_configure_model_quirks(device);
--
-+
- 	device->dispatch = evdev_configure_device(device);
- 	if (device->dispatch == NULL || device->seat_caps == 0)
--		goto err;
--
--	device->source =
--		libinput_add_fd(libinput, fd, evdev_device_dispatch, device);
-+		goto err;
-+
-+  	device->source = NULL;
-+/*		libinput_add_fd(libinput, libinput->pipes[0], evdev_device_hdfdispatch, libinput);
- 	if (!device->source)
--		goto err;
--
--	if (!evdev_set_device_group(device, udev_device))
-+		goto err;*/
-+	if (!evdev_set_device_group(device, uhdf))
- 		goto err;
-
- 	list_insert(seat->devices_list.prev, &device->base.link);
-@@ -2264,7 +2247,6 @@
- 	return device;
-
- err:
--	close_restricted(libinput, fd);
- 	if (device) {
- 		unhandled_device = device->seat_caps == 0;
- 		evdev_device_destroy(device);
-@@ -2282,7 +2264,7 @@
- const char *
- evdev_device_get_sysname(struct evdev_device *device)
- {
--	return udev_device_get_sysname(device->udev_device);
-+	return "hdf_path";
- }
-
- const char *
-@@ -2306,7 +2288,8 @@
- struct udev_device *
- evdev_device_get_udev_device(struct evdev_device *device)
- {
--	return udev_device_ref(device->udev_device);
-+
-+	return NULL;
- }
-
- void
-@@ -2387,7 +2370,7 @@
- 	const char *prop;
- 	float calibration[6];
-
--	prop = udev_device_get_property_value(device->udev_device,
-+	prop = uhdf_device_get_property_value(device->uhdf,
- 					      "LIBINPUT_CALIBRATION_MATRIX");
-
- 	if (prop == NULL)
-@@ -2423,7 +2406,7 @@
- 	if (rc == -1)
- 		return 0;
-
--	prop = udev_device_get_property_value(device->udev_device, name);
-+	prop = uhdf_device_get_property_value(device->uhdf, name);
- 	if (prop && (safe_atoi(prop, &fuzz) == false || fuzz < 0)) {
- 		evdev_log_bug_libinput(device,
- 				       "invalid LIBINPUT_FUZZ property value: %s\n",
-@@ -2476,6 +2459,9 @@
- 		return !!(device->seat_caps & EVDEV_DEVICE_TABLET_PAD);
- 	case LIBINPUT_DEVICE_CAP_SWITCH:
- 		return !!(device->seat_caps & EVDEV_DEVICE_SWITCH);
-+	case LIBINPUT_DEVICE_CAP_JOYSTICK:
-+		return !!(device->seat_caps & EVDEV_DEVICE_JOYSTICK);
-+
- 	default:
- 		return false;
- 	}
-@@ -2751,64 +2737,6 @@
- int
- evdev_device_resume(struct evdev_device *device)
- {
--	struct libinput *libinput = evdev_libinput_context(device);
--	int fd;
--	const char *devnode;
--	struct input_event ev;
--	enum libevdev_read_status status;
--
--	if (device->fd != -1)
--		return 0;
--
--	if (device->was_removed)
--		return -ENODEV;
--
--	devnode = udev_device_get_devnode(device->udev_device);
--	if (!devnode)
--		return -ENODEV;
--
--	fd = open_restricted(libinput, devnode,
--			     O_RDWR | O_NONBLOCK | O_CLOEXEC);
--
--	if (fd < 0)
--		return -errno;
--
--	if (!evdev_device_have_same_syspath(device->udev_device, fd)) {
--		close_restricted(libinput, fd);
--		return -ENODEV;
--	}
--
--	evdev_drain_fd(fd);
--
--	device->fd = fd;
--
--	if (evdev_need_mtdev(device)) {
--		device->mtdev = mtdev_new_open(device->fd);
--		if (!device->mtdev)
--			return -ENODEV;
--	}
--
--	libevdev_change_fd(device->evdev, fd);
--	libevdev_set_clock_id(device->evdev, CLOCK_MONOTONIC);
--
--	/* re-sync libevdev's view of the device, but discard the actual
--	   events. Our device is in a neutral state already */
--	libevdev_next_event(device->evdev,
--			    LIBEVDEV_READ_FLAG_FORCE_SYNC,
--			    &ev);
--	do {
--		status = libevdev_next_event(device->evdev,
--					     LIBEVDEV_READ_FLAG_SYNC,
--					     &ev);
--	} while (status == LIBEVDEV_READ_STATUS_SYNC);
--
--	device->source =
--		libinput_add_fd(libinput, fd, evdev_device_dispatch, device);
--	if (!device->source) {
--		mtdev_close_delete(device->mtdev);
--		return -ENOMEM;
--	}
--
- 	evdev_notify_resumed_device(device);
-
- 	return 0;
-@@ -2861,12 +2789,12 @@
- 		libinput_device_group_unref(device->base.group);
-
- 	free(device->output_name);
-+    free((char*)device->devname);
- 	filter_destroy(device->pointer.filter);
- 	libinput_timer_destroy(&device->scroll.timer);
- 	libinput_timer_destroy(&device->middlebutton.timer);
- 	libinput_seat_unref(device->base.seat);
- 	libevdev_free(device->evdev);
--	udev_device_unref(device->udev_device);
- 	free(device);
- }
-
-diff -Naur old/src/evdev.h new/src/evdev.h
---- old/src/evdev.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev.h	2021-01-01 00:00:00.000000000 +0800
-@@ -61,6 +61,7 @@
- 	EVDEV_DEVICE_TABLET_PAD		= bit(4),
- 	EVDEV_DEVICE_GESTURE		= bit(5),
- 	EVDEV_DEVICE_SWITCH		= bit(6),
-+	EVDEV_DEVICE_JOYSTICK = bit(7),
- };
-
- enum evdev_device_tags {
-@@ -76,6 +77,11 @@
- 	EVDEV_TAG_TABLET_TOUCHPAD	= bit(9),
- };
-
-+struct evdev_udev_tag_match {
-+    const char* name;
-+    enum evdev_device_udev_tags tag;
-+};
-+
- enum evdev_middlebutton_state {
- 	MIDDLEBUTTON_IDLE,
- 	MIDDLEBUTTON_LEFT_DOWN,
-@@ -159,6 +165,8 @@
- 	ARBITRATION_IGNORE_RECT,
- };
-
-+struct uhdf;
-+
- struct evdev_device {
- 	struct libinput_device base;
-
-@@ -269,6 +277,7 @@
- 		uint32_t button_mask;
- 		uint64_t first_event_time;
- 	} middlebutton;
-+	struct uhdf *uhdf;
- };
-
- static inline struct evdev_device *
-@@ -353,6 +362,7 @@
- 	DISPATCH_TABLET,
- 	DISPATCH_TABLET_PAD,
- 	DISPATCH_TOTEM,
-+	DISPATCH_JOYSTICK,
- };
-
- struct evdev_dispatch {
-@@ -375,7 +385,7 @@
-
- struct evdev_device *
- evdev_device_create(struct libinput_seat *seat,
--		    struct udev_device *device);
-+		    struct uhdf *uhdf);
-
- static inline struct libinput *
- evdev_libinput_context(const struct evdev_device *device)
-@@ -386,19 +396,8 @@
- static inline bool
- evdev_device_has_model_quirk(struct evdev_device *device,
- 			     enum quirk model_quirk)
--{
--	struct quirks_context *quirks;
--	struct quirks *q;
--	bool result = false;
--
--	assert(quirk_get_name(model_quirk) != NULL);
--
--	quirks = evdev_libinput_context(device)->quirks;
--	q = quirks_fetch_for_device(quirks, device->udev_device);
--	quirks_get_bool(q, model_quirk, &result);
--	quirks_unref(q);
--
--	return result;
-+{
-+	return model_quirk == (enum quirk)(device->uhdf->modeltype);
- }
-
- void
-@@ -430,6 +429,10 @@
- evdev_device_init_pointer_acceleration(struct evdev_device *device,
- 				       struct motion_filter *filter);
-
-+struct evdev_dispatch*
-+evdev_joystick_create(struct evdev_device* device);
-+
-+
- struct evdev_dispatch *
- evdev_touchpad_create(struct evdev_device *device);
-
-@@ -481,6 +484,11 @@
- struct udev_device *
- evdev_device_get_udev_device(struct evdev_device *device);
-
-+/**  @brief   获取设备类型 */
-+enum evdev_device_udev_tags
-+evdev_device_get_udev_device_tags(struct evdev_device* device);
-+
-+
- void
- evdev_device_set_default_calibration(struct evdev_device *device,
- 				     const float calibration[6]);
-@@ -1005,7 +1013,8 @@
- 				   "Axis %#x value %d is outside expected range [%d, %d]\n"
- 				   "See %sabsolute_coordinate_ranges.html for details\n",
- 				   code, value, min, max,
--				   HTTP_DOC_LINK);
-+				   "");
-+				//HTTP_DOC_LINK);
- 	}
- }
-
-@@ -1024,4 +1033,7 @@
- 	free(kbd);
- }
-
-+const char *  uhdf_device_get_property_value(struct uhdf *uhdf,
-+						   const char *key);
-+
- #endif /* EVDEV_H */
-diff -Naur old/src/libinput-git-version.h new/src/libinput-git-version.h
---- old/src/libinput-git-version.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-git-version.h	2021-01-01 00:00:00.000000000 +0800
-@@ -0,0 +1,3 @@
-+#pragma once
-+
-+#define LIBINPUT_GIT_VERSION "@VCS_TAG@"
-diff -Naur old/src/libinput-private.h new/src/libinput-private.h
---- old/src/libinput-private.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/libinput-private.h	2021-01-01 00:00:00.000000000 +0800
-@@ -30,7 +30,7 @@
- #include <errno.h>
- #include <math.h>
- #include <stdarg.h>
--
-+#include <stdatomic.h>
- #if HAVE_LIBWACOM
- #include <libwacom/libwacom.h>
- #endif
-@@ -118,7 +118,7 @@
- 	int (*device_change_seat)(struct libinput_device *device,
- 				  const char *seat_name);
- };
--
-+#define PIPE_NUM 64
- struct libinput {
- 	int epoll_fd;
- 	struct list source_destroy_list;
-@@ -162,6 +162,14 @@
- 		size_t refcount;
- 	} libwacom;
- #endif
-+    int pipes[2];
-+    atomic_int pipesbytes;
-+    atomic_int pipesbytesbyindex[PIPE_NUM];
-+    bool pipesstatus[PIPE_NUM];
-+    struct evdev_device *device[PIPE_NUM];
-+    int devpipes[2];
-+    struct libinput_source *devsource;
-+    struct libinput_source *eventsource;
- };
-
- typedef void (*libinput_seat_destroy_func) (struct libinput_seat *seat);
-@@ -600,7 +608,8 @@
- 		     enum libinput_event_type type,
- 		     int finger_count,
- 		     const struct normalized_coords *delta,
--		     const struct normalized_coords *unaccel);
-+		     const struct normalized_coords *unaccel,
-+		     const struct sloted_coords_info *raw_touches);
-
- void
- gesture_notify_swipe_end(struct libinput_device *device,
-@@ -867,5 +876,6 @@
- static inline void libinput_libwacom_unref(struct libinput *li) {}
- #endif
-
-+struct libinput * uhdflibinput_unref(struct libinput *libinput);
-
- #endif /* LIBINPUT_PRIVATE_H */
-diff -Naur old/src/libinput-util.c new/src/libinput-util.c
---- old/src/libinput-util.c	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-util.c	2021-01-01 00:00:00.000000000 +0800
-@@ -0,0 +1,102 @@
-+/*
-+ * Copyright © 2008-2011 Kristian Høgsberg
-+ * Copyright © 2011 Intel Corporation
-+ * Copyright © 2013-2015 Red Hat, Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/*
-+ * This list data structure is verbatim copy from wayland-util.h from the
-+ * Wayland project; except that wl_ prefix has been removed.
-+ */
-+
-+#include "libinput-util.h"
-+
-+#ifdef HAVE_LIBINPUT_LOG_ENABLE
-+
-+static FILE* p_log_fp = NULL;
-+
-+FILE *libinput_get_log_fp()
-+{
-+    if (p_log_fp == NULL) {
-+        const char *pLogDir = getenv("LIBINPUT_LOG_DIR");
-+        if (pLogDir == NULL) {
-+            pLogDir = (char *)_LIBINPUT_LOG_DIR;
-+        }
-+
-+        const int r = mkdir(pLogDir, 0755);
-+        if (r < 0 && errno != EEXIST) {
-+            const int saved_errno = errno;
-+            printf("could not create %s, errno: %d\n", pLogDir, saved_errno);
-+            return NULL;
-+        }
-+
-+        const char *p_log_path = getenv("LIBINPUT_LOG_PATH");
-+        if (p_log_path == NULL) {
-+            p_log_path = (char *)_LIBINPUT_LOG_PATH;
-+        }
-+        p_log_fp = fopen(p_log_path, "w+");
-+    }
-+
-+    return p_log_fp;
-+}
-+
-+void libinput_log_printf(const char* fmt, ...)
-+{
-+    p_log_fp = libinput_get_log_fp();
-+#ifdef HAVE_LIBINPUT_LOG_CONSOLE_ENABLE
-+    char buf[1024] = {0};
-+
-+    va_list args;
-+    va_start(args, fmt);
-+    vsprintf(buf, fmt, args);
-+    va_end(args);
-+    buf[1024 - 1] = '\0';
-+
-+    printf("%s\n", buf);
-+
-+    if (p_log_fp != NULL) {
-+        fputs(buf, p_log_fp);
-+        fflush(p_log_fp);
-+    }
-+#else
-+    if (p_log_fp != NULL) {
-+        va_list args;
-+        va_start(args, fmt);
-+        vfprintf(p_log_fp, fmt, args);
-+        va_end(args);
-+        fflush(p_log_fp);
-+    }
-+#endif
-+}
-+
-+uint64_t getMicrotime()
-+{
-+    struct timeval currentTime;
-+    gettimeofday(&currentTime, NULL);
-+    return currentTime.tv_sec * 1000000 + currentTime.tv_usec;
-+}
-+
-+uint64_t getTranTime(struct input_event *event)
-+{
-+    return event->input_event_sec * 1000000 + event->input_event_usec;
-+}
-+#endif
-diff -Naur old/src/libinput-util.h new/src/libinput-util.h
---- old/src/libinput-util.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/libinput-util.h	2021-01-01 00:00:00.000000000 +0800
-@@ -27,10 +27,9 @@
-
- #include "config.h"
-
--#ifdef NDEBUG
--#warning "libinput relies on assert(). #defining NDEBUG is not recommended"
--#endif
--
-+//#ifdef NDEBUG
-+//#warning "libinput relies on assert(). #defining NDEBUG is not recommended"
-+//#endif
-
- #include "libinput.h"
-
-@@ -57,6 +56,15 @@
- #define DEFAULT_MOUSE_DPI 1000
- #define DEFAULT_TRACKPOINT_SENSITIVITY 128
-
-+
-+#ifdef HAVE_LIBINPUT_LOG_ENABLE
-+void libinput_log_printf(const char* fmt, ...);
-+uint64_t getMicrotime();
-+uint64_t getTranTime(struct input_event *event);
-+#else
-+#define libinput_log_printf(fmt, ...)
-+#endif
-+
- #define trace(...) \
- 	do { \
- 	printf("%s() - \033[0;31m", __func__); \
-diff -Naur old/src/libinput-version.h new/src/libinput-version.h
---- old/src/libinput-version.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-version.h	2021-01-01 00:00:00.000000000 +0800
-@@ -0,0 +1,32 @@
-+/*
-+ * Copyright © 2013 Jonas Ådahl
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#ifndef LIBINPUT_VERSION_H
-+#define LIBINPUT_VERSION_H
-+
-+#define LIBINPUT_VERSION_MAJOR //@LIBINPUT_VERSION_MAJOR@
-+#define LIBINPUT_VERSION_MINOR //@LIBINPUT_VERSION_MINOR@
-+#define LIBINPUT_VERSION_MICRO //@LIBINPUT_VERSION_MICRO@
-+#define LIBINPUT_VERSION "@LIBINPUT_VERSION@"
-+
-+#endif
-diff -Naur old/src/libinput.c new/src/libinput.c
---- old/src/libinput.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/libinput.c	2021-01-01 00:00:00.000000000 +0800
-@@ -33,12 +33,13 @@
- #include <sys/epoll.h>
- #include <unistd.h>
- #include <assert.h>
--
-+#include <stdatomic.h>
- #include "libinput.h"
- #include "libinput-private.h"
- #include "evdev.h"
- #include "timer.h"
- #include "quirks.h"
-+#include "evdev-joystick.h"
-
- #define require_event_type(li_, type_, retval_, ...)	\
- 	if (type_ == LIBINPUT_EVENT_NONE) abort(); \
-@@ -193,6 +194,7 @@
- 	int cancelled;
- 	struct normalized_coords delta;
- 	struct normalized_coords delta_unaccel;
-+	struct sloted_coords_info solt_touches;
- 	double scale;
- 	double angle;
- };
-@@ -1031,6 +1033,18 @@
- 	return event->angle;
- }
-
-+LIBINPUT_EXPORT struct sloted_coords_info *
-+libinput_event_gesture_get_solt_touches(
-+	struct libinput_event_gesture *event)
-+{
-+	require_event_type(libinput_event_get_context(&event->base),
-+			   event->base.type,
-+			   NULL,
-+			   LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE);
-+
-+	return &event->solt_touches;
-+}
-+
- LIBINPUT_EXPORT int
- libinput_event_tablet_tool_x_has_changed(
- 				struct libinput_event_tablet_tool *event)
-@@ -1757,7 +1771,122 @@
- 	source->fd = -1;
- 	list_insert(&libinput->source_destroy_list, &source->link);
- }
-+extern void *
-+libinput_load_module(const char *name, const char *entrypoint);
-+typedef int (*HdfDevHandle)(int index,int cmd);
-+static void
-+evdev_dev_handler(void *data)
-+{
-+    struct libinput *libinput = (struct libinput *)data;
-+    int cmd[2];
-+    int len = sizeof(int);
-+    static HdfDevHandle handle = NULL;
-+    printf("libinput_add_fd epoll_fd =%d,fd=%d ,function addr = %p \n",libinput->epoll_fd,libinput->devpipes[0], evdev_dev_handler);
-+    if( handle == NULL) {
-+        handle = (HdfDevHandle)libinput_load_module("libmmi-server.z.so","HdfDevHandle");
-+    }
-+    {
-+        len = read(libinput->devpipes[0],cmd,sizeof(cmd));
-+        //printf("evdev_dev_handler cmd len =%d\n" ,len);
-+        if(len >= 0 ) {
-+            if(handle) {
-+                handle(cmd[0],cmd[1]);
-+            }
-+        }
-+    }
-+    return;
-+}
-+void uhdflibinput_unpipe(struct libinput *libinput)
-+{
-+    close(libinput->devpipes[0]);
-+    close(libinput->devpipes[1]);
-+    close(libinput->pipes[0]);
-+    close(libinput->pipes[1]);
-+}
-+bool libinput_pipe(struct libinput *libinput) {
-+
-+
-+	libinput->pipes[0]=-1;
-+    libinput->pipes[1]=-1;
-+    libinput->pipesbytes = 0;
-+    if (0 != pipe(libinput->pipes)) {
-+		return false;
-+	}
-+    if (fcntl(libinput->pipes[0], F_SETFL, O_NONBLOCK) == -1) {
-+		return false;
-+	}
-+    if (fcntl(libinput->pipes[1], F_SETFL, O_NONBLOCK) == -1) {
-+		return false;
-+	}
-+    libinput->devpipes[0]=-1;
-+    libinput->devpipes[1]=-1;
-+    if (0 != pipe(libinput->devpipes)) {
-+		    return false;
-+	}
-+
-+
-+    libinput->devsource = libinput_add_fd(libinput,
-+						     libinput->devpipes[0],
-+						     evdev_dev_handler,
-+						     libinput);
-+	if (!libinput->devsource) {
-+		return false;
-+	}
-+
-+	libinput->eventsource =
-+		libinput_add_fd(libinput, libinput->pipes[0], evdev_device_hdfdispatch, libinput);
-+	if (!libinput->eventsource) {
-+		return false;
-+    }
-+    libinput->pipesbytes = 0 ;
-+	return true;
-+}
-+
-+/**
-+* Write in a pipe.
-+*/
-+LIBINPUT_EXPORT int libinput_pipe_write(struct libinput *libinput, int index , const void *buf, int count) {
-+    int readcount =atomic_load_explicit(&libinput->pipesbytes,__ATOMIC_SEQ_CST);
-+
-+    if(readcount > 56*1024) { // more then 56k data will be discard
-+        libinput->pipesstatus[index] = true;
-+    }
-+    if(readcount < 1024) {//less then 1k data will  do translate
-+        libinput->pipesstatus[index] = false;
-+    }
-+    if(!libinput->pipesstatus[index]) {
-+        write(libinput->pipes[1], buf, count);
-+        atomic_fetch_add_explicit(&libinput->pipesbytes, count, memory_order_release);
-+    }
-+    return count ;
-+}
-
-+
-+LIBINPUT_EXPORT int libinput_get_pipe_bytes(struct libinput *libinput, int index) {
-+    return libinput->pipesbytes;
-+}
-+
-+/**
-+* Read in a pipe.
-+*/
-+LIBINPUT_EXPORT int libinput_pipe_read(struct libinput *libinput,  int index , void *buf, int count) {
-+	return (int) read(libinput->pipes[0], buf, count);
-+}
-+
-+/**
-+* Write in a pipe.
-+*/
-+LIBINPUT_EXPORT int libinput_devpipe_write(struct libinput *libinput, void *buf, int count) {
-+	return (int) write(libinput->devpipes[1], buf, count);
-+}
-+
-+/**
-+* Read in a pipe.
-+*/
-+LIBINPUT_EXPORT int libinput_devpipe_read(struct libinput *libinput,void *buf, int count) {
-+
-+	return (int) read(libinput->devpipes[0], buf, count);
-+}
- int
- libinput_init(struct libinput *libinput,
- 	      const struct libinput_interface *interface,
-@@ -1770,7 +1899,11 @@
- 	libinput->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
- 	if (libinput->epoll_fd < 0)
- 		return -1;
--
-+    if (!libinput_pipe(libinput)) {
-+        uhdflibinput_unpipe(libinput);
-+        close(libinput->epoll_fd);
-+        return -1;
-+    }
- 	libinput->events_len = 4;
- 	libinput->events = zalloc(libinput->events_len * sizeof(*libinput->events));
- 	libinput->log_handler = libinput_default_log_func;
-@@ -1806,11 +1939,8 @@
- 	/* If we fail, we'll fail next time too */
- 	libinput->quirks_initialized = true;
-
--	data_path = getenv("LIBINPUT_QUIRKS_DIR");
--	if (!data_path) {
--		data_path = LIBINPUT_QUIRKS_DIR;
--		override_file = LIBINPUT_QUIRKS_OVERRIDE_FILE;
--	}
-+		data_path = (char *)LIBINPUT_QUIRKS_DIR;
-+		override_file = (char *)LIBINPUT_QUIRKS_OVERRIDE_FILE;
-
- 	quirks = quirks_init_subsystem(data_path,
- 				       override_file,
-@@ -1856,10 +1986,9 @@
- 	return libinput;
- }
-
--LIBINPUT_EXPORT struct libinput *
--libinput_unref(struct libinput *libinput)
-+struct libinput * uhdflibinput_unref(struct libinput *libinput)
- {
--	struct libinput_event *event;
-+    struct libinput_event *event;
- 	struct libinput_device *device, *next_device;
- 	struct libinput_seat *seat, *next_seat;
- 	struct libinput_tablet_tool *tool, *next_tool;
-@@ -1873,10 +2002,6 @@
- 	if (libinput->refcount > 0)
- 		return libinput;
-
--	libinput_suspend(libinput);
--
--	libinput->interface_backend->destroy(libinput);
--
- 	while ((event = libinput_get_event(libinput)))
- 	       libinput_event_destroy(event);
-
-@@ -1901,16 +2026,25 @@
- 	list_for_each_safe(tool, next_tool, &libinput->tool_list, link) {
- 		libinput_tablet_tool_unref(tool);
- 	}
--
-+    libinput_remove_source(libinput,libinput->devsource);
-+    libinput_remove_source(libinput,libinput->eventsource);
-+    uhdflibinput_unpipe(libinput);
- 	libinput_timer_subsys_destroy(libinput);
- 	libinput_drop_destroyed_sources(libinput);
--	quirks_context_unref(libinput->quirks);
- 	close(libinput->epoll_fd);
- 	free(libinput);
-
- 	return NULL;
- }
-
-+LIBINPUT_EXPORT struct libinput *
-+libinput_unref(struct libinput *libinput)
-+{
-+    uhdflibinput_unref(libinput);
-+
-+	return NULL;
-+}
-+
- static void
- libinput_event_tablet_tool_destroy(struct libinput_event_tablet_tool *event)
- {
-@@ -2311,6 +2445,9 @@
- 	case LIBINPUT_DEVICE_CAP_SWITCH:
- 		capability = "CAP_SWITCH";
- 		break;
-+	case LIBINPUT_DEVICE_CAP_JOYSTICK:
-+        capability = "CAP_JOYSTICK";
-+        break;
- 	}
-
- 	log_bug_libinput(device->seat->libinput,
-@@ -2814,6 +2951,7 @@
- 	       int cancelled,
- 	       const struct normalized_coords *delta,
- 	       const struct normalized_coords *unaccel,
-+	       const struct sloted_coords_info *solt_touches,
- 	       double scale,
- 	       double angle)
- {
-@@ -2834,6 +2972,12 @@
- 		.angle = angle,
- 	};
-
-+	if (solt_touches != NULL) {
-+		gesture_event->solt_touches = *solt_touches;
-+	} else {
-+        memset(&gesture_event->solt_touches, 0, sizeof(struct sloted_coords_info));
-+    }
-+
- 	post_device_event(device, time, type,
- 			  &gesture_event->base);
- }
-@@ -2844,9 +2988,10 @@
- 		     enum libinput_event_type type,
- 		     int finger_count,
- 		     const struct normalized_coords *delta,
--		     const struct normalized_coords *unaccel)
-+		     const struct normalized_coords *unaccel,
-+		     const struct sloted_coords_info *solt_touches)
- {
--	gesture_notify(device, time, type, finger_count, 0, delta, unaccel,
-+	gesture_notify(device, time, type, finger_count, 0, delta, unaccel, solt_touches,
- 		       0.0, 0.0);
- }
-
-@@ -2859,7 +3004,7 @@
- 	const struct normalized_coords zero = { 0.0, 0.0 };
-
- 	gesture_notify(device, time, LIBINPUT_EVENT_GESTURE_SWIPE_END,
--		       finger_count, cancelled, &zero, &zero, 0.0, 0.0);
-+		       finger_count, cancelled, &zero, &zero, NULL, 0.0, 0.0);
- }
-
- void
-@@ -2873,7 +3018,7 @@
- 		     double angle)
- {
- 	gesture_notify(device, time, type, finger_count, 0,
--		       delta, unaccel, scale, angle);
-+		       delta, unaccel, NULL, scale, angle);
- }
-
- void
-@@ -2886,7 +3031,7 @@
- 	const struct normalized_coords zero = { 0.0, 0.0 };
-
- 	gesture_notify(device, time, LIBINPUT_EVENT_GESTURE_PINCH_END,
--		       finger_count, cancelled, &zero, &zero, scale, 0.0);
-+		       finger_count, cancelled, &zero, &zero, NULL, scale, 0.0);
- }
-
- void
-@@ -2972,6 +3117,92 @@
- 	libinput->events_in = (libinput->events_in + 1) % libinput->events_len;
- }
-
-+
-+LIBINPUT_EXPORT void
-+libinput_post_handle_event(struct libinput* libinput, struct libinput_event* event)
-+{
-+	libinput_post_event(libinput, event);
-+}
-+
-+LIBINPUT_EXPORT struct libinput_event_joystick_button*
-+libinput_event_get_joystick_button_event(struct libinput_event* event)
-+{
-+    require_event_type(libinput_event_get_context(event),
-+        event->type,
-+        NULL,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+    return (struct libinput_event_joystick_button*)event;
-+}
-+
-+LIBINPUT_EXPORT struct libinput_event_joystick_axis*
-+libinput_event_get_joystick_axis_event(struct libinput_event* event)
-+{
-+	require_event_type(libinput_event_get_context(event),
-+        event->type,
-+        NULL,
-+		LIBINPUT_EVENT_POINTER_AXIS);
-+
-+    return (struct libinput_event_joystick_axis*)event;
-+}
-+
-+/**
-+ * @brief 获取joystick指定轴的数据是否变化
-+*/
-+bool libinput_event_get_joystick_axis_value_is_changed(struct libinput_event_joystick_axis *event, enum libinput_joystick_axis_source axis)
-+{
-+	if (event == NULL) {
-+		return 0;
-+	}
-+
-+	return (bool)(event->axis_value_mask & (uint32_t)axis);
-+}
-+
-+/**
-+ * @brief 获取轴事件的时间
-+ */
-+uint64_t
-+libinput_event_get_joystick_axis_time(struct libinput_event_joystick_axis *event)
-+{
-+	if (event == NULL) {
-+		return 0;
-+	}
-+
-+	return event->time;
-+}
-+
-+/**
-+ * @brief 获取joystick指定轴的abs信息
-+*/
-+struct libinput_event_joystick_axis_abs_info *
-+libinput_event_get_joystick_axis_abs_info(struct libinput_event_joystick_axis *event, enum libinput_joystick_axis_source axis)
-+{
-+	switch (axis) {
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_X:
-+	return &event->abs_x;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Y:
-+	return &event->abs_y;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Z:
-+	return &event->abs_z;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RX:
-+	return &event->abs_rx;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RY:
-+	return &event->abs_ry;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RZ:
-+	return &event->abs_rz;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_THROTTLE:
-+	return &event->abs_throttle;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0X:
-+	return &event->abs_hat0x;
-+	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0Y:
-+	return &event->abs_hat0y;
-+	default:
-+	break;
-+	}
-+
-+	return NULL;
-+}
-+
- LIBINPUT_EXPORT struct libinput_event *
- libinput_get_event(struct libinput *libinput)
- {
-@@ -3016,13 +3247,13 @@
- LIBINPUT_EXPORT int
- libinput_resume(struct libinput *libinput)
- {
--	return libinput->interface_backend->resume(libinput);
-+	return 0;
- }
-
- LIBINPUT_EXPORT void
- libinput_suspend(struct libinput *libinput)
- {
--	libinput->interface_backend->suspend(libinput);
-+
- }
-
- LIBINPUT_EXPORT void
-@@ -3055,12 +3286,37 @@
- 	return evdev_device_get_sysname((struct evdev_device *) device);
- }
-
-+LIBINPUT_EXPORT const char*
-+libinput_device_get_phys(struct libinput_device* device)
-+{
-+	struct libevdev* evdev = ((struct evdev_device*)device)->evdev;
-+	if (evdev == NULL) {
-+		return NULL;
-+	}
-+	return libevdev_get_phys(evdev);
-+}
-+
- LIBINPUT_EXPORT const char *
- libinput_device_get_name(struct libinput_device *device)
- {
- 	return evdev_device_get_name((struct evdev_device *) device);
- }
-
-+LIBINPUT_EXPORT enum evdev_device_udev_tags
-+libinput_device_get_tags(struct libinput_device* device)
-+{
-+	if(device == NULL)
-+        return EVDEV_UDEV_TAG_INPUT;
-+
-+	struct evdev_device* evdevDevice = (struct evdev_device*)device;
-+	enum evdev_device_udev_tags udev_tags;
-+
-+	if (evdevDevice->udev_device)
-+	    return EVDEV_UDEV_TAG_INPUT;
-+
-+	return udev_tags = (enum evdev_device_udev_tags)evdevDevice->model_flags;
-+}
-+
- LIBINPUT_EXPORT unsigned int
- libinput_device_get_id_product(struct libinput_device *device)
- {
-@@ -3076,7 +3332,7 @@
- LIBINPUT_EXPORT const char *
- libinput_device_get_output_name(struct libinput_device *device)
- {
--	return evdev_device_get_output((struct evdev_device *) device);
-+    return NULL;
- }
-
- LIBINPUT_EXPORT struct libinput_seat *
-@@ -4378,3 +4634,93 @@
- 	}
- }
- #endif
-+
-+LIBINPUT_EXPORT struct libinput_event_joystick_button*
-+libinput_event_get_joystick_pointer_button_event(struct libinput_event* event)
-+{
-+	if (!event)
-+		return 0;
-+
-+	require_event_type(libinput_event_get_context(event),
-+		event->type,
-+		NULL,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+	return (struct libinput_event_joystick_button*)event;
-+}
-+
-+LIBINPUT_EXPORT uint64_t
-+libinput_event_joystick_button_time(struct libinput_event_joystick_button* event)
-+{
-+    if (!event)
-+        return 0;
-+
-+    require_event_type(libinput_event_get_context(&event->base),
-+        event->base.type,
-+        0,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+    return event->time;
-+}
-+
-+LIBINPUT_EXPORT uint32_t
-+libinput_event_joystick_button_get_key(struct libinput_event_joystick_button* event)
-+{
-+    if (!event)
-+        return 0;
-+
-+    require_event_type(libinput_event_get_context(&event->base),
-+		event->base.type,
-+        0,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+    return event->key;
-+}
-+
-+LIBINPUT_EXPORT enum libinput_key_state
-+libinput_event_joystick_button_get_key_state(struct libinput_event_joystick_button* event)
-+{
-+	if (!event)
-+		return 0;
-+
-+	require_event_type(libinput_event_get_context(&event->base),
-+		event->base.type,
-+		0,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+	return event->state;
-+}
-+
-+LIBINPUT_EXPORT uint32_t
-+libinput_event_joystick_button_get_seat_key_count(struct libinput_event_joystick_button* event)
-+{
-+    if (!event)
-+        return 0;
-+
-+    require_event_type(libinput_event_get_context(&event->base),
-+		event->base.type,
-+        0,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+    return event->seat_key_count;
-+}
-+
-+LIBINPUT_EXPORT int
-+libinput_event_joystick_button_get_value(struct libinput_event_joystick_button* event)
-+{
-+    if (!event)
-+        return 0;
-+
-+    require_event_type(libinput_event_get_context(&event->base),
-+		event->base.type,
-+        0,
-+        LIBINPUT_EVENT_POINTER_BUTTON);
-+
-+    return event->value;
-+}
-+
-+LIBINPUT_EXPORT double
-+libinput_event_get_touch_pressure(struct libinput_event *event)
-+{
-+    return 0.0F;
-+}
-diff -Naur old/src/libinput.h new/src/libinput.h
---- old/src/libinput.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/libinput.h	2021-01-01 00:00:00.000000000 +0800
-@@ -33,6 +33,7 @@
- #include <stdint.h>
- #include <stdarg.h>
- #include <libudev.h>
-+#include "util-bits.h"
-
- #define LIBINPUT_ATTRIBUTE_PRINTF(_format, _args) \
- 	__attribute__ ((format (printf, _format, _args)))
-@@ -196,6 +197,22 @@
- 	LIBINPUT_DEVICE_CAP_TABLET_PAD = 4,
- 	LIBINPUT_DEVICE_CAP_GESTURE = 5,
- 	LIBINPUT_DEVICE_CAP_SWITCH = 6,
-+	LIBINPUT_DEVICE_CAP_JOYSTICK = 7,
-+};
-+
-+enum evdev_device_udev_tags {
-+    EVDEV_UDEV_TAG_INPUT = bit(0),
-+    EVDEV_UDEV_TAG_KEYBOARD = bit(1),
-+    EVDEV_UDEV_TAG_MOUSE = bit(2),
-+    EVDEV_UDEV_TAG_TOUCHPAD = bit(3),
-+    EVDEV_UDEV_TAG_TOUCHSCREEN = bit(4),
-+    EVDEV_UDEV_TAG_TABLET = bit(5),
-+    EVDEV_UDEV_TAG_JOYSTICK = bit(6),
-+    EVDEV_UDEV_TAG_ACCELEROMETER = bit(7),
-+    EVDEV_UDEV_TAG_TABLET_PAD = bit(8),
-+    EVDEV_UDEV_TAG_POINTINGSTICK = bit(9),
-+    EVDEV_UDEV_TAG_TRACKBALL = bit(10),
-+    EVDEV_UDEV_TAG_SWITCH = bit(11),
- };
-
- /**
-@@ -315,6 +332,49 @@
- };
-
- /**
-+ * @ingroup event_joystick
-+ *
-+ * The source for a @ref LIBINPUT_EVENT_POINTER_AXIS event. See
-+ * libinput_event_get_joystick_axis_event() for details.
-+ *
-+ * @since 1.16.4
-+ */
-+enum libinput_joystick_axis_source {
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_UNKNOW = 0,
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_X = bit(0),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Y = bit(1),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Z = bit(2),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RX = bit(3),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RY = bit(4),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RZ = bit(5),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_THROTTLE = bit(6),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RUDDER = bit(7),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_WHEEL = bit(8),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_GAS = bit(9),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_BRAKE = bit(10),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0X = bit(11),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0Y = bit(12),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT1X = bit(13),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT1Y = bit(14),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT2X = bit(15),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT2Y = bit(16),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT3X = bit(17),
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT3Y = bit(18),
-+};
-+
-+#define MAX_SOLTED_COORDS_NUM 10
-+struct sloted_coords {
-+	bool is_active;
-+	float x;
-+	float y;
-+};
-+
-+struct sloted_coords_info {
-+	struct sloted_coords coords[MAX_SOLTED_COORDS_NUM];
-+	unsigned int active_count;
-+};
-+
-+/**
-  * @ingroup device
-  *
-  * Available tool types for a device with the @ref
-@@ -387,6 +447,17 @@
- 	LIBINPUT_TABLET_TOOL_TIP_DOWN = 1,
- };
-
-+struct libinput_event_joystick_axis_abs_info {
-+	int32_t code;
-+	int32_t value;
-+	int32_t minimum;
-+	int32_t maximum;
-+	int32_t fuzz;
-+	int32_t flat;
-+	int32_t resolution;
-+	float	standardValue;
-+};
-+
- /**
-  * @defgroup tablet_pad_modes Tablet pad modes
-  *
-@@ -1893,6 +1964,12 @@
- libinput_event_gesture_get_angle_delta(struct libinput_event_gesture *event);
-
- /**
-+ * 获取带slot的touches信息, 仅支持LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE
-+ */
-+struct sloted_coords_info *
-+libinput_event_gesture_get_solt_touches(struct libinput_event_gesture *event);
-+
-+/**
-  * @defgroup event_tablet Tablet events
-  *
-  * Events that come from tools on tablet devices. For events from the pad,
-@@ -3466,6 +3543,46 @@
- int
- libinput_dispatch(struct libinput *libinput);
-
-+/****************************************************************************
-+* @brief : brief
-+* @author : fms
-+* @date : 2021/3/8 20:55
-+* @version : ver 1.0
-+* @inparam :libinput  event
-+* @outparam :
-+*****************************************************************************/
-+void
-+libinput_post_handle_event(struct libinput* libinput,
-+	struct libinput_event* event);
-+
-+/****************************************************************************
-+* @brief : get joystick button event
-+* @author : fms
-+* @date : 2021/3/12 10:56
-+* @version : ver 1.0
-+* @inparam :
-+* @outparam :
-+*****************************************************************************/
-+struct libinput_event_joystick_axis *
-+libinput_event_get_joystick_axis_event(struct libinput_event *event);
-+
-+/**
-+ * @brief 获取轴事件的时间
-+ */
-+uint64_t
-+libinput_event_get_joystick_axis_time(struct libinput_event_joystick_axis *event);
-+
-+/**
-+ * @brief 获取joystick指定轴的数据是否变化
-+*/
-+bool libinput_event_get_joystick_axis_value_is_changed(struct libinput_event_joystick_axis *event, enum libinput_joystick_axis_source axis);
-+
-+/**
-+ * @brief 获取joystick指定轴的abs信息
-+*/
-+struct libinput_event_joystick_axis_abs_info *
-+libinput_event_get_joystick_axis_abs_info(struct libinput_event_joystick_axis *event, enum libinput_joystick_axis_source axis);
-+
- /**
-  * @ingroup base
-  *
-@@ -3936,6 +4053,10 @@
- const char *
- libinput_device_get_name(struct libinput_device *device);
-
-+/**  @brief   获取设备类型*/
-+enum evdev_device_udev_tags
-+libinput_device_get_tags(struct libinput_device* device);
-+
- /**
-  * @ingroup device
-  *
-@@ -5928,7 +6049,96 @@
- unsigned int
- libinput_device_config_rotation_get_default_angle(struct libinput_device *device);
-
-+struct uhdf;
-+
-+int uhdfdevice_added(struct libinput *input,struct uhdf *uhdf,const char *seat_name);
-+
-+struct libinput * libinput_hdf_create_context(const struct libinput_interface *interface,void *user_data);
-+
-+void uhdfdevice_removed(struct uhdf *uhdf);
-+
-+struct evdev_device;
-+struct input_event;
-+void evdev_device_dispatch_two(struct evdev_device *device,
-+                struct input_event *ev);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the struct libinput_event_joystick_button from the event.
-+ *
-+ * @param event The libinput event
-+ * @return The libinput_event_joystick_button for this event.
-+ */
-+struct libinput_event_joystick_button*
-+libinput_event_get_joystick_pointer_button_event(struct libinput_event* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the time from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The time for this event.
-+ */
-+uint64_t libinput_event_joystick_button_time(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the key value from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The key value for this event.
-+ */
-+uint32_t libinput_event_joystick_button_get_key(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the seat key count from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The seat key count for this event.
-+ */
-+uint32_t libinput_event_joystick_button_get_seat_key_count(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup event
-+ *
-+ * Get the value count from the event.
-+ *
-+ * @param event The libinput_event_joystick_button
-+ * @return The value for this event.
-+ */
-+int libinput_event_joystick_button_get_value(struct libinput_event_joystick_button* event);
-+
-+/**
-+ * @ingroup config
-+ *
-+ * Get the pressure of the touch screen
-+ *
-+ * @param Carried libinput event
-+ * @return Pressure value of touch screen
-+ *
-+ * @since 1.4
-+ */
-+double
-+libinput_event_get_touch_pressure(struct libinput_event* event);
-+
-+const char*
-+libinput_device_get_phys(struct libinput_device* device);bool libinput_pipe(struct libinput *libinput);
-+bool libinput_pipe(struct libinput *libinput);
-+int libinput_pipe_write(struct libinput *libinput, int index,const void *buf, int count);
-+int libinput_pipe_read(struct libinput *libinput, int index,void *buf, int count);
-+int libinput_devpipe_write(struct libinput *libinput,void *buf, int count);
-+int libinput_devpipe_read(struct libinput *libinput, void *buf, int count);
-+int libinput_get_pipe_bytes(struct libinput *libinput, int index);
-+void evdev_device_hdfdispatch(void *data);
-+enum libinput_key_state
-+libinput_event_joystick_button_get_key_state(struct libinput_event_joystick_button* event);
- #ifdef __cplusplus
- }
- #endif
- #endif /* LIBINPUT_H */
-+
-diff -Naur old/src/path-seat.c new/src/path-seat.c
---- old/src/path-seat.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/path-seat.c	2021-01-01 00:00:00.000000000 +0800
-@@ -176,42 +176,7 @@
- 		   struct udev_device *udev_device,
- 		   const char *seat_logical_name_override)
- {
--	struct path_seat *seat;
--	struct evdev_device *device = NULL;
--	const char *output_name;
--	const char *devnode, *sysname;
--
--	devnode = udev_device_get_devnode(udev_device);
--	sysname = udev_device_get_sysname(udev_device);
--
--	seat = path_seat_get_for_device(input, udev_device, seat_logical_name_override);
--	if (!seat)
--		goto out;
--
--	device = evdev_device_create(&seat->base, udev_device);
--	libinput_seat_unref(&seat->base);
--
--	if (device == EVDEV_UNHANDLED_DEVICE) {
--		device = NULL;
--		log_info(&input->base,
--			 "%-7s - not using input device '%s'.\n",
--			 sysname,
--			 devnode);
--		goto out;
--	} else if (device == NULL) {
--		log_info(&input->base,
--			 "%-7s - failed to create input device '%s'.\n",
--			 sysname,
--			 devnode);
--		goto out;
--	}
--
--	evdev_read_calibration_prop(device);
--	output_name = udev_device_get_property_value(udev_device, "WL_OUTPUT");
--	device->output_name = safe_strdup(output_name);
--
--out:
--	return device ? &device->base : NULL;
-+    return NULL;
- }
-
- static int
-@@ -277,19 +242,7 @@
- path_device_change_seat(struct libinput_device *device,
- 			const char *seat_name)
- {
--	struct libinput *libinput = device->seat->libinput;
--	struct evdev_device *evdev = evdev_device(device);
--	struct udev_device *udev_device = NULL;
--	int rc = -1;
--
--	udev_device = evdev->udev_device;
--	udev_device_ref(udev_device);
--	libinput_path_remove_device(device);
--
--	if (path_create_device(libinput, udev_device, seat_name) != NULL)
--		rc = 0;
--	udev_device_unref(udev_device);
--	return rc;
-+	return -1;
- }
-
- static const struct libinput_interface_backend interface_backend = {
-@@ -404,26 +357,5 @@
- LIBINPUT_EXPORT void
- libinput_path_remove_device(struct libinput_device *device)
- {
--	struct libinput *libinput = device->seat->libinput;
--	struct path_input *input = (struct path_input*)libinput;
--	struct libinput_seat *seat;
--	struct evdev_device *evdev = evdev_device(device);
--	struct path_device *dev;
--
--	if (libinput->interface_backend != &interface_backend) {
--		log_bug_client(libinput, "Mismatching backends.\n");
--		return;
--	}
--
--	list_for_each(dev, &input->path_list, link) {
--		if (dev->udev_device == evdev->udev_device) {
--			path_device_destroy(dev);
--			break;
--		}
--	}
--
--	seat = device->seat;
--	libinput_seat_ref(seat);
--	path_disable_device(libinput, evdev);
--	libinput_seat_unref(seat);
-+    // hdf no need
- }
-diff -Naur old/src/quirks.c new/src/quirks.c
---- old/src/quirks.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/quirks.c	2021-01-01 00:00:00.000000000 +0800
-@@ -1382,36 +1382,9 @@
-
- struct quirks *
- quirks_fetch_for_device(struct quirks_context *ctx,
--			struct udev_device *udev_device)
-+            struct uhdf *uhdf)
- {
--	struct quirks *q = NULL;
--	struct section *s;
--	struct match *m;
--
--	if (!ctx)
--		return NULL;
--
--	qlog_debug(ctx, "%s: fetching quirks\n",
--		   udev_device_get_devnode(udev_device));
--
--	q = quirks_new();
--
--	m = match_new(udev_device, ctx->dmi, ctx->dt);
--
--	list_for_each(s, &ctx->sections, link) {
--		quirk_match_section(ctx, q, s, m, udev_device);
--	}
--
--	match_free(m);
--
--	if (q->nproperties == 0) {
--		quirks_unref(q);
--		return NULL;
--	}
--
--	list_insert(&ctx->quirks, &q->link);
--
--	return q;
-+	return uhdf->quirkpop;
- }
-
-
-diff -Naur old/src/quirks.h new/src/quirks.h
---- old/src/quirks.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/quirks.h	2021-01-01 00:00:00.000000000 +0800
-@@ -31,6 +31,7 @@
- #include <libudev.h>
-
- #include "libinput.h"
-+#include "udev-seat.h"
-
- /**
-  * Handle to the quirks context.
-@@ -189,7 +190,7 @@
-  */
- struct quirks *
- quirks_fetch_for_device(struct quirks_context *ctx,
--			struct udev_device *device);
-+			struct uhdf *uhdf);
-
- /**
-  * Reduce the refcount by one. When the refcount reaches zero, the
-diff -Naur old/src/udev-seat.c new/src/udev-seat.c
---- old/src/udev-seat.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/udev-seat.c	2021-01-01 00:00:00.000000000 +0800
-@@ -27,10 +27,17 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
--
-+#include <dlfcn.h>
- #include "evdev.h"
- #include "udev-seat.h"
-
-+#ifdef __aarch64__
-+#define LIB_MODULEDIR "/system/lib64"
-+#define MODULEDIR "/system/lib64"
-+#else
-+#define LIB_MODULEDIR "/system/lib"
-+#define MODULEDIR "/system/lib"
-+#endif
- static const char default_seat[] = "seat0";
- static const char default_seat_name[] = "default";
-
-@@ -40,6 +47,86 @@
- 		 const char *seat_name);
- static struct udev_seat *
- udev_seat_get_named(struct udev_input *input, const char *seat_name);
-+size_t
-+module_path_from_env(const char *name, char *path, size_t path_len)
-+{
-+	const char *mapping = getenv("WESTON_MODULE_MAP");
-+	const char *end;
-+	const int name_len = strlen(name);
-+
-+	if (!mapping)
-+		return 0;
-+
-+	end = mapping + strlen(mapping);
-+	while (mapping < end && *mapping) {
-+		const char *filename, *next;
-+
-+		/* early out: impossibly short string */
-+		if (end - mapping < name_len + 1)
-+			return 0;
-+
-+		filename = &mapping[name_len + 1];
-+		next = strchrnul(mapping, ';');
-+
-+		if (strncmp(mapping, name, name_len) == 0 &&
-+		    mapping[name_len] == '=') {
-+			size_t file_len = next - filename; /* no trailing NUL */
-+			if (file_len >= path_len)
-+				return 0;
-+			strncpy(path, filename, file_len);
-+			path[file_len] = '\0';
-+			return file_len;
-+		}
-+
-+		mapping = next + 1;
-+	}
-+
-+	return 0;
-+}
-+
-+void *
-+libinput_load_module(const char *name, const char *entrypoint)
-+{
-+	char path[PATH_MAX];
-+	void *module, *init;
-+	size_t len;
-+
-+	if (name == NULL)
-+		return NULL;
-+	if (name[0] != '/') {
-+		len = module_path_from_env(name, path, sizeof path);
-+		if (len == 0)
-+			len = snprintf(path, sizeof path, "%s/%s",
-+				       LIB_MODULEDIR, name);
-+	} else {
-+		len = snprintf(path, sizeof path, "%s", name);
-+	}
-+    len = snprintf(path, sizeof path, "%s", name);
-+	/* snprintf returns the length of the string it would've written,
-+	 * _excluding_ the NUL byte. So even being equal to the size of
-+	 * our buffer is an error here. */
-+	if (len >= sizeof path)
-+		return NULL;
-+
-+	module = dlopen(path, RTLD_NOW | RTLD_NOLOAD);
-+	if (module) {
-+		libinput_log_printf("Module '%s' already loaded\n", path);
-+	} else {
-+		libinput_log_printf("Loading module '%s'\n", path);
-+		module = dlopen(path, RTLD_NOW);
-+		if (!module) {
-+			libinput_log_printf("Failed to load module: %s\n", dlerror());
-+			return NULL;
-+		}
-+	}
-+
-+	init = dlsym(module, entrypoint);
-+	if (!init) {
-+		return NULL;
-+	}
-+
-+	return init;
-+}
-
-
- static inline bool
-@@ -78,90 +165,12 @@
- 	     struct udev_input *input,
- 	     const char *seat_name)
- {
--	struct evdev_device *device;
--	const char *devnode, *sysname;
--	const char *device_seat, *output_name;
--	struct udev_seat *seat;
--
--	device_seat = udev_device_get_property_value(udev_device, "ID_SEAT");
--	if (!device_seat)
--		device_seat = default_seat;
--
--	if (!streq(device_seat, input->seat_id))
--		return 0;
--
--	if (ignore_litest_test_suite_device(udev_device))
--		return 0;
--
--	devnode = udev_device_get_devnode(udev_device);
--	sysname = udev_device_get_sysname(udev_device);
--
--	/* Search for matching logical seat */
--	if (!seat_name)
--		seat_name = udev_device_get_property_value(udev_device, "WL_SEAT");
--	if (!seat_name)
--		seat_name = default_seat_name;
--
--	seat = udev_seat_get_named(input, seat_name);
--
--	/* There is a race at startup: a device added between setting
--	 * up the udev monitor and enumerating all current devices may show
--	 * up in both lists. Filter those out.
--	 */
--	if (filter_duplicates(seat, udev_device))
--		return 0;
--
--	if (seat)
--		libinput_seat_ref(&seat->base);
--	else {
--		seat = udev_seat_create(input, device_seat, seat_name);
--		if (!seat)
--			return -1;
--	}
--
--	device = evdev_device_create(&seat->base, udev_device);
--	libinput_seat_unref(&seat->base);
--
--	if (device == EVDEV_UNHANDLED_DEVICE) {
--		log_info(&input->base,
--			 "%-7s - not using input device '%s'\n",
--			 sysname,
--			 devnode);
--		return 0;
--	} else if (device == NULL) {
--		log_info(&input->base,
--			 "%-7s - failed to create input device '%s'\n",
--			 sysname,
--			 devnode);
--		return 0;
--	}
--
--	evdev_read_calibration_prop(device);
--
--	output_name = udev_device_get_property_value(udev_device, "WL_OUTPUT");
--	device->output_name = safe_strdup(output_name);
--
- 	return 0;
- }
-
- static void
- device_removed(struct udev_device *udev_device, struct udev_input *input)
- {
--	struct evdev_device *device, *next;
--	struct udev_seat *seat;
--	const char *syspath;
--
--	syspath = udev_device_get_syspath(udev_device);
--	list_for_each(seat, &input->base.seat_list, base.link) {
--		list_for_each_safe(device, next,
--				   &seat->base.devices_list, base.link) {
--			if (streq(syspath,
--				  udev_device_get_syspath(device->udev_device))) {
--				evdev_device_remove(device);
--				break;
--			}
--		}
--	}
- }
-
- static int
-@@ -368,55 +377,36 @@
- udev_device_change_seat(struct libinput_device *device,
- 			const char *seat_name)
- {
--	struct libinput *libinput = device->seat->libinput;
--	struct udev_input *input = (struct udev_input *)libinput;
--	struct evdev_device *evdev = evdev_device(device);
--	struct udev_device *udev_device = evdev->udev_device;
--	int rc;
--
--	udev_device_ref(udev_device);
--	device_removed(udev_device, input);
--	rc = device_added(udev_device, input, seat_name);
--	udev_device_unref(udev_device);
--
--	return rc;
-+    return 0;
- }
--
-+#if 0
- static const struct libinput_interface_backend interface_backend = {
- 	.resume = udev_input_enable,
- 	.suspend = udev_input_disable,
- 	.destroy = udev_input_destroy,
- 	.device_change_seat = udev_device_change_seat,
- };
--
-+#endif
-+typedef struct libinput *  (*HdfAdfInit)();
- LIBINPUT_EXPORT struct libinput *
- libinput_udev_create_context(const struct libinput_interface *interface,
- 			     void *user_data,
- 			     struct udev *udev)
- {
--	struct udev_input *input;
--
--	if (!interface || !udev)
--		return NULL;
--
--	input = zalloc(sizeof *input);
--
--	if (libinput_init(&input->base, interface,
--			  &interface_backend, user_data) != 0) {
--		libinput_unref(&input->base);
--		free(input);
--		return NULL;
--	}
--
--	input->udev = udev_ref(udev);
--
--	return &input->base;
-+    HdfAdfInit init = (HdfAdfInit)libinput_load_module("libmmi-server.z.so","HdfAdfInit");
-+    if(init == NULL) {
-+        return NULL;
-+    }
-+     struct libinput * plibinput = init();
-+     libinput_set_user_data(plibinput,user_data);
-+     return plibinput;
- }
-
- LIBINPUT_EXPORT int
- libinput_udev_assign_seat(struct libinput *libinput,
- 			  const char *seat_id)
- {
-+#if 0
- 	struct udev_input *input = (struct udev_input*)libinput;
-
- 	if (!seat_id)
-@@ -447,6 +437,109 @@
-
- 	if (udev_input_enable(&input->base) < 0)
- 		return -1;
--
-+#endif
- 	return 0;
- }
-+
-+// change libinput for hdf frame
-+static const struct libinput_interface_backend simplyinterface_backend = {
-+    .resume = NULL,
-+    .suspend = NULL,
-+    .destroy = NULL,
-+    .device_change_seat = NULL,
-+};
-+
-+static struct udev_seat *
-+uhdf_seat_get_named(struct uhdf_input *input, const char *seat_name)
-+{
-+    struct udev_seat *seat;
-+
-+    list_for_each(seat, &input->base.seat_list, base.link) {
-+        if (streq(seat->base.logical_name, seat_name))
-+            return seat;
-+    }
-+
-+    return NULL;
-+}
-+
-+static struct udev_seat *
-+uhdf_seat_create(struct uhdf_input *input,
-+    const char *device_seat,
-+    const char *seat_name)
-+{
-+    struct udev_seat *seat;
-+
-+    seat = zalloc(sizeof *seat);
-+
-+    libinput_seat_init(&seat->base, &input->base,
-+            device_seat, seat_name,
-+            udev_seat_destroy);
-+
-+    return seat;
-+}
-+
-+struct libinput *
-+libinput_hdf_create_context(const struct libinput_interface *interface,
-+                           void *user_data)
-+{
-+    struct uhdf_input *input;
-+    input = zalloc(sizeof *input);
-+
-+    if (libinput_init(&input->base, interface,
-+        &simplyinterface_backend, user_data) != 0) {
-+            free(input);
-+            return NULL;
-+    }
-+
-+    return &input->base;
-+}
-+
-+void uhdfdevice_removed(struct uhdf *uhdf)
-+{
-+    evdev_device_remove(uhdf->device);
-+}
-+
-+int
-+uhdfdevice_added(struct libinput  *libinput,
-+		  struct uhdf *uhdf,
-+		  const char *seat_name)
-+{
-+    struct uhdf_input *input =(struct uhdf_input *)libinput;
-+	struct udev_seat *seat;
-+	struct evdev_device *device;
-+	const char *device_seat;
-+    device_seat = default_seat;
-+
-+	if (!seat_name)
-+		seat_name = default_seat_name;
-+
-+	seat = uhdf_seat_get_named(input, seat_name);
-+
-+	if (seat)
-+		libinput_seat_ref(&seat->base);
-+	else {
-+		seat = uhdf_seat_create(input, device_seat, seat_name);
-+		if (!seat)
-+		return -1;
-+	}
-+
-+	device = evdev_device_create(&seat->base, uhdf);
-+	libinput_seat_unref(&seat->base);
-+
-+	if (device == EVDEV_UNHANDLED_DEVICE) {
-+	    log_info(&input->base,
-+				  "- not using input device \n");
-+			return 0;
-+	} else if (device == NULL) {
-+		log_info(&input->base,
-+				  " - failed to create input device\n");
-+		return 0;
-+	}
-+
-+	uhdf->device = device;
-+    libinput->pipesbytesbyindex[uhdf->index] = 0;
-+    libinput->pipesstatus[uhdf->index] = false ;
-+	evdev_read_calibration_prop(device);
-+
-+    return 0;
-+}
-diff -Naur old/src/udev-seat.h new/src/udev-seat.h
---- old/src/udev-seat.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/udev-seat.h	2021-01-01 00:00:00.000000000 +0800
-@@ -41,4 +41,23 @@
- 	char *seat_id;
- };
-
-+struct quirks;
-+struct uhdf
-+{
-+    int index;
-+    int type;
-+    int modeltype;
-+    int prop;
-+    struct quirks *quirkpop;
-+    int nproperties;
-+    int (*fn)(int index,int code, void * iobuff);
-+    struct evdev_device *device;
-+    void * deviceinfo;
-+};
-+
-+struct uhdf_input {
-+	struct libinput base;
-+	char *seat_id;
-+};
-+
- #endif
-diff -Naur old/src/util-strings.h new/src/util-strings.h
---- old/src/util-strings.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/util-strings.h	2021-01-01 00:00:00.000000000 +0800
-@@ -281,7 +281,7 @@
- 	if (npairs == 0)
- 		goto error;
-
--	result = zalloc(npairs * sizeof *result);
-+	result = (struct key_value_double *)zalloc(npairs * sizeof *result);
-
- 	for (pair = pairs; *pair; pair++) {
- 		char **kv = strv_from_string(*pair, kv_separator);
-diff -Naur old/src/util-time.h new/src/util-time.h
---- old/src/util-time.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/util-time.h	2021-01-01 00:00:00.000000000 +0800
-@@ -97,7 +97,8 @@
- static inline struct human_time
- to_human_time(uint64_t us)
- {
--	struct human_time t;
-+	uint64_t l = 0;
-+	struct human_time t = {0, NULL};
- 	struct c {
- 		const char *unit;
- 		unsigned int change_from_previous;
-@@ -108,7 +109,7 @@
- 		{"s", 1000, 120},
- 		{"min", 60, 120},
- 		{"h", 60, 48},
--		{"d", 24, ~0},
-+		{"d", 24, ~l},
- 	};
- 	struct c *c;
- 	uint64_t value = us;
-@@ -121,6 +122,6 @@
- 			return t;
- 		}
- 	}
--
--	assert(!"We should never get here");
-+return t;
-+	//assert(1);
- }
-diff -Naur old/tools/libinput-debug-events.c new/tools/libinput-debug-events.c
---- old/tools/libinput-debug-events.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/tools/libinput-debug-events.c	2021-01-01 00:00:00.000000000 +0800
-@@ -274,6 +274,10 @@
- 					   LIBINPUT_DEVICE_CAP_SWITCH))
- 		printq("S");
-
-+    if (libinput_device_has_capability(dev,
-+        LIBINPUT_DEVICE_CAP_JOYSTICK))
-+        printq("JOYSTICK");
-+
- 	if (libinput_device_get_size(dev, &w, &h) == 0)
- 		printq("  size %.0fx%.0fmm", w, h);
-
-diff -Naur old/udev/libinput-device-group.c new/udev/libinput-device-group.c
---- old/udev/libinput-device-group.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/udev/libinput-device-group.c	2021-01-01 00:00:00.000000000 +0800
-@@ -138,7 +138,7 @@
- 				*product_id = pid;
- 				best_dist = dist;
-
--				free(*phys_attr);
-+				free((char*)*phys_attr);
- 				*phys_attr = strdup(phys);
- 			}
- 		}
diff --git a/patch/diff_mtdev_hdf/BUILD.gn b/patch/diff_mtdev_hdf/BUILD.gn
deleted file mode 100644
index 5f51caf69c..0000000000
--- a/patch/diff_mtdev_hdf/BUILD.gn
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright (c) 2021-2022 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build/ohos.gni")
-
-gen_src_dir = "//third_party/mtdev"
-gen_dst_dir = root_out_dir + "/diff_mtdev_hdf"
-patches_root_dir = "//foundation/multimodalinput/input/patch"
-build_gn_dir = "$patches_root_dir/diff_mtdev_hdf"
-
-action("apply_patch") {
-  visibility = [ ":*" ]
-  script = "$patches_root_dir/apply_patch.sh"
-  inputs = [ "$gen_src_dir" ]
-  outputs = [
-    "$gen_dst_dir/include",
-    "$gen_dst_dir/src",
-    "$gen_dst_dir/src/caps.c",
-    "$gen_dst_dir/src/core.c",
-    "$gen_dst_dir/src/iobuf.c",
-    "$gen_dst_dir/src/match.c",
-    "$gen_dst_dir/src/match_four.c",
-  ]
-  args = [
-    rebase_path(gen_src_dir, root_build_dir),
-    rebase_path(gen_dst_dir, root_build_dir),
-    rebase_path(build_gn_dir, root_build_dir),
-  ]
-}
-
-config("libmtdev_config") {
-  visibility = [ ":*" ]
-
-  include_dirs = [ "$gen_dst_dir/src" ]
-
-  cflags = [
-    "-Wno-unused-parameter",
-    "-Wno-sign-compare",
-  ]
-}
-
-config("libmtdev_public_config") {
-  include_dirs = [ "$gen_dst_dir/include" ]
-
-  cflags = []
-}
-
-ohos_source_set("patch_gen_mtdev-third") {
-  sources = [
-    "$gen_dst_dir/src/caps.c",
-    "$gen_dst_dir/src/core.c",
-    "$gen_dst_dir/src/iobuf.c",
-    "$gen_dst_dir/src/match.c",
-    "$gen_dst_dir/src/match_four.c",
-  ]
-
-  configs = [ ":libmtdev_config" ]
-
-  deps = [ ":apply_patch" ]
-
-  public_deps = []
-}
-
-ohos_shared_library("libmtdev-hdf") {
-  sources = []
-
-  configs = [ ":libmtdev_config" ]
-
-  deps = []
-
-  public_deps = [ ":patch_gen_mtdev-third" ]
-
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-}
diff --git a/patch/diff_mtdev_hdf/mtdev_hdf_0000.diff b/patch/diff_mtdev_hdf/mtdev_hdf_0000.diff
deleted file mode 100644
index 9544c1dbce..0000000000
--- a/patch/diff_mtdev_hdf/mtdev_hdf_0000.diff
+++ /dev/null
@@ -1,251 +0,0 @@
-Copyright (c) 2021-2022 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
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-diff -Naur old/BUILD.gn new/BUILD.gn
---- old/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
-+++ new/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
-@@ -23,7 +23,7 @@
-   ]
- }
-
--ohos_shared_library("libmtdev") {
-+ohos_shared_library("libmtdev-hdf") {
-   sources = [
-     "src/caps.c",
-     "src/core.c",
-diff -Naur old/include/mtdev.h new/include/mtdev.h
---- old/include/mtdev.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/include/mtdev.h	2021-01-01 00:00:00.000000000 +0800
-@@ -77,6 +77,21 @@
- #define MT_ID_MIN	0
- #define MT_ID_MAX	65535
-
-+typedef int (*mtdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-+
-+/**
-+ * mtdev_new_open - create and open a new mtdev
-+ * @fd: file descriptor of the kernel device
-+ *
-+ * Create a new mtdev and open the conversion.
-+ *
-+ * Returns zero in case of failure.
-+ *
-+ * This call combines the plumbing functions mtdev_new() and
-+ * mtdev_open().
-+ */
-+struct mtdev *mtdev_new_open_hdi(int fd,mtdev_ioctl func);
-+
- /**
-  * mtdev_new_open - create and open a new mtdev
-  * @fd: file descriptor of the kernel device
-diff -Naur old/src/caps.c new/src/caps.c
---- old/src/caps.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/caps.c	2021-01-01 00:00:00.000000000 +0800
-@@ -35,6 +35,8 @@
- #define LONG_BITS (sizeof(long) * 8)
- #define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS)
-
-+typedef int (*mtdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-+
- static inline int getbit(const unsigned long *map, int key)
- {
- 	return (map[key / LONG_BITS] >> (key % LONG_BITS)) & 0x01;
-@@ -47,6 +49,13 @@
- 	return rc >= 0;
- }
-
-+static int hdigetabs(struct input_absinfo *abs, int key, int fd,mtdev_ioctl func)
-+{
-+	int rc;
-+	rc = func(fd, EVIOCGABS(key), abs);
-+	return rc >= 0;
-+}
-+
- static struct input_absinfo *get_info(struct mtdev *dev, int code)
- {
- 	int ix;
-@@ -70,6 +79,13 @@
- 	mtdev_set_mt_event(dev, code, has);
- }
-
-+static void hdiset_info(struct mtdev *dev, int code,
-+						  const unsigned long *bits, int fd,mtdev_ioctl func)
-+{
-+		int has = getbit(bits, code) && hdigetabs(get_info(dev, code), code, fd,func);
-+		mtdev_set_mt_event(dev, code, has);
-+}
-+
- static void default_fuzz(struct mtdev *dev, int code, int sn)
- {
- 	struct input_absinfo *abs = get_info(dev, code);
-@@ -78,6 +94,29 @@
- 	abs->fuzz = (abs->maximum - abs->minimum) / sn;
- }
-
-+static int hdimtdev_set_slots(struct mtdev *dev, int fd,mtdev_ioctl func)
-+{
-+	struct { unsigned code; int values[DIM_FINGER]; } req;
-+	struct mtdev_state *state = dev->state;
-+	int rc, i, s, nslot;
-+
-+	nslot = mtdev_get_abs_maximum(dev, ABS_MT_SLOT) + 1;
-+
-+	for (i = 0; i < MT_ABS_SIZE; i++) {
-+		req.code = mtdev_mt2abs(i);
-+		if (!mtdev_has_mt_event(dev, req.code))
-+			continue;
-+		rc = func(fd, EVIOCGMTSLOTS(sizeof(req)), &req);
-+		if (rc < 0)
-+			return rc;
-+		for (s = 0; s < DIM_FINGER && s < nslot; s++)
-+			set_sval(&state->data[s], i, req.values[s]);
-+	}
-+
-+	return 0;
-+}
-+
-+
- static int mtdev_set_slots(struct mtdev *dev, int fd)
- {
- 	struct { unsigned code; int values[DIM_FINGER]; } req;
-@@ -99,6 +138,48 @@
-
- 	return 0;
- }
-+
-+int mtdev_configure_hdi(struct mtdev *dev, int fd,mtdev_ioctl func)
-+{
-+	unsigned long absbits[NLONGS(ABS_MAX)];
-+	int rc, i;
-+
-+	rc = func(fd, EVIOCGBIT(EV_ABS, sizeof(absbits)), absbits);
-+	if (rc < 0)
-+		return rc;
-+
-+	hdiset_info(dev, ABS_MT_SLOT, absbits, fd,func);
-+	for (i = 0; i < MT_ABS_SIZE; i++)
-+		hdiset_info(dev, mtdev_mt2abs(i), absbits, fd,func);
-+
-+	dev->has_mtdata = mtdev_has_mt_event(dev, ABS_MT_POSITION_X) &&
-+		mtdev_has_mt_event(dev, ABS_MT_POSITION_Y);
-+
-+	if (!mtdev_has_mt_event(dev, ABS_MT_POSITION_X))
-+		hdigetabs(get_info(dev, ABS_MT_POSITION_X), ABS_X, fd,func);
-+	if (!mtdev_has_mt_event(dev, ABS_MT_POSITION_Y))
-+		hdigetabs(get_info(dev, ABS_MT_POSITION_Y), ABS_Y, fd,func);
-+	if (!mtdev_has_mt_event(dev, ABS_MT_PRESSURE))
-+		hdigetabs(get_info(dev, ABS_MT_PRESSURE), ABS_PRESSURE, fd,func);
-+
-+	if (!mtdev_has_mt_event(dev, ABS_MT_TRACKING_ID)) {
-+		mtdev_set_abs_minimum(dev, ABS_MT_TRACKING_ID, MT_ID_MIN);
-+		mtdev_set_abs_maximum(dev, ABS_MT_TRACKING_ID, MT_ID_MAX);
-+	}
-+
-+	default_fuzz(dev, ABS_MT_POSITION_X, SN_COORD);
-+	default_fuzz(dev, ABS_MT_POSITION_Y, SN_COORD);
-+	default_fuzz(dev, ABS_MT_TOUCH_MAJOR, SN_WIDTH);
-+	default_fuzz(dev, ABS_MT_TOUCH_MINOR, SN_WIDTH);
-+	default_fuzz(dev, ABS_MT_WIDTH_MAJOR, SN_WIDTH);
-+	default_fuzz(dev, ABS_MT_WIDTH_MINOR, SN_WIDTH);
-+	default_fuzz(dev, ABS_MT_ORIENTATION, SN_ORIENT);
-+
-+	if (dev->has_slot)
-+		hdimtdev_set_slots(dev, fd,func);
-+
-+	return 0;
-+}
-
- int mtdev_configure(struct mtdev *dev, int fd)
- {
-diff -Naur old/src/common.h new/src/common.h
---- old/src/common.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/common.h	2021-01-01 00:00:00.000000000 +0800
-@@ -95,6 +95,8 @@
-  */
- #define LEGACY_API_NUM_MT_AXES 11
-
-+typedef int (*mtdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-+
- /**
-  * struct mtdev - represents an input MT device
-  * @has_mtdata: true if the device has MT capabilities
-diff -Naur old/src/core.c new/src/core.c
---- old/src/core.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/core.c	2021-01-01 00:00:00.000000000 +0800
-@@ -36,6 +36,8 @@
- #define input_event_usec time.tv_usec
- #endif
-
-+typedef int (*mtdev_ioctl)(int hdiindex,int cmd, void * iobuff);
-+
- static inline int istouch(const struct mtdev_slot *data,
- 			  const struct mtdev *dev)
- {
-@@ -382,6 +384,36 @@
- 	return ret;
- }
-
-+extern int mtdev_configure_hdi(struct mtdev *dev, int fd,mtdev_ioctl func);
-+
-+struct mtdev *mtdev_new_open_hdi(int fd,mtdev_ioctl func)
-+{
-+	struct mtdev *dev;
-+	int ret;
-+
-+	dev = mtdev_new();
-+	if (!dev)
-+		return NULL;
-+
-+	if (!dev || fd < 0)
-+		goto error;
-+
-+	ret = mtdev_init(dev);
-+	if (ret)
-+		goto error;
-+	ret = mtdev_configure_hdi(dev, fd,func);
-+
-+	if (ret)
-+		goto error;
-+
-+	return dev;
-+
-+error:
-+	mtdev_close(dev);
-+	mtdev_delete(dev);
-+	return NULL;
-+}
-+
- struct mtdev *mtdev_new_open(int fd)
- {
- 	struct mtdev *dev;
-diff -Naur old/src/iobuf.c new/src/iobuf.c
---- old/src/iobuf.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/iobuf.c	2021-01-01 00:00:00.000000000 +0800
-@@ -65,6 +65,17 @@
- 	return evbuf_empty(&dev->state->outbuf);
- }
-
-+int mtdev_count(struct mtdev *dev)
-+{
-+	return dev->state->outbuf.head - dev->state->outbuf.tail;
-+}
-+
-+
-+int mtdev_countin(struct mtdev *dev)
-+{
-+	return dev->state->inbuf.head - dev->state->inbuf.tail;
-+}
-+
- void mtdev_get_event(struct mtdev *dev, struct input_event* ev)
- {
- 	evbuf_get(&dev->state->outbuf, ev);
diff --git a/service/BUILD.gn b/service/BUILD.gn
index ea69d60e16..b50a1294a3 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -62,31 +62,8 @@ config("libmmi_server_config") {
     ]
   }
 
-  if (input_feature_hdf) {
-    include_dirs += [
-      "hdf_adapter/include",
-      "hdi_inject/include",
-      "$root_out_dir/diff_libinput_mmi/export_include",
-      "//third_party/eudev/export_include/",
-      "$root_out_dir/diff_libevdev_hdf/export_include",
-      "$root_out_dir/diff_libinput_mmi/include/linux",
-    ]
-  }
-
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_combination_key) {
     defines += [ "OHOS_BUILD_ENABLE_COMBINATION_KEY" ]
   }
@@ -462,13 +439,6 @@ ohos_shared_library("libmmi-server") {
     ]
   }
 
-  if (input_feature_hdf) {
-    sources += [
-      "hdf_adapter/src/hdf_event_manager.cpp",
-      "hdi_inject/src/hdi_inject.cpp",
-    ]
-  }
-
   if (input_feature_keyboard) {
     sources += [
       "key_event_normalize/src/key_event_normalize.cpp",
@@ -558,6 +528,7 @@ ohos_shared_library("libmmi-server") {
     "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//foundation/multimodalinput/input/service/connect_manager:mmi_connect_manager_service",
     "//foundation/multimodalinput/input/service/filter:mmi_event_filter_proxy",
     "//foundation/multimodalinput/input/util:libmmi-util",
@@ -565,10 +536,6 @@ ohos_shared_library("libmmi-server") {
     "//third_party/json:nlohmann_json_static",
   ]
 
-  if (input_feature_libinput || input_feature_hdf) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
-
   if (resource_schedule_service_enabled) {
     deps += [ "//foundation/resourceschedule/resource_schedule_service/ressched/interfaces/innerkits/ressched_client:ressched_client" ]
   }
@@ -647,23 +614,17 @@ ohos_unittest("ut-mmi-service-out") {
     "${mmi_path}/service/event_dispatch/include",
     "${mmi_path}/service/key_event_normalize/include",
     "${mmi_path}/service/event_handler/include",
-    "${mmi_path}/service/hdi_inject/include",
     "${mmi_path}/service/event_dump/include",
-    "${mmi_path}/service/hdf_adapter/include",
     "${mmi_path}/service/libinput_adapter/include",
     "${mmi_path}/service/message_handle/include",
     "${mmi_path}/service/module_loader/include",
     "${mmi_path}/service/window_manager/include",
     "${mmi_path}/uinput",
+    "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  if (input_feature_libinput || input_feature_hdf) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
-
   sources = [
     "event_dispatch/test/event_dispatch_test.cpp",
-    "hdi_inject/test/hdi_inject_test.cpp",
     "message_handle/test/server_msg_handler_test.cpp",
     "module_loader/test/uds_server_test.cpp",
     "window_manager/test/input_windows_manager_test.cpp",
@@ -671,18 +632,6 @@ ohos_unittest("ut-mmi-service-out") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_pointer_drawing) {
     defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
   }
@@ -705,17 +654,13 @@ ohos_unittest("ut-mmi-service-out") {
     "${mmi_path}/frameworks/proxy:libmmi-client",
     "${mmi_path}/service:libmmi-server",
     "${mmi_path}/util:libmmi-util",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
 
-  if (input_feature_libinput || input_feature_hdf) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
-
   external_deps = [
     "c_utils:utils",
-    "drivers_interface_input:hdi_input",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }
@@ -732,10 +677,6 @@ ohos_unittest("TransformPointTest") {
 
   defines = []
 
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
   deps = [
     "${mmi_path}/tools/vuinput:libmmi-virtual-device",
     "//third_party/googletest:gmock_main",
diff --git a/service/event_dump/src/event_dump.cpp b/service/event_dump/src/event_dump.cpp
index 4d30ac2aa8..af6c8e5bbf 100644
--- a/service/event_dump/src/event_dump.cpp
+++ b/service/event_dump/src/event_dump.cpp
@@ -52,16 +52,6 @@ EventDump::~EventDump() {}
 void ChkConfig(int32_t fd)
 {
     mprintf(fd, "ChkMMIConfig: ");
-#ifdef OHOS_BUILD_LIBINPUT
-    mprintf(fd, "OHOS_BUILD_LIBINPUT");
-#endif
-#ifdef OHOS_BUILD_HDF
-    mprintf(fd, "OHOS_BUILD_HDF");
-#endif
-#ifdef OHOS_BUILD_MMI_DEBUG
-    mprintf(fd, "OHOS_BUILD_MMI_DEBUG");
-#endif // OHOS_BUILD_MMI_DEBUG
-
     mprintf(fd, "DEF_MMI_DATA_ROOT: %s\n", DEF_MMI_DATA_ROOT);
     mprintf(fd, "EXP_CONFIG: %s\n", DEF_EXP_CONFIG);
     mprintf(fd, "EXP_SOPATH: %s\n", DEF_EXP_SOPATH);
diff --git a/service/hdf_adapter/include/hdf_event_manager.h b/service/hdf_adapter/include/hdf_event_manager.h
deleted file mode 100644
index c37c78295e..0000000000
--- a/service/hdf_adapter/include/hdf_event_manager.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef HDF_EVENT_MANAGER_H
-#define HDF_EVENT_MANAGER_H
-
-#include <functional>
-#include <iostream>
-#include <list>
-#include <map>
-
-#include "evdev.h"
-#include "input_type.h"
-#include "libinput.h"
-#include "nocopyable.h"
-
-#include "input_manager.h"
-#include "libinput_adapter.h"
-
-#define MAX_INPUT_DEVICE_COUNT MAX_INPUT_DEV_NUM
-#define TOTAL_INPUT_DEVICE_COUNT (2 * MAX_INPUT_DEV_NUM)
-#define TOTAL_INPUT_DEVICE_STATUS_COUNT (TOTAL_INPUT_DEVICE_COUNT + 1)
-#define IOCTL_CMD_MASK (0x3fff)
-#define IOCTL_CMD_SHIFT (16)
-#define USEC_PER_SEC (1000000)
-#define MAX_EVENT_PKG_NUM (256)
-
-namespace OHOS {
-namespace MMI {
-enum hdf_event_type {
-    HDF_NONE = 0,
-    HDF_EVENT,
-    HDF_ADD_DEVICE,
-    HDF_RMV_DEVICE,
-};
-struct Devcmd {
-    int32_t index { 0 };
-    int32_t cmd { 0 };
-};
-class HdfEventManager {
-public:
-    static int32_t EvdevSimIoctl(int32_t hdindex, int32_t pcmd, void *iobuff);
-    static int32_t EvdevIoctl(int32_t hdiindex, int32_t pcmd, void *iobuff);
-    static void HotPlugCallback(const HotPlugEvent *event);
-    static void GetEventCallback(const KeyEventNormalize **pkgs, uint32_t count, uint32_t devIndex);
-    static int32_t DeviceAddHandle(uint32_t devIndex, uint32_t devType);
-    static int32_t DeviceRemoveHandle(uint32_t devIndex, uint32_t devType);
-    static libinput *HdfLibinputInit();
-    static int32_t HdfDevHandle(int32_t index, hdf_event_type cmd);
-    HdfEventManager();
-    DISALLOW_COPY_AND_MOVE(HdfEventManager);
-    virtual ~HdfEventManager();
-    bool Init();
-    void SetupCallback();
-    bool OpenHdfDevice(uint32_t devIndex, bool oper);
-    int32_t GetDeviceCount();
-    int32_t GetJectDeviceCount();
-    void AddDevice(uint32_t devIndex, uint32_t typeIndex);
-    int32_t HdfdevtypeMapLibinputType(uint32_t devIndex, uint32_t devType);
-private:
-    static HdfEventManager *globleThis_;
-    libinput *hdiinput_ { nullptr };
-    std::list<uhdf *> hdflist_;
-    bool devStatus[TOTAL_INPUT_DEVICE_STATUS_COUNT] { false };
-    DevDesc mountDevIndex_[TOTAL_INPUT_DEVICE_COUNT];
-    IInputInterface *inputInterface_ { nullptr };
-    IInputInterface *injectInterface_ { nullptr };
-    InputEventCb eventCallBack_;
-    InputHostCb  hostPlugCallBack_;
-};
-
-extern HdfEventManager  hdfEventManager;
-} // namespace MMI
-} // namespace OHOS
-#endif // HDF_EVENT_MANAGER_H
\ No newline at end of file
diff --git a/service/hdf_adapter/include/hdf_inject_init.h b/service/hdf_adapter/include/hdf_inject_init.h
deleted file mode 100644
index 2c03ce1da5..0000000000
--- a/service/hdf_adapter/include/hdf_inject_init.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef HDF_INJECT_INIT_H
-#define HDF_INJECT_INIT_H
-enum  DrvType {
-    TOUCH = 0,
-    MOUSE,
-    KEYBOARD,
-    PEN,
-    PAD,
-    FINGER,
-    JOYSTICK,
-    SWITCH5,
-    TRACKPAD5,
-    GAMEPAD,
-    TRACKBALL,
-    INVALD = 100,
-};
-#endif // HDF_INJECT_INIT_H
\ No newline at end of file
diff --git a/service/hdf_adapter/include/lib_hdf.h b/service/hdf_adapter/include/lib_hdf.h
deleted file mode 100644
index 668d22d85f..0000000000
--- a/service/hdf_adapter/include/lib_hdf.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef LIB_HDF_H
-#define LIB_HDF_H
-extern int32_t GetInputInterfaceFromInject(IInputInterface** interface);
-#define hdfbit(y_) (1UL << (y_))
-
-enum hdf_device_tags {
-    HDF_INPUT       = hdfbit(0),
-    HDF_KEYBOARD        = hdfbit(1),
-    HDF_MOUSE       = hdfbit(2),
-    HDF_TOUCHPAD        = hdfbit(3),
-    HDF_TOUCHSCREEN = hdfbit(4),
-    HDF_TABLET      = hdfbit(5),
-    HDF_JOYSTICK        = hdfbit(6),
-    HDF_ACCELEROMETER   = hdfbit(7),
-    HDF_TABLET_PAD  = hdfbit(8),
-    HDF_POINTINGSTICK   = hdfbit(9),
-    HDF_TRACKBALL   = hdfbit(10),
-    HDF_SWITCH      = hdfbit(11),
-};
-
-enum io_ctl_cmd {
-    IO_BITS     = 0x20,
-    IO_KEYBITS      = 0x21,
-    IO_RELBITS      = 0x22,
-    IO_ABSBITS      = 0x23,
-    IO_MSCBITS  = 0x24,
-    IO_SWBITS       = 0x25,
-    IO_LEDBITS      = 0x31,
-    IO_SNDBITS  = 0x32,
-    IO_FFBITS   = 0x35,
-    IO_PROPBITS = 0x9,
-    IO_KEYVALUES    = 0x18,
-    IO_LEDVALUES    = 0x19,
-    IO_SWVALUES     = 0x1b,
-    IO_NAMES        = 0x6,
-    IO_MTVABS       = 0xa,
-    IO_IDS      = 0x2,
-    IO_ABSBEGIN     = 0x40,
-    IO_ABEND        = 0x80,
-};
-#endif // LIB_HDF_H
\ No newline at end of file
diff --git a/service/hdf_adapter/src/hdf_event_manager.cpp b/service/hdf_adapter/src/hdf_event_manager.cpp
deleted file mode 100644
index ae80e9029e..0000000000
--- a/service/hdf_adapter/src/hdf_event_manager.cpp
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "hdf_event_manager.h"
-
-#include <cstring>
-#include <ctime>
-#include <thread>
-
-#include <sys/time.h>
-#include <unistd.h>
-
-#include "hdf_inject_init.cpp"
-#include "lib_hdf.h"
-#include "define_multimodal.h"
-#include "mmi_log.h"
-#include "util.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "HdfEventManager"};
-} // namespace
-
-HdfEventManager *HdfEventManager::m_globleThis;
-int32_t HdfEventManager::EvdevSimIoctl(int32_t hdindex, int32_t pcmd, void *iobuff)
-{
-    const int32_t size = (pcmd >> IOCTL_CMD_SHIFT) & IOCTL_CMD_MASK;
-    int32_t cmd = pcmd & 0xff;
-
-    MMI_HILOGD("evdev_simioctl index:%{public}d,cmd:%{public}02x,size:%{public}d,"
-               "pcmd:%{public}04x", hdindex, cmd, size, pcmd);
-    DrvType drvtype = g_index2DrvType[hdindex - MAX_INPUT_DEVICE_COUNT];
-    MMI_HILOGD("evdev_simioctl drvtype:%{public}d", drvtype);
-    if (drvtype >= INVALD) {
-        MMI_HILOGE("Unknown device type");
-        return 0;
-    }
-    for (const auto &item : m_globleThis->hdflist_) {
-        if (item.index == hdindex) {
-            break;
-        }
-    }
-    const int32_t iobuffSize = size;
-    errno_t ret = 0;
-    switch (cmd) {
-        case IO_BITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayBits[drvtype], size);
-            break;
-        }
-        case IO_KEYBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayKeyBits[drvtype], size);
-            break;
-        }
-        case IO_RELBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayRelBits[drvtype], size);
-            break;
-        }
-        case IO_ABSBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayAbsBits[drvtype], size);
-            break;
-        }
-        case IO_MSCBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayMscBits[drvtype], size);
-            break;
-        }
-        case IO_SWBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arraySwBits[drvtype], size);
-            break;
-        }
-        case IO_LEDBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayLedBits[drvtype], size);
-            break;
-        }
-        case IO_SNDBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arraySndBits[drvtype], size);
-            break;
-        }
-        case IO_PROPBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayPropsBits[drvtype], size);
-            break;
-        }
-        case IO_KEYVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayKeyValues[drvtype], size);
-            break;
-        }
-        case IO_LEDVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayLedValues[drvtype], size);
-            break;
-        }
-        case IO_SWVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arraySwValues[drvtype], size);
-            break;
-        }
-        case IO_MTVABS: {
-            break;
-        }
-        case IO_IDS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayIds[drvtype], size);
-            break;
-        }
-        case IO_FFBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayFfBits[drvtype], size);
-            break;
-        }
-        default: {
-            if (cmd >= IO_ABSBEGIN && cmd < IO_ABEND) {
-                ret = memcpy_s(iobuff, iobuffSize, &g_arrayAxisInfo[drvtype][cmd - IO_ABSBEGIN], size);
-            }
-            break;
-        }
-    }
-    if (ret != EOK) {
-        MMI_HILOGE("Call memcpy_s failed, cmd = %d, ret = %d", cmd, ret);
-    }
-    return RET_OK;
-}
-int32_t HdfEventManager::EvdevIoctl(int32_t hdiindex, int32_t pcmd, void *iobuff)
-{
-    int32_t size = (pcmd >> IOCTL_CMD_SHIFT) & IOCTL_CMD_MASK;
-    int32_t cmd = pcmd & 0xff;
-    MMI_HILOGD("index:%{public}d,cmd:%{public}02x,size:%{public}d,"
-        "pcmd:%{public}04x", hdiindex, cmd, size, pcmd);
-    DeviceInfo *deviceinfo = nullptr;
-    for (const auto &item : globleThis_->hdflist_) {
-        if (item.index == hdiindex) {
-            deviceinfo = static_cast<DeviceInfo*>(item->deviceinfo);
-            break;
-        }
-    }
-    if (deviceinfo == nullptr) {
-        MMI_HILOGE("Deviceinfo is null");
-        return 0;
-    }
-    const int32_t iobuffSize = size;
-    errno_t ret = 0;
-    switch (cmd) {
-        case IO_BITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.eventType, size);
-            break;
-        }
-        case IO_KEYBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.keyCode, size);
-            break;
-        }
-        case IO_RELBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.relCode, size);
-            break;
-        }
-        case IO_ABSBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.absCode, size);
-            break;
-        }
-        case IO_MSCBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.miscCode, size);
-            break;
-        }
-        case IO_SWBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.switchCode, size);
-            break;
-        }
-        case IO_LEDBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.ledCode, size);
-            break;
-        }
-        case IO_SNDBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.forceCode, size);
-            break;
-        }
-        case IO_PROPBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.devProp, size);
-            break;
-        }
-        case IO_KEYVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.keyType, size);
-            break;
-        }
-        case IO_LEDVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.ledType, size);
-            break;
-        }
-        case IO_SWVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.switchType, size);
-            break;
-        }
-        case IO_MTVABS: {
-            break;
-        }
-        case IO_IDS: {
-            ret = memcpy_s(iobuff, iobuffSize, &deviceinfo->attrSet.id, size);
-            break;
-        }
-        case IO_FFBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &deviceinfo->abilitySet.forceCode, size);
-            break;
-        }
-        default: {
-            if (cmd >= IO_ABSBEGIN && cmd < IO_ABEND) {
-                ret = memcpy_s(iobuff, iobuffSize, &deviceinfo->attrSet.axisInfo[cmd - IO_ABSBEGIN], size);
-            }
-            break;
-        }
-    }
-    if (ret != EOK) {
-        MMI_HILOGE("Call memcpy_s failed, cmd = %d, ret = %d", cmd, ret);
-    }
-    return 0;
-}
-
-HdfEventManager::HdfEventManager()
-{
-    globleThis_ = this;
-    hdiinput_ = nullptr;
-}
-HdfEventManager::~HdfEventManager()
-{
-    uint32_t ret = inputInterface_->iInputReporter->UnregisterHotPlugCallback();
-    if (ret == INPUT_SUCCESS) {
-        MMI_HILOGI("%{public}s:%{public}d INPUT_SUCCESS", __func__, __LINE__);
-    } else {
-        MMI_HILOGE("%{public}s:%{public}d INPUT_ERROR", __func__, __LINE__);
-    }
-}
-int32_t HdfEventManager::HdfdevtypeMapLibinputType(uint32_t devIndex, uint32_t devType)
-{
-    if (devIndex >= MAX_INPUT_DEVICE_COUNT) {
-        MMI_HILOGE("The maximum number of devices exceeded, devIndex:%{public}d", devIndex);
-        return devType;
-    }
-    int32_t ret = 0;
-    switch (devType) {
-        case INDEV_TYPE_TOUCH: {
-            ret = HDF_INPUT | HDF_TOUCHSCREEN;
-            break;
-        }
-        case INDEV_TYPE_MOUSE: {
-            ret = HDF_INPUT | HDF_MOUSE;
-            break;
-        }
-        case INDEV_TYPE_KEYBOARD: {
-            ret = HDF_INPUT | HDF_KEYBOARD;
-            break;
-        }
-        default: {
-            ret = devType;
-            break;
-        }
-    }
-    return ret;
-}
-#ifdef  OHOS_BUILD_HDF
-int32_t HdfEventManager::GetDeviceCount()
-{
-    errno_t ret = memset_s(mountDevIndex_, sizeof(DevDesc) * TOTAL_INPUT_DEVICE_COUNT, 0,
-                           sizeof(DevDesc) * TOTAL_INPUT_DEVICE_COUNT);
-    if (ret != EOK) {
-        MMI_HILOGE("Call memset_s failed. ret = %d", ret);
-    }
-    int32_t devcount = 0;
-    if (inputInterface_ != nullptr || inputInterface_->iInputManager != nullptr) {
-        int32_t ret = inputInterface_->iInputManager->ScanInputDevice(MAX_INPUT_DEVICE_COUNT, mountDevIndex_);
-        if (ret) {
-            MMI_HILOGE("%{public}s:%{public}d Error:ScanInputDevice failed", __func__, __LINE__);
-            return 0;
-        }
-
-        for (int32_t i = 0; i < MAX_INPUT_DEVICE_COUNT; i++) {
-            if (mountDevIndex_[i].devIndex != 0) {
-                devcount = devcount + 1;
-            }
-        }
-    }
-    int32_t jectcount = 0;
-    if (injectInterface_ != nullptr || injectInterface_->iInputManager != nullptr) {
-        int32_t ret = injectInterface_->iInputManager->ScanInputDevice(MAX_INPUT_DEVICE_COUNT,
-                                                                       &mountDevIndex_[devcount]);
-        if (ret) {
-            MMI_HILOGE("%{public}s:%{public}d Error:injectInterface_ ScanInputDevice failed",
-                __func__, __LINE__);
-            return devcount;
-        }
-
-        for (int32_t i = 0; i < MAX_INPUT_DEVICE_COUNT; i++) {
-            if (mountDevIndex_[devcount + i].devIndex != 0) {
-                jectcount = jectcount + 1;
-            }
-        }
-    }
-    return devcount + jectcount;
-}
-void HdfEventManager::SetupCallback()
-{
-    MMI_HILOGD("%{public}s:%{public}d ThreadSetupCallback start", __func__, __LINE__);
-    uint32_t ret = GetInputInterface(&inputInterface_);
-    if (ret != 0 || inputInterface_ == nullptr
-        || inputInterface_->iInputManager == nullptr
-        || inputInterface_->iInputReporter == nullptr) {
-        MMI_HILOGD("%{public}s:%{public}d inputInterface_ init failed", __func__, __LINE__);
-    }
-
-    ret = GetInputInterfaceFromInject(&injectInterface_);
-    if (ret != 0 || injectInterface_ == nullptr
-        || injectInterface_->iInputManager == nullptr
-        || injectInterface_->iInputReporter == nullptr) {
-        MMI_HILOGD("%{public}s:%{public}d injectInterface_ init failed", __func__, __LINE__);
-    }
-
-    eventCallBack_.EventPkgCallback = globleThis_->GetEventCallback;
-    hostPlugCallBack_.HotPlugCallback = globleThis_->HotPlugCallback;
-    if (inputInterface_) {
-        ret = inputInterface_->iInputReporter->RegisterHotPlugCallback(&hostPlugCallBack_);
-        if (ret == INPUT_SUCCESS) {
-            MMI_HILOGI("%{public}s:%{public}d RegisterHotPlugCallback INPUT_SUCCESS", __func__, __LINE__);
-        } else {
-            MMI_HILOGE("%{public}s:%{public}d RegisterHotPlugCallback INPUT_ERROR", __func__, __LINE__);
-        }
-    }
-
-    if (injectInterface_) {
-        ret = injectInterface_->iInputReporter->RegisterHotPlugCallback(&hostPlugCallBack_);
-        if (ret == INPUT_SUCCESS) {
-            MMI_HILOGI("%{public}s:%{public}d injectInterface_ RegisterHotPlugCallback INPUT_SUCCESS",
-                __func__, __LINE__);
-        } else {
-            MMI_HILOGE("%{public}s:%{public}d injectInterface_ RegisterHotPlugCallback INPUT_ERROR",
-                __func__, __LINE__);
-        }
-    }
-
-    int32_t count = GetDeviceCount();
-    MMI_HILOGD("ThreadSetupCallback count:%{public}d",                                 count);
-    for (int32_t i = 0; i < count; i++) {
-        DeviceAddHandle(mountDevIndex_[i].devIndex, mountDevIndex_[i].devType);
-    }
-}
-
-void HdfEventManager::AddDevice(uint32_t devIndex, uint32_t devType)
-{
-    uint32_t ret = 0;
-    if (devIndex >= MAX_INPUT_DEVICE_COUNT) {
-        ret = injectInterface_->iInputReporter->RegisterReportCallback(devIndex, &eventCallBack_);
-        return;
-    }
-    if (!OpenHdfDevice(devIndex, true)) {
-        return;
-    }
-    ret = inputInterface_->iInputReporter->RegisterReportCallback(devIndex, &eventcallback);
-    if (ret == INPUT_SUCCESS) {
-        MMI_HILOGI("%{public}s:%{public}d RegisterReportCallback eventcallback INPUT_SUCCESS"
-            "devindex:%{public}u, devType:%{public}u", __func__, __LINE__, devIndex, devType);
-    } else {
-        MMI_HILOGE("%{public}s:%{public}d RegisterReportCallback eventcallback INPUT_ERROR"
-            "devindex:%{public}u,devType:%{public}u", __func__, __LINE__, devIndex, devType);
-    }
-}
-bool HdfEventManager::OpenHdfDevice(uint32_t devIndex, bool oper)
-{
-    if (devIndex >= MAX_INPUT_DEVICE_COUNT) {
-        return true;
-    }
-    int32_t ret = -1;
-    if (oper) {
-        ret = inputInterface_->iInputManager->OpenInputDevice(devIndex);
-    } else {
-        ret = inputInterface_->iInputManager->CloseInputDevice(devIndex);
-    }
-    if (ret == 0) {
-        MMI_HILOGI("%{public}s:%{public}d Info: device success!", __func__, __LINE__);
-        return true;
-    }
-
-    if (ret != 0) {
-        MMI_HILOGE("%{public}s:%{public}d Error: device fail! code:%{public}u", __func__, __LINE__, ret);
-    }
-    return false;
-}
-void HdfEventManager::HotPlugCallback(const HotPlugEvent *event)
-{
-    MMI_HILOGD("%{public}s:%{public}d HotPlugCallback status:%{public}u,devindex:%{public}u"
-        "devType:%{public}u", __func__, __LINE__, event->status, event->devIndex, event->devType);
-
-    if (!event->status) {
-        DeviceAddHandle(event->devIndex, event->devType);
-    } else {
-        DeviceRemoveHandle(event->devIndex, event->devType);
-    }
-}
-int32_t HdfEventManager::DeviceRemoveHandle(uint32_t devIndex, uint32_t devType)
-{
-    MMI_HILOGD("%{public}s:%{public}d DeviceRemoveHandle devindex:%{public}u,devType:%{public}u",
-        __func__, __LINE__, devIndex, devType);
-    Devcmd cmd;
-    cmd.index = devIndex;
-    cmd.cmd = static_cast<int32_t>(HDF_RMV_DEVICE);
-    libinput_devpipe_write(m_globleThis->hdiinput_, &cmd, sizeof(Devcmd));
-    if (devIndex < MAX_INPUT_DEVICE_COUNT) {
-        uint32_t ret = m_globleThis->inputInterface_->iInputReporter->UnregisterReportCallback(devIndex);
-        if (ret == INPUT_SUCCESS) {
-            MMI_HILOGI("%{public}s:%{public}d REMOVE_SUCCESS devindex:%{public}u,devType:%{public}u",
-                __func__, __LINE__, devIndex, devType);
-        } else {
-            MMI_HILOGE("%{public}s:%{public}d REMOVE_ERROR devindex:%{public}u,devType:%{public}u",
-                __func__, __LINE__, devIndex, devType);
-        }
-    }
-    globleThis_->OpenHdfDevice(devIndex, false);
-    return RET_OK;
-}
-
-
-void HdfEventManager::GetEventCallback(const KeyEventNormalize **pkgs, uint32_t count, uint32_t devIndex)
-{
-    static constexpr uint16_t byteSize = 8;
-    CHKPV(pkgs);
-    struct input_event eventarry[MAX_EVENT_PKG_NUM];
-    for (uint32_t i = 0; i < count && i < MAX_EVENT_PKG_NUM; i++) {
-        eventarry[i].code = pkgs[i]->code;
-        eventarry[i].type = (pkgs[i]->type) | static_cast<uint16_t>(devIndex<<byteSize);
-        eventarry[i].value = pkgs[i]->value;
-        eventarry[i].input_event_sec = (pkgs[i]->timestamp) / (USEC_PER_SEC);
-        eventarry[i].input_event_usec = (pkgs[i]->timestamp) % (USEC_PER_SEC);
-    }
-    if (!globleThis_->devStatus[devIndex]) {
-        return;
-    }
-    libinput_pipe_write(globleThis_->hdiinput_, devIndex, eventarry, count * sizeof(struct input_event));
-}
-
-int32_t HdfEventManager::DeviceAddHandle(uint32_t devIndex, uint32_t devType)
-{
-    MMI_HILOGD("%{public}s:%{public}d DeviceAddHandle devindex:%{public}u,devType:%{public}u",
-        __func__, __LINE__, devIndex, devType);
-    globleThis_->devStatus[devIndex] = false;
-    uhdf *hdiuhdf = nullptr;
-    hdiuhdf = new(uhdf);
-    hdiuhdf->index = devIndex;
-    hdiuhdf->type = globleThis_->HdfdevtypeMapLibinputType(devIndex, devType);
-    hdiuhdf->nproperties = 0;
-    hdiuhdf->quirkpop = nullptr;
-    hdiuhdf->modeltype = 0;
-    hdiuhdf->fn = (hdiuhdf->index >= MAX_INPUT_DEV_NUM) ? EvdevSimIoctl : EvdevIoctl;
-    globleThis_->hdflist_.push_back(hdiuhdf);
-    Devcmd cmd;
-    cmd.index = devIndex;
-    cmd.cmd = static_cast<int32_t>(HDF_ADD_DEVICE);
-    libinput_devpipe_write(globleThis_->hdiinput_, &cmd, sizeof(Devcmd));
-    return RET_OK;
-}
-constexpr struct libinput_interface _hdfinterface = {
-    .open_restricted = [](const char *path, int32_t flags, void *user_data)->int32_t {
-        int32_t fd = -1;
-        MMI_HILOGI("libinput .open_restricted path:%{public}s,fd:%{public}d", path, fd);
-        return fd < 0 ? -errno : fd;
-    },
-    .close_restricted = [](int32_t fd, void *user_data)
-    {
-        MMI_HILOGI("libinput .close_restricted fd:%{public}d", fd);
-    },
-};
-libinput *HdfEventManager::HdfLibinputInit()
-{
-    if (globleThis_->hdiinput_ == nullptr) {
-        globleThis_->hdiinput_ = libinput_hdf_create_context(&_hdfinterface, nullptr);
-    }
-    MMI_HILOGD("HdfLibinputInit function end");
-    return globleThis_->hdiinput_;
-}
-int32_t HdfEventManager::HdfDevHandle(int32_t index, hdf_event_type cmd)
-{
-    if (cmd != HDF_ADD_DEVICE) {
-        MMI_HILOGD("HdfRmv function start");
-        uhdf *hdiuhdf = nullptr;
-        for (std::list<uhdf*>::iterator it = globleThis_->hdflist_.begin();
-             it != globleThis_->hdflist_.end(); ++it) {
-            uhdf *hdiuhdfit = *it;
-            if (hdiuhdfit->index == static_cast<int32_t>(index)) {
-                hdiuhdf = *it;
-                globleThis_->hdflist_.remove(*it);
-                break;
-            }
-        }
-        if (hdiuhdf == nullptr) {
-            return RET_OK;
-        }
-        uhdfdevice_removed(hdiuhdf);
-        delete(hdiuhdf);
-        return RET_OK;
-    }
-
-    uhdf *hdiuhdf = nullptr;
-    for (std::list<uhdf*>::iterator it = globleThis_->hdflist_.begin();
-        it != globleThis_->hdflist_.end(); ++it) {
-        uhdf *hdiuhdfit = *it;
-        if (hdiuhdfit->index != static_cast<int32_t>(index)) {
-            continue;
-        }
-
-        hdiuhdf = *it;
-        DeviceInfo *deviceinfo = nullptr;
-        globleThis_->AddDevice(index, hdiuhdf->type);
-        if (index < MAX_INPUT_DEVICE_COUNT) {
-            uint32_t ret = globleThis_->inputInterface_->iInputManager->GetInputDevice(index, &deviceinfo);
-            if (ret != 0 || (deviceinfo == nullptr)) {
-                MMI_HILOGE("%{public}s:%{public}d inputInterface_ GetInputDevice ret:%{public}d",
-                           __func__, __LINE__, ret);
-                return RET_ERR;
-            }
-            hdiuhdf->deviceinfo = (void*)deviceinfo;
-        }
-        uhdfdevice_added(globleThis_->hdiinput_, hdiuhdf, "default");
-        globleThis_->devStatus[index] = true;
-        return RET_OK;
-    }
-    return RET_OK;
-}
-bool HdfEventManager::Init()
-{
-    return true;
-}
-HdfEventManager  hdfEventManager;
-extern "C" libinput *HdfAdfInit()
-{
-    MMI_HILOGD("HdfAdfInit function start");
-    return hdfEventManager.HdfLibinputInit();
-}
-
-extern "C" int32_t HdfDevHandle(int32_t index, hdf_event_type cmd)
-{
-    MMI_HILOGD("HdfDevHandle function start index:%{public}d,cmd:%{public}d", index, cmd);
-    return hdfEventManager.HdfDevHandle(index, cmd);
-}
-#endif
-} // namespace MMI
-} // namespace OHOS
\ No newline at end of file
diff --git a/service/hdf_adapter/src/hdf_inject_init.cpp b/service/hdf_adapter/src/hdf_inject_init.cpp
deleted file mode 100644
index a2c812dad7..0000000000
--- a/service/hdf_adapter/src/hdf_inject_init.cpp
+++ /dev/null
@@ -1,767 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "hdf_inject_init.h"
-
-static DrvType g_index2DrvType[] = {
-    MOUSE, KEYBOARD, TOUCH, PEN, PAD, INVALD, FINGER, JOYSTICK, INVALD, INVALD, KEYBOARD, SWITCH5, TRACKPAD5, GAMEPAD
-};
-static short g_arrayIds[][4] = {
-    {3, 24582, 24582, 1}, {3, 24582, 24582, 1}, {3, 24582, 24582, 1}, {3, 1386, 914, 272},
-    {3, 1386, 914, 272}, {3, 1386, 914, 272}, {3, 1386, 914, 272}, {3, 1386, 914, 272},
-    {3, 1386, 914, 272}, {3, 1386, 914, 272}
-};
-static uint32_t g_arrayBits[] = {
-    11, 7, 31, 27, 11, 43, 31, 1179671, 23, 31s
-};
-static uint32_t g_arrayPropsBits[] = {
-    2, 0, 0, 1, 0, 1, 0, 0, 0, 0
-};
-static uint32_t g_arrayKeyBits[][24] = {
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1024, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 1073741824, 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff, 0, 0, 0, 0, 0, 0, 0, 0,
-     0, 0, 0, 0, 0},
-    {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-     0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-     0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7903, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 127, 0, 2048, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58656, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 65535, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-     2031617, 0, 0, 3209970758, 397407021, 75759615, 0, 0, 0, 0, 196863, 0, 0, 0, 0, 0},
-    {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-     2031616, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-};
-static uint32_t g_arrayRelBits[] = {
-    0, 2307, 64, 0, 0, 0, 0, 323, 323, 0
-};
-static uint32_t g_arrayAbsBits[][2] = {
-    {16777219, 124977152},
-    { 0, 0},
-    { 0, 1},
-    {251658503, 256},
-    {259, 256},
-    {3, 41123840},
-    {196707, 0},
-    {0, 1},
-    {0, 0},
-    {198207, 0},
-};
-static uint32_t g_arrayLedBits[] = {
-    0, 0, 0, 0, 0, 0, 0, 7, 7, 0
-};
-static uint32_t g_arraySwBits[] = {
-    0, 0, 0, 0, 0, 16384, 0, 0, 0, 0
-};
-static uint32_t g_arrayMscBits[] = {
-    0, 0, 16, 1, 0, 0, 16, 16, 16, 0
-};
-static uint32_t g_arrayFfBits[][4] = {
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-    {0, 0, 0, 0},
-};
-static uint32_t g_arraySndBits[] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-static uint32_t g_arrayLedValues[] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-static uint32_t g_arraySwValues[] = {
-    0, 0, 0, 0, 0, 16384, 0, 0, 0, 0
-};
-static uint32_t g_arrayKeyValues[][24] = {
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16384, 0, 6400, 0, 0, 4000, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-};
-static input_absinfo g_arrayAxisInfo[][64] = {
-    {
-        {0, 0, 480, 0, 0, 0},
-        {0, 0, 960, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 100, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 1, 0, 0, 0},
-        {0, 0, 1, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, -90, 90, 0, 0, 0},
-        {0, 0, 480, 0, 0, 0},
-        {0, 0, 960, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 10, 0, 0, 0},
-        {0, 0, 9, 0, 0, 0},
-        {0, 0, 100, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 1300, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 31920, 4, 0, 200},
-        {0, 0, 19950, 4, 0, 200},
-        {0, -900, 899, 0, 0, 287},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 2047, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 8191, 0, 0, 0},
-        {0, 0, 63, 0, 0, 0},
-        {0, -64, 63, 0, 0, 57},
-        {0, -64, 63, 0, 0, 57},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, -2147483648, 2147483647, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 1, 0, 0, 0},
-        {0, 0, 1, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 71, 0, 0, 11 },
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 6400, 0, 0, 40},
-        {0, 0, 4000, 0, 0, 40},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 9, 0, 0, 0},
-        {0, 0, 21, 0, 0, 2},
-        {0, 0, 21, 0, 0, 2},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 1, 0, 0, 0},
-        {0, 0, 6400, 0, 0, 40},
-        {0, 0, 4000, 0, 0, 40},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 65535, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 16383, 63, 1023, 0},
-        {0, 0, 16383, 63, 1023, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, -1, 1, 0, 0, 0},
-        {0, -1, 1, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 572, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-    {
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, -32768, 32767, 16, 128, 0},
-        {0, -32768, 32767, 16, 128, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 255, 0, 15, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, -1, 1, 0, 0, 0},
-        {0, -1, 1, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0},
-    },
-};
diff --git a/service/hdf_adapter/test/.gitkeep b/service/hdf_adapter/test/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/service/hdi_inject/include/hdi_inject.h b/service/hdi_inject/include/hdi_inject.h
deleted file mode 100644
index 0e9c588a37..0000000000
--- a/service/hdi_inject/include/hdi_inject.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef HDI_INJECT_H
-#define HDI_INJECT_H
-#ifdef OHOS_BUILD_HDF
-
-#include <list>
-#include <vector>
-
-#include "input_type.h"
-
-#include "input_manager.h"
-#include "uds_server.h"
-
-namespace OHOS {
-namespace MMI {
-class HdiInject final {
-    DECLARE_DELAYED_SINGLETON(HdiInject);
-
-enum HdiInfoType {
-    GET_STATUS_INFO = 1001,
-    SET_HOT_PLUGS = 1002,
-    SET_EVENT_INJECT = 1003,
-    GET_DEVICE_INFO = 1004,
-    SHOW_DEVICE_INFO = 1005,
-    REPLY_STATUS_INFO = 2001,
-};
-
-enum HdiDeviceStatus {
-    HDI_DEVICE_ADD_STATUS = 0,
-    HDI_DEVICE_REMOVE_STATUS = 1,
-};
-
-struct DeviceInformation {
-    bool status { false };
-    int32_t devIndex { 0 };
-    int32_t devType { 0 };
-    int16_t fd { 0 };
-    char chipName[32];
-};
-public:
-    DISALLOW_COPY_AND_MOVE(HdiInject);
-    bool Init(UDSServer &sess);
-    void StartHdiserver();
-    void ShowAllDeviceInfo();
-    void InitDeviceInfo();
-    int32_t GetDeviceCount();
-    bool SyncDeviceHotStatus();
-    bool ReportHotPlugEvent();
-    void OnInitHdiServerStatus();
-    int32_t GetDevTypeIndex(int32_t devIndex);
-    int32_t GetDevIndexType(int32_t devType);
-    int32_t ManageHdfInject(const MMI::SessionPtr sess, MMI::NetPacket &pkt);
-    void OnSetHotPlugs(uint32_t devIndex, uint32_t devSatatus);
-    int32_t OnSetEventInject(const RawInputEvent& allEvent, int32_t devType);
-    bool SetDeviceHotStatus(int32_t devIndex, int32_t status);
-    int32_t ScanInputDevice(uint32_t arrLen, DevDesc *staArr);
-    bool ReportHotPlugEvent(uint32_t devIndex, uint32_t status);
-public:
-    InputHostCb hotPlugcallback_;
-    InputEventCb eventcallback_;
-private:
-    bool initStatus_ { false };
-    HotPlugEvent** event_ { nullptr };
-    MMI::UDSServer* udsServerPtr_ { nullptr };
-    std::vector<DeviceInformation> deviceArray_ = {};
-};
-
-#define MMIHdiInject ::OHOS::DelayedSingleton<HdiInject>::GetInstance()
-} // namespace MMI
-} // namespace OHOS
-#endif // OHOS_BUILD_HDF
-#endif // HDI_INJECT_H
\ No newline at end of file
diff --git a/service/hdi_inject/src/hdi_inject.cpp b/service/hdi_inject/src/hdi_inject.cpp
deleted file mode 100644
index 75566c9675..0000000000
--- a/service/hdi_inject/src/hdi_inject.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "hdi_inject.h"
-
-#include <iostream>
-
-#include "singleton.h"
-
-#include "define_multimodal.h"
-#include "proto.h"
-#include "util.h"
-
-
-#ifdef OHOS_BUILD_HDF
-using namespace std;
-using namespace OHOS::MMI;
-
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "HdiInject" };
-constexpr int32_t HDF_MOUSE_DEV_TYPE = 5;
-constexpr int32_t HDF_KEYBOARD_DEV_TYPE = 3;
-constexpr int32_t HDF_TOUCH_DEV_TYPE = 17;
-constexpr int32_t HDF_TABLET_DEV_TYPE = 33;
-constexpr int32_t HDF_TABLET_PAD_DEV_TYPE = 289;
-constexpr int32_t HDF_SWITH_PAD_DEV_TYPE = 2089;
-constexpr int32_t HDF_TOUCH_FINGER_DEV_TYPE = 2089;
-constexpr int32_t HDF_SWITCH_DEV_TYPE = 7;
-constexpr int32_t HDF_TRACK_PAD_DEV_TYPE = 7;
-constexpr int32_t HDF_JOYSTICK_DEV_TYPE = 65;
-constexpr int32_t HDF_GAMEPAD_DEV_TYPE = 65;
-constexpr int32_t HDF_TOUCH_PAD_DEV_TYPE = 5;
-constexpr int32_t HDF_TRACK_BALL_DEV_TYPE = 3;
-constexpr int32_t HDF_DEVICE_FD_DEFAULT_STATUS = -1;
-constexpr int32_t EVENT_PACKAGE_ARROW_SIZE = 1;
-} // namespace
-
-HdiInject::HdiInject() {}
-HdiInject::~HdiInject() {}
-
-bool HdiInject::Init(UDSServer &sess)
-{
-    udsServerPtr_ = &sess;
-    StartHdiserver();
-    return true;
-}
-
-int32_t HdiInject::ManageHdfInject(const SessionPtr sess, NetPacket &pkt)
-{
-    MMI_HILOGI("Into function ManageHdfInject");
-    int32_t sendType = 0;
-    pkt >> sendType;
-    uint32_t devIndex = 0;
-    uint32_t devSatatus = 0;
-    RawInputEvent speechEvent = {};
-    switch (sendType) {
-        case GET_STATUS_INFO: {
-            OnInitHdiServerStatus();
-            return RET_OK;
-        }
-        case SET_EVENT_INJECT: {
-            pkt >> devIndex >> speechEvent;
-            if (pkt.ChkRWError()) {
-                MMI_HILOGE("Packet read recv massage failed");
-                return RET_ERR;
-            }
-            MMI_HILOGI("Hdi server recv massage: devIndex:%{public}d", devIndex);
-            OnSetEventInject(speechEvent, devIndex);
-            return RET_OK;
-        }
-        case SHOW_DEVICE_INFO: {
-            ShowAllDeviceInfo();
-            return RET_OK;
-        }
-        case SET_HOT_PLUGS: {
-            pkt >> devIndex >> devSatatus;
-            if (pkt.ChkRWError()) {
-                MMI_HILOGE("Packet read tool hot data failed");
-                return RET_ERR;
-            }
-            MMI_HILOGI("Recv inject tool hot data, devIndex:%{public}d,status:%{public}d", devIndex, devSatatus);
-            OnSetHotPlugs(devIndex, devSatatus);
-            return RET_OK;
-        }
-        default: {
-            MMI_HILOGE("The message type:%{public}d cannot be processed", sendType);
-            return RET_ERR;
-        }
-    }
-}
-
-int32_t HdiInject::OnSetEventInject(const RawInputEvent& allEvent, int32_t devIndex)
-{
-    CALL_DEBUG_ENTER;
-    KeyEventNormalize* pack[EVENT_PACKAGE_ARROW_SIZE];
-    pack[0] = (KeyEventNormalize*)malloc(sizeof(KeyEventNormalize));
-    pack[0]->type = static_cast<int32_t>(allEvent.ev_type);
-    pack[0]->code = static_cast<uint32_t>allEvent.ev_code;
-    pack[0]->value = static_cast<int32_t>(allEvent.ev_value);
-    pack[0]->timestamp = static_cast<uint64_t>(GetSysClockTime());
-    MMIHdiInject->eventcallback_.EventPkgCallback((const KeyEventNormalize**)pack, 1, devIndex);
-    free(pack[0]);
-    return RET_OK;
-}
-
-void HdiInject::OnSetHotPlugs(uint32_t devIndex, uint32_t devSatatus)
-{
-    if (!(ReportHotPlugEvent(devIndex, devSatatus))) {
-        MMI_HILOGE("ReportHotPlugEvent failed");
-        return;
-    }
-    MMI_HILOGI("ReportHotPlugEvent success");
-}
-
-void HdiInject::InitDeviceInfo()
-{
-    DeviceInformation deviceInfoArray[] = {
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_POINTER_INDEX, HDF_MOUSE_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "mouse"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_KEYBOARD_INDEX, HDF_KEYBOARD_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "keyboard"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_TOUCH_INDEX, HDF_TOUCH_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "touch"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_TABLET_TOOL_INDEX, HDF_TABLET_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "pen"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_TABLET_PAD_INDEX, HDF_TABLET_PAD_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "pad"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_FINGER_INDEX, HDF_TOUCH_FINGER_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "finger"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_SWITCH_INDEX, HDF_SWITCH_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "knob"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_TRACKPAD5_INDEX, HDF_TRACK_PAD_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "trackPad"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_JOYSTICK_INDEX, HDF_JOYSTICK_DEV_TYPE,
-            HDF_DEVICE_FD_DEFAULT_STATUS, "joyStick"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_GAMEPAD_INDEX, HDF_GAMEPAD_DEV_TYPE,
-            HDF_DEVICE_FD_DEFAULT_STATUS, "gamePad"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_TOUCH_PAD, HDF_TOUCH_PAD_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "touchPad"},
-        {HDI_DEVICE_REMOVE_STATUS, INPUT_DEVICE_REMOTE_CONTROL, HDF_TRACK_BALL_DEV_TYPE,
-         HDF_DEVICE_FD_DEFAULT_STATUS, "remoteControl"},
-    };
-    int32_t counts = sizeof(deviceInfoArray) / sizeof(DeviceInformation);
-    auto iter = deviceArray_.insert(deviceArray_.begin(), deviceInfoArray, deviceInfoArray + counts);
-    if (!iter.second) {
-        MMI_HILOGE("Insert value failed");
-    }
-}
-
-void HdiInject::StartHdiserver()
-{
-    initStatus_ = true;
-}
-
-void HdiInject::OnInitHdiServerStatus()
-{
-    StartHdiserver();
-}
-
-void HdiInject::ShowAllDeviceInfo()
-{
-    for (const auto &item : deviceArray_) {
-        MMI_HILOGI("deviceName:%{public}s,devIndex:%{public}d,status:%{public}d,devType:%{public}d",
-            item.chipName, item.devIndex, item.status, item.devType);
-    }
-}
-
-int32_t HdiInject::GetDeviceCount()
-{
-    return static_cast<int32_t>(deviceArray_.size());
-}
-
-bool HdiInject::SetDeviceHotStatus(int32_t devIndex, int32_t status)
-{
-    for (auto iter = deviceArray_.begin(); iter != deviceArray_.end(); ++iter) {
-        if (iter->devIndex == devIndex) {
-            if (iter->status == status) {
-                MMI_HILOGE("Failed to find status");
-                return false;
-            }
-            iter->status = ~status + 1;
-            return true;
-        }
-    }
-    return false;
-}
-
-bool HdiInject::SyncDeviceHotStatus()
-{
-    const uint16_t count = static_cast<uint16_t>(deviceArray_.size());
-    event_ = (HotPlugEvent**)malloc(count * sizeof(HotPlugEvent));
-    CHKPF(event_);
-    for (int32_t i = 0; i < count; i++) {
-        event_[i]->devIndex = deviceArray_[i].devIndex;
-        event_[i]->devType = deviceArray_[i].devType;
-        event_[i]->status = deviceArray_[i].status;
-        MMIHdiInject->hotPlugcallback_.HotPlugCallback((const HotPlugEvent*)&event_[i]);
-    }
-    return true;
-}
-
-bool HdiInject::ReportHotPlugEvent()
-{
-    SyncDeviceHotStatus();
-    MMIHdiInject->hotPlugcallback_.HotPlugCallback(*event_);
-    return true;
-}
-
-bool HdiInject::ReportHotPlugEvent(uint32_t devIndex, uint32_t status)
-{
-    if (!(SetDeviceHotStatus(devIndex, status))) {
-        MMI_HILOGE("SetDeviceHotStatus error devIndex:%{public}d,status:%{public}d", devIndex, status);
-        return false;
-    }
-    int32_t devType = GetDevTypeIndex(devIndex);
-    if (devType == -1) {
-        return false;
-    }
-    HotPlugEvent event = {
-        static_cast<uint32_t>(devIndex),
-        static_cast<uint32_t>(devType),
-        static_cast<uint32_t>(status)
-    };
-    MMIHdiInject->hotPlugcallback_.HotPlugCallback(&event);
-    return true;
-}
-
-int32_t HdiInject::GetDevTypeIndex(int32_t devIndex)
-{
-    for (const auto &item : deviceArray_) {
-        if (item.devIndex == devIndex) {
-            return item.devType;
-        }
-    }
-    return RET_ERR;
-}
-
-int32_t HdiInject::GetDevIndexType(int32_t devType)
-{
-    vector<DeviceInformation>::iterator iter;
-    for (const auto &item : deviceArray_) {
-        if (item.devType == devType) {
-            return item.devIndex;
-        }
-    }
-    return RET_ERR;
-}
-
-int32_t HdiInject::ScanInputDevice(uint32_t arrLen, DevDesc *staArr)
-{
-    uint16_t count = static_cast<uint16_t>(deviceArray_.size());
-    int32_t index = 0;
-    for (int i = 0; i < count; i++) {
-        if (deviceArray_[i].status == 1) {
-            continue;
-        }
-        staArr[index].devIndex = deviceArray_[i].devIndex;
-        staArr[index].devType = deviceArray_[i].devType;
-        index++;
-    }
-    return 0;
-}
-
-static int32_t ScanInputDevice(uint32_t arrLen, DevDesc *staArr)
-{
-    return MMIHdiInject->ScanInputDevice(arrLen, staArr);
-}
-
-static int32_t OpenInputDevice(uint32_t devIndex)
-{
-    return 0;
-}
-
-static int32_t CloseInputDevice(uint32_t devIndex)
-{
-    return 0;
-}
-
-static int32_t GetInputDevice(uint32_t devIndex, DeviceInfo **devInfo)
-{
-    return 0;
-}
-
-static int32_t GetInputDeviceList(uint32_t *devNum, DeviceInfo **devList, uint32_t size)
-{
-    return 0;
-}
-
-static int32_t SetPowerStatus(uint32_t devIndex, uint32_t status)
-{
-    return 0;
-}
-
-static int32_t GetPowerStatus(uint32_t devIndex, uint32_t *status)
-{
-    return 0;
-}
-
-static int32_t GetDeviceType(uint32_t devIndex, uint32_t *deviceType)
-{
-    return 0;
-}
-
-static int32_t GetChipInfo(uint32_t devIndex, char *chipInfo, uint32_t length)
-{
-    return 0;
-}
-
-static int32_t GetVendorName(uint32_t devIndex, char *vendorName, uint32_t length)
-{
-    return 0;
-}
-
-
-static int32_t GetChipName(uint32_t devIndex, char *chipName, uint32_t length)
-{
-    return 0;
-}
-
-static int32_t SetGestureMode(uint32_t devIndex, uint32_t gestureMode)
-{
-    return 0;
-}
-
-static int32_t RunCapacitanceTest(uint32_t devIndex, uint32_t testType, char *result, uint32_t length)
-{
-    return 0;
-}
-
-static int32_t RunExtraCommand(uint32_t devIndex, InputExtraCmd *cmd)
-{
-    return 0;
-}
-
-static int32_t RegisterReportCallback(uint32_t devIndex, InputEventCb *callback)
-{
-    MMIHdiInject->eventcallback_.EventPkgCallback = callback->EventPkgCallback;
-    return 0;
-}
-
-static int32_t UnregisterReportCallback(uint32_t devIndex)
-{
-    return 0;
-}
-
-static int32_t RegisterHotPlugCallback(InputHostCb *callback)
-{
-    MMIHdiInject->hotPlugcallback_.HotPlugCallback = callback->HotPlugCallback;
-    return 0;
-}
-
-static int32_t UnregisterHotPlugCallback(void)
-{
-    return 0;
-}
-
-static InputManager interfaceManager = {
-    .ScanInputDevice = ScanInputDevice,
-    .OpenInputDevice = OpenInputDevice,
-    .CloseInputDevice = CloseInputDevice,
-    .GetInputDevice = GetInputDevice,
-    .GetInputDeviceList = GetInputDeviceList,
-};
-
-static InputController interfaceControl = {
-    .SetPowerStatus = SetPowerStatus,
-    .GetPowerStatus = GetPowerStatus,
-    .GetDeviceType = GetDeviceType,
-    .GetChipInfo = GetChipInfo,
-    .GetVendorName = GetVendorName,
-    .GetChipName = GetChipName,
-    .SetGestureMode = SetGestureMode,
-    .RunCapacitanceTest = RunCapacitanceTest,
-    .RunExtraCommand = RunExtraCommand,
-};
-
-static InputReporter interfaceReport = {
-    .RegisterReportCallback = RegisterReportCallback,
-    .UnregisterReportCallback = UnregisterReportCallback,
-    .RegisterHotPlugCallback = RegisterHotPlugCallback,
-    .UnregisterHotPlugCallback = UnregisterHotPlugCallback,
-};
-
-int32_t GetInputInterfaceFromInject(IInputInterface **interface)
-{
-    MMIHdiInject->InitDeviceInfo();
-    int32_t ret = 0;
-    IInputInterface* injectInterface = new(IInputInterface);
-    *interface = injectInterface;
-    injectInterface->iInputController = &interfaceControl;
-    injectInterface->iInputManager = &interfaceManager;
-    injectInterface->iInputReporter = &interfaceReport;
-    return ret;
-}
-#endif
\ No newline at end of file
diff --git a/service/hdi_inject/test/hdi_inject_test.cpp b/service/hdi_inject/test/hdi_inject_test.cpp
deleted file mode 100644
index 27746d2b2f..0000000000
--- a/service/hdi_inject/test/hdi_inject_test.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include "define_multimodal.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-using namespace testing::ext;
-using namespace OHOS::MMI;
-} // namespace
-
-class HdiInjectTest : public testing::Test {
-public:
-    static void SetUpTestCase(void) {}
-    static void TearDownTestCase(void) {}
-};
-} // namespace MMI
-} // namespace OHOS
diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
index 48aa33d124..28a252e7cf 100644
--- a/service/message_handle/include/server_msg_handler.h
+++ b/service/message_handle/include/server_msg_handler.h
@@ -64,13 +64,7 @@ public:
 protected:
     int32_t MarkProcessed(SessionPtr sess, NetPacket& pkt);
     int32_t OnRegisterMsgHandler(SessionPtr sess, NetPacket& pkt);
-#ifdef OHOS_BUILD_HDF
-    int32_t OnHdiInject(SessionPtr sess, NetPacket& pkt);
-#endif
     int32_t OnDisplayInfo(SessionPtr sess, NetPacket& pkt);
-#ifdef OHOS_BUILD_MMI_DEBUG
-    int32_t OnBigPacketTest(SessionPtr sess, NetPacket& pkt);
-#endif // OHOS_BUILD_MMI_DEBUG
 private:
     UDSServer *udsServer_ { nullptr };
     int32_t targetWindowId_ { -1 };
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index e4111e62a4..7c8cbb9ff7 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -34,9 +34,6 @@
 #include "mmi_func_callback.h"
 #include "mouse_event_normalize.h"
 #include "time_cost_chk.h"
-#ifdef OHOS_BUILD_HDF
-#include "hdi_inject.h"
-#endif
 
 namespace OHOS {
 namespace MMI {
@@ -51,21 +48,9 @@ ServerMsgHandler::~ServerMsgHandler() {}
 void ServerMsgHandler::Init(UDSServer& udsServer)
 {
     udsServer_ = &udsServer;
-#ifdef OHOS_BUILD_HDF
-    if (!(MMIHdiInject->Init(udsServer))) {
-        MMI_HILOGE("Input device initialization failed");
-        return;
-    }
-#endif
     MsgCallback funs[] = {
         {MmiMessageId::MARK_PROCESS, MsgCallbackBind2(&ServerMsgHandler::MarkProcessed, this)},
         {MmiMessageId::DISPLAY_INFO, MsgCallbackBind2(&ServerMsgHandler::OnDisplayInfo, this)},
-#ifdef OHOS_BUILD_MMI_DEBUG
-        {MmiMessageId::BIGPACKET_TEST, MsgCallbackBind2(&ServerMsgHandler::OnBigPacketTest, this)},
-#endif // OHOS_BUILD_MMI_DEBUG
-#ifdef OHOS_BUILD_HDF
-        {MmiMessageId::HDI_INJECT, MsgCallbackBind2(&ServerMsgHandler::OnHdiInject, this)},
-#endif // OHOS_BUILD_HDF
     };
     for (auto &it : funs) {
         if (!RegistrationEvent(it)) {
@@ -91,27 +76,6 @@ void ServerMsgHandler::OnMsgHandler(SessionPtr sess, NetPacket& pkt)
     }
 }
 
-#ifdef OHOS_BUILD_HDF
-int32_t ServerMsgHandler::OnHdiInject(SessionPtr sess, NetPacket& pkt)
-{
-    MMI_HILOGI("Hdfinject server access hditools info");
-    CHKPR(sess, ERROR_NULL_POINTER);
-    CHKPR(udsServer_, ERROR_NULL_POINTER);
-    const int32_t processingCode = MMIHdiInject->ManageHdfInject(sess, pkt);
-    NetPacket pkt(MmiMessageId::HDI_INJECT);
-    pkt << processingCode;
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet write reply message failed");
-        return RET_ERR;
-    }
-    if (!sess->SendMsg(pkt)) {
-        MMI_HILOGE("OnHdiInject reply message error");
-        return RET_ERR;
-    }
-    return RET_OK;
-}
-#endif // OHOS_BUILD_HDF
-
 int32_t ServerMsgHandler::MarkProcessed(SessionPtr sess, NetPacket& pkt)
 {
     CALL_DEBUG_ENTER;
@@ -382,56 +346,5 @@ int32_t ServerMsgHandler::AddInputEventFilter(sptr<IEventFilter> filter)
     return RET_OK;
 }
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
-
-#ifdef OHOS_BUILD_MMI_DEBUG
-int32_t ServerMsgHandler::OnBigPacketTest(SessionPtr sess, NetPacket& pkt)
-{
-    CHKPR(sess, ERROR_NULL_POINTER);
-    int32_t width = 0;
-    int32_t height = 0;
-    int32_t focusWindowId = 0;
-    pkt >> width >> height >> focusWindowId;
-    MMI_HILOGD("logicalInfo,width:%{public}d,height:%{public}d,focusWindowId:%{public}d",
-        width, height, focusWindowId);
-    uint32_t num = 0;
-    pkt >> num;
-    for (uint32_t i = 0; i < num; i++) {
-        WindowInfo info;
-        pkt >> info.id >> info.pid >> info.uid >> info.area >> info.defaultHotAreas
-            >> info.pointerHotAreas >> info.agentWindowId >> info.flags;
-        MMI_HILOGD("windowsInfos,id:%{public}d,pid:%{public}d,uid:%{public}d,"
-            "area.x:%{public}d,area.y:%{public}d,area.width:%{public}d,area.height:%{public}d,"
-            "defaultHotAreas:size:%{public}zu,pointerHotAreas:size:%{public}zu,"
-            "agentWindowId:%{public}d,flags:%{public}d",
-            info.id, info.pid, info.uid, info.area.x, info.area.y, info.area.width,
-            info.area.height, info.defaultHotAreas.size(), info.pointerHotAreas.size(),
-            info.agentWindowId, info.flags);
-        for (const auto &win : info.defaultHotAreas) {
-            MMI_HILOGD("defaultHotAreas,x:%{public}d,y:%{public}d,width:%{public}d,height:%{public}d",
-                win.x, win.y, win.width, win.height);
-        }
-        for (const auto &pointer : info.pointerHotAreas) {
-            MMI_HILOGD("pointerHotAreas,x:%{public}d,y:%{public}d,width:%{public}d,height:%{public}d",
-                pointer.x, pointer.y, pointer.width, pointer.height);
-        }
-    }
-    pkt >> num;
-    for (uint32_t i = 0; i < num; i++) {
-        DisplayInfo info;
-        pkt >> info.id >> info.x >> info.y >> info.width >> info.height
-            >> info.name >> info.uniq >> info.direction;
-        MMI_HILOGD("displaysInfos,id:%{public}d,x:%{public}d,y:%{public}d,"
-            "width:%{public}d,height:%{public}d,name:%{public}s,"
-            "uniq:%{public}s,direction:%{public}d",
-            info.id, info.x, info.y, info.width, info.height, info.name.c_str(),
-            info.uniq.c_str(), info.direction);
-    }
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet read data failed");
-        return PACKET_READ_FAIL;
-    }
-    return RET_OK;
-}
-#endif // OHOS_BUILD_MMI_DEBUG
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/message_handle/test/server_msg_handler_test.cpp b/service/message_handle/test/server_msg_handler_test.cpp
index 64c6c8c6a3..e77f0d90a4 100644
--- a/service/message_handle/test/server_msg_handler_test.cpp
+++ b/service/message_handle/test/server_msg_handler_test.cpp
@@ -32,14 +32,6 @@ public:
 
 class ServerMsgHandlerUnitTest : public ServerMsgHandler {
 public:
-
-#ifdef OHOS_BUILD_HDF
-    int32_t OnHdiInjectTest(SessionPtr sess, NetPacket& pkt)
-    {
-        return OnHdiInject(sess, pkt);
-    }
-#endif // OHOS_BUILD_HDF
-
     int32_t OnInjectKeyEventTest(SessionPtr sess, std::shared_ptr<KeyEvent> keyEvent)
     {
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index 701a6c12dd..b2a370f4b8 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -31,10 +31,6 @@
 #include "server_msg_handler.h"
 #include "uds_server.h"
 
-#ifdef OHOS_BUILD_HDF
-    #include "hdf_event_manager.h"
-#endif
-
 namespace OHOS {
 namespace MMI {
 
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 095119f40d..ecac09d357 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -84,15 +84,6 @@ void CheckDefineOutput(const char* fmt, Ts... args)
 static void CheckDefine()
 {
     CheckDefineOutput("ChkDefs:");
-#ifdef OHOS_BUILD_LIBINPUT
-    CheckDefineOutput("%-40s", "OHOS_BUILD_LIBINPUT");
-#endif
-#ifdef OHOS_BUILD_HDF
-    CheckDefineOutput("%-40s", "OHOS_BUILD_HDF");
-#endif
-#ifdef OHOS_BUILD_MMI_DEBUG
-    CheckDefineOutput("%-40s", "OHOS_BUILD_MMI_DEBUG");
-#endif
 #ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
     CheckDefineOutput("%-40s", "OHOS_BUILD_ENABLE_POINTER_DRAWING");
 #endif
@@ -186,10 +177,6 @@ bool MMIService::IsRunning() const
 
 bool MMIService::InitLibinputService()
 {
-#ifdef OHOS_BUILD_HDF
-    MMI_HILOGD("HDF Init");
-    hdfEventManager.SetupCallback();
-#endif
     if (!(libinputAdapter_.Init(std::bind(&InputEventHandler::OnEvent, InputHandler, std::placeholders::_1),
         DEF_INPUT_SEAT))) {
         MMI_HILOGE("Libinput init, bind failed");
diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp
index 1677e4a3d6..cac34aa782 100644
--- a/service/module_loader/src/uds_server.cpp
+++ b/service/module_loader/src/uds_server.cpp
@@ -156,9 +156,6 @@ int32_t UDSServer::AddSocketPairInfo(const std::string& programName,
         return RET_ERR;
     }
     sess->SetTokenType(tokenType);
-#ifdef OHOS_BUILD_MMI_DEBUG
-    sess->SetClientFd(toReturnClientFd);
-#endif // OHOS__BUILD_MMI_DEBUG
 
     if (!AddSession(sess)) {
         cleanTaskWhenError();
diff --git a/tools/event_inject/BUILD.gn b/tools/event_inject/BUILD.gn
index 03f2da866c..81af1938b9 100644
--- a/tools/event_inject/BUILD.gn
+++ b/tools/event_inject/BUILD.gn
@@ -25,16 +25,6 @@ config("event_injection_config") {
     "//foundation/multimodalinput/input/util/common/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/common/include",
   ]
-
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
 }
 
 config("event_injection_public_config") {
@@ -73,16 +63,13 @@ ohos_source_set("event-injection") {
   ]
 
   deps = [
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//foundation/multimodalinput/input/service/connect_manager:mmi_connect_manager_proxy",
     "//foundation/multimodalinput/input/service/filter:mmi_event_filter_service",
     "//foundation/multimodalinput/input/util:libmmi-util",
     "//third_party/cJSON:cjson_static",
   ]
 
-  if (input_feature_libinput) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
-
   external_deps = [ "ipc:ipc_core" ]
 
   part_name = "input"
@@ -124,12 +111,9 @@ ohos_unittest("ut-event-injection-out") {
     "${mmi_path}/service/window_manager/include",
     "${mmi_path}/tools/event_inject/include",
     "${mmi_path}/uinput",
+    "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
-
   sources = [
     "test/device_base_test.cpp",
     "test/get_device_node_test.cpp",
@@ -146,30 +130,17 @@ ohos_unittest("ut-event-injection-out") {
     "test/send_message_test.cpp",
   ]
 
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   deps = [
     "${mmi_path}/frameworks/proxy:libmmi-client",
     "${mmi_path}/service:libmmi-server",
     "${mmi_path}/tools/event_inject:event-injection",
     "${mmi_path}/util:libmmi-util",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//third_party/cJSON:cjson_static",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
 
-  if (input_feature_libinput) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
-
   external_deps = [
     "c_utils:utils",
     "hiviewdfx_hilog_native:libhilog",
@@ -183,23 +154,11 @@ ohos_executable("mmi-event-injection") {
   configs = [ ":event_injection_public_config" ]
 
   deps = [
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//foundation/multimodalinput/input/tools/event_inject:event-injection",
     "//foundation/multimodalinput/input/util:libmmi-util",
   ]
 
-  if (input_feature_libinput) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
   install_enable = true
   part_name = "input"
   subsystem_name = "multimodalinput"
diff --git a/tools/event_inject/include/manage_inject_device.h b/tools/event_inject/include/manage_inject_device.h
index f8ce4b8518..6f157f5f47 100644
--- a/tools/event_inject/include/manage_inject_device.h
+++ b/tools/event_inject/include/manage_inject_device.h
@@ -30,7 +30,6 @@ public:
     int32_t TransformJsonData(const DeviceItems &configData);
 private:
     int32_t SendEvent(const InputEventArray &inputEventArray);
-    int32_t SendEventToHdi(const InputEventArray &inputEventArray);
     int32_t SendEventToDeviceNode(const InputEventArray &inputEventArray);
 private:
     GetDeviceNode getDeviceNodeObject_;
diff --git a/tools/vuinput/BUILD.gn b/tools/vuinput/BUILD.gn
index abd2db6c46..7d1b6f0588 100644
--- a/tools/vuinput/BUILD.gn
+++ b/tools/vuinput/BUILD.gn
@@ -23,20 +23,6 @@ config("libmmi_virtual_device_config") {
     "//commonlibrary/c_utils/base/include",
     "//util/common/include",
   ]
-
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
 }
 
 config("virtual_device_public_config") {
@@ -78,20 +64,6 @@ ohos_source_set("libmmi-virtual-device") {
 
   configs = [ ":libmmi_virtual_device_config" ]
 
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   part_name = "input"
   subsystem_name = "multimodalinput"
   external_deps = [ "c_utils:utils" ]
@@ -103,26 +75,10 @@ ohos_executable("vuinput") {
   configs = [ ":virtual_device_public_config" ]
 
   deps = [
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//foundation/multimodalinput/input/tools/vuinput:libmmi-virtual-device",
   ]
 
-  if (input_feature_libinput) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   install_enable = true
   part_name = "input"
   subsystem_name = "multimodalinput"
@@ -140,40 +96,21 @@ ohos_unittest("ut-virtual-device-out") {
     "${mmi_path}/util/network/include",
     "${mmi_path}/util/socket",
     "${mmi_path}/util/socket/include",
+    "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  if (input_feature_libinput || input_feature_hdf) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
-
   sources = [ "test/virtual_device_test.cpp" ]
 
   configs = [ ":virtual_device_public_config" ]
 
-  defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   deps = [
     "${mmi_path}/tools/vuinput:libmmi-virtual-device",
     "${mmi_path}/util:libmmi-util",
+    "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
 
-  if (input_feature_libinput || input_feature_hdf) {
-    deps += [ "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi" ]
-  }
   external_deps = [
     "c_utils:utils",
     "hiviewdfx_hilog_native:libhilog",
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 7b3c66529d..cc03c5def7 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -24,21 +24,7 @@ config("libmmi_util_public_config") {
     "//foundation/multimodalinput/input/interfaces/native/innerkits/common/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
   ]
-
   defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
@@ -100,26 +86,10 @@ ohos_unittest("ut-mmi-util-out") {
     "${mmi_path}/interfaces/native/innerkits/common/include",
     "${mmi_path}/interfaces/native/innerkits/proxy/include",
     "${mmi_path}/interfaces/native/innerkits/event/include",
+    "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
-
   defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
@@ -166,26 +136,10 @@ ohos_unittest("RunShellUtilTest") {
     "${mmi_path}/interfaces/native/innerkits/proxy/include",
     "${mmi_path}/interfaces/native/innerkits/event/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
+    "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  if (input_feature_libinput) {
-    include_dirs += [ "$root_out_dir/diff_libinput_mmi/export_include" ]
-  }
-
   defines = []
-
-  if (input_feature_debug) {
-    defines += [ "OHOS_BUILD_MMI_DEBUG" ]
-  }
-
-  if (input_feature_libinput) {
-    defines += [ "OHOS_BUILD_LIBINPUT" ]
-  }
-
-  if (input_feature_hdf) {
-    defines += [ "OHOS_BUILD_HDF" ]
-  }
-
   if (input_feature_input_cooperation) {
     defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
   }
diff --git a/util/common/include/proto.h b/util/common/include/proto.h
index fd9c64f0bb..f8327aa92f 100644
--- a/util/common/include/proto.h
+++ b/util/common/include/proto.h
@@ -120,7 +120,6 @@ enum class MmiMessageId : int32_t {
 
     ON_STANDARD = 9000,
     SENIOR_INPUT_FUNC = 9050,
-    HDI_INJECT = 9051,
     ON_JOYSTICK = 10000,
     ON_WINDOW = 11000,
 
@@ -132,10 +131,6 @@ enum class MmiMessageId : int32_t {
     ON_EXCEPTION = 13050,
     ON_LIST,
 
-#ifdef OHOS_BUILD_MMI_DEBUG
-    BIGPACKET_TEST = 91000,
-#endif // OHOS_BUILD_MMI_DEBUG
-
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     COOPERATION_ADD_LISTENER = 15000,
     COOPERATION_MESSAGE,
diff --git a/util/socket/include/uds_session.h b/util/socket/include/uds_session.h
index 580d27b749..d82b8e1e37 100644
--- a/util/socket/include/uds_session.h
+++ b/util/socket/include/uds_session.h
@@ -103,14 +103,6 @@ public:
     int64_t GetEarliestEventTime(int32_t type = 0) const;
     bool IsEventQueueEmpty(int32_t type = 0);
 
-#ifdef OHOS_BUILD_MMI_DEBUG
-    void SetClientFd(const int32_t clientFd)
-    {
-        clientFd_ = clientFd;
-        UpdateDescript();
-    }
-#endif
-
 protected:
     struct EventTime {
         int32_t id { 0 };
@@ -126,9 +118,6 @@ protected:
     const int32_t uid_ { -1 };
     const int32_t pid_ { -1 };
     int32_t tokenType_ { TokenType::TOKEN_INVALID };
-#ifdef OHOS_BUILD_MMI_DEBUG
-    int32_t clientFd_ { -1 };
-#endif // OHOS_BUILD_MMI_DEBUG
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/util/socket/src/uds_session.cpp b/util/socket/src/uds_session.cpp
index 209a5f49b3..e0bdeaa65f 100644
--- a/util/socket/src/uds_session.cpp
+++ b/util/socket/src/uds_session.cpp
@@ -109,9 +109,6 @@ void UDSSession::UpdateDescript()
         << ", programName = " << programName_
         << ", moduleType = " << moduleType_
         << ((fd_ < 0) ? ", closed" : ", opened")
-#ifdef OHOS_BUILD_MMI_DEBUG
-        << ", clientFd = " << clientFd_
-#endif // OHOS_BUILD_MMI_DEBUG
         << ", uid = " << uid_
         << ", pid = " << pid_
         << ", tokenType = " << tokenType_
-- 
Gitee


From 30b3b15f65c2774042ba55e72e5a886ee000aa03 Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Fri, 21 Oct 2022 16:56:55 +0800
Subject: [PATCH 064/360] delete dinput code

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: Icbf51e309003edec7183be90de95e47748e91db7
---
 BUILD.gn                                      |   3 -
 frameworks/napi/distributed_input/BUILD.gn    |  57 ---
 .../include/js_input_dinput_context.h         |  60 ---
 .../include/js_input_dinput_manager.h         |  94 ----
 .../src/js_input_dinput_context.cpp           | 404 ------------------
 .../src/js_input_dinput_manager.cpp           | 247 -----------
 .../src/js_register_module.cpp                |  37 --
 multimodalinput_mini.gni                      |   2 -
 service/dinput/BUILD.gn                       |  75 ----
 .../include/call_dinput_death_recipient.h     |  37 --
 service/dinput/include/call_dinput_proxy.h    |  42 --
 service/dinput/include/call_dinput_service.h  |  50 ---
 service/dinput/include/call_dinput_stub.h     |  42 --
 service/dinput/include/dinput_callback.h      |  70 ---
 service/dinput/include/dinput_manager.h       |  73 ----
 service/dinput/include/i_call_dinput.h        |  46 --
 .../src/call_dinput_death_recipient.cpp       |  35 --
 service/dinput/src/call_dinput_proxy.cpp      | 144 -------
 service/dinput/src/call_dinput_service.cpp    | 102 -----
 service/dinput/src/call_dinput_stub.cpp       | 123 ------
 service/dinput/src/dinput_callback.cpp        |  67 ---
 service/dinput/src/dinput_manager.cpp         | 188 --------
 22 files changed, 1998 deletions(-)
 delete mode 100644 frameworks/napi/distributed_input/BUILD.gn
 delete mode 100644 frameworks/napi/distributed_input/include/js_input_dinput_context.h
 delete mode 100644 frameworks/napi/distributed_input/include/js_input_dinput_manager.h
 delete mode 100644 frameworks/napi/distributed_input/src/js_input_dinput_context.cpp
 delete mode 100644 frameworks/napi/distributed_input/src/js_input_dinput_manager.cpp
 delete mode 100644 frameworks/napi/distributed_input/src/js_register_module.cpp
 delete mode 100644 service/dinput/BUILD.gn
 delete mode 100644 service/dinput/include/call_dinput_death_recipient.h
 delete mode 100644 service/dinput/include/call_dinput_proxy.h
 delete mode 100644 service/dinput/include/call_dinput_service.h
 delete mode 100644 service/dinput/include/call_dinput_stub.h
 delete mode 100644 service/dinput/include/dinput_callback.h
 delete mode 100644 service/dinput/include/dinput_manager.h
 delete mode 100644 service/dinput/include/i_call_dinput.h
 delete mode 100644 service/dinput/src/call_dinput_death_recipient.cpp
 delete mode 100644 service/dinput/src/call_dinput_proxy.cpp
 delete mode 100644 service/dinput/src/call_dinput_service.cpp
 delete mode 100644 service/dinput/src/call_dinput_stub.cpp
 delete mode 100644 service/dinput/src/dinput_callback.cpp
 delete mode 100644 service/dinput/src/dinput_manager.cpp

diff --git a/BUILD.gn b/BUILD.gn
index 81dbdc4386..c538301543 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -84,9 +84,6 @@ group("input_jsapi_group") {
       "frameworks/napi/mouse_event:mouseevent",
       "frameworks/napi/touch_event:touchevent",
     ]
-    if (input_feature_distributed) {
-      deps += [ "frameworks/napi/distributed_input:distributedinput" ]
-    }
     if (input_feature_monitor) {
       deps += [ "frameworks/napi/input_monitor:inputmonitor" ]
     }
diff --git a/frameworks/napi/distributed_input/BUILD.gn b/frameworks/napi/distributed_input/BUILD.gn
deleted file mode 100644
index 63cea33fb9..0000000000
--- a/frameworks/napi/distributed_input/BUILD.gn
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (c) 2022 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
-
-if (input_feature_distributed) {
-  distributed_input_path = "${mmi_path}/frameworks/napi/distributed_input"
-  config("distributedinput_config") {
-    visibility = [ ":*" ]
-
-    include_dirs = [
-      "//foundation/multimodalinput/input/util/common/include",
-      "//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include",
-      "${distributed_input_path}/include",
-    ]
-  }
-
-  ohos_shared_library("distributedinput") {
-    sources = [
-      "src/js_input_dinput_context.cpp",
-      "src/js_input_dinput_manager.cpp",
-      "src/js_register_module.cpp",
-    ]
-
-    configs = [ ":distributedinput_config" ]
-
-    deps = [
-      "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
-      "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
-      "//foundation/multimodalinput/input/util:libmmi-util",
-      "//third_party/libuv:uv",
-    ]
-
-    external_deps = [
-      "c_utils:utils",
-      "drivers_interface_input:hdi_input",
-      "hiviewdfx_hilog_native:libhilog",
-      "ipc:ipc_core",
-      "napi:ace_napi",
-    ]
-
-    relative_install_dir = "module/multimodalinput"
-
-    part_name = "input"
-    subsystem_name = "multimodalinput"
-  }
-}
diff --git a/frameworks/napi/distributed_input/include/js_input_dinput_context.h b/frameworks/napi/distributed_input/include/js_input_dinput_context.h
deleted file mode 100644
index 4431691e05..0000000000
--- a/frameworks/napi/distributed_input/include/js_input_dinput_context.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef JS_INPUT_DINPUT_CONTEXT_H
-#define JS_INPUT_DINPUT_CONTEXT_H
-
-#include "js_input_dinput_manager.h"
-
-namespace OHOS {
-namespace MMI {
-class JsInputDinputContext {
-public:
-    JsInputDinputContext() = default;
-    ~JsInputDinputContext() = default;
-    static JsInputDinputContext* GetInstance(napi_env env);
-    static napi_value Export(napi_env env, napi_value exports);
-    static napi_value PrepareRemoteInput(napi_env env, napi_callback_info info);
-    static napi_value UnprepareRemoteInput(napi_env env, napi_callback_info info);
-    static napi_value StartRemoteInput(napi_env env, napi_callback_info info);
-    static napi_value StopRemoteInput(napi_env env, napi_callback_info info);
-    static napi_value GetRemoteInputAbility(napi_env env, napi_callback_info info);
-
-private:
-    static napi_value CreateInstance(napi_env env);
-    static napi_value JsConstructor(napi_env env, napi_callback_info info);
-    static napi_value Init(napi_env env, napi_value exports);
-    static napi_value InitInputAbilityTypeEnum(napi_env env, napi_value exports);
-    static napi_value EnumTypeConstructor(napi_env env, napi_callback_info info);
-
-    static napi_value GetParameter(napi_env env, napi_callback_info info, napi_ref &first);
-    static napi_value GetParameter(napi_env env, napi_callback_info info,
-        std::string &first, napi_ref &second);
-    static napi_value GetParameter(napi_env env, napi_callback_info info,
-        int32_t &first, int32_t &second, napi_ref &third);
-    static napi_value GetParameter(napi_env env, napi_callback_info info,
-        std::string &first, int32_t second, napi_ref &third);
-    static napi_value GetParameter(napi_env env, napi_callback_info info,
-        std::string &first, std::vector<uint32_t> &second, napi_ref &third);
-    static bool TypeOf(napi_env env, napi_value value, napi_valuetype type);
-    std::shared_ptr<JsInputDinputManager> GetJsInputDinputMgr() const;
-    std::shared_ptr<JsInputDinputManager> mgr_ { std::make_shared<JsInputDinputManager>() };
-    napi_ref contextRef_ { nullptr };
-    std::mutex mtx_;
-};
-} // namespace MMI
-} // namespace OHOS
-
-#endif // JS_INPUT_DEVICE_CONTEXT_H
\ No newline at end of file
diff --git a/frameworks/napi/distributed_input/include/js_input_dinput_manager.h b/frameworks/napi/distributed_input/include/js_input_dinput_manager.h
deleted file mode 100644
index d74f30778a..0000000000
--- a/frameworks/napi/distributed_input/include/js_input_dinput_manager.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef JS_INPUT_DINPUT_MANAGER_H
-#define JS_INPUT_DINPUT_MANAGER_H
-
-#include <memory>
-#include <set>
-#include <uv.h>
-
-#include "napi/native_api.h"
-#include "napi/native_node_api.h"
-#include "utils/log.h"
-
-#include "define_multimodal.h"
-#include "error_multimodal.h"
-#include "util_napi.h"
-
-#define PARAMERTER_NUM 1
-namespace OHOS {
-namespace MMI {
-enum InputAbilityType {
-    MOUSE = 1,
-    KEYBOARD = 2,
-    TOUCHPAD = 4,
-};
-template <class T>
-class CallbackInfo {
-public:
-    napi_env env { nullptr };
-    napi_ref ref { nullptr };
-    napi_async_work asyncWork { nullptr };
-    napi_deferred deferred { nullptr };
-    napi_value promise { nullptr };
-    int32_t mouseX { 0 };
-    int32_t mouseY { 0 };
-    T returnResult;
-};
-
-class JsInputDinputManager {
-public:
-    napi_value PrepareRemoteInput(napi_env env, const std::string& deviceId, napi_ref handle);
-    napi_value UnprepareRemoteInput(napi_env env, const std::string& deviceId, napi_ref handle);
-    napi_value StartRemoteInput(napi_env env, const std::string& deviceId,
-        const std::vector<uint32_t>& inputAbility, napi_ref handle);
-    napi_value StopRemoteInput(napi_env env, const std::string& deviceId,
-        const std::vector<uint32_t>& inputAbility, napi_ref handle);
-    napi_value GetRemoteInputAbility(napi_env env, const std::string& deviceId, napi_ref handle);
-public:
-    template <typename T>
-    CallbackInfo<T>* CreateCallbackInfo(napi_env env, napi_ref handle)
-    {
-        auto cb = new (std::nothrow) CallbackInfo<T>;
-        if (cb == nullptr) {
-            return nullptr;
-        }
-        cb->env = env;
-        if (handle == nullptr) {
-            if (napi_create_promise(env, &cb->deferred, &cb->promise) != napi_ok) {
-                delete cb;
-                cb = nullptr;
-                napi_throw_error(env, nullptr, "Failed to create promise");
-            }
-        } else {
-            cb->ref = handle;
-        }
-        return cb;
-    }
-
-private:
-    static void HandleCallBack(CallbackInfo<int32_t>* cb);
-    static void HandleCallBack(CallbackInfo<std::set<int32_t>>* cb);
-    static napi_value MakeInputAbilityObj(napi_env env, std::set<int32_t> types);
-    static uint32_t GetAbilityType(std::vector<uint32_t> abilities);
-
-    static void CallFunctionPromise(napi_env env, napi_deferred deferred, napi_value object);
-    static void CallFunctionAsync(napi_env env, napi_ref handleRef, size_t count, napi_value* object);
-    std::mutex cbMutex_;
-};
-} // namespace MMI
-} // namespace OHOS
-#endif // JS_INPUT_DINPUT_MANAGER_H
\ No newline at end of file
diff --git a/frameworks/napi/distributed_input/src/js_input_dinput_context.cpp b/frameworks/napi/distributed_input/src/js_input_dinput_context.cpp
deleted file mode 100644
index 0169621cab..0000000000
--- a/frameworks/napi/distributed_input/src/js_input_dinput_context.cpp
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "js_input_dinput_context.h"
-
-#include "napi_constants.h"
-#include "util_napi.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "JsInputDinputContext" };
-constexpr uint32_t ARGV_FIRST = 0;
-constexpr uint32_t ARGV_SECOND = 1;
-constexpr uint32_t ARGV_THIRD = 2;
-constexpr uint32_t ARGC_NUM_1 = 1;
-constexpr uint32_t ARGC_NUM_2 = 2;
-constexpr uint32_t ARGC_NUM_3 = 3;
-constexpr uint32_t INIT_REF_COUNT = 1;
-const std::string GET_GLOBLE = "napi_get_global";
-
-napi_ref inputAbilityTypeEnumConstructor_ = nullptr;
-} // namespace
-
-napi_value JsInputDinputContext::CreateInstance(napi_env env)
-{
-    CALL_LOG_ENTER;
-    napi_value global = nullptr;
-    CHKRP(env, napi_get_global(env, &global), GET_GLOBLE);
-    constexpr char className[] = "JsInputDinputContext";
-    napi_value jsClass = nullptr;
-    napi_property_descriptor desc[] = {};
-    napi_status status = napi_define_class(env, className, sizeof(className),
-        JsInputDinputContext::JsConstructor, nullptr, sizeof(desc) / sizeof(desc[0]), nullptr, &jsClass);
-    CHKRP(env, status, DEFINE_CLASS);
-    status = napi_set_named_property(env, global, "multimodalinput_input_dinput_class", jsClass);
-    CHKRP(env, status, SET_NAMED_PROPERTY);
-    napi_value jsInstance = nullptr;
-    CHKRP(env, napi_new_instance(env, jsClass, 0, nullptr, &jsInstance), NEW_INSTANCE);
-    CHKRP(env, napi_set_named_property(env, global, "multimodal_input_dinput", jsInstance), SET_NAMED_PROPERTY);
-
-    JsInputDinputContext *jsContext = nullptr;
-    status = napi_unwrap(env, jsInstance, (void**)&jsContext);
-    CHKPP(jsContext);
-    CHKRP(env, napi_create_reference(env, jsInstance, 1, &(jsContext->contextRef_)), CREATE_REFERENCE);
-    uint32_t refCount = 0;
-    CHKRP(env, napi_reference_ref(env, jsContext->contextRef_, &refCount), REFERENCE_REF);
-    return jsInstance;
-}
-
-napi_value JsInputDinputContext::JsConstructor(napi_env env, napi_callback_info info)
-{
-    CALL_LOG_ENTER;
-    napi_value thisVar = nullptr;
-    void *data = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, &data), GET_CB_INFO);
-    JsInputDinputContext *jsContext = new (std::nothrow) JsInputDinputContext();
-    CHKPP(jsContext);
-    CHKPP(data);
-    napi_status status = napi_wrap(env, thisVar, jsContext, [](napi_env env, void* data, void* hin) {
-        MMI_HILOGI("jsvm ends");
-        CHKPL(data);
-        auto context = static_cast<JsInputDinputContext*>(data);
-        delete context;
-    }, nullptr, nullptr);
-    if (status != napi_ok) {
-        delete jsContext;
-        THROWERR(env, "Failed to wrap native instance");
-        return nullptr;
-    }
-    return thisVar;
-}
-
-JsInputDinputContext* JsInputDinputContext::GetInstance(napi_env env)
-{
-    CALL_LOG_ENTER;
-    napi_value global = nullptr;
-    CHKRP(env, napi_get_global(env, &global), GET_GLOBLE);
-    bool result = false;
-    CHKRP(env, napi_has_named_property(env, global, "multimodal_input_dinput", &result), HAS_NAMED_PROPERTY);
-    napi_value object = nullptr;
-    CHKRP(env, napi_get_named_property(env, global, "multimodal_input_dinput", &object), SET_NAMED_PROPERTY);
-    if (object == nullptr) {
-        THROWERR(env, "object is nullptr");
-        return nullptr;
-    }
-    JsInputDinputContext *instance = nullptr;
-    CHKRP(env, napi_unwrap(env, object, (void**)&instance), UNWRAP);
-    if (instance == nullptr) {
-        THROWERR(env, "instance is nullptr");
-        return nullptr;
-    }
-    return instance;
-}
-
-std::shared_ptr<JsInputDinputManager> JsInputDinputContext::GetJsInputDinputMgr() const
-{
-    return mgr_;
-}
-
-napi_value JsInputDinputContext::PrepareRemoteInput(napi_env env, napi_callback_info info)
-{
-    CALL_LOG_ENTER;
-    std::string deviceId;
-    napi_ref callBackRef = nullptr;
-    if (GetParameter(env, info, deviceId, callBackRef) != nullptr) {
-        JsInputDinputContext *jsContext = JsInputDinputContext::GetInstance(env);
-        CHKPP(jsContext);
-        auto jsInputDinputMgr = jsContext->GetJsInputDinputMgr();
-        CHKPP(jsInputDinputMgr);
-        return jsInputDinputMgr->PrepareRemoteInput(env, deviceId, callBackRef);
-    }
-    return nullptr;
-}
-
-napi_value JsInputDinputContext::UnprepareRemoteInput(napi_env env, napi_callback_info info)
-{
-    CALL_LOG_ENTER;
-    std::string deviceId;
-    napi_ref callBackRef = nullptr;
-    if (GetParameter(env, info, deviceId, callBackRef) != nullptr) {
-        JsInputDinputContext *jsContext = JsInputDinputContext::GetInstance(env);
-        CHKPP(jsContext);
-        auto jsInputDinputMgr = jsContext->GetJsInputDinputMgr();
-        CHKPP(jsInputDinputMgr);
-        return jsInputDinputMgr->UnprepareRemoteInput(env, deviceId, callBackRef);
-    }
-    return nullptr;
-}
-
-napi_value JsInputDinputContext::StartRemoteInput(napi_env env, napi_callback_info info)
-{
-    CALL_LOG_ENTER;
-    std::string deviceId;
-    std::vector<uint32_t> inputAbility;
-    napi_ref callBackRef = nullptr;
-    if (GetParameter(env, info, deviceId, inputAbility, callBackRef) != nullptr) {
-        JsInputDinputContext *jsContext = JsInputDinputContext::GetInstance(env);
-        CHKPP(jsContext);
-        auto jsInputDinputMgr = jsContext->GetJsInputDinputMgr();
-        CHKPP(jsInputDinputMgr);
-        return jsInputDinputMgr->StartRemoteInput(env, deviceId, inputAbility, callBackRef);
-    }
-    return nullptr;
-}
-
-napi_value JsInputDinputContext::StopRemoteInput(napi_env env, napi_callback_info info)
-{
-    CALL_LOG_ENTER;
-    std::string deviceId;
-    std::vector<uint32_t> inputAbility;
-    napi_ref callBackRef = nullptr;
-    if (GetParameter(env, info, deviceId, inputAbility, callBackRef) != nullptr) {
-        JsInputDinputContext *jsContext = JsInputDinputContext::GetInstance(env);
-        CHKPP(jsContext);
-        auto jsInputDinputMgr = jsContext->GetJsInputDinputMgr();
-        CHKPP(jsInputDinputMgr);
-        return jsInputDinputMgr->StopRemoteInput(env, deviceId, inputAbility, callBackRef);
-    }
-    return nullptr;
-}
-
-napi_value JsInputDinputContext::GetRemoteInputAbility(napi_env env, napi_callback_info info)
-{
-    CALL_LOG_ENTER;
-    std::string deviceId;
-    napi_ref callBackRef = nullptr;
-    if (GetParameter(env, info, deviceId, callBackRef) != nullptr) {
-        JsInputDinputContext *jsContext = JsInputDinputContext::GetInstance(env);
-        CHKPP(jsContext);
-        auto jsInputDinputMgr = jsContext->GetJsInputDinputMgr();
-        CHKPP(jsInputDinputMgr);
-        return jsInputDinputMgr->GetRemoteInputAbility(env, deviceId, callBackRef);
-    }
-    return nullptr;
-}
-
-napi_value JsInputDinputContext::GetParameter(napi_env env, napi_callback_info info, napi_ref &first)
-{
-    CALL_LOG_ENTER;
-    size_t argc = ARGC_NUM_1;
-    napi_value argv[ARGC_NUM_1];
-    napi_value ret = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
-    CHKRP(env, napi_create_int32(env, argc, &ret), CREATE_INT32);
-    if (argc > ARGC_NUM_1) {
-        THROWERR(env, "parameters count error");
-        return nullptr;
-    }
-    if (argc == 0) {
-        first = nullptr;
-        return ret;
-    }
-    if (!TypeOf(env, argv[ARGV_FIRST], napi_function)) {
-        THROWERR(env, "The first parameter type is incorrect");
-        return nullptr;
-    }
-    CHKRP(env, napi_create_reference(env, argv[ARGV_FIRST], INIT_REF_COUNT, &first), CREATE_REFERENCE);
-    return ret;
-}
-
-napi_value JsInputDinputContext::GetParameter(napi_env env, napi_callback_info info,
-    std::string &first, napi_ref &second)
-{
-    CALL_LOG_ENTER;
-    size_t argc = ARGC_NUM_2;
-    napi_value argv[ARGC_NUM_2];
-    napi_value ret = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
-    CHKRP(env, napi_create_int32(env, argc, &ret), CREATE_INT32);
-    if (argc > ARGC_NUM_2 || argc < ARGC_NUM_1) {
-        THROWERR(env, "parameters count error");
-        return nullptr;
-    }
-    if (!TypeOf(env, argv[ARGV_FIRST], napi_string)) {
-        THROWERR(env, "The first parameter type is incorrect");
-        return nullptr;
-    }
-    char deviceId[MAX_STRING_LEN] = { 0 };
-    size_t typeLen = 0;
-    CHKRP(env, napi_get_value_string_utf8(env, argv[ARGV_FIRST], deviceId,
-        MAX_STRING_LEN - 1, &typeLen), GET_STRING_UTF8);
-    first = deviceId;
-    if (argc == ARGC_NUM_1) {
-        second = nullptr;
-        return ret;
-    }
-    if (!TypeOf(env, argv[ARGV_SECOND], napi_function)) {
-        THROWERR(env, "The second parameter type is incorrect");
-        return nullptr;
-    }
-    CHKRP(env, napi_create_reference(env, argv[ARGV_SECOND], INIT_REF_COUNT, &second), CREATE_REFERENCE);
-    return ret;
-}
-
-napi_value JsInputDinputContext::GetParameter(napi_env env, napi_callback_info info,
-    int32_t &first, int32_t &second, napi_ref &third)
-{
-    CALL_LOG_ENTER;
-    size_t argc = ARGC_NUM_3;
-    napi_value argv[ARGC_NUM_3];
-    napi_value ret = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
-    CHKRP(env, napi_create_int32(env, argc, &ret), CREATE_INT32);
-    if (argc > ARGC_NUM_3 || argc < ARGC_NUM_2) {
-        THROWERR(env, "parameters count error");
-        return nullptr;
-    }
-    if (!TypeOf(env, argv[ARGV_FIRST], napi_number)) {
-        THROWERR(env, "The first parameter type is incorrect");
-        return nullptr;
-    }
-    if (!TypeOf(env, argv[ARGV_SECOND], napi_number)) {
-        THROWERR(env, "The second parameter type is incorrect");
-        return nullptr;
-    }
-    napi_get_value_int32(env, argv[ARGV_FIRST], &first);
-    napi_get_value_int32(env, argv[ARGV_SECOND], &second);
-    if (argc == ARGC_NUM_2) {
-        third = nullptr;
-        return ret;
-    }
-    if (!TypeOf(env, argv[ARGV_THIRD], napi_function)) {
-        THROWERR(env, "The third parameter type is incorrect");
-        return nullptr;
-    }
-    CHKRP(env, napi_create_reference(env, argv[ARGV_THIRD], INIT_REF_COUNT, &third), CREATE_REFERENCE);
-    return ret;
-}
-
-napi_value JsInputDinputContext::GetParameter(napi_env env, napi_callback_info info,
-    std::string &first, std::vector<uint32_t> &second, napi_ref &third)
-{
-    CALL_LOG_ENTER;
-    size_t argc = ARGC_NUM_3;
-    napi_value argv[ARGC_NUM_3];
-    napi_value ret = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
-    CHKRP(env, napi_create_int32(env, argc, &ret), CREATE_INT32);
-    if (argc > ARGC_NUM_3 || argc < ARGC_NUM_2) {
-        THROWERR(env, "parameters count error");
-        return nullptr;
-    }
-    if (!TypeOf(env, argv[ARGV_FIRST], napi_string)) {
-        THROWERR(env, "The first parameter type is incorrect");
-        return nullptr;
-    }
-    char deviceId[MAX_STRING_LEN] = { 0 };
-    size_t typeLen = 0;
-    CHKRP(env, napi_get_value_string_utf8(env, argv[ARGV_FIRST], deviceId,
-        MAX_STRING_LEN - 1, &typeLen), GET_STRING_UTF8);
-    first = deviceId;
-
-    uint32_t arrayLength = 0;
-    CHKRP(env, napi_get_array_length(env, argv[ARGV_SECOND], &arrayLength), GET_ARRAY_LENGTH);
-    if (arrayLength <= 0) {
-        THROWERR(env, "length is incorrect");
-        return nullptr;
-    }
-    for (size_t i = 0; i < arrayLength; i++) {
-        napi_value inputAbility = nullptr;
-        CHKRP(env, napi_get_element(env, argv[ARGV_SECOND], i, &inputAbility), GET_ELEMENT);
-        if (!TypeOf(env, inputAbility, napi_number)) {
-            THROWERR(env, "The numeric parameter type is incorrect");
-            return nullptr;
-        }
-        int32_t value0 = 0;
-        CHKRP(env, napi_get_value_int32(env, inputAbility, &value0), GET_INT32);
-        second.push_back(value0);
-    }
-    if (argc == ARGC_NUM_2) {
-        third = nullptr;
-        return ret;
-    }
-    if (!TypeOf(env, argv[ARGV_THIRD], napi_function)) {
-        THROWERR(env, "The function parameter type is incorrect");
-        return nullptr;
-    }
-    CHKRP(env, napi_create_reference(env, argv[ARGV_THIRD], INIT_REF_COUNT, &third), CREATE_REFERENCE);
-    return ret;
-}
-
-bool JsInputDinputContext::TypeOf(napi_env env, napi_value value, napi_valuetype type)
-{
-    napi_valuetype valueType = napi_undefined;
-    CHKRF(env, napi_typeof(env, value, &valueType), TYPEOF);
-    return valueType == type;
-}
-
-napi_value JsInputDinputContext::EnumTypeConstructor(napi_env env, napi_callback_info info)
-{
-    size_t argc = 0;
-    napi_value args[ARGC_NUM_1] = { 0 };
-    napi_value res = nullptr;
-    void *data = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, &argc, args, &res, &data), GET_CB_INFO);
-    MMI_HILOGD("Constructed successfully");
-    return res;
-}
-
-napi_value JsInputDinputContext::Init(napi_env env, napi_value exports)
-{
-    CALL_LOG_ENTER;
-    auto instance = CreateInstance(env);
-    if (instance == nullptr) {
-        napi_throw_error(env, nullptr, "JsInputDeviceContext: failed to create instance");
-        MMI_HILOGW("Failed to create instance");
-        return nullptr;
-    }
-    napi_property_descriptor desc[] = {
-        DECLARE_NAPI_FUNCTION("prepareRemoteInput", PrepareRemoteInput),
-        DECLARE_NAPI_FUNCTION("unprepareRemoteInput", UnprepareRemoteInput),
-        DECLARE_NAPI_FUNCTION("startRemoteInput", StartRemoteInput),
-        DECLARE_NAPI_FUNCTION("stopRemoteInput", StopRemoteInput),
-        DECLARE_NAPI_FUNCTION("getRemoteInputAbility", GetRemoteInputAbility),
-    };
-    NAPI_CALL(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc));
-    return exports;
-}
-
-napi_value JsInputDinputContext::InitInputAbilityTypeEnum(napi_env env, napi_value exports)
-{
-    napi_value mouse;
-    napi_value keyboard;
-    napi_value touchpad;
-
-    int32_t refCount = 1;
-    napi_create_uint32(env, static_cast<uint32_t>(InputAbilityType::MOUSE), &mouse);
-    napi_create_uint32(env, static_cast<uint32_t>(InputAbilityType::KEYBOARD), &keyboard);
-    napi_create_uint32(env, static_cast<uint32_t>(InputAbilityType::TOUCHPAD), &touchpad);
-    napi_property_descriptor desc[] = {
-        DECLARE_NAPI_STATIC_PROPERTY("MOUSE", mouse),
-        DECLARE_NAPI_STATIC_PROPERTY("KEYBOARD", keyboard),
-        DECLARE_NAPI_STATIC_PROPERTY("TOUCHPAD", touchpad),
-    };
-
-    napi_value result = nullptr;
-    napi_define_class(env, "InputAbilityType", NAPI_AUTO_LENGTH, EnumTypeConstructor,
-        nullptr, sizeof(desc) / sizeof(*desc), desc, &result);
-    napi_create_reference(env, result, refCount, &inputAbilityTypeEnumConstructor_);
-    napi_set_named_property(env, exports, "InputAbilityType", result);
-    return exports;
-}
-
-napi_value JsInputDinputContext::Export(napi_env env, napi_value exports)
-{
-    JsInputDinputContext::Init(env, exports);
-    JsInputDinputContext::InitInputAbilityTypeEnum(env, exports);
-    return exports;
-}
-} // namespace MMI
-} // namespace OHOS
\ No newline at end of file
diff --git a/frameworks/napi/distributed_input/src/js_input_dinput_manager.cpp b/frameworks/napi/distributed_input/src/js_input_dinput_manager.cpp
deleted file mode 100644
index 360366a9f6..0000000000
--- a/frameworks/napi/distributed_input/src/js_input_dinput_manager.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "js_input_dinput_manager.h"
-
-#include <map>
-
-#include "input_manager.h"
-#include "napi_constants.h"
-#include "util_napi.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "JsInputDinputManager" };
-const std::string DELETE_ASYNC_WORK = "napi_delete_async_work";
-const std::string CREATE_STRING_LATIN = "napi_create_string_latin1";
-
-std::mutex mutex_;
-
-std::map<int32_t, int32_t> deviceTypeMap = {
-    {InputAbilityType::KEYBOARD, EVDEV_UDEV_TAG_KEYBOARD},
-    {InputAbilityType::MOUSE, EVDEV_UDEV_TAG_MOUSE},
-    {InputAbilityType::TOUCHPAD, EVDEV_UDEV_TAG_TOUCHPAD},
-};
-}
-
-napi_value JsInputDinputManager::PrepareRemoteInput(napi_env env, const std::string& deviceId, napi_ref handle)
-{
-    CALL_LOG_ENTER;
-    CHKPP(handle);
-    auto cb = CreateCallbackInfo<int32_t>(env, handle);
-    CHKPP(cb);
-    InputManager::GetInstance()->PrepareRemoteInput(deviceId, [cb](int32_t returnResult) {
-        CHKPL(cb);
-        cb->returnResult = returnResult;
-        JsInputDinputManager::HandleCallBack(cb);
-    });
-    return cb->promise;
-}
-
-napi_value JsInputDinputManager::UnprepareRemoteInput(napi_env env, const std::string& deviceId, napi_ref handle)
-{
-    CALL_LOG_ENTER;
-    CHKPP(handle);
-    auto cb = CreateCallbackInfo<int32_t>(env, handle);
-    CHKPP(cb);
-    InputManager::GetInstance()->UnprepareRemoteInput(deviceId, [cb](int32_t returnResult) {
-        CHKPL(cb);
-        cb->returnResult = returnResult;
-        JsInputDinputManager::HandleCallBack(cb);
-    });
-    CHKPP(handle);
-    return cb->promise;
-}
-
-napi_value JsInputDinputManager::StartRemoteInput(napi_env env, const std::string& deviceId,
-    const std::vector<uint32_t>& inputAbility, napi_ref handle)
-{
-    CALL_LOG_ENTER;
-    CHKPP(handle);
-    auto cb = CreateCallbackInfo<int32_t>(env, handle);
-    uint32_t ability = GetAbilityType(inputAbility);
-    CHKPP(cb);
-    InputManager::GetInstance()->StartRemoteInput(deviceId, ability, [cb](int32_t returnResult) {
-        CHKPL(cb);
-        cb->returnResult = returnResult;
-        JsInputDinputManager::HandleCallBack(cb);
-    });
-    CHKPP(handle);
-    return cb->promise;
-}
-
-napi_value JsInputDinputManager::StopRemoteInput(napi_env env, const std::string& deviceId,
-    const std::vector<uint32_t>& inputAbility, napi_ref handle)
-{
-    CALL_LOG_ENTER;
-    CHKPP(handle);
-    auto cb = CreateCallbackInfo<int32_t>(env, handle);
-    uint32_t ability = GetAbilityType(inputAbility);
-    CHKPP(cb);
-    InputManager::GetInstance()->StopRemoteInput(deviceId, ability, [cb](int32_t returnResult) {
-        CHKPL(cb);
-        cb->returnResult = returnResult;
-        JsInputDinputManager::HandleCallBack(cb);
-    });
-    CHKPP(handle);
-    return cb->promise;
-}
-
-napi_value JsInputDinputManager::GetRemoteInputAbility(napi_env env, const std::string& deviceId, napi_ref handle)
-{
-    CALL_LOG_ENTER;
-    CHKPP(handle);
-    auto cb = CreateCallbackInfo<std::set<int32_t>>(env, handle);
-    CHKPP(cb);
-    InputManager::GetInstance()->GetRemoteInputAbility(deviceId, [cb](std::set<int32_t> returnResult) {
-        CHKPL(cb);
-        cb->returnResult = returnResult;
-        JsInputDinputManager::HandleCallBack(cb);
-    });
-    CHKPP(handle);
-    return cb->promise;
-}
-
-uint32_t JsInputDinputManager::GetAbilityType(std::vector<uint32_t> abilities)
-{
-    CALL_LOG_ENTER;
-    uint32_t inputAbility = 0;
-    for (const auto &item : abilities) {
-        inputAbility |= item;
-    }
-    return inputAbility & (InputAbilityType::MOUSE | InputAbilityType::KEYBOARD);
-}
-
-void JsInputDinputManager::HandleCallBack(CallbackInfo<int32_t>* cb)
-{
-    CALL_LOG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    napi_value resourceName = nullptr;
-    CHKPV(cb);
-    CHKRV(cb->env, napi_create_string_latin1(cb->env, "HandleCallBack", NAPI_AUTO_LENGTH, &resourceName),
-        CREATE_STRING_LATIN);
-    napi_status retStatus = napi_create_async_work(
-        cb->env, nullptr, resourceName,
-        [](napi_env env, void *data) {},
-        [](napi_env env, napi_status status, void *data) {
-            (void)status;
-            auto cbInfo = static_cast<CallbackInfo<int32_t>*>(data);
-            napi_value resultObj[1] = { 0 };
-            if (cbInfo->returnResult == RET_OK) {
-               napi_get_undefined(cbInfo->env, &resultObj[0]);
-            } else {
-                napi_value result = nullptr;
-                CHKRV(env, napi_create_int32(cbInfo->env, cbInfo->returnResult, &result), CREATE_INT32);
-                CHKRV(env, napi_create_object(cbInfo->env, &resultObj[0]), CREATE_OBJECT);
-                CHKRV(env, napi_set_named_property(cbInfo->env, resultObj[0], "code",
-                    result), SET_NAMED_PROPERTY);
-            }
-            if (cbInfo->promise != nullptr) {
-                CallFunctionPromise(cbInfo->env, cbInfo->deferred, resultObj[0]);
-            } else if (cbInfo->ref != nullptr) {
-                CallFunctionAsync(cbInfo->env, cbInfo->ref, PARAMERTER_NUM, &resultObj[0]);
-            }
-            MMI_HILOGD("async_work end");
-            CHKRV(env, napi_delete_reference(env, cbInfo->ref), DELETE_REFERENCE);
-            CHKRV(env, napi_delete_async_work(env, cbInfo->asyncWork), DELETE_ASYNC_WORK);
-            delete cbInfo;
-        }, (void *)cb, &cb->asyncWork);
-    if (retStatus != napi_ok) {
-        MMI_HILOGE("Create async work failed");
-    }
-    napi_queue_async_work(cb->env, cb->asyncWork);
-}
-
-void JsInputDinputManager::HandleCallBack(CallbackInfo<std::set<int32_t>>* cb)
-{
-    CALL_LOG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    napi_value resourceName = nullptr;
-    CHKPV(cb);
-    CHKRV(cb->env, napi_create_string_latin1(cb->env, "HandleCallBack", NAPI_AUTO_LENGTH, &resourceName),
-        CREATE_STRING_LATIN);
-    napi_status retStatus = napi_create_async_work(
-        cb->env, nullptr, resourceName,
-        [](napi_env env, void *data) {},
-        [](napi_env env, napi_status status, void *data) {
-            (void)status;
-            auto cbInfo = static_cast<CallbackInfo<std::set<int32_t>>*>(data);
-            napi_value resultObj[2] = {};
-            napi_get_undefined(cbInfo->env, &resultObj[0]);
-            resultObj[1] = MakeInputAbilityObj(cbInfo->env, cbInfo->returnResult);
-            CHKPV(resultObj);
-            if (cbInfo->promise != nullptr) {
-                CallFunctionPromise(cbInfo->env, cbInfo->deferred, resultObj[1]);
-            } else if (cbInfo->ref != nullptr) {
-                CallFunctionAsync(cbInfo->env, cbInfo->ref, (PARAMERTER_NUM + 1), &resultObj[0]);
-            }
-            MMI_HILOGD("async_work end");
-            CHKRV(env, napi_delete_reference(env, cbInfo->ref), DELETE_REFERENCE);
-            CHKRV(env, napi_delete_async_work(env, cbInfo->asyncWork), DELETE_ASYNC_WORK);
-            delete cbInfo;
-        }, (void *)cb, &cb->asyncWork);
-    if (retStatus != napi_ok) {
-        MMI_HILOGE("Create async work failed");
-    }
-    napi_queue_async_work(cb->env, cb->asyncWork);
-}
-
-napi_value JsInputDinputManager::MakeInputAbilityObj(napi_env env, std::set<int32_t> types)
-{
-    napi_value returnResult = nullptr;
-    napi_value resultArry = nullptr;
-    int32_t i = 0;
-    CHKRP(env, napi_create_array(env, &resultArry), CREATE_ARRAY);
-    for (const auto &deviceType : types) {
-        MMI_HILOGD("deviceType:%{public}d", deviceType);
-        for (const auto &item : deviceTypeMap) {
-            MMI_HILOGD("deviceType:%{public}d, item.second:%{public}d", deviceType, item.second);
-            if (deviceType & item.second) {
-                CHKRP(env, napi_create_int32(env, item.first, &returnResult), CREATE_INT32);
-                CHKRP(env, napi_set_element(env, resultArry, i++, returnResult), SET_ELEMENT);
-                break;
-            }
-        }
-    }
-    napi_value resultObj;
-    CHKRP(env, napi_create_object(env, &resultObj), CREATE_OBJECT);
-    CHKRP(env, napi_set_named_property(env, resultObj, "inputAbility", resultArry), SET_NAMED_PROPERTY);
-    return resultObj;
-}
-
-void JsInputDinputManager::CallFunctionPromise(napi_env env, napi_deferred deferred, napi_value object)
-{
-    CALL_LOG_ENTER;
-    CHKRV(env, napi_resolve_deferred(env, deferred, object), RESOLVE_DEFERRED);
-}
-
-void JsInputDinputManager::CallFunctionAsync(napi_env env, napi_ref handleRef, size_t count, napi_value* object)
-{
-    CALL_LOG_ENTER;
-    napi_value handler = nullptr;
-    CHKRV(env, napi_get_reference_value(env, handleRef, &handler), GET_REFERENCE);
-    napi_value result = nullptr;
-    if (handler != nullptr) {
-        CHKRV(env, napi_call_function(env, nullptr, handler, count, object, &result), CALL_FUNCTION);
-    } else {
-        MMI_HILOGE("The handler is nullptr");
-    }
-    uint32_t refCount = 0;
-    CHKRV(env, napi_reference_unref(env, handleRef, &refCount), REFERENCE_UNREF);
-}
-} // namespace MMI
-} // namespace OHOS
\ No newline at end of file
diff --git a/frameworks/napi/distributed_input/src/js_register_module.cpp b/frameworks/napi/distributed_input/src/js_register_module.cpp
deleted file mode 100644
index 557cc59e3a..0000000000
--- a/frameworks/napi/distributed_input/src/js_register_module.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <cinttypes>
-
-#include "js_input_dinput_context.h"
-
-namespace OHOS {
-namespace MMI {
-static napi_module mmiInputDInputModule = {
-    .nm_version = 1,
-    .nm_flags = 0,
-    .nm_filename = nullptr,
-    .nm_register_func = JsInputDinputContext::Export,
-    .nm_modname = "multimodalInput.distributedInput",
-    .nm_priv = ((void*)0),
-    .reserved = { 0 },
-};
-
-extern "C" __attribute__((constructor)) void RegisterModule(void)
-{
-    napi_module_register(&mmiInputDInputModule);
-}
-}
-}
diff --git a/multimodalinput_mini.gni b/multimodalinput_mini.gni
index 643d2bbf75..89a735ca67 100644
--- a/multimodalinput_mini.gni
+++ b/multimodalinput_mini.gni
@@ -16,7 +16,6 @@ import("//build/ohos.gni")
 mmi_path = "//foundation/multimodalinput/input"
 ability_runtime_path = "//foundation/ability/ability_runtime"
 ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits"
-input_feature_distributed = false
 
 declare_args() {
   resource_schedule_service_enabled = false
@@ -45,7 +44,6 @@ print("input_feature_combination_key = ${input_feature_combination_key}")
 print("input_feature_pointer_drawing = ${input_feature_pointer_drawing}")
 print("input_feature_monitor = ${input_feature_monitor}")
 print("input_feature_interceptor = ${input_feature_interceptor}")
-print("input_feature_distributed = ${input_feature_distributed}")
 print("input_feature_keyboard = ${input_feature_keyboard}")
 print("input_feature_mouse = ${input_feature_mouse}")
 print("input_feature_joystick = ${input_feature_joystick}")
diff --git a/service/dinput/BUILD.gn b/service/dinput/BUILD.gn
deleted file mode 100644
index 4363d91e62..0000000000
--- a/service/dinput/BUILD.gn
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright (c) 2021-2022 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
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build/ohos.gni")
-import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
-dinput_path = "${mmi_path}/service/dinput"
-
-config("mmi_dinput_config") {
-  include_dirs = [
-    "//foundation/multimodalinput/input/common/include",
-    "//foundation/multimodalinput/input/interfaces/native/innerkits/common/include",
-    "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
-    "//foundation/multimodalinput/input/util/common/include",
-    "${dinput_path}/include",
-  ]
-
-  if (input_feature_distributed) {
-    include_dirs += [
-      "//foundation/distributedhardware/distributed_input/common/include",
-      "//foundation/distributedhardware/distributed_input/frameworks/include",
-      "//foundation/distributedhardware/distributed_input/interfaces/ipc/include",
-    ]
-  }
-}
-if (input_feature_distributed) {
-  ohos_source_set("mmi_dinput_service") {
-    sources = [
-      "${dinput_path}/src/call_dinput_service.cpp",
-      "${dinput_path}/src/call_dinput_stub.cpp",
-    ]
-
-    public_configs = [ ":mmi_dinput_config" ]
-
-    configs = [ ":mmi_dinput_config" ]
-
-    defines = [ "OHOS_DISTRIBUTED_INPUT_MODEL" ]
-
-    external_deps = [
-      "hiviewdfx_hilog_native:libhilog",
-      "ipc:ipc_core",
-      "safwk:system_ability_fwk",
-    ]
-
-    if (input_feature_distributed) {
-      external_deps += [ "distributed_input:libdinput_sdk" ]
-    }
-  }
-  ohos_source_set("mmi_dinput_proxy") {
-    sources = [
-      "${dinput_path}/src/call_dinput_death_recipient.cpp",
-      "${dinput_path}/src/call_dinput_proxy.cpp",
-    ]
-
-    public_configs = [ ":mmi_dinput_config" ]
-
-    configs = [ ":mmi_dinput_config" ]
-
-    defines = [ "OHOS_DISTRIBUTED_INPUT_MODEL" ]
-    external_deps = [
-      "hiviewdfx_hilog_native:libhilog",
-      "ipc:ipc_core",
-      "safwk:system_ability_fwk",
-    ]
-  }
-}
diff --git a/service/dinput/include/call_dinput_death_recipient.h b/service/dinput/include/call_dinput_death_recipient.h
deleted file mode 100644
index fb6035d5bb..0000000000
--- a/service/dinput/include/call_dinput_death_recipient.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef CALL_DINPUT_DEATH_RECIPIENT_H
-#define CALL_DINPUT_DEATH_RECIPIENT_H
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-
-#include "iremote_broker.h"
-
-namespace OHOS {
-namespace MMI {
-class CALLDinputDeathRecipient : public IRemoteObject::DeathRecipient {
-public:
-    explicit CALLDinputDeathRecipient(const std::function<void(const wptr<IRemoteObject> &object)>
-                                                  &deathCallback);
-    ~CALLDinputDeathRecipient() = default;
-    void OnRemoteDied(const wptr<IRemoteObject> &object) override;
-
-private:
-    std::function<void(const wptr<IRemoteObject> &object)> deathCallback_ { nullptr };
-};
-} // namespace MMI
-} // namespace OHOS
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
-#endif // REMOTE_INPUT_ABILITY_DEATH_RECIPIENT_H
diff --git a/service/dinput/include/call_dinput_proxy.h b/service/dinput/include/call_dinput_proxy.h
deleted file mode 100644
index dccc3816b2..0000000000
--- a/service/dinput/include/call_dinput_proxy.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef CALL_DINPUT_PROXY_H
-#define CALL_DINPUT_PROXY_H
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-
-#include "iremote_object.h"
-#include "iremote_proxy.h"
-
-#include "i_call_dinput.h"
-
-namespace OHOS {
-namespace MMI {
-class CallDinputProxy final : public IRemoteProxy<ICallDinput> {
-public:
-    explicit CallDinputProxy(const sptr<IRemoteObject> &impl) {}
-    ~CallDinputProxy() = default;
-    int32_t HandlePrepareDinput(const std::string &deviceId, int32_t status) override;
-    int32_t HandleUnprepareDinput(const std::string &deviceId, int32_t status) override;
-    int32_t HandleStartDinput(const std::string &deviceId, uint32_t inputTypes, int32_t status) override;
-    int32_t HandleStopDinput(const std::string &deviceId, uint32_t inputTypes, int32_t status) override;
-    int32_t HandleRemoteInputAbility(const std::set<int32_t> &remoteInputAbility) override;
-private:
-    static BrokerDelegator<CallDinputProxy> delegator_;
-};
-} // namespace MMI
-} // namespace OHOS
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
-#endif // CALL_DINPUT_PROXY_H
diff --git a/service/dinput/include/call_dinput_service.h b/service/dinput/include/call_dinput_service.h
deleted file mode 100644
index 60065d71cf..0000000000
--- a/service/dinput/include/call_dinput_service.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef CALL_DINPUT_SERVICE_H
-#define CALL_DINPUT_SERVICE_H
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-
-#include "iremote_object.h"
-
-#include "call_dinput_stub.h"
-
-namespace OHOS {
-namespace MMI {
-class CallDinputService final : public CallDinputStub {
-public:
-    CallDinputService() = default;
-    ~CallDinputService() = default;
-    int32_t HandlePrepareDinput(const std::string& deviceId, int32_t status) override;
-    int32_t HandleUnprepareDinput(const std::string& deviceId, int32_t status) override;
-    int32_t HandleStartDinput(const std::string& deviceId, uint32_t inputTypes, int32_t status) override;
-    int32_t HandleStopDinput(const std::string& deviceId, uint32_t inputTypes, int32_t status) override;
-    int32_t HandleRemoteInputAbility(const std::set<int32_t>& remoteInputAbility) override;
-    void SetPrepareCallback(const std::function<void(int32_t)>& callback);
-    void SetUnprepareCallback(const std::function<void(int32_t)>& callback);
-    void SetStartCallback(const std::function<void(int32_t)>& callback);
-    void SetStopCallback(const std::function<void(int32_t)>& callback);
-    void SetRemoteAbilityCallback(std::function<void(std::set<int32_t>)>& callback);
-private:
-    std::function<void(int32_t)> prepareCallback_ { nullptr };
-    std::function<void(int32_t)> unprepareCallback_ { nullptr };
-    std::function<void(int32_t)> startCallback_ { nullptr };
-    std::function<void(int32_t)> stopCallback_ { nullptr };
-    std::function<void(std::set<int32_t>)> remoteAbilityCallback_ { nullptr };
-};
-} // namespace MMI
-} // namespace OHOS
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
-#endif // CALL_DINPUT_SERVICE_H
diff --git a/service/dinput/include/call_dinput_stub.h b/service/dinput/include/call_dinput_stub.h
deleted file mode 100644
index f906129dd2..0000000000
--- a/service/dinput/include/call_dinput_stub.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef CALL_DINPUT_STUB_H
-#define CALL_DINPUT_STUB_H
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-
-#include "iremote_stub.h"
-
-#include "i_call_dinput.h"
-#include "message_parcel.h"
-
-namespace OHOS {
-namespace MMI {
-class CallDinputStub : public IRemoteStub<ICallDinput> {
-public:
-    CallDinputStub() = default;
-    ~CallDinputStub() = default;
-    int32_t OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& options) override;
-protected:
-    int32_t StubHandlePrepareDinput(MessageParcel& data, MessageParcel& reply);
-    int32_t StubHandleUnprepareDinput(MessageParcel& data, MessageParcel& reply);
-    int32_t StubHandleStartDinput(MessageParcel& data, MessageParcel& reply);
-    int32_t StubHandleStopDinput(MessageParcel& data, MessageParcel& reply);
-    int32_t StubHandleRemoteInputAbility(MessageParcel& data, MessageParcel& reply);
-};
-} // namespace MMI
-} // namespace OHOS
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
-#endif // CALL_DINPUT_STUB_H
diff --git a/service/dinput/include/dinput_callback.h b/service/dinput/include/dinput_callback.h
deleted file mode 100644
index 2c55624007..0000000000
--- a/service/dinput/include/dinput_callback.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DINPUT_CALLBACK_H
-#define DINPUT_CALLBACK_H
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-
-#include <string>
-#include <vector>
-
-#include "prepare_d_input_call_back_stub.h"
-#include "start_d_input_call_back_stub.h"
-#include "stop_d_input_call_back_stub.h"
-#include "unprepare_d_input_call_back_stub.h"
-
-#include "i_call_dinput.h"
-
-namespace OHOS {
-namespace MMI {
-class PrepareDInputCallback : public OHOS::DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
-public:
-    explicit PrepareDInputCallback(sptr<ICallDinput> prepareDinput) : callback_(prepareDinput) {}
-    ~PrepareDInputCallback() = default;
-    void OnResult(const std::string& deviceId, const int32_t& status) override;
-private:
-    sptr<ICallDinput> callback_ { nullptr };
-};
-
-class StartDInputCallback : public OHOS::DistributedHardware::DistributedInput::StartDInputCallbackStub {
-public:
-    explicit StartDInputCallback(sptr<ICallDinput> prepareDinput) : callback_(prepareDinput) {}
-    ~StartDInputCallback() = default;
-    void OnResult(const std::string& deviceId, const uint32_t& inputTypes, const int32_t& status) override;
-private:
-    sptr<ICallDinput> callback_ { nullptr };
-};
-
-class StopDInputCallback : public OHOS::DistributedHardware::DistributedInput::StopDInputCallbackStub {
-public:
-    explicit StopDInputCallback(sptr<ICallDinput> prepareDinput) : callback_(prepareDinput) {}
-    ~StopDInputCallback() = default;
-    void OnResult(const std::string& deviceId, const uint32_t& inputTypes, const int32_t& status) override;
-private:
-    sptr<ICallDinput> callback_ { nullptr };
-};
-
-class UnprepareDInputCallback : public OHOS::DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
-public:
-    explicit UnprepareDInputCallback(sptr<ICallDinput> prepareDinput) : callback_(prepareDinput) {}
-    ~UnprepareDInputCallback() = default;
-    void OnResult(const std::string& deviceId, const int32_t& status) override;
-private:
-    sptr<ICallDinput> callback_ { nullptr };
-};
-}
-}
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
-#endif // DINPUT_CALLBACK_H
diff --git a/service/dinput/include/dinput_manager.h b/service/dinput/include/dinput_manager.h
deleted file mode 100644
index 7a273976f3..0000000000
--- a/service/dinput/include/dinput_manager.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef OHOS_DINPUT_MANAGER_H
-#define OHOS_DINPUT_MANAGER_H
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-
-#include <string>
-#include <vector>
-
-#include "constants_dinput.h"
-#include "i_call_dinput.h"
-#include "key_event.h"
-#include "singleton.h"
-
-namespace OHOS {
-namespace MMI {
-struct DMouseLocation {
-    int32_t globalX { 0 };
-    int32_t globalY { 0 };
-    int32_t dx { 0 };
-    int32_t dy { 0 };
-    int32_t displayId { 0 };
-};
-
-class DInputManager final {
-    DECLARE_DELAYED_SINGLETON(DInputManager);
-public:
-    static const uint32_t DEFAULT_ABILITY;
-    static const uint32_t MOUSE_ABILITY;
-    static const uint32_t KEYBOARD_ABILITY;
-    static const uint32_t TOUCH_ABILITY;
-    static const uint32_t FULL_ABILITY;
-public:
-    DISALLOW_COPY_AND_MOVE(DInputManager);
-    void SetMouseLocation(const DMouseLocation& info);
-    DMouseLocation& GetMouseLocation();
-    bool IsControllerSide(uint32_t inputAbility);
-    bool IsDistributedInput(uint32_t inputAbility);
-    bool IsNeedFilterOut(const std::string& deviceId, const std::shared_ptr<KeyEvent>& key);
-    bool CheckWhiteList(const std::shared_ptr<KeyEvent>& key, bool &jumpIntercept);
-    OHOS::DistributedHardware::DistributedInput::DInputServerType GetDInputServerType(uint32_t inputAbility);
-
-    int32_t PrepareRemoteInput(const std::string& deviceId, sptr<ICallDinput> prepareDinput);
-    int32_t UnprepareRemoteInput(const std::string& deviceId, sptr<ICallDinput> prepareDinput);
-    int32_t StartRemoteInput(const std::string& deviceId, uint32_t inputAbility,
-        sptr<ICallDinput> prepareDinput);
-    int32_t StopRemoteInput(const std::string& deviceId, uint32_t inputAbility,
-        sptr<ICallDinput> prepareDinput);
-    void OnStartRemoteInput(const std::string& deviceId, uint32_t inputTypes);
-    void OnStopRemoteInput(const std::string& deviceId, uint32_t inputTypes);
-private:
-    DMouseLocation mouseLocation_;
-    int32_t inputTypes_ { 0 };
-};
-
-#define DInputMgr ::OHOS::DelayedSingleton<DInputManager>::GetInstance()
-} // namespace MMI
-} // namespace OHOS
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
-#endif // OHOS_DINPUT_MANAGER_H
diff --git a/service/dinput/include/i_call_dinput.h b/service/dinput/include/i_call_dinput.h
deleted file mode 100644
index 613f53f48b..0000000000
--- a/service/dinput/include/i_call_dinput.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef I_CALL_DINPUT_H
-#define I_CALL_DINPUT_H
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-
-#include <set>
-
-#include "iremote_broker.h"
-
-namespace OHOS {
-namespace MMI {
-class ICallDinput : public IRemoteBroker {
-public:
-    DECLARE_INTERFACE_DESCRIPTOR(u"ohos.multimodalinput.ICallDinput");
-    virtual int32_t HandlePrepareDinput(const std::string &deviceId, int32_t status) = 0;
-    virtual int32_t HandleUnprepareDinput(const std::string &deviceId, int32_t status) = 0;
-    virtual int32_t HandleStartDinput(const std::string &deviceId, uint32_t inputTypes, int32_t status) = 0;
-    virtual int32_t HandleStopDinput(const std::string &deviceId, uint32_t inputTypes, int32_t status) = 0;
-    virtual int32_t HandleRemoteInputAbility(const std::set<int32_t> &remoteInputAbility) = 0;
-protected:
-    enum {
-        HANDLE_PREPARE_DINPUT = 0,
-        HANDLE_UNPREPARE_DINPUT = 1,
-        HANDLE_START_DINPUT = 2,
-        HANDLE_STOP_DINPUT = 3,
-        HANDLE_REMOTE_INPUT_ABILITY = 4,
-    };
-};
-} // namespace MMI
-} // namespace OHOS
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
-#endif // I_CALL_DINPUT_H
diff --git a/service/dinput/src/call_dinput_death_recipient.cpp b/service/dinput/src/call_dinput_death_recipient.cpp
deleted file mode 100644
index e7762596ce..0000000000
--- a/service/dinput/src/call_dinput_death_recipient.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "call_dinput_death_recipient.h"
-
-#include "mmi_log.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "CallDinputDeathRecipient" };
-} // namespace
-CALLDinputDeathRecipient::CALLDinputDeathRecipient(
-    const std::function<void(const wptr<IRemoteObject> &object)> &deathCallback)
-    : deathCallback_(deathCallback) {}
-
-void CALLDinputDeathRecipient::OnRemoteDied(const OHOS::wptr<OHOS::IRemoteObject> &object)
-{
-    CHKPV(deathCallback_);
-    deathCallback_(object);
-}
-} // namespace MMI
-} // namespace OHOS
diff --git a/service/dinput/src/call_dinput_proxy.cpp b/service/dinput/src/call_dinput_proxy.cpp
deleted file mode 100644
index a1f22fbaa8..0000000000
--- a/service/dinput/src/call_dinput_proxy.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "call_dinput_proxy.h"
-
-#include "message_option.h"
-#include "string_ex.h"
-
-#include "error_multimodal.h"
-#include "mmi_log.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "CallDinputProxy" };
-} // namespace
-
-int32_t CallDinputProxy::HandlePrepareDinput(const std::string &deviceId, int32_t status)
-{
-    CALL_INFO_TRACE;
-    MessageParcel data;
-    if (!data.WriteInterfaceToken(CallDinputProxy::GetDescriptor())) {
-        MMI_HILOGW("Failed to write descriptor");
-        return false;
-    }
-    WRITESTRING(data, deviceId, RET_ERR);
-    WRITEINT32(data, status, RET_ERR);
-    MessageParcel reply;
-    MessageOption option;
-    sptr<IRemoteObject> remote = Remote();
-    CHKPR(remote, ERROR_NULL_POINTER);
-    int32_t ret = remote->SendRequest(HANDLE_PREPARE_DINPUT, data, reply, option);
-    if (ret != NO_ERROR) {
-        MMI_HILOGW("Send request failed, result:%{public}d", ret);
-        return false;
-    }
-    return ret;
-}
-
-int32_t CallDinputProxy::HandleUnprepareDinput(const std::string &deviceId, int32_t status)
-{
-    CALL_INFO_TRACE;
-    MessageParcel data;
-    if (!data.WriteInterfaceToken(CallDinputProxy::GetDescriptor())) {
-        MMI_HILOGW("Failed to write descriptor");
-        return false;
-    }
-    WRITESTRING(data, deviceId, RET_ERR);
-    WRITEINT32(data, status, RET_ERR);
-    MessageParcel reply;
-    MessageOption option;
-    sptr<IRemoteObject> remote = Remote();
-    CHKPR(remote, ERROR_NULL_POINTER);
-    int32_t ret = remote->SendRequest(HANDLE_UNPREPARE_DINPUT, data, reply, option);
-    if (ret != NO_ERROR) {
-        MMI_HILOGW("Send request failed, result:%{public}d", ret);
-        return false;
-    }
-    return ret;
-}
-
-int32_t CallDinputProxy::HandleStartDinput(const std::string &deviceId, uint32_t inputTypes, int32_t status)
-{
-    CALL_INFO_TRACE;
-    MessageParcel data;
-    if (!data.WriteInterfaceToken(CallDinputProxy::GetDescriptor())) {
-        MMI_HILOGW("Failed to write descriptor");
-        return false;
-    }
-    WRITESTRING(data, deviceId, RET_ERR);
-    WRITEINT32(data, inputTypes, RET_ERR);
-    WRITEINT32(data, status, RET_ERR);
-    MessageParcel reply;
-    MessageOption option;
-    sptr<IRemoteObject> remote = Remote();
-    CHKPR(remote, ERROR_NULL_POINTER);
-    int32_t ret = remote->SendRequest(HANDLE_START_DINPUT, data, reply, option);
-    if (ret != NO_ERROR) {
-        MMI_HILOGW("Send request failed, result:%{public}d", ret);
-        return false;
-    }
-    return ret;
-}
-
-int32_t CallDinputProxy::HandleStopDinput(const std::string &deviceId, uint32_t inputTypes, int32_t status)
-{
-    CALL_INFO_TRACE;
-    MessageParcel data;
-    if (!data.WriteInterfaceToken(CallDinputProxy::GetDescriptor())) {
-        MMI_HILOGW("Failed to write descriptor");
-        return false;
-    }
-    WRITESTRING(data, deviceId, RET_ERR);
-    WRITEINT32(data, inputTypes, RET_ERR);
-    WRITEINT32(data, status, RET_ERR);
-    MessageParcel reply;
-    MessageOption option;
-    sptr<IRemoteObject> remote = Remote();
-    CHKPR(remote, ERROR_NULL_POINTER);
-    int32_t ret = remote->SendRequest(HANDLE_STOP_DINPUT, data, reply, option);
-    if (ret != NO_ERROR) {
-        MMI_HILOGW("Send request failed, result:%{public}d", ret);
-        return false;
-    }
-    return ret;
-}
-
-int32_t CallDinputProxy::HandleRemoteInputAbility(const std::set<int32_t> &remoteInputAbility)
-{
-    CALL_INFO_TRACE;
-    MessageParcel data;
-    if (!data.WriteInterfaceToken(CallDinputProxy::GetDescriptor())) {
-        MMI_HILOGW("Failed to write descriptor");
-        return false;
-    }
-    WRITEINT32(data, remoteInputAbility.size(), RET_ERR);
-    for (const auto &item : remoteInputAbility) {
-        WRITEINT32(data, item, RET_ERR);
-    }
-    MessageParcel reply;
-    MessageOption option;
-    sptr<IRemoteObject> remote = Remote();
-    CHKPR(remote, ERROR_NULL_POINTER);
-    int32_t ret = remote->SendRequest(HANDLE_REMOTE_INPUT_ABILITY, data, reply, option);
-    if (ret != NO_ERROR) {
-        MMI_HILOGW("Send request failed, result:%{public}d", ret);
-        return false;
-    }
-    return ret;
-}
-} // namespace MMI
-} // namespace OHOS
diff --git a/service/dinput/src/call_dinput_service.cpp b/service/dinput/src/call_dinput_service.cpp
deleted file mode 100644
index f8ef65af3f..0000000000
--- a/service/dinput/src/call_dinput_service.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "call_dinput_service.h"
-
-#include <cstring>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "error_multimodal.h"
-#include "mmi_log.h"
-#include "string_ex.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "CallDinputService" };
-} // namespace
-
-void CallDinputService::SetPrepareCallback(const std::function<void(int32_t)>& callback)
-{
-    CALL_INFO_TRACE;
-    prepareCallback_ = callback;
-}
-
-void CallDinputService::SetUnprepareCallback(const std::function<void(int32_t)>& callback)
-{
-    CALL_INFO_TRACE;
-    unprepareCallback_ = callback;
-}
-
-void CallDinputService::SetStartCallback(const std::function<void(int32_t)>& callback)
-{
-    CALL_INFO_TRACE;
-    startCallback_ = callback;
-}
-
-void CallDinputService::SetStopCallback(const std::function<void(int32_t)>& callback)
-{
-    CALL_INFO_TRACE;
-    stopCallback_ = callback;
-}
-
-void CallDinputService::SetRemoteAbilityCallback(std::function<void(std::set<int32_t>)>& callback)
-{
-    CALL_INFO_TRACE;
-    remoteAbilityCallback_ = callback;
-}
-
-int32_t CallDinputService::HandlePrepareDinput(const std::string& deviceId, int32_t status)
-{
-    CALL_INFO_TRACE;
-    CHKPR(prepareCallback_, ERROR_NULL_POINTER);
-    prepareCallback_(status);
-    return RET_OK;
-}
-
-int32_t CallDinputService::HandleUnprepareDinput(const std::string& deviceId, int32_t status)
-{
-    CALL_INFO_TRACE;
-    CHKPR(unprepareCallback_, ERROR_NULL_POINTER);
-    unprepareCallback_(status);
-    return RET_OK;
-}
-
-int32_t CallDinputService::HandleStartDinput(const std::string& deviceId, uint32_t inputTypes, int32_t status)
-{
-    CALL_INFO_TRACE;
-    CHKPR(startCallback_, ERROR_NULL_POINTER);
-    startCallback_(status);
-    return RET_OK;
-}
-
-int32_t CallDinputService::HandleStopDinput(const std::string& deviceId, uint32_t inputTypes, int32_t status)
-{
-    CALL_INFO_TRACE;
-    CHKPR(stopCallback_, ERROR_NULL_POINTER);
-    stopCallback_(status);
-    return RET_OK;
-}
-
-int32_t CallDinputService::HandleRemoteInputAbility(const std::set<int32_t>& remoteInputAbility)
-{
-    CALL_INFO_TRACE;
-    CHKPR(remoteAbilityCallback_, ERROR_NULL_POINTER);
-    remoteAbilityCallback_(remoteInputAbility);
-    return RET_OK;
-}
-} // namespace MMI
-} // namespace OHOS
diff --git a/service/dinput/src/call_dinput_stub.cpp b/service/dinput/src/call_dinput_stub.cpp
deleted file mode 100644
index 9dd43fe766..0000000000
--- a/service/dinput/src/call_dinput_stub.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "call_dinput_stub.h"
-
-#include <sys/socket.h>
-#include <sys/types.h>
-
-#include "ipc_skeleton.h"
-#include "mmi_log.h"
-#include "string_ex.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "CallDinputStub" };
-}  // namespace
-
-int32_t CallDinputStub::OnRemoteRequest(
-    uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option)
-{
-    MMI_HILOGI("Enter, code:%{public}d", code);
-
-    std::u16string descriptor = data.ReadInterfaceToken();
-    if (descriptor != ICallDinput::GetDescriptor()) {
-        MMI_HILOGW("Get unexpect descriptor:%{public}s", Str16ToStr8(descriptor).c_str());
-        return ERR_INVALID_STATE;
-    }
-
-    switch (code) {
-        case HANDLE_PREPARE_DINPUT: {
-            return StubHandlePrepareDinput(data, reply);
-        }
-        case HANDLE_UNPREPARE_DINPUT: {
-            return StubHandleUnprepareDinput(data, reply);
-        }
-        case HANDLE_START_DINPUT: {
-            return StubHandleStartDinput(data, reply);
-        }
-        case HANDLE_STOP_DINPUT: {
-            return StubHandleStopDinput(data, reply);
-        }
-        case HANDLE_REMOTE_INPUT_ABILITY: {
-            return StubHandleRemoteInputAbility(data, reply);
-        }
-        default: {
-            MMI_HILOGW("Unknown code:%{public}u, go switch defaut", code);
-            return IPCObjectStub::OnRemoteRequest(code, data, reply, option);
-        }
-    }
-}
-
-int32_t CallDinputStub::StubHandlePrepareDinput(MessageParcel& data, MessageParcel& reply)
-{
-    CALL_INFO_TRACE;
-    std::string deviceId;
-    READSTRING(data, deviceId, RET_ERR);
-    int32_t status;
-    READINT32(data, status, RET_ERR);
-    return HandlePrepareDinput(deviceId, status);
-}
-
-int32_t CallDinputStub::StubHandleUnprepareDinput(MessageParcel& data, MessageParcel& reply)
-{
-    CALL_INFO_TRACE;
-    std::string deviceId;
-    READSTRING(data, deviceId, RET_ERR);
-    int32_t status;
-    READINT32(data, status, RET_ERR);
-    return HandleUnprepareDinput(deviceId, status);
-}
-
-int32_t CallDinputStub::StubHandleStartDinput(MessageParcel& data, MessageParcel& reply)
-{
-    CALL_INFO_TRACE;
-    std::string deviceId;
-    READSTRING(data, deviceId, RET_ERR);
-    int32_t inputAbility;
-    READINT32(data, inputAbility, RET_ERR);
-    int32_t status;
-    READINT32(data, status, RET_ERR);
-    return HandleStartDinput(deviceId, inputAbility, status);
-}
-
-int32_t CallDinputStub::StubHandleStopDinput(MessageParcel& data, MessageParcel& reply)
-{
-    CALL_INFO_TRACE;
-    std::string deviceId;
-    READSTRING(data, deviceId, RET_ERR);
-    int32_t inputAbility;
-    READINT32(data, inputAbility, RET_ERR);
-    int32_t status;
-    READINT32(data, status, RET_ERR);
-    return HandleStopDinput(deviceId, inputAbility, status);
-}
-
-int32_t CallDinputStub::StubHandleRemoteInputAbility(MessageParcel& data, MessageParcel& reply)
-{
-    CALL_INFO_TRACE;
-    std::set<int32_t> remoteInputAbility;
-    int32_t size;
-    READINT32(data, size, RET_ERR);
-    int32_t value;
-    for (size_t i = 0; i < size; i++) {
-        READINT32(data, value, RET_ERR);
-        remoteInputAbility.insert(value);
-    }
-    return HandleRemoteInputAbility(remoteInputAbility);
-}
-} // namespace MMI
-} // namespace OHOS
\ No newline at end of file
diff --git a/service/dinput/src/dinput_callback.cpp b/service/dinput/src/dinput_callback.cpp
deleted file mode 100644
index d5283095f2..0000000000
--- a/service/dinput/src/dinput_callback.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "dinput_callback.h"
-
-#include "define_multimodal.h"
-
-#include "dinput_manager.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "EventDinputService" };
-}
-
-void PrepareDInputCallback::OnResult(const std::string& deviceId, const int32_t& status)
-{
-    MMI_HILOGI("PrepareDInputCallback OnResult deviceId:%{public}s, status:%{public}d",
-        GetAnonyString(deviceId).c_str(), status);
-    CHKPV(callback_);
-    callback_->HandlePrepareDinput(deviceId, status);
-}
-
-void StartDInputCallback::OnResult(const std::string& deviceId, const uint32_t& inputTypes, const int32_t& status)
-{
-    MMI_HILOGI("StartDInputCallback OnResult deviceId:%{public}s, status:%{public}d",
-        GetAnonyString(deviceId).c_str(), status);
-    CHKPV(callback_);
-    callback_->HandleStartDinput(deviceId, inputTypes, status);
-    if (status != 0) {
-        MMI_HILOGI("StartDInputCallback OnResult status:%{public}d", status);
-    }
-    DInputMgr->OnStartRemoteInput(deviceId, inputTypes);
-}
-
-void StopDInputCallback::OnResult(const std::string& deviceId, const uint32_t& inputTypes, const int32_t& status)
-{
-    MMI_HILOGI("StopDInputCallback OnResult:%{public}s, status:%{public}d", GetAnonyString(deviceId).c_str(), status);
-    CHKPV(callback_);
-    callback_->HandleStopDinput(deviceId, inputTypes, status);
-    if (status != 0) {
-        MMI_HILOGI("StopDInputCallback OnResult status:%{public}d", status);
-    }
-    DInputMgr->OnStopRemoteInput(deviceId, inputTypes);
-}
-
-void UnprepareDInputCallback::OnResult(const std::string& deviceId, const int32_t& status)
-{
-    MMI_HILOGI("UnprepareDInputCallback OnResult:%{public}s, status:%{public}d",
-        GetAnonyString(deviceId).c_str(), status);
-    CHKPV(callback_);
-    callback_->HandleUnprepareDinput(deviceId, status);
-}
-} // namespace MMI
-} // namespace OHOS
diff --git a/service/dinput/src/dinput_manager.cpp b/service/dinput/src/dinput_manager.cpp
deleted file mode 100644
index 2c3c8be186..0000000000
--- a/service/dinput/src/dinput_manager.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "define_multimodal.h"
-#include "dinput_callback.h"
-#include "distributed_input_kit.h"
-#include "input_device_manager.h"
-#include "dinput_manager.h"
-
-using namespace OHOS::DistributedHardware::DistributedInput;
-namespace OHOS {
-namespace MMI {
-namespace {
-static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "DInputManager" };
-}
-const uint32_t DInputManager::DEFAULT_ABILITY = 0;
-const uint32_t DInputManager::MOUSE_ABILITY = 1;
-const uint32_t DInputManager::KEYBOARD_ABILITY = 2;
-const uint32_t DInputManager::TOUCH_ABILITY = 4;
-const uint32_t DInputManager::FULL_ABILITY = 7;
-
-DInputManager::DInputManager() {}
-DInputManager::~DInputManager() {}
-
-void DInputManager::SetMouseLocation(const DMouseLocation& info)
-{
-    mouseLocation_ = info;
-}
-
-DMouseLocation& DInputManager::GetMouseLocation()
-{
-    return mouseLocation_;
-}
-
-bool DInputManager::IsControllerSide(uint32_t inputAbility)
-{
-    CALL_INFO_TRACE;
-    DInputServerType type = GetDInputServerType(inputAbility);
-    MMI_HILOGI("type:%{public}d", type);
-    return type != DInputServerType::SINK_SERVER_TYPE;
-}
-
-bool DInputManager::IsDistributedInput(uint32_t inputAbility)
-{
-    CALL_INFO_TRACE;
-    DInputServerType type = GetDInputServerType(inputAbility);
-    MMI_HILOGI("type:%{public}d", type);
-    return type != DInputServerType::NULL_SERVER_TYPE;
-}
-
-bool DInputManager::CheckWhiteList(const std::shared_ptr<KeyEvent>& key, bool &jumpIntercept)
-{
-    CALL_INFO_TRACE;
-    jumpIntercept = false;
-    std::string deviceId = "";
-    DInputServerType type = GetDInputServerType(DInputManager::KEYBOARD_ABILITY);
-    if (DInputServerType::SOURCE_SERVER_TYPE == type) {
-        std::shared_ptr<InputDevice> inputDevice = InputDevMgr->GetRemoteInputDevice(key->GetDeviceId());
-        if (inputDevice != nullptr) {
-            deviceId = inputDevice->GetNetworkId();
-            if (!IsNeedFilterOut(deviceId, key)) {
-                return true;
-            }
-        }
-    } else if (DInputServerType::SINK_SERVER_TYPE == type) {
-        if (!IsNeedFilterOut(deviceId, key)) {
-            return true;
-        } else {
-            jumpIntercept = true;
-            MMI_HILOGW("Events are filtered");
-        }
-    }
-    return false;
-}
-
-DInputServerType DInputManager::GetDInputServerType(uint32_t inputAbility)
-{
-    CALL_INFO_TRACE;
-    DInputServerType type = DistributedInputKit::IsStartDistributedInput(inputAbility);
-    MMI_HILOGI("type:%{public}d", type);
-    return type;
-}
-
-bool DInputManager::IsNeedFilterOut(const std::string& deviceId, const std::shared_ptr<KeyEvent>& key)
-{
-    CALL_INFO_TRACE;
-    CHKPF(key);
-    const std::vector<OHOS::MMI::KeyEvent::KeyItem>& pressedKeys = key->GetKeyItems();
-    std::vector<int32_t> pressedKeysForDInput;
-    pressedKeysForDInput.reserve(pressedKeys.size());
-    for (size_t i = 0; i < pressedKeys.size(); i++) {
-        pressedKeysForDInput.push_back(pressedKeys[i].GetKeyCode());
-    }
-    BusinessEvent businessEvent;
-    businessEvent.keyCode = key->GetKeyCode();
-    businessEvent.keyAction = key->GetKeyAction();
-    businessEvent.pressedKeys = pressedKeysForDInput;
-    for (const auto &item : businessEvent.pressedKeys) {
-        MMI_HILOGI("pressedKeys:%{public}d", item);
-    }
-    MMI_HILOGI("deviceId:%{public}s, keyCode:%{public}d, keyAction:%{public}d",
-        GetAnonyString(deviceId).c_str(), businessEvent.keyCode, businessEvent.keyAction);
-    if (!DistributedInputKit::IsNeedFilterOut(deviceId, businessEvent)) {
-        MMI_HILOGI("IsNeedFilterOut:%{public}s", "false");
-    }
-    return true;
-}
-
-int32_t DInputManager::PrepareRemoteInput(const std::string& deviceId, sptr<ICallDinput> prepareDinput)
-{
-    CALL_INFO_TRACE;
-    sptr<PrepareDInputCallback> callback = new PrepareDInputCallback(prepareDinput);
-    CHKPR(callback, ERROR_NULL_POINTER);
-    return DistributedInputKit::PrepareRemoteInput(deviceId, callback);
-}
-
-int32_t DInputManager::UnprepareRemoteInput(const std::string& deviceId, sptr<ICallDinput> prepareDinput)
-{
-    CALL_INFO_TRACE;
-    sptr<UnprepareDInputCallback> callback = new UnprepareDInputCallback(prepareDinput);
-    CHKPR(callback, ERROR_NULL_POINTER);
-    return DistributedInputKit::UnprepareRemoteInput(deviceId, callback);
-}
-
-int32_t DInputManager::StartRemoteInput(const std::string& deviceId, uint32_t inputAbility,
-    sptr<ICallDinput> prepareDinput)
-{
-    CALL_INFO_TRACE;
-    sptr<StartDInputCallback> callback = new StartDInputCallback(prepareDinput);
-    CHKPR(callback, ERROR_NULL_POINTER);
-    DistributedInputKit::IsStartDistributedInput(inputAbility);
-    return DistributedInputKit::StartRemoteInput(deviceId, inputAbility, callback);
-}
-
-int32_t DInputManager::StopRemoteInput(const std::string& deviceId, uint32_t inputAbility,
-    sptr<ICallDinput> prepareDinput)
-{
-    CALL_INFO_TRACE;
-    sptr<StopDInputCallback> callback = new StopDInputCallback(prepareDinput);
-    CHKPR(callback, ERROR_NULL_POINTER);
-    return DistributedInputKit::StopRemoteInput(deviceId,
-        inputAbility, callback);
-}
-
-void DInputManager::OnStartRemoteInput(const std::string& deviceId, uint32_t inputTypes)
-{
-    MMI_HILOGI("Enter: inputTypes:%{public}d", inputTypes);
-    int32_t diffBit = (inputTypes_ & DInputManager::FULL_ABILITY) ^ (inputTypes & DInputManager::FULL_ABILITY);
-    MMI_HILOGI("diffBit:%{public}d", diffBit);
-    if (diffBit == 0) {
-        return;
-    }
-    inputTypes_ = (inputTypes_ & DInputManager::FULL_ABILITY) | (inputTypes & DInputManager::FULL_ABILITY);
-    MMI_HILOGI("inputTypes_:%{public}d", inputTypes_);
-    int32_t addTypes = diffBit & (inputTypes & DInputManager::FULL_ABILITY);
-    MMI_HILOGI("addTypes:%{public}d", addTypes);
-    if (addTypes != 0) {
-        InputDevMgr->OnStartRemoteInput(deviceId, addTypes);
-    }
-}
-
-void DInputManager::OnStopRemoteInput(const std::string& deviceId, uint32_t inputTypes)
-{
-    MMI_HILOGI("Enter: inputTypes:%{public}d", inputTypes);
-    int32_t removeTypes = (inputTypes_ & DInputManager::FULL_ABILITY) & (inputTypes & DInputManager::FULL_ABILITY);
-    MMI_HILOGI("removeTypes:%{public}d", removeTypes);
-    if (removeTypes == 0) {
-        MMI_HILOGE("Stop remoteInput failed");
-        return;
-    }
-    inputTypes_ = inputTypes_ ^ removeTypes;
-    MMI_HILOGI("inputTypes_:%{public}d", inputTypes_);
-    InputDevMgr->OnStopRemoteInput(deviceId, removeTypes);
-}
-} // namespace MMI
-} // namespace OHOS
-- 
Gitee


From c5dd499c8d283c0d2d6aa9aa6998b33b021de35e Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Fri, 21 Oct 2022 17:11:23 +0800
Subject: [PATCH 065/360] delete dinput code

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: Ica6a845b5b410d4c3c404efef4b99026a2337ebe
---
 .vscode/settings.json                         |  63 +++++++++
 .../napi/pointer/include/js_pointer_context.h |   1 -
 .../napi/pointer/include/js_pointer_manager.h |   1 -
 .../napi/pointer/src/js_pointer_context.cpp   |  34 -----
 .../napi/pointer/src/js_pointer_manager.cpp   |  23 ---
 .../include/input_manager_impl.h              |  14 --
 .../event_handler/src/input_manager_impl.cpp  | 132 ------------------
 frameworks/proxy/events/src/input_manager.cpp |  33 -----
 .../innerkits/proxy/include/input_manager.h   |  57 --------
 9 files changed, 63 insertions(+), 295 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000..8003601966
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,63 @@
+{
+    "files.associations": {
+        "algorithm": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "chrono": "cpp",
+        "cinttypes": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "condition_variable": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "list": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "string": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "fstream": "cpp",
+        "future": "cpp",
+        "initializer_list": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "ostream": "cpp",
+        "shared_mutex": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "thread": "cpp",
+        "typeinfo": "cpp"
+    }
+}
\ No newline at end of file
diff --git a/frameworks/napi/pointer/include/js_pointer_context.h b/frameworks/napi/pointer/include/js_pointer_context.h
index a0aedec5d3..dff05f8f68 100644
--- a/frameworks/napi/pointer/include/js_pointer_context.h
+++ b/frameworks/napi/pointer/include/js_pointer_context.h
@@ -32,7 +32,6 @@ public:
     std::shared_ptr<JsPointerManager> GetJsPointerMgr() const;
     static napi_value SetPointerSpeed(napi_env env, napi_callback_info info);
     static napi_value GetPointerSpeed(napi_env env, napi_callback_info info);
-    static napi_value SetPointerLocation(napi_env env, napi_callback_info info);
 
 private:
     static napi_value CreateInstance(napi_env env);
diff --git a/frameworks/napi/pointer/include/js_pointer_manager.h b/frameworks/napi/pointer/include/js_pointer_manager.h
index a98bbbb16a..8ea45dd171 100644
--- a/frameworks/napi/pointer/include/js_pointer_manager.h
+++ b/frameworks/napi/pointer/include/js_pointer_manager.h
@@ -62,7 +62,6 @@ public:
     napi_value GetPointerSpeed(napi_env env, napi_value handle = nullptr);
     napi_value SetPointerStyle(napi_env env, int32_t windowid, int32_t pointerStyle, napi_value handle = nullptr);
     napi_value GetPointerStyle(napi_env env, int32_t windowid, napi_value handle = nullptr);
-    napi_value SetPointerLocation(napi_env env, napi_value handle, int32_t x, int32_t y);
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/napi/pointer/src/js_pointer_context.cpp b/frameworks/napi/pointer/src/js_pointer_context.cpp
index 4c08a18ca3..fa27ced90a 100644
--- a/frameworks/napi/pointer/src/js_pointer_context.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_context.cpp
@@ -470,39 +470,5 @@ napi_value JsPointerContext::Export(napi_env env, napi_value exports)
     }
     return exports;
 }
-
-napi_value JsPointerContext::SetPointerLocation(napi_env env, napi_callback_info info)
-{
-    CALL_INFO_TRACE;
-    size_t argc = 3;
-    napi_value argv[3];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
-    if (argc > 3 || argc < 2) {
-        THROWERR(env, "the number of parameters is not as expected");
-        return nullptr;
-    }
-    if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
-        THROWERR(env, "The first parameter type is wrong");
-        return nullptr;
-    }
-    if (!JsCommon::TypeOf(env, argv[1], napi_number)) {
-        THROWERR(env, "The second parameter type is wrong");
-        return nullptr;
-    }
-    int32_t x = 0;
-    int32_t y = 0;
-    CHKRP(env, napi_get_value_int32(env, argv[0], &x), GET_INT32);
-    CHKRP(env, napi_get_value_int32(env, argv[1], &y), GET_INT32);
-    JsPointerContext *jsPointer = JsPointerContext::GetInstance(env);
-    auto jsPointerMgr = jsPointer->GetJsPointerMgr();
-    if (argc == 2) {
-        return jsPointerMgr->SetPointerLocation(env, nullptr, x, y);
-    }
-    if (!JsCommon::TypeOf(env, argv[2], napi_function)) {
-        THROWERR(env, "The third parameter type is wrong");
-        return nullptr;
-    }
-    return jsPointerMgr->SetPointerLocation(env, argv[2], x, y);
-}
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/napi/pointer/src/js_pointer_manager.cpp b/frameworks/napi/pointer/src/js_pointer_manager.cpp
index 468c5e4c2b..a151669134 100644
--- a/frameworks/napi/pointer/src/js_pointer_manager.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_manager.cpp
@@ -218,29 +218,6 @@ napi_value JsPointerManager::GetPointerSpeed(napi_env env, napi_value handle)
     return promise;
 }
 
-napi_value JsPointerManager::SetPointerLocation(napi_env env, napi_value handle, int32_t x, int32_t y)
-{
-    CALL_DEBUG_ENTER;
-    sptr<AsyncContext> asyncContext = new (std::nothrow) AsyncContext(env);
-    if (asyncContext == nullptr) {
-        THROWERR(env, "create AsyncContext failed");
-        return nullptr;
-    }
-    asyncContext->errorCode = InputManager::GetInstance()->SetPointerLocation(x, y);
-    asyncContext->reserve << ReturnType::VOID;
-    napi_value promise = nullptr;
-    uint32_t initial_refcount = 1;
-    if (handle != nullptr) {
-        CHKRP(env, napi_create_reference(env, handle, initial_refcount, &asyncContext->callback), CREATE_REFERENCE);
-        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
-        napi_delete_reference(env, asyncContext->callback);
-    } else {
-        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
-    }
-    AsyncCallbackWork(asyncContext);
-    return promise;
-}
-
 napi_value JsPointerManager::SetPointerStyle(napi_env env, int32_t windowid, int32_t pointerStyle, napi_value handle)
 {
     CALL_DEBUG_ENTER;
diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index 1abd4c3dff..a2d9f61f39 100755
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -38,9 +38,6 @@
 #include "i_input_event_consumer.h"
 #include "key_option.h"
 #include "pointer_event.h"
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-#include "call_dinput_service.h"
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
 
 namespace OHOS {
 namespace MMI {
@@ -104,14 +101,6 @@ public:
     void SetAnrObserver(std::shared_ptr<IAnrObserver> observer);
     void OnAnr(int32_t pid);
 
-    int32_t SetPointerLocation(int32_t x, int32_t y);
-
-    int32_t GetRemoteInputAbility(std::string deviceId, std::function<void(std::set<int32_t>)> remoteTypes);
-    int32_t PrepareRemoteInput(const std::string& deviceId, std::function<void(int32_t)> callback);
-    int32_t UnprepareRemoteInput(const std::string& deviceId, std::function<void(int32_t)> callback);
-    int32_t StartRemoteInput(const std::string& deviceId, uint32_t inputAbility, std::function<void(int32_t)> callback);
-    int32_t StopRemoteInput(const std::string& deviceId, uint32_t inputAbility, std::function<void(int32_t)> callback);
-
     int32_t RegisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener);
     int32_t UnregisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener = nullptr);
     int32_t EnableInputDeviceCooperate(bool enabled, std::function<void(std::string, CooperationMessage)> callback);
@@ -148,9 +137,6 @@ private:
     std::condition_variable cv_;
     std::thread ehThread_;
     std::shared_ptr<AppExecFwk::EventHandler> eventHandler_ { nullptr };
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-    sptr<CallDinputService> callDinputService_ { nullptr };
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
 };
 
 #define InputMgrImpl ::OHOS::Singleton<InputManagerImpl>::GetInstance()
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index e68a025613..c347cdf3ea 100755
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -758,138 +758,6 @@ int32_t InputManagerImpl::SetInputDevice(const std::string &dhid, const std::str
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 }
 
-int32_t InputManagerImpl::SetPointerLocation(int32_t x, int32_t y)
-{
-    CALL_INFO_TRACE;
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-    std::lock_guard<std::mutex> guard(mtx_);
-    int32_t ret = MultimodalInputConnectManager::GetInstance()->SetPointerLocation(x, y);
-    if (ret != RET_OK) {
-        MMI_HILOGE("SetPointerLocation has send to server failed, ret:%{public}d", ret);
-        return RET_ERR;
-    }
-    return RET_OK;
-#else
-    MMI_HILOGW("Set pointer location dose not support");
-    return RET_OK;
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
-}
-
-int32_t InputManagerImpl::GetRemoteInputAbility(std::string deviceId,
-    std::function<void(std::set<int32_t>)> remoteTypes)
-{
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-    CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mtx_);
-    if (callDinputService_ == nullptr) {
-        callDinputService_ = new (std::nothrow) CallDinputService();
-    }
-    CHKPR(callDinputService_, RET_ERR);
-    callDinputService_->SetRemoteAbilityCallback(remoteTypes);
-    int32_t ret = MultimodalInputConnectManager::GetInstance()->GetRemoteInputAbility(deviceId, callDinputService_);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Send to server failed, ret:%{public}d", ret);
-        return RET_ERR;
-    }
-    return RET_OK;
-#else
-    MMI_HILOGW("Get remote input ability dose not support");
-    return RET_OK;
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
-}
-
-int32_t InputManagerImpl::PrepareRemoteInput(const std::string &deviceId, std::function<void(int32_t)> callback)
-{
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-    CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mtx_);
-    if (callDinputService_ == nullptr) {
-        callDinputService_ = new (std::nothrow) CallDinputService();
-    }
-    CHKPR(callDinputService_, RET_ERR);
-    callDinputService_->SetPrepareCallback(callback);
-    int32_t ret = MultimodalInputConnectManager::GetInstance()->PrepareRemoteInput(deviceId, callDinputService_);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Send to server failed, ret:%{public}d", ret);
-        return RET_ERR;
-    }
-    return RET_OK;
-#else
-    MMI_HILOGW("Prepare remote input dose not support");
-    return RET_OK;
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
-}
-
-int32_t InputManagerImpl::UnprepareRemoteInput(const std::string &deviceId, std::function<void(int32_t)> callback)
-{
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-    CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mtx_);
-    if (callDinputService_ == nullptr) {
-        callDinputService_ = new (std::nothrow) CallDinputService();
-    }
-    CHKPR(callDinputService_, RET_ERR);
-    callDinputService_->SetUnprepareCallback(callback);
-    int32_t ret = MultimodalInputConnectManager::GetInstance()->UnprepareRemoteInput(deviceId, callDinputService_);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Send to server failed, ret:%{public}d", ret);
-        return RET_ERR;
-    }
-    return RET_OK;
-#else
-    MMI_HILOGW("Unprepare remote input dose not support");
-    return RET_OK;
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
-}
-
-int32_t InputManagerImpl::StartRemoteInput(const std::string &deviceId,
-    uint32_t inputAbility, std::function<void(int32_t)> callback)
-{
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-    CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mtx_);
-    if (callDinputService_ == nullptr) {
-        callDinputService_ = new (std::nothrow) CallDinputService();
-    }
-    CHKPR(callDinputService_, RET_ERR);
-    callDinputService_->SetStartCallback(callback);
-    int32_t ret = MultimodalInputConnectManager::GetInstance()->StartRemoteInput(deviceId,
-        inputAbility, callDinputService_);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Send to server failed, ret:%{public}d", ret);
-        return RET_ERR;
-    }
-    return RET_OK;
-#else
-    MMI_HILOGW("Start remote input dose not support");
-    return RET_OK;
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
-}
-
-int32_t InputManagerImpl::StopRemoteInput(const std::string &deviceId,
-    uint32_t inputAbility, std::function<void(int32_t)> callback)
-{
-#ifdef OHOS_DISTRIBUTED_INPUT_MODEL
-    CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mtx_);
-    if (callDinputService_ == nullptr) {
-        callDinputService_ = new (std::nothrow) CallDinputService();
-    }
-    CHKPR(callDinputService_, RET_ERR);
-    callDinputService_->SetStopCallback(callback);
-    int32_t ret = MultimodalInputConnectManager::GetInstance()->StopRemoteInput(deviceId,
-        inputAbility, callDinputService_);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Send to server failed, ret:%{public}d", ret);
-        return RET_ERR;
-    }
-    return RET_OK;
-#else
-    MMI_HILOGW("Stop remote input dose not support");
-    return RET_OK;
-#endif // OHOS_DISTRIBUTED_INPUT_MODEL
-}
-
 int32_t InputManagerImpl::RegisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener)
 {
     CALL_DEBUG_ENTER;
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index 0bd9570e16..1e4afaee10 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -192,39 +192,6 @@ int32_t InputManager::SetInputDevice(const std::string& dhid, const std::string&
     return InputMgrImpl.SetInputDevice(dhid, screenId);
 }
 
-int32_t InputManager::SetPointerLocation(int32_t x, int32_t y)
-{
-    return InputMgrImpl.SetPointerLocation(x, y);
-}
-
-int32_t InputManager::GetRemoteInputAbility(std::string deviceId,
-    std::function<void(std::set<int32_t>)> remoteTypes)
-{
-    return InputMgrImpl.GetRemoteInputAbility(deviceId, remoteTypes);
-}
-
-int32_t InputManager::PrepareRemoteInput(const std::string& deviceId, std::function<void(int32_t)> callback)
-{
-    return InputMgrImpl.PrepareRemoteInput(deviceId, callback);
-}
-
-int32_t InputManager::UnprepareRemoteInput(const std::string& deviceId, std::function<void(int32_t)> callback)
-{
-    return InputMgrImpl.UnprepareRemoteInput(deviceId, callback);
-}
-
-int32_t InputManager::StartRemoteInput(const std::string& deviceId,
-    uint32_t inputAbility, std::function<void(int32_t)> callback)
-{
-    return InputMgrImpl.StartRemoteInput(deviceId, inputAbility, callback);
-}
-
-int32_t InputManager::StopRemoteInput(const std::string& deviceId, uint32_t inputAbility,
-    std::function<void(int32_t)> callback)
-{
-    return InputMgrImpl.StopRemoteInput(deviceId, inputAbility, callback);
-}
-
 int32_t InputManager::RegisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener)
 {
     return InputMgrImpl.RegisterCooperateListener(listener);
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index 0a94da1d89..2c609e4fcd 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -318,63 +318,6 @@ public:
      */
     void SetAnrObserver(std::shared_ptr<IAnrObserver> observer);
 
-    /**
-     * @brief 设置鼠标光标的位置.
-     * @param x x 坐标
-     * @param y y 坐标
-     * @return 0表示返回成功，否则表示返回失败
-     */
-    int32_t SetPointerLocation(int32_t x, int32_t y);
-
-    /**
-     * @brief 获取远端输入能力.
-     * @param deviceId 远端的deviceId
-     * @param remoteTypes 返回远端输入能力
-     * @return 0表示返回成功，否则表示返回失败
-     * @since 9
-     */
-    int32_t GetRemoteInputAbility(std::string deviceId, std::function<void(std::set<int32_t>)> remoteTypes);
-
-    /**
-     * @brief 准备分布式.
-     * @param deviceId 准备分布式的那台设备的ID
-     * @param callback 准备分布式的回调，如果准备分布式执行完了，此回调被调用
-     * 如果准备分布式成功，则返回大于或等于 <b>0</b> 的值
-     * 否则返回小于 <b>0</b> 的值.
-     * @return 0表示返回成功，否则表示返回失败
-     */
-    int32_t PrepareRemoteInput(const std::string& deviceId, std::function<void(int32_t)> callback);
-
-    /**
-     * @brief 取消准备分布式.
-     * @param deviceId 取消准备分布式的那台设备的ID
-     * @param callback 取消准备分布式的回调，如果取消准备分布式执行完了，此回调被调用
-     * 如果取消准备分布式成功，则返回大于或等于 <b>0</b> 的值
-     * 否则返回小于 <b>0</b> 的值.
-     * @return 0表示返回成功，否则表示返回失败
-     */
-    int32_t UnprepareRemoteInput(const std::string& deviceId, std::function<void(int32_t)> callback);
-
-    /**
-     * @brief 开始分布式.
-     * @param deviceId 开始分布式的那台设备的ID
-     * @param callback 开始分布式的回调，如果开始分布式执行完了，此回调被调用
-     * 如果开始分布式成功，则返回大于或等于 <b>0</b> 的值
-     * 否则返回小于 <b>0</b> 的值.
-     * @return 0表示返回成功，否则表示返回失败
-     */
-    int32_t StartRemoteInput(const std::string& deviceId, uint32_t inputAbility, std::function<void(int32_t)> callback);
-
-    /**
-     * @brief 取消分布式.
-     * @param deviceId 取消分布式的那台设备的ID
-     * @param callback 取消分布式的回调，如果取消分布式执行完了，此回调被调用
-     * 如果取消分布式成功，则返回大于或等于 <b>0</b> 的值
-     * 否则返回小于 <b>0</b> 的值.
-     * @return 0表示返回成功，否则表示返回失败
-     */
-    int32_t StopRemoteInput(const std::string& deviceId, uint32_t inputAbility, std::function<void(int32_t)> callback);
-
     /**
      * @brief 设置指定输入设备对应的屏幕ID
      * @param dhid 输入设备唯一ID
-- 
Gitee


From 544f95f43dba7c2cdb1fa2f3592d769a6a695f99 Mon Sep 17 00:00:00 2001
From: zhangpengcheng <zhangpengcheng31@huawei.com>
Date: Fri, 21 Oct 2022 17:20:17 +0800
Subject: [PATCH 066/360] remove dinput code

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: Iadf17cf6c27d44b43f4d1d66bf7437a197e4bc49
---
 .vscode/settings.json | 63 -------------------------------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 8003601966..0000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "files.associations": {
-        "algorithm": "cpp",
-        "array": "cpp",
-        "atomic": "cpp",
-        "bit": "cpp",
-        "*.tcc": "cpp",
-        "bitset": "cpp",
-        "cctype": "cpp",
-        "chrono": "cpp",
-        "cinttypes": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "condition_variable": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdint": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cstring": "cpp",
-        "ctime": "cpp",
-        "cwchar": "cpp",
-        "cwctype": "cpp",
-        "deque": "cpp",
-        "list": "cpp",
-        "map": "cpp",
-        "set": "cpp",
-        "unordered_map": "cpp",
-        "vector": "cpp",
-        "exception": "cpp",
-        "functional": "cpp",
-        "iterator": "cpp",
-        "memory": "cpp",
-        "memory_resource": "cpp",
-        "numeric": "cpp",
-        "optional": "cpp",
-        "random": "cpp",
-        "ratio": "cpp",
-        "regex": "cpp",
-        "string": "cpp",
-        "string_view": "cpp",
-        "system_error": "cpp",
-        "tuple": "cpp",
-        "type_traits": "cpp",
-        "utility": "cpp",
-        "fstream": "cpp",
-        "future": "cpp",
-        "initializer_list": "cpp",
-        "iosfwd": "cpp",
-        "iostream": "cpp",
-        "istream": "cpp",
-        "limits": "cpp",
-        "mutex": "cpp",
-        "new": "cpp",
-        "ostream": "cpp",
-        "shared_mutex": "cpp",
-        "sstream": "cpp",
-        "stdexcept": "cpp",
-        "streambuf": "cpp",
-        "thread": "cpp",
-        "typeinfo": "cpp"
-    }
-}
\ No newline at end of file
-- 
Gitee


From cd12f555cd31724aa48ff0d0c89ad580f3d05ab0 Mon Sep 17 00:00:00 2001
From: hhh2 <pengfei.hou@huawei.com>
Date: Fri, 21 Oct 2022 21:28:03 +0800
Subject: [PATCH 067/360] virtual reidentification

Signed-off-by: hhh2 <pengfei.hou@huawei.com>
Change-Id: I044f9c7615eea7fe12018845953b4106eb08ad1a
Signed-off-by: hhh2 <pengfei.hou@huawei.com>
---
 .../include/js_input_dinput_context.h         |  2 +-
 .../include/js_input_dinput_manager.h         |  2 +-
 .../input_device/include/js_event_target.h    |  6 +-
 .../include/js_input_device_context.h         |  2 +-
 .../napi/input_device/src/js_event_target.cpp |  4 +-
 .../include/js_event_target.h                 |  6 +-
 .../js_input_device_cooperate_context.h       |  2 +-
 .../input_monitor/include/js_input_monitor.h  | 15 ++--
 .../include/js_input_monitor_manager.h        |  2 +-
 .../include/js_input_monitor_util.h           | 28 +++---
 .../napi/key_code/include/js_key_code.h       |  2 +-
 .../napi/key_event/include/js_key_event.h     |  2 +-
 .../napi/mouse_event/include/js_mouse_event.h |  2 +-
 .../napi/pointer/include/js_pointer_manager.h |  2 +-
 .../napi/touch_event/include/js_touch_event.h |  2 +-
 .../event_handler/include/bytrace_adapter.h   |  2 +-
 .../include/client_msg_handler.h              |  4 +-
 .../include/input_device_cooperate_impl.h     |  2 +-
 .../event_handler/include/input_device_impl.h |  2 +-
 .../include/input_interceptor_manager.h       |  4 +-
 .../include/input_monitor_manager.h           |  4 +-
 .../event_handler/src/client_msg_handler.cpp  |  5 --
 .../proxy/events/include/event_log_helper.h   |  2 +-
 .../module_loader/include/mmi_fd_listener.h   | 10 +--
 .../module_loader/src/mmi_fd_listener.cpp     |  4 -
 service/BUILD.gn                              |  1 -
 ...multimodal_input_connect_death_recipient.h |  4 +-
 .../multimodal_input_connect_manager.h        |  4 +-
 .../include/multimodal_input_connect_proxy.h  | 76 ++++++++--------
 .../multimodal_input_connect_remoter.h        |  4 +-
 .../include/multimodal_input_connect_stub.h   |  2 +-
 .../multimodal_input_connect_def_parcel.cpp   |  5 +-
 .../src/multimodal_input_connect_proxy.cpp    |  5 --
 .../delegate_task/include/delegate_tasks.h    |  4 +-
 .../src/input_device_manager.cpp              |  2 +-
 service/dinput/include/call_dinput_proxy.h    |  4 +-
 service/dinput/include/call_dinput_stub.h     |  2 +-
 service/dinput/include/dinput_callback.h      | 16 ++--
 service/dinput/include/dinput_manager.h       | 11 +--
 service/dinput/src/dinput_manager.cpp         |  5 --
 .../include/event_dispatch_handler.h          |  4 +-
 .../src/event_dispatch_handler.cpp            |  2 -
 .../include/event_filter_death_recipient.h    |  4 +-
 service/filter/include/event_filter_handler.h |  6 +-
 service/filter/include/event_filter_proxy.h   |  4 +-
 service/filter/include/event_filter_service.h |  6 +-
 service/filter/src/event_filter_handler.cpp   |  9 --
 service/filter/src/event_filter_proxy.cpp     |  5 --
 service/filter/src/event_filter_service.cpp   | 10 ---
 .../include/cooperate_event_handler.h         |  4 +-
 .../include/device_profile_adapter.h          |  2 +-
 .../include/distributed_input_adapter.h       | 22 ++---
 .../input_device_cooperate_state_free.h       |  4 +-
 .../include/input_device_cooperate_state_in.h |  6 +-
 .../input_device_cooperate_state_out.h        |  6 +-
 .../src/cooperate_event_handler.cpp           |  1 -
 .../src/input_device_cooperate_sm.cpp         |  2 +-
 .../src/input_device_cooperate_state_out.cpp  |  3 +-
 .../include/event_interceptor_handler.h       |  6 +-
 .../key_command/include/key_command_handler.h |  4 +-
 .../include/libinput_adapter.h                |  6 +-
 .../libinput_adapter/src/libinput_adapter.cpp |  4 -
 .../include/server_msg_handler.h              |  6 +-
 .../message_handle/src/server_msg_handler.cpp |  4 -
 .../test/server_msg_handler_test.cpp          | 45 ----------
 service/module_loader/include/mmi_service.h   | 88 +++++++++----------
 service/module_loader/include/uds_server.h    |  2 +-
 service/module_loader/src/uds_server.cpp      |  1 -
 .../monitor/include/event_monitor_handler.h   |  4 +-
 .../include/key_subscriber_handler.h          |  2 +-
 .../include/gesture_transform_processor.h     |  4 +-
 .../include/tablet_tool_tranform_processor.h  |  4 +-
 .../include/touch_transform_processor.h       |  4 +-
 .../include/touchpad_transform_processor.h    |  4 +-
 .../include/pointer_drawing_manager.h         | 34 +++----
 .../src/input_windows_manager.cpp             |  2 +-
 76 files changed, 240 insertions(+), 347 deletions(-)
 delete mode 100644 service/message_handle/test/server_msg_handler_test.cpp

diff --git a/frameworks/napi/distributed_input/include/js_input_dinput_context.h b/frameworks/napi/distributed_input/include/js_input_dinput_context.h
index 4431691e05..9d43639ff8 100644
--- a/frameworks/napi/distributed_input/include/js_input_dinput_context.h
+++ b/frameworks/napi/distributed_input/include/js_input_dinput_context.h
@@ -20,7 +20,7 @@
 
 namespace OHOS {
 namespace MMI {
-class JsInputDinputContext {
+class JsInputDinputContext final {
 public:
     JsInputDinputContext() = default;
     ~JsInputDinputContext() = default;
diff --git a/frameworks/napi/distributed_input/include/js_input_dinput_manager.h b/frameworks/napi/distributed_input/include/js_input_dinput_manager.h
index d74f30778a..b90964ff3e 100644
--- a/frameworks/napi/distributed_input/include/js_input_dinput_manager.h
+++ b/frameworks/napi/distributed_input/include/js_input_dinput_manager.h
@@ -49,7 +49,7 @@ public:
     T returnResult;
 };
 
-class JsInputDinputManager {
+class JsInputDinputManager final {
 public:
     napi_value PrepareRemoteInput(napi_env env, const std::string& deviceId, napi_ref handle);
     napi_value UnprepareRemoteInput(napi_env env, const std::string& deviceId, napi_ref handle);
diff --git a/frameworks/napi/input_device/include/js_event_target.h b/frameworks/napi/input_device/include/js_event_target.h
index add03f0de2..abd0a3cc08 100644
--- a/frameworks/napi/input_device/include/js_event_target.h
+++ b/frameworks/napi/input_device/include/js_event_target.h
@@ -32,7 +32,7 @@ namespace MMI {
 class JsEventTarget : public IInputDeviceListener, public std::enable_shared_from_this<JsEventTarget> {
 public:
     JsEventTarget();
-    ~JsEventTarget();
+    virtual ~JsEventTarget() = default;
     DISALLOW_COPY_AND_MOVE(JsEventTarget);
     static void EmitJsIds(int32_t userData, std::vector<int32_t> &ids);
     static void EmitJsDev(int32_t userData, std::shared_ptr<InputDevice> device);
@@ -43,8 +43,8 @@ public:
     void RemoveCallbackInfo(napi_env env, napi_value handle, int32_t userData);
     napi_value CreateCallbackInfo(napi_env env, napi_value handle, const int32_t userData, bool isApi9 = false);
     void ResetEnv();
-    virtual void OnDeviceAdded(int32_t deviceId, const std::string &type) override;
-    virtual void OnDeviceRemoved(int32_t deviceId, const std::string &type) override;
+    void OnDeviceAdded(int32_t deviceId, const std::string &type) override;
+    void OnDeviceRemoved(int32_t deviceId, const std::string &type) override;
 
 private:
     static void CallIdsPromiseWork(uv_work_t *work, int32_t status);
diff --git a/frameworks/napi/input_device/include/js_input_device_context.h b/frameworks/napi/input_device/include/js_input_device_context.h
index 08ac10b7af..9e78e180c2 100644
--- a/frameworks/napi/input_device/include/js_input_device_context.h
+++ b/frameworks/napi/input_device/include/js_input_device_context.h
@@ -20,7 +20,7 @@
 
 namespace OHOS {
 namespace MMI {
-class JsInputDeviceContext {
+class JsInputDeviceContext final {
 public:
     JsInputDeviceContext();
     DISALLOW_COPY_AND_MOVE(JsInputDeviceContext);
diff --git a/frameworks/napi/input_device/src/js_event_target.cpp b/frameworks/napi/input_device/src/js_event_target.cpp
index c24c33d258..ae423f4655 100755
--- a/frameworks/napi/input_device/src/js_event_target.cpp
+++ b/frameworks/napi/input_device/src/js_event_target.cpp
@@ -35,8 +35,6 @@ JsEventTarget::JsEventTarget()
     CK(ret.second, VAL_NOT_EXP);
 }
 
-JsEventTarget::~JsEventTarget() {}
-
 void JsEventTarget::EmitAddedDeviceEvent(uv_work_t *work, int32_t status)
 {
     CALL_DEBUG_ENTER;
@@ -290,7 +288,7 @@ void JsEventTarget::EmitJsIds(int32_t userData, std::vector<int32_t> &ids)
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
-    if ((uData) == nullptr) {
+    if (uData == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
         MMI_HILOGE("Check uData is null");
         return;
diff --git a/frameworks/napi/input_device_cooperate/include/js_event_target.h b/frameworks/napi/input_device_cooperate/include/js_event_target.h
index b34b8bc8eb..da0b8d8ced 100755
--- a/frameworks/napi/input_device_cooperate/include/js_event_target.h
+++ b/frameworks/napi/input_device_cooperate/include/js_event_target.h
@@ -36,7 +36,7 @@ namespace MMI {
 class JsEventTarget : public IInputDeviceCooperateListener, public std::enable_shared_from_this<JsEventTarget> {
 public:
     JsEventTarget();
-    ~JsEventTarget() = default;
+    virtual ~JsEventTarget() = default;
     DISALLOW_COPY_AND_MOVE(JsEventTarget);
 
     static void EmitJsEnable(int32_t userData, std::string deviceId, CooperationMessage msg);
@@ -55,8 +55,8 @@ public:
 
 private:
     inline static std::map<std::string_view, std::vector<std::unique_ptr<JsUtil::CallbackInfo>>>
-        cooperateListener_ = {};
-    inline static std::map<int32_t, std::unique_ptr<JsUtil::CallbackInfo>> callback_ = {};
+        cooperateListener_ {};
+    inline static std::map<int32_t, std::unique_ptr<JsUtil::CallbackInfo>> callback_ {};
     bool isListeningProcess_ { false };
 
     static void CallEnablePromsieWork(uv_work_t *work, int32_t status);
diff --git a/frameworks/napi/input_device_cooperate/include/js_input_device_cooperate_context.h b/frameworks/napi/input_device_cooperate/include/js_input_device_cooperate_context.h
index ff607762e2..875e0b42e1 100755
--- a/frameworks/napi/input_device_cooperate/include/js_input_device_cooperate_context.h
+++ b/frameworks/napi/input_device_cooperate/include/js_input_device_cooperate_context.h
@@ -25,7 +25,7 @@
 
 namespace OHOS {
 namespace MMI {
-class JsInputDeviceCooperateContext {
+class JsInputDeviceCooperateContext final {
 public:
     JsInputDeviceCooperateContext();
     ~JsInputDeviceCooperateContext();
diff --git a/frameworks/napi/input_monitor/include/js_input_monitor.h b/frameworks/napi/input_monitor/include/js_input_monitor.h
index 3d39198271..0bba34f04b 100644
--- a/frameworks/napi/input_monitor/include/js_input_monitor.h
+++ b/frameworks/napi/input_monitor/include/js_input_monitor.h
@@ -34,21 +34,21 @@ namespace MMI {
 using MapFun = std::map<std::string, std::function<int64_t()>>;
 
 
-class InputMonitor : public IInputEventConsumer,
-                     public std::enable_shared_from_this<InputMonitor> {
+class InputMonitor final : public IInputEventConsumer,
+                           public std::enable_shared_from_this<InputMonitor> {
 public:
     InputMonitor() = default;
     DISALLOW_COPY_AND_MOVE(InputMonitor);
-    virtual ~InputMonitor() = default;
+    ~InputMonitor() override = default;
 
     int32_t Start();
     void Stop();
     void MarkConsumed(int32_t eventId);
     void SetCallback(std::function<void(std::shared_ptr<PointerEvent>)> callback);
     void SetId(int32_t id);
-    virtual void OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override;
-    virtual void OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override;
-    virtual void OnInputEvent(std::shared_ptr<AxisEvent> axisEvent) const override;
+    void OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override;
+    void OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override;
+    void OnInputEvent(std::shared_ptr<AxisEvent> axisEvent) const override;
 
 private:
     std::function<void(std::shared_ptr<PointerEvent>)> callback_;
@@ -58,8 +58,7 @@ private:
     mutable std::mutex mutex_;
 };
 
-
-class JsInputMonitor {
+class JsInputMonitor final {
 public:
     static void JsCallback(uv_work_t *work, int32_t status);
     JsInputMonitor(napi_env jsEnv, const std::string &typeName, napi_value callback, int32_t id);
diff --git a/frameworks/napi/input_monitor/include/js_input_monitor_manager.h b/frameworks/napi/input_monitor/include/js_input_monitor_manager.h
index 89fcdf03be..839bbe229a 100644
--- a/frameworks/napi/input_monitor/include/js_input_monitor_manager.h
+++ b/frameworks/napi/input_monitor/include/js_input_monitor_manager.h
@@ -29,7 +29,7 @@
 
 namespace OHOS {
 namespace MMI {
-class JsInputMonitorManager {
+class JsInputMonitorManager final {
 public:
     static JsInputMonitorManager& GetInstance();
     DISALLOW_COPY_AND_MOVE(JsInputMonitorManager);
diff --git a/frameworks/napi/input_monitor/include/js_input_monitor_util.h b/frameworks/napi/input_monitor/include/js_input_monitor_util.h
index 5207d8299c..e6f5afbee6 100644
--- a/frameworks/napi/input_monitor/include/js_input_monitor_util.h
+++ b/frameworks/napi/input_monitor/include/js_input_monitor_util.h
@@ -20,21 +20,21 @@
 
 namespace OHOS {
 namespace MMI {
-        napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, bool value);
-        napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, uint16_t value);
-        napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, int32_t value);
-        napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, uint32_t value);
-        napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, float value);
-        napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, double value);
-        napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, int64_t value);
-        napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, std::string value);
-        napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, napi_value value);
+napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, bool value);
+napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, uint16_t value);
+napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, int32_t value);
+napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, uint32_t value);
+napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, float value);
+napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, double value);
+napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, int64_t value);
+napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, std::string value);
+napi_status SetNameProperty(const napi_env& env, napi_value object, const std::string& name, napi_value value);
 
-        bool GetNamePropertyBool(const napi_env& env, const napi_value& object, const std::string& name);
-        std::string GetNamePropertyString(const napi_env& env, const napi_value& object, const std::string& name);
-        int32_t GetNamePropertyInt32(const napi_env& env, const napi_value& object, const std::string& name);
-        int64_t GetNamePropertyInt64(const napi_env& env, const napi_value& object, const std::string& name);
-        uint32_t GetNamePropertyUint32(const napi_env& env, const napi_value& object, const std::string& name);
+bool GetNamePropertyBool(const napi_env& env, const napi_value& object, const std::string& name);
+std::string GetNamePropertyString(const napi_env& env, const napi_value& object, const std::string& name);
+int32_t GetNamePropertyInt32(const napi_env& env, const napi_value& object, const std::string& name);
+int64_t GetNamePropertyInt64(const napi_env& env, const napi_value& object, const std::string& name);
+uint32_t GetNamePropertyUint32(const napi_env& env, const napi_value& object, const std::string& name);
 } // namespace MMI
 } // namespace OHOS
 #endif // JS_INPUT_MONITOR_UTIL_H
diff --git a/frameworks/napi/key_code/include/js_key_code.h b/frameworks/napi/key_code/include/js_key_code.h
index 36c7affd72..c2d5a1b9dc 100644
--- a/frameworks/napi/key_code/include/js_key_code.h
+++ b/frameworks/napi/key_code/include/js_key_code.h
@@ -22,7 +22,7 @@
 
 namespace OHOS {
 namespace MMI {
-class JsKeyCode {
+class JsKeyCode final {
 public:
     JsKeyCode() = default;
     ~JsKeyCode() = default;
diff --git a/frameworks/napi/key_event/include/js_key_event.h b/frameworks/napi/key_event/include/js_key_event.h
index 9e8e15217c..e24767edc8 100644
--- a/frameworks/napi/key_event/include/js_key_event.h
+++ b/frameworks/napi/key_event/include/js_key_event.h
@@ -22,7 +22,7 @@
 
 namespace OHOS {
 namespace MMI {
-class JsKeyEvent {
+class JsKeyEvent final {
 public:
     JsKeyEvent() = default;
     ~JsKeyEvent() = default;
diff --git a/frameworks/napi/mouse_event/include/js_mouse_event.h b/frameworks/napi/mouse_event/include/js_mouse_event.h
index 9dcc6d2d14..f0d5782dad 100644
--- a/frameworks/napi/mouse_event/include/js_mouse_event.h
+++ b/frameworks/napi/mouse_event/include/js_mouse_event.h
@@ -22,7 +22,7 @@
 
 namespace OHOS {
 namespace MMI {
-class JsMouseEvent {
+class JsMouseEvent final {
 public:
     JsMouseEvent() = default;
     ~JsMouseEvent() = default;
diff --git a/frameworks/napi/pointer/include/js_pointer_manager.h b/frameworks/napi/pointer/include/js_pointer_manager.h
index a98bbbb16a..004153f72a 100644
--- a/frameworks/napi/pointer/include/js_pointer_manager.h
+++ b/frameworks/napi/pointer/include/js_pointer_manager.h
@@ -49,7 +49,7 @@ struct AsyncContext : RefBase {
     ~AsyncContext();
 };
 
-class JsPointerManager {
+class JsPointerManager final {
 public:
     JsPointerManager() = default;
     ~JsPointerManager() = default;
diff --git a/frameworks/napi/touch_event/include/js_touch_event.h b/frameworks/napi/touch_event/include/js_touch_event.h
index 20363bf675..77ceab88d4 100644
--- a/frameworks/napi/touch_event/include/js_touch_event.h
+++ b/frameworks/napi/touch_event/include/js_touch_event.h
@@ -22,7 +22,7 @@
 
 namespace OHOS {
 namespace MMI {
-class JsTouchEvent {
+class JsTouchEvent final {
 public:
     JsTouchEvent() = default;
     ~JsTouchEvent() = default;
diff --git a/frameworks/proxy/event_handler/include/bytrace_adapter.h b/frameworks/proxy/event_handler/include/bytrace_adapter.h
index c8dcd3b190..36782c7a4d 100644
--- a/frameworks/proxy/event_handler/include/bytrace_adapter.h
+++ b/frameworks/proxy/event_handler/include/bytrace_adapter.h
@@ -22,7 +22,7 @@
 
 namespace OHOS {
 namespace MMI {
-class BytraceAdapter {
+class BytraceAdapter final {
 public:
     enum TraceBtn {
         TRACE_STOP = 0,
diff --git a/frameworks/proxy/event_handler/include/client_msg_handler.h b/frameworks/proxy/event_handler/include/client_msg_handler.h
index 385f030b7e..6dfb4c3979 100644
--- a/frameworks/proxy/event_handler/include/client_msg_handler.h
+++ b/frameworks/proxy/event_handler/include/client_msg_handler.h
@@ -23,11 +23,11 @@
 namespace OHOS {
 namespace MMI {
 typedef std::function<int32_t(const UDSClient&, NetPacket&)> ClientMsgFun;
-class ClientMsgHandler : public MsgHandler<MmiMessageId, ClientMsgFun> {
+class ClientMsgHandler final : public MsgHandler<MmiMessageId, ClientMsgFun> {
 public:
     ClientMsgHandler() = default;
     DISALLOW_COPY_AND_MOVE(ClientMsgHandler);
-    virtual ~ClientMsgHandler();
+    ~ClientMsgHandler() override = default;
 
     void Init();
     void InitProcessedCallback();
diff --git a/frameworks/proxy/event_handler/include/input_device_cooperate_impl.h b/frameworks/proxy/event_handler/include/input_device_cooperate_impl.h
index bcdb0788f0..6ed06919b3 100755
--- a/frameworks/proxy/event_handler/include/input_device_cooperate_impl.h
+++ b/frameworks/proxy/event_handler/include/input_device_cooperate_impl.h
@@ -27,7 +27,7 @@
 
 namespace OHOS {
 namespace MMI {
-class InputDeviceCooperateImpl {
+class InputDeviceCooperateImpl final {
 public:
     static InputDeviceCooperateImpl &GetInstance();
     DISALLOW_COPY_AND_MOVE(InputDeviceCooperateImpl);
diff --git a/frameworks/proxy/event_handler/include/input_device_impl.h b/frameworks/proxy/event_handler/include/input_device_impl.h
index 792833e227..3b8463b46e 100755
--- a/frameworks/proxy/event_handler/include/input_device_impl.h
+++ b/frameworks/proxy/event_handler/include/input_device_impl.h
@@ -29,7 +29,7 @@
 namespace OHOS {
 namespace MMI {
 class NetPacket;
-class InputDeviceImpl {
+class InputDeviceImpl final {
 public:
     static InputDeviceImpl& GetInstance();
     DISALLOW_COPY_AND_MOVE(InputDeviceImpl);
diff --git a/frameworks/proxy/event_handler/include/input_interceptor_manager.h b/frameworks/proxy/event_handler/include/input_interceptor_manager.h
index 853bfba307..862a9fed35 100644
--- a/frameworks/proxy/event_handler/include/input_interceptor_manager.h
+++ b/frameworks/proxy/event_handler/include/input_interceptor_manager.h
@@ -26,13 +26,13 @@
 
 namespace OHOS {
 namespace MMI {
-class InputInterceptorManager : public InputHandlerManager {
+class InputInterceptorManager final : public InputHandlerManager {
     DECLARE_DELAYED_SINGLETON(InputInterceptorManager);
 public:
     DISALLOW_COPY_AND_MOVE(InputInterceptorManager);
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, HandleEventType eventType);
     void RemoveInterceptor(int32_t interceptorId);
-    virtual InputHandlerType GetHandlerType() const override;
+    InputHandlerType GetHandlerType() const override;
 };
 
 inline InputHandlerType InputInterceptorManager::GetHandlerType() const
diff --git a/frameworks/proxy/event_handler/include/input_monitor_manager.h b/frameworks/proxy/event_handler/include/input_monitor_manager.h
index 7292d5d281..4bc2a205be 100644
--- a/frameworks/proxy/event_handler/include/input_monitor_manager.h
+++ b/frameworks/proxy/event_handler/include/input_monitor_manager.h
@@ -26,14 +26,14 @@
 
 namespace OHOS {
 namespace MMI {
-class InputMonitorManager : public InputHandlerManager {
+class InputMonitorManager final : public InputHandlerManager {
     DECLARE_DELAYED_SINGLETON(InputMonitorManager);
 public:
     DISALLOW_COPY_AND_MOVE(InputMonitorManager);
     int32_t AddMonitor(std::shared_ptr<IInputEventConsumer> monitor);
     void RemoveMonitor(int32_t monitorId);
     void MarkConsumed(int32_t monitorId, int32_t eventId);
-    virtual InputHandlerType GetHandlerType() const override;
+    InputHandlerType GetHandlerType() const override;
 
 public:
     static bool IsValidMonitorId(int32_t monitorId);
diff --git a/frameworks/proxy/event_handler/src/client_msg_handler.cpp b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
index 6625570063..a12857f8c1 100644
--- a/frameworks/proxy/event_handler/src/client_msg_handler.cpp
+++ b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
@@ -47,11 +47,6 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "ClientMsgHandler"};
 } // namespace
 
-ClientMsgHandler::~ClientMsgHandler()
-{
-    dispatchCallback_ = nullptr;
-}
-
 void ClientMsgHandler::Init()
 {
     MsgCallback funs[] = {
diff --git a/frameworks/proxy/events/include/event_log_helper.h b/frameworks/proxy/events/include/event_log_helper.h
index 77524d908e..d181bd55e5 100644
--- a/frameworks/proxy/events/include/event_log_helper.h
+++ b/frameworks/proxy/events/include/event_log_helper.h
@@ -25,7 +25,7 @@
 
 namespace OHOS {
 namespace MMI {
-class EventLogHelper {
+class EventLogHelper final {
     static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "EventLogHelper" };
 
 public:
diff --git a/frameworks/proxy/module_loader/include/mmi_fd_listener.h b/frameworks/proxy/module_loader/include/mmi_fd_listener.h
index 67a475b430..03193d5ff0 100644
--- a/frameworks/proxy/module_loader/include/mmi_fd_listener.h
+++ b/frameworks/proxy/module_loader/include/mmi_fd_listener.h
@@ -20,15 +20,15 @@
 
 namespace OHOS {
 namespace MMI {
-class MMIFdListener : public AppExecFwk::FileDescriptorListener {
+class MMIFdListener final : public AppExecFwk::FileDescriptorListener {
 public:
     explicit MMIFdListener(MMIClientPtr client);
     DISALLOW_COPY_AND_MOVE(MMIFdListener);
-    virtual ~MMIFdListener();
+    ~MMIFdListener() override = default;
 
-    virtual void OnReadable(int32_t fd) override;
-    virtual void OnShutdown(int32_t fd) override;
-    virtual void OnException(int32_t fd) override;
+    void OnReadable(int32_t fd) override;
+    void OnShutdown(int32_t fd) override;
+    void OnException(int32_t fd) override;
 
 private:
     MMIClientPtr mmiClient_ { nullptr };
diff --git a/frameworks/proxy/module_loader/src/mmi_fd_listener.cpp b/frameworks/proxy/module_loader/src/mmi_fd_listener.cpp
index 3575f229ba..0229b7026d 100644
--- a/frameworks/proxy/module_loader/src/mmi_fd_listener.cpp
+++ b/frameworks/proxy/module_loader/src/mmi_fd_listener.cpp
@@ -32,10 +32,6 @@ MMIFdListener::MMIFdListener(MMIClientPtr client) : mmiClient_(client)
 {
     CALL_DEBUG_ENTER;
 }
-MMIFdListener::~MMIFdListener()
-{
-    CALL_DEBUG_ENTER;
-}
 
 void MMIFdListener::OnReadable(int32_t fd)
 {
diff --git a/service/BUILD.gn b/service/BUILD.gn
index b50a1294a3..f7adcbcf75 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -625,7 +625,6 @@ ohos_unittest("ut-mmi-service-out") {
 
   sources = [
     "event_dispatch/test/event_dispatch_test.cpp",
-    "message_handle/test/server_msg_handler_test.cpp",
     "module_loader/test/uds_server_test.cpp",
     "window_manager/test/input_windows_manager_test.cpp",
   ]
diff --git a/service/connect_manager/include/multimodal_input_connect_death_recipient.h b/service/connect_manager/include/multimodal_input_connect_death_recipient.h
index b55a96d692..c74f4d5136 100644
--- a/service/connect_manager/include/multimodal_input_connect_death_recipient.h
+++ b/service/connect_manager/include/multimodal_input_connect_death_recipient.h
@@ -21,12 +21,12 @@
 
 namespace OHOS {
 namespace MMI {
-class MultimodalInputConnectDeathRecipient : public IRemoteObject::DeathRecipient {
+class MultimodalInputConnectDeathRecipient final : public IRemoteObject::DeathRecipient {
 public:
     explicit MultimodalInputConnectDeathRecipient(const std::function<void(const wptr<IRemoteObject> &object)>
                                                   &deathCallback);
     DISALLOW_COPY_AND_MOVE(MultimodalInputConnectDeathRecipient);
-    virtual ~MultimodalInputConnectDeathRecipient() = default;
+    ~MultimodalInputConnectDeathRecipient() override = default;
     void OnRemoteDied(const wptr<IRemoteObject> &object) override;
 
 private:
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
index 0ffc175114..c46e31c799 100644
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -27,9 +27,9 @@
 
 namespace OHOS {
 namespace MMI {
-class MultimodalInputConnectManager : public std::enable_shared_from_this<MultimodalInputConnectManager> {
+class MultimodalInputConnectManager final : public std::enable_shared_from_this<MultimodalInputConnectManager> {
 public:
-    virtual ~MultimodalInputConnectManager() = default;
+    ~MultimodalInputConnectManager() = default;
     static std::shared_ptr<MultimodalInputConnectManager> GetInstance();
     int32_t AllocSocketPair(const int32_t moduleType);
     int32_t GetClientSocketFdOfAllocedSocketPair() const;
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
index cff5fad685..173f8a79a0 100644
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -29,47 +29,47 @@ class MultimodalInputConnectProxy final : public IRemoteProxy<IMultimodalInputCo
 public:
     explicit MultimodalInputConnectProxy(const sptr<IRemoteObject> &impl);
     DISALLOW_COPY_AND_MOVE(MultimodalInputConnectProxy);
-    virtual ~MultimodalInputConnectProxy() override;
-    virtual int32_t AllocSocketFd(const std::string &programName, const int32_t moduleType,
+    ~MultimodalInputConnectProxy() override = default;
+    int32_t AllocSocketFd(const std::string &programName, const int32_t moduleType,
         int32_t &socketFd, int32_t &tokenType) override;
-    virtual int32_t AddInputEventFilter(sptr<IEventFilter> filter) override;
-    virtual int32_t SetPointerVisible(bool visible) override;
-    virtual int32_t IsPointerVisible(bool &visible) override;
-    virtual int32_t SetPointerSpeed(int32_t speed) override;
-    virtual int32_t GetPointerSpeed(int32_t &speed) override;
-    virtual int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle) override;
-    virtual int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle) override;
-    virtual int32_t SupportKeys(int32_t userData, int32_t deviceId, std::vector<int32_t> &keys) override;
-    virtual int32_t GetDeviceIds(int32_t userData) override;
-    virtual int32_t GetDevice(int32_t userData, int32_t deviceId) override;
-    virtual int32_t RegisterDevListener() override;
-    virtual int32_t UnregisterDevListener() override;
-    virtual int32_t GetKeyboardType(int32_t userData, int32_t deviceId) override;
-    virtual int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType) override;
-    virtual int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType) override;
-    virtual int32_t MarkEventConsumed(int32_t eventId) override;
-    virtual int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY) override;
-    virtual int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
-    virtual int32_t SubscribeKeyEvent(int32_t subscribeId, const std::shared_ptr<KeyOption> option) override;
-    virtual int32_t UnsubscribeKeyEvent(int32_t subscribeId) override;
-    virtual int32_t InjectPointerEvent(const std::shared_ptr<PointerEvent> pointerEvent) override;
-    virtual int32_t SetAnrObserver() override;
-    virtual int32_t RegisterCooperateListener() override;
-    virtual int32_t UnregisterCooperateListener() override;
-    virtual int32_t EnableInputDeviceCooperate(int32_t userData, bool enabled) override;
-    virtual int32_t StartInputDeviceCooperate(int32_t userData, const std::string &sinkDeviceId,
+    int32_t AddInputEventFilter(sptr<IEventFilter> filter) override;
+    int32_t SetPointerVisible(bool visible) override;
+    int32_t IsPointerVisible(bool &visible) override;
+    int32_t SetPointerSpeed(int32_t speed) override;
+    int32_t GetPointerSpeed(int32_t &speed) override;
+    int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle) override;
+    int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle) override;
+    int32_t SupportKeys(int32_t userData, int32_t deviceId, std::vector<int32_t> &keys) override;
+    int32_t GetDeviceIds(int32_t userData) override;
+    int32_t GetDevice(int32_t userData, int32_t deviceId) override;
+    int32_t RegisterDevListener() override;
+    int32_t UnregisterDevListener() override;
+    int32_t GetKeyboardType(int32_t userData, int32_t deviceId) override;
+    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType) override;
+    int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType) override;
+    int32_t MarkEventConsumed(int32_t eventId) override;
+    int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY) override;
+    int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
+    int32_t SubscribeKeyEvent(int32_t subscribeId, const std::shared_ptr<KeyOption> option) override;
+    int32_t UnsubscribeKeyEvent(int32_t subscribeId) override;
+    int32_t InjectPointerEvent(const std::shared_ptr<PointerEvent> pointerEvent) override;
+    int32_t SetAnrObserver() override;
+    int32_t RegisterCooperateListener() override;
+    int32_t UnregisterCooperateListener() override;
+    int32_t EnableInputDeviceCooperate(int32_t userData, bool enabled) override;
+    int32_t StartInputDeviceCooperate(int32_t userData, const std::string &sinkDeviceId,
         int32_t srcInputDeviceId) override;
-    virtual int32_t StopDeviceCooperate(int32_t userData) override;
-    virtual int32_t GetInputDeviceCooperateState(int32_t userData, const std::string &deviceId) override;
-    virtual int32_t SetInputDevice(const std::string& dhid, const std::string& screenId) override;
-    virtual int32_t StartRemoteCooperate(const std::string &localDeviceId) override;
-    virtual int32_t StartRemoteCooperateResult(bool isSuccess, const std::string& startDhid,
+    int32_t StopDeviceCooperate(int32_t userData) override;
+    int32_t GetInputDeviceCooperateState(int32_t userData, const std::string &deviceId) override;
+    int32_t SetInputDevice(const std::string& dhid, const std::string& screenId) override;
+    int32_t StartRemoteCooperate(const std::string &localDeviceId) override;
+    int32_t StartRemoteCooperateResult(bool isSuccess, const std::string& startDhid,
         int32_t xPercent, int32_t yPercent) override;
-    virtual int32_t StopRemoteCooperate() override;
-    virtual int32_t StopRemoteCooperateResult(bool isSuccess) override;
-    virtual int32_t StartCooperateOtherResult(const std::string &srcNetworkId) override;
-    virtual int32_t GetFunctionKeyState(int32_t funcKey, bool &state) override;
-    virtual int32_t SetFunctionKeyState(int32_t funcKey, bool enable) override;
+    int32_t StopRemoteCooperate() override;
+    int32_t StopRemoteCooperateResult(bool isSuccess) override;
+    int32_t StartCooperateOtherResult(const std::string &srcNetworkId) override;
+    int32_t GetFunctionKeyState(int32_t funcKey, bool &state) override;
+    int32_t SetFunctionKeyState(int32_t funcKey, bool enable) override;
 
 private:
     static inline BrokerDelegator<MultimodalInputConnectProxy> delegator_;
diff --git a/service/connect_manager/include/multimodal_input_connect_remoter.h b/service/connect_manager/include/multimodal_input_connect_remoter.h
index d587c48e0d..88c37793bf 100755
--- a/service/connect_manager/include/multimodal_input_connect_remoter.h
+++ b/service/connect_manager/include/multimodal_input_connect_remoter.h
@@ -26,9 +26,9 @@
 
 namespace OHOS {
 namespace MMI {
-class MultimodalInputConnectRemoter : public std::enable_shared_from_this<MultimodalInputConnectRemoter> {
+class MultimodalInputConnectRemoter final : public std::enable_shared_from_this<MultimodalInputConnectRemoter> {
 public:
-    virtual ~MultimodalInputConnectRemoter() = default;
+    ~MultimodalInputConnectRemoter() = default;
     static std::shared_ptr<MultimodalInputConnectRemoter> GetInstance();
     int32_t StartRemoteCooperate(const std::string &localDeviceId, const std::string &remoteDeviceId);
     int32_t StartRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess,
diff --git a/service/connect_manager/include/multimodal_input_connect_stub.h b/service/connect_manager/include/multimodal_input_connect_stub.h
index 66666a841f..9ebdde5412 100644
--- a/service/connect_manager/include/multimodal_input_connect_stub.h
+++ b/service/connect_manager/include/multimodal_input_connect_stub.h
@@ -30,7 +30,7 @@ class MultimodalInputConnectStub : public IRemoteStub<IMultimodalInputConnect> {
 public:
     MultimodalInputConnectStub() = default;
     DISALLOW_COPY_AND_MOVE(MultimodalInputConnectStub);
-    ~MultimodalInputConnectStub() = default;
+    virtual ~MultimodalInputConnectStub() = default;
 
     virtual bool IsRunning() const = 0;
     virtual int32_t OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply,
diff --git a/service/connect_manager/src/multimodal_input_connect_def_parcel.cpp b/service/connect_manager/src/multimodal_input_connect_def_parcel.cpp
index a6ef69b52f..192f2aaf0f 100644
--- a/service/connect_manager/src/multimodal_input_connect_def_parcel.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_def_parcel.cpp
@@ -25,10 +25,7 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Multi
 bool ConnectReqParcel::Marshalling(Parcel& out) const
 {
     WRITEINT32(out, data.moduleId);
-    if (!out.WriteString(data.clientName)) {
-        return false;
-    }
-    return true;
+    return out.WriteString(data.clientName);
 }
 
 ConnectReqParcel *ConnectReqParcel::Unmarshalling(Parcel& in)
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index ac46ceb23f..72263da364 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -33,11 +33,6 @@ MultimodalInputConnectProxy::MultimodalInputConnectProxy(const sptr<IRemoteObjec
     MMI_HILOGD("Enter MultimodalInputConnectProxy");
 }
 
-MultimodalInputConnectProxy::~MultimodalInputConnectProxy()
-{
-    MMI_HILOGD("Enter ~MultimodalInputConnectProxy");
-}
-
 int32_t MultimodalInputConnectProxy::AllocSocketFd(const std::string &programName,
     const int32_t moduleType, int32_t &socketFd, int32_t &tokenType)
 {
diff --git a/service/delegate_task/include/delegate_tasks.h b/service/delegate_task/include/delegate_tasks.h
index da2c8d9f45..457426a678 100644
--- a/service/delegate_task/include/delegate_tasks.h
+++ b/service/delegate_task/include/delegate_tasks.h
@@ -27,7 +27,7 @@
 namespace OHOS {
 namespace MMI {
 using DTaskCallback = std::function<int32_t()>;
-class DelegateTasks : public IdFactory<int32_t> {
+class DelegateTasks final : public IdFactory<int32_t> {
 public:
     struct TaskData {
         uint64_t tid { 0 };
@@ -68,7 +68,7 @@ public:
 
 public:
     DelegateTasks() = default;
-    virtual ~DelegateTasks() = default;
+    ~DelegateTasks() override = default;
 
     bool Init();
     void ProcessTasks();
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 1f744c7e50..c60d116199 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -616,7 +616,7 @@ bool InputDeviceManager::HasLocalPointerDevice() const
 
 bool InputDeviceManager::IsRemote(struct libinput_device *inputDevice) const
 {
-    CHKPR(inputDevice, false);
+    CHKPF(inputDevice);
     bool isRemote = false;
     const char* name = libinput_device_get_name(inputDevice);
     if (name == nullptr || name[0] == '\0') {
diff --git a/service/dinput/include/call_dinput_proxy.h b/service/dinput/include/call_dinput_proxy.h
index dccc3816b2..96a8c3daea 100644
--- a/service/dinput/include/call_dinput_proxy.h
+++ b/service/dinput/include/call_dinput_proxy.h
@@ -26,8 +26,8 @@ namespace OHOS {
 namespace MMI {
 class CallDinputProxy final : public IRemoteProxy<ICallDinput> {
 public:
-    explicit CallDinputProxy(const sptr<IRemoteObject> &impl) {}
-    ~CallDinputProxy() = default;
+    explicit CallDinputProxy(const sptr<IRemoteObject> &impl) = default;
+    ~CallDinputProxy() override = default;
     int32_t HandlePrepareDinput(const std::string &deviceId, int32_t status) override;
     int32_t HandleUnprepareDinput(const std::string &deviceId, int32_t status) override;
     int32_t HandleStartDinput(const std::string &deviceId, uint32_t inputTypes, int32_t status) override;
diff --git a/service/dinput/include/call_dinput_stub.h b/service/dinput/include/call_dinput_stub.h
index f906129dd2..6e669d6599 100644
--- a/service/dinput/include/call_dinput_stub.h
+++ b/service/dinput/include/call_dinput_stub.h
@@ -27,7 +27,7 @@ namespace MMI {
 class CallDinputStub : public IRemoteStub<ICallDinput> {
 public:
     CallDinputStub() = default;
-    ~CallDinputStub() = default;
+    virtual ~CallDinputStub() = default;
     int32_t OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& options) override;
 protected:
     int32_t StubHandlePrepareDinput(MessageParcel& data, MessageParcel& reply);
diff --git a/service/dinput/include/dinput_callback.h b/service/dinput/include/dinput_callback.h
index 2c55624007..01d3f6e4b3 100644
--- a/service/dinput/include/dinput_callback.h
+++ b/service/dinput/include/dinput_callback.h
@@ -29,37 +29,37 @@
 
 namespace OHOS {
 namespace MMI {
-class PrepareDInputCallback : public OHOS::DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
+class PrepareDInputCallback final : public OHOS::DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
 public:
     explicit PrepareDInputCallback(sptr<ICallDinput> prepareDinput) : callback_(prepareDinput) {}
-    ~PrepareDInputCallback() = default;
+    ~PrepareDInputCallback() override = default;
     void OnResult(const std::string& deviceId, const int32_t& status) override;
 private:
     sptr<ICallDinput> callback_ { nullptr };
 };
 
-class StartDInputCallback : public OHOS::DistributedHardware::DistributedInput::StartDInputCallbackStub {
+class StartDInputCallback final : public OHOS::DistributedHardware::DistributedInput::StartDInputCallbackStub {
 public:
     explicit StartDInputCallback(sptr<ICallDinput> prepareDinput) : callback_(prepareDinput) {}
-    ~StartDInputCallback() = default;
+    ~StartDInputCallback() override = default;
     void OnResult(const std::string& deviceId, const uint32_t& inputTypes, const int32_t& status) override;
 private:
     sptr<ICallDinput> callback_ { nullptr };
 };
 
-class StopDInputCallback : public OHOS::DistributedHardware::DistributedInput::StopDInputCallbackStub {
+class StopDInputCallback final : public OHOS::DistributedHardware::DistributedInput::StopDInputCallbackStub {
 public:
     explicit StopDInputCallback(sptr<ICallDinput> prepareDinput) : callback_(prepareDinput) {}
-    ~StopDInputCallback() = default;
+    ~StopDInputCallback() override = default;
     void OnResult(const std::string& deviceId, const uint32_t& inputTypes, const int32_t& status) override;
 private:
     sptr<ICallDinput> callback_ { nullptr };
 };
 
-class UnprepareDInputCallback : public OHOS::DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
+class UnprepareDInputCallback final : public OHOS::DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
 public:
     explicit UnprepareDInputCallback(sptr<ICallDinput> prepareDinput) : callback_(prepareDinput) {}
-    ~UnprepareDInputCallback() = default;
+    ~UnprepareDInputCallback() override = default;
     void OnResult(const std::string& deviceId, const int32_t& status) override;
 private:
     sptr<ICallDinput> callback_ { nullptr };
diff --git a/service/dinput/include/dinput_manager.h b/service/dinput/include/dinput_manager.h
index 7a273976f3..08aaf53d59 100644
--- a/service/dinput/include/dinput_manager.h
+++ b/service/dinput/include/dinput_manager.h
@@ -38,11 +38,12 @@ struct DMouseLocation {
 class DInputManager final {
     DECLARE_DELAYED_SINGLETON(DInputManager);
 public:
-    static const uint32_t DEFAULT_ABILITY;
-    static const uint32_t MOUSE_ABILITY;
-    static const uint32_t KEYBOARD_ABILITY;
-    static const uint32_t TOUCH_ABILITY;
-    static const uint32_t FULL_ABILITY;
+    static constexpr uint32_t DEFAULT_ABILITY { 0 };
+    static constexpr uint32_t MOUSE_ABILITY { 1 };
+    static constexpr uint32_t KEYBOARD_ABILITY { 2 };
+    static constexpr uint32_t TOUCH_ABILITY { 4 };
+    static constexpr uint32_t FULL_ABILITY { 7 };
+
 public:
     DISALLOW_COPY_AND_MOVE(DInputManager);
     void SetMouseLocation(const DMouseLocation& info);
diff --git a/service/dinput/src/dinput_manager.cpp b/service/dinput/src/dinput_manager.cpp
index 2c3c8be186..bf02f683bb 100644
--- a/service/dinput/src/dinput_manager.cpp
+++ b/service/dinput/src/dinput_manager.cpp
@@ -25,11 +25,6 @@ namespace MMI {
 namespace {
 static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "DInputManager" };
 }
-const uint32_t DInputManager::DEFAULT_ABILITY = 0;
-const uint32_t DInputManager::MOUSE_ABILITY = 1;
-const uint32_t DInputManager::KEYBOARD_ABILITY = 2;
-const uint32_t DInputManager::TOUCH_ABILITY = 4;
-const uint32_t DInputManager::FULL_ABILITY = 7;
 
 DInputManager::DInputManager() {}
 DInputManager::~DInputManager() {}
diff --git a/service/event_dispatch/include/event_dispatch_handler.h b/service/event_dispatch/include/event_dispatch_handler.h
index b7990681ee..943bb17546 100644
--- a/service/event_dispatch/include/event_dispatch_handler.h
+++ b/service/event_dispatch/include/event_dispatch_handler.h
@@ -27,7 +27,7 @@
 
 namespace OHOS {
 namespace MMI {
-class EventDispatchHandler : public IInputEventHandler {
+class EventDispatchHandler final : public IInputEventHandler {
     struct MouseState {
         uint32_t type { PointerEvent::SOURCE_TYPE_UNKNOWN };
         uint32_t code { PointerEvent::BUTTON_NONE };
@@ -36,7 +36,7 @@ class EventDispatchHandler : public IInputEventHandler {
 public:
     EventDispatchHandler();
     DISALLOW_COPY_AND_MOVE(EventDispatchHandler);
-    virtual ~EventDispatchHandler();
+    ~EventDispatchHandler() override = default;
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     void HandleKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
diff --git a/service/event_dispatch/src/event_dispatch_handler.cpp b/service/event_dispatch/src/event_dispatch_handler.cpp
index 8583482fb0..4bb05ce2b7 100644
--- a/service/event_dispatch/src/event_dispatch_handler.cpp
+++ b/service/event_dispatch/src/event_dispatch_handler.cpp
@@ -50,8 +50,6 @@ EventDispatchHandler::EventDispatchHandler()
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 }
 
-EventDispatchHandler::~EventDispatchHandler() {}
-
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
 void EventDispatchHandler::HandleKeyEvent(const std::shared_ptr<KeyEvent> keyEvent)
 {
diff --git a/service/filter/include/event_filter_death_recipient.h b/service/filter/include/event_filter_death_recipient.h
index 9f37e95891..45ae94c80f 100644
--- a/service/filter/include/event_filter_death_recipient.h
+++ b/service/filter/include/event_filter_death_recipient.h
@@ -21,12 +21,12 @@
 
 namespace OHOS {
 namespace MMI {
-class EventFilterDeathRecipient : public IRemoteObject::DeathRecipient {
+class EventFilterDeathRecipient final : public IRemoteObject::DeathRecipient {
 public:
     explicit EventFilterDeathRecipient(const std::function<void(const wptr<IRemoteObject> &object)>
                                                   &deathCallback);
     DISALLOW_COPY_AND_MOVE(EventFilterDeathRecipient);
-    virtual ~EventFilterDeathRecipient() = default;
+    ~EventFilterDeathRecipient() override = default;
     void OnRemoteDied(const wptr<IRemoteObject> &object) override;
 
 private:
diff --git a/service/filter/include/event_filter_handler.h b/service/filter/include/event_filter_handler.h
index fcb8b10a62..db607470f3 100644
--- a/service/filter/include/event_filter_handler.h
+++ b/service/filter/include/event_filter_handler.h
@@ -24,11 +24,11 @@
 
 namespace OHOS {
 namespace MMI {
-class EventFilterHandler : public IInputEventHandler {
+class EventFilterHandler final : public IInputEventHandler {
 public:
-    EventFilterHandler();
+    EventFilterHandler() = default;
     DISALLOW_COPY_AND_MOVE(EventFilterHandler);
-    ~EventFilterHandler();
+    ~EventFilterHandler() override = default;
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     void HandleKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
diff --git a/service/filter/include/event_filter_proxy.h b/service/filter/include/event_filter_proxy.h
index f547440f1e..095d4d891b 100644
--- a/service/filter/include/event_filter_proxy.h
+++ b/service/filter/include/event_filter_proxy.h
@@ -28,8 +28,8 @@ class EventFilterProxy final : public IRemoteProxy<IEventFilter> {
 public:
     explicit EventFilterProxy(const sptr<IRemoteObject> &impl);
     DISALLOW_COPY_AND_MOVE(EventFilterProxy);
-    virtual ~EventFilterProxy() override;
-    virtual bool HandlePointerEvent(const std::shared_ptr<PointerEvent> event) override;
+    ~EventFilterProxy() override = default;
+    bool HandlePointerEvent(const std::shared_ptr<PointerEvent> event) override;
 private:
     static inline BrokerDelegator<EventFilterProxy> delegator_;
 };
diff --git a/service/filter/include/event_filter_service.h b/service/filter/include/event_filter_service.h
index 7dd1bac8d4..974a53685f 100644
--- a/service/filter/include/event_filter_service.h
+++ b/service/filter/include/event_filter_service.h
@@ -27,10 +27,10 @@ namespace MMI {
 enum class ServiceRunningState { STATE_NOT_START, STATE_RUNNING };
 class EventFilterService final : public EventFilterStub {
 public:
-    EventFilterService();
+    EventFilterService() = default;
     DISALLOW_COPY_AND_MOVE(EventFilterService);
-    ~EventFilterService();
-    virtual bool HandlePointerEvent(const std::shared_ptr<PointerEvent> event) override;
+    ~EventFilterService() override = default;
+    bool HandlePointerEvent(const std::shared_ptr<PointerEvent> event) override;
     void SetPointerEventPtr(std::function<bool(std::shared_ptr<PointerEvent>)> pointerFilter);
 
 private:
diff --git a/service/filter/src/event_filter_handler.cpp b/service/filter/src/event_filter_handler.cpp
index 7dee1d024e..73a0c3944a 100644
--- a/service/filter/src/event_filter_handler.cpp
+++ b/service/filter/src/event_filter_handler.cpp
@@ -24,15 +24,6 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "EventFilterHandler" };
 } // namespace
 
-EventFilterHandler::EventFilterHandler()
-{
-    CALL_DEBUG_ENTER;
-}
-
-EventFilterHandler::~EventFilterHandler()
-{
-    CALL_DEBUG_ENTER;
-}
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
 void EventFilterHandler::HandleKeyEvent(const std::shared_ptr<KeyEvent> keyEvent)
 {
diff --git a/service/filter/src/event_filter_proxy.cpp b/service/filter/src/event_filter_proxy.cpp
index 0cf9b0865b..838f7cc2db 100644
--- a/service/filter/src/event_filter_proxy.cpp
+++ b/service/filter/src/event_filter_proxy.cpp
@@ -32,11 +32,6 @@ EventFilterProxy::EventFilterProxy(const sptr<IRemoteObject> &impl) : IRemotePro
     MMI_HILOGI("EventFilterProxy()");
 }
 
-EventFilterProxy::~EventFilterProxy()
-{
-    MMI_HILOGI("~EventFilterProxy()");
-}
-
 bool EventFilterProxy::HandlePointerEvent(const std::shared_ptr<PointerEvent> event)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/filter/src/event_filter_service.cpp b/service/filter/src/event_filter_service.cpp
index eedf8202f6..a97b954de7 100644
--- a/service/filter/src/event_filter_service.cpp
+++ b/service/filter/src/event_filter_service.cpp
@@ -30,16 +30,6 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "EventFilterService" };
 } // namespace
 
-EventFilterService::EventFilterService()
-{
-    CALL_DEBUG_ENTER;
-}
-
-EventFilterService::~EventFilterService()
-{
-    CALL_DEBUG_ENTER;
-}
-
 void EventFilterService::SetPointerEventPtr(std::function<bool(std::shared_ptr<PointerEvent>)> pointerFilter)
 {
     pointerFilter_ = pointerFilter;
diff --git a/service/input_device_cooperate/include/cooperate_event_handler.h b/service/input_device_cooperate/include/cooperate_event_handler.h
index 1157ee2a65..4ffc0a694e 100755
--- a/service/input_device_cooperate/include/cooperate_event_handler.h
+++ b/service/input_device_cooperate/include/cooperate_event_handler.h
@@ -23,10 +23,10 @@
 
 namespace OHOS {
 namespace MMI {
-class CooperateEventHandler : public AppExecFwk::EventHandler {
+class CooperateEventHandler final : public AppExecFwk::EventHandler {
 public:
     explicit CooperateEventHandler(const std::shared_ptr<AppExecFwk::EventRunner> &runner);
-    virtual ~CooperateEventHandler();
+    ~CooperateEventHandler() override = default;
     bool ProxyPostTask(const Callback &callback, int64_t delayTime);
     bool ProxyPostTask(const Callback &callback, const std::string &name = std::string(), int64_t delayTime = 0);
     void ProxyRemoveTask(const std::string &name);
diff --git a/service/input_device_cooperate/include/device_profile_adapter.h b/service/input_device_cooperate/include/device_profile_adapter.h
index fe55fd3d9e..fe3c0f175e 100755
--- a/service/input_device_cooperate/include/device_profile_adapter.h
+++ b/service/input_device_cooperate/include/device_profile_adapter.h
@@ -30,7 +30,7 @@ namespace OHOS {
 namespace MMI {
 class DeviceProfileAdapter final {
     DECLARE_DELAYED_SINGLETON(DeviceProfileAdapter);
-    class ProfileEventCallbackImpl : public DeviceProfile::IProfileEventCallback {
+    class ProfileEventCallbackImpl final : public DeviceProfile::IProfileEventCallback {
     public:
         void OnSyncCompleted(const DeviceProfile::SyncResult &syncResults) override;
         void OnProfileChanged(const DeviceProfile::ProfileChangeNotification &changeNotification) override;
diff --git a/service/input_device_cooperate/include/distributed_input_adapter.h b/service/input_device_cooperate/include/distributed_input_adapter.h
index 1d1c9c55de..8bdb1da610 100644
--- a/service/input_device_cooperate/include/distributed_input_adapter.h
+++ b/service/input_device_cooperate/include/distributed_input_adapter.h
@@ -93,57 +93,57 @@ private:
         int32_t timerId { 0 };
     };
 
-    class StartDInputCallback : public DistributedHardware::DistributedInput::StartDInputCallbackStub {
+    class StartDInputCallback final : public DistributedHardware::DistributedInput::StartDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const uint32_t &inputTypes, const int32_t &status) override;
     };
 
-    class StopDInputCallback : public DistributedHardware::DistributedInput::StopDInputCallbackStub {
+    class StopDInputCallback final : public DistributedHardware::DistributedInput::StopDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const uint32_t &inputTypes, const int32_t &status) override;
     };
 
-    class StartDInputCallbackDHIds : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
+    class StartDInputCallbackDHIds final : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
     public:
         void OnResultDhids(const std::string &devId, const int32_t &status) override;
     };
 
-    class StopDInputCallbackDHIds : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
+    class StopDInputCallbackDHIds final : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
     public:
         void OnResultDhids(const std::string &devId, const int32_t &status) override;
     };
 
-    class StartDInputCallbackFds : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
+    class StartDInputCallbackFds final : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
     public:
         void OnResultDhids(const std::string &devId, const int32_t &status) override;
     };
 
-    class StopDInputCallbackFds : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
+    class StopDInputCallbackFds final : public DistributedHardware::DistributedInput::StartStopDInputsCallbackStub {
     public:
         void OnResultDhids(const std::string &devId, const int32_t &status) override;
     };
 
-    class PrepareStartDInputCallback : public DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
+    class PrepareStartDInputCallback final : public DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const int32_t &status) override;
     };
 
-    class UnPrepareStopDInputCallback : public DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
+    class UnPrepareStopDInputCallback final : public DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const int32_t &status) override;
     };
 
-    class PrepareStartDInputCallbackSink : public DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
+    class PrepareStartDInputCallbackSink final : public DistributedHardware::DistributedInput::PrepareDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const int32_t &status) override;
     };
 
-    class UnPrepareStopDInputCallbackSink : public DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
+    class UnPrepareStopDInputCallbackSink final : public DistributedHardware::DistributedInput::UnprepareDInputCallbackStub {
     public:
         void OnResult(const std::string &devId, const int32_t &status) override;
     };
 
-    class MouseStateChangeCallbackImpl : public DistributedHardware::DistributedInput::SimulationEventListenerStub {
+    class MouseStateChangeCallbackImpl final : public DistributedHardware::DistributedInput::SimulationEventListenerStub {
     public:
         int32_t OnSimulationEvent(uint32_t type, uint32_t code, int32_t value) override;
     };
diff --git a/service/input_device_cooperate/include/input_device_cooperate_state_free.h b/service/input_device_cooperate/include/input_device_cooperate_state_free.h
index b0903d7011..4ee4799b5f 100755
--- a/service/input_device_cooperate/include/input_device_cooperate_state_free.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_state_free.h
@@ -21,9 +21,9 @@
 
 namespace OHOS {
 namespace MMI {
-class InputDeviceCooperateStateFree : public IInputDeviceCooperateState {
+class InputDeviceCooperateStateFree final : public IInputDeviceCooperateState {
 public:
-    virtual int32_t StartInputDeviceCooperate(const std::string &remoteNetworkId, int32_t startInputDeviceId) override;
+    int32_t StartInputDeviceCooperate(const std::string &remoteNetworkId, int32_t startInputDeviceId) override;
 
 private:
     int32_t ProcessStart(const std::string &remoteNetworkId, int32_t startInputDeviceId);
diff --git a/service/input_device_cooperate/include/input_device_cooperate_state_in.h b/service/input_device_cooperate/include/input_device_cooperate_state_in.h
index 585c5d7c58..31ecf179b3 100755
--- a/service/input_device_cooperate/include/input_device_cooperate_state_in.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_state_in.h
@@ -20,11 +20,11 @@
 
 namespace OHOS {
 namespace MMI {
-class InputDeviceCooperateStateIn : public IInputDeviceCooperateState {
+class InputDeviceCooperateStateIn final : public IInputDeviceCooperateState {
 public:
     explicit InputDeviceCooperateStateIn(const std::string &startDhid);
-    virtual int32_t StartInputDeviceCooperate(const std::string &remoteNetworkId, int32_t startInputDeviceId) override;
-    virtual int32_t StopInputDeviceCooperate(const std::string &networkId) override;
+    int32_t StartInputDeviceCooperate(const std::string &remoteNetworkId, int32_t startInputDeviceId) override;
+    int32_t StopInputDeviceCooperate(const std::string &networkId) override;
 
 private:
     void ComeBack(const std::string &sinkNetworkId, int32_t startInputDeviceId);
diff --git a/service/input_device_cooperate/include/input_device_cooperate_state_out.h b/service/input_device_cooperate/include/input_device_cooperate_state_out.h
index 663a405ce7..871778bb51 100755
--- a/service/input_device_cooperate/include/input_device_cooperate_state_out.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_state_out.h
@@ -20,11 +20,11 @@
 
 namespace OHOS {
 namespace MMI {
-class InputDeviceCooperateStateOut : public IInputDeviceCooperateState {
+class InputDeviceCooperateStateOut final : public IInputDeviceCooperateState {
 public:
     explicit InputDeviceCooperateStateOut(const std::string &startDhid);
-    virtual int32_t StopInputDeviceCooperate(const std::string &networkId) override;
-    virtual void OnKeyboardOnline(const std::string &dhid) override;
+    int32_t StopInputDeviceCooperate(const std::string &networkId) override;
+    void OnKeyboardOnline(const std::string &dhid) override;
 
 private:
     void OnStopRemoteInput(bool isSuccess, const std::string &srcNetworkId);
diff --git a/service/input_device_cooperate/src/cooperate_event_handler.cpp b/service/input_device_cooperate/src/cooperate_event_handler.cpp
index ae3884ac47..8347fd93d5 100755
--- a/service/input_device_cooperate/src/cooperate_event_handler.cpp
+++ b/service/input_device_cooperate/src/cooperate_event_handler.cpp
@@ -22,7 +22,6 @@ CooperateEventHandler::CooperateEventHandler(
     : AppExecFwk::EventHandler(runner)
 {
 }
-CooperateEventHandler::~CooperateEventHandler() = default;
 
 bool CooperateEventHandler::ProxyPostTask(const Callback &callback, int64_t delayTime)
 {
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index de4e98643f..8d5660d9ed 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -334,7 +334,7 @@ bool InputDeviceCooperateSM::UpdateMouseLocation()
 {
     CALL_DEBUG_ENTER;
     auto pointerEvent = MouseEventHdr->GetPointerEvent();
-    CHKPR(pointerEvent, false);
+    CHKPF(pointerEvent);
     int32_t displayId = pointerEvent->GetTargetDisplayId();
     auto displayGroupInfo =  WinMgr->GetDisplayGroupInfo();
     struct DisplayInfo physicalDisplayInfo;
diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
index c60ca0aa8a..18298c9b11 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
@@ -30,8 +30,7 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputD
 
 InputDeviceCooperateStateOut::InputDeviceCooperateStateOut(const std::string& startDhid)
     : startDhid_(startDhid)
-{
-}
+{}
 
 int32_t InputDeviceCooperateStateOut::StopInputDeviceCooperate(const std::string &networkId)
 {
diff --git a/service/interceptor/include/event_interceptor_handler.h b/service/interceptor/include/event_interceptor_handler.h
index 1a87ee1a61..e7e10cbeac 100644
--- a/service/interceptor/include/event_interceptor_handler.h
+++ b/service/interceptor/include/event_interceptor_handler.h
@@ -69,13 +69,13 @@ private:
         SessionPtr session_ { nullptr };
     };
 
-    class InterceptorCollection : public IInputEventCollectionHandler, protected NoCopyable {
+    class InterceptorCollection final : public IInputEventCollectionHandler, protected NoCopyable {
     public:
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
-        virtual bool HandleEvent(std::shared_ptr<KeyEvent> keyEvent) override;
+        bool HandleEvent(std::shared_ptr<KeyEvent> keyEvent) override;
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
-        virtual bool HandleEvent(std::shared_ptr<PointerEvent> pointerEvent) override;
+        bool HandleEvent(std::shared_ptr<PointerEvent> pointerEvent) override;
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
         int32_t AddInterceptor(const SessionHandler& interceptor);
         void RemoveInterceptor(const SessionHandler& interceptor);
diff --git a/service/key_command/include/key_command_handler.h b/service/key_command/include/key_command_handler.h
index 7eb5ef5676..263cf98a4f 100755
--- a/service/key_command/include/key_command_handler.h
+++ b/service/key_command/include/key_command_handler.h
@@ -73,11 +73,11 @@ struct Sequence {
     Ability ability;
 };
 
-class KeyCommandHandler : public IInputEventHandler {
+class KeyCommandHandler final : public IInputEventHandler {
 public:
     KeyCommandHandler() = default;
     DISALLOW_COPY_AND_MOVE(KeyCommandHandler);
-    ~KeyCommandHandler() = default;
+    ~KeyCommandHandler() override = default;
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     void HandleKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
diff --git a/service/libinput_adapter/include/libinput_adapter.h b/service/libinput_adapter/include/libinput_adapter.h
index 5675aac98d..75d585e2da 100644
--- a/service/libinput_adapter/include/libinput_adapter.h
+++ b/service/libinput_adapter/include/libinput_adapter.h
@@ -27,13 +27,13 @@
 namespace OHOS {
 namespace MMI {
 typedef std::function<void(void *event)> FunInputEvent;
-class LibinputAdapter {
+class LibinputAdapter final {
 public:
     static void LoginfoPackagingTool(struct libinput_event *event);
     static int32_t DeviceLedUpdate(struct libinput_device *device, int32_t funcKey, bool isEnable);
-    LibinputAdapter();
+    LibinputAdapter() = default;
     DISALLOW_COPY_AND_MOVE(LibinputAdapter);
-    virtual ~LibinputAdapter();
+    ~LibinputAdapter() = default;
     bool Init(FunInputEvent funInputEvent, const std::string& seat_id = "seat0");
     void EventDispatch(struct epoll_event& ev);
     void Stop();
diff --git a/service/libinput_adapter/src/libinput_adapter.cpp b/service/libinput_adapter/src/libinput_adapter.cpp
index 326d04c8b4..b668fc2989 100644
--- a/service/libinput_adapter/src/libinput_adapter.cpp
+++ b/service/libinput_adapter/src/libinput_adapter.cpp
@@ -101,10 +101,6 @@ constexpr static libinput_interface LIBINPUT_INTERFACE = {
     },
 };
 
-LibinputAdapter::LibinputAdapter() {}
-
-LibinputAdapter::~LibinputAdapter() {}
-
 bool LibinputAdapter::Init(FunInputEvent funInputEvent, const std::string& seat_id)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
index 28a252e7cf..24f66b67e3 100644
--- a/service/message_handle/include/server_msg_handler.h
+++ b/service/message_handle/include/server_msg_handler.h
@@ -27,11 +27,11 @@
 namespace OHOS {
 namespace MMI {
 typedef std::function<int32_t(SessionPtr sess, NetPacket& pkt)> ServerMsgFun;
-class ServerMsgHandler : public MsgHandler<MmiMessageId, ServerMsgFun> {
+class ServerMsgHandler final : public MsgHandler<MmiMessageId, ServerMsgFun> {
 public:
-    ServerMsgHandler();
+    ServerMsgHandler() = default;
     DISALLOW_COPY_AND_MOVE(ServerMsgHandler);
-    virtual ~ServerMsgHandler() override;
+    ~ServerMsgHandler() override = default;
 
     void Init(UDSServer& udsServer);
     void OnMsgHandler(SessionPtr sess, NetPacket& pkt);
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index 7c8cbb9ff7..37b09d1bb3 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -41,10 +41,6 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ServerMsgHandler" };
 } // namespace
 
-ServerMsgHandler::ServerMsgHandler() {}
-
-ServerMsgHandler::~ServerMsgHandler() {}
-
 void ServerMsgHandler::Init(UDSServer& udsServer)
 {
     udsServer_ = &udsServer;
diff --git a/service/message_handle/test/server_msg_handler_test.cpp b/service/message_handle/test/server_msg_handler_test.cpp
deleted file mode 100644
index e77f0d90a4..0000000000
--- a/service/message_handle/test/server_msg_handler_test.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include "server_msg_handler.h"
-
-
-namespace OHOS {
-namespace MMI {
-namespace {
-using namespace testing::ext;
-} // namespace
-
-class ServerMsgHandlerTest : public testing::Test {
-public:
-    static void SetUpTestCase(void) {}
-    static void TearDownTestCase(void) {}
-};
-
-class ServerMsgHandlerUnitTest : public ServerMsgHandler {
-public:
-    int32_t OnInjectKeyEventTest(SessionPtr sess, std::shared_ptr<KeyEvent> keyEvent)
-    {
-#ifdef OHOS_BUILD_ENABLE_KEYBOARD
-        return OnInjectKeyEvent(keyEvent);
-#else
-        return ERROR_UNSUPPORT;
-#endif // OHOS_BUILD_ENABLE_KEYBOARD
-    }
-};
-} // namespace MMI
-} // namespace OHOS
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index b2a370f4b8..3552e54faa 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -41,60 +41,60 @@ class MMIService final : public UDSServer, public SystemAbility, public Multimod
     DISALLOW_COPY_AND_MOVE(MMIService);
 
 public:
-    virtual void OnStart() override;
-    virtual void OnStop() override;
+    void OnStart() override;
+    void OnStop() override;
     int32_t Dump(int32_t fd, const std::vector<std::u16string> &args) override;
-    virtual int32_t AllocSocketFd(const std::string &programName, const int32_t moduleType,
+    int32_t AllocSocketFd(const std::string &programName, const int32_t moduleType,
         int32_t &toReturnClientFd, int32_t &tokenType) override;
-    virtual int32_t AddInputEventFilter(sptr<IEventFilter> filter) override;
-    virtual int32_t SetPointerVisible(bool visible) override;
-    virtual int32_t IsPointerVisible(bool &visible) override;
-    virtual int32_t SetPointerSpeed(int32_t speed) override;
-    virtual int32_t GetPointerSpeed(int32_t &speed) override;
-    virtual int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle) override;
-    virtual int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle) override;
-    virtual int32_t SupportKeys(int32_t userData, int32_t deviceId, std::vector<int32_t> &keys) override;
-    virtual int32_t GetDeviceIds(int32_t userData) override;
-    virtual int32_t GetDevice(int32_t userData, int32_t deviceId) override;
-    virtual int32_t RegisterDevListener() override;
-    virtual int32_t UnregisterDevListener() override;
-    virtual int32_t GetKeyboardType(int32_t userData, int32_t deviceId) override;
-    virtual int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType) override;
-    virtual int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType) override;
-    virtual int32_t MarkEventConsumed(int32_t eventId) override;
-    virtual int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY) override;
-    virtual int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
-    virtual int32_t SubscribeKeyEvent(int32_t subscribeId, const std::shared_ptr<KeyOption> option) override;
-    virtual int32_t UnsubscribeKeyEvent(int32_t subscribeId) override;
-    virtual int32_t InjectPointerEvent(const std::shared_ptr<PointerEvent> pointerEvent) override;
-    virtual int32_t SetAnrObserver() override;
-    virtual int32_t RegisterCooperateListener() override;
-    virtual int32_t UnregisterCooperateListener() override;
-    virtual int32_t EnableInputDeviceCooperate(int32_t userData, bool enabled) override;
-    virtual int32_t StartInputDeviceCooperate(int32_t userData, const std::string &sinkDeviceId,
+    int32_t AddInputEventFilter(sptr<IEventFilter> filter) override;
+    int32_t SetPointerVisible(bool visible) override;
+    int32_t IsPointerVisible(bool &visible) override;
+    int32_t SetPointerSpeed(int32_t speed) override;
+    int32_t GetPointerSpeed(int32_t &speed) override;
+    int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle) override;
+    int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle) override;
+    int32_t SupportKeys(int32_t userData, int32_t deviceId, std::vector<int32_t> &keys) override;
+    int32_t GetDeviceIds(int32_t userData) override;
+    int32_t GetDevice(int32_t userData, int32_t deviceId) override;
+    int32_t RegisterDevListener() override;
+    int32_t UnregisterDevListener() override;
+    int32_t GetKeyboardType(int32_t userData, int32_t deviceId) override;
+    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType) override;
+    int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType) override;
+    int32_t MarkEventConsumed(int32_t eventId) override;
+    int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY) override;
+    int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
+    int32_t SubscribeKeyEvent(int32_t subscribeId, const std::shared_ptr<KeyOption> option) override;
+    int32_t UnsubscribeKeyEvent(int32_t subscribeId) override;
+    int32_t InjectPointerEvent(const std::shared_ptr<PointerEvent> pointerEvent) override;
+    int32_t SetAnrObserver() override;
+    int32_t RegisterCooperateListener() override;
+    int32_t UnregisterCooperateListener() override;
+    int32_t EnableInputDeviceCooperate(int32_t userData, bool enabled) override;
+    int32_t StartInputDeviceCooperate(int32_t userData, const std::string &sinkDeviceId,
         int32_t srcInputDeviceId) override;
-    virtual int32_t StopDeviceCooperate(int32_t userData) override;
-    virtual int32_t GetInputDeviceCooperateState(int32_t userData, const std::string &deviceId) override;
-    virtual int32_t SetInputDevice(const std::string& dhid, const std::string& screenId) override;
-    virtual int32_t StartRemoteCooperate(const std::string& localDeviceId) override;
-    virtual int32_t StartRemoteCooperateResult(bool isSuccess, const std::string& startDhid,
+    int32_t StopDeviceCooperate(int32_t userData) override;
+    int32_t GetInputDeviceCooperateState(int32_t userData, const std::string &deviceId) override;
+    int32_t SetInputDevice(const std::string& dhid, const std::string& screenId) override;
+    int32_t StartRemoteCooperate(const std::string& localDeviceId) override;
+    int32_t StartRemoteCooperateResult(bool isSuccess, const std::string& startDhid,
         int32_t xPercent, int32_t yPercent) override;
-    virtual int32_t StopRemoteCooperate() override;
-    virtual int32_t StopRemoteCooperateResult(bool isSuccess) override;
-    virtual int32_t StartCooperateOtherResult(const std::string& srcNetworkId) override;
-    virtual int32_t GetFunctionKeyState(int32_t funcKey, bool &state) override;
-    virtual int32_t SetFunctionKeyState(int32_t funcKey, bool enable) override;
+    int32_t StopRemoteCooperate() override;
+    int32_t StopRemoteCooperateResult(bool isSuccess) override;
+    int32_t StartCooperateOtherResult(const std::string& srcNetworkId) override;
+    int32_t GetFunctionKeyState(int32_t funcKey, bool &state) override;
+    int32_t SetFunctionKeyState(int32_t funcKey, bool enable) override;
 
 #ifdef OHOS_RSS_CLIENT
-    virtual void OnAddSystemAbility(int32_t systemAbilityId, const std::string& deviceId) override;
+    void OnAddSystemAbility(int32_t systemAbilityId, const std::string& deviceId) override;
 #endif
 
 protected:
-    virtual void OnConnected(SessionPtr s) override;
-    virtual void OnDisconnected(SessionPtr s) override;
-    virtual int32_t AddEpoll(EpollEventType type, int32_t fd) override;
+    void OnConnected(SessionPtr s) override;
+    void OnDisconnected(SessionPtr s) override;
+    int32_t AddEpoll(EpollEventType type, int32_t fd) override;
     int32_t DelEpoll(EpollEventType type, int32_t fd);
-    virtual bool IsRunning() const override;
+    bool IsRunning() const override;
 #if defined(OHOS_BUILD_ENABLE_POINTER) && defined(OHOS_BUILD_ENABLE_POINTER_DRAWING)
     int32_t CheckPointerVisible(bool &visible);
 #endif // OHOS_BUILD_ENABLE_POINTER && OHOS_BUILD_ENABLE_POINTER_DRAWING
diff --git a/service/module_loader/include/uds_server.h b/service/module_loader/include/uds_server.h
index de5d2cfeb2..ee17916c00 100644
--- a/service/module_loader/include/uds_server.h
+++ b/service/module_loader/include/uds_server.h
@@ -41,7 +41,7 @@ enum EpollEventType {
 using MsgServerFunCallback = std::function<void(SessionPtr, NetPacket&)>;
 class UDSServer : public UDSSocket, public IUdsServer {
 public:
-    UDSServer();
+    UDSServer() = default;
     DISALLOW_COPY_AND_MOVE(UDSServer);
     virtual ~UDSServer();
     void UdsStop();
diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp
index cac34aa782..06838d7df5 100644
--- a/service/module_loader/src/uds_server.cpp
+++ b/service/module_loader/src/uds_server.cpp
@@ -31,7 +31,6 @@ namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "UDSServer"};
 } // namespace
-UDSServer::UDSServer() {}
 
 UDSServer::~UDSServer()
 {
diff --git a/service/monitor/include/event_monitor_handler.h b/service/monitor/include/event_monitor_handler.h
index a8ea052429..974affb788 100644
--- a/service/monitor/include/event_monitor_handler.h
+++ b/service/monitor/include/event_monitor_handler.h
@@ -30,11 +30,11 @@
 
 namespace OHOS {
 namespace MMI {
-class EventMonitorHandler : public IInputEventHandler {
+class EventMonitorHandler final : public IInputEventHandler {
 public:
     EventMonitorHandler() = default;
     DISALLOW_COPY_AND_MOVE(EventMonitorHandler);
-    ~EventMonitorHandler() = default;
+    ~EventMonitorHandler() override = default;
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     void HandleKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
diff --git a/service/subscriber/include/key_subscriber_handler.h b/service/subscriber/include/key_subscriber_handler.h
index 080cde695e..c10a4eb227 100644
--- a/service/subscriber/include/key_subscriber_handler.h
+++ b/service/subscriber/include/key_subscriber_handler.h
@@ -30,7 +30,7 @@
 
 namespace OHOS {
 namespace MMI {
-class KeySubscriberHandler :  public IInputEventHandler {
+class KeySubscriberHandler final :  public IInputEventHandler {
 public:
     KeySubscriberHandler() = default;
     DISALLOW_COPY_AND_MOVE(KeySubscriberHandler);
diff --git a/service/touch_event_normalize/include/gesture_transform_processor.h b/service/touch_event_normalize/include/gesture_transform_processor.h
index 6d72ffc3b6..465bf8dea1 100644
--- a/service/touch_event_normalize/include/gesture_transform_processor.h
+++ b/service/touch_event_normalize/include/gesture_transform_processor.h
@@ -20,11 +20,11 @@
 
 namespace OHOS {
 namespace MMI {
-class GestureTransformProcessor : public TransformProcessor {
+class GestureTransformProcessor final : public TransformProcessor {
 public:
     explicit GestureTransformProcessor(int32_t deviceId);
     DISALLOW_COPY_AND_MOVE(GestureTransformProcessor);
-    virtual ~GestureTransformProcessor() = default;
+    ~GestureTransformProcessor() = default;
     std::shared_ptr<PointerEvent> OnEvent(struct libinput_event *event) override;
 
 private:
diff --git a/service/touch_event_normalize/include/tablet_tool_tranform_processor.h b/service/touch_event_normalize/include/tablet_tool_tranform_processor.h
index 85612c98c9..e5e1d6e94e 100644
--- a/service/touch_event_normalize/include/tablet_tool_tranform_processor.h
+++ b/service/touch_event_normalize/include/tablet_tool_tranform_processor.h
@@ -20,11 +20,11 @@
 
 namespace OHOS {
 namespace MMI {
-class TabletToolTransformProcessor : public TransformProcessor {
+class TabletToolTransformProcessor final : public TransformProcessor {
 public:
     explicit TabletToolTransformProcessor(int32_t deviceId);
     DISALLOW_COPY_AND_MOVE(TabletToolTransformProcessor);
-    virtual ~TabletToolTransformProcessor() = default;
+    ~TabletToolTransformProcessor() = default;
     std::shared_ptr<PointerEvent> OnEvent(struct libinput_event *event) override;
 
 private:
diff --git a/service/touch_event_normalize/include/touch_transform_processor.h b/service/touch_event_normalize/include/touch_transform_processor.h
index b1df3eed25..22ec3efea0 100644
--- a/service/touch_event_normalize/include/touch_transform_processor.h
+++ b/service/touch_event_normalize/include/touch_transform_processor.h
@@ -20,11 +20,11 @@
 
 namespace OHOS {
 namespace MMI {
-class TouchTransformProcessor : public TransformProcessor {
+class TouchTransformProcessor final : public TransformProcessor {
 public:
     explicit TouchTransformProcessor(int32_t deviceId);
     DISALLOW_COPY_AND_MOVE(TouchTransformProcessor);
-    virtual ~TouchTransformProcessor() = default;
+    ~TouchTransformProcessor() = default;
     std::shared_ptr<PointerEvent> OnEvent(struct libinput_event *event) override;
 
 private:
diff --git a/service/touch_event_normalize/include/touchpad_transform_processor.h b/service/touch_event_normalize/include/touchpad_transform_processor.h
index 71c883fe6f..53555abf9b 100644
--- a/service/touch_event_normalize/include/touchpad_transform_processor.h
+++ b/service/touch_event_normalize/include/touchpad_transform_processor.h
@@ -19,11 +19,11 @@
 
 namespace OHOS {
 namespace MMI {
-class TouchPadTransformProcessor : public TransformProcessor {
+class TouchPadTransformProcessor final : public TransformProcessor {
 public:
     explicit TouchPadTransformProcessor(int32_t deviceId);
     DISALLOW_COPY_AND_MOVE(TouchPadTransformProcessor);
-    virtual ~TouchPadTransformProcessor() = default;
+    ~TouchPadTransformProcessor() = default;
     std::shared_ptr<PointerEvent> OnEvent(struct libinput_event *event) override;
 
 private:
diff --git a/service/window_manager/include/pointer_drawing_manager.h b/service/window_manager/include/pointer_drawing_manager.h
index c6cba8d513..1dbccbe079 100644
--- a/service/window_manager/include/pointer_drawing_manager.h
+++ b/service/window_manager/include/pointer_drawing_manager.h
@@ -33,9 +33,9 @@
 
 namespace OHOS {
 namespace MMI {
-class PointerDrawingManager : public IPointerDrawingManager,
-                              public IDeviceObserver,
-                              public std::enable_shared_from_this<PointerDrawingManager> {
+class PointerDrawingManager final : public IPointerDrawingManager,
+                                    public IDeviceObserver,
+                                    public std::enable_shared_from_this<PointerDrawingManager> {
 public:
     static const int32_t IMAGE_WIDTH = 64;
     static const int32_t IMAGE_HEIGHT = 64;
@@ -43,21 +43,21 @@ public:
 public:
     PointerDrawingManager();
     DISALLOW_COPY_AND_MOVE(PointerDrawingManager);
-    ~PointerDrawingManager() = default;
+    ~PointerDrawingManager() override = default;
     void DrawPointer(int32_t displayId, int32_t physicalX, int32_t physicalY,
-        const MOUSE_ICON mouseStyle = MOUSE_ICON::DEFAULT);
-    void UpdateDisplayInfo(const DisplayInfo& displayInfo);
-    void OnDisplayInfo(const DisplayGroupInfo& displayGroupInfo);
-    void OnWindowInfo(const WinInfo &info);
-    void UpdatePointerDevice(bool hasPointerDevicee, bool isPointerVisible);
-    bool Init();
-    void DeletePointerVisible(int32_t pid);
-    int32_t SetPointerVisible(int32_t pid, bool visible);
-    int32_t SetPointerStyle(int32_t pid, int32_t windowId, int32_t pointerStyle);
-    int32_t GetPointerStyle(int32_t pid, int32_t windowId, int32_t &pointerStyle);
-    void DrawPointerStyle();
-    bool IsPointerVisible();
-    void SetPointerLocation(int32_t pid, int32_t x, int32_t y);
+        const MOUSE_ICON mouseStyle = MOUSE_ICON::DEFAULT) override;
+    void UpdateDisplayInfo(const DisplayInfo& displayInfo) override;
+    void OnDisplayInfo(const DisplayGroupInfo& displayGroupInfo) override;
+    void OnWindowInfo(const WinInfo &info) override;
+    void UpdatePointerDevice(bool hasPointerDevicee, bool isPointerVisible) override;
+    bool Init() override;
+    void DeletePointerVisible(int32_t pid) override;
+    int32_t SetPointerVisible(int32_t pid, bool visible) override;
+    int32_t SetPointerStyle(int32_t pid, int32_t windowId, int32_t pointerStyle) override;
+    int32_t GetPointerStyle(int32_t pid, int32_t windowId, int32_t &pointerStyle) override;
+    void DrawPointerStyle() override;
+    bool IsPointerVisible() override;
+    void SetPointerLocation(int32_t pid, int32_t x, int32_t y) override;
     void AdjustMouseFocus(ICON_TYPE iconType, int32_t &physicalX, int32_t &physicalY);
 
 private:
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 782decd89d..b6d2e51546 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -541,7 +541,7 @@ bool InputWindowsManager::IsNeedRefreshLayer(int32_t windowId)
         displayId = displayGroupInfo_.displaysInfo[0].id;
     }
     auto displayInfo = GetPhysicalDisplay(displayId);
-    CHKPR(displayInfo, false);
+    CHKPF(displayInfo);
     int32_t logicX = mouseLocation.physicalX + displayInfo->x;
     int32_t logicY = mouseLocation.physicalY + displayInfo->y;
     std::optional<WindowInfo> touchWindow = GetWindowInfo(logicX, logicY);
-- 
Gitee


From 27b2435267d4ba8f037006fd4c1a1c45b66c1517 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Sat, 22 Oct 2022 09:43:46 +0800
Subject: [PATCH 068/360] service thread mmi_service add watchdog

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ied245f1db842924817d8f7b330eee7d8bef1839d
---
 service/module_loader/include/mmi_service.h |  2 +-
 service/module_loader/src/mmi_service.cpp   | 12 ++++++------
 service/timer_manager/src/timer_manager.cpp |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index 7004974cb5..e521daac52 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -162,7 +162,7 @@ private:
     ServerMsgHandler sMsgHandler_;
     DelegateTasks delegateTasks_;
 
-    std::atomic_bool watchdogFlg_ { false };
+    std::atomic_bool threadStatusFlag_ { false };
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 523e416d50..bf2e12e701 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -315,15 +315,15 @@ void MMIService::OnStart()
 #endif
 
     TimerMgr->AddTimer(WATCHDOG_INTERVAL_TIME, -1, [this]() {
-        MMI_HILOGD("Set watchdog flag to true");
-        watchdogFlg_ = true;
+        MMI_HILOGD("Set thread status flag to true");
+        threadStatusFlag_ = true;
     });
     auto taskFunc = [this]() {
-        if (watchdogFlg_) {
-            MMI_HILOGD("Set watchdog flag to false");
-            watchdogFlg_ = false;
+        if (threadStatusFlag_) {
+            MMI_HILOGD("Set thread status flag to false");
+            threadStatusFlag_ = false;
         } else {
-            MMI_HILOGD("kill MMIService");
+            MMI_HILOGE("Watchdog happened, process exit");
             abort();
         }
     };
diff --git a/service/timer_manager/src/timer_manager.cpp b/service/timer_manager/src/timer_manager.cpp
index 33319566d6..e90873aca0 100644
--- a/service/timer_manager/src/timer_manager.cpp
+++ b/service/timer_manager/src/timer_manager.cpp
@@ -20,7 +20,7 @@ namespace MMI {
 namespace {
 constexpr int32_t MIN_DELAY = -1;
 constexpr int32_t MIN_INTERVAL = 50;
-constexpr int32_t MAX_INTERVAL = 10000;
+constexpr int32_t MAX_INTERVAL_MS = 10000;
 constexpr int32_t MAX_TIMER_COUNT = 64;
 constexpr int32_t NONEXISTENT_ID = -1;
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "TimerManager" };
@@ -80,8 +80,8 @@ int32_t TimerManager::AddTimerInternal(int32_t intervalMs, int32_t repeatCount,
 {
     if (intervalMs < MIN_INTERVAL) {
         intervalMs = MIN_INTERVAL;
-    } else if (intervalMs > MAX_INTERVAL) {
-        intervalMs = MAX_INTERVAL;
+    } else if (intervalMs > MAX_INTERVAL_MS) {
+        intervalMs = MAX_INTERVAL_MS;
     }
     if (!callback) {
         return NONEXISTENT_ID;
-- 
Gitee


From bbe484ac23b636aee86b26e193449c8d9ffe0a07 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Sat, 22 Oct 2022 09:54:36 +0800
Subject: [PATCH 069/360] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ib577f717968de8cdb7c3b7cac6af12d641b1dbad
---
 .../include/input_windows_manager.h           |  1 -
 util/common/include/error_multimodal.h        | 28 ++-----------------
 util/socket/test/uds_session_test.cpp         |  1 -
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
index 1e2e568168..4f971dddfe 100644
--- a/service/window_manager/include/input_windows_manager.h
+++ b/service/window_manager/include/input_windows_manager.h
@@ -140,7 +140,6 @@ private:
     std::map<int32_t, std::map<int32_t, int32_t>> pointerStyle_;
 #endif // OHOS_BUILD_ENABLE_POINTER
     DisplayGroupInfo displayGroupInfo_;
-    // physical coord
     MouseLocation mouseLocation_ = { -1, -1 };
 };
 
diff --git a/util/common/include/error_multimodal.h b/util/common/include/error_multimodal.h
index 778203b801..569ce68f04 100644
--- a/util/common/include/error_multimodal.h
+++ b/util/common/include/error_multimodal.h
@@ -34,10 +34,8 @@ enum MmiModuleType {
 constexpr ErrCode CLIENT_ERR_OFFSET = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_CLIENT);
 
 enum {
-    // 事件消费失败
-    EVENT_CONSUM_FAIL = CLIENT_ERR_OFFSET,
     // APL鉴权失败
-    CHECK_PERMISSION_FAIL
+    CHECK_PERMISSION_FAIL = CLIENT_ERR_OFFSET,
 };
 // Error code for event simulate
 constexpr ErrCode EVENT_SIMULATE_ERR_OFFSET = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_EVENT_SIMULATE);
@@ -49,7 +47,7 @@ enum {
     STREAM_BUF_READ_FAIL,
     // 事件注册失败
     EVENT_REG_FAIL,
-    // 注入携带参数错误
+    // 参数注入失败
     PARAM_INPUT_FAIL
 };
 // Error code for server
@@ -62,30 +60,20 @@ enum {
     UNKNOWN_EVENT,
     // 空指针
     ERROR_NULL_POINTER,
-    // 窗口管理器初始化失败
-    WINDOWS_MSG_INIT_FAIL,
     // libinput初始化失败
     LIBINPUT_INIT_FAIL,
     // 无效的输入参数
     PARAM_INPUT_INVALID,
-    // 键盘事件派发失败
-    KEY_EVENT_DISP_FAIL,
     // memcpy安全函数错误
     MEMCPY_SEC_FUN_FAIL,
     // 键盘事件封装失败
     KEY_EVENT_PKG_FAIL,
-    // sprintf_s安全函数错误
-    SPRINTF_S_SEC_FUN_FAIL,
     // 多设备相同事件返回标志
     MULTIDEVICE_SAME_EVENT_MARK,
     // GESTURE_SWIPE事件封装失败
     GESTURE_EVENT_PKG_FAIL,
-    // gesture swipe事件派发失败
-    GESTURE_EVENT_DISP_FAIL,
     // SA_Service初始化错误
     SASERVICE_INIT_FAIL,
-    // SA_Service权限不足
-    SASERVICE_PERMISSION_FAIL,
     // 增加session错误
     ADD_SESSION_FAIL,
     // make_shared错误
@@ -102,8 +90,6 @@ enum {
     MMISERVICE_NOT_RUNNING,
     // 代理任务启动失败
     ETASKS_INIT_FAIL,
-    // 委托任务队列已满
-    ETASKS_QUEUE_FULL,
     // 委托任务wait超时
     ETASKS_WAIT_TIMEOUT,
     // 委托任务wait延期
@@ -154,16 +140,6 @@ enum {
     // 监听增加失败
     INVALID_MONITOR_MON
 };
-
-enum REGISTER {
-    MMI_STANDARD_EVENT_SUCCESS = 1,
-    MMI_STANDARD_EVENT_INVALID_PARAM = -1,
-};
-
-enum MMI_SERVICE_STATUS {
-    // 多模服务不存在，多模输入服务异常
-    MMI_SERVICE_INVALID = -1,
-};
 } // namespace MMI
 } // namespace OHOS
 #endif // ERROR_MULTIMODAL_H
\ No newline at end of file
diff --git a/util/socket/test/uds_session_test.cpp b/util/socket/test/uds_session_test.cpp
index cb939d8baf..68def8fcd2 100644
--- a/util/socket/test/uds_session_test.cpp
+++ b/util/socket/test/uds_session_test.cpp
@@ -32,7 +32,6 @@ public:
     static void SetUpTestCase(void) {}
     static void TearDownTestCase(void) {}
     static constexpr char PROGRAM_NAME[] = "uds_sesion_test";
-    // 3 CONNECT_MODULE_TYPE_ST_TEST
     const int32_t moduleType_ = 3;
     static inline int32_t pid_ = 0;
     int32_t writeFd_ = -1;
-- 
Gitee


From 932333120919eeeca93f7daca4b05b3bb7677b2f Mon Sep 17 00:00:00 2001
From: test <gchenghu@126.com>
Date: Mon, 17 Oct 2022 14:24:26 +0800
Subject: [PATCH 070/360] fuzzer

Signed-off-by: test <gchenghu@126.com>
---
 .../input_device_cooperate/src/js_util.cpp    |  4 +--
 .../src/input_device_manager.cpp              |  6 ++---
 .../src/event_dispatch_handler.cpp            |  2 +-
 .../device_cooperate_softbus_adapter.h        |  6 ++---
 .../include/device_cooperate_softbus_define.h |  6 ++---
 .../include/input_device_cooperate_sm.h       |  1 +
 .../src/device_cooperate_softbus_adapter.cpp  | 25 ++++++++-----------
 .../src/device_profile_adapter.cpp            |  2 +-
 .../src/input_device_cooperate_sm.cpp         |  8 +++---
 .../src/input_device_cooperate_util.cpp       |  8 +++---
 .../src/mouse_event_normalize.cpp             |  4 +--
 11 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/frameworks/napi/input_device_cooperate/src/js_util.cpp b/frameworks/napi/input_device_cooperate/src/js_util.cpp
index 456a197dd3..457a225804 100755
--- a/frameworks/napi/input_device_cooperate/src/js_util.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_util.cpp
@@ -81,8 +81,8 @@ napi_value JsUtil::GetResult(napi_env env, bool result, int32_t errCode)
             return nullptr;
         }
         napi_value resultCode = nullptr;
-        napi_value resultMessage = nullptr;
         CHKRP(env, napi_create_int32(env, errCode, &resultCode), CREATE_INT32);
+        napi_value resultMessage = nullptr;
         CHKRP(env, napi_create_string_utf8(env, napiError.msg.data(), NAPI_AUTO_LENGTH, &resultMessage), CREATE_INT32);
         CHKRP(env, napi_create_error(env, nullptr, resultMessage, &object), CREATE_ERROR);
         CHKRP(env, napi_set_named_property(env, object, ERR_CODE.c_str(), resultCode), SET_NAMED_PROPERTY);
@@ -93,9 +93,9 @@ napi_value JsUtil::GetResult(napi_env env, bool result, int32_t errCode)
 napi_value JsUtil::GetStateResult(napi_env env, bool result)
 {
     CHKPP(env);
-    napi_value object = nullptr;
     napi_value state = nullptr;
     CHKRP(env, napi_get_boolean(env, result, &state), GET_BOOLEAN);
+    napi_value object = nullptr;
     CHKRP(env, napi_create_object(env, &object), CREATE_OBJECT);
     CHKRP(env, napi_set_named_property(env,  object, "state", state), SET_NAMED_PROPERTY);
     return object;
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 3934d4f235..bd7105b69c 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -502,7 +502,7 @@ void InputDeviceManager::DumpDeviceList(int32_t fd, const std::vector<std::strin
 
 bool InputDeviceManager::IsRemote(struct libinput_device *inputDevice) const
 {
-    CHKPR(inputDevice, false);
+    CHKPF(inputDevice, false);
     bool isRemote = false;
     const char* name = libinput_device_get_name(inputDevice);
     if (name == nullptr || name[0] == '\0') {
@@ -514,7 +514,7 @@ bool InputDeviceManager::IsRemote(struct libinput_device *inputDevice) const
     if (pos != std::string::npos) {
         isRemote = true;
     }
-    MMI_HILOGD("isRemote: %{public}s", isRemote == true ? "true" : "false");
+    MMI_HILOGD("isRemote: %{public}s", isRemote ? "true" : "false");
     return isRemote;
 }
 
@@ -525,7 +525,7 @@ bool InputDeviceManager::IsRemote(int32_t id) const
     if (device != inputDevice_.end()) {
         isRemote = device->second.isRemote_;
     }
-    MMI_HILOGD("isRemote: %{public}s", isRemote == true ? "true" : "false");
+    MMI_HILOGD("isRemote: %{public}s", isRemote ? "true" : "false");
     return isRemote;
 }
 
diff --git a/service/event_dispatch/src/event_dispatch_handler.cpp b/service/event_dispatch/src/event_dispatch_handler.cpp
index 79b0ff4c8e..54e67889a1 100644
--- a/service/event_dispatch/src/event_dispatch_handler.cpp
+++ b/service/event_dispatch/src/event_dispatch_handler.cpp
@@ -185,7 +185,7 @@ bool EventDispatchHandler::CheckPointerEvent(std::shared_ptr<PointerEvent> point
     if (dinputSimulateEvent_[0].value == BUTTON_STATE_RELEASED) {
         pointerAction = PointerEvent::POINTER_ACTION_BUTTON_UP;
     }
-    if ((EV_KEY == dinputSimulateEvent_[0].type == EV_KEY) &&
+    if ((dinputSimulateEvent_[0].type == EV_KEY) &&
         (pointerAction == pointerEvent->GetPointerAction()) &&
         (MouseState->LibinputChangeToPointer(dinputSimulateEvent_[0].code) == pointerEvent->GetButtonId())) {
         dinputSimulateEvent_.clear();
diff --git a/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h b/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
index 37b164043c..3c5684730a 100755
--- a/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
+++ b/service/input_device_cooperate/include/device_cooperate_softbus_adapter.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef INPUT_DEVICE_COOPERATE_ADAPTER_H
-#define INPUT_DEVICE_COOPERATE_ADAPTER_H
+#ifndef DEVICE_COOPERATE_SOFTBUS_ADAPTER_H
+#define DEVICE_COOPERATE_SOFTBUS_ADAPTER_H
 
 #include <map>
 #include <memory>
@@ -65,4 +65,4 @@ private:
 } // namespace MMI
 } // namespace OHOS
 #define DevCooperateSoftbusAdapter DeviceCooperateSoftbusAdapter::GetInstance()
-#endif // INPUT_DEVICE_COOPERATE_ADAPTER_H
+#endif // DEVICE_COOPERATE_SOFTBUS_ADAPTER_H
diff --git a/service/input_device_cooperate/include/device_cooperate_softbus_define.h b/service/input_device_cooperate/include/device_cooperate_softbus_define.h
index 9f503a39cb..7b9a20dd76 100644
--- a/service/input_device_cooperate/include/device_cooperate_softbus_define.h
+++ b/service/input_device_cooperate/include/device_cooperate_softbus_define.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef MMI_SOFTBUS_DEFINE_H
-#define MMI_SOFTBUS_DEFINE_H
+#ifndef DEVICE_COOPERATE_SOFTBUS_DEFINE_H
+#define DEVICE_COOPERATE_SOFTBUS_DEFINE_H
 
 #include <string>
 #include <unistd.h>
@@ -51,4 +51,4 @@ enum {
 };
 }  // namespace MMI
 }  // namespace OHOS
-#endif  // MMI_SOFTBUS_DEFINE_H
+#endif  // DEVICE_COOPERATE_SOFTBUS_DEFINE_H
diff --git a/service/input_device_cooperate/include/input_device_cooperate_sm.h b/service/input_device_cooperate/include/input_device_cooperate_sm.h
index 0fcda177da..7459910aca 100755
--- a/service/input_device_cooperate/include/input_device_cooperate_sm.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_sm.h
@@ -114,6 +114,7 @@ private:
     DelegateTasksCallback delegateTasksCallback_ { nullptr };
 };
 
+#define DisHardware DistributedHardware::DeviceManager::GetInstance()
 #define InputDevCooSM ::OHOS::DelayedSingleton<InputDeviceCooperateSM>::GetInstance()
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
index 541301f8cf..0271a04e7b 100755
--- a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
+++ b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
@@ -149,7 +149,7 @@ int32_t DeviceCooperateSoftbusAdapter::Init()
     localSessionName_ = SESSION_NAME + networkId.substr(0, INTERCEPT_STRING_LENGTH);
     int32_t ret = CreateSessionServer(MMI_DINPUT_PKG_NAME, localSessionName_.c_str(), &sessListener_);
     if (ret != RET_OK) {
-        MMI_HILOGE("Create session server failed, error code: %{public}d", ret);
+        MMI_HILOGE("Create session server failed, error code:%{public}d", ret);
         return RET_ERR;
     }
     return RET_OK;
@@ -184,13 +184,13 @@ int32_t DeviceCooperateSoftbusAdapter::OpenInputSoftbus(const std::string &remot
 {
     CALL_INFO_TRACE;
     if (CheckDeviceSessionState(remoteDevId)) {
-        MMI_HILOGD("Softbus session has already opened");
+        MMI_HILOGD("Softbus session has already  opened");
         return RET_OK;
     }
 
     int32_t ret = Init();
     if (ret != RET_OK) {
-        MMI_HILOGE("CreateSessionServer failed");
+        MMI_HILOGE("Init failed");
         return RET_ERR;
     }
 
@@ -263,7 +263,7 @@ int32_t DeviceCooperateSoftbusAdapter::StartRemoteCooperate(const std::string &l
     int32_t ret = SendMsg(sessionId, smsg);
     cJSON_free(smsg);
     if (ret != RET_OK) {
-        MMI_HILOGE("Start remote cooperate send session msg failed, ret: %{public}d", ret);
+        MMI_HILOGE("Start remote cooperate send session msg failed, ret:%{public}d", ret);
         return RET_ERR;
     }
     return RET_OK;
@@ -382,7 +382,7 @@ void DeviceCooperateSoftbusAdapter::HandleSessionData(int32_t sessionId, const s
         MMI_HILOGE("OnBytesReceived cmdType is not number type");
         return;
     }
-    MMI_HILOGI("valueint: %{public}d", comType->valueint);
+    MMI_HILOGD("valueint: %{public}d", comType->valueint);
     switch (comType->valueint) {
         case REMOTE_COOPERATE_START: {
             ResponseStartRemoteCooperate(sessionId, parser);
@@ -420,14 +420,13 @@ void DeviceCooperateSoftbusAdapter::OnBytesReceived(int32_t sessionId, const voi
     }
     std::string message = std::string(static_cast<const char *>(data), dataLen);
     HandleSessionData(sessionId, message);
-    return;
 }
 
 int32_t DeviceCooperateSoftbusAdapter::SendMsg(int32_t sessionId, const std::string &message)
 {
     CALL_DEBUG_ENTER;
     if (message.size() > MSG_MAX_SIZE) {
-        MMI_HILOGW("error: message.size() > MSG_MAX_SIZE msessage size: %{public}d", message.size());
+        MMI_HILOGW("error:message.size() > MSG_MAX_SIZE msessage size:%{public}d", message.size());
         return RET_ERR;
     }
     return SendBytes(sessionId, message.c_str(), strlen(message.c_str()));
@@ -440,10 +439,9 @@ std::string DeviceCooperateSoftbusAdapter::FindDevice(int32_t sessionId)
         [sessionId](const std::map<std::string, int>::value_type item) {
         return item.second == sessionId;
     });
-
     if (find_item == sessionDevMap_.end()) {
-        MMI_HILOGE("FindKeyByValue error");
-        return "";
+        MMI_HILOGE("FindDevice error");
+        return {};
     }
     return find_item->first;
 }
@@ -453,10 +451,10 @@ int32_t DeviceCooperateSoftbusAdapter::OnSessionOpened(int32_t sessionId, int32_
     CALL_INFO_TRACE;
     char peerDevId[DEVICE_ID_SIZE_MAX] = {};
     int32_t getPeerDeviceIdResult = GetPeerDeviceId(sessionId, peerDevId, sizeof(peerDevId));
-    MMI_HILOGD("Get peer device id ret: %{public}d", getPeerDeviceIdResult);
+    MMI_HILOGD("Get peer device id ret:%{public}d", getPeerDeviceIdResult);
     if (result != RET_OK) {
         std::string deviceId = FindDevice(sessionId);
-        MMI_HILOGE("Session open failed result: %{public}d", result);
+        MMI_HILOGE("Session open failed result:%{public}d", result);
         std::unique_lock<std::mutex> sessionLock(operationMutex_);
         if (sessionDevMap_.find(deviceId) != sessionDevMap_.end()) {
             sessionDevMap_.erase(deviceId);
@@ -471,13 +469,12 @@ int32_t DeviceCooperateSoftbusAdapter::OnSessionOpened(int32_t sessionId, int32_
     int32_t sessionSide = GetSessionSide(sessionId);
     MMI_HILOGI("session open succeed, sessionId:%{public}d, sessionSide:%{public}d(1 is client side)",
         sessionId, sessionSide);
+    std::lock_guard<std::mutex> notifyLock(operationMutex_);
     if (sessionSide == SESSION_SIDE_SERVER) {
-        std::lock_guard<std::mutex> notifyLock(operationMutex_);
         if (getPeerDeviceIdResult == RET_OK) {
             sessionDevMap_[peerDevId] = sessionId;
         }
     } else {
-        std::lock_guard<std::mutex> notifyLock(operationMutex_);
         if (getPeerDeviceIdResult == RET_OK) {
             channelStatusMap_[peerDevId] = true;
         }
diff --git a/service/input_device_cooperate/src/device_profile_adapter.cpp b/service/input_device_cooperate/src/device_profile_adapter.cpp
index a16497d126..faa90e811f 100755
--- a/service/input_device_cooperate/src/device_profile_adapter.cpp
+++ b/service/input_device_cooperate/src/device_profile_adapter.cpp
@@ -99,7 +99,7 @@ bool DeviceProfileAdapter::GetCrossingSwitchState(const std::string &deviceId)
     }
     cJSON* state = cJSON_GetObjectItemCaseSensitive(parser.json_, CHARACTERISTICS_NAME.c_str());
     if (!cJSON_IsBool(state)) {
-        MMI_HILOGE("state is not bool type.");
+        MMI_HILOGE("State is not bool type");
         return false;
     }
     return cJSON_IsTrue(state);
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index b0bb53d1a1..1f2392290b 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -189,10 +189,10 @@ int32_t InputDeviceCooperateSM::StopInputDeviceCooperate()
 void InputDeviceCooperateSM::StartRemoteCooperate(const std::string &remoteNetworkId)
 {
     CALL_INFO_TRACE;
+    std::lock_guard<std::mutex> guard(mutex_);
     CHKPV(delegateTasksCallback_);
     delegateTasksCallback_(std::bind(&CooperateEventManager::OnCooperateMessage,
         CooperateEventMgr, CooperationMessage::INFO_START, remoteNetworkId));
-    std::lock_guard<std::mutex> guard(mutex_);
     isStarting_ = true;
 }
 
@@ -522,15 +522,13 @@ bool InputDeviceCooperateSM::InitDeviceManager()
     CALL_DEBUG_ENTER;
     initCallback_ = std::make_shared<DeviceInitCallBack>();
     CHKPR(initCallback_, false);
-    int32_t ret =
-        DistributedHardware::DeviceManager::GetInstance().InitDeviceManager(MMI_DINPUT_PKG_NAME, initCallback_);
+    int32_t ret = DisHardware->InitDeviceManager(MMI_DINPUT_PKG_NAME, initCallback_);
     if (ret != 0) {
         MMI_HILOGE("Init device manager failed, ret:%{public}d", ret);
         return false;
     }
     stateCallback_ = std::make_shared<MmiDeviceStateCallback>();
-    ret = DistributedHardware::DeviceManager::GetInstance().RegisterDevStateCallback(MMI_DINPUT_PKG_NAME,
-        "", stateCallback_);
+    ret = DisHardware->RegisterDevStateCallback(MMI_DINPUT_PKG_NAME, "", stateCallback_);
     if (ret != 0) {
         MMI_HILOGE("Register devStateCallback failed, ret:%{public}d", ret);
         return false;
diff --git a/service/input_device_cooperate/src/input_device_cooperate_util.cpp b/service/input_device_cooperate/src/input_device_cooperate_util.cpp
index 87f2951775..3a388735fe 100644
--- a/service/input_device_cooperate/src/input_device_cooperate_util.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_util.cpp
@@ -28,10 +28,10 @@ std::string GetLocalDeviceId()
 {
     auto localNode = std::make_unique<NodeBasicInfo>();
     CHKPS(localNode);
-    int32_t errCode = GetLocalNodeDeviceInfo(MMI_DINPUT_PKG_NAME, localNode.get());
-    if (errCode != RET_OK) {
-        MMI_HILOGE("GetLocalNodeDeviceInfo errCode:%{public}d", errCode);
-        return "";
+    int32_t ret = GetLocalNodeDeviceInfo(MMI_DINPUT_PKG_NAME, localNode.get());
+    if (ret != RET_OK) {
+        MMI_HILOGE("GetLocalNodeDeviceInfo ret:%{public}d", ret);
+        return {};
     }
     return localNode->networkId;
 }
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index fe6f201361..aff4d835ff 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -446,12 +446,12 @@ void MouseEventNormalize::SetDxDyForDInput(PointerEvent::PointerItem& pointerIte
     int32_t rawDy = static_cast<int32_t>(dy);
     pointerItem.SetRawDx(rawDx);
     pointerItem.SetRawDy(rawDy);
-    MMI_HILOGD("MouseEventNormalize SetDxDyForDInput : dx:%{public}d, dy:%{public}d", rawDx, rawDy);
+    MMI_HILOGD("MouseEventNormalize SetDxDyForDInput, dx:%{public}d, dy:%{public}d", rawDx, rawDy);
 }
 
 void MouseEventNormalize::SetAbsolutionLocation(double xPercent, double yPercent)
 {
-    MMI_HILOGI("Cross screen location : xPercent:%{public}lf, yPercent:%{public}lf",
+    MMI_HILOGI("Cross screen location, xPercent:%{public}lf, yPercent:%{public}lf",
         xPercent, yPercent);
     auto displayGroupInfo = WinMgr->GetDisplayGroupInfo();
     if (currentDisplayId_ == -1) {
-- 
Gitee


From bcabb2b486bc6d9dbb7819f1349003b099d512de Mon Sep 17 00:00:00 2001
From: hhh2 <pengfei.hou@huawei.com>
Date: Sat, 22 Oct 2022 20:36:36 +0800
Subject: [PATCH 071/360] remove unused definitions

Signed-off-by: hhh2 <pengfei.hou@huawei.com>
Change-Id: I5224bc098ab758adc021e188d8f2d0f73ab51da6
---
 .../event_handler/src/client_msg_handler.cpp  |   2 +-
 .../src/event_dispatch_handler.cpp            |   2 +-
 .../src/event_normalize_handler.cpp           |   8 +-
 .../include/touch_event_normalize.h           |  24 +-
 .../src/touch_event_normalize.cpp             |  12 +-
 tools/event_inject/BUILD.gn                   |   2 -
 .../include/manage_inject_device.h            |   1 -
 tools/event_inject/include/send_message.h     |  34 --
 tools/event_inject/src/send_message.cpp       |  49 ---
 tools/event_inject/test/send_message_test.cpp |  48 ---
 util/BUILD.gn                                 |   1 -
 util/common/include/error_multimodal.h        |  30 +-
 util/common/include/proto.h                   | 166 +---------
 util/common/include/util.h                    |  65 ++--
 util/common/src/util.cpp                      | 303 ++++--------------
 util/common/test/util_test.cpp                | 221 -------------
 util/network/test/net_packet_test.cpp         |   6 +-
 util/socket/test/uds_session_test.cpp         |   4 +-
 18 files changed, 138 insertions(+), 840 deletions(-)
 delete mode 100644 tools/event_inject/include/send_message.h
 delete mode 100644 tools/event_inject/src/send_message.cpp
 delete mode 100644 tools/event_inject/test/send_message_test.cpp
 delete mode 100644 util/common/test/util_test.cpp

diff --git a/frameworks/proxy/event_handler/src/client_msg_handler.cpp b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
index a12857f8c1..b1f2f170cb 100644
--- a/frameworks/proxy/event_handler/src/client_msg_handler.cpp
+++ b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
@@ -51,7 +51,7 @@ void ClientMsgHandler::Init()
 {
     MsgCallback funs[] = {
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
-        {MmiMessageId::ON_KEYEVENT, MsgCallbackBind2(&ClientMsgHandler::OnKeyEvent, this)},
+        {MmiMessageId::ON_KEY_EVENT, MsgCallbackBind2(&ClientMsgHandler::OnKeyEvent, this)},
         {MmiMessageId::ON_SUBSCRIBE_KEY, std::bind(&ClientMsgHandler::OnSubscribeKeyEventCallback,
                                                    this, std::placeholders::_1, std::placeholders::_2)},
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
diff --git a/service/event_dispatch/src/event_dispatch_handler.cpp b/service/event_dispatch/src/event_dispatch_handler.cpp
index 4bb05ce2b7..7e1db5823e 100644
--- a/service/event_dispatch/src/event_dispatch_handler.cpp
+++ b/service/event_dispatch/src/event_dispatch_handler.cpp
@@ -149,7 +149,7 @@ int32_t EventDispatchHandler::DispatchKeyEventPid(UDSServer& udsServer, std::sha
         return RET_OK;
     }
 
-    NetPacket pkt(MmiMessageId::ON_KEYEVENT);
+    NetPacket pkt(MmiMessageId::ON_KEY_EVENT);
     InputEventDataTransformation::KeyEventToNetPacket(key, pkt);
     BytraceAdapter::StartBytrace(key, BytraceAdapter::KEY_DISPATCH_EVENT);
     pkt << fd;
diff --git a/service/event_handler/src/event_normalize_handler.cpp b/service/event_handler/src/event_normalize_handler.cpp
index 51721173b4..ceab300172 100644
--- a/service/event_handler/src/event_normalize_handler.cpp
+++ b/service/event_handler/src/event_normalize_handler.cpp
@@ -348,7 +348,7 @@ int32_t EventNormalizeHandler::HandleTouchPadEvent(libinput_event* event)
     }
 #ifdef OHOS_BUILD_ENABLE_POINTER
     CHKPR(event, ERROR_NULL_POINTER);
-    auto pointerEvent = TouchEventHdr->OnLibInput(event, INPUT_DEVICE_CAP_TOUCH_PAD);
+    auto pointerEvent = TouchEventHdr->OnLibInput(event, TouchEventNormalize::DeviceType::TOUCH_PAD);
     CHKPR(pointerEvent, ERROR_NULL_POINTER);
     nextHandler_->HandlePointerEvent(pointerEvent);
     auto type = libinput_event_get_type(event);
@@ -374,7 +374,7 @@ int32_t EventNormalizeHandler::HandleGestureEvent(libinput_event* event)
     }
 #ifdef OHOS_BUILD_ENABLE_POINTER
     CHKPR(event, ERROR_NULL_POINTER);
-    auto pointerEvent = TouchEventHdr->OnLibInput(event, INPUT_DEVICE_CAP_GESTURE);
+    auto pointerEvent = TouchEventHdr->OnLibInput(event, TouchEventNormalize::DeviceType::GESTURE);
     CHKPR(pointerEvent, GESTURE_EVENT_PKG_FAIL);
     MMI_HILOGD("GestureEvent package, eventType:%{public}d,actionTime:%{public}" PRId64 ","
                "action:%{public}d,actionStartTime:%{public}" PRId64 ","
@@ -409,7 +409,7 @@ int32_t EventNormalizeHandler::HandleTouchEvent(libinput_event* event)
     }
 #ifdef OHOS_BUILD_ENABLE_TOUCH
     CHKPR(event, ERROR_NULL_POINTER);
-    auto pointerEvent = TouchEventHdr->OnLibInput(event, INPUT_DEVICE_CAP_TOUCH);
+    auto pointerEvent = TouchEventHdr->OnLibInput(event, TouchEventNormalize::DeviceType::TOUCH);
     CHKPR(pointerEvent, ERROR_NULL_POINTER);
 #ifdef OHOS_DISTRIBUTED_INPUT_MODEL
     if (InputDevCooSM->CheckTouchEvent(event)) {
@@ -451,7 +451,7 @@ int32_t EventNormalizeHandler::HandleTableToolEvent(libinput_event* event)
     }
 #ifdef OHOS_BUILD_ENABLE_TOUCH
     CHKPR(event, ERROR_NULL_POINTER);
-    auto pointerEvent = TouchEventHdr->OnLibInput(event, INPUT_DEVICE_CAP_TABLET_TOOL);
+    auto pointerEvent = TouchEventHdr->OnLibInput(event, TouchEventNormalize::DeviceType::TABLET_TOOL);
     CHKPR(pointerEvent, ERROR_NULL_POINTER);
     BytraceAdapter::StartBytrace(pointerEvent, BytraceAdapter::TRACE_START);
     nextHandler_->HandleTouchEvent(pointerEvent);
diff --git a/service/touch_event_normalize/include/touch_event_normalize.h b/service/touch_event_normalize/include/touch_event_normalize.h
index fec7cdad96..d02f504f41 100644
--- a/service/touch_event_normalize/include/touch_event_normalize.h
+++ b/service/touch_event_normalize/include/touch_event_normalize.h
@@ -27,13 +27,33 @@ namespace OHOS {
 namespace MMI {
 class TouchEventNormalize final {
     DECLARE_DELAYED_SINGLETON(TouchEventNormalize);
+
+public:
+    enum class DeviceType : int32_t {
+        KEYBOARD,
+        POINTER,
+        TOUCH,
+        TABLET_TOOL,
+        TABLET_PAD,
+        GESTURE,
+        SWITCH,
+        JOYSTICK,
+        AISENSOR,
+        TOUCH_PAD,
+        REMOTE_CONTROL,
+        TRACK_BALL,
+        KNUCKLE,
+        TRACKPAD5,
+        GAMEPAD,
+    };
+
 public:
     DISALLOW_COPY_AND_MOVE(TouchEventNormalize);
-    std::shared_ptr<PointerEvent> OnLibInput(struct libinput_event *event, INPUT_DEVICE_TYPE deviceType);
+    std::shared_ptr<PointerEvent> OnLibInput(struct libinput_event *event, DeviceType deviceType);
 
 private:
     std::shared_ptr<TransformProcessor> MakeTransformProcessor(
-        int32_t deviceId, INPUT_DEVICE_TYPE deviceType) const;
+        int32_t deviceId, DeviceType deviceType) const;
 
 private:
     std::map<int32_t, std::shared_ptr<TransformProcessor>> processors_;
diff --git a/service/touch_event_normalize/src/touch_event_normalize.cpp b/service/touch_event_normalize/src/touch_event_normalize.cpp
index f2cbb447a8..ff1b492e63 100644
--- a/service/touch_event_normalize/src/touch_event_normalize.cpp
+++ b/service/touch_event_normalize/src/touch_event_normalize.cpp
@@ -30,7 +30,7 @@ TouchEventNormalize::TouchEventNormalize() {}
 TouchEventNormalize::~TouchEventNormalize() {}
 
 std::shared_ptr<PointerEvent> TouchEventNormalize::OnLibInput(
-    struct libinput_event *event, INPUT_DEVICE_TYPE deviceType)
+    struct libinput_event *event, DeviceType deviceType)
 {
     CHKPP(event);
     auto device = libinput_event_get_device(event);
@@ -51,26 +51,26 @@ std::shared_ptr<PointerEvent> TouchEventNormalize::OnLibInput(
 }
 
 std::shared_ptr<TransformProcessor> TouchEventNormalize::MakeTransformProcessor(
-    int32_t deviceId, INPUT_DEVICE_TYPE deviceType) const
+    int32_t deviceId, DeviceType deviceType) const
 {
     std::shared_ptr<TransformProcessor> processor { nullptr };
     switch (deviceType) {
 #ifdef OHOS_BUILD_ENABLE_TOUCH
-        case INPUT_DEVICE_CAP_TOUCH: {
+        case DeviceType::TOUCH: {
             processor = std::make_shared<TouchTransformProcessor>(deviceId);
             break;
         }
-        case INPUT_DEVICE_CAP_TABLET_TOOL: {
+        case DeviceType::TABLET_TOOL: {
             processor = std::make_shared<TabletToolTransformProcessor>(deviceId);
             break;
         }
 #endif // OHOS_BUILD_ENABLE_TOUCH
 #ifdef OHOS_BUILD_ENABLE_POINTER
-        case INPUT_DEVICE_CAP_TOUCH_PAD: {
+        case DeviceType::TOUCH_PAD: {
             processor = std::make_shared<TouchPadTransformProcessor>(deviceId);
             break;
         }
-        case INPUT_DEVICE_CAP_GESTURE: {
+        case DeviceType::GESTURE: {
             processor = std::make_shared<GestureTransformProcessor>(deviceId);
             break;
         }
diff --git a/tools/event_inject/BUILD.gn b/tools/event_inject/BUILD.gn
index 81af1938b9..318594ca6f 100644
--- a/tools/event_inject/BUILD.gn
+++ b/tools/event_inject/BUILD.gn
@@ -54,7 +54,6 @@ ohos_source_set("event-injection") {
     "src/processing_pad_device.cpp",
     "src/processing_pen_device.cpp",
     "src/processing_touch_screen_device.cpp",
-    "src/send_message.cpp",
   ]
 
   configs = [
@@ -127,7 +126,6 @@ ohos_unittest("ut-event-injection-out") {
     "test/processing_pad_device_test.cpp",
     "test/processing_pen_device_test.cpp",
     "test/processing_touch_screen_device_test.cpp",
-    "test/send_message_test.cpp",
   ]
 
   deps = [
diff --git a/tools/event_inject/include/manage_inject_device.h b/tools/event_inject/include/manage_inject_device.h
index 6f157f5f47..e98605545a 100644
--- a/tools/event_inject/include/manage_inject_device.h
+++ b/tools/event_inject/include/manage_inject_device.h
@@ -18,7 +18,6 @@
 
 #include "get_device_object.h"
 #include "get_device_node.h"
-#include "send_message.h"
 
 namespace OHOS {
 namespace MMI {
diff --git a/tools/event_inject/include/send_message.h b/tools/event_inject/include/send_message.h
deleted file mode 100644
index 310e0bec74..0000000000
--- a/tools/event_inject/include/send_message.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef SEND_MESSAGE_H
-#define SEND_MESSAGE_H
-
-#include "nocopyable.h"
-
-#include "msg_head.h"
-
-namespace OHOS {
-namespace MMI {
-class SendMessage {
-public:
-    SendMessage() = default;
-    DISALLOW_COPY_AND_MOVE(SendMessage);
-    ~SendMessage() = default;
-    int32_t GetDevIndexName(const std::string& deviceName);
-};
-} // namespace MMI
-} // namespace OHOS
-#endif // SEND_MESSAGE_H
\ No newline at end of file
diff --git a/tools/event_inject/src/send_message.cpp b/tools/event_inject/src/send_message.cpp
deleted file mode 100644
index bb625cbda6..0000000000
--- a/tools/event_inject/src/send_message.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "send_message.h"
-
-#include "proto.h"
-
-using namespace OHOS::MMI;
-
-int32_t SendMessage::GetDevIndexName(const std::string& deviceName)
-{
-    static const std::map<std::string, INPUT_DEVICE_INDEX> deviceTypeToIndexMap = {
-        {"keyboard model1", INPUT_DEVICE_KEYBOARD_INDEX},
-        {"keyboard model2", INPUT_DEVICE_KEYBOARD_INDEX},
-        {"keyboard model3", INPUT_DEVICE_KEYBOARD_INDEX},
-        {"mouse", INPUT_DEVICE_POINTER_INDEX},
-        {"trackball", INPUT_DEVICE_POINTER_INDEX},
-        {"touch", INPUT_DEVICE_TOUCH_INDEX},
-        {"pen", INPUT_DEVICE_TABLET_TOOL_INDEX},
-        {"pad", INPUT_DEVICE_TABLET_PAD_INDEX},
-        {"joystick", INPUT_DEVICE_JOYSTICK_INDEX},
-        {"gamePad", INPUT_DEVICE_GAMEPAD_INDEX},
-        {"finger", INPUT_DEVICE_FINGER_INDEX},
-        {"knob model1", INPUT_DEVICE_SWITCH_INDEX},
-        {"knob model2", INPUT_DEVICE_SWITCH_INDEX},
-        {"knob model3", INPUT_DEVICE_SWITCH_INDEX},
-        {"remoteControl", INPUT_DEVICE_REMOTE_CONTROL},
-        {"trackpad model1", INPUT_DEVICE_TRACKPAD5_INDEX},
-        {"trackpad model2", INPUT_DEVICE_TRACKPAD5_INDEX},
-    };
-
-    auto iter = deviceTypeToIndexMap.find(deviceName);
-    if (iter == deviceTypeToIndexMap.end()) {
-        return RET_ERR;
-    }
-    return static_cast<int32_t>(iter->second);
-}
diff --git a/tools/event_inject/test/send_message_test.cpp b/tools/event_inject/test/send_message_test.cpp
deleted file mode 100644
index 3a37815636..0000000000
--- a/tools/event_inject/test/send_message_test.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include "send_message.h"
-
-
-namespace OHOS {
-namespace MMI {
-namespace {
-using namespace testing::ext;
-using namespace OHOS::MMI;
-} // namespace
-
-class SendMessageTest : public testing::Test {
-public:
-    static void SetUpTestCase(void) {}
-    static void TearDownTestCase(void) {}
-};
-
-/**
- * @tc.name:Test_GetDevIndexName
- * @tc.desc:Verify SendMessage function GetDevIndexName
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(SendMessageTest, Test_GetDevIndexName, TestSize.Level1)
-{
-    SendMessage sendMessage;
-    const std::string deviceName = "mouse";
-    auto ret = sendMessage.GetDevIndexName(deviceName);
-    EXPECT_EQ(ret, 32);
-}
-} // namespace MMI
-} // namespace OHOS
\ No newline at end of file
diff --git a/util/BUILD.gn b/util/BUILD.gn
index cc03c5def7..1443804b94 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -95,7 +95,6 @@ ohos_unittest("ut-mmi-util-out") {
   }
 
   sources = [
-    "common/test/util_test.cpp",
     "network/test/net_packet_test.cpp",
     "socket/test/stream_buffer_test.cpp",
     "socket/test/uds_client_test.cpp",
diff --git a/util/common/include/error_multimodal.h b/util/common/include/error_multimodal.h
index 569ce68f04..70e31bb61a 100644
--- a/util/common/include/error_multimodal.h
+++ b/util/common/include/error_multimodal.h
@@ -24,25 +24,21 @@ inline constexpr int32_t ERROR_UNSUPPORT = -2;
 inline constexpr int32_t ARGV_VALID = 2;
 inline constexpr int32_t ERROR_NO_PERMISSION = -201;
 
-enum MmiModuleType {
+enum {
     MODULE_CLIENT = 0x00,
     MODULE_EVENT_SIMULATE = 0x01,
     MODULE_SERVER = 0x02,
     MODULE_UTIL = 0x03
 };
-// Error code for client
-constexpr ErrCode CLIENT_ERR_OFFSET = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_CLIENT);
 
 enum {
     // APL鉴权失败
-    CHECK_PERMISSION_FAIL = CLIENT_ERR_OFFSET,
+    CHECK_PERMISSION_FAIL = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_CLIENT),
 };
-// Error code for event simulate
-constexpr ErrCode EVENT_SIMULATE_ERR_OFFSET = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_EVENT_SIMULATE);
 
 enum {
     // 文件打开失败
-    FILE_OPEN_FAIL = EVENT_SIMULATE_ERR_OFFSET,
+    FILE_OPEN_FAIL = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_EVENT_SIMULATE),
     // 流缓冲读取失败
     STREAM_BUF_READ_FAIL,
     // 事件注册失败
@@ -50,12 +46,10 @@ enum {
     // 参数注入失败
     PARAM_INPUT_FAIL
 };
-// Error code for server
-constexpr ErrCode SERVER_ERR_OFFSET = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_SERVER);
 
 enum {
     // 发送消息失败
-    MSG_SEND_FAIL = SERVER_ERR_OFFSET,
+    MSG_SEND_FAIL = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_SERVER),
     // 未知的事件
     UNKNOWN_EVENT,
     // 空指针
@@ -101,28 +95,14 @@ enum {
     // DUMP参数错误
     DUMP_PARAM_ERR
 };
-// Error code for util
-constexpr ErrCode UTIL_ERR_OFFSET = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_UTIL);
 
 enum {
     // 非标准化事件
-    NON_STD_EVENT = UTIL_ERR_OFFSET,
+    NON_STD_EVENT = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_UTIL),
     // 未处理的消息
     UNPROC_MSG,
     // 未知消息ID
     UNKNOWN_MSG_ID,
-    // 未知设备
-    UNKNOWN_DEV,
-    // 文件读取失败
-    FILE_READ_FAIL,
-    // 文件写入失败
-    FILE_WRITE_FAIL,
-    // api参数类型错误
-    API_PARAM_TYPE_FAIL,
-    // api返回值超出定义范围
-    API_OUT_OF_RANGE,
-    // 获取focus_id失败
-    FOCUS_ID_OBTAIN_FAIL,
     // EPOLL创建失败
     EPOLL_CREATE_FAIL,
     // 修改EPOLL失败
diff --git a/util/common/include/proto.h b/util/common/include/proto.h
index f8327aa92f..5f45f23dcd 100644
--- a/util/common/include/proto.h
+++ b/util/common/include/proto.h
@@ -14,181 +14,31 @@
  */
 #ifndef PROTO_H
 #define PROTO_H
-
 #include <sys/types.h>
 
 enum class MmiMessageId : int32_t {
-    INVALID = 0,
-
-    INPUT_DEVICE = 901,
+    INVALID,
+    INPUT_DEVICE,
     INPUT_DEVICE_IDS,
     INPUT_DEVICE_SUPPORT_KEYS,
     ADD_INPUT_DEVICE_LISTENER,
-    REMOVE_INPUT_DEVICE_LISTENER,
     INPUT_DEVICE_KEYBOARD_TYPE,
-
-    BEGIN = 1001,
-    REGISTER_APP_INFO,
-    REGISTER_MSG_HANDLER,
-    UNREGISTER_MSG_HANDLER,
-    CHECK_REPLY_MESSAGE,
-    ADD_KEY_EVENT_INTERCEPTOR,
-    KEY_EVENT_INTERCEPTOR,
-    REMOVE_KEY_EVENT_INTERCEPTOR,
-    ADD_TOUCH_EVENT_INTERCEPTOR,
-    TOUCH_EVENT_INTERCEPTOR,
-    REMOVE_TOUCH_EVENT_INTERCEPTOR,
     DISPLAY_INFO,
-    ADD_POINTER_INTERCEPTOR,
-    REMOVE_POINTER_INTERCEPTOR,
-    POINTER_EVENT_INTERCEPTOR,
-    ADD_INPUT_EVENT_MONITOR,
-    REMOVE_INPUT_EVENT_MONITOR,
-    ADD_INPUT_HANDLER,
-    REMOVE_INPUT_HANDLER,
-    MARK_CONSUMED,
-    ADD_INPUT_EVENT_TOUCHPAD_MONITOR,
-    REMOVE_INPUT_EVENT_TOUCHPAD_MONITOR,
     NOTICE_ANR,
     MARK_PROCESS,
-
-    COMMON_EVENT_BEGIN = 1100,
-    ON_SHOW_MENU,
-    ON_SEND,
-    ON_COPY,
-    ON_PASTE,
-    ON_CUT,
-    ON_UNDO,
-    ON_REFRESH,
-    ON_START_DRAG,
-    ON_CANCEL,
-    ON_ENTER,
-    ON_PREVIOUS,
-    ON_NEXT,
-    ON_BACK,
-    ON_PRINT,
-    COMMON_EVENT_END,
-
-    KEY_EVENT_BEGIN = 2000,
-    ON_KEY,
     ON_SUBSCRIBE_KEY,
-    KEY_EVENT_END,
-
-    ON_KEYEVENT = 2100,
+    ON_KEY_EVENT,
     ON_POINTER_EVENT,
-    ON_KEYMONITOR = 2200,
     REPORT_KEY_EVENT,
     REPORT_POINTER_EVENT,
-    ON_TOUCHPAD_MONITOR,
-
-    MEDIA_EVENT_BEGIN = 3000,
-    ON_PLAY,
-    ON_PAUSE,
-    ON_MEDIA_CONTROL,
-    MEDIA_EVENT_END,
-
-    SYSTEM_EVENT_BEGIN = 4000,
-    ON_SCREEN_SHOT,
-    ON_SCREEN_SPLIT,
-    ON_START_SCREEN_RECORD,
-    ON_STOP_SCREEN_RECORD,
-    ON_GOTO_DESKTOP,
-    ON_RECENT,
-    ON_SHOW_NOTIFICATION,
-    ON_LOCK_SCREEN,
-    ON_SEARCH,
-    ON_CLOSE_PAGE,
-    ON_LAUNCH_VOICE_ASSISTANT,
-    ON_MUTE,
-    SYSTEM_EVENT_END,
-
-    TELEPHONE_EVENT_BEGIN = 5000,
-    ON_ANSWER,
-    ON_REFUSE,
-    ON_HANG_UP,
-    ON_TELEPHONE_CONTROL,
-    TELEPHONE_EVENT_END,
-
-    TOUCH_EVENT_BEGIN = 6000,
-    ON_TOUCH,
-    TOUCH_EVENT_END,
-
-    DEVICE_BEGIN = 7000,
     ON_DEVICE_ADDED,
     ON_DEVICE_REMOVED,
-    DEVICE_END,
-
-    ON_STANDARD = 9000,
-    SENIOR_INPUT_FUNC = 9050,
-    ON_JOYSTICK = 10000,
-    ON_WINDOW = 11000,
-
-    ON_VIRTUAL_KEY = 12000,
-    ON_VIRTUAL_HOME,
-    ON_VIRTUAL_BACK,
-    ON_VIRTUAL_MULTI_XERA,
-
-    ON_EXCEPTION = 13050,
-    ON_LIST,
 
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-    COOPERATION_ADD_LISTENER = 15000,
+    COOPERATION_ADD_LISTENER,
     COOPERATION_MESSAGE,
     COOPERATION_GET_STATE,
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-    END,
-};
-
-enum INPUT_DEVICE_TYPE {
-    INPUT_DEVICE_CAP_KEYBOARD = 0,
-    INPUT_DEVICE_CAP_POINTER = 1,
-    INPUT_DEVICE_CAP_TOUCH = 2,
-    INPUT_DEVICE_CAP_TABLET_TOOL = 3,
-    INPUT_DEVICE_CAP_TABLET_PAD = 4,
-    INPUT_DEVICE_CAP_GESTURE = 5,
-    INPUT_DEVICE_CAP_SWITCH = 6,
-    INPUT_DEVICE_CAP_JOYSTICK = 7,
-    INPUT_DEVICE_CAP_AISENSOR = 8,
-    INPUT_DEVICE_CAP_TOUCH_PAD = 9,
-    INPUT_DEVICE_CAP_REMOTE_CONTROL = 10,
-    INPUT_DEVICE_CAP_TRACK_BALL = 11,
-    INPUT_DEVICE_CAP_KNUCKLE = 12,
-    INPUT_DEVICE_CAP_TRACKPAD5 = 13,
-    INPUT_DEVICE_CAP_GAMEPAD = 14,
-};
-
-enum INPUT_DEVICE_INDEX {
-    INPUT_DEVICE_POINTER_INDEX = 32,
-    INPUT_DEVICE_KEYBOARD_INDEX = 33,
-    INPUT_DEVICE_TOUCH_INDEX = 34,
-    INPUT_DEVICE_TABLET_TOOL_INDEX = 35,
-    INPUT_DEVICE_TABLET_PAD_INDEX = 36,
-    INPUT_DEVICE_GESTURE_INDEX = 37,
-    INPUT_DEVICE_FINGER_INDEX = 38,
-    INPUT_DEVICE_JOYSTICK_INDEX = 39,
-    INPUT_DEVICE_AISENSOR_INDEX = 40,
-    INPUT_DEVICE_TOUCH_PAD = 41,
-    INPUT_DEVICE_REMOTE_CONTROL = 42,
-    INPUT_DEVICE_SWITCH_INDEX = 43,
-    INPUT_DEVICE_TRACKPAD5_INDEX = 44,
-    INPUT_DEVICE_GAMEPAD_INDEX = 45,
-};
-
-enum MSG_TYPE {
-    MSG_TYPE_DEVICE_INIT,
-    MSG_TYPE_DEVICE_INFO,
-};
-enum JOYSTICK_AXIS_SOURCE {
-    JOYSTICK_AXIS_SOURCE_UNKNOW = 0,
-    JOYSTICK_AXIS_SOURCE_ABS_X = 1UL,
-    JOYSTICK_AXIS_SOURCE_ABS_Y = 1UL << 1,
-    JOYSTICK_AXIS_SOURCE_ABS_Z = 1UL << 2,
-    JOYSTICK_AXIS_SOURCE_ABS_RX = 1UL << 3,
-    JOYSTICK_AXIS_SOURCE_ABS_RY = 1UL << 4,
-    JOYSTICK_AXIS_SOURCE_ABS_RZ = 1UL << 5,
-    JOYSTICK_AXIS_SOURCE_ABS_THROTTLE = 1UL << 6,
-    JOYSTICK_AXIS_SOURCE_ABS_HAT0X = 1UL << 11,
-    JOYSTICK_AXIS_SOURCE_ABS_HAT0Y = 1UL << 12,
 };
 
 enum KeyboardType {
@@ -203,12 +53,12 @@ enum KeyboardType {
 enum TokenType : int32_t {
     TOKEN_INVALID = -1,
     TOKEN_HAP = 0,
-    TOKEN_NATIVE = 1,
-    TOKEN_SHELL = 2
+    TOKEN_NATIVE,
+    TOKEN_SHELL,
 };
 
 enum ANREventType {
-    ANR_DISPATCH = 0,
-    ANR_MONITOR = 1
+    ANR_DISPATCH,
+    ANR_MONITOR,
 };
 #endif // PROTO_H
\ No newline at end of file
diff --git a/util/common/include/util.h b/util/common/include/util.h
index 34450aa9e9..2792f0028f 100644
--- a/util/common/include/util.h
+++ b/util/common/include/util.h
@@ -15,9 +15,7 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#include <ctime>
 #include <map>
-#include <sstream>
 #include <string>
 #include <vector>
 
@@ -32,63 +30,44 @@ struct DeviceConfig {
     int32_t intervalTime { 100 };
     int32_t keyboardType { 0 };
 };
-const char *GetMmiErrorTypeDesc(int32_t errorCodeEnum);
-std::string UuIdGenerate();
-int64_t GetMicrotime();
+
 int64_t GetSysClockTime();
+
 int64_t GetMillisTime();
+
 std::string GetUUid();
-std::string GetThisThreadIdOfString();
+
 uint64_t GetThisThreadId();
-size_t StringToken(std::string &str, const std::string &sep, std::string &token);
+
 size_t StringSplit(const std::string &str, const std::string &sep, std::vector<std::string> &vecList);
+
 std::string IdsListToString(const std::vector<int32_t> &list, const std::string &sep = ", ");
-void LocalTime(tm &t, time_t curTime = 0);
-std::string Strftime(const std::string &format = "%F %T", time_t curTime = 0);
-void PrintEventJoyStickAxisInfo(const EventJoyStickAxis &r, const int32_t fd,
-    const int32_t abilityId, const int32_t focusId, const int64_t preHandlerTime);
-void PrintWMSInfo(const std::string &str, const int32_t fd, const int32_t abilityId, const int32_t focusId);
+
 int32_t GetPid();
-std::string GetFileName(const std::string &strPath);
+
 const char* GetProgramName();
-char* MmiBasename(char* path);
+
 void SetThreadName(const std::string &name);
-const std::string &GetThreadName();
-void AddId(std::vector<int32_t> &list, int32_t id);
-size_t CalculateDifference(const std::vector<int32_t> &list1, std::vector<int32_t> &list2,
-    std::vector<int32_t> &difList);
+
 void ReadProFile(const std::string &filePath, int32_t deviceId,
     std::map<int32_t, std::map<int32_t, int32_t>> &configMap);
+
 void ReadProConfigFile(const std::string &realPath, int32_t deviceId,
     std::map<int32_t, std::map<int32_t, int32_t>> &configKey);
-std::string StringFmt(const char* str, ...);
+
 std::string ReadJsonFile(const std::string &filePath);
-std::string ReadUinputToolFile(const std::string &filePath);
+
 int32_t ReadCursorStyleFile(const std::string &filePath);
+
 int32_t ReadTomlFile(const std::string &filePath, DeviceConfig &devConf);
-int32_t ReadConfigFile(const std::string &realPath, DeviceConfig &devConf);
-int32_t ConfigItemSwitch(const std::string &configItem, const std::string &value, DeviceConfig &devConf);
+
 std::string StringPrintf(const char *format, ...);
-inline bool IsNum(const std::string &str)
-{
-    std::istringstream sin(str);
-    double num;
-    return (sin >> num) && sin.eof();
-}
+
 inline void RemoveSpace(std::string &str)
 {
     str.erase(remove_if(str.begin(), str.end(), [](unsigned char c) { return std::isspace(c);}), str.end());
 }
-template <typename T>
-bool AddInt(T op1, T op2, T minVal, T maxVal, T &res);
-inline bool AddInt32(int32_t op1, int32_t op2, int32_t &res)
-{
-    return AddInt(op1, op2, INT32_MIN, INT32_MAX, res);
-}
-inline bool AddInt64(int64_t op1, int64_t op2, int64_t &res)
-{
-    return AddInt(op1, op2, INT64_MIN, INT64_MAX, res);
-}
+
 template<typename T>
 bool AddInt(T op1, T op2, T minVal, T maxVal, T &res)
 {
@@ -104,6 +83,16 @@ bool AddInt(T op1, T op2, T minVal, T maxVal, T &res)
     res = op1 + op2;
     return true;
 }
+
+inline bool AddInt32(int32_t op1, int32_t op2, int32_t &res)
+{
+    return AddInt(op1, op2, INT32_MIN, INT32_MAX, res);
+}
+
+inline bool AddInt64(int64_t op1, int64_t op2, int64_t &res)
+{
+    return AddInt(op1, op2, INT64_MIN, INT64_MAX, res);
+}
 } // namespace MMI
 } // namespace OHOS
 #endif // UTIL_H
diff --git a/util/common/src/util.cpp b/util/common/src/util.cpp
index 592a57fa21..57c18b14ef 100644
--- a/util/common/src/util.cpp
+++ b/util/common/src/util.cpp
@@ -19,10 +19,7 @@
 #include <cinttypes>
 #include <cstdarg>
 #include <fstream>
-#include <iomanip>
-#include <thread>
 
-#include <fcntl.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
@@ -63,38 +60,6 @@ constexpr size_t BUF_CMD_SIZE = 512;
 constexpr size_t PROGRAM_NAME_SIZE = 256;
 } // namespace
 
-const std::map<int32_t, std::string> ERROR_STRING_MAP = {
-    {MSG_SEND_FAIL, "Send Message Failed"},
-    {NON_STD_EVENT, "Non-Standardized Event"},
-    {UNKNOWN_EVENT, "Unknown Event"},
-    {UNPROC_MSG, "Unprocessed Message"},
-    {UNKNOWN_MSG_ID, "Unknown Message Id"},
-    {UNKNOWN_DEV, "Unknown Device"},
-    {ERROR_NULL_POINTER, "Null Pointer"},
-    {FILE_OPEN_FAIL, "Open File Failed"},
-    {FILE_READ_FAIL, "Read File Failed"},
-    {FILE_WRITE_FAIL, "Write File Failed"},
-    {API_PARAM_TYPE_FAIL, "API Param Type Error"},
-    {API_OUT_OF_RANGE, "API Out Of Range Error"},
-    {FOCUS_ID_OBTAIN_FAIL, "Obtain FocusID Failed"},
-};
-
-const char *GetMmiErrorTypeDesc(int32_t errorCodeEnum)
-{
-    auto str = ERROR_STRING_MAP.find(errorCodeEnum);
-    if (str == ERROR_STRING_MAP.end()) {
-        return nullptr;
-    }
-    return str->second.c_str();
-}
-
-int64_t GetMicrotime()
-{
-    struct timeval currentTime = {};
-    gettimeofday(&currentTime, nullptr);
-    return currentTime.tv_sec * 1000 * 1000 + currentTime.tv_usec;
-}
-
 int64_t GetSysClockTime()
 {
     struct timespec ts = { 0, 0 };
@@ -112,13 +77,6 @@ int64_t GetMillisTime()
     return tmp.count();
 }
 
-std::string UuIdGenerate()
-{
-    static constexpr int32_t uuidBufSize = 64;
-    char buf[uuidBufSize] = {};
-    return buf;
-}
-
 std::string GetUUid()
 {
     Uuid uid;
@@ -127,7 +85,7 @@ std::string GetUUid()
     return strUuid;
 }
 
-std::string GetThisThreadIdOfString()
+static std::string GetThisThreadIdOfString()
 {
     thread_local std::string threadLocalId;
     if (threadLocalId.empty()) {
@@ -152,7 +110,7 @@ uint64_t GetThisThreadId()
     return tid;
 }
 
-size_t StringToken(std::string &str, const std::string &sep, std::string &token)
+static size_t StringToken(std::string &str, const std::string &sep, std::string &token)
 {
     token = "";
     if (str.empty()) {
@@ -204,76 +162,12 @@ std::string IdsListToString(const std::vector<int32_t> &list, const std::string
     return str;
 }
 
-void LocalTime(struct tm &t, time_t curTime)
-{
-    time_t curTimeTemp = curTime;
-    if (curTimeTemp == 0) {
-        curTimeTemp = time(nullptr);
-    }
-    auto tm = localtime(&curTimeTemp);
-    if (tm) {
-        t = *tm;
-    }
-}
-
-std::string Strftime(const std::string &format, time_t curTime)
-{
-    if (format.empty()) {
-        return format;
-    }
-    struct tm t = {};
-    LocalTime(t, curTime);
-    char szDTime[32] = "";
-    (void)strftime(szDTime, sizeof(szDTime), format.c_str(), &t);
-    return szDTime;
-}
-
-static void PrintEventJoyStickAxisInfo(const std::string &axisName, const EventJoyStickAxisAbsInfo &r)
-{
-    MMI_HILOGD("%{public}s: {code:%{public}d,value:%{public}d,min:%{public}d,max:%{public}d,"
-               "fuzz:%{public}d,flat:%{public}d,resolution:%{public}d,"
-               "standardValue:%{public}lf,isChanged:%{public}d}, ",
-               axisName.c_str(), r.code, r.value, r.minimum, r.maximum, r.fuzz, r.flat, r.resolution,
-               r.standardValue, r.isChanged);
-}
-
-void PrintEventJoyStickAxisInfo(const EventJoyStickAxis &r, const int32_t fd,
-    const int32_t abilityId, const int32_t focusId, const int64_t preHandlerTime)
-{
-    MMI_HILOGD("Event dispatcher of server, EventJoyStickAxis:physical:%{public}s,"
-               "fd:%{public}d,preHandlerTime:%{public}" PRId64 ","
-               "time:%{public}" PRId64 ",deviceType:%{public}u,eventType:%{public}d,deviceName:%{public}s",
-               r.physical, fd, preHandlerTime, r.time, r.deviceType,
-               r.eventType, r.deviceName);
-
-    PrintEventJoyStickAxisInfo(std::string("abs_throttle"), r.abs_throttle);
-    PrintEventJoyStickAxisInfo(std::string("abs_hat0x"), r.abs_hat0x);
-    PrintEventJoyStickAxisInfo(std::string("abs_hat0y"), r.abs_hat0y);
-    PrintEventJoyStickAxisInfo(std::string("abs_x"), r.abs_x);
-    PrintEventJoyStickAxisInfo(std::string("abs_y"), r.abs_y);
-    PrintEventJoyStickAxisInfo(std::string("abs_z"), r.abs_z);
-    PrintEventJoyStickAxisInfo(std::string("abs_rx"), r.abs_rx);
-    PrintEventJoyStickAxisInfo(std::string("abs_ry"), r.abs_ry);
-    PrintEventJoyStickAxisInfo(std::string("abs_rz"), r.abs_rz);
-}
-
-void PrintWMSInfo(const std::string &str, const int32_t fd, const int32_t abilityId, const int32_t focusId)
-{
-    MMI_HILOGD("MMIWMS:windowId:%{public}s", str.c_str());
-    if (focusId == -1) {
-        MMI_HILOGD("WMS:windowId = ''");
-    } else {
-        MMI_HILOGD("WMS:windowId:%{public}d", focusId);
-    }
-    MMI_HILOGI("CALL_AMS, fd:%{public}d,abilityID:%{public}d", fd, abilityId);
-}
-
 int32_t GetPid()
 {
     return static_cast<int32_t>(getpid());
 }
 
-std::string GetFileName(const std::string &strPath)
+static std::string GetFileName(const std::string &strPath)
 {
     size_t nPos = strPath.find_last_of('/');
     if (strPath.npos == nPos) {
@@ -338,97 +232,11 @@ const char* GetProgramName()
     return programName;
 }
 
-char* MmiBasename(char* path)
-{
-    if (path == nullptr) {
-        return nullptr;
-    }
-
-    char* rightSlash = strrchr(path, '/');
-    char* pBasename = nullptr;
-    if (rightSlash != nullptr) {
-        pBasename = (rightSlash + 1);
-    } else {
-        pBasename = path;
-    }
-
-    return pBasename;
-}
-
 void SetThreadName(const std::string &name)
 {
     prctl(PR_SET_NAME, name.c_str());
 }
 
-namespace {
-thread_local std::string g_threadName;
-} // namespace
-const std::string& GetThreadName()
-{
-    if (!g_threadName.empty()) {
-        return g_threadName;
-    }
-    static constexpr size_t maxThreadNameSize = 16;
-    char thisThreadName[maxThreadNameSize + 1];
-    int32_t ret = prctl(PR_GET_NAME, thisThreadName);
-    if (ret == 0) {
-        thisThreadName[maxThreadNameSize] = '\0';
-        g_threadName = thisThreadName;
-    } else {
-        printf("in GetThreadName, call prctl get name fail, errno: %d.\n", errno);
-    }
-    return g_threadName;
-}
-
-void AddId(std::vector<int32_t> &list, int32_t id)
-{
-    if (id <= 0) {
-        return;
-    }
-    auto it = std::find(list.begin(), list.end(), id);
-    if (it != list.end()) {
-        return;
-    }
-    list.push_back(id);
-}
-
-size_t CalculateDifference(const std::vector<int32_t> &list1, std::vector<int32_t> &list2,
-    std::vector<int32_t> &difList)
-{
-    if (list1.empty()) {
-        difList = list2;
-        return difList.size();
-    }
-    if (list2.empty()) {
-        difList = list1;
-        return difList.size();
-    }
-    std::vector<int32_t> l1 = list1;
-    std::sort(l1.begin(), l1.end());
-    std::vector<int32_t> l2 = list2;
-    std::sort(l2.begin(), l2.end());
-    std::set_difference(l1.begin(), l1.end(), l2.begin(), l2.end(), std::back_inserter(difList));
-    return difList.size();
-}
-
-std::string StringFmt(const char* str, ...)
-{
-    if (str == nullptr) {
-        MMI_HILOGW("Str is nullptr");
-        return "";
-    }
-    va_list args;
-    va_start(args, str);
-    char buf[MAX_PACKET_BUF_SIZE] = {};
-    if (vsnprintf_s(buf, sizeof(buf), sizeof(buf) - 1, str, args) == -1) {
-        MMI_HILOGE("vsnprintf_s error");
-        va_end(args);
-        return "";
-    }
-    va_end(args);
-    return buf;
-}
-
 static bool IsFileExists(const std::string &fileName)
 {
     return (access(fileName.c_str(), F_OK) == 0);
@@ -523,6 +331,13 @@ void ReadProFile(const std::string &filePath, int32_t deviceId,
     ReadProConfigFile(realPath, deviceId, configMap);
 }
 
+static inline bool IsNum(const std::string &str)
+{
+    std::istringstream sin(str);
+    double num;
+    return (sin >> num) && sin.eof();
+}
+
 void ReadProConfigFile(const std::string &realPath, int32_t deviceId,
     std::map<int32_t, std::map<int32_t, int32_t>> &configKey)
 {
@@ -601,42 +416,38 @@ std::string ReadJsonFile(const std::string &filePath)
     return ReadFile(filePath);
 }
 
-int32_t ReadTomlFile(const std::string &filePath, DeviceConfig &devConf)
+static int32_t ConfigItemSwitch(const std::string &configItem, const std::string &value, DeviceConfig &devConf)
 {
-    if (filePath.empty()) {
-        MMI_HILOGE("FilePath is empty");
-        return RET_ERR;
-    }
-    char realPath[PATH_MAX] = {};
-    if (realpath(filePath.c_str(), realPath) == nullptr) {
-        MMI_HILOGE("Path is error");
-        return RET_ERR;
-    }
-    if (!IsValidTomlPath(realPath)) {
-        MMI_HILOGE("File path is error");
-        return RET_ERR;
-    }
-    if (!IsFileExists(realPath)) {
-        MMI_HILOGE("File is not existent");
-        return RET_ERR;
-    }
-    if (!CheckFileExtendName(realPath, "TOML")) {
-        MMI_HILOGE("Unable to parse files other than json format");
+    CALL_DEBUG_ENTER;
+    if (configItem.empty() || value.empty()) {
+        MMI_HILOGE("Get key config item is invalid");
         return RET_ERR;
     }
-    int32_t fileSize = GetFileSize(realPath);
-    if ((fileSize <= 0) || (fileSize > FILE_SIZE_MAX)) {
-        MMI_HILOGE("File size out of read range");
+    if (!IsNum(value)) {
+        MMI_HILOGE("Get key config item is invalid");
         return RET_ERR;
     }
-    if (ReadConfigFile(realPath, devConf) == RET_ERR) {
-        MMI_HILOGE("Read device config file failed");
-        return RET_ERR;
+    if (configItem == CONFIG_ITEM_REPEAT) {
+        devConf.autoSwitch = stoi(value);
+    } else if (configItem == CONFIG_ITEM_DELAY) {
+        devConf.delayTime = stoi(value);
+        if (devConf.delayTime < MIN_DELAYTIME || devConf.delayTime > MAX_DELAYTIME) {
+            MMI_HILOGE("Unusual the delaytime");
+            return RET_ERR;
+        }
+    } else if (configItem == CONFIG_ITEM_INTERVAL) {
+        devConf.intervalTime = stoi(value);
+        if (devConf.intervalTime < MIN_INTERVALTIME || devConf.intervalTime > MAX_INTERVALTIME) {
+            MMI_HILOGE("Unusual the intervaltime");
+            return RET_ERR;
+        }
+    } else if (configItem == CONFIG_ITEM_TYPE) {
+        devConf.keyboardType = stoi(value);
     }
     return RET_OK;
 }
 
-int32_t ReadConfigFile(const std::string &realPath, DeviceConfig &devConf)
+static int32_t ReadConfigFile(const std::string &realPath, DeviceConfig &devConf)
 {
     CALL_DEBUG_ENTER;
     std::ifstream cfgFile(realPath);
@@ -674,33 +485,37 @@ int32_t ReadConfigFile(const std::string &realPath, DeviceConfig &devConf)
     return RET_OK;
 }
 
-int32_t ConfigItemSwitch(const std::string &configItem, const std::string &value, DeviceConfig &devConf)
+int32_t ReadTomlFile(const std::string &filePath, DeviceConfig &devConf)
 {
-    CALL_DEBUG_ENTER;
-    if (configItem.empty() || value.empty()) {
-        MMI_HILOGE("Get key config item is invalid");
+    if (filePath.empty()) {
+        MMI_HILOGE("FilePath is empty");
         return RET_ERR;
     }
-    if (!IsNum(value)) {
-        MMI_HILOGE("Get key config item is invalid");
+    char realPath[PATH_MAX] = {};
+    if (realpath(filePath.c_str(), realPath) == nullptr) {
+        MMI_HILOGE("Path is error");
         return RET_ERR;
     }
-    if (configItem == CONFIG_ITEM_REPEAT) {
-        devConf.autoSwitch = stoi(value);
-    } else if (configItem == CONFIG_ITEM_DELAY) {
-        devConf.delayTime = stoi(value);
-        if (devConf.delayTime < MIN_DELAYTIME || devConf.delayTime > MAX_DELAYTIME) {
-            MMI_HILOGE("Unusual the delaytime");
-            return RET_ERR;
-        }
-    } else if (configItem == CONFIG_ITEM_INTERVAL) {
-        devConf.intervalTime = stoi(value);
-        if (devConf.intervalTime < MIN_INTERVALTIME || devConf.intervalTime > MAX_INTERVALTIME) {
-            MMI_HILOGE("Unusual the intervaltime");
-            return RET_ERR;
-        }
-    } else if (configItem == CONFIG_ITEM_TYPE) {
-        devConf.keyboardType = stoi(value);
+    if (!IsValidTomlPath(realPath)) {
+        MMI_HILOGE("File path is error");
+        return RET_ERR;
+    }
+    if (!IsFileExists(realPath)) {
+        MMI_HILOGE("File is not existent");
+        return RET_ERR;
+    }
+    if (!CheckFileExtendName(realPath, "TOML")) {
+        MMI_HILOGE("Unable to parse files other than json format");
+        return RET_ERR;
+    }
+    int32_t fileSize = GetFileSize(realPath);
+    if ((fileSize <= 0) || (fileSize > FILE_SIZE_MAX)) {
+        MMI_HILOGE("File size out of read range");
+        return RET_ERR;
+    }
+    if (ReadConfigFile(realPath, devConf) == RET_ERR) {
+        MMI_HILOGE("Read device config file failed");
+        return RET_ERR;
     }
     return RET_OK;
 }
diff --git a/util/common/test/util_test.cpp b/util/common/test/util_test.cpp
deleted file mode 100644
index 7829c62edd..0000000000
--- a/util/common/test/util_test.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include "error_multimodal.h"
-#include "util.h"
-
-
-namespace OHOS {
-namespace MMI {
-namespace {
-using namespace testing::ext;
-} // namespace
-
-class UtilTest : public testing::Test {
-public:
-    static void SetUpTestCase(void) {}
-    static void TearDownTestCase(void) {}
-};
-
-/**
- * @tc.name:getEnumString_001
- * @tc.desc:Verify get enum string
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, getEnumString_001, TestSize.Level1)
-{
-    const int32_t errorCodeEnum = MSG_SEND_FAIL;
-    const char *retResult = GetMmiErrorTypeDesc(errorCodeEnum);
-    EXPECT_STREQ(retResult, "Send Message Failed");
-}
-
-/**
- * @tc.name:getEnumString_002
- * @tc.desc:Verify get enum string
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, getEnumString_002, TestSize.Level1)
-{
-    const int32_t errorCodeEnum = NON_STD_EVENT;
-    const char *retResult = GetMmiErrorTypeDesc(errorCodeEnum);
-    EXPECT_STREQ(retResult, "Non-Standardized Event");
-}
-
-/**
- * @tc.name:getEnumString_003
- * @tc.desc:Verify get enum string
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, getEnumString_003, TestSize.Level1)
-{
-    const int32_t errorCodeEnum = UNKNOWN_EVENT;
-    const char *retResult = GetMmiErrorTypeDesc(errorCodeEnum);
-    EXPECT_STREQ(retResult, "Unknown Event");
-}
-
-/**
- * @tc.name:getEnumString_004
- * @tc.desc:Verify get enum string
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, getEnumString_004, TestSize.Level1)
-{
-    const int32_t errorCodeEnum = UNPROC_MSG;
-    const char *retResult = GetMmiErrorTypeDesc(errorCodeEnum);
-    EXPECT_STREQ(retResult, "Unprocessed Message");
-}
-
-/**
- * @tc.name:getEnumString_005
- * @tc.desc:Verify get enum string
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, getEnumString_005, TestSize.Level1)
-{
-    const int32_t errorCodeEnum = UNKNOWN_MSG_ID;
-    const char *retResult = GetMmiErrorTypeDesc(errorCodeEnum);
-    EXPECT_STREQ(retResult, "Unknown Message Id");
-}
-
-/**
- * @tc.name:GetMicrotime
- * @tc.desc:Verify get micro time
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, GetMicrotime, TestSize.Level1)
-{
-    int64_t retResult = GetMicrotime();
-    EXPECT_TRUE(retResult > 0);
-}
-
-/**
- * @tc.name:GetMillisTime
- * @tc.desc:Verify get millis time
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, GetMillisTime, TestSize.Level1)
-{
-    int64_t retResult = GetMillisTime();
-    EXPECT_TRUE(retResult > 0);
-}
-
-/**
- * @tc.name:UuIdGenerate
- * @tc.desc:Verify generate uuid
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, UuIdGenerate, TestSize.Level1)
-{
-    std::string retResult = UuIdGenerate();
-    EXPECT_TRUE(retResult.length() == 0);
-}
-
-/**
- * @tc.name:GetUUid
- * @tc.desc:Verify get uuid
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, GetUUid, TestSize.Level1)
-{
-    std::string retResult = GetUUid();
-    EXPECT_TRUE(retResult.length() >= 0);
-}
-
-/**
- * @tc.name:GetThisThreadIdOfString
- * @tc.desc:Verify get thread id
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, GetThisThreadIdOfString, TestSize.Level1)
-{
-    std::string retResult = GetThisThreadIdOfString();
-    EXPECT_TRUE(retResult.length() >= 0);
-}
-
-HWTEST_F(UtilTest, GetThisThreadId, TestSize.Level1)
-{
-    uint64_t retResult = GetThisThreadId();
-    EXPECT_TRUE(retResult >= 0);
-}
-
-/**
- * @tc.name:StringToken_001
- * @tc.desc:Verify string token
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, StringToken_001, TestSize.Level1)
-{
-    std::string str = "sdf_wef_1";
-    const std::string sep = "sdf_wef_1.sss";
-    std::string token = "_";
-    StringToken(str, sep, token);
-}
-
-/**
- * @tc.name:StringToken_002
- * @tc.desc:Verify string token
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, StringToken_002, TestSize.Level1)
-{
-    std::string str = { 0 };
-    const std::string sep;
-    std::string token;
-    StringToken(str, sep, token);
-}
-
-/**
- * @tc.name:StringToken_003
- * @tc.desc:Verify string token
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, StringToken_003, TestSize.Level1)
-{
-    std::string str = { 0, 1, 2, 3 };
-    const std::string sep = { 2 };
-    std::string token;
-    StringToken(str, sep, token);
-}
-
-/**
- * @tc.name:StringSplit
- * @tc.desc:Verify string token
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(UtilTest, StringSplit, TestSize.Level1)
-{
-    const std::string str;
-    const std::string sep;
-    std::vector<std::string> vecList;
-    StringSplit(str, sep, vecList);
-}
-} // namespace MMI
-} // namespace OHOS
diff --git a/util/network/test/net_packet_test.cpp b/util/network/test/net_packet_test.cpp
index aa6364435c..aecdf18550 100644
--- a/util/network/test/net_packet_test.cpp
+++ b/util/network/test/net_packet_test.cpp
@@ -208,7 +208,7 @@ HWTEST_F(NetPacketTest, ReadAndWrite, TestSize.Level1)
 {
     int32_t p1 = 112;
     std::string p2 = "test111";
-    NetPacket pkt(MmiMessageId::REGISTER_APP_INFO);
+    NetPacket pkt(MmiMessageId::INVALID);
     pkt << p1 << p2;
 
     int32_t r1 = 0;
@@ -228,7 +228,7 @@ HWTEST_F(NetPacketTest, WriteError, TestSize.Level1)
 {
     int32_t p1 = 112;
     std::string p2 = "test111";
-    NetPacket pkt(MmiMessageId::REGISTER_APP_INFO);
+    NetPacket pkt(MmiMessageId::INVALID);
     pkt << p1 << p2;
     EXPECT_FALSE(pkt.ChkRWError());
     struct TestData {
@@ -250,7 +250,7 @@ HWTEST_F(NetPacketTest, ReadError, TestSize.Level1)
 {
     int32_t p1 = 112;
     std::string p2 = "test111";
-    NetPacket pkt(MmiMessageId::REGISTER_APP_INFO);
+    NetPacket pkt(MmiMessageId::INVALID);
     pkt << p1 << p2;
     EXPECT_FALSE(pkt.ChkRWError());
 
diff --git a/util/socket/test/uds_session_test.cpp b/util/socket/test/uds_session_test.cpp
index 68def8fcd2..50f35bdffd 100644
--- a/util/socket/test/uds_session_test.cpp
+++ b/util/socket/test/uds_session_test.cpp
@@ -173,7 +173,7 @@ HWTEST_F(UDSSessionTest, SendMsg_type2_001, TestSize.Level1)
  */
 HWTEST_F(UDSSessionTest, SendMsg_type2_002, TestSize.Level1)
 {
-    NetPacket pkt(MmiMessageId::BEGIN);
+    NetPacket pkt(MmiMessageId::INVALID);
 
     UDSSession sesObj(PROGRAM_NAME, moduleType_, writeFd_, UID_ROOT, pid_);
     bool retResult = sesObj.SendMsg(pkt);
@@ -189,7 +189,7 @@ HWTEST_F(UDSSessionTest, SendMsg_type2_002, TestSize.Level1)
 HWTEST_F(UDSSessionTest, SendMsg_type2_003, TestSize.Level1)
 {
     int32_t fd = -65535;
-    NetPacket pkt(MmiMessageId::BEGIN);
+    NetPacket pkt(MmiMessageId::INVALID);
 
     UDSSession sesObj(PROGRAM_NAME, moduleType_, fd, UID_ROOT, pid_);
     bool retResult = sesObj.SendMsg(pkt);
-- 
Gitee


From 7399211121a279129e954358bd077d6d3090a546 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 24 Oct 2022 10:55:16 +0800
Subject: [PATCH 072/360] Add fuzzTest

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ifa58397c12f0eb3f969b89ae826ccdfcddc2430d
---
 service/module_loader/src/mmi_service.cpp     |  2 +-
 test/fuzztest/BUILD.gn                        |  3 +
 .../getfunctionkeystate_fuzzer/BUILD.gn       | 49 ++++++++++++++
 .../getfunctionkeystate_fuzzer/corpus/init    | 14 ++++
 .../getfunctionkeystate_fuzzer.cpp            | 62 +++++++++++++++++
 .../getfunctionkeystate_fuzzer.h              | 21 ++++++
 .../getfunctionkeystate_fuzzer/project.xml    | 25 +++++++
 test/fuzztest/getpointerstyle_fuzzer/BUILD.gn | 49 ++++++++++++++
 .../getpointerstyle_fuzzer/corpus/init        | 14 ++++
 .../getpointerstyle_fuzzer.cpp                | 64 ++++++++++++++++++
 .../getpointerstyle_fuzzer.h                  | 21 ++++++
 .../getpointerstyle_fuzzer/project.xml        | 25 +++++++
 test/fuzztest/pointerspeed_fuzzer/BUILD.gn    | 50 ++++++++++++++
 test/fuzztest/pointerspeed_fuzzer/corpus/init | 14 ++++
 .../pointerspeed_fuzzer.cpp                   | 67 +++++++++++++++++++
 .../pointerspeed_fuzzer/pointerspeed_fuzzer.h | 21 ++++++
 test/fuzztest/pointerspeed_fuzzer/project.xml | 25 +++++++
 17 files changed, 525 insertions(+), 1 deletion(-)
 create mode 100644 test/fuzztest/getfunctionkeystate_fuzzer/BUILD.gn
 create mode 100644 test/fuzztest/getfunctionkeystate_fuzzer/corpus/init
 create mode 100644 test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.cpp
 create mode 100644 test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.h
 create mode 100644 test/fuzztest/getfunctionkeystate_fuzzer/project.xml
 create mode 100644 test/fuzztest/getpointerstyle_fuzzer/BUILD.gn
 create mode 100644 test/fuzztest/getpointerstyle_fuzzer/corpus/init
 create mode 100644 test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.cpp
 create mode 100644 test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.h
 create mode 100644 test/fuzztest/getpointerstyle_fuzzer/project.xml
 create mode 100644 test/fuzztest/pointerspeed_fuzzer/BUILD.gn
 create mode 100644 test/fuzztest/pointerspeed_fuzzer/corpus/init
 create mode 100644 test/fuzztest/pointerspeed_fuzzer/pointerspeed_fuzzer.cpp
 create mode 100644 test/fuzztest/pointerspeed_fuzzer/pointerspeed_fuzzer.h
 create mode 100644 test/fuzztest/pointerspeed_fuzzer/project.xml

diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 2f81ecc531..9ccb7ea889 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -691,7 +691,7 @@ int32_t MMIService::GetKeyboardType(int32_t userData, int32_t deviceId)
         pid, userData, deviceId));
     if (ret != RET_OK) {
         MMI_HILOGE("Get keyboard type failed, ret:%{public}d", ret);
-        return RET_ERR;
+        return ret;
     }
     return RET_OK;
 }
diff --git a/test/fuzztest/BUILD.gn b/test/fuzztest/BUILD.gn
index 5f004007b0..988372fe7c 100644
--- a/test/fuzztest/BUILD.gn
+++ b/test/fuzztest/BUILD.gn
@@ -20,9 +20,12 @@ group("test") {
     "addinputeventfilter_fuzzer:fuzztest",
     "addinterceptor_fuzzer:fuzztest",
     "addmonitor_fuzzer:fuzztest",
+    "getfunctionkeystate_fuzzer:fuzztest",
     "getkeyboardtype_fuzzer:fuzztest",
+    "getpointerstyle_fuzzer:fuzztest",
     "markconsumed_fuzzer:fuzztest",
     "movemouse_fuzzer:fuzztest",
+    "pointerspeed_fuzzer:fuzztest",
     "pointervisible_fuzzer:fuzztest",
     "simulateinputevent_fuzzer:fuzztest",
     "subscribekeyevent_fuzzer:fuzztest",
diff --git a/test/fuzztest/getfunctionkeystate_fuzzer/BUILD.gn b/test/fuzztest/getfunctionkeystate_fuzzer/BUILD.gn
new file mode 100644
index 0000000000..a21aae9a89
--- /dev/null
+++ b/test/fuzztest/getfunctionkeystate_fuzzer/BUILD.gn
@@ -0,0 +1,49 @@
+# Copyright (c) 2022 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#####################hydra-fuzz###################
+import("//build/config/features.gni")
+import("//build/test.gni")
+import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
+module_output_path = "multimodalinput/fuzz"
+
+##############################fuzztest##########################################
+ohos_fuzztest("GetFunctionkeyStateFuzzTest") {
+  module_out_path = module_output_path
+  fuzz_config_file = "//foundation/multimodalinput/input/test/fuzztest/getfunctionkeystate_fuzzer"
+  include_dirs =
+      [ "//foundation/multimodalinput/input/interfaces/util/common/include" ]
+  cflags = [
+    "-g",
+    "-O0",
+    "-Wno-unused-variable",
+    "-fno-omit-frame-pointer",
+  ]
+  sources = [ "getfunctionkeystate_fuzzer.cpp" ]
+  deps = [ "${mmi_path}/frameworks/proxy:libmmi-client" ]
+  external_deps = [
+    "c_utils:utils",
+    "hiviewdfx_hilog_native:libhilog",
+  ]
+}
+
+###############################################################################
+group("fuzztest") {
+  testonly = true
+  deps = []
+  deps += [
+    # deps file
+    ":GetFunctionkeyStateFuzzTest",
+  ]
+}
+###############################################################################
diff --git a/test/fuzztest/getfunctionkeystate_fuzzer/corpus/init b/test/fuzztest/getfunctionkeystate_fuzzer/corpus/init
new file mode 100644
index 0000000000..bc977bd973
--- /dev/null
+++ b/test/fuzztest/getfunctionkeystate_fuzzer/corpus/init
@@ -0,0 +1,14 @@
+# Copyright (c) 2022 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FUZZ
\ No newline at end of file
diff --git a/test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.cpp b/test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.cpp
new file mode 100644
index 0000000000..0653784267
--- /dev/null
+++ b/test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "getfunctionkeystate_fuzzer.h"
+
+#include "securec.h"
+
+#include "input_manager.h"
+#include "mmi_log.h"
+
+namespace OHOS {
+namespace MMI {
+template<class T>
+size_t GetObject(T &object, const uint8_t *data, size_t size)
+{
+    size_t objectSize = sizeof(object);
+    if (objectSize > size) {
+        return 0;
+    }
+    errno_t ret = memcpy_s(&object, objectSize, data, objectSize);
+    if (ret != EOK) {
+        return 0;
+    }
+    return objectSize;
+}
+
+void GetFunctionkeyStateFuzzTest(const uint8_t* data, size_t  size)
+{
+    int32_t funcKey;
+    size_t startPos = 0;
+    startPos += GetObject<int32_t>(funcKey, data + startPos, size - startPos);
+    InputManager::GetInstance()->GetFunctionKeyState(funcKey);
+
+    int32_t random = 0;
+    startPos += GetObject<int32_t>(funcKey, data + startPos, size - startPos);
+    startPos += GetObject<int32_t>(random, data + startPos, size - startPos);
+    bool enable = (random % 2) ? false : true;
+    InputManager::GetInstance()->SetFunctionKeyState(funcKey, enable);
+}
+} // MMI
+} // OHOS
+
+/* Fuzzer entry point */
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    /* Run your code on data */
+    OHOS::MMI::GetFunctionkeyStateFuzzTest(data, size);
+    return 0;
+}
+
diff --git a/test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.h b/test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.h
new file mode 100644
index 0000000000..86a3f68c09
--- /dev/null
+++ b/test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef GETFUNCTIONKEYSTATE_FUZZER_H
+#define GETFUNCTIONKEYSTATE_FUZZER_H
+
+#define FUZZ_PROJECT_NAME "getfunctionkeystate_fuzzer"
+
+#endif // GETFUNCTIONKEYSTATE_FUZZER_H
diff --git a/test/fuzztest/getfunctionkeystate_fuzzer/project.xml b/test/fuzztest/getfunctionkeystate_fuzzer/project.xml
new file mode 100644
index 0000000000..6e8ad2cfde
--- /dev/null
+++ b/test/fuzztest/getfunctionkeystate_fuzzer/project.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2022 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
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<fuzz_config>
+  <fuzztest>
+    <!-- maximum length of a test input -->
+    <max_len>1000</max_len>
+    <!-- maximum total time in seconds to run the fuzzer -->
+    <max_total_time>300</max_total_time>
+    <!-- memory usage limit in Mb -->
+    <rss_limit_mb>4096</rss_limit_mb>
+  </fuzztest>
+</fuzz_config>
diff --git a/test/fuzztest/getpointerstyle_fuzzer/BUILD.gn b/test/fuzztest/getpointerstyle_fuzzer/BUILD.gn
new file mode 100644
index 0000000000..edc63248bb
--- /dev/null
+++ b/test/fuzztest/getpointerstyle_fuzzer/BUILD.gn
@@ -0,0 +1,49 @@
+# Copyright (c) 2022 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#####################hydra-fuzz###################
+import("//build/config/features.gni")
+import("//build/test.gni")
+import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
+module_output_path = "multimodalinput/fuzz"
+
+##############################fuzztest##########################################
+ohos_fuzztest("GetPointerStyleFuzzTest") {
+  module_out_path = module_output_path
+  fuzz_config_file = "//foundation/multimodalinput/input/test/fuzztest/getpointerstyle_fuzzer"
+  include_dirs =
+      [ "//foundation/multimodalinput/input/interfaces/util/common/include" ]
+  cflags = [
+    "-g",
+    "-O0",
+    "-Wno-unused-variable",
+    "-fno-omit-frame-pointer",
+  ]
+  sources = [ "getpointerstyle_fuzzer.cpp" ]
+  deps = [ "${mmi_path}/frameworks/proxy:libmmi-client" ]
+  external_deps = [
+    "c_utils:utils",
+    "hiviewdfx_hilog_native:libhilog",
+  ]
+}
+
+###############################################################################
+group("fuzztest") {
+  testonly = true
+  deps = []
+  deps += [
+    # deps file
+    ":GetPointerStyleFuzzTest",
+  ]
+}
+###############################################################################
diff --git a/test/fuzztest/getpointerstyle_fuzzer/corpus/init b/test/fuzztest/getpointerstyle_fuzzer/corpus/init
new file mode 100644
index 0000000000..bc977bd973
--- /dev/null
+++ b/test/fuzztest/getpointerstyle_fuzzer/corpus/init
@@ -0,0 +1,14 @@
+# Copyright (c) 2022 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FUZZ
\ No newline at end of file
diff --git a/test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.cpp b/test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.cpp
new file mode 100644
index 0000000000..bf005b9db9
--- /dev/null
+++ b/test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "getpointerstyle_fuzzer.h"
+
+#include "securec.h"
+
+#include "input_manager.h"
+#include "define_multimodal.h"
+#include "mmi_log.h"
+
+namespace OHOS {
+namespace MMI {
+
+template<class T>
+size_t GetObject(T &object, const uint8_t *data, size_t size)
+{
+    size_t objectSize = sizeof(object);
+    if (objectSize > size) {
+        return 0;
+    }
+    errno_t ret = memcpy_s(&object, objectSize, data, objectSize);
+    if (ret != EOK) {
+        return 0;
+    }
+    return objectSize;
+}
+
+void GetPointerStyleFuzzTest(const uint8_t* data, size_t  size)
+{
+    int32_t windowId;
+    size_t startPos = 0;
+    startPos += GetObject<int32_t>(windowId, data + startPos, size - startPos);
+    int32_t pointerStyle;
+    startPos += GetObject<int32_t>(pointerStyle, data + startPos, size - startPos);
+    InputManager::GetInstance()->SetPointerStyle(windowId, pointerStyle);
+
+    startPos += GetObject<int32_t>(windowId, data + startPos, size - startPos);
+    startPos += GetObject<int32_t>(pointerStyle, data + startPos, size - startPos);
+    InputManager::GetInstance()->GetPointerStyle(windowId, pointerStyle);
+}
+} // MMI
+} // OHOS
+
+/* Fuzzer entry point */
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    /* Run your code on data */
+    OHOS::MMI::GetPointerStyleFuzzTest(data, size);
+    return 0;
+}
+
diff --git a/test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.h b/test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.h
new file mode 100644
index 0000000000..5d11f3a311
--- /dev/null
+++ b/test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef GETPOINTERSTYLE_FUZZER_H
+#define GETPOINTERSTYLE_FUZZER_H
+
+#define FUZZ_PROJECT_NAME "getpointerstyle_fuzzer"
+
+#endif // GETPOINTERSTYLE_FUZZER_H
diff --git a/test/fuzztest/getpointerstyle_fuzzer/project.xml b/test/fuzztest/getpointerstyle_fuzzer/project.xml
new file mode 100644
index 0000000000..6e8ad2cfde
--- /dev/null
+++ b/test/fuzztest/getpointerstyle_fuzzer/project.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2022 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
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<fuzz_config>
+  <fuzztest>
+    <!-- maximum length of a test input -->
+    <max_len>1000</max_len>
+    <!-- maximum total time in seconds to run the fuzzer -->
+    <max_total_time>300</max_total_time>
+    <!-- memory usage limit in Mb -->
+    <rss_limit_mb>4096</rss_limit_mb>
+  </fuzztest>
+</fuzz_config>
diff --git a/test/fuzztest/pointerspeed_fuzzer/BUILD.gn b/test/fuzztest/pointerspeed_fuzzer/BUILD.gn
new file mode 100644
index 0000000000..c59ff74033
--- /dev/null
+++ b/test/fuzztest/pointerspeed_fuzzer/BUILD.gn
@@ -0,0 +1,50 @@
+# Copyright (c) 2022 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#####################hydra-fuzz###################
+import("//build/config/features.gni")
+import("//build/test.gni")
+import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
+module_output_path = "multimodalinput/fuzz"
+
+##############################fuzztest##########################################
+ohos_fuzztest("PointerSpeedFuzzTest") {
+  module_out_path = module_output_path
+  fuzz_config_file =
+      "//foundation/multimodalinput/input/test/fuzztest/pointerspeed_fuzzer"
+  include_dirs =
+      [ "//foundation/multimodalinput/input/interfaces/util/common/include" ]
+  cflags = [
+    "-g",
+    "-O0",
+    "-Wno-unused-variable",
+    "-fno-omit-frame-pointer",
+  ]
+  sources = [ "pointerspeed_fuzzer.cpp" ]
+  deps = [ "${mmi_path}/frameworks/proxy:libmmi-client" ]
+  external_deps = [
+    "c_utils:utils",
+    "hiviewdfx_hilog_native:libhilog",
+  ]
+}
+
+###############################################################################
+group("fuzztest") {
+  testonly = true
+  deps = []
+  deps += [
+    # deps file
+    ":PointerSpeedFuzzTest",
+  ]
+}
+###############################################################################
diff --git a/test/fuzztest/pointerspeed_fuzzer/corpus/init b/test/fuzztest/pointerspeed_fuzzer/corpus/init
new file mode 100644
index 0000000000..bc977bd973
--- /dev/null
+++ b/test/fuzztest/pointerspeed_fuzzer/corpus/init
@@ -0,0 +1,14 @@
+# Copyright (c) 2022 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FUZZ
\ No newline at end of file
diff --git a/test/fuzztest/pointerspeed_fuzzer/pointerspeed_fuzzer.cpp b/test/fuzztest/pointerspeed_fuzzer/pointerspeed_fuzzer.cpp
new file mode 100644
index 0000000000..1f66610b0e
--- /dev/null
+++ b/test/fuzztest/pointerspeed_fuzzer/pointerspeed_fuzzer.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "pointerspeed_fuzzer.h"
+
+#include "securec.h"
+
+#include "input_manager.h"
+#include "mmi_log.h"
+
+namespace OHOS {
+namespace MMI {
+namespace {
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "PointerSpeedFuzzTest" };
+} // namespace
+
+template<class T>
+size_t GetObject(const uint8_t *data, size_t size, T &object)
+{
+    size_t objectSize = sizeof(object);
+    if (objectSize > size) {
+        return 0;
+    }
+    errno_t ret = memcpy_s(&object, objectSize, data, objectSize);
+    if (ret != EOK) {
+        return 0;
+    }
+    return objectSize;
+}
+
+void PointerSpeedFuzzTest(const uint8_t* data, size_t size)
+{
+    int32_t speed;
+    size_t startPos = 0;
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, speed);
+    InputManager::GetInstance()->SetPointerSpeed(speed);
+    if (InputManager::GetInstance()->SetPointerSpeed(speed) == RET_OK) {
+        MMI_HILOGD("Set pointer speed success");
+    }
+
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, speed);
+    if (InputManager::GetInstance()->GetPointerSpeed(speed) == RET_OK) {
+        MMI_HILOGD("Get pointer speed success");
+    }
+}
+} // namespace MMI
+} // namespace OHOS
+
+/* Fuzzer entry point */
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    /* Run your code on data */
+    OHOS::MMI::PointerSpeedFuzzTest(data, size);
+    return 0;
+}
\ No newline at end of file
diff --git a/test/fuzztest/pointerspeed_fuzzer/pointerspeed_fuzzer.h b/test/fuzztest/pointerspeed_fuzzer/pointerspeed_fuzzer.h
new file mode 100644
index 0000000000..206b6eb1dd
--- /dev/null
+++ b/test/fuzztest/pointerspeed_fuzzer/pointerspeed_fuzzer.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef POINTERSPEED_FUZZER_H
+#define POINTERSPEED_FUZZER_H
+
+#define FUZZ_PROJECT_NAME "pointerspeed_fuzzer"
+
+#endif // POINTERSPEED_FUZZER_H
\ No newline at end of file
diff --git a/test/fuzztest/pointerspeed_fuzzer/project.xml b/test/fuzztest/pointerspeed_fuzzer/project.xml
new file mode 100644
index 0000000000..27c26d11b7
--- /dev/null
+++ b/test/fuzztest/pointerspeed_fuzzer/project.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2022 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
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<fuzz_config>
+  <fuzztest>
+    <!-- maximum length of a test input -->
+    <max_len>1000</max_len>
+    <!-- maximum total time in seconds to run the fuzzer -->
+    <max_total_time>300</max_total_time>
+    <!-- memory usage limit in Mb -->
+    <rss_limit_mb>4096</rss_limit_mb>
+  </fuzztest>
+</fuzz_config>
\ No newline at end of file
-- 
Gitee


From f4316344ea353534a68aee94a38a007f191fdc9e Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 24 Oct 2022 14:06:28 +0800
Subject: [PATCH 073/360] =?UTF-8?q?=E6=B7=BB=E5=8A=A0fuzz?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I78fde8366bfcf683c45d9a3fbc4ee201877c7e2a
---
 test/fuzztest/getpointerstyle_fuzzer/BUILD.gn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/fuzztest/getpointerstyle_fuzzer/BUILD.gn b/test/fuzztest/getpointerstyle_fuzzer/BUILD.gn
index edc63248bb..24bbe86683 100644
--- a/test/fuzztest/getpointerstyle_fuzzer/BUILD.gn
+++ b/test/fuzztest/getpointerstyle_fuzzer/BUILD.gn
@@ -20,7 +20,8 @@ module_output_path = "multimodalinput/fuzz"
 ##############################fuzztest##########################################
 ohos_fuzztest("GetPointerStyleFuzzTest") {
   module_out_path = module_output_path
-  fuzz_config_file = "//foundation/multimodalinput/input/test/fuzztest/getpointerstyle_fuzzer"
+  fuzz_config_file =
+      "//foundation/multimodalinput/input/test/fuzztest/getpointerstyle_fuzzer"
   include_dirs =
       [ "//foundation/multimodalinput/input/interfaces/util/common/include" ]
   cflags = [
-- 
Gitee


From 9aa04b99d1a66b9726fd9b8c855cc7268e8c6cf3 Mon Sep 17 00:00:00 2001
From: lixiangpeng5 <lixiangpeng5@huawei.com>
Date: Thu, 13 Oct 2022 09:36:50 +0800
Subject: [PATCH 074/360] =?UTF-8?q?=E8=A7=84=E6=95=B4{}=E5=89=8D=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lixiangpeng5 <lixiangpeng5@huawei.com>
Change-Id: I2fba74129c60c0cf4b403e55d0df2e17252dce29
---
 .../src/js_input_monitor_manager.cpp          |   2 +-
 .../event_handler/src/client_msg_handler.cpp  |   2 +-
 .../src/input_device_cooperate_impl.cpp       |   2 +-
 .../event_handler/src/input_device_impl.cpp   |   2 +-
 .../src/multimodal_event_handler.cpp          |   2 +-
 frameworks/proxy/events/src/input_event.cpp   |   2 +-
 frameworks/proxy/events/src/key_event.cpp     |   2 +-
 frameworks/proxy/events/src/key_option.cpp    |   2 +-
 .../proxy/events/test/pointer_event_test.cpp  |   2 +-
 .../src/multimodal_input_connect_manager.cpp  |   2 +-
 .../src/multimodal_input_connect_remoter.cpp  |   2 +-
 .../src/input_device_manager.cpp              |   2 +-
 service/hdf_adapter/src/hdf_event_manager.cpp | 546 ++++++++++++++++++
 .../src/cooperate_event_manager.cpp           |   2 +-
 .../src/distributed_input_adapter.cpp         |   2 +-
 .../src/i_input_device_cooperate_state.cpp    |   2 +-
 .../src/input_device_cooperate_sm.cpp         |   2 +-
 .../src/input_device_cooperate_state_free.cpp |   2 +-
 .../src/input_device_cooperate_state_in.cpp   |   2 +-
 .../src/input_device_cooperate_state_out.cpp  |   2 +-
 service/module_loader/src/uds_server.cpp      |   2 +-
 .../src/mouse_device_state.cpp                |   2 +-
 .../src/mouse_event_normalize.cpp             |   2 +-
 .../src/permission_helper.cpp                 |   2 +-
 .../subscriber/src/key_subscriber_handler.cpp |   2 +-
 .../src/input_windows_manager.cpp             |   2 +-
 .../event_inject/src/manage_inject_device.cpp |   2 +-
 .../src/processing_joystick_device.cpp        |   2 +-
 .../src/processing_mouse_device.cpp           |   2 +-
 .../src/input_manager_command.cpp             |   2 +-
 uinput/hdf_device_event_dispatch.cpp          |   2 +-
 uinput/hdf_device_event_manager.cpp           |   2 +-
 uinput/keyboard_inject.cpp                    |   2 +-
 uinput/virtual_device.cpp                     |   2 +-
 util/common/src/util.cpp                      |   2 +-
 util/network/include/circle_stream_buffer.h   |   2 +-
 util/network/include/stream_buffer.h          |   2 +-
 37 files changed, 582 insertions(+), 36 deletions(-)
 create mode 100644 service/hdf_adapter/src/hdf_event_manager.cpp

diff --git a/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp b/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp
index 405943fa35..e9dae772ef 100644
--- a/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp
@@ -24,7 +24,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "JsInputMonitorManager" };
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "JsInputMonitorManager" };
 
 const std::string REFERENCE_UNREF = "napi_reference_unref";
 constexpr int32_t MONITOR_REGISTER_EXCEED_MAX { 4100001 };
diff --git a/frameworks/proxy/event_handler/src/client_msg_handler.cpp b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
index b1f2f170cb..a9ceb2dc12 100644
--- a/frameworks/proxy/event_handler/src/client_msg_handler.cpp
+++ b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
@@ -44,7 +44,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "ClientMsgHandler"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ClientMsgHandler" };
 } // namespace
 
 void ClientMsgHandler::Init()
diff --git a/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp b/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp
index 04ca6c4466..3aca722b3b 100755
--- a/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp
@@ -22,7 +22,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateImpl"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateImpl" };
 } // namespace
 
 InputDeviceCooperateImpl &InputDeviceCooperateImpl::GetInstance()
diff --git a/frameworks/proxy/event_handler/src/input_device_impl.cpp b/frameworks/proxy/event_handler/src/input_device_impl.cpp
index d22fb0636d..6387a11db3 100755
--- a/frameworks/proxy/event_handler/src/input_device_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_device_impl.cpp
@@ -24,7 +24,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceImpl"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceImpl" };
 } // namespace
 
 InputDeviceImpl& InputDeviceImpl::GetInstance()
diff --git a/frameworks/proxy/event_handler/src/multimodal_event_handler.cpp b/frameworks/proxy/event_handler/src/multimodal_event_handler.cpp
index f815b9e9e6..a03f1a3b1d 100755
--- a/frameworks/proxy/event_handler/src/multimodal_event_handler.cpp
+++ b/frameworks/proxy/event_handler/src/multimodal_event_handler.cpp
@@ -28,7 +28,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "MultimodalEventHandler"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MultimodalEventHandler" };
 } // namespace
 
 void OnConnected(const IfMMIClient& client)
diff --git a/frameworks/proxy/events/src/input_event.cpp b/frameworks/proxy/events/src/input_event.cpp
index 13055a4671..8f9ea6cb80 100644
--- a/frameworks/proxy/events/src/input_event.cpp
+++ b/frameworks/proxy/events/src/input_event.cpp
@@ -24,7 +24,7 @@ namespace OHOS {
 namespace MMI {
 namespace {
 int64_t g_nextEventId = 1;
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputEvent"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputEvent" };
 } // namespace
 
 InputEvent::InputEvent(int32_t eventType) : eventType_(eventType)
diff --git a/frameworks/proxy/events/src/key_event.cpp b/frameworks/proxy/events/src/key_event.cpp
index 2f402a91e1..4369a45b7e 100644
--- a/frameworks/proxy/events/src/key_event.cpp
+++ b/frameworks/proxy/events/src/key_event.cpp
@@ -22,7 +22,7 @@ using namespace OHOS::HiviewDFX;
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "KeyEvent"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeyEvent" };
 } // namespace
 const int32_t KeyEvent::UNKOWN_FUNCTION_KEY = -1;
 const int32_t KeyEvent::NUM_LOCK_FUNCTION_KEY = 0;
diff --git a/frameworks/proxy/events/src/key_option.cpp b/frameworks/proxy/events/src/key_option.cpp
index 1461a3102c..90093be922 100644
--- a/frameworks/proxy/events/src/key_option.cpp
+++ b/frameworks/proxy/events/src/key_option.cpp
@@ -20,7 +20,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "KeyOption"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeyOption" };
 constexpr int32_t PRE_KEYS_MAX_SIZE = 3;
 }
 std::set<int32_t> KeyOption::GetPreKeys() const
diff --git a/frameworks/proxy/events/test/pointer_event_test.cpp b/frameworks/proxy/events/test/pointer_event_test.cpp
index c7b0110e12..2c0ffb52a2 100755
--- a/frameworks/proxy/events/test/pointer_event_test.cpp
+++ b/frameworks/proxy/events/test/pointer_event_test.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace MMI {
 namespace {
 #ifdef OHOS_BUILD_ENABLE_POINTER
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "PointerEventTest"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "PointerEventTest" };
 #endif // OHOS_BUILD_ENABLE_POINTER
 using namespace testing::ext;
 } // namespace
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
index 38be4017e2..9893ab9b6c 100644
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -30,7 +30,7 @@ namespace OHOS {
 namespace MMI {
 namespace {
 std::shared_ptr<MultimodalInputConnectManager> g_instance = nullptr;
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "MultimodalInputConnectManager"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MultimodalInputConnectManager" };
 } // namespace
 
 std::shared_ptr<MultimodalInputConnectManager> MultimodalInputConnectManager::GetInstance()
diff --git a/service/connect_manager/src/multimodal_input_connect_remoter.cpp b/service/connect_manager/src/multimodal_input_connect_remoter.cpp
index 9f959b0905..ca3555f33b 100755
--- a/service/connect_manager/src/multimodal_input_connect_remoter.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_remoter.cpp
@@ -30,7 +30,7 @@ namespace OHOS {
 namespace MMI {
 namespace {
 std::shared_ptr<MultimodalInputConnectRemoter> g_instance = nullptr;
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "MultimodalInputConnectRemoter"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MultimodalInputConnectRemoter" };
 } // namespace
 
 std::shared_ptr<MultimodalInputConnectRemoter> MultimodalInputConnectRemoter::GetInstance()
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index c60d116199..a461861fde 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -39,7 +39,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceManager"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceManager" };
 constexpr int32_t INVALID_DEVICE_ID = -1;
 constexpr int32_t SUPPORT_KEY = 1;
 
diff --git a/service/hdf_adapter/src/hdf_event_manager.cpp b/service/hdf_adapter/src/hdf_event_manager.cpp
new file mode 100644
index 0000000000..1a61ecafb0
--- /dev/null
+++ b/service/hdf_adapter/src/hdf_event_manager.cpp
@@ -0,0 +1,546 @@
+/*
+ * Copyright (c) 2021-2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "hdf_event_manager.h"
+
+#include <cstring>
+#include <ctime>
+#include <thread>
+
+#include <sys/time.h>
+#include <unistd.h>
+
+#include "hdf_inject_init.cpp"
+#include "lib_hdf.h"
+#include "define_multimodal.h"
+#include "mmi_log.h"
+#include "util.h"
+
+namespace OHOS {
+namespace MMI {
+namespace {
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "HdfEventManager" };
+} // namespace
+
+HdfEventManager *HdfEventManager::m_globleThis;
+int32_t HdfEventManager::EvdevSimIoctl(int32_t hdindex, int32_t pcmd, void *iobuff)
+{
+    const int32_t size = (pcmd >> IOCTL_CMD_SHIFT) & IOCTL_CMD_MASK;
+    int32_t cmd = pcmd & 0xff;
+
+    MMI_HILOGD("evdev_simioctl index:%{public}d,cmd:%{public}02x,size:%{public}d,"
+               "pcmd:%{public}04x", hdindex, cmd, size, pcmd);
+    DrvType drvtype = g_index2DrvType[hdindex - MAX_INPUT_DEVICE_COUNT];
+    MMI_HILOGD("evdev_simioctl drvtype:%{public}d", drvtype);
+    if (drvtype >= INVALD) {
+        MMI_HILOGE("Unknown device type");
+        return 0;
+    }
+    for (const auto &item : m_globleThis->hdflist_) {
+        if (item.index == hdindex) {
+            break;
+        }
+    }
+    const int32_t iobuffSize = size;
+    errno_t ret = 0;
+    switch (cmd) {
+        case IO_BITS: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arrayBits[drvtype], size);
+            break;
+        }
+        case IO_KEYBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arrayKeyBits[drvtype], size);
+            break;
+        }
+        case IO_RELBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arrayRelBits[drvtype], size);
+            break;
+        }
+        case IO_ABSBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arrayAbsBits[drvtype], size);
+            break;
+        }
+        case IO_MSCBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arrayMscBits[drvtype], size);
+            break;
+        }
+        case IO_SWBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arraySwBits[drvtype], size);
+            break;
+        }
+        case IO_LEDBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arrayLedBits[drvtype], size);
+            break;
+        }
+        case IO_SNDBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arraySndBits[drvtype], size);
+            break;
+        }
+        case IO_PROPBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arrayPropsBits[drvtype], size);
+            break;
+        }
+        case IO_KEYVALUES: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arrayKeyValues[drvtype], size);
+            break;
+        }
+        case IO_LEDVALUES: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arrayLedValues[drvtype], size);
+            break;
+        }
+        case IO_SWVALUES: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arraySwValues[drvtype], size);
+            break;
+        }
+        case IO_MTVABS: {
+            break;
+        }
+        case IO_IDS: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arrayIds[drvtype], size);
+            break;
+        }
+        case IO_FFBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, &g_arrayFfBits[drvtype], size);
+            break;
+        }
+        default: {
+            if (cmd >= IO_ABSBEGIN && cmd < IO_ABEND) {
+                ret = memcpy_s(iobuff, iobuffSize, &g_arrayAxisInfo[drvtype][cmd - IO_ABSBEGIN], size);
+            }
+            break;
+        }
+    }
+    if (ret != EOK) {
+        MMI_HILOGE("Call memcpy_s failed, cmd = %d, ret = %d", cmd, ret);
+    }
+    return RET_OK;
+}
+int32_t HdfEventManager::EvdevIoctl(int32_t hdiindex, int32_t pcmd, void *iobuff)
+{
+    int32_t size = (pcmd >> IOCTL_CMD_SHIFT) & IOCTL_CMD_MASK;
+    int32_t cmd = pcmd & 0xff;
+    MMI_HILOGD("index:%{public}d,cmd:%{public}02x,size:%{public}d,"
+        "pcmd:%{public}04x", hdiindex, cmd, size, pcmd);
+    DeviceInfo *deviceinfo = nullptr;
+    for (const auto &item : globleThis_->hdflist_) {
+        if (item.index == hdiindex) {
+            deviceinfo = static_cast<DeviceInfo*>(item->deviceinfo);
+            break;
+        }
+    }
+    if (deviceinfo == nullptr) {
+        MMI_HILOGE("Deviceinfo is null");
+        return 0;
+    }
+    const int32_t iobuffSize = size;
+    errno_t ret = 0;
+    switch (cmd) {
+        case IO_BITS: {
+            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.eventType, size);
+            break;
+        }
+        case IO_KEYBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.keyCode, size);
+            break;
+        }
+        case IO_RELBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.relCode, size);
+            break;
+        }
+        case IO_ABSBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.absCode, size);
+            break;
+        }
+        case IO_MSCBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.miscCode, size);
+            break;
+        }
+        case IO_SWBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.switchCode, size);
+            break;
+        }
+        case IO_LEDBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.ledCode, size);
+            break;
+        }
+        case IO_SNDBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.forceCode, size);
+            break;
+        }
+        case IO_PROPBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.devProp, size);
+            break;
+        }
+        case IO_KEYVALUES: {
+            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.keyType, size);
+            break;
+        }
+        case IO_LEDVALUES: {
+            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.ledType, size);
+            break;
+        }
+        case IO_SWVALUES: {
+            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.switchType, size);
+            break;
+        }
+        case IO_MTVABS: {
+            break;
+        }
+        case IO_IDS: {
+            ret = memcpy_s(iobuff, iobuffSize, &deviceinfo->attrSet.id, size);
+            break;
+        }
+        case IO_FFBITS: {
+            ret = memcpy_s(iobuff, iobuffSize, &deviceinfo->abilitySet.forceCode, size);
+            break;
+        }
+        default: {
+            if (cmd >= IO_ABSBEGIN && cmd < IO_ABEND) {
+                ret = memcpy_s(iobuff, iobuffSize, &deviceinfo->attrSet.axisInfo[cmd - IO_ABSBEGIN], size);
+            }
+            break;
+        }
+    }
+    if (ret != EOK) {
+        MMI_HILOGE("Call memcpy_s failed, cmd = %d, ret = %d", cmd, ret);
+    }
+    return 0;
+}
+
+HdfEventManager::HdfEventManager()
+{
+    globleThis_ = this;
+    hdiinput_ = nullptr;
+}
+HdfEventManager::~HdfEventManager()
+{
+    uint32_t ret = inputInterface_->iInputReporter->UnregisterHotPlugCallback();
+    if (ret == INPUT_SUCCESS) {
+        MMI_HILOGI("%{public}s:%{public}d INPUT_SUCCESS", __func__, __LINE__);
+    } else {
+        MMI_HILOGE("%{public}s:%{public}d INPUT_ERROR", __func__, __LINE__);
+    }
+}
+int32_t HdfEventManager::HdfdevtypeMapLibinputType(uint32_t devIndex, uint32_t devType)
+{
+    if (devIndex >= MAX_INPUT_DEVICE_COUNT) {
+        MMI_HILOGE("The maximum number of devices exceeded, devIndex:%{public}d", devIndex);
+        return devType;
+    }
+    int32_t ret = 0;
+    switch (devType) {
+        case INDEV_TYPE_TOUCH: {
+            ret = HDF_INPUT | HDF_TOUCHSCREEN;
+            break;
+        }
+        case INDEV_TYPE_MOUSE: {
+            ret = HDF_INPUT | HDF_MOUSE;
+            break;
+        }
+        case INDEV_TYPE_KEYBOARD: {
+            ret = HDF_INPUT | HDF_KEYBOARD;
+            break;
+        }
+        default: {
+            ret = devType;
+            break;
+        }
+    }
+    return ret;
+}
+#ifdef  OHOS_BUILD_HDF
+int32_t HdfEventManager::GetDeviceCount()
+{
+    errno_t ret = memset_s(mountDevIndex_, sizeof(DevDesc) * TOTAL_INPUT_DEVICE_COUNT, 0,
+                           sizeof(DevDesc) * TOTAL_INPUT_DEVICE_COUNT);
+    if (ret != EOK) {
+        MMI_HILOGE("Call memset_s failed. ret = %d", ret);
+    }
+    int32_t devcount = 0;
+    if (inputInterface_ != nullptr || inputInterface_->iInputManager != nullptr) {
+        int32_t ret = inputInterface_->iInputManager->ScanInputDevice(MAX_INPUT_DEVICE_COUNT, mountDevIndex_);
+        if (ret) {
+            MMI_HILOGE("%{public}s:%{public}d Error:ScanInputDevice failed", __func__, __LINE__);
+            return 0;
+        }
+
+        for (int32_t i = 0; i < MAX_INPUT_DEVICE_COUNT; i++) {
+            if (mountDevIndex_[i].devIndex != 0) {
+                devcount = devcount + 1;
+            }
+        }
+    }
+    int32_t jectcount = 0;
+    if (injectInterface_ != nullptr || injectInterface_->iInputManager != nullptr) {
+        int32_t ret = injectInterface_->iInputManager->ScanInputDevice(MAX_INPUT_DEVICE_COUNT,
+                                                                       &mountDevIndex_[devcount]);
+        if (ret) {
+            MMI_HILOGE("%{public}s:%{public}d Error:injectInterface_ ScanInputDevice failed",
+                __func__, __LINE__);
+            return devcount;
+        }
+
+        for (int32_t i = 0; i < MAX_INPUT_DEVICE_COUNT; i++) {
+            if (mountDevIndex_[devcount + i].devIndex != 0) {
+                jectcount = jectcount + 1;
+            }
+        }
+    }
+    return devcount + jectcount;
+}
+void HdfEventManager::SetupCallback()
+{
+    MMI_HILOGD("%{public}s:%{public}d ThreadSetupCallback start", __func__, __LINE__);
+    uint32_t ret = GetInputInterface(&inputInterface_);
+    if (ret != 0 || inputInterface_ == nullptr
+        || inputInterface_->iInputManager == nullptr
+        || inputInterface_->iInputReporter == nullptr) {
+        MMI_HILOGD("%{public}s:%{public}d inputInterface_ init failed", __func__, __LINE__);
+    }
+
+    ret = GetInputInterfaceFromInject(&injectInterface_);
+    if (ret != 0 || injectInterface_ == nullptr
+        || injectInterface_->iInputManager == nullptr
+        || injectInterface_->iInputReporter == nullptr) {
+        MMI_HILOGD("%{public}s:%{public}d injectInterface_ init failed", __func__, __LINE__);
+    }
+
+    eventCallBack_.EventPkgCallback = globleThis_->GetEventCallback;
+    hostPlugCallBack_.HotPlugCallback = globleThis_->HotPlugCallback;
+    if (inputInterface_) {
+        ret = inputInterface_->iInputReporter->RegisterHotPlugCallback(&hostPlugCallBack_);
+        if (ret == INPUT_SUCCESS) {
+            MMI_HILOGI("%{public}s:%{public}d RegisterHotPlugCallback INPUT_SUCCESS", __func__, __LINE__);
+        } else {
+            MMI_HILOGE("%{public}s:%{public}d RegisterHotPlugCallback INPUT_ERROR", __func__, __LINE__);
+        }
+    }
+
+    if (injectInterface_) {
+        ret = injectInterface_->iInputReporter->RegisterHotPlugCallback(&hostPlugCallBack_);
+        if (ret == INPUT_SUCCESS) {
+            MMI_HILOGI("%{public}s:%{public}d injectInterface_ RegisterHotPlugCallback INPUT_SUCCESS",
+                __func__, __LINE__);
+        } else {
+            MMI_HILOGE("%{public}s:%{public}d injectInterface_ RegisterHotPlugCallback INPUT_ERROR",
+                __func__, __LINE__);
+        }
+    }
+
+    int32_t count = GetDeviceCount();
+    MMI_HILOGD("ThreadSetupCallback count:%{public}d",                                 count);
+    for (int32_t i = 0; i < count; i++) {
+        DeviceAddHandle(mountDevIndex_[i].devIndex, mountDevIndex_[i].devType);
+    }
+}
+
+void HdfEventManager::AddDevice(uint32_t devIndex, uint32_t devType)
+{
+    uint32_t ret = 0;
+    if (devIndex >= MAX_INPUT_DEVICE_COUNT) {
+        ret = injectInterface_->iInputReporter->RegisterReportCallback(devIndex, &eventCallBack_);
+        return;
+    }
+    if (!OpenHdfDevice(devIndex, true)) {
+        return;
+    }
+    ret = inputInterface_->iInputReporter->RegisterReportCallback(devIndex, &eventcallback);
+    if (ret == INPUT_SUCCESS) {
+        MMI_HILOGI("%{public}s:%{public}d RegisterReportCallback eventcallback INPUT_SUCCESS"
+            "devindex:%{public}u, devType:%{public}u", __func__, __LINE__, devIndex, devType);
+    } else {
+        MMI_HILOGE("%{public}s:%{public}d RegisterReportCallback eventcallback INPUT_ERROR"
+            "devindex:%{public}u,devType:%{public}u", __func__, __LINE__, devIndex, devType);
+    }
+}
+bool HdfEventManager::OpenHdfDevice(uint32_t devIndex, bool oper)
+{
+    if (devIndex >= MAX_INPUT_DEVICE_COUNT) {
+        return true;
+    }
+    int32_t ret = -1;
+    if (oper) {
+        ret = inputInterface_->iInputManager->OpenInputDevice(devIndex);
+    } else {
+        ret = inputInterface_->iInputManager->CloseInputDevice(devIndex);
+    }
+    if (ret == 0) {
+        MMI_HILOGI("%{public}s:%{public}d Info: device success!", __func__, __LINE__);
+        return true;
+    }
+
+    if (ret != 0) {
+        MMI_HILOGE("%{public}s:%{public}d Error: device fail! code:%{public}u", __func__, __LINE__, ret);
+    }
+    return false;
+}
+void HdfEventManager::HotPlugCallback(const HotPlugEvent *event)
+{
+    MMI_HILOGD("%{public}s:%{public}d HotPlugCallback status:%{public}u,devindex:%{public}u"
+        "devType:%{public}u", __func__, __LINE__, event->status, event->devIndex, event->devType);
+
+    if (!event->status) {
+        DeviceAddHandle(event->devIndex, event->devType);
+    } else {
+        DeviceRemoveHandle(event->devIndex, event->devType);
+    }
+}
+int32_t HdfEventManager::DeviceRemoveHandle(uint32_t devIndex, uint32_t devType)
+{
+    MMI_HILOGD("%{public}s:%{public}d DeviceRemoveHandle devindex:%{public}u,devType:%{public}u",
+        __func__, __LINE__, devIndex, devType);
+    Devcmd cmd;
+    cmd.index = devIndex;
+    cmd.cmd = static_cast<int32_t>(HDF_RMV_DEVICE);
+    libinput_devpipe_write(m_globleThis->hdiinput_, &cmd, sizeof(Devcmd));
+    if (devIndex < MAX_INPUT_DEVICE_COUNT) {
+        uint32_t ret = m_globleThis->inputInterface_->iInputReporter->UnregisterReportCallback(devIndex);
+        if (ret == INPUT_SUCCESS) {
+            MMI_HILOGI("%{public}s:%{public}d REMOVE_SUCCESS devindex:%{public}u,devType:%{public}u",
+                __func__, __LINE__, devIndex, devType);
+        } else {
+            MMI_HILOGE("%{public}s:%{public}d REMOVE_ERROR devindex:%{public}u,devType:%{public}u",
+                __func__, __LINE__, devIndex, devType);
+        }
+    }
+    globleThis_->OpenHdfDevice(devIndex, false);
+    return RET_OK;
+}
+
+
+void HdfEventManager::GetEventCallback(const KeyEventNormalize **pkgs, uint32_t count, uint32_t devIndex)
+{
+    static constexpr uint16_t byteSize = 8;
+    CHKPV(pkgs);
+    struct input_event eventarry[MAX_EVENT_PKG_NUM];
+    for (uint32_t i = 0; i < count && i < MAX_EVENT_PKG_NUM; i++) {
+        eventarry[i].code = pkgs[i]->code;
+        eventarry[i].type = (pkgs[i]->type) | static_cast<uint16_t>(devIndex<<byteSize);
+        eventarry[i].value = pkgs[i]->value;
+        eventarry[i].input_event_sec = (pkgs[i]->timestamp) / (USEC_PER_SEC);
+        eventarry[i].input_event_usec = (pkgs[i]->timestamp) % (USEC_PER_SEC);
+    }
+    if (!globleThis_->devStatus[devIndex]) {
+        return;
+    }
+    libinput_pipe_write(globleThis_->hdiinput_, devIndex, eventarry, count * sizeof(struct input_event));
+}
+
+int32_t HdfEventManager::DeviceAddHandle(uint32_t devIndex, uint32_t devType)
+{
+    MMI_HILOGD("%{public}s:%{public}d DeviceAddHandle devindex:%{public}u,devType:%{public}u",
+        __func__, __LINE__, devIndex, devType);
+    globleThis_->devStatus[devIndex] = false;
+    uhdf *hdiuhdf = nullptr;
+    hdiuhdf = new(uhdf);
+    hdiuhdf->index = devIndex;
+    hdiuhdf->type = globleThis_->HdfdevtypeMapLibinputType(devIndex, devType);
+    hdiuhdf->nproperties = 0;
+    hdiuhdf->quirkpop = nullptr;
+    hdiuhdf->modeltype = 0;
+    hdiuhdf->fn = (hdiuhdf->index >= MAX_INPUT_DEV_NUM) ? EvdevSimIoctl : EvdevIoctl;
+    globleThis_->hdflist_.push_back(hdiuhdf);
+    Devcmd cmd;
+    cmd.index = devIndex;
+    cmd.cmd = static_cast<int32_t>(HDF_ADD_DEVICE);
+    libinput_devpipe_write(globleThis_->hdiinput_, &cmd, sizeof(Devcmd));
+    return RET_OK;
+}
+constexpr struct libinput_interface _hdfinterface = {
+    .open_restricted = [](const char *path, int32_t flags, void *user_data)->int32_t {
+        int32_t fd = -1;
+        MMI_HILOGI("libinput .open_restricted path:%{public}s,fd:%{public}d", path, fd);
+        return fd < 0 ? -errno : fd;
+    },
+    .close_restricted = [](int32_t fd, void *user_data)
+    {
+        MMI_HILOGI("libinput .close_restricted fd:%{public}d", fd);
+    },
+};
+libinput *HdfEventManager::HdfLibinputInit()
+{
+    if (globleThis_->hdiinput_ == nullptr) {
+        globleThis_->hdiinput_ = libinput_hdf_create_context(&_hdfinterface, nullptr);
+    }
+    MMI_HILOGD("HdfLibinputInit function end");
+    return globleThis_->hdiinput_;
+}
+int32_t HdfEventManager::HdfDevHandle(int32_t index, hdf_event_type cmd)
+{
+    if (cmd != HDF_ADD_DEVICE) {
+        MMI_HILOGD("HdfRmv function start");
+        uhdf *hdiuhdf = nullptr;
+        for (std::list<uhdf*>::iterator it = globleThis_->hdflist_.begin();
+             it != globleThis_->hdflist_.end(); ++it) {
+            uhdf *hdiuhdfit = *it;
+            if (hdiuhdfit->index == static_cast<int32_t>(index)) {
+                hdiuhdf = *it;
+                globleThis_->hdflist_.remove(*it);
+                break;
+            }
+        }
+        if (hdiuhdf == nullptr) {
+            return RET_OK;
+        }
+        uhdfdevice_removed(hdiuhdf);
+        delete(hdiuhdf);
+        return RET_OK;
+    }
+
+    uhdf *hdiuhdf = nullptr;
+    for (std::list<uhdf*>::iterator it = globleThis_->hdflist_.begin();
+        it != globleThis_->hdflist_.end(); ++it) {
+        uhdf *hdiuhdfit = *it;
+        if (hdiuhdfit->index != static_cast<int32_t>(index)) {
+            continue;
+        }
+
+        hdiuhdf = *it;
+        DeviceInfo *deviceinfo = nullptr;
+        globleThis_->AddDevice(index, hdiuhdf->type);
+        if (index < MAX_INPUT_DEVICE_COUNT) {
+            uint32_t ret = globleThis_->inputInterface_->iInputManager->GetInputDevice(index, &deviceinfo);
+            if (ret != 0 || (deviceinfo == nullptr)) {
+                MMI_HILOGE("%{public}s:%{public}d inputInterface_ GetInputDevice ret:%{public}d",
+                           __func__, __LINE__, ret);
+                return RET_ERR;
+            }
+            hdiuhdf->deviceinfo = (void*)deviceinfo;
+        }
+        uhdfdevice_added(globleThis_->hdiinput_, hdiuhdf, "default");
+        globleThis_->devStatus[index] = true;
+        return RET_OK;
+    }
+    return RET_OK;
+}
+bool HdfEventManager::Init()
+{
+    return true;
+}
+HdfEventManager  hdfEventManager;
+extern "C" libinput *HdfAdfInit()
+{
+    MMI_HILOGD("HdfAdfInit function start");
+    return hdfEventManager.HdfLibinputInit();
+}
+
+extern "C" int32_t HdfDevHandle(int32_t index, hdf_event_type cmd)
+{
+    MMI_HILOGD("HdfDevHandle function start index:%{public}d,cmd:%{public}d", index, cmd);
+    return hdfEventManager.HdfDevHandle(index, cmd);
+}
+#endif
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/service/input_device_cooperate/src/cooperate_event_manager.cpp b/service/input_device_cooperate/src/cooperate_event_manager.cpp
index 8e3618fa74..9e20c28bbc 100755
--- a/service/input_device_cooperate/src/cooperate_event_manager.cpp
+++ b/service/input_device_cooperate/src/cooperate_event_manager.cpp
@@ -20,7 +20,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "CooperateEventManager"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "CooperateEventManager" };
 } // namespace
 
 CooperateEventManager::CooperateEventManager() {}
diff --git a/service/input_device_cooperate/src/distributed_input_adapter.cpp b/service/input_device_cooperate/src/distributed_input_adapter.cpp
index 798393c47f..aa0951120d 100755
--- a/service/input_device_cooperate/src/distributed_input_adapter.cpp
+++ b/service/input_device_cooperate/src/distributed_input_adapter.cpp
@@ -26,7 +26,7 @@ namespace OHOS {
 namespace MMI {
 using namespace DistributedHardware::DistributedInput;
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "DistributedInputAdapter"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "DistributedInputAdapter" };
 constexpr int32_t DEFAULT_DELAY_TIME = 4000;
 constexpr int32_t RETRY_TIME = 2;
 } // namespace
diff --git a/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp b/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp
index 1f2a9cbbff..f7530881ea 100755
--- a/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp
+++ b/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp
@@ -24,7 +24,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "IInputDeviceCooperateState"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "IInputDeviceCooperateState" };
 } // namespace
 
 IInputDeviceCooperateState::IInputDeviceCooperateState()
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index 8d5660d9ed..d79b09633d 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -37,7 +37,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateSM"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateSM" };
 const std::string BUNDLE_NAME = "ohos.multimodalinput.input";
 constexpr int32_t INTERVAL_MS = 2000;
 constexpr int32_t MOUSE_ABS_LOCATION = 100;
diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp
index 302f2d85a9..c4733803a5 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp
@@ -23,7 +23,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateStateFree"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateStateFree" };
 } // namespace
 
 int32_t InputDeviceCooperateStateFree::StartInputDeviceCooperate(
diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp
index 1fa453f27a..800f63af7d 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp
@@ -25,7 +25,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateStateIn"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateStateIn" };
 } // namespace
 
 InputDeviceCooperateStateIn::InputDeviceCooperateStateIn(const std::string &startDhid) : startDhid_(startDhid) {}
diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
index 18298c9b11..725fa6da0a 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
@@ -25,7 +25,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateStateOut"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateStateOut" };
 } // namespace
 
 InputDeviceCooperateStateOut::InputDeviceCooperateStateOut(const std::string& startDhid)
diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp
index 06838d7df5..e82f59f7ad 100644
--- a/service/module_loader/src/uds_server.cpp
+++ b/service/module_loader/src/uds_server.cpp
@@ -29,7 +29,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "UDSServer"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "UDSServer" };
 } // namespace
 
 UDSServer::~UDSServer()
diff --git a/service/mouse_event_normalize/src/mouse_device_state.cpp b/service/mouse_event_normalize/src/mouse_device_state.cpp
index af64b2917c..75f1bd6a41 100644
--- a/service/mouse_event_normalize/src/mouse_device_state.cpp
+++ b/service/mouse_event_normalize/src/mouse_device_state.cpp
@@ -20,7 +20,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "MouseDeviceState"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MouseDeviceState" };
 } // namespace
 
 MouseDeviceState::MouseDeviceState()
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index 18535d648b..27ceea1ce3 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -46,7 +46,7 @@ const std::vector<AccelerateCurve> ACCELERATE_CURVES {
     { { 8, 32, 128 }, { 1.04, 3.30, 6.16 }, { 0.0, -18.08, -109.60 } },
     { { 8, 32, 128 }, { 1.10, 3.75, 7.00 }, { 0.0, -21.20, -125.20 } },
     { { 8, 32, 128 }, { 1.16, 4.20, 7.84 }, { 0.0, -24.32, -140.80 } }
-    };
+};
 constexpr double DOUBLE_ZERO = 1e-6;
 constexpr int32_t MIN_SPEED = 1;
 constexpr int32_t MAX_SPEED = 11;
diff --git a/service/permission_helper/src/permission_helper.cpp b/service/permission_helper/src/permission_helper.cpp
index 48bd55daba..6e50aefb88 100644
--- a/service/permission_helper/src/permission_helper.cpp
+++ b/service/permission_helper/src/permission_helper.cpp
@@ -21,7 +21,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "PermissionHelper"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "PermissionHelper" };
 } // namespace
 
 PermissionHelper::PermissionHelper() {}
diff --git a/service/subscriber/src/key_subscriber_handler.cpp b/service/subscriber/src/key_subscriber_handler.cpp
index 32d8483e91..58990b466d 100644
--- a/service/subscriber/src/key_subscriber_handler.cpp
+++ b/service/subscriber/src/key_subscriber_handler.cpp
@@ -28,7 +28,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "KeySubscriberHandler"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeySubscriberHandler" };
 constexpr uint32_t MAX_PRE_KEY_COUNT = 4;
 } // namespace
 
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index b6d2e51546..fcb72b40d5 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -30,7 +30,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputWindowsManager"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputWindowsManager" };
 #ifdef OHOS_BUILD_ENABLE_POINTER
 constexpr int32_t DEFAULT_POINTER_STYLE = 0;
 constexpr size_t MAX_WINDOW_COUNT = 20;
diff --git a/tools/event_inject/src/manage_inject_device.cpp b/tools/event_inject/src/manage_inject_device.cpp
index 464a16b927..b9b1724dab 100644
--- a/tools/event_inject/src/manage_inject_device.cpp
+++ b/tools/event_inject/src/manage_inject_device.cpp
@@ -21,7 +21,7 @@
 using namespace OHOS::MMI;
 
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "ManageInjectDevice" };
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ManageInjectDevice" };
 constexpr int64_t INJECT_SLEEP_TIMES = 10;
 } // namespace
 
diff --git a/tools/event_inject/src/processing_joystick_device.cpp b/tools/event_inject/src/processing_joystick_device.cpp
index 2df47d752a..012343f6d1 100644
--- a/tools/event_inject/src/processing_joystick_device.cpp
+++ b/tools/event_inject/src/processing_joystick_device.cpp
@@ -18,7 +18,7 @@
 using namespace OHOS::MMI;
 
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "ProcessingJoystickDevice" };
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ProcessingJoystickDevice" };
 constexpr int32_t DEFAULT_ABSX_VALUE = 8188;
 constexpr int32_t DEFAULT_ABSY_VALUE = 8192;
 constexpr int32_t DEFAULT_ABSZ_VALUE = 125;
diff --git a/tools/event_inject/src/processing_mouse_device.cpp b/tools/event_inject/src/processing_mouse_device.cpp
index 119f34cc4a..36ce84884b 100644
--- a/tools/event_inject/src/processing_mouse_device.cpp
+++ b/tools/event_inject/src/processing_mouse_device.cpp
@@ -18,7 +18,7 @@
 using namespace OHOS::MMI;
 
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "ProcessingMouseDevice" };
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ProcessingMouseDevice" };
 } // namespace
 
 int32_t ProcessingMouseDevice::TransformJsonDataToInputData(const DeviceItem& fingerEventArrays,
diff --git a/tools/inject_event/src/input_manager_command.cpp b/tools/inject_event/src/input_manager_command.cpp
index 23f32e37ca..efcd22af2b 100755
--- a/tools/inject_event/src/input_manager_command.cpp
+++ b/tools/inject_event/src/input_manager_command.cpp
@@ -50,7 +50,7 @@ private:
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputManagerCommand"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputManagerCommand" };
 constexpr int32_t SLEEPTIME = 20;
 constexpr int32_t MOUSE_ID = 7;
 constexpr int32_t TWO_MORE_COMMAND = 2;
diff --git a/uinput/hdf_device_event_dispatch.cpp b/uinput/hdf_device_event_dispatch.cpp
index e00c356f01..db847f0386 100644
--- a/uinput/hdf_device_event_dispatch.cpp
+++ b/uinput/hdf_device_event_dispatch.cpp
@@ -24,7 +24,7 @@ using namespace OHOS::HiviewDFX;
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "HdfDeviceEventDispatch"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "HdfDeviceEventDispatch" };
 } // namespace
 std::unique_ptr<VirtualTouchScreen> g_pTouchScreen = nullptr;
 InjectThread HdfDeviceEventDispatch::injectThread_;
diff --git a/uinput/hdf_device_event_manager.cpp b/uinput/hdf_device_event_manager.cpp
index 18f68e7799..699e21d0fb 100644
--- a/uinput/hdf_device_event_manager.cpp
+++ b/uinput/hdf_device_event_manager.cpp
@@ -24,7 +24,7 @@ using namespace OHOS::HiviewDFX;
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "HdfDeviceEventManager"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "HdfDeviceEventManager" };
 } // namespace
 
 HdfDeviceEventManager::HdfDeviceEventManager() {}
diff --git a/uinput/keyboard_inject.cpp b/uinput/keyboard_inject.cpp
index 5d2546e94d..144b058021 100644
--- a/uinput/keyboard_inject.cpp
+++ b/uinput/keyboard_inject.cpp
@@ -23,7 +23,7 @@ namespace OHOS {
 namespace MMI {
 namespace {
 std::shared_ptr<KeyboardInject> g_instance = nullptr;
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "keyBoardInject"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "keyBoardInject" };
 constexpr int32_t INPUT_KEY_BACK = 2;
 constexpr int32_t LINUX_KEY_BACK = 158;
 } // namespace
diff --git a/uinput/virtual_device.cpp b/uinput/virtual_device.cpp
index 8e52abd6d0..03e4e5026e 100644
--- a/uinput/virtual_device.cpp
+++ b/uinput/virtual_device.cpp
@@ -25,7 +25,7 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace OHOS::HiviewDFX;
-constexpr HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "VirtualDevice"};
+constexpr HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "VirtualDevice" };
 constexpr uint32_t MAX_NAME_LENGTH = 80;
 
 bool DoIoctl(int32_t fd, int32_t request, const uint32_t value)
diff --git a/util/common/src/util.cpp b/util/common/src/util.cpp
index 57c18b14ef..308b94c25f 100644
--- a/util/common/src/util.cpp
+++ b/util/common/src/util.cpp
@@ -37,7 +37,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "Util"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Util" };
 constexpr int32_t FILE_SIZE_MAX = 0x5000;
 constexpr int32_t MAX_PRO_FILE_SIZE = 128000;
 constexpr int32_t KEY_ELEMENT_COUNT = 4;
diff --git a/util/network/include/circle_stream_buffer.h b/util/network/include/circle_stream_buffer.h
index b5427aa5b0..b055cdf080 100644
--- a/util/network/include/circle_stream_buffer.h
+++ b/util/network/include/circle_stream_buffer.h
@@ -19,7 +19,7 @@
 namespace OHOS {
 namespace MMI {
 class CircleStreamBuffer : public StreamBuffer {
-    static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "CircleStreamBuffer"};
+    static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "CircleStreamBuffer" };
 public:
     CircleStreamBuffer() = default;
     virtual ~CircleStreamBuffer() = default;
diff --git a/util/network/include/stream_buffer.h b/util/network/include/stream_buffer.h
index 861d6e8c08..f1bcacc426 100644
--- a/util/network/include/stream_buffer.h
+++ b/util/network/include/stream_buffer.h
@@ -30,7 +30,7 @@
 namespace OHOS {
 namespace MMI {
 class StreamBuffer {
-    static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "StreamBuffer"};
+    static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "StreamBuffer" };
 public:
     StreamBuffer() = default;
     DISALLOW_MOVE(StreamBuffer);
-- 
Gitee


From 14523e73fc05f3b4e5bb3c361b7f018b383fe014 Mon Sep 17 00:00:00 2001
From: lixiangpeng5 <lixiangpeng5@huawei.com>
Date: Thu, 13 Oct 2022 14:42:35 +0800
Subject: [PATCH 075/360] =?UTF-8?q?=E6=B7=BB=E5=8A=A0JsInputDeviceCooperat?=
 =?UTF-8?q?eContext::GetInstance(env)=E8=BF=94=E5=9B=9E=E5=80=BC=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lixiangpeng5 <lixiangpeng5@huawei.com>
Change-Id: I6ea00db4e612532418f560cbbd4eaece808f1a0f
---
 .../src/js_input_device_cooperate_context.cpp |   6 +
 service/hdf_adapter/src/hdf_event_manager.cpp | 546 ------------------
 2 files changed, 6 insertions(+), 546 deletions(-)
 delete mode 100644 service/hdf_adapter/src/hdf_event_manager.cpp

diff --git a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
index 65dd12af2d..bfec5bcc89 100755
--- a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
@@ -79,6 +79,7 @@ napi_value JsInputDeviceCooperateContext::Enable(napi_env env, napi_callback_inf
     CHKRP(env, napi_get_value_bool(env, argv[0], &enable), GET_BOOL);
 
     JsInputDeviceCooperateContext *jsDev = JsInputDeviceCooperateContext::GetInstance(env);
+    CHKPP(jsDev);
     auto jsInputDeviceMgr = jsDev->GetJsInputDeviceCooperateMgr();
     if (argc == 1) {
         return jsInputDeviceMgr->Enable(env, enable);
@@ -122,6 +123,7 @@ napi_value JsInputDeviceCooperateContext::Start(napi_env env, napi_callback_info
     CHKRP(env, napi_get_value_int32(env, argv[1], &srcInputDeviceId), GET_INT32);
 
     JsInputDeviceCooperateContext *jsDev = JsInputDeviceCooperateContext::GetInstance(env);
+    CHKPP(jsDev);
     auto jsInputDeviceMgr = jsDev->GetJsInputDeviceCooperateMgr();
     if (argc == 2) {
         return jsInputDeviceMgr->Start(env, sinkDeviceDescriptor, srcInputDeviceId);
@@ -142,6 +144,7 @@ napi_value JsInputDeviceCooperateContext::Stop(napi_env env, napi_callback_info
     CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
 
     JsInputDeviceCooperateContext *jsDev = JsInputDeviceCooperateContext::GetInstance(env);
+    CHKPP(jsDev);
     auto jsInputDeviceMgr = jsDev->GetJsInputDeviceCooperateMgr();
     if (argc == 0) {
         return jsInputDeviceMgr->Stop(env);
@@ -178,6 +181,7 @@ napi_value JsInputDeviceCooperateContext::GetState(napi_env env, napi_callback_i
     std::string deviceDescriptor_ = deviceDescriptor;
 
     JsInputDeviceCooperateContext *jsDev = JsInputDeviceCooperateContext::GetInstance(env);
+    CHKPP(jsDev);
     auto jsInputDeviceMgr = jsDev->GetJsInputDeviceCooperateMgr();
     if (argc == 1) {
         return jsInputDeviceMgr->GetState(env, deviceDescriptor_);
@@ -213,6 +217,7 @@ napi_value JsInputDeviceCooperateContext::On(napi_env env, napi_callback_info in
     std::string type_ = type;
 
     JsInputDeviceCooperateContext *jsDev = JsInputDeviceCooperateContext::GetInstance(env);
+    CHKPP(jsDev);
     auto jsInputDeviceMgr = jsDev->GetJsInputDeviceCooperateMgr();
     if (!UtilNapi::TypeOf(env, argv[1], napi_function)) {
         MMI_HILOGE("The seocond parameter is not function");
@@ -246,6 +251,7 @@ napi_value JsInputDeviceCooperateContext::Off(napi_env env, napi_callback_info i
     std::string type_ = type;
 
     JsInputDeviceCooperateContext *jsDev = JsInputDeviceCooperateContext::GetInstance(env);
+    CHKPP(jsDev);
     auto jsInputDeviceMgr = jsDev->GetJsInputDeviceCooperateMgr();
     if (argc == 1) {
         jsInputDeviceMgr->UnregisterListener(env, type_);
diff --git a/service/hdf_adapter/src/hdf_event_manager.cpp b/service/hdf_adapter/src/hdf_event_manager.cpp
deleted file mode 100644
index 1a61ecafb0..0000000000
--- a/service/hdf_adapter/src/hdf_event_manager.cpp
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "hdf_event_manager.h"
-
-#include <cstring>
-#include <ctime>
-#include <thread>
-
-#include <sys/time.h>
-#include <unistd.h>
-
-#include "hdf_inject_init.cpp"
-#include "lib_hdf.h"
-#include "define_multimodal.h"
-#include "mmi_log.h"
-#include "util.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "HdfEventManager" };
-} // namespace
-
-HdfEventManager *HdfEventManager::m_globleThis;
-int32_t HdfEventManager::EvdevSimIoctl(int32_t hdindex, int32_t pcmd, void *iobuff)
-{
-    const int32_t size = (pcmd >> IOCTL_CMD_SHIFT) & IOCTL_CMD_MASK;
-    int32_t cmd = pcmd & 0xff;
-
-    MMI_HILOGD("evdev_simioctl index:%{public}d,cmd:%{public}02x,size:%{public}d,"
-               "pcmd:%{public}04x", hdindex, cmd, size, pcmd);
-    DrvType drvtype = g_index2DrvType[hdindex - MAX_INPUT_DEVICE_COUNT];
-    MMI_HILOGD("evdev_simioctl drvtype:%{public}d", drvtype);
-    if (drvtype >= INVALD) {
-        MMI_HILOGE("Unknown device type");
-        return 0;
-    }
-    for (const auto &item : m_globleThis->hdflist_) {
-        if (item.index == hdindex) {
-            break;
-        }
-    }
-    const int32_t iobuffSize = size;
-    errno_t ret = 0;
-    switch (cmd) {
-        case IO_BITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayBits[drvtype], size);
-            break;
-        }
-        case IO_KEYBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayKeyBits[drvtype], size);
-            break;
-        }
-        case IO_RELBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayRelBits[drvtype], size);
-            break;
-        }
-        case IO_ABSBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayAbsBits[drvtype], size);
-            break;
-        }
-        case IO_MSCBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayMscBits[drvtype], size);
-            break;
-        }
-        case IO_SWBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arraySwBits[drvtype], size);
-            break;
-        }
-        case IO_LEDBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayLedBits[drvtype], size);
-            break;
-        }
-        case IO_SNDBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arraySndBits[drvtype], size);
-            break;
-        }
-        case IO_PROPBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayPropsBits[drvtype], size);
-            break;
-        }
-        case IO_KEYVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayKeyValues[drvtype], size);
-            break;
-        }
-        case IO_LEDVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayLedValues[drvtype], size);
-            break;
-        }
-        case IO_SWVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arraySwValues[drvtype], size);
-            break;
-        }
-        case IO_MTVABS: {
-            break;
-        }
-        case IO_IDS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayIds[drvtype], size);
-            break;
-        }
-        case IO_FFBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &g_arrayFfBits[drvtype], size);
-            break;
-        }
-        default: {
-            if (cmd >= IO_ABSBEGIN && cmd < IO_ABEND) {
-                ret = memcpy_s(iobuff, iobuffSize, &g_arrayAxisInfo[drvtype][cmd - IO_ABSBEGIN], size);
-            }
-            break;
-        }
-    }
-    if (ret != EOK) {
-        MMI_HILOGE("Call memcpy_s failed, cmd = %d, ret = %d", cmd, ret);
-    }
-    return RET_OK;
-}
-int32_t HdfEventManager::EvdevIoctl(int32_t hdiindex, int32_t pcmd, void *iobuff)
-{
-    int32_t size = (pcmd >> IOCTL_CMD_SHIFT) & IOCTL_CMD_MASK;
-    int32_t cmd = pcmd & 0xff;
-    MMI_HILOGD("index:%{public}d,cmd:%{public}02x,size:%{public}d,"
-        "pcmd:%{public}04x", hdiindex, cmd, size, pcmd);
-    DeviceInfo *deviceinfo = nullptr;
-    for (const auto &item : globleThis_->hdflist_) {
-        if (item.index == hdiindex) {
-            deviceinfo = static_cast<DeviceInfo*>(item->deviceinfo);
-            break;
-        }
-    }
-    if (deviceinfo == nullptr) {
-        MMI_HILOGE("Deviceinfo is null");
-        return 0;
-    }
-    const int32_t iobuffSize = size;
-    errno_t ret = 0;
-    switch (cmd) {
-        case IO_BITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.eventType, size);
-            break;
-        }
-        case IO_KEYBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.keyCode, size);
-            break;
-        }
-        case IO_RELBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.relCode, size);
-            break;
-        }
-        case IO_ABSBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.absCode, size);
-            break;
-        }
-        case IO_MSCBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.miscCode, size);
-            break;
-        }
-        case IO_SWBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.switchCode, size);
-            break;
-        }
-        case IO_LEDBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.ledCode, size);
-            break;
-        }
-        case IO_SNDBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.forceCode, size);
-            break;
-        }
-        case IO_PROPBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.devProp, size);
-            break;
-        }
-        case IO_KEYVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.keyType, size);
-            break;
-        }
-        case IO_LEDVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.ledType, size);
-            break;
-        }
-        case IO_SWVALUES: {
-            ret = memcpy_s(iobuff, iobuffSize, deviceinfo->abilitySet.switchType, size);
-            break;
-        }
-        case IO_MTVABS: {
-            break;
-        }
-        case IO_IDS: {
-            ret = memcpy_s(iobuff, iobuffSize, &deviceinfo->attrSet.id, size);
-            break;
-        }
-        case IO_FFBITS: {
-            ret = memcpy_s(iobuff, iobuffSize, &deviceinfo->abilitySet.forceCode, size);
-            break;
-        }
-        default: {
-            if (cmd >= IO_ABSBEGIN && cmd < IO_ABEND) {
-                ret = memcpy_s(iobuff, iobuffSize, &deviceinfo->attrSet.axisInfo[cmd - IO_ABSBEGIN], size);
-            }
-            break;
-        }
-    }
-    if (ret != EOK) {
-        MMI_HILOGE("Call memcpy_s failed, cmd = %d, ret = %d", cmd, ret);
-    }
-    return 0;
-}
-
-HdfEventManager::HdfEventManager()
-{
-    globleThis_ = this;
-    hdiinput_ = nullptr;
-}
-HdfEventManager::~HdfEventManager()
-{
-    uint32_t ret = inputInterface_->iInputReporter->UnregisterHotPlugCallback();
-    if (ret == INPUT_SUCCESS) {
-        MMI_HILOGI("%{public}s:%{public}d INPUT_SUCCESS", __func__, __LINE__);
-    } else {
-        MMI_HILOGE("%{public}s:%{public}d INPUT_ERROR", __func__, __LINE__);
-    }
-}
-int32_t HdfEventManager::HdfdevtypeMapLibinputType(uint32_t devIndex, uint32_t devType)
-{
-    if (devIndex >= MAX_INPUT_DEVICE_COUNT) {
-        MMI_HILOGE("The maximum number of devices exceeded, devIndex:%{public}d", devIndex);
-        return devType;
-    }
-    int32_t ret = 0;
-    switch (devType) {
-        case INDEV_TYPE_TOUCH: {
-            ret = HDF_INPUT | HDF_TOUCHSCREEN;
-            break;
-        }
-        case INDEV_TYPE_MOUSE: {
-            ret = HDF_INPUT | HDF_MOUSE;
-            break;
-        }
-        case INDEV_TYPE_KEYBOARD: {
-            ret = HDF_INPUT | HDF_KEYBOARD;
-            break;
-        }
-        default: {
-            ret = devType;
-            break;
-        }
-    }
-    return ret;
-}
-#ifdef  OHOS_BUILD_HDF
-int32_t HdfEventManager::GetDeviceCount()
-{
-    errno_t ret = memset_s(mountDevIndex_, sizeof(DevDesc) * TOTAL_INPUT_DEVICE_COUNT, 0,
-                           sizeof(DevDesc) * TOTAL_INPUT_DEVICE_COUNT);
-    if (ret != EOK) {
-        MMI_HILOGE("Call memset_s failed. ret = %d", ret);
-    }
-    int32_t devcount = 0;
-    if (inputInterface_ != nullptr || inputInterface_->iInputManager != nullptr) {
-        int32_t ret = inputInterface_->iInputManager->ScanInputDevice(MAX_INPUT_DEVICE_COUNT, mountDevIndex_);
-        if (ret) {
-            MMI_HILOGE("%{public}s:%{public}d Error:ScanInputDevice failed", __func__, __LINE__);
-            return 0;
-        }
-
-        for (int32_t i = 0; i < MAX_INPUT_DEVICE_COUNT; i++) {
-            if (mountDevIndex_[i].devIndex != 0) {
-                devcount = devcount + 1;
-            }
-        }
-    }
-    int32_t jectcount = 0;
-    if (injectInterface_ != nullptr || injectInterface_->iInputManager != nullptr) {
-        int32_t ret = injectInterface_->iInputManager->ScanInputDevice(MAX_INPUT_DEVICE_COUNT,
-                                                                       &mountDevIndex_[devcount]);
-        if (ret) {
-            MMI_HILOGE("%{public}s:%{public}d Error:injectInterface_ ScanInputDevice failed",
-                __func__, __LINE__);
-            return devcount;
-        }
-
-        for (int32_t i = 0; i < MAX_INPUT_DEVICE_COUNT; i++) {
-            if (mountDevIndex_[devcount + i].devIndex != 0) {
-                jectcount = jectcount + 1;
-            }
-        }
-    }
-    return devcount + jectcount;
-}
-void HdfEventManager::SetupCallback()
-{
-    MMI_HILOGD("%{public}s:%{public}d ThreadSetupCallback start", __func__, __LINE__);
-    uint32_t ret = GetInputInterface(&inputInterface_);
-    if (ret != 0 || inputInterface_ == nullptr
-        || inputInterface_->iInputManager == nullptr
-        || inputInterface_->iInputReporter == nullptr) {
-        MMI_HILOGD("%{public}s:%{public}d inputInterface_ init failed", __func__, __LINE__);
-    }
-
-    ret = GetInputInterfaceFromInject(&injectInterface_);
-    if (ret != 0 || injectInterface_ == nullptr
-        || injectInterface_->iInputManager == nullptr
-        || injectInterface_->iInputReporter == nullptr) {
-        MMI_HILOGD("%{public}s:%{public}d injectInterface_ init failed", __func__, __LINE__);
-    }
-
-    eventCallBack_.EventPkgCallback = globleThis_->GetEventCallback;
-    hostPlugCallBack_.HotPlugCallback = globleThis_->HotPlugCallback;
-    if (inputInterface_) {
-        ret = inputInterface_->iInputReporter->RegisterHotPlugCallback(&hostPlugCallBack_);
-        if (ret == INPUT_SUCCESS) {
-            MMI_HILOGI("%{public}s:%{public}d RegisterHotPlugCallback INPUT_SUCCESS", __func__, __LINE__);
-        } else {
-            MMI_HILOGE("%{public}s:%{public}d RegisterHotPlugCallback INPUT_ERROR", __func__, __LINE__);
-        }
-    }
-
-    if (injectInterface_) {
-        ret = injectInterface_->iInputReporter->RegisterHotPlugCallback(&hostPlugCallBack_);
-        if (ret == INPUT_SUCCESS) {
-            MMI_HILOGI("%{public}s:%{public}d injectInterface_ RegisterHotPlugCallback INPUT_SUCCESS",
-                __func__, __LINE__);
-        } else {
-            MMI_HILOGE("%{public}s:%{public}d injectInterface_ RegisterHotPlugCallback INPUT_ERROR",
-                __func__, __LINE__);
-        }
-    }
-
-    int32_t count = GetDeviceCount();
-    MMI_HILOGD("ThreadSetupCallback count:%{public}d",                                 count);
-    for (int32_t i = 0; i < count; i++) {
-        DeviceAddHandle(mountDevIndex_[i].devIndex, mountDevIndex_[i].devType);
-    }
-}
-
-void HdfEventManager::AddDevice(uint32_t devIndex, uint32_t devType)
-{
-    uint32_t ret = 0;
-    if (devIndex >= MAX_INPUT_DEVICE_COUNT) {
-        ret = injectInterface_->iInputReporter->RegisterReportCallback(devIndex, &eventCallBack_);
-        return;
-    }
-    if (!OpenHdfDevice(devIndex, true)) {
-        return;
-    }
-    ret = inputInterface_->iInputReporter->RegisterReportCallback(devIndex, &eventcallback);
-    if (ret == INPUT_SUCCESS) {
-        MMI_HILOGI("%{public}s:%{public}d RegisterReportCallback eventcallback INPUT_SUCCESS"
-            "devindex:%{public}u, devType:%{public}u", __func__, __LINE__, devIndex, devType);
-    } else {
-        MMI_HILOGE("%{public}s:%{public}d RegisterReportCallback eventcallback INPUT_ERROR"
-            "devindex:%{public}u,devType:%{public}u", __func__, __LINE__, devIndex, devType);
-    }
-}
-bool HdfEventManager::OpenHdfDevice(uint32_t devIndex, bool oper)
-{
-    if (devIndex >= MAX_INPUT_DEVICE_COUNT) {
-        return true;
-    }
-    int32_t ret = -1;
-    if (oper) {
-        ret = inputInterface_->iInputManager->OpenInputDevice(devIndex);
-    } else {
-        ret = inputInterface_->iInputManager->CloseInputDevice(devIndex);
-    }
-    if (ret == 0) {
-        MMI_HILOGI("%{public}s:%{public}d Info: device success!", __func__, __LINE__);
-        return true;
-    }
-
-    if (ret != 0) {
-        MMI_HILOGE("%{public}s:%{public}d Error: device fail! code:%{public}u", __func__, __LINE__, ret);
-    }
-    return false;
-}
-void HdfEventManager::HotPlugCallback(const HotPlugEvent *event)
-{
-    MMI_HILOGD("%{public}s:%{public}d HotPlugCallback status:%{public}u,devindex:%{public}u"
-        "devType:%{public}u", __func__, __LINE__, event->status, event->devIndex, event->devType);
-
-    if (!event->status) {
-        DeviceAddHandle(event->devIndex, event->devType);
-    } else {
-        DeviceRemoveHandle(event->devIndex, event->devType);
-    }
-}
-int32_t HdfEventManager::DeviceRemoveHandle(uint32_t devIndex, uint32_t devType)
-{
-    MMI_HILOGD("%{public}s:%{public}d DeviceRemoveHandle devindex:%{public}u,devType:%{public}u",
-        __func__, __LINE__, devIndex, devType);
-    Devcmd cmd;
-    cmd.index = devIndex;
-    cmd.cmd = static_cast<int32_t>(HDF_RMV_DEVICE);
-    libinput_devpipe_write(m_globleThis->hdiinput_, &cmd, sizeof(Devcmd));
-    if (devIndex < MAX_INPUT_DEVICE_COUNT) {
-        uint32_t ret = m_globleThis->inputInterface_->iInputReporter->UnregisterReportCallback(devIndex);
-        if (ret == INPUT_SUCCESS) {
-            MMI_HILOGI("%{public}s:%{public}d REMOVE_SUCCESS devindex:%{public}u,devType:%{public}u",
-                __func__, __LINE__, devIndex, devType);
-        } else {
-            MMI_HILOGE("%{public}s:%{public}d REMOVE_ERROR devindex:%{public}u,devType:%{public}u",
-                __func__, __LINE__, devIndex, devType);
-        }
-    }
-    globleThis_->OpenHdfDevice(devIndex, false);
-    return RET_OK;
-}
-
-
-void HdfEventManager::GetEventCallback(const KeyEventNormalize **pkgs, uint32_t count, uint32_t devIndex)
-{
-    static constexpr uint16_t byteSize = 8;
-    CHKPV(pkgs);
-    struct input_event eventarry[MAX_EVENT_PKG_NUM];
-    for (uint32_t i = 0; i < count && i < MAX_EVENT_PKG_NUM; i++) {
-        eventarry[i].code = pkgs[i]->code;
-        eventarry[i].type = (pkgs[i]->type) | static_cast<uint16_t>(devIndex<<byteSize);
-        eventarry[i].value = pkgs[i]->value;
-        eventarry[i].input_event_sec = (pkgs[i]->timestamp) / (USEC_PER_SEC);
-        eventarry[i].input_event_usec = (pkgs[i]->timestamp) % (USEC_PER_SEC);
-    }
-    if (!globleThis_->devStatus[devIndex]) {
-        return;
-    }
-    libinput_pipe_write(globleThis_->hdiinput_, devIndex, eventarry, count * sizeof(struct input_event));
-}
-
-int32_t HdfEventManager::DeviceAddHandle(uint32_t devIndex, uint32_t devType)
-{
-    MMI_HILOGD("%{public}s:%{public}d DeviceAddHandle devindex:%{public}u,devType:%{public}u",
-        __func__, __LINE__, devIndex, devType);
-    globleThis_->devStatus[devIndex] = false;
-    uhdf *hdiuhdf = nullptr;
-    hdiuhdf = new(uhdf);
-    hdiuhdf->index = devIndex;
-    hdiuhdf->type = globleThis_->HdfdevtypeMapLibinputType(devIndex, devType);
-    hdiuhdf->nproperties = 0;
-    hdiuhdf->quirkpop = nullptr;
-    hdiuhdf->modeltype = 0;
-    hdiuhdf->fn = (hdiuhdf->index >= MAX_INPUT_DEV_NUM) ? EvdevSimIoctl : EvdevIoctl;
-    globleThis_->hdflist_.push_back(hdiuhdf);
-    Devcmd cmd;
-    cmd.index = devIndex;
-    cmd.cmd = static_cast<int32_t>(HDF_ADD_DEVICE);
-    libinput_devpipe_write(globleThis_->hdiinput_, &cmd, sizeof(Devcmd));
-    return RET_OK;
-}
-constexpr struct libinput_interface _hdfinterface = {
-    .open_restricted = [](const char *path, int32_t flags, void *user_data)->int32_t {
-        int32_t fd = -1;
-        MMI_HILOGI("libinput .open_restricted path:%{public}s,fd:%{public}d", path, fd);
-        return fd < 0 ? -errno : fd;
-    },
-    .close_restricted = [](int32_t fd, void *user_data)
-    {
-        MMI_HILOGI("libinput .close_restricted fd:%{public}d", fd);
-    },
-};
-libinput *HdfEventManager::HdfLibinputInit()
-{
-    if (globleThis_->hdiinput_ == nullptr) {
-        globleThis_->hdiinput_ = libinput_hdf_create_context(&_hdfinterface, nullptr);
-    }
-    MMI_HILOGD("HdfLibinputInit function end");
-    return globleThis_->hdiinput_;
-}
-int32_t HdfEventManager::HdfDevHandle(int32_t index, hdf_event_type cmd)
-{
-    if (cmd != HDF_ADD_DEVICE) {
-        MMI_HILOGD("HdfRmv function start");
-        uhdf *hdiuhdf = nullptr;
-        for (std::list<uhdf*>::iterator it = globleThis_->hdflist_.begin();
-             it != globleThis_->hdflist_.end(); ++it) {
-            uhdf *hdiuhdfit = *it;
-            if (hdiuhdfit->index == static_cast<int32_t>(index)) {
-                hdiuhdf = *it;
-                globleThis_->hdflist_.remove(*it);
-                break;
-            }
-        }
-        if (hdiuhdf == nullptr) {
-            return RET_OK;
-        }
-        uhdfdevice_removed(hdiuhdf);
-        delete(hdiuhdf);
-        return RET_OK;
-    }
-
-    uhdf *hdiuhdf = nullptr;
-    for (std::list<uhdf*>::iterator it = globleThis_->hdflist_.begin();
-        it != globleThis_->hdflist_.end(); ++it) {
-        uhdf *hdiuhdfit = *it;
-        if (hdiuhdfit->index != static_cast<int32_t>(index)) {
-            continue;
-        }
-
-        hdiuhdf = *it;
-        DeviceInfo *deviceinfo = nullptr;
-        globleThis_->AddDevice(index, hdiuhdf->type);
-        if (index < MAX_INPUT_DEVICE_COUNT) {
-            uint32_t ret = globleThis_->inputInterface_->iInputManager->GetInputDevice(index, &deviceinfo);
-            if (ret != 0 || (deviceinfo == nullptr)) {
-                MMI_HILOGE("%{public}s:%{public}d inputInterface_ GetInputDevice ret:%{public}d",
-                           __func__, __LINE__, ret);
-                return RET_ERR;
-            }
-            hdiuhdf->deviceinfo = (void*)deviceinfo;
-        }
-        uhdfdevice_added(globleThis_->hdiinput_, hdiuhdf, "default");
-        globleThis_->devStatus[index] = true;
-        return RET_OK;
-    }
-    return RET_OK;
-}
-bool HdfEventManager::Init()
-{
-    return true;
-}
-HdfEventManager  hdfEventManager;
-extern "C" libinput *HdfAdfInit()
-{
-    MMI_HILOGD("HdfAdfInit function start");
-    return hdfEventManager.HdfLibinputInit();
-}
-
-extern "C" int32_t HdfDevHandle(int32_t index, hdf_event_type cmd)
-{
-    MMI_HILOGD("HdfDevHandle function start index:%{public}d,cmd:%{public}d", index, cmd);
-    return hdfEventManager.HdfDevHandle(index, cmd);
-}
-#endif
-} // namespace MMI
-} // namespace OHOS
\ No newline at end of file
-- 
Gitee


From e805502e5aae83a3e3b47f53c3ed168dab620e65 Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Tue, 25 Oct 2022 12:18:05 +0000
Subject: [PATCH 076/360] Fix pr1909 compilation problems

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 .../input_device_cooperate/src/input_device_cooperate_sm.cpp  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index 3887159624..cb09dfe252 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -522,13 +522,13 @@ bool InputDeviceCooperateSM::InitDeviceManager()
     CALL_DEBUG_ENTER;
     initCallback_ = std::make_shared<DeviceInitCallBack>();
     CHKPR(initCallback_, false);
-    int32_t ret = DisHardware->InitDeviceManager(MMI_DINPUT_PKG_NAME, initCallback_);
+    int32_t ret = DisHardware.InitDeviceManager(MMI_DINPUT_PKG_NAME, initCallback_);
     if (ret != 0) {
         MMI_HILOGE("Init device manager failed, ret:%{public}d", ret);
         return false;
     }
     stateCallback_ = std::make_shared<MmiDeviceStateCallback>();
-    ret = DisHardware->RegisterDevStateCallback(MMI_DINPUT_PKG_NAME, "", stateCallback_);
+    ret = DisHardware.RegisterDevStateCallback(MMI_DINPUT_PKG_NAME, "", stateCallback_);
     if (ret != 0) {
         MMI_HILOGE("Register devStateCallback failed, ret:%{public}d", ret);
         return false;
-- 
Gitee


From 08b471072dd8a0f723525a4ab084d345b95f16cc Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 26 Oct 2022 11:02:27 +0800
Subject: [PATCH 077/360] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAsteady=5Fclock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ic381d8bdb162bf1bbe05b3486590e3e0a414e765
---
 util/common/src/util.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/common/src/util.cpp b/util/common/src/util.cpp
index 308b94c25f..366aa9e2d8 100644
--- a/util/common/src/util.cpp
+++ b/util/common/src/util.cpp
@@ -72,7 +72,7 @@ int64_t GetSysClockTime()
 
 int64_t GetMillisTime()
 {
-    auto timeNow = std::chrono::time_point_cast<std::chrono::milliseconds>(std::chrono::system_clock::now());
+    auto timeNow = std::chrono::time_point_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now());
     auto tmp = std::chrono::duration_cast<std::chrono::milliseconds>(timeNow.time_since_epoch());
     return tmp.count();
 }
-- 
Gitee


From 54af1273cd9082698ee2ca5cde2e0bc655d08b42 Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Wed, 26 Oct 2022 06:26:09 +0000
Subject: [PATCH 078/360] modify debug for KMC

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 .../src/device_cooperate_softbus_adapter.cpp                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
index 0271a04e7b..6d7462262e 100755
--- a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
+++ b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
@@ -426,7 +426,7 @@ int32_t DeviceCooperateSoftbusAdapter::SendMsg(int32_t sessionId, const std::str
 {
     CALL_DEBUG_ENTER;
     if (message.size() > MSG_MAX_SIZE) {
-        MMI_HILOGW("error:message.size() > MSG_MAX_SIZE msessage size:%{public}d", message.size());
+        MMI_HILOGW("error:message.size() > MSG_MAX_SIZE msessage size:%{public}zu", message.size());
         return RET_ERR;
     }
     return SendBytes(sessionId, message.c_str(), strlen(message.c_str()));
-- 
Gitee


From 0772a49bf0b5ee4b9577634954b60339c1dc5020 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 26 Oct 2022 16:59:13 +0800
Subject: [PATCH 079/360] commit joystick precess code

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I2c86db3c4fdac6c9b95965733d32be376b2da9ad
---
 .../innerkits/event/include/pointer_event.h   |  23 +-
 .../libinput/libinput_0000.diff               | 934 ++++++++++--------
 service/BUILD.gn                              |   3 +
 .../include/event_normalize_handler.h         |   1 +
 .../src/event_normalize_handler.cpp           |  29 +-
 .../include/joystick_transform_processor.h    | 103 ++
 .../src/joystick_transform_processor.cpp      | 147 +++
 .../src/touch_event_normalize.cpp             |   7 +
 8 files changed, 856 insertions(+), 391 deletions(-)
 create mode 100644 service/touch_event_normalize/include/joystick_transform_processor.h
 create mode 100644 service/touch_event_normalize/src/joystick_transform_processor.cpp

diff --git a/interfaces/native/innerkits/event/include/pointer_event.h b/interfaces/native/innerkits/event/include/pointer_event.h
index 99c1b144b2..03a63b0e95 100644
--- a/interfaces/native/innerkits/event/include/pointer_event.h
+++ b/interfaces/native/innerkits/event/include/pointer_event.h
@@ -556,6 +556,27 @@ public:
      */
     static constexpr int32_t JOYSTICK_BUTTON_DEAD = 25;
 
+    /**
+     * 表示操纵杆的C按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_C = 26;
+
+    /**
+     * 表示操纵杆的Z按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_Z = 27;
+
+    /**
+     *表示操纵杆的MODE按键。
+     *
+     * @since 9
+     */
+    static constexpr int32_t JOYSTICK_BUTTON_MODE = 28;
+
 public:
     static std::shared_ptr<PointerEvent> from(std::shared_ptr<InputEvent> inputEvent);
 
@@ -1285,7 +1306,7 @@ private:
     int32_t pointerAction_ { POINTER_ACTION_UNKNOWN };
     int32_t buttonId_ { -1 };
     uint32_t axes_ { 0U };
-    std::array<double, AXIS_TYPE_MAX>   axisValues_ {};
+    std::array<double, AXIS_TYPE_MAX> axisValues_ {};
     std::vector<int32_t> pressedKeys_;
 };
 
diff --git a/patch/diff_libinput_mmi/libinput/libinput_0000.diff b/patch/diff_libinput_mmi/libinput/libinput_0000.diff
index fb3c6ff880..02c9e2c788 100644
--- a/patch/diff_libinput_mmi/libinput/libinput_0000.diff
+++ b/patch/diff_libinput_mmi/libinput/libinput_0000.diff
@@ -12,8 +12,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 diff -Naur old/BUILD.gn new/BUILD.gn
---- old/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
-+++ new/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
+--- old/BUILD.gn	2022-10-17 15:22:59.435710212 +0800
++++ new/BUILD.gn	2022-10-17 17:29:22.211403639 +0800
 @@ -21,9 +21,16 @@
  config("libinput-third_public_config") {
    include_dirs = [
@@ -22,7 +22,7 @@ diff -Naur old/BUILD.gn new/BUILD.gn
 +    "//third_party/FreeBSD/sys/dev/evdev",
 +    "src",
    ]
-
+ 
    cflags = [
 +    "-DHAVE_LIBEVDEV_DISABLE_PROPERTY=0",
 +    "-DHAVE_LIBWACOM=0",
@@ -30,7 +30,7 @@ diff -Naur old/BUILD.gn new/BUILD.gn
 +    "-UHAVE_VERSIONSORT",
    ]
  }
-
+ 
 @@ -61,7 +68,8 @@
      "src/path-seat.c",
      "src/udev-seat.c",
@@ -39,46 +39,46 @@ diff -Naur old/BUILD.gn new/BUILD.gn
 +    "src/libinput-util.c",
 +    "src/evdev-joystick.c",
    ]
-
+ 
    configs = [
 @@ -81,7 +89,7 @@
      "//third_party/mtdev:libmtdev",
    ]
-
+ 
 -  part_name = "multimodalinput_base"
 +  part_name = "input"
  }
  ## Build libinput-third.so }}}
-
+ 
 @@ -113,7 +121,7 @@
      "//third_party/mtdev:libmtdev",
    ]
-
+ 
 -  part_name = "multimodalinput_base"
 +  part_name = "input"
  }
-
+ 
  ohos_executable("libinput-list") {
 @@ -143,7 +151,7 @@
      "//third_party/mtdev:libmtdev",
    ]
-
+ 
 -  part_name = "multimodalinput_base"
 +  part_name = "input"
  }
-
+ 
  ohos_executable("libinput-tablet") {
 @@ -173,5 +181,5 @@
      "//third_party/mtdev:libmtdev",
    ]
-
+ 
 -  part_name = "multimodalinput_base"
 +  part_name = "input"
  }
 \ No newline at end of file
 diff -Naur old/export_include/libinput.h new/export_include/libinput.h
---- old/export_include/libinput.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/export_include/libinput.h	2021-01-01 00:00:00.000000000 +0800
+--- old/export_include/libinput.h	2022-10-17 15:22:59.443710306 +0800
++++ new/export_include/libinput.h	2022-10-17 17:29:08.379240969 +0800
 @@ -196,6 +196,22 @@
  	LIBINPUT_DEVICE_CAP_TABLET_PAD = 4,
  	LIBINPUT_DEVICE_CAP_GESTURE = 5,
@@ -100,11 +100,11 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
 +    EVDEV_UDEV_TAG_TRACKBALL = 1 << 10,
 +    EVDEV_UDEV_TAG_SWITCH = 1 << 11,
  };
-
+ 
  /**
 @@ -315,6 +331,49 @@
  };
-
+ 
  /**
 + * @ingroup event_joystick
 + *
@@ -155,7 +155,7 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
 @@ -387,6 +446,17 @@
  	LIBINPUT_TABLET_TOOL_TIP_DOWN = 1,
  };
-
+ 
 +struct libinput_event_joystick_axis_abs_info {
 +	int32_t code;
 +	int32_t value;
@@ -170,10 +170,20 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
  /**
   * @defgroup tablet_pad_modes Tablet pad modes
   *
-@@ -754,6 +824,10 @@
+@@ -744,6 +814,9 @@
+ 	LIBINPUT_EVENT_POINTER_BUTTON,
+ 	LIBINPUT_EVENT_POINTER_AXIS,
+ 
++	LIBINPUT_EVENT_JOYSTICK_BUTTON = 450,
++	LIBINPUT_EVENT_JOYSTICK_AXIS,
++
+ 	LIBINPUT_EVENT_TOUCH_DOWN = 500,
+ 	LIBINPUT_EVENT_TOUCH_UP,
+ 	LIBINPUT_EVENT_TOUCH_MOTION,
+@@ -754,6 +827,10 @@
  	 */
  	LIBINPUT_EVENT_TOUCH_FRAME,
-
+ 
 +	LIBINPUT_EVENT_TOUCHPAD_DOWN = 550,
 +	LIBINPUT_EVENT_TOUCHPAD_UP,
 +	LIBINPUT_EVENT_TOUCHPAD_MOTION,
@@ -181,7 +191,7 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
  	/**
  	 * One or more axes have changed state on a device with the @ref
  	 * LIBINPUT_DEVICE_CAP_TABLET_TOOL capability. This event is only sent
-@@ -1001,6 +1075,19 @@
+@@ -1001,6 +1078,19 @@
  /**
   * @ingroup event
   *
@@ -201,9 +211,9 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
   * Return the gesture event that is this input event. If the event type does
   * not match the gesture event types, this function returns NULL.
   *
-@@ -1673,6 +1760,120 @@
+@@ -1673,6 +1763,120 @@
  				       uint32_t height);
-
+ 
  /**
 + * @brief 获取触摸屏的工具类型区域属性
 + */
@@ -322,9 +332,9 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
   * @ingroup event_touch
   *
   * @return The generic libinput_event of this event
-@@ -1681,6 +1882,228 @@
+@@ -1681,6 +1885,228 @@
  libinput_event_touch_get_base_event(struct libinput_event_touch *event);
-
+ 
  /**
 + * @defgroup event_touch Touchpad events
 + *
@@ -551,9 +561,9 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
   * @defgroup event_gesture Gesture events
   *
   * Gesture events are generated when a gesture is recognized on a touchpad.
-@@ -1893,6 +2316,42 @@
+@@ -1893,6 +2319,42 @@
  libinput_event_gesture_get_angle_delta(struct libinput_event_gesture *event);
-
+ 
  /**
 + * 获取带slot的touches信息, 仅支持LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE
 + */
@@ -594,7 +604,7 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
   * @defgroup event_tablet Tablet events
   *
   * Events that come from tools on tablet devices. For events from the pad,
-@@ -2620,6 +3079,19 @@
+@@ -2620,6 +3082,19 @@
  /**
   * @ingroup event_tablet
   *
@@ -614,10 +624,10 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
   * Return the high-level tool type for a tool object.
   *
   * The high level tool describes general interaction expected with the tool.
-@@ -3466,6 +3938,46 @@
+@@ -3466,6 +3941,56 @@
  int
  libinput_dispatch(struct libinput *libinput);
-
+ 
 +/****************************************************************************
 +* @brief : brief
 +* @author : fms
@@ -638,9 +648,19 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
 +* @inparam :
 +* @outparam :
 +*****************************************************************************/
-+struct libinput_event_joystick_axis *
-+libinput_event_get_joystick_axis_event(struct libinput_event *event);
++struct libinput_event_joystick_button*
++libinput_event_get_joystick_button_event(struct libinput_event* event);
 +
++/****************************************************************************
++* @brief : get joystick axis event
++* @author : fms
++* @date : 2021/3/12 10:56
++* @version : ver 1.0
++* @inparam :
++* @outparam :
++*****************************************************************************/
++struct libinput_event_joystick_axis*
++    libinput_event_get_joystick_axis_event(struct libinput_event* event);
 +/**
 + * @brief 获取轴事件的时间
 + */
@@ -661,10 +681,10 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
  /**
   * @ingroup base
   *
-@@ -3936,6 +4448,42 @@
+@@ -3936,6 +4461,42 @@
  const char *
  libinput_device_get_name(struct libinput_device *device);
-
+ 
 +/**  @brief   获取设备类型*/
 +enum evdev_device_udev_tags
 +libinput_device_get_tags(struct libinput_device* device);
@@ -704,9 +724,9 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
  /**
   * @ingroup device
   *
-@@ -4146,6 +4694,12 @@
+@@ -4146,6 +4707,12 @@
  libinput_device_touch_get_touch_count(struct libinput_device *device);
-
+ 
  /**
 + * @brief 获取触摸屏工具类型按钮是否按下
 + */
@@ -717,10 +737,10 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
   * @ingroup device
   *
   * Check if a @ref LIBINPUT_DEVICE_CAP_SWITCH device has a switch of the
-@@ -5928,7 +6482,102 @@
+@@ -5928,7 +6495,102 @@
  unsigned int
  libinput_device_config_rotation_get_default_angle(struct libinput_device *device);
-
+ 
 +/**
 + * @ingroup event
 + *
@@ -813,7 +833,7 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
 +const char*
 +libinput_device_get_uniq(struct libinput_device* device);
 +
-+enum libinput_key_state
++enum libinput_button_state
 +libinput_event_joystick_button_get_key_state(struct libinput_event_joystick_button* event);
  #ifdef __cplusplus
  }
@@ -822,7 +842,7 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
 +
 diff -Naur old/hm_src/hm_missing.c new/hm_src/hm_missing.c
 --- old/hm_src/hm_missing.c	1970-01-01 08:00:00.000000000 +0800
-+++ new/hm_src/hm_missing.c	2021-01-01 00:00:00.000000000 +0800
++++ new/hm_src/hm_missing.c	2022-10-17 17:29:08.087237536 +0800
 @@ -0,0 +1,22 @@
 +/*
 + * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
@@ -849,7 +869,7 @@ diff -Naur old/hm_src/hm_missing.c new/hm_src/hm_missing.c
 \ No newline at end of file
 diff -Naur old/hm_src/hm_missing.h new/hm_src/hm_missing.h
 --- old/hm_src/hm_missing.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/hm_src/hm_missing.h	2021-01-01 00:00:00.000000000 +0800
++++ new/hm_src/hm_missing.h	2022-10-17 17:29:07.971236172 +0800
 @@ -0,0 +1,25 @@
 +/*
 + * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
@@ -877,15 +897,15 @@ diff -Naur old/hm_src/hm_missing.h new/hm_src/hm_missing.h
 +
 +#endif
 diff -Naur old/include/config.h new/include/config.h
---- old/include/config.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/include/config.h	2021-01-01 00:00:00.000000000 +0800
+--- old/include/config.h	2022-10-17 15:22:59.443710306 +0800
++++ new/include/config.h	2022-10-17 17:29:07.855234807 +0800
 @@ -18,14 +18,17 @@
  #endif
  #define HTTP_DOC_LINK "https://wayland.freedesktop.org/libinput/doc/latest"
-
+ 
 -#define LIBINPUT_QUIRKS_DIR "/usr/share/libinput"
 +#define LIBINPUT_QUIRKS_DIR "/etc/libinput/quirks"
-
+ 
 -#define LIBINPUT_QUIRKS_OVERRIDE_FILE "/etc/libinput/local-overrides.quirks"
 +#define LIBINPUT_QUIRKS_OVERRIDE_FILE "/etc/libinput/quirks/local-overrides.quirks"
 +
@@ -894,7 +914,7 @@ diff -Naur old/include/config.h new/include/config.h
 +#define LIBINPUT_TOOL_PATH "/data/libinput"
 +
 +#define MESON_BUILD_ROOT "/data/libinput"
-
+ 
  #undef NDEBUG
 -#define LIBINPUT_TOOL_PATH ""
 -#define LIBINPUT_QUIRKS_SRCDIR ""
@@ -903,7 +923,7 @@ diff -Naur old/include/config.h new/include/config.h
  # ifdef _Static_assert
  #  define static_assert(cond, msg) _Static_assert(cond, msg)
 @@ -36,3 +39,10 @@
-
+ 
  #define index strchr
  #define ffs __builtin_ffs
 +
@@ -914,7 +934,7 @@ diff -Naur old/include/config.h new/include/config.h
 +
 +
 diff -Naur old/include/linux/linux/input-event-codes.h new/include/linux/linux/input-event-codes.h
---- old/include/linux/linux/input-event-codes.h	2021-01-01 00:00:00.000000000 +0800
+--- old/include/linux/linux/input-event-codes.h	2022-10-17 15:22:59.443710306 +0800
 +++ new/include/linux/linux/input-event-codes.h	1970-01-01 08:00:00.000000000 +0800
 @@ -1,945 +0,0 @@
 -/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
@@ -1863,8 +1883,8 @@ diff -Naur old/include/linux/linux/input-event-codes.h new/include/linux/linux/i
 -
 -#endif
 diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
---- old/src/evdev-fallback.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-fallback.c	2021-01-01 00:00:00.000000000 +0800
+--- old/src/evdev-fallback.c	2022-10-17 15:22:59.447710353 +0800
++++ new/src/evdev-fallback.c	2022-10-17 17:29:01.959165469 +0800
 @@ -284,8 +284,11 @@
  	struct libinput_device *base = &device->base;
  	struct libinput_seat *seat = base->seat;
@@ -1874,13 +1894,13 @@ diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
  	int seat_slot;
 +	struct touch_axis axis;
 +	int tool_type;
-
+ 
  	if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
  		return false;
 @@ -308,8 +311,12 @@
  	slot->hysteresis_center = point;
  	evdev_transform_absolute(device, &point);
-
+ 
 -	touch_notify_touch_down(base, time, slot_idx, seat_slot,
 -				&point);
 +	tool_type = slot->tool_type;
@@ -1889,7 +1909,7 @@ diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
 +	evdev_transform_absolute_rect(device, &rect);
 +	touch_notify_touch_down(base, time, slot_idx, seat_slot, slot->pressure,
 +				&axis, &point, tool_type, &rect);
-
+ 
  	return true;
  }
 @@ -322,8 +329,11 @@
@@ -1901,7 +1921,7 @@ diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
  	int seat_slot;
 +	struct touch_axis axis;
 +	int tool_type;
-
+ 
  	if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
  		return false;
 @@ -331,6 +341,7 @@
@@ -1909,12 +1929,12 @@ diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
  	seat_slot = slot->seat_slot;
  	point = slot->point;
 +    axis = slot->axis;
-
+ 
  	if (seat_slot == -1)
  		return false;
 @@ -339,8 +350,12 @@
  		return false;
-
+ 
  	evdev_transform_absolute(device, &point);
 -	touch_notify_touch_motion(base, time, slot_idx, seat_slot,
 -				  &point);
@@ -1924,7 +1944,7 @@ diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
 +	evdev_transform_absolute_rect(device, &rect);
 +	touch_notify_touch_motion(base, time, slot_idx, seat_slot, slot->pressure,
 +				  &axis, &point, tool_type, &rect);
-
+ 
  	return true;
  }
 @@ -355,6 +370,7 @@
@@ -1932,18 +1952,18 @@ diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
  	struct mt_slot *slot;
  	int seat_slot;
 +	int tool_type;
-
+ 
  	if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
  		return false;
 @@ -368,7 +384,9 @@
-
+ 
  	seat->slot_map &= ~bit(seat_slot);
-
+ 
 -	touch_notify_touch_up(base, time, slot_idx, seat_slot);
 +	tool_type = slot->tool_type;
 +
 +	touch_notify_touch_up(base, time, slot_idx, seat_slot, tool_type);
-
+ 
  	return true;
  }
 @@ -409,7 +427,11 @@
@@ -1955,18 +1975,18 @@ diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
  	int seat_slot;
 +	int tool_type;
 +	int32_t pressure = dispatch->abs.pressure;
-
+ 
  	if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
  		return false;
 @@ -431,7 +453,9 @@
  	point = dispatch->abs.point;
  	evdev_transform_absolute(device, &point);
-
+ 
 -	touch_notify_touch_down(base, time, -1, seat_slot, &point);
 +	tool_type = -1;
 +
 +	touch_notify_touch_down(base, time, -1, seat_slot, pressure, &axis, &point, tool_type, &rect);
-
+ 
  	return true;
  }
 @@ -443,7 +467,11 @@
@@ -1978,18 +1998,18 @@ diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
  	int seat_slot;
 +	int tool_type;
 +	int32_t pressure = dispatch->abs.pressure;
-
+ 
  	point = dispatch->abs.point;
  	evdev_transform_absolute(device, &point);
 @@ -453,7 +481,9 @@
  	if (seat_slot == -1)
  		return false;
-
+ 
 -	touch_notify_touch_motion(base, time, -1, seat_slot, &point);
 +	tool_type = -1;
 +
 +	touch_notify_touch_motion(base, time, -1, seat_slot, pressure, &axis, &point, tool_type, &rect);
-
+ 
  	return true;
  }
 @@ -466,6 +496,7 @@
@@ -1997,18 +2017,18 @@ diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
  	struct libinput_seat *seat = base->seat;
  	int seat_slot;
 +	int tool_type;
-
+ 
  	if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
  		return false;
 @@ -478,7 +509,9 @@
-
+ 
  	seat->slot_map &= ~bit(seat_slot);
-
+ 
 -	touch_notify_touch_up(base, time, -1, seat_slot);
 +	tool_type = -1;
 +
 +	touch_notify_touch_up(base, time, -1, seat_slot, tool_type);
-
+ 
  	return true;
  }
 @@ -653,6 +686,42 @@
@@ -2064,17 +2084,17 @@ diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
 +		break;
  	}
  }
-
+ 
 @@ -1592,6 +1665,7 @@
-
+ 
  	for (slot = 0; slot < num_slots; ++slot) {
  		slots[slot].seat_slot = -1;
 +		slots[slot].tool_type = -1;
-
+ 
  		if (evdev_need_mtdev(device))
  			continue;
 @@ -1751,3 +1825,11 @@
-
+ 
  	return &dispatch->base;
  }
 +
@@ -2086,8 +2106,8 @@ diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
 +	return hw_is_key_down(dispatch, btnToolType);
 +}
 diff -Naur old/src/evdev-fallback.h new/src/evdev-fallback.h
---- old/src/evdev-fallback.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-fallback.h	2021-01-01 00:00:00.000000000 +0800
+--- old/src/evdev-fallback.h	2022-10-17 15:22:59.447710353 +0800
++++ new/src/evdev-fallback.h	2022-10-17 17:29:01.799163587 +0800
 @@ -66,6 +66,10 @@
  	struct device_coords point;
  	struct device_coords hysteresis_center;
@@ -2097,7 +2117,7 @@ diff -Naur old/src/evdev-fallback.h new/src/evdev-fallback.h
 +	struct touch_axis axis;
 +	int32_t tool_type;
  };
-
+ 
  struct fallback_dispatch {
 @@ -84,6 +88,7 @@
  	struct {
@@ -2105,7 +2125,7 @@ diff -Naur old/src/evdev-fallback.h new/src/evdev-fallback.h
  		int32_t seat_slot;
 +		int32_t pressure;
  	} abs;
-
+ 
  	struct {
 @@ -169,6 +174,7 @@
  static inline enum key_type
@@ -2123,11 +2143,11 @@ diff -Naur old/src/evdev-fallback.h new/src/evdev-fallback.h
 +		return KEY_TYPE_KEY;
  	return KEY_TYPE_NONE;
  }
-
+ 
 diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
 --- old/src/evdev-joystick.c	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/evdev-joystick.c	2021-01-01 00:00:00.000000000 +0800
-@@ -0,0 +1,580 @@
++++ new/src/evdev-joystick.c	2022-10-17 17:29:01.675162129 +0800
+@@ -0,0 +1,593 @@
 +/*
 + * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
 + * Licensed under the Apache License, Version 2.0 (the "License");
@@ -2168,31 +2188,35 @@ diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
 +}
 +
 +static int
-+update_seat_joystick_button_count(struct libinput_seat* pSeat, int32_t key, uint32_t *pRetcount, enum libinput_key_state state)
++update_seat_joystick_button_count(struct libinput_seat* seat, int32_t key, uint32_t *seat_count, enum libinput_button_state state)
 +{
-+    if (pSeat == NULL || pRetcount == NULL || key < SYN_REPORT || key > KEY_MAX) {
++    if (seat == NULL || seat_count == NULL || key < SYN_REPORT || key > KEY_MAX) {
 +        return false;
 +    }
 +
 +    switch (state) {
-+        case LIBINPUT_KEY_STATE_PRESSED:
++        case LIBINPUT_BUTTON_STATE_PRESSED:
 +        {
-+            *(pRetcount) = ++pSeat->button_count[key];
++            *(seat_count) = ++seat->button_count[key];
++            break;
 +        }
-+        break;
-+        case LIBINPUT_KEY_STATE_RELEASED:
++        case LIBINPUT_BUTTON_STATE_RELEASED:
 +        {
-+            if (pSeat->button_count[key] == 0) {
-+                *(pRetcount) = pSeat->button_count[key];
++            if (seat->button_count[key] == 0)
++            {
++                *(seat_count) = seat->button_count[key];
 +            }
-+            else {
-+                *(pRetcount) = --pSeat->button_count[key];
++            else
++            {
++                *(seat_count) = --seat->button_count[key];
 +            }
++            break;
 +        }
-+        break;
 +        default:
-+            *(pRetcount) = 0;
++        {
++            *(seat_count) = 0;
 +            break;
++        }
 +    }
 +    return true;
 +}
@@ -2216,21 +2240,21 @@ diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
 +        return;
 +    }
 +
-+    *joystick_axis_event = (struct libinput_event_joystick_axis){
++    *joystick_axis_event = (struct libinput_event_joystick_axis) {
 +	    .base.type = LIBINPUT_EVENT_POINTER_AXIS,
 +	    .base.device = &device->base,
 +        .type = EV_ABS,
 +        .time = time,
 +        .axis_value_mask = joystick_dispatch->axis_value_mask,
-+	    .abs_throttle = joystick_dispatch->abs_throttle,
-+	    .abs_hat0x = joystick_dispatch->abs_hat0x,
-+	    .abs_hat0y = joystick_dispatch->abs_hat0y,
-+	    .abs_x = joystick_dispatch->abs_x,
-+		.abs_y = joystick_dispatch->abs_y,
-+		.abs_z = joystick_dispatch->abs_z,
-+		.abs_rx = joystick_dispatch->abs_rx,
-+		.abs_ry = joystick_dispatch->abs_ry,
-+		.abs_rz = joystick_dispatch->abs_rz,
++	    .abs_throttle = joystick_dispatch->axis_abs_infos.abs_throttle,
++	    .abs_hat0x = joystick_dispatch->axis_abs_infos.abs_hat0x,
++	    .abs_hat0y = joystick_dispatch->axis_abs_infos.abs_hat0y,
++	    .abs_x = joystick_dispatch->axis_abs_infos.abs_x,
++		.abs_y = joystick_dispatch->axis_abs_infos.abs_y,
++		.abs_z = joystick_dispatch->axis_abs_infos.abs_z,
++		.abs_rx = joystick_dispatch->axis_abs_infos.abs_rx,
++		.abs_ry = joystick_dispatch->axis_abs_infos.abs_ry,
++		.abs_rz = joystick_dispatch->axis_abs_infos.abs_rz,
 +    };
 +
 +    struct libinput_event_listener* listener = NULL;
@@ -2243,44 +2267,44 @@ diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
 +}
 +
 +static void
-+joystick_notify_key_event(struct evdev_device* device, struct input_event* pEvent, uint64_t time)
++joystick_notify_key_event(struct evdev_device* device, struct input_event* event, uint64_t time)
 +{
-+    if (device == NULL || pEvent == NULL) {
++    if (device == NULL || event == NULL) {
 +        return;
 +    }
 +
-+    struct libinput_event_joystick_button* pKeyEvent = {0};
-+    uint32_t uiSeatCount = 0;
++    struct libinput_event_joystick_button* button_event = {0};
++    uint32_t seat_count = 0;
 +
-+    int iRet = update_seat_joystick_button_count(device->base.seat, pEvent->code, &uiSeatCount, pEvent->value);
-+    if (iRet == false) {
++    int ret = update_seat_joystick_button_count(device->base.seat, event->code, &seat_count, event->value);
++    if (ret == 0) {
 +        return;
 +    }
 +
-+    pKeyEvent = zalloc(sizeof * pKeyEvent);
-+    if (pKeyEvent == NULL) {
++    button_event = zalloc(sizeof * button_event);
++    if (button_event == NULL) {
 +        return;
 +    }
 +
-+	*pKeyEvent = (struct libinput_event_joystick_button) {
-+			.base.type = LIBINPUT_EVENT_POINTER_BUTTON,
++	*button_event = (struct libinput_event_joystick_button) {
++			.base.type = LIBINPUT_EVENT_JOYSTICK_BUTTON,
 +			.base.device = &device->base,
 +            .time = time,
-+            .type = pEvent->type,
-+            .key = pEvent->code,
-+            .value = pEvent->value,
-+            .seat_key_count = uiSeatCount,
-+            .state = pEvent->value,
++            .type = event->type,
++            .key = event->code,
++            .value = event->value,
++            .seat_key_count = seat_count,
++            .state = event->value,
 +    };
 +
 +    struct libinput_event_listener* listener = NULL;
 +    struct libinput_event_listener* tmp_listener = NULL;
 +    list_for_each_safe(listener, tmp_listener, &device->base.event_listeners, link)
 +    {
-+        listener->notify_func(time, &pKeyEvent->base, listener->notify_func_data);
++        listener->notify_func(time, &button_event->base, listener->notify_func_data);
 +    }
 +
-+    libinput_post_handle_event(device->base.seat->libinput, &pKeyEvent->base);
++    libinput_post_handle_event(device->base.seat->libinput, &button_event->base);
 +}
 +
 +static float
@@ -2350,39 +2374,47 @@ diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
 +    switch (code) {
 +    case ABS_THROTTLE:
 +    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_THROTTLE);
-+    absinfo = &joystick_dispatch->abs_throttle;
++    absinfo = &joystick_dispatch->axis_abs_infos.abs_throttle;
 +    break;
 +    case ABS_HAT0X:
 +    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0X);
-+    absinfo = &joystick_dispatch->abs_hat0x;
++    absinfo = &joystick_dispatch->axis_abs_infos.abs_hat0x;
 +    break;
 +    case ABS_HAT0Y:
 +    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0Y);
-+    absinfo = &joystick_dispatch->abs_hat0y;
++    absinfo = &joystick_dispatch->axis_abs_infos.abs_hat0y;
 +    break;
 +    case ABS_X:
 +    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_X);
-+    absinfo = &joystick_dispatch->abs_x;
++    absinfo = &joystick_dispatch->axis_abs_infos.abs_x;
 +    break;
 +    case ABS_Y:
 +    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Y);
-+    absinfo = &joystick_dispatch->abs_y;
++    absinfo = &joystick_dispatch->axis_abs_infos.abs_y;
 +    break;
 +	case ABS_Z:
 +	joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Z);
-+	absinfo = &joystick_dispatch->abs_z;
++	absinfo = &joystick_dispatch->axis_abs_infos.abs_z;
 +    break;
 +	case ABS_RX:
 +	joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RX);
-+	absinfo = &joystick_dispatch->abs_rx;
++	absinfo = &joystick_dispatch->axis_abs_infos.abs_rx;
 +	break;
 +	case ABS_RY:
 +	joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RY);
-+	absinfo = &joystick_dispatch->abs_ry;
++	absinfo = &joystick_dispatch->axis_abs_infos.abs_ry;
 +	break;
 +    case ABS_RZ:
 +    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RZ);
-+    absinfo = &joystick_dispatch->abs_rz;
++    absinfo = &joystick_dispatch->axis_abs_infos.abs_rz;
++    break;
++    case ABS_GAS:
++    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_GAS);
++    absinfo = &joystick_dispatch->axis_abs_infos.abs_gas;
++    break;
++    case ABS_BRAKE:
++    joystick_set_axis_value_mask(joystick_dispatch, LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_BRAKE);
++    absinfo = &joystick_dispatch->axis_abs_infos.abs_brake;
 +    break;
 +    default:
 +    break;
@@ -2426,7 +2458,8 @@ diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
 +    }
 +
 +    if (joystick_dispatch->axis_value_mask != 0) {
-+        joystick_notify_axis(device, time);
++        joysticks_notify_axis(&device->base, time, joystick_dispatch->axis_value_mask, 
++            &joystick_dispatch->axis_abs_infos);
 +        joystick_reset_axis_value_mask(joystick_dispatch);
 +    }
 +}
@@ -2710,8 +2743,8 @@ diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
 +
 diff -Naur old/src/evdev-joystick.h new/src/evdev-joystick.h
 --- old/src/evdev-joystick.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/evdev-joystick.h	2021-01-01 00:00:00.000000000 +0800
-@@ -0,0 +1,77 @@
++++ new/src/evdev-joystick.h	2022-10-17 17:29:01.539160530 +0800
+@@ -0,0 +1,71 @@
 +/*
 + * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
 + * Licensed under the Apache License, Version 2.0 (the "License");
@@ -2736,15 +2769,7 @@ diff -Naur old/src/evdev-joystick.h new/src/evdev-joystick.h
 +	struct evdev_dispatch base;
 +	struct evdev_device* device;
 +	uint32_t axis_value_mask;
-+	struct libinput_event_joystick_axis_abs_info abs_throttle;
-+	struct libinput_event_joystick_axis_abs_info abs_hat0x;
-+	struct libinput_event_joystick_axis_abs_info abs_hat0y;
-+	struct libinput_event_joystick_axis_abs_info abs_x;
-+	struct libinput_event_joystick_axis_abs_info abs_y;
-+	struct libinput_event_joystick_axis_abs_info abs_z;
-+	struct libinput_event_joystick_axis_abs_info abs_rx;
-+	struct libinput_event_joystick_axis_abs_info abs_ry;
-+	struct libinput_event_joystick_axis_abs_info abs_rz;
++	struct joystick_axis_abs_infos axis_abs_infos;
 +	struct {
 +		struct libinput_device_config_send_events config;
 +		enum libinput_config_send_events_mode current_mode;
@@ -2757,7 +2782,7 @@ diff -Naur old/src/evdev-joystick.h new/src/evdev-joystick.h
 +	uint64_t time;
 +	uint32_t key;
 +	uint32_t seat_key_count;
-+	enum libinput_key_state state;
++	enum libinput_button_state state;
 +	int value;
 +};
 +
@@ -2775,6 +2800,8 @@ diff -Naur old/src/evdev-joystick.h new/src/evdev-joystick.h
 +	struct libinput_event_joystick_axis_abs_info abs_rx;
 +	struct libinput_event_joystick_axis_abs_info abs_ry;
 +	struct libinput_event_joystick_axis_abs_info abs_rz;
++	struct libinput_event_joystick_axis_abs_info abs_gas;
++	struct libinput_event_joystick_axis_abs_info abs_brake;
 +};
 +
 +#ifdef _DEBUG
@@ -2790,11 +2817,11 @@ diff -Naur old/src/evdev-joystick.h new/src/evdev-joystick.h
 +
 +#endif
 diff -Naur old/src/evdev-mt-touchpad-gestures.c new/src/evdev-mt-touchpad-gestures.c
---- old/src/evdev-mt-touchpad-gestures.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-mt-touchpad-gestures.c	2021-01-01 00:00:00.000000000 +0800
+--- old/src/evdev-mt-touchpad-gestures.c	2022-10-17 15:22:59.447710353 +0800
++++ new/src/evdev-mt-touchpad-gestures.c	2022-10-17 17:29:01.031154555 +0800
 @@ -80,6 +80,37 @@
  }
-
+ 
  static void
 +tp_get_raw_touches(struct tp_dispatch *tp, struct sloted_coords_info *raw_touches)
 +{
@@ -2838,18 +2865,18 @@ diff -Naur old/src/evdev-mt-touchpad-gestures.c new/src/evdev-mt-touchpad-gestur
 +				     &zero, &zero, NULL);
  		break;
  	}
-
+ 
 @@ -630,10 +661,12 @@
  tp_gesture_handle_state_swipe(struct tp_dispatch *tp, uint64_t time)
  {
  	struct device_float_coords raw;
 +	struct sloted_coords_info raw_touches = {};
  	struct normalized_coords delta, unaccel;
-
+ 
  	raw = tp_get_average_touches_delta(tp);
  	delta = tp_filter_motion(tp, &raw, time);
 +	tp_get_raw_touches(tp, &raw_touches);
-
+ 
  	if (!normalized_is_zero(delta) || !device_float_is_zero(raw)) {
  		unaccel = tp_normalize_delta(tp, raw);
 @@ -641,7 +674,7 @@
@@ -2859,11 +2886,11 @@ diff -Naur old/src/evdev-mt-touchpad-gestures.c new/src/evdev-mt-touchpad-gestur
 -				     &delta, &unaccel);
 +				     &delta, &unaccel, &raw_touches);
  	}
-
+ 
  	return GESTURE_STATE_SWIPE;
 diff -Naur old/src/evdev-mt-touchpad-tap.c new/src/evdev-mt-touchpad-tap.c
---- old/src/evdev-mt-touchpad-tap.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-mt-touchpad-tap.c	2021-01-01 00:00:00.000000000 +0800
+--- old/src/evdev-mt-touchpad-tap.c	2022-10-17 15:22:59.447710353 +0800
++++ new/src/evdev-mt-touchpad-tap.c	2022-10-17 17:29:00.891152908 +0800
 @@ -72,6 +72,7 @@
  	CASE_RETURN_STRING(TAP_STATE_DRAGGING_OR_TAP);
  	CASE_RETURN_STRING(TAP_STATE_DRAGGING_2);
@@ -2873,9 +2900,9 @@ diff -Naur old/src/evdev-mt-touchpad-tap.c new/src/evdev-mt-touchpad-tap.c
  	return NULL;
  }
 @@ -122,6 +123,10 @@
-
+ 
  	button = button_map[tp->tap.map][nfingers - 1];
-
+ 
 +	if (tp->device->key_count[button] == 0 &&
 +		state == LIBINPUT_BUTTON_STATE_RELEASED)
 +		return;
@@ -2954,7 +2981,7 @@ diff -Naur old/src/evdev-mt-touchpad-tap.c new/src/evdev-mt-touchpad-tap.c
 +			      LIBINPUT_BUTTON_STATE_RELEASED);
 +    }
  }
-
+ 
  static void
 @@ -796,6 +851,9 @@
  	case TAP_STATE_DEAD:
@@ -2964,7 +2991,7 @@ diff -Naur old/src/evdev-mt-touchpad-tap.c new/src/evdev-mt-touchpad-tap.c
 +		tp_tap_holding_handle_event(tp, t, event, time);
 +		break;
  	}
-
+ 
  	if (tp->tap.state == TAP_STATE_IDLE || tp->tap.state == TAP_STATE_DEAD)
 @@ -1295,3 +1353,63 @@
  		return false;
@@ -3032,11 +3059,11 @@ diff -Naur old/src/evdev-mt-touchpad-tap.c new/src/evdev-mt-touchpad-tap.c
 +}
 \ No newline at end of file
 diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
---- old/src/evdev-mt-touchpad.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-mt-touchpad.c	2021-01-01 00:00:00.000000000 +0800
+--- old/src/evdev-mt-touchpad.c	2022-10-17 15:22:59.447710353 +0800
++++ new/src/evdev-mt-touchpad.c	2022-10-17 17:29:00.623149756 +0800
 @@ -308,6 +308,35 @@
  }
-
+ 
  static inline void
 +tp_tool_key_set(struct tp_dispatch *tp,
 +		   unsigned int code,
@@ -3077,11 +3104,11 @@ diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
 +	t->seat_slot = -1;
  	tp->queued |= TOUCHPAD_EVENT_MOTION;
  }
-
+ 
 @@ -496,6 +526,81 @@
  	return absinfo->maximum - (value - absinfo->minimum);
  }
-
+ 
 +void tp_ext_post_event(struct tp_dispatch* dispatch, bool is_up, uint64_t time)
 +{
 +	struct tp_touch * t = tp_current_touch(dispatch);
@@ -3161,7 +3188,7 @@ diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
  tp_process_absolute(struct tp_dispatch *tp,
  		    const struct input_event *e,
 @@ -505,6 +610,7 @@
-
+ 
  	switch(e->code) {
  	case ABS_MT_POSITION_X:
 +		tp_ext_on_xy_update(tp);
@@ -3228,7 +3255,7 @@ diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
 +		break;
  	}
  }
-
+ 
 @@ -772,6 +903,20 @@
  			tp_process_trackpoint_button(tp, e, time);
  			break;
@@ -3248,7 +3275,7 @@ diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
 +			break;
 +	}
  }
-
+ 
  static void
 @@ -1951,6 +2096,7 @@
  		tp_process_msc(tp, e, time);
@@ -3265,23 +3292,23 @@ diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
 +	t->seat_slot = -1;
 +	t->tool_type = -1;
  }
-
+ 
  static inline void
 @@ -3660,6 +3808,10 @@
  	if (tp->gesture.enabled)
  		device->seat_caps |= EVDEV_DEVICE_GESTURE;
-
+ 
 +	tp->orginal.seat_slot_id = 0;
 +	tp->orginal.active_slot_count = 0;
 +	tp->orginal.xy_updated = 0;
 +
  	return true;
  }
-
+ 
 @@ -3843,6 +3995,14 @@
-
+ 
  	tp = zalloc(sizeof *tp);
-
+ 
 +	const struct input_absinfo* absInfo = device->is_mt ? libevdev_get_abs_info(device->evdev, ABS_MT_PRESSURE)
 +		: libevdev_get_abs_info(device->evdev, ABS_PRESSURE);
 +	if (absInfo == NULL) {
@@ -3294,7 +3321,7 @@ diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
  		tp_interface_destroy(&tp->base);
  		return NULL;
 @@ -3860,3 +4020,27 @@
-
+ 
  	return &tp->base;
  }
 +
@@ -3323,25 +3350,25 @@ diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
 +}
 \ No newline at end of file
 diff -Naur old/src/evdev-mt-touchpad.h new/src/evdev-mt-touchpad.h
---- old/src/evdev-mt-touchpad.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-mt-touchpad.h	2021-01-01 00:00:00.000000000 +0800
+--- old/src/evdev-mt-touchpad.h	2022-10-17 15:22:59.447710353 +0800
++++ new/src/evdev-mt-touchpad.h	2022-10-17 17:29:00.431147499 +0800
 @@ -118,6 +118,7 @@
  	TAP_STATE_DRAGGING_WAIT,
  	TAP_STATE_DRAGGING_2,
  	TAP_STATE_DEAD, /**< finger count exceeded */
 +	TAP_STATE_HOLDING,
  };
-
+ 
  enum tp_tap_touch_state {
 @@ -176,10 +177,14 @@
  	int pressure;
  	bool is_tool_palm; /* MT_TOOL_PALM */
  	int major, minor;
 +    struct device_coord_rect tool_rect;
-
+ 
  	bool was_down; /* if distance == 0, false for pure hovering
  			  touches */
-
+ 
 +	int seat_slot;
 +	int tool_type;
 +
@@ -3351,7 +3378,7 @@ diff -Naur old/src/evdev-mt-touchpad.h new/src/evdev-mt-touchpad.h
 @@ -294,6 +299,17 @@
  	 */
  	unsigned int fake_touches;
-
+ 
 +	/* bit 0: BTN_TOOL_PEN
 +	 * bit 1: BTN_TOOL_RUBBER
 +	 * bit 2: BTN_TOOL_BRUSH
@@ -3377,12 +3404,12 @@ diff -Naur old/src/evdev-mt-touchpad.h new/src/evdev-mt-touchpad.h
 +		int xy_updated;
 +	} orginal;
  };
-
+ 
  static inline struct tp_dispatch*
 @@ -730,4 +752,19 @@
  void
  tp_init_thumb(struct tp_dispatch *tp);
-
+ 
 +void
 +tp_tap_original_down(struct tp_dispatch *tp,
 +		    struct tp_touch *t,
@@ -3400,8 +3427,8 @@ diff -Naur old/src/evdev-mt-touchpad.h new/src/evdev-mt-touchpad.h
 +
  #endif
 diff -Naur old/src/evdev-tablet.c new/src/evdev-tablet.c
---- old/src/evdev-tablet.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-tablet.c	2021-01-01 00:00:00.000000000 +0800
+--- old/src/evdev-tablet.c	2022-10-17 15:22:59.447710353 +0800
++++ new/src/evdev-tablet.c	2022-10-17 17:28:59.923141525 +0800
 @@ -219,6 +219,7 @@
  	case ABS_TILT_Y:
  	case ABS_DISTANCE:
@@ -3424,12 +3451,12 @@ diff -Naur old/src/evdev-tablet.c new/src/evdev-tablet.c
  			.refcount = 1,
 +			.mt_tool_type = tablet->current_value[LIBINPUT_TABLET_TOOL_AXIS_TYPE],
  		};
-
+ 
  		tool_set_pressure_thresholds(tablet, tool);
 @@ -2368,6 +2369,34 @@
  	return true;
  }
-
+ 
 +static void
 +tablet_reset_abs_resolution(struct evdev_device *device)
 +{
@@ -3466,12 +3493,12 @@ diff -Naur old/src/evdev-tablet.c new/src/evdev-tablet.c
  	tablet->current_tool.type = LIBINPUT_TOOL_NONE;
  	list_init(&tablet->tool_list);
 +    tablet_reset_abs_resolution(device);
-
+ 
  	if (tablet_reject_device(device))
  		return -1;
 diff -Naur old/src/evdev-tablet.h new/src/evdev-tablet.h
---- old/src/evdev-tablet.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-tablet.h	2021-01-01 00:00:00.000000000 +0800
+--- old/src/evdev-tablet.h	2022-10-17 15:22:59.447710353 +0800
++++ new/src/evdev-tablet.h	2022-10-17 17:28:59.739139361 +0800
 @@ -151,6 +151,9 @@
  	case ABS_WHEEL:
  		axis = LIBINPUT_TABLET_TOOL_AXIS_SLIDER;
@@ -3493,12 +3520,12 @@ diff -Naur old/src/evdev-tablet.h new/src/evdev-tablet.h
  		evcode = ABS_MT_TOUCH_MINOR;
  		break;
 diff -Naur old/src/evdev.c new/src/evdev.c
---- old/src/evdev.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev.c	2021-01-01 00:00:00.000000000 +0800
+--- old/src/evdev.c	2022-10-17 15:22:59.451710400 +0800
++++ new/src/evdev.c	2022-10-17 17:28:59.503136585 +0800
 @@ -54,25 +54,7 @@
  #define DEFAULT_BUTTON_SCROLL_TIMEOUT ms2us(200)
  #define MAX_RETRY_OPEN_DEVICE_COUNT 10
-
+ 
 -enum evdev_device_udev_tags {
 -        EVDEV_UDEV_TAG_INPUT		= bit(0),
 -        EVDEV_UDEV_TAG_KEYBOARD		= bit(1),
@@ -3513,17 +3540,17 @@ diff -Naur old/src/evdev.c new/src/evdev.c
 -        EVDEV_UDEV_TAG_TRACKBALL	= bit(10),
 -        EVDEV_UDEV_TAG_SWITCH		= bit(11),
 -};
-
+ 
 -struct evdev_udev_tag_match {
 -	const char *name;
 -	enum evdev_device_udev_tags tag;
 -};
-
+ 
  static const struct evdev_udev_tag_match evdev_udev_tag_matches[] = {
  	{"ID_INPUT",			EVDEV_UDEV_TAG_INPUT},
 @@ -341,6 +323,17 @@
  }
-
+ 
  void
 +evdev_transform_absolute_rect(struct evdev_device *device,
 +			 struct device_coord_rect *rect)
@@ -3552,7 +3579,7 @@ diff -Naur old/src/evdev.c new/src/evdev.c
 @@ -1771,6 +1767,9 @@
  	libevdev_disable_event_code(evdev, EV_ABS, REL_Z);
  }
-
+ 
 +static enum evdev_device_udev_tags
 +update_device_capability(struct evdev_device *device);
 +
@@ -3561,10 +3588,10 @@ diff -Naur old/src/evdev.c new/src/evdev.c
  {
 @@ -1780,11 +1779,17 @@
  	struct evdev_dispatch *dispatch;
-
+ 
  	udev_tags = evdev_device_get_udev_tags(device, device->udev_device);
 +    libinput_log_printf("----evdev_configure_device  tagged as supported input device---- %d \r\n", udev_tags);
-
+ 
  	if ((udev_tags & EVDEV_UDEV_TAG_INPUT) == 0 ||
  	    (udev_tags & ~EVDEV_UDEV_TAG_INPUT) == 0) {
 +		udev_tags = update_device_capability(device);
@@ -3576,11 +3603,11 @@ diff -Naur old/src/evdev.c new/src/evdev.c
 +        libinput_log_printf("----evdev_configure_device not tagged as supported input device---- \r\n");
  		return NULL;
  	}
-
+ 
 @@ -1812,12 +1817,6 @@
  		evdev_disable_accelerometer_axes(device);
  	}
-
+ 
 -	if (udev_tags == (EVDEV_UDEV_TAG_INPUT|EVDEV_UDEV_TAG_JOYSTICK)) {
 -		evdev_log_info(device,
 -			       "device is a joystick, ignoring\n");
@@ -3593,7 +3620,7 @@ diff -Naur old/src/evdev.c new/src/evdev.c
 @@ -1833,8 +1832,16 @@
  			udev_tags &= ~EVDEV_UDEV_TAG_TOUCHSCREEN;
  	}
-
+ 
 +    if (udev_tags & EVDEV_UDEV_TAG_JOYSTICK) {
 +        libinput_log_printf("----evdev_configure_device--_LIBINPUT_JOYSTICK_BULID-- \r\n");
 +        dispatch = evdev_joystick_create(device);
@@ -3608,7 +3635,7 @@ diff -Naur old/src/evdev.c new/src/evdev.c
  		device->seat_caps |= EVDEV_DEVICE_TABLET;
  		evdev_log_info(device, "device is a totem\n");
 @@ -1850,12 +1857,14 @@
-
+ 
  	/* libwacom assigns tablet _and_ tablet_pad to the pad devices */
  	if (udev_tags & EVDEV_UDEV_TAG_TABLET_PAD) {
 +        libinput_log_printf("----evdev_configure_device--_LIBINPUT_TABLET_PAD_BULID-- \r\n");
@@ -3616,7 +3643,7 @@ diff -Naur old/src/evdev.c new/src/evdev.c
  		device->seat_caps |= EVDEV_DEVICE_TABLET_PAD;
  		evdev_log_info(device, "device is a tablet pad\n");
  		return dispatch;
-
+ 
  	} else if ((udev_tags & tablet_tags) == EVDEV_UDEV_TAG_TABLET) {
 +        libinput_log_printf("----evdev_configure_device--_LIBINPUT_TABLET_BULID-- \r\n");
  		dispatch = evdev_tablet_create(device);
@@ -3624,7 +3651,7 @@ diff -Naur old/src/evdev.c new/src/evdev.c
  		evdev_log_info(device, "device is a tablet\n");
 @@ -1863,6 +1872,7 @@
  	}
-
+ 
  	if (udev_tags & EVDEV_UDEV_TAG_TOUCHPAD) {
 +        libinput_log_printf("----evdev_configure_device--_LIBINPUT_TOUCHPAD_BULID-- \r\n");
  		if (udev_tags & EVDEV_UDEV_TAG_TABLET)
@@ -3632,7 +3659,7 @@ diff -Naur old/src/evdev.c new/src/evdev.c
  		/* whether velocity should be averaged, false by default */
 @@ -2292,6 +2302,18 @@
  }
-
+ 
  unsigned int
 +evdev_device_get_id_bustype(struct evdev_device *device)
 +{
@@ -3652,7 +3679,7 @@ diff -Naur old/src/evdev.c new/src/evdev.c
 @@ -2309,6 +2331,33 @@
  	return udev_device_ref(device->udev_device);
  }
-
+ 
 +enum evdev_device_udev_tags
 +	evdev_device_get_udev_device_tags(struct evdev_device* device)
 +{
@@ -3740,20 +3767,20 @@ diff -Naur old/src/evdev.c new/src/evdev.c
 +    return 0;
 +}
 diff -Naur old/src/evdev.h new/src/evdev.h
---- old/src/evdev.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev.h	2021-01-01 00:00:00.000000000 +0800
+--- old/src/evdev.h	2022-10-17 15:22:59.451710400 +0800
++++ new/src/evdev.h	2022-10-17 17:28:59.319134421 +0800
 @@ -61,6 +61,7 @@
  	EVDEV_DEVICE_TABLET_PAD		= bit(4),
  	EVDEV_DEVICE_GESTURE		= bit(5),
  	EVDEV_DEVICE_SWITCH		= bit(6),
 +	EVDEV_DEVICE_JOYSTICK = bit(7),
  };
-
+ 
  enum evdev_device_tags {
 @@ -76,6 +77,11 @@
  	EVDEV_TAG_TABLET_TOUCHPAD	= bit(9),
  };
-
+ 
 +struct evdev_udev_tag_match {
 +    const char* name;
 +    enum evdev_device_udev_tags tag;
@@ -3776,11 +3803,11 @@ diff -Naur old/src/evdev.h new/src/evdev.h
  	DISPATCH_TOTEM,
 +	DISPATCH_JOYSTICK,
  };
-
+ 
  struct evdev_dispatch {
 @@ -406,6 +414,10 @@
  			 struct device_coords *point);
-
+ 
  void
 +evdev_transform_absolute_rect(struct evdev_device *device,
 +			 struct device_coord_rect *rect);
@@ -3788,30 +3815,30 @@ diff -Naur old/src/evdev.h new/src/evdev.h
 +void
  evdev_transform_relative(struct evdev_device *device,
  			 struct device_coords *point);
-
+ 
 @@ -430,12 +442,19 @@
  evdev_device_init_pointer_acceleration(struct evdev_device *device,
  				       struct motion_filter *filter);
-
+ 
 +struct evdev_dispatch*
 +evdev_joystick_create(struct evdev_device* device);
 +
 +
  struct evdev_dispatch *
  evdev_touchpad_create(struct evdev_device *device);
-
+ 
  struct evdev_dispatch *
  evdev_mt_touchpad_create(struct evdev_device *device);
-
+ 
 +bool
 +evdev_device_touchpad_btn_tool_type_down(struct evdev_device *device, int32_t btnToolType);
 +
  struct evdev_dispatch *
  evdev_tablet_create(struct evdev_device *device);
-
+ 
 @@ -473,6 +492,12 @@
  evdev_device_get_name(struct evdev_device *device);
-
+ 
  unsigned int
 +evdev_device_get_id_bustype(struct evdev_device *device);
 +
@@ -3820,12 +3847,12 @@ diff -Naur old/src/evdev.h new/src/evdev.h
 +
 +unsigned int
  evdev_device_get_id_product(struct evdev_device *device);
-
+ 
  unsigned int
 @@ -481,6 +506,19 @@
  struct udev_device *
  evdev_device_get_udev_device(struct evdev_device *device);
-
+ 
 +/**  @brief   获取设备类型 */
 +enum evdev_device_udev_tags
 +evdev_device_get_udev_device_tags(struct evdev_device* device);
@@ -3845,7 +3872,7 @@ diff -Naur old/src/evdev.h new/src/evdev.h
 @@ -506,6 +544,9 @@
  int
  evdev_device_get_touch_count(struct evdev_device *device);
-
+ 
 +bool
 +evdev_device_touch_btn_tool_type_down(struct evdev_device *device, int32_t btnToolType);
 +
@@ -3863,7 +3890,7 @@ diff -Naur old/src/evdev.h new/src/evdev.h
  	return value/absinfo->resolution;
  }
 @@ -764,12 +808,15 @@
-
+ 
  	if (!is_logged(evdev_libinput_context(device), priority))
  		return;
 -
@@ -3889,21 +3916,21 @@ diff -Naur old/src/evdev.h new/src/evdev.h
 +				//HTTP_DOC_LINK);
  	}
  }
-
+ 
 diff -Naur old/src/libinput-git-version.h new/src/libinput-git-version.h
 --- old/src/libinput-git-version.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-git-version.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/libinput-git-version.h	2022-10-17 17:28:57.835116969 +0800
 @@ -0,0 +1,3 @@
 +#pragma once
 +
 +#define LIBINPUT_GIT_VERSION "@VCS_TAG@"
 diff -Naur old/src/libinput-private.h new/src/libinput-private.h
---- old/src/libinput-private.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/libinput-private.h	2021-01-01 00:00:00.000000000 +0800
+--- old/src/libinput-private.h	2022-10-17 15:22:59.451710400 +0800
++++ new/src/libinput-private.h	2022-10-17 17:28:57.583114005 +0800
 @@ -48,6 +48,12 @@
  	int x, y;
  };
-
+ 
 +/* Size of touch point region (major and minor axes of ellipse) */
 +struct touch_axis {
 +    int32_t major;
@@ -3921,7 +3948,7 @@ diff -Naur old/src/libinput-private.h new/src/libinput-private.h
 +	LIBINPUT_TABLET_TOOL_AXIS_TYPE = 11,
 +	LIBINPUT_TABLET_TOOL_AXIS_SIZE_MINOR = 12,
  };
-
+ 
  #define LIBINPUT_TABLET_TOOL_AXIS_MAX LIBINPUT_TABLET_TOOL_AXIS_SIZE_MINOR
 @@ -383,6 +390,7 @@
  	/* pressure_offset includes axis->minimum */
@@ -3929,9 +3956,30 @@ diff -Naur old/src/libinput-private.h new/src/libinput-private.h
  	bool has_pressure_offset;
 +	int32_t mt_tool_type;
  };
-
+ 
  struct libinput_tablet_pad_mode_group {
-@@ -569,20 +577,29 @@
+@@ -415,6 +423,20 @@
+ 	void *notify_func_data;
+ };
+ 
++struct joystick_axis_abs_infos {
++	struct libinput_event_joystick_axis_abs_info abs_throttle;
++	struct libinput_event_joystick_axis_abs_info abs_hat0x;
++	struct libinput_event_joystick_axis_abs_info abs_hat0y;
++	struct libinput_event_joystick_axis_abs_info abs_x;
++	struct libinput_event_joystick_axis_abs_info abs_y;
++	struct libinput_event_joystick_axis_abs_info abs_z;
++	struct libinput_event_joystick_axis_abs_info abs_rx;
++	struct libinput_event_joystick_axis_abs_info abs_ry;
++	struct libinput_event_joystick_axis_abs_info abs_rz;
++	struct libinput_event_joystick_axis_abs_info abs_gas;
++	struct libinput_event_joystick_axis_abs_info abs_brake;
++};
++
+ typedef void (*libinput_source_dispatch_t)(void *data);
+ 
+ #define log_debug(li_, ...) log_msg((li_), LIBINPUT_LOG_PRIORITY_DEBUG, __VA_ARGS__)
+@@ -569,20 +591,29 @@
  			uint64_t time,
  			int32_t slot,
  			int32_t seat_slot,
@@ -3941,7 +3989,7 @@ diff -Naur old/src/libinput-private.h new/src/libinput-private.h
 +			const struct device_coords *point,
 +			int32_t tool_type,
 +			const struct device_coord_rect *tool_rect);
-
+ 
  void
  touch_notify_touch_motion(struct libinput_device *device,
  			  uint64_t time,
@@ -3953,7 +4001,7 @@ diff -Naur old/src/libinput-private.h new/src/libinput-private.h
 +			  const struct device_coords *point,
 +			  int32_t tool_type,
 +			  const struct device_coord_rect *tool_rect);
-
+ 
  void
  touch_notify_touch_up(struct libinput_device *device,
  		      uint64_t time,
@@ -3961,12 +4009,12 @@ diff -Naur old/src/libinput-private.h new/src/libinput-private.h
 -		      int32_t seat_slot);
 +		      int32_t seat_slot,
 +		      int32_t tool_type);
-
+ 
  void
  touch_notify_touch_cancel(struct libinput_device *device,
-@@ -595,12 +612,43 @@
+@@ -595,12 +626,43 @@
  		   uint64_t time);
-
+ 
  void
 +touchpad_notify_touch_down(struct libinput_device *device,
 +			uint64_t time,
@@ -4006,12 +4054,25 @@ diff -Naur old/src/libinput-private.h new/src/libinput-private.h
 -		     const struct normalized_coords *unaccel);
 +		     const struct normalized_coords *unaccel,
 +		     const struct sloted_coords_info *raw_touches);
-
+ 
  void
  gesture_notify_swipe_end(struct libinput_device *device,
+@@ -689,6 +751,12 @@
+ 		     enum libinput_switch sw,
+ 		     enum libinput_switch_state state);
+ 
++void
++joysticks_notify_axis(struct libinput_device *device,
++			uint64_t time,
++			uint32_t axes,
++			const struct joystick_axis_abs_infos *axis_abs);
++
+ static inline uint64_t
+ libinput_now(struct libinput *libinput)
+ {
 diff -Naur old/src/libinput-util.c new/src/libinput-util.c
 --- old/src/libinput-util.c	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-util.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/libinput-util.c	2022-10-17 17:28:57.207109584 +0800
 @@ -0,0 +1,102 @@
 +/*
 + * Copyright © 2008-2011 Kristian Høgsberg
@@ -4116,12 +4177,12 @@ diff -Naur old/src/libinput-util.c new/src/libinput-util.c
 +}
 +#endif
 diff -Naur old/src/libinput-util.h new/src/libinput-util.h
---- old/src/libinput-util.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/libinput-util.h	2021-01-01 00:00:00.000000000 +0800
+--- old/src/libinput-util.h	2022-10-17 15:22:59.451710400 +0800
++++ new/src/libinput-util.h	2022-10-17 17:28:57.075108031 +0800
 @@ -27,10 +27,9 @@
-
+ 
  #include "config.h"
-
+ 
 -#ifdef NDEBUG
 -#warning "libinput relies on assert(). #defining NDEBUG is not recommended"
 -#endif
@@ -4129,13 +4190,13 @@ diff -Naur old/src/libinput-util.h new/src/libinput-util.h
 +//#ifdef NDEBUG
 +//#warning "libinput relies on assert(). #defining NDEBUG is not recommended"
 +//#endif
-
+ 
  #include "libinput.h"
-
+ 
 @@ -57,6 +56,15 @@
  #define DEFAULT_MOUSE_DPI 1000
  #define DEFAULT_TRACKPOINT_SENSITIVITY 128
-
+ 
 +
 +#ifdef HAVE_LIBINPUT_LOG_ENABLE
 +void libinput_log_printf(const char* fmt, ...);
@@ -4150,7 +4211,7 @@ diff -Naur old/src/libinput-util.h new/src/libinput-util.h
  	printf("%s() - \033[0;31m", __func__); \
 diff -Naur old/src/libinput-version.h new/src/libinput-version.h
 --- old/src/libinput-version.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-version.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/libinput-version.h	2022-10-17 17:28:56.935106384 +0800
 @@ -0,0 +1,32 @@
 +/*
 + * Copyright © 2013 Jonas Ådahl
@@ -4185,17 +4246,25 @@ diff -Naur old/src/libinput-version.h new/src/libinput-version.h
 +
 +#endif
 diff -Naur old/src/libinput.c new/src/libinput.c
---- old/src/libinput.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/libinput.c	2021-01-01 00:00:00.000000000 +0800
+--- old/src/libinput.c	2022-10-17 15:22:59.451710400 +0800
++++ new/src/libinput.c	2022-10-17 17:28:56.547101822 +0800
 @@ -39,6 +39,7 @@
  #include "evdev.h"
  #include "timer.h"
  #include "quirks.h"
 +#include "evdev-joystick.h"
-
+ 
  #define require_event_type(li_, type_, retval_, ...)	\
  	if (type_ == LIBINPUT_EVENT_NONE) abort(); \
-@@ -123,6 +124,9 @@
+@@ -117,12 +118,17 @@
+ 	CASE_RETURN_STRING(LIBINPUT_EVENT_POINTER_MOTION);
+ 	CASE_RETURN_STRING(LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE);
+ 	CASE_RETURN_STRING(LIBINPUT_EVENT_POINTER_BUTTON);
++	CASE_RETURN_STRING(LIBINPUT_EVENT_JOYSTICK_AXIS);
++	CASE_RETURN_STRING(LIBINPUT_EVENT_JOYSTICK_BUTTON);
+ 	CASE_RETURN_STRING(LIBINPUT_EVENT_POINTER_AXIS);
+ 	CASE_RETURN_STRING(LIBINPUT_EVENT_TOUCH_DOWN);
+ 	CASE_RETURN_STRING(LIBINPUT_EVENT_TOUCH_UP);
  	CASE_RETURN_STRING(LIBINPUT_EVENT_TOUCH_MOTION);
  	CASE_RETURN_STRING(LIBINPUT_EVENT_TOUCH_CANCEL);
  	CASE_RETURN_STRING(LIBINPUT_EVENT_TOUCH_FRAME);
@@ -4205,7 +4274,7 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  	CASE_RETURN_STRING(LIBINPUT_EVENT_TABLET_TOOL_AXIS);
  	CASE_RETURN_STRING(LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY);
  	CASE_RETURN_STRING(LIBINPUT_EVENT_TABLET_TOOL_TIP);
-@@ -184,6 +188,10 @@
+@@ -184,6 +190,10 @@
  	int32_t slot;
  	int32_t seat_slot;
  	struct device_coords point;
@@ -4214,9 +4283,9 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +	struct touch_axis axis;
 +	int32_t tool_type;
  };
-
+ 
  struct libinput_event_gesture {
-@@ -193,6 +201,7 @@
+@@ -193,6 +203,7 @@
  	int cancelled;
  	struct normalized_coords delta;
  	struct normalized_coords delta_unaccel;
@@ -4224,18 +4293,18 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  	double scale;
  	double angle;
  };
-@@ -208,6 +217,7 @@
+@@ -208,6 +219,7 @@
  	struct libinput_tablet_tool *tool;
  	enum libinput_tablet_tool_proximity_state proximity_state;
  	enum libinput_tablet_tool_tip_state tip_state;
 +	int32_t mt_tool_type;
  };
-
+ 
  struct libinput_event_tablet_pad {
-@@ -392,6 +402,18 @@
+@@ -392,6 +404,18 @@
  	return (struct libinput_event_touch *) event;
  }
-
+ 
 +LIBINPUT_EXPORT struct libinput_event_touch *
 +libinput_event_get_touchpad_event(struct libinput_event *event)
 +{
@@ -4251,10 +4320,10 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  LIBINPUT_EXPORT struct libinput_event_gesture *
  libinput_event_get_gesture_event(struct libinput_event *event)
  {
-@@ -459,6 +481,19 @@
+@@ -459,6 +483,19 @@
  	return (struct libinput_event_switch *) event;
  }
-
+ 
 +LIBINPUT_EXPORT int32_t
 +libinput_event_tablet_tool_get_tool_type(struct libinput_event_tablet_tool *event)
 +{
@@ -4271,9 +4340,9 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  LIBINPUT_EXPORT uint32_t
  libinput_event_keyboard_get_time(struct libinput_event_keyboard *event)
  {
-@@ -851,6 +886,20 @@
+@@ -851,6 +888,20 @@
  }
-
+ 
  LIBINPUT_EXPORT double
 +libinput_event_touch_get_y(struct libinput_event_touch *event)
 +{
@@ -4292,19 +4361,21 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  libinput_event_touch_get_y_transformed(struct libinput_event_touch *event,
  				       uint32_t height)
  {
-@@ -866,7 +915,7 @@
+@@ -866,7 +917,109 @@
  }
-
+ 
  LIBINPUT_EXPORT double
 -libinput_event_touch_get_y(struct libinput_event_touch *event)
 +libinput_event_touch_get_tool_x(struct libinput_event_touch *event)
- {
- 	struct evdev_device *device = evdev_device(event->base.device);
-
-@@ -876,9 +925,358 @@
- 			   LIBINPUT_EVENT_TOUCH_DOWN,
- 			   LIBINPUT_EVENT_TOUCH_MOTION);
-
++{
++	struct evdev_device *device = evdev_device(event->base.device);
++
++	require_event_type(libinput_event_get_context(&event->base),
++			   event->base.type,
++			   0,
++			   LIBINPUT_EVENT_TOUCH_DOWN,
++			   LIBINPUT_EVENT_TOUCH_MOTION);
++
 +	return evdev_convert_to_mm(device->abs.absinfo_x, event->tool_rect.x);
 +}
 +
@@ -4398,15 +4469,13 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +LIBINPUT_EXPORT double
 +libinput_event_touch_get_tool_height_transformed(struct libinput_event_touch *event,
 +				       uint32_t height)
-+{
-+	struct evdev_device *device = evdev_device(event->base.device);
-+
-+	require_event_type(libinput_event_get_context(&event->base),
-+			   event->base.type,
-+			   0,
-+			   LIBINPUT_EVENT_TOUCH_DOWN,
-+			   LIBINPUT_EVENT_TOUCH_MOTION);
-+
+ {
+ 	struct evdev_device *device = evdev_device(event->base.device);
+ 
+@@ -876,9 +1029,256 @@
+ 			   LIBINPUT_EVENT_TOUCH_DOWN,
+ 			   LIBINPUT_EVENT_TOUCH_MOTION);
+ 
 +	return evdev_device_transform_y(device, event->tool_rect.h, height);
 +}
 +
@@ -4489,7 +4558,7 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +
  	return evdev_convert_to_mm(device->abs.absinfo_y, event->point.y);
  }
-
+ 
 +LIBINPUT_EXPORT double
 +libinput_event_touchpad_get_tool_x(struct libinput_event_touch *event)
 +{
@@ -4660,10 +4729,10 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  LIBINPUT_EXPORT uint32_t
  libinput_event_gesture_get_time(struct libinput_event_gesture *event)
  {
-@@ -1031,6 +1429,18 @@
+@@ -1031,6 +1431,18 @@
  	return event->angle;
  }
-
+ 
 +LIBINPUT_EXPORT struct sloted_coords_info *
 +libinput_event_gesture_get_solt_touches(
 +	struct libinput_event_gesture *event)
@@ -4679,9 +4748,9 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  LIBINPUT_EXPORT int
  libinput_event_tablet_tool_x_has_changed(
  				struct libinput_event_tablet_tool *event)
-@@ -1048,6 +1458,24 @@
+@@ -1048,6 +1460,24 @@
  }
-
+ 
  LIBINPUT_EXPORT int
 +libinput_has_event_led_type(struct libinput_device *device)
 +{
@@ -4704,10 +4773,10 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  libinput_event_tablet_tool_y_has_changed(
  				struct libinput_event_tablet_tool *event)
  {
-@@ -1806,11 +2234,8 @@
+@@ -1806,11 +2236,8 @@
  	/* If we fail, we'll fail next time too */
  	libinput->quirks_initialized = true;
-
+ 
 -	data_path = getenv("LIBINPUT_QUIRKS_DIR");
 -	if (!data_path) {
 -		data_path = LIBINPUT_QUIRKS_DIR;
@@ -4715,10 +4784,10 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 -	}
 +		data_path = (char *)LIBINPUT_QUIRKS_DIR;
 +		override_file = (char *)LIBINPUT_QUIRKS_OVERRIDE_FILE;
-
+ 
  	quirks = quirks_init_subsystem(data_path,
  				       override_file,
-@@ -2311,6 +2736,9 @@
+@@ -2311,6 +2738,9 @@
  	case LIBINPUT_DEVICE_CAP_SWITCH:
  		capability = "CAP_SWITCH";
  		break;
@@ -4726,9 +4795,9 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +        capability = "CAP_JOYSTICK";
 +        break;
  	}
-
+ 
  	log_bug_libinput(device->seat->libinput,
-@@ -2458,7 +2886,11 @@
+@@ -2458,7 +2888,11 @@
  			uint64_t time,
  			int32_t slot,
  			int32_t seat_slot,
@@ -4740,8 +4809,8 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +			const struct device_coord_rect *tool_rect)
  {
  	struct libinput_event_touch *touch_event;
-
-@@ -2472,6 +2904,10 @@
+ 
+@@ -2472,6 +2906,10 @@
  		.slot = slot,
  		.seat_slot = seat_slot,
  		.point = *point,
@@ -4750,9 +4819,9 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +		.axis = *axis,
 +		.tool_type = tool_type,
  	};
-
+ 
  	post_device_event(device, time,
-@@ -2484,7 +2920,11 @@
+@@ -2484,7 +2922,11 @@
  			  uint64_t time,
  			  int32_t slot,
  			  int32_t seat_slot,
@@ -4764,8 +4833,8 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +			  const struct device_coord_rect *tool_rect)
  {
  	struct libinput_event_touch *touch_event;
-
-@@ -2498,6 +2938,10 @@
+ 
+@@ -2498,6 +2940,10 @@
  		.slot = slot,
  		.seat_slot = seat_slot,
  		.point = *point,
@@ -4774,9 +4843,9 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +		.axis = *axis,
 +		.tool_type = tool_type,
  	};
-
+ 
  	post_device_event(device, time,
-@@ -2509,7 +2953,8 @@
+@@ -2509,7 +2955,8 @@
  touch_notify_touch_up(struct libinput_device *device,
  		      uint64_t time,
  		      int32_t slot,
@@ -4785,18 +4854,18 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +		      int32_t tool_type)
  {
  	struct libinput_event_touch *touch_event;
-
-@@ -2522,6 +2967,7 @@
+ 
+@@ -2522,6 +2969,7 @@
  		.time = time,
  		.slot = slot,
  		.seat_slot = seat_slot,
 +		.tool_type = tool_type,
  	};
-
+ 
  	post_device_event(device, time,
-@@ -2574,6 +3020,90 @@
+@@ -2574,6 +3022,90 @@
  }
-
+ 
  void
 +touchpad_notify_touch_down(struct libinput_device *device,
 +			uint64_t time,
@@ -4885,15 +4954,15 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  tablet_notify_axis(struct libinput_device *device,
  		   uint64_t time,
  		   struct libinput_tablet_tool *tool,
-@@ -2591,6 +3121,7 @@
+@@ -2591,6 +3123,7 @@
  		.proximity_state = LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN,
  		.tip_state = tip_state,
  		.axes = *axes,
 +		.mt_tool_type = tool->mt_tool_type,
  	};
-
+ 
  	memcpy(axis_event->changed_axes,
-@@ -2621,6 +3152,7 @@
+@@ -2621,6 +3154,7 @@
  		.tip_state = LIBINPUT_TABLET_TOOL_TIP_UP,
  		.proximity_state = proximity_state,
  		.axes = *axes,
@@ -4901,7 +4970,7 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  	};
  	memcpy(proximity_event->changed_axes,
  	       changed_axes,
-@@ -2650,6 +3182,7 @@
+@@ -2650,6 +3184,7 @@
  		.tip_state = tip_state,
  		.proximity_state = LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN,
  		.axes = *axes,
@@ -4909,15 +4978,15 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  	};
  	memcpy(tip_event->changed_axes,
  	       changed_axes,
-@@ -2688,6 +3221,7 @@
+@@ -2688,6 +3223,7 @@
  		.proximity_state = LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN,
  		.tip_state = tip_state,
  		.axes = *axes,
 +		.mt_tool_type = tool->mt_tool_type,
  	};
-
+ 
  	post_device_event(device,
-@@ -2814,6 +3348,7 @@
+@@ -2814,6 +3350,7 @@
  	       int cancelled,
  	       const struct normalized_coords *delta,
  	       const struct normalized_coords *unaccel,
@@ -4925,10 +4994,10 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  	       double scale,
  	       double angle)
  {
-@@ -2834,6 +3369,12 @@
+@@ -2834,6 +3371,12 @@
  		.angle = angle,
  	};
-
+ 
 +	if (solt_touches != NULL) {
 +		gesture_event->solt_touches = *solt_touches;
 +	} else {
@@ -4938,7 +5007,7 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  	post_device_event(device, time, type,
  			  &gesture_event->base);
  }
-@@ -2844,9 +3385,10 @@
+@@ -2844,9 +3387,10 @@
  		     enum libinput_event_type type,
  		     int finger_count,
  		     const struct normalized_coords *delta,
@@ -4950,38 +5019,85 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +	gesture_notify(device, time, type, finger_count, 0, delta, unaccel, solt_touches,
  		       0.0, 0.0);
  }
-
-@@ -2859,7 +3401,7 @@
+ 
+@@ -2859,7 +3403,7 @@
  	const struct normalized_coords zero = { 0.0, 0.0 };
-
+ 
  	gesture_notify(device, time, LIBINPUT_EVENT_GESTURE_SWIPE_END,
 -		       finger_count, cancelled, &zero, &zero, 0.0, 0.0);
 +		       finger_count, cancelled, &zero, &zero, NULL, 0.0, 0.0);
  }
-
+ 
  void
-@@ -2873,7 +3415,7 @@
+@@ -2873,7 +3417,7 @@
  		     double angle)
  {
  	gesture_notify(device, time, type, finger_count, 0,
 -		       delta, unaccel, scale, angle);
 +		       delta, unaccel, NULL, scale, angle);
  }
-
+ 
  void
-@@ -2886,7 +3428,7 @@
+@@ -2886,7 +3430,7 @@
  	const struct normalized_coords zero = { 0.0, 0.0 };
-
+ 
  	gesture_notify(device, time, LIBINPUT_EVENT_GESTURE_PINCH_END,
 -		       finger_count, cancelled, &zero, &zero, scale, 0.0);
 +		       finger_count, cancelled, &zero, &zero, NULL, scale, 0.0);
  }
-
+ 
  void
-@@ -2972,6 +3514,92 @@
+@@ -2919,6 +3463,46 @@
+ #endif
+ }
+ 
++void
++joysticks_notify_axis(struct libinput_device *device,
++		    uint64_t time,
++		    uint32_t axes,
++			const struct joystick_axis_abs_infos *axis_abs)
++{
++	struct libinput_event_joystick_axis* joystick_axis_event;
++
++	joystick_axis_event = zalloc(sizeof * joystick_axis_event);
++
++	*joystick_axis_event = (struct libinput_event_joystick_axis){
++		.type = EV_ABS,
++		.time = time,
++		.axis_value_mask = axes,
++		.abs_throttle = axis_abs->abs_throttle,
++		.abs_hat0x = axis_abs->abs_hat0x,
++		.abs_hat0y = axis_abs->abs_hat0y,
++		.abs_x = axis_abs->abs_x,
++		.abs_y = axis_abs->abs_y,
++		.abs_z = axis_abs->abs_z,
++		.abs_rx = axis_abs->abs_rx,
++		.abs_ry = axis_abs->abs_ry,
++		.abs_rz = axis_abs->abs_rz,
++		.abs_gas = axis_abs->abs_gas,
++		.abs_brake = axis_abs->abs_brake,
++	};
++    libinput_log_printf("code:%d value:%d \r\n", axis_abs->abs_x.code, axis_abs->abs_x.value);
++    libinput_log_printf("code:%d value:%d \r\n", axis_abs->abs_y.code, axis_abs->abs_y.value);
++    libinput_log_printf("code:%d value:%d \r\n", axis_abs->abs_z.code, axis_abs->abs_z.value);
++    libinput_log_printf("code:%d value:%d \r\n", axis_abs->abs_rz.code, axis_abs->abs_rz.value);
++    libinput_log_printf("code:%d value:%d \r\n", axis_abs->abs_gas.code, axis_abs->abs_gas.value);
++    libinput_log_printf("code:%d value:%d \r\n", axis_abs->abs_brake.code, axis_abs->abs_brake.value);
++    libinput_log_printf("code:%d value:%d \r\n", axis_abs->abs_hat0x.code, axis_abs->abs_hat0x.value);
++    libinput_log_printf("code:%d value:%d \r\n", axis_abs->abs_hat0y.code, axis_abs->abs_hat0y.value);
++    libinput_log_printf("code:%d value:%d \r\n", axis_abs->abs_throttle.code, axis_abs->abs_throttle.value);
++	post_device_event(device, time,
++			  LIBINPUT_EVENT_JOYSTICK_AXIS,
++			  &joystick_axis_event->base);
++}
++
+ static void
+ libinput_post_event(struct libinput *libinput,
+ 		    struct libinput_event *event)
+@@ -2972,6 +3556,96 @@
  	libinput->events_in = (libinput->events_in + 1) % libinput->events_len;
  }
-
+ 
 +
 +LIBINPUT_EXPORT void
 +libinput_post_handle_event(struct libinput* libinput, struct libinput_event* event)
@@ -4995,7 +5111,7 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +    require_event_type(libinput_event_get_context(event),
 +        event->type,
 +        NULL,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
++        LIBINPUT_EVENT_JOYSTICK_BUTTON);
 +
 +    return (struct libinput_event_joystick_button*)event;
 +}
@@ -5006,7 +5122,7 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +	require_event_type(libinput_event_get_context(event),
 +        event->type,
 +        NULL,
-+		LIBINPUT_EVENT_POINTER_AXIS);
++        LIBINPUT_EVENT_JOYSTICK_AXIS);
 +
 +    return (struct libinput_event_joystick_axis*)event;
 +}
@@ -5061,6 +5177,10 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +	return &event->abs_hat0x;
 +	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0Y:
 +	return &event->abs_hat0y;
++	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_GAS:
++	return &event->abs_gas;
++	case LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_BRAKE:
++	return &event->abs_brake;
 +	default:
 +	break;
 +	}
@@ -5071,10 +5191,10 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  LIBINPUT_EXPORT struct libinput_event *
  libinput_get_event(struct libinput *libinput)
  {
-@@ -3055,12 +3683,169 @@
+@@ -3055,12 +3729,169 @@
  	return evdev_device_get_sysname((struct evdev_device *) device);
  }
-
+ 
 +LIBINPUT_EXPORT const char*
 +libinput_device_get_phys(struct libinput_device* device)
 +{
@@ -5100,7 +5220,7 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  {
  	return evdev_device_get_name((struct evdev_device *) device);
  }
-
+ 
 +LIBINPUT_EXPORT enum evdev_device_udev_tags
 +libinput_device_get_tags(struct libinput_device* device)
 +{
@@ -5241,9 +5361,9 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  LIBINPUT_EXPORT unsigned int
  libinput_device_get_id_product(struct libinput_device *device)
  {
-@@ -3148,6 +3933,15 @@
+@@ -3148,6 +3979,15 @@
  }
-
+ 
  LIBINPUT_EXPORT int
 +libinput_device_touch_btn_tool_type_down(struct libinput_device *device, int32_t btnToolType)
 +{
@@ -5257,9 +5377,9 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  libinput_device_switch_has_switch(struct libinput_device *device,
  				  enum libinput_switch sw)
  {
-@@ -3347,6 +4141,19 @@
+@@ -3347,6 +4187,19 @@
  }
-
+ 
  LIBINPUT_EXPORT struct libinput_event *
 +libinput_event_touchpad_get_base_event(struct libinput_event_touch *event)
 +{
@@ -5277,7 +5397,7 @@ diff -Naur old/src/libinput.c new/src/libinput.c
  libinput_event_gesture_get_base_event(struct libinput_event_gesture *event)
  {
  	require_event_type(libinput_event_get_context(&event->base),
-@@ -4378,3 +5185,162 @@
+@@ -4378,3 +5231,162 @@
  	}
  }
  #endif
@@ -5291,7 +5411,7 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +	require_event_type(libinput_event_get_context(event),
 +		event->type,
 +		NULL,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
++		LIBINPUT_EVENT_JOYSTICK_BUTTON);
 +
 +	return (struct libinput_event_joystick_button*)event;
 +}
@@ -5305,7 +5425,7 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +    require_event_type(libinput_event_get_context(&event->base),
 +        event->base.type,
 +        0,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
++		LIBINPUT_EVENT_JOYSTICK_BUTTON);
 +
 +    return event->time;
 +}
@@ -5319,12 +5439,12 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +    require_event_type(libinput_event_get_context(&event->base),
 +		event->base.type,
 +        0,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
++		LIBINPUT_EVENT_JOYSTICK_BUTTON);
 +
 +    return event->key;
 +}
 +
-+LIBINPUT_EXPORT enum libinput_key_state
++LIBINPUT_EXPORT enum libinput_button_state
 +libinput_event_joystick_button_get_key_state(struct libinput_event_joystick_button* event)
 +{
 +	if (!event)
@@ -5333,7 +5453,7 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +	require_event_type(libinput_event_get_context(&event->base),
 +		event->base.type,
 +		0,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
++		LIBINPUT_EVENT_JOYSTICK_BUTTON);
 +
 +	return event->state;
 +}
@@ -5347,7 +5467,7 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +    require_event_type(libinput_event_get_context(&event->base),
 +		event->base.type,
 +        0,
-+		LIBINPUT_EVENT_POINTER_BUTTON);
++		LIBINPUT_EVENT_JOYSTICK_BUTTON);
 +
 +    return event->seat_key_count;
 +}
@@ -5361,7 +5481,7 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +    require_event_type(libinput_event_get_context(&event->base),
 +		event->base.type,
 +        0,
-+        LIBINPUT_EVENT_POINTER_BUTTON);
++        LIBINPUT_EVENT_JOYSTICK_BUTTON);
 +
 +    return event->value;
 +}
@@ -5441,8 +5561,8 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +}
 +
 diff -Naur old/src/libinput.h new/src/libinput.h
---- old/src/libinput.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/libinput.h	2021-01-01 00:00:00.000000000 +0800
+--- old/src/libinput.h	2022-10-17 15:22:59.451710400 +0800
++++ new/src/libinput.h	2022-10-17 17:28:56.247098294 +0800
 @@ -196,6 +196,22 @@
  	LIBINPUT_DEVICE_CAP_TABLET_PAD = 4,
  	LIBINPUT_DEVICE_CAP_GESTURE = 5,
@@ -5464,11 +5584,11 @@ diff -Naur old/src/libinput.h new/src/libinput.h
 +    EVDEV_UDEV_TAG_TRACKBALL = 1 << 10,
 +    EVDEV_UDEV_TAG_SWITCH = 1 << 11,
  };
-
+ 
  /**
 @@ -315,6 +331,49 @@
  };
-
+ 
  /**
 + * @ingroup event_joystick
 + *
@@ -5519,7 +5639,7 @@ diff -Naur old/src/libinput.h new/src/libinput.h
 @@ -387,6 +446,17 @@
  	LIBINPUT_TABLET_TOOL_TIP_DOWN = 1,
  };
-
+ 
 +struct libinput_event_joystick_axis_abs_info {
 +	int32_t code;
 +	int32_t value;
@@ -5534,10 +5654,20 @@ diff -Naur old/src/libinput.h new/src/libinput.h
  /**
   * @defgroup tablet_pad_modes Tablet pad modes
   *
-@@ -754,6 +824,10 @@
+@@ -744,6 +814,9 @@
+ 	LIBINPUT_EVENT_POINTER_BUTTON,
+ 	LIBINPUT_EVENT_POINTER_AXIS,
+ 
++	LIBINPUT_EVENT_JOYSTICK_BUTTON = 450,
++	LIBINPUT_EVENT_JOYSTICK_AXIS,
++
+ 	LIBINPUT_EVENT_TOUCH_DOWN = 500,
+ 	LIBINPUT_EVENT_TOUCH_UP,
+ 	LIBINPUT_EVENT_TOUCH_MOTION,
+@@ -754,6 +827,10 @@
  	 */
  	LIBINPUT_EVENT_TOUCH_FRAME,
-
+ 
 +	LIBINPUT_EVENT_TOUCHPAD_DOWN = 550,
 +	LIBINPUT_EVENT_TOUCHPAD_UP,
 +	LIBINPUT_EVENT_TOUCHPAD_MOTION,
@@ -5545,7 +5675,7 @@ diff -Naur old/src/libinput.h new/src/libinput.h
  	/**
  	 * One or more axes have changed state on a device with the @ref
  	 * LIBINPUT_DEVICE_CAP_TABLET_TOOL capability. This event is only sent
-@@ -1001,6 +1075,19 @@
+@@ -1001,6 +1078,19 @@
  /**
   * @ingroup event
   *
@@ -5565,9 +5695,9 @@ diff -Naur old/src/libinput.h new/src/libinput.h
   * Return the gesture event that is this input event. If the event type does
   * not match the gesture event types, this function returns NULL.
   *
-@@ -1673,6 +1760,120 @@
+@@ -1673,6 +1763,120 @@
  				       uint32_t height);
-
+ 
  /**
 + * @brief 获取触摸屏的工具类型区域属性
 + */
@@ -5686,9 +5816,9 @@ diff -Naur old/src/libinput.h new/src/libinput.h
   * @ingroup event_touch
   *
   * @return The generic libinput_event of this event
-@@ -1681,6 +1882,228 @@
+@@ -1681,6 +1885,228 @@
  libinput_event_touch_get_base_event(struct libinput_event_touch *event);
-
+ 
  /**
 + * @defgroup event_touch Touchpad events
 + *
@@ -5915,9 +6045,9 @@ diff -Naur old/src/libinput.h new/src/libinput.h
   * @defgroup event_gesture Gesture events
   *
   * Gesture events are generated when a gesture is recognized on a touchpad.
-@@ -1893,6 +2316,42 @@
+@@ -1893,6 +2319,42 @@
  libinput_event_gesture_get_angle_delta(struct libinput_event_gesture *event);
-
+ 
  /**
 + * 获取带slot的touches信息, 仅支持LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE
 + */
@@ -5958,7 +6088,7 @@ diff -Naur old/src/libinput.h new/src/libinput.h
   * @defgroup event_tablet Tablet events
   *
   * Events that come from tools on tablet devices. For events from the pad,
-@@ -2620,6 +3079,19 @@
+@@ -2620,6 +3082,19 @@
  /**
   * @ingroup event_tablet
   *
@@ -5978,10 +6108,10 @@ diff -Naur old/src/libinput.h new/src/libinput.h
   * Return the high-level tool type for a tool object.
   *
   * The high level tool describes general interaction expected with the tool.
-@@ -3466,6 +3938,46 @@
+@@ -3466,6 +3941,56 @@
  int
  libinput_dispatch(struct libinput *libinput);
-
+ 
 +/****************************************************************************
 +* @brief : brief
 +* @author : fms
@@ -6002,9 +6132,19 @@ diff -Naur old/src/libinput.h new/src/libinput.h
 +* @inparam :
 +* @outparam :
 +*****************************************************************************/
-+struct libinput_event_joystick_axis *
-+libinput_event_get_joystick_axis_event(struct libinput_event *event);
++struct libinput_event_joystick_button*
++libinput_event_get_joystick_button_event(struct libinput_event* event);
 +
++/****************************************************************************
++* @brief : get joystick axis event
++* @author : fms
++* @date : 2021/3/12 10:56
++* @version : ver 1.0
++* @inparam :
++* @outparam :
++*****************************************************************************/
++struct libinput_event_joystick_axis*
++    libinput_event_get_joystick_axis_event(struct libinput_event* event);
 +/**
 + * @brief 获取轴事件的时间
 + */
@@ -6025,10 +6165,10 @@ diff -Naur old/src/libinput.h new/src/libinput.h
  /**
   * @ingroup base
   *
-@@ -3936,6 +4448,42 @@
+@@ -3936,6 +4461,42 @@
  const char *
  libinput_device_get_name(struct libinput_device *device);
-
+ 
 +/**  @brief   获取设备类型*/
 +enum evdev_device_udev_tags
 +libinput_device_get_tags(struct libinput_device* device);
@@ -6068,9 +6208,9 @@ diff -Naur old/src/libinput.h new/src/libinput.h
  /**
   * @ingroup device
   *
-@@ -4146,6 +4694,12 @@
+@@ -4146,6 +4707,12 @@
  libinput_device_touch_get_touch_count(struct libinput_device *device);
-
+ 
  /**
 + * @brief 获取触摸屏工具类型按钮是否按下
 + */
@@ -6081,10 +6221,10 @@ diff -Naur old/src/libinput.h new/src/libinput.h
   * @ingroup device
   *
   * Check if a @ref LIBINPUT_DEVICE_CAP_SWITCH device has a switch of the
-@@ -5928,7 +6482,102 @@
+@@ -5928,7 +6495,102 @@
  unsigned int
  libinput_device_config_rotation_get_default_angle(struct libinput_device *device);
-
+ 
 +/**
 + * @ingroup event
 + *
@@ -6177,7 +6317,7 @@ diff -Naur old/src/libinput.h new/src/libinput.h
 +const char*
 +libinput_device_get_uniq(struct libinput_device* device);
 +
-+enum libinput_key_state
++enum libinput_button_state
 +libinput_event_joystick_button_get_key_state(struct libinput_event_joystick_button* event);
  #ifdef __cplusplus
  }
@@ -6185,10 +6325,10 @@ diff -Naur old/src/libinput.h new/src/libinput.h
  #endif /* LIBINPUT_H */
 +
 diff -Naur old/src/udev-seat.c new/src/udev-seat.c
---- old/src/udev-seat.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/udev-seat.c	2021-01-01 00:00:00.000000000 +0800
+--- old/src/udev-seat.c	2022-10-17 15:22:59.451710400 +0800
++++ new/src/udev-seat.c	2022-10-17 17:28:55.039084087 +0800
 @@ -189,6 +189,7 @@
-
+ 
  		/* Skip unconfigured device. udev will send an event
  		 * when device is fully configured  */
 +/*
@@ -6206,24 +6346,24 @@ diff -Naur old/src/udev-seat.c new/src/udev-seat.c
 +				  sysname,
 +				  udev_device_get_devnode(device));
 +		}
-
+ 
  		if (device_added(device, input, NULL) < 0) {
  			udev_device_unref(device);
 diff -Naur old/src/util-strings.h new/src/util-strings.h
---- old/src/util-strings.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/util-strings.h	2021-01-01 00:00:00.000000000 +0800
+--- old/src/util-strings.h	2022-10-17 15:22:59.451710400 +0800
++++ new/src/util-strings.h	2022-10-17 17:28:53.399064800 +0800
 @@ -281,7 +281,7 @@
  	if (npairs == 0)
  		goto error;
-
+ 
 -	result = zalloc(npairs * sizeof *result);
 +	result = (struct key_value_double *)zalloc(npairs * sizeof *result);
-
+ 
  	for (pair = pairs; *pair; pair++) {
  		char **kv = strv_from_string(*pair, kv_separator);
 diff -Naur old/src/util-time.h new/src/util-time.h
---- old/src/util-time.h	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/util-time.h	2021-01-01 00:00:00.000000000 +0800
+--- old/src/util-time.h	2022-10-17 15:22:59.451710400 +0800
++++ new/src/util-time.h	2022-10-17 17:28:53.255063107 +0800
 @@ -97,7 +97,8 @@
  static inline struct human_time
  to_human_time(uint64_t us)
@@ -6253,8 +6393,8 @@ diff -Naur old/src/util-time.h new/src/util-time.h
 +	//assert(1);
  }
 diff -Naur old/tools/libinput-debug-events.c new/tools/libinput-debug-events.c
---- old/tools/libinput-debug-events.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/tools/libinput-debug-events.c	2021-01-01 00:00:00.000000000 +0800
+--- old/tools/libinput-debug-events.c	2022-10-17 15:22:59.459710493 +0800
++++ new/tools/libinput-debug-events.c	2022-10-17 17:28:35.914859184 +0800
 @@ -101,6 +101,15 @@
  	case LIBINPUT_EVENT_TOUCH_FRAME:
  		type = "TOUCH_FRAME";
@@ -6271,20 +6411,29 @@ diff -Naur old/tools/libinput-debug-events.c new/tools/libinput-debug-events.c
  	case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
  		type = "GESTURE_SWIPE_BEGIN";
  		break;
-@@ -274,6 +283,10 @@
+@@ -146,6 +155,8 @@
+ 	case LIBINPUT_EVENT_SWITCH_TOGGLE:
+ 		type = "SWITCH_TOGGLE";
+ 		break;
++	default:
++		break;
+ 	}
+ 
+ 	prefix = (last_device != dev) ? '-' : ' ';
+@@ -274,6 +285,10 @@
  					   LIBINPUT_DEVICE_CAP_SWITCH))
  		printq("S");
-
+ 
 +    if (libinput_device_has_capability(dev,
 +        LIBINPUT_DEVICE_CAP_JOYSTICK))
 +        printq("JOYSTICK");
 +
  	if (libinput_device_get_size(dev, &w, &h) == 0)
  		printq("  size %.0fx%.0fmm", w, h);
-
-@@ -530,6 +543,15 @@
+ 
+@@ -530,6 +545,15 @@
  }
-
+ 
  static void
 +print_touchpad_event_without_coords(struct libinput_event *ev)
 +{
@@ -6298,9 +6447,9 @@ diff -Naur old/tools/libinput-debug-events.c new/tools/libinput-debug-events.c
  print_proximity_event(struct libinput_event *ev)
  {
  	struct libinput_event_tablet_tool *t = libinput_event_get_tablet_tool_event(ev);
-@@ -647,6 +669,21 @@
+@@ -647,6 +671,21 @@
  }
-
+ 
  static void
 +print_touchpad_event_with_coords(struct libinput_event *ev)
 +{
@@ -6320,7 +6469,7 @@ diff -Naur old/tools/libinput-debug-events.c new/tools/libinput-debug-events.c
  print_gesture_event_without_coords(struct libinput_event *ev)
  {
  	struct libinput_event_gesture *t = libinput_event_get_gesture_event(ev);
-@@ -869,6 +906,15 @@
+@@ -869,6 +908,15 @@
  		case LIBINPUT_EVENT_TOUCH_FRAME:
  			print_touch_event_without_coords(ev);
  			break;
@@ -6336,24 +6485,33 @@ diff -Naur old/tools/libinput-debug-events.c new/tools/libinput-debug-events.c
  		case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
  			print_gesture_event_without_coords(ev);
  			break;
+@@ -914,6 +962,8 @@
+ 		case LIBINPUT_EVENT_SWITCH_TOGGLE:
+ 			print_switch_event(ev);
+ 			break;
++		default:
++			break;
+ 		}
+ 
+ 		libinput_event_destroy(ev);
 diff -Naur old/tools/libinput-record.c new/tools/libinput-record.c
---- old/tools/libinput-record.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/tools/libinput-record.c	2021-01-01 00:00:00.000000000 +0800
+--- old/tools/libinput-record.c	2022-10-17 15:22:59.459710493 +0800
++++ new/tools/libinput-record.c	2022-10-17 17:28:32.954824372 +0800
 @@ -50,6 +50,7 @@
  #include "util-time.h"
  #include "util-input-event.h"
  #include "util-macros.h"
 +#include "hm_missing.h"
-
+ 
  static const int FILE_VERSION_NUMBER = 1;
-
+ 
 diff -Naur old/udev/libinput-device-group.c new/udev/libinput-device-group.c
---- old/udev/libinput-device-group.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/udev/libinput-device-group.c	2021-01-01 00:00:00.000000000 +0800
+--- old/udev/libinput-device-group.c	2022-10-17 15:22:59.463710540 +0800
++++ new/udev/libinput-device-group.c	2022-10-17 17:28:31.338805368 +0800
 @@ -138,7 +138,7 @@
  				*product_id = pid;
  				best_dist = dist;
-
+ 
 -				free(*phys_attr);
 +				free((char*)*phys_attr);
  				*phys_attr = strdup(phys);
diff --git a/service/BUILD.gn b/service/BUILD.gn
index 492776cd98..36ee8eb9ff 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -474,6 +474,9 @@ ohos_shared_library("libmmi-server") {
       ]
     }
   }
+  if (input_feature_joystick) {
+    sources += [ "touch_event_normalize/src/joystick_transform_processor.cpp" ]
+  }
   if (input_feature_monitor) {
     sources += [ "monitor/src/event_monitor_handler.cpp" ]
   }
diff --git a/service/event_handler/include/event_normalize_handler.h b/service/event_handler/include/event_normalize_handler.h
index 1dba71cc17..e42c30dd73 100644
--- a/service/event_handler/include/event_normalize_handler.h
+++ b/service/event_handler/include/event_normalize_handler.h
@@ -50,6 +50,7 @@ private:
     int32_t HandleMouseEvent(libinput_event* event);
     int32_t HandleTouchEvent(libinput_event* event);
     int32_t HandleTableToolEvent(libinput_event* event);
+    int32_t HandleJoystickEvent(libinput_event* event);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     bool IsNeedFilterOut(const std::string& deviceId, const std::shared_ptr<KeyEvent> keyEvent);
 #endif // OHOS_BUILD_ENABLE_COOPERATE
diff --git a/service/event_handler/src/event_normalize_handler.cpp b/service/event_handler/src/event_normalize_handler.cpp
index 693a9e83f3..674093b40c 100644
--- a/service/event_handler/src/event_normalize_handler.cpp
+++ b/service/event_handler/src/event_normalize_handler.cpp
@@ -104,6 +104,12 @@ void EventNormalizeHandler::HandleEvent(libinput_event* event)
             HandleTableToolEvent(event);
             break;
         }
+        case LIBINPUT_EVENT_JOYSTICK_BUTTON:
+        case LIBINPUT_EVENT_JOYSTICK_AXIS: {
+            HandleJoystickEvent(event);
+            DfxHisysevent::CalcPointerDispTimes();
+            break;
+        }
         default: {
             MMI_HILOGW("This device does not support");
             break;
@@ -439,7 +445,7 @@ void EventNormalizeHandler::ResetTouchUpEvent(std::shared_ptr<PointerEvent> poin
 int32_t EventNormalizeHandler::HandleTableToolEvent(libinput_event* event)
 {
     if (nextHandler_ == nullptr) {
-        MMI_HILOGW("Touchscreen device does not support");
+        MMI_HILOGW("TableTool device does not support");
         return ERROR_UNSUPPORT;
     }
 #ifdef OHOS_BUILD_ENABLE_TOUCH
@@ -452,11 +458,30 @@ int32_t EventNormalizeHandler::HandleTableToolEvent(libinput_event* event)
         pointerEvent->Reset();
     }
 #else
-    MMI_HILOGW("Touchscreen device does not support");
+    MMI_HILOGW("TableTool device does not support");
 #endif // OHOS_BUILD_ENABLE_TOUCH
     return RET_OK;
 }
 
+int32_t EventNormalizeHandler::HandleJoystickEvent(libinput_event* event)
+{
+    CALL_DEBUG_ENTER;
+    if (nextHandler_ == nullptr) {
+        MMI_HILOGW("Joystick device does not support");
+        return ERROR_UNSUPPORT;
+    }
+#ifdef OHOS_BUILD_ENABLE_JOYSTICK
+    CHKPR(event, ERROR_NULL_POINTER);
+    auto pointerEvent = TouchEventHdr->OnLibInput(event, TouchEventNormalize::DeviceType::JOYSTICK);
+    CHKPR(pointerEvent, ERROR_NULL_POINTER);
+    BytraceAdapter::StartBytrace(pointerEvent, BytraceAdapter::TRACE_START);
+    nextHandler_->HandlePointerEvent(pointerEvent);
+#else
+    MMI_HILOGW("Joystick device does not support");
+#endif // OHOS_BUILD_ENABLE_JOYSTICK
+    return RET_OK;
+}
+
 int32_t EventNormalizeHandler::AddHandleTimer(int32_t timeout)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/touch_event_normalize/include/joystick_transform_processor.h b/service/touch_event_normalize/include/joystick_transform_processor.h
new file mode 100644
index 0000000000..72592303f9
--- /dev/null
+++ b/service/touch_event_normalize/include/joystick_transform_processor.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JOYSTICK_TRANSFORM_PROCESSOR_H
+#define JOYSTICK_TRANSFORM_PROCESSOR_H
+
+#include "input_windows_manager.h"
+#include "transform_processor.h"
+
+namespace OHOS {
+namespace MMI {
+class JoystickTransformProcessor final : public TransformProcessor {
+    enum LIBINPUT_BUTTON_CODE : uint32_t {
+        LIBINPUT_HOMEPAGE_BUTTON_CODE = 172,
+        LIBINPUT_TRIGGER_BUTTON_CODE = 288,
+        LIBINPUT_THUMB_BUTTON_CODE = 289,
+        LIBINPUT_THUMB2_BUTTON_CODE = 290,
+        LIBINPUT_TOP_BUTTON_CODE = 291,
+        LIBINPUT_TOP2_BUTTON_CODE = 292,
+        LIBINPUT_PINKIE_BUTTON_CODE = 293,
+        LIBINPUT_BASE_BUTTON_CODE = 294,
+        LIBINPUT_BASE2_BUTTON_CODE = 295,
+        LIBINPUT_BASE3_BUTTON_CODE = 296,
+        LIBINPUT_BASE4_BUTTON_CODE = 297,
+        LIBINPUT_BASE5_BUTTON_CODE = 298,
+        LIBINPUT_BASE6_BUTTON_CODE = 299,
+        LIBINPUT_DEAD_BUTTON_CODE = 303,
+        LIBINPUT_SOUTH_BUTTON_CODE = 304,
+        LIBINPUT_EAST_BUTTON_CODE = 305,
+        LIBINPUT_C_BUTTON_CODE = 306,
+        LIBINPUT_NORTH_BUTTON_CODE = 307,
+        LIBINPUT_WEST_BUTTON_CODE = 308,
+        LIBINPUT_Z_BUTTON_CODE = 309,
+        LIBINPUT_TL_BUTTON_CODE = 310,
+        LIBINPUT_TR_BUTTON_CODE = 311,
+        LIBINPUT_TL2_BUTTON_CODE = 312,
+        LIBINPUT_TR2_BUTTON_CODE = 313,
+        LIBINPUT_SELECT_BUTTON_CODE = 314,
+        LIBINPUT_START_BUTTON_CODE = 315,
+        LIBINPUT_MODE_BUTTON_CODE = 316,
+        LIBINPUT_THUMBL_BUTTON_CODE = 317,
+        LIBINPUT_THUMBR_BUTTON_CODE = 318
+    };
+    const std::map<uint32_t, int32_t> LibinputChangeToPointer = {
+        {LIBINPUT_TL2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TL2},
+        {LIBINPUT_TR2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TR2},
+        {LIBINPUT_TL_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TL},
+        {LIBINPUT_TR_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TR},
+        {LIBINPUT_SOUTH_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_SOUTH},
+        {LIBINPUT_NORTH_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_NORTH},
+        {LIBINPUT_WEST_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_WEST},
+        {LIBINPUT_EAST_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_EAST},
+        {LIBINPUT_SELECT_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_SELECT},
+        {LIBINPUT_HOMEPAGE_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_HOMEPAGE},
+        {LIBINPUT_THUMBL_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_THUMBL},
+        {LIBINPUT_THUMBR_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_THUMBR},
+        {LIBINPUT_THUMB2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_THUMB2},
+        {LIBINPUT_THUMB_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_THUMB},
+        {LIBINPUT_TOP_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TOP},
+        {LIBINPUT_TOP2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TOP2},
+        {LIBINPUT_PINKIE_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_PINKIE},
+        {LIBINPUT_BASE_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE},
+        {LIBINPUT_BASE2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE2},
+        {LIBINPUT_BASE3_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE3},
+        {LIBINPUT_BASE4_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE4},
+        {LIBINPUT_BASE5_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE5},
+        {LIBINPUT_BASE6_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE6},
+        {LIBINPUT_DEAD_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_DEAD},
+        {LIBINPUT_C_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_C},
+        {LIBINPUT_Z_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_Z},
+        {LIBINPUT_MODE_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_MODE}
+    };
+
+public:
+    explicit JoystickTransformProcessor(int32_t deviceId);
+    DISALLOW_COPY_AND_MOVE(JoystickTransformProcessor);
+    ~JoystickTransformProcessor() = default;
+    std::shared_ptr<PointerEvent> OnEvent(struct libinput_event *event) override;
+
+private:
+    bool OnEventJoystickButton(struct libinput_event* event);
+    bool OnEventJoystickAxis(struct libinput_event *event);
+    int32_t LibinputButtonToPointer(const uint32_t button);
+private:
+    int32_t deviceId_ { 0 };
+    std::shared_ptr<PointerEvent> pointerEvent_ { nullptr };
+    std::vector<std::pair<enum libinput_joystick_axis_source, PointerEvent::AxisType>> joystickType;
+};
+} // namespace MMI
+} // namespace OHOS
+#endif // JOYSTICK_TRANSFORM_POINT_PROCESSOR_H
\ No newline at end of file
diff --git a/service/touch_event_normalize/src/joystick_transform_processor.cpp b/service/touch_event_normalize/src/joystick_transform_processor.cpp
new file mode 100644
index 0000000000..d9627bbe79
--- /dev/null
+++ b/service/touch_event_normalize/src/joystick_transform_processor.cpp
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "joystick_transform_processor.h"
+
+#include "mmi_log.h"
+
+namespace OHOS {
+namespace MMI {
+namespace {
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "JoystickTransformProcessor" };
+} // namespace
+
+JoystickTransformProcessor::JoystickTransformProcessor(int32_t deviceId) : deviceId_(deviceId)
+{
+    joystickType.emplace_back(
+        std::make_pair(LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_X, PointerEvent::AXIS_TYPE_ABS_X));
+    joystickType.emplace_back(
+        std::make_pair(LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Y, PointerEvent::AXIS_TYPE_ABS_Y));
+    joystickType.emplace_back(
+        std::make_pair(LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Z, PointerEvent::AXIS_TYPE_ABS_Z));
+    joystickType.emplace_back(
+        std::make_pair(LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_RZ, PointerEvent::AXIS_TYPE_ABS_RZ));
+    joystickType.emplace_back(
+        std::make_pair(LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_GAS, PointerEvent::AXIS_TYPE_ABS_GAS));
+    joystickType.emplace_back(
+        std::make_pair(LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_BRAKE, PointerEvent::AXIS_TYPE_ABS_BRAKE));
+    joystickType.emplace_back(
+        std::make_pair(LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0X, PointerEvent::AXIS_TYPE_ABS_HAT0X));
+    joystickType.emplace_back(
+        std::make_pair(LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_HAT0Y, PointerEvent::AXIS_TYPE_ABS_HAT0Y));
+    joystickType.emplace_back(
+        std::make_pair(LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_THROTTLE, PointerEvent::AXIS_TYPE_ABS_THROTTLE));
+}
+
+bool JoystickTransformProcessor::OnEventJoystickButton(struct libinput_event* event)
+{
+    CALL_DEBUG_ENTER;
+    CHKPF(event);
+    auto data = libinput_event_get_joystick_button_event(event);
+    CHKPF(data);
+    int64_t time = GetSysClockTime();
+    pointerEvent_->SetActionTime(time);
+    pointerEvent_->SetActionStartTime(time);
+    pointerEvent_->SetDeviceId(deviceId_);   
+    uint32_t button = libinput_event_joystick_button_get_key(data);
+    int32_t buttonId = LibinputButtonToPointer(button);
+    
+    if (buttonId == PointerEvent::BUTTON_NONE) {
+        MMI_HILOGE("Unknown btn, btn:%{public}u", button);
+        return false;
+    }
+    pointerEvent_->SetButtonId(buttonId);
+    auto state = libinput_event_joystick_button_get_key_state(data);
+    
+    if (state == LIBINPUT_BUTTON_STATE_RELEASED) {
+        pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_BUTTON_UP);
+        pointerEvent_->DeleteReleaseButton(buttonId);
+    } else if (state == LIBINPUT_BUTTON_STATE_PRESSED) {
+        pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_BUTTON_DOWN);
+        pointerEvent_->SetButtonPressed(buttonId);
+    } else {
+        MMI_HILOGE("Unknown state, state:%{public}u", state);
+        return false;
+    }
+    MMI_HILOGD("button:%{public}u, buttonId:%{public}d, state:%{public}d", button, buttonId ,state);
+    return true;
+}
+
+int32_t JoystickTransformProcessor::LibinputButtonToPointer(const uint32_t button)
+{
+    auto iter = LibinputChangeToPointer.find(button);
+    return (iter == LibinputChangeToPointer.end() ? PointerEvent::BUTTON_NONE : iter->second);
+}
+
+bool JoystickTransformProcessor::OnEventJoystickAxis(struct libinput_event *event)
+{
+    CALL_DEBUG_ENTER;
+    CHKPF(event);
+    auto data = libinput_event_get_joystick_axis_event(event);
+    CHKPF(data);
+    int64_t time = GetSysClockTime();
+    pointerEvent_->SetActionTime(time);
+    pointerEvent_->SetActionStartTime(time);
+    pointerEvent_->SetDeviceId(deviceId_);
+    pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_AXIS_UPDATE);
+    pointerEvent_->SetSourceType(PointerEvent::SOURCE_TYPE_JOYSTICK);
+
+    for (const auto &item : joystickType) {
+        if (libinput_event_get_joystick_axis_value_is_changed(data, item.first) != 0) {
+            struct libinput_event_joystick_axis_abs_info* axisInfo = 
+                libinput_event_get_joystick_axis_abs_info(data, item.first);
+            CHKPF(axisInfo);
+            pointerEvent_->SetAxisValue(item.second, axisInfo->value);
+        }
+    }
+    return true;
+}
+
+std::shared_ptr<PointerEvent> JoystickTransformProcessor::OnEvent(struct libinput_event *event)
+{
+    CALL_DEBUG_ENTER;
+    CHKPP(event);
+    if (pointerEvent_ == nullptr) {
+        pointerEvent_ = PointerEvent::Create();
+        CHKPP(pointerEvent_);
+    }
+    pointerEvent_->ClearAxisValue();
+    auto type = libinput_event_get_type(event);
+    switch (type) {
+        case LIBINPUT_EVENT_JOYSTICK_BUTTON: {
+            if(!OnEventJoystickButton(event)) {
+                MMI_HILOGE("Get OnEventJoystickButton failed");
+                return nullptr;
+            }
+            break;
+        }
+        case LIBINPUT_EVENT_JOYSTICK_AXIS: {
+            if (!OnEventJoystickAxis(event)) {
+                MMI_HILOGE("Get OnEventJoystickAxis failed");
+                return nullptr;
+            }
+            break;
+        }
+        default: {
+            MMI_HILOGE("Unknown event type, joystickType:%{public}d", type);
+            return nullptr;
+        }
+    }
+    WinMgr->UpdateTargetPointer(pointerEvent_);
+   
+    return pointerEvent_;
+}
+} // namespace MMI
+} // namespace OHOS
diff --git a/service/touch_event_normalize/src/touch_event_normalize.cpp b/service/touch_event_normalize/src/touch_event_normalize.cpp
index ff1b492e63..f78d2feb58 100644
--- a/service/touch_event_normalize/src/touch_event_normalize.cpp
+++ b/service/touch_event_normalize/src/touch_event_normalize.cpp
@@ -16,6 +16,7 @@
 #include "touch_event_normalize.h"
 #include "gesture_transform_processor.h"
 #include "input_device_manager.h"
+#include "joystick_transform_processor.h"
 #include "tablet_tool_tranform_processor.h"
 #include "touch_transform_processor.h"
 #include "touchpad_transform_processor.h"
@@ -75,6 +76,12 @@ std::shared_ptr<TransformProcessor> TouchEventNormalize::MakeTransformProcessor(
             break;
         }
 #endif // OHOS_BUILD_ENABLE_POINTER
+#ifdef OHOS_BUILD_ENABLE_JOYSTICK
+	case DeviceType::JOYSTICK: {
+            processor = std::make_shared<JoystickTransformProcessor>(deviceId);
+            break;
+        }
+#endif // OHOS_BUILD_ENABLE_JOYSTICK
         default: {
             MMI_HILOGE("Unsupported device type: %{public}d", deviceType);
             break;
-- 
Gitee


From 0ddf821c1a8063a953f72776d86fdb6be805e603 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 26 Oct 2022 20:06:09 +0800
Subject: [PATCH 080/360] =?UTF-8?q?=E5=A4=A7=E5=87=BD=E6=95=B0=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I0bf47066a30759a472c0b9c1964b212c14a16b05
---
 .../event_handler/src/input_device_impl.cpp   |  57 +-
 frameworks/proxy/events/src/key_event.cpp     | 786 +++++++++---------
 .../proxy/events/test/input_manager_test.cpp  |  55 +-
 service/module_loader/src/uds_server.cpp      |   3 -
 .../include/input_event_data_transformation.h |   1 +
 util/common/include/util_ex.h                 |  93 ---
 .../src/input_event_data_transformation.cpp   |  23 +-
 7 files changed, 443 insertions(+), 575 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_device_impl.cpp b/frameworks/proxy/event_handler/src/input_device_impl.cpp
index 6387a11db3..2001378d20 100755
--- a/frameworks/proxy/event_handler/src/input_device_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_device_impl.cpp
@@ -278,68 +278,41 @@ std::shared_ptr<InputDevice> InputDeviceImpl::DevDataUnmarshalling(NetPacket &pk
     auto devData = std::make_shared<InputDevice>();
     CHKPP(devData);
     int32_t deviceId;
-    pkt >> deviceId;
-    devData->SetId(deviceId);
-
     std::string name;
-    pkt >> name;
-    devData->SetName(name);
-
     int32_t deviceType;
-    pkt >> deviceType;
-    devData->SetType(deviceType);
-
     int32_t bus;
-    pkt >> bus;
-    devData->SetBus(bus);
-
     int32_t product;
-    pkt >> product;
-    devData->SetProduct(product);
-
     int32_t vendor;
-    pkt >> vendor;
-    devData->SetVendor(vendor);
-
     int32_t version;
-    pkt >> version;
-    devData->SetVersion(version);
-
     std::string phys;
-    pkt >> phys;
-    devData->SetPhys(phys);
-
     std::string uniq;
-    pkt >> uniq;
+    pkt >> deviceId >> name >> deviceType >> bus >> product >> vendor >> version >> phys >> uniq;
+    devData->SetId(deviceId);
+    devData->SetName(name);
+    devData->SetType(deviceType);
+    devData->SetBus(bus);
+    devData->SetProduct(product);
+    devData->SetVendor(vendor);
+    devData->SetVersion(version);
+    devData->SetPhys(phys);
     devData->SetUniq(uniq);
 
     size_t size;
     pkt >> size;
-    std::vector<InputDevice::AxisInfo> axisInfo;
     for (size_t i = 0; i < size; ++i) {
         InputDevice::AxisInfo axis;
         int32_t type;
-        pkt >> type;
-        axis.SetAxisType(type);
-
         int32_t min;
-        pkt >> min;
-        axis.SetMinimum(min);
-
         int32_t max;
-        pkt >> max;
-        axis.SetMaximum(max);
-
         int32_t fuzz;
-        pkt >> fuzz;
-        axis.SetFuzz(fuzz);
-
         int32_t flat;
-        pkt >> flat;
-        axis.SetFlat(flat);
-
         int32_t resolution;
-        pkt >> resolution;
+        pkt >> type >> min >> max >> fuzz >> flat >> resolution;
+        axis.SetAxisType(type);
+        axis.SetMinimum(min);
+        axis.SetMaximum(max);
+        axis.SetFuzz(fuzz);
+        axis.SetFlat(flat);
         axis.SetResolution(resolution);
         devData->AddAxisInfo(axis);
     }
diff --git a/frameworks/proxy/events/src/key_event.cpp b/frameworks/proxy/events/src/key_event.cpp
index 4369a45b7e..2f9d309d8e 100644
--- a/frameworks/proxy/events/src/key_event.cpp
+++ b/frameworks/proxy/events/src/key_event.cpp
@@ -23,6 +23,397 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeyEvent" };
+const std::map <int32_t, std::string> KEYCODE_TO_STRING = {
+    {KeyEvent::KEYCODE_FN, "KEYCODE_FN"},
+    {KeyEvent::KEYCODE_UNKNOWN, "KEYCODE_UNKNOWN"},
+    {KeyEvent::KEYCODE_HOME, "KEYCODE_HOME"},
+    {KeyEvent::KEYCODE_BACK, "KEYCODE_BACK"},
+    {KeyEvent::KEYCODE_CALL, "KEYCODE_CALL"},
+    {KeyEvent::KEYCODE_ENDCALL, "KEYCODE_ENDCALL"},
+    {KeyEvent::KEYCODE_CLEAR, "KEYCODE_CLEAR"},
+    {KeyEvent::KEYCODE_HEADSETHOOK, "KEYCODE_HEADSETHOOK"},
+    {KeyEvent::KEYCODE_FOCUS, "KEYCODE_FOCUS"},
+    {KeyEvent::KEYCODE_NOTIFICATION, "KEYCODE_NOTIFICATION"},
+    {KeyEvent::KEYCODE_SEARCH, "KEYCODE_SEARCH"},
+    {KeyEvent::KEYCODE_MEDIA_PLAY_PAUSE, "KEYCODE_MEDIA_PLAY_PAUSE"},
+    {KeyEvent::KEYCODE_MEDIA_STOP, "KEYCODE_MEDIA_STOP"},
+    {KeyEvent::KEYCODE_MEDIA_NEXT, "KEYCODE_MEDIA_NEXT"},
+    {KeyEvent::KEYCODE_MEDIA_PREVIOUS, "KEYCODE_MEDIA_PREVIOUS"},
+    {KeyEvent::KEYCODE_MEDIA_REWIND, "KEYCODE_MEDIA_REWIND"},
+    {KeyEvent::KEYCODE_MEDIA_FAST_FORWARD, "KEYCODE_MEDIA_FAST_FORWARD"},
+    {KeyEvent::KEYCODE_VOLUME_UP, "KEYCODE_VOLUME_UP"},
+    {KeyEvent::KEYCODE_VOLUME_DOWN, "KEYCODE_VOLUME_DOWN"},
+    {KeyEvent::KEYCODE_POWER, "KEYCODE_POWER"},
+    {KeyEvent::KEYCODE_CAMERA, "KEYCODE_CAMERA"},
+    {KeyEvent::KEYCODE_VOICE_ASSISTANT, "KEYCODE_VOICE_ASSISTANT"},
+    {KeyEvent::KEYCODE_CUSTOM1, "KEYCODE_CUSTOM1"},
+    {KeyEvent::KEYCODE_VOLUME_MUTE, "KEYCODE_VOLUME_MUTE"},
+    {KeyEvent::KEYCODE_MUTE, "KEYCODE_MUTE"},
+    {KeyEvent::KEYCODE_BRIGHTNESS_UP, "KEYCODE_BRIGHTNESS_UP"},
+    {KeyEvent::KEYCODE_BRIGHTNESS_DOWN, "KEYCODE_BRIGHTNESS_DOWN"},
+    {KeyEvent::KEYCODE_WEAR_1, "KEYCODE_WEAR_1"},
+    {KeyEvent::KEYCODE_0, "KEYCODE_0"},
+    {KeyEvent::KEYCODE_1, "KEYCODE_1"},
+    {KeyEvent::KEYCODE_2, "KEYCODE_2"},
+    {KeyEvent::KEYCODE_3, "KEYCODE_3"},
+    {KeyEvent::KEYCODE_4, "KEYCODE_4"},
+    {KeyEvent::KEYCODE_5, "KEYCODE_5"},
+    {KeyEvent::KEYCODE_6, "KEYCODE_6"},
+    {KeyEvent::KEYCODE_7, "KEYCODE_7"},
+    {KeyEvent::KEYCODE_8, "KEYCODE_8"},
+    {KeyEvent::KEYCODE_9, "KEYCODE_9"},
+    {KeyEvent::KEYCODE_STAR, "KEYCODE_STAR"},
+    {KeyEvent::KEYCODE_POUND, "KEYCODE_POUND"},
+    {KeyEvent::KEYCODE_DPAD_UP, "KEYCODE_DPAD_UP"},
+    {KeyEvent::KEYCODE_DPAD_DOWN, "KEYCODE_DPAD_DOWN"},
+    {KeyEvent::KEYCODE_DPAD_LEFT, "KEYCODE_DPAD_LEFT"},
+    {KeyEvent::KEYCODE_DPAD_RIGHT, "KEYCODE_DPAD_RIGHT"},
+    {KeyEvent::KEYCODE_DPAD_CENTER, "KEYCODE_DPAD_CENTER"},
+    {KeyEvent::KEYCODE_A, "KEYCODE_A"},
+    {KeyEvent::KEYCODE_B, "KEYCODE_B"},
+    {KeyEvent::KEYCODE_C, "KEYCODE_C"},
+    {KeyEvent::KEYCODE_D, "KEYCODE_D"},
+    {KeyEvent::KEYCODE_E, "KEYCODE_E"},
+    {KeyEvent::KEYCODE_F, "KEYCODE_F"},
+    {KeyEvent::KEYCODE_G, "KEYCODE_G"},
+    {KeyEvent::KEYCODE_H, "KEYCODE_H"},
+    {KeyEvent::KEYCODE_I, "KEYCODE_I"},
+    {KeyEvent::KEYCODE_J, "KEYCODE_J"},
+    {KeyEvent::KEYCODE_K, "KEYCODE_K"},
+    {KeyEvent::KEYCODE_L, "KEYCODE_L"},
+    {KeyEvent::KEYCODE_M, "KEYCODE_M"},
+    {KeyEvent::KEYCODE_N, "KEYCODE_N"},
+    {KeyEvent::KEYCODE_O, "KEYCODE_O"},
+    {KeyEvent::KEYCODE_P, "KEYCODE_P"},
+    {KeyEvent::KEYCODE_Q, "KEYCODE_Q"},
+    {KeyEvent::KEYCODE_R, "KEYCODE_R"},
+    {KeyEvent::KEYCODE_S, "KEYCODE_S"},
+    {KeyEvent::KEYCODE_T, "KEYCODE_T"},
+    {KeyEvent::KEYCODE_U, "KEYCODE_U"},
+    {KeyEvent::KEYCODE_V, "KEYCODE_V"},
+    {KeyEvent::KEYCODE_W, "KEYCODE_W"},
+    {KeyEvent::KEYCODE_X, "KEYCODE_X"},
+    {KeyEvent::KEYCODE_Y, "KEYCODE_Y"},
+    {KeyEvent::KEYCODE_Z, "KEYCODE_Z"},
+    {KeyEvent::KEYCODE_COMMA, "KEYCODE_COMMA"},
+    {KeyEvent::KEYCODE_PERIOD, "KEYCODE_PERIOD"},
+    {KeyEvent::KEYCODE_ALT_LEFT, "KEYCODE_ALT_LEFT"},
+    {KeyEvent::KEYCODE_ALT_RIGHT, "KEYCODE_ALT_RIGHT"},
+    {KeyEvent::KEYCODE_SHIFT_LEFT, "KEYCODE_SHIFT_LEFT"},
+    {KeyEvent::KEYCODE_SHIFT_RIGHT, "KEYCODE_SHIFT_RIGHT"},
+    {KeyEvent::KEYCODE_TAB, "KEYCODE_TAB"},
+    {KeyEvent::KEYCODE_SPACE, "KEYCODE_SPACE"},
+    {KeyEvent::KEYCODE_SYM, "KEYCODE_SYM"},
+    {KeyEvent::KEYCODE_EXPLORER, "KEYCODE_EXPLORER"},
+    {KeyEvent::KEYCODE_ENVELOPE, "KEYCODE_ENVELOPE"},
+    {KeyEvent::KEYCODE_ENTER, "KEYCODE_ENTER"},
+    {KeyEvent::KEYCODE_DEL, "KEYCODE_DEL"},
+    {KeyEvent::KEYCODE_GRAVE, "KEYCODE_GRAVE"},
+    {KeyEvent::KEYCODE_MINUS, "KEYCODE_MINUS"},
+    {KeyEvent::KEYCODE_EQUALS, "KEYCODE_EQUALS"},
+    {KeyEvent::KEYCODE_LEFT_BRACKET, "KEYCODE_LEFT_BRACKET"},
+    {KeyEvent::KEYCODE_RIGHT_BRACKET, "KEYCODE_RIGHT_BRACKET"},
+    {KeyEvent::KEYCODE_BACKSLASH, "KEYCODE_BACKSLASH"},
+    {KeyEvent::KEYCODE_SEMICOLON, "KEYCODE_SEMICOLON"},
+    {KeyEvent::KEYCODE_APOSTROPHE, "KEYCODE_APOSTROPHE"},
+    {KeyEvent::KEYCODE_SLASH, "KEYCODE_SLASH"},
+    {KeyEvent::KEYCODE_AT, "KEYCODE_AT"},
+    {KeyEvent::KEYCODE_PLUS, "KEYCODE_PLUS"},
+    {KeyEvent::KEYCODE_MENU, "KEYCODE_MENU"},
+    {KeyEvent::KEYCODE_PAGE_UP, "KEYCODE_PAGE_UP"},
+    {KeyEvent::KEYCODE_PAGE_DOWN, "KEYCODE_PAGE_DOWN"},
+    {KeyEvent::KEYCODE_ESCAPE, "KEYCODE_ESCAPE"},
+    {KeyEvent::KEYCODE_FORWARD_DEL, "KEYCODE_FORWARD_DEL"},
+    {KeyEvent::KEYCODE_CTRL_LEFT, "KEYCODE_CTRL_LEFT"},
+    {KeyEvent::KEYCODE_CTRL_RIGHT, "KEYCODE_CTRL_RIGHT"},
+    {KeyEvent::KEYCODE_CAPS_LOCK, "KEYCODE_CAPS_LOCK"},
+    {KeyEvent::KEYCODE_SCROLL_LOCK, "KEYCODE_SCROLL_LOCK"},
+    {KeyEvent::KEYCODE_META_LEFT, "KEYCODE_META_LEFT"},
+    {KeyEvent::KEYCODE_META_RIGHT, "KEYCODE_META_RIGHT"},
+    {KeyEvent::KEYCODE_FUNCTION, "KEYCODE_FUNCTION"},
+    {KeyEvent::KEYCODE_SYSRQ, "KEYCODE_SYSRQ"},
+    {KeyEvent::KEYCODE_BREAK, "KEYCODE_BREAK"},
+    {KeyEvent::KEYCODE_MOVE_HOME, "KEYCODE_MOVE_HOME"},
+    {KeyEvent::KEYCODE_MOVE_END, "KEYCODE_MOVE_END"},
+    {KeyEvent::KEYCODE_INSERT, "KEYCODE_INSERT"},
+    {KeyEvent::KEYCODE_FORWARD, "KEYCODE_FORWARD"},
+    {KeyEvent::KEYCODE_MEDIA_PLAY, "KEYCODE_MEDIA_PLAY"},
+    {KeyEvent::KEYCODE_MEDIA_PAUSE, "KEYCODE_MEDIA_PAUSE"},
+    {KeyEvent::KEYCODE_MEDIA_CLOSE, "KEYCODE_MEDIA_CLOSE"},
+    {KeyEvent::KEYCODE_MEDIA_EJECT, "KEYCODE_MEDIA_EJECT"},
+    {KeyEvent::KEYCODE_MEDIA_RECORD, "KEYCODE_MEDIA_RECORD"},
+    {KeyEvent::KEYCODE_F1, "KEYCODE_F1"},
+    {KeyEvent::KEYCODE_F2, "KEYCODE_F2"},
+    {KeyEvent::KEYCODE_F3, "KEYCODE_F3"},
+    {KeyEvent::KEYCODE_F4, "KEYCODE_F4"},
+    {KeyEvent::KEYCODE_F5, "KEYCODE_F5"},
+    {KeyEvent::KEYCODE_F6, "KEYCODE_F6"},
+    {KeyEvent::KEYCODE_F7, "KEYCODE_F7"},
+    {KeyEvent::KEYCODE_F8, "KEYCODE_F8"},
+    {KeyEvent::KEYCODE_F9, "KEYCODE_F9"},
+    {KeyEvent::KEYCODE_F10, "KEYCODE_F10"},
+    {KeyEvent::KEYCODE_F11, "KEYCODE_F11"},
+    {KeyEvent::KEYCODE_F12, "KEYCODE_F12"},
+    {KeyEvent::KEYCODE_NUM_LOCK, "KEYCODE_NUM_LOCK"},
+    {KeyEvent::KEYCODE_NUMPAD_0, "KEYCODE_NUMPAD_0"},
+    {KeyEvent::KEYCODE_NUMPAD_1, "KEYCODE_NUMPAD_1"},
+    {KeyEvent::KEYCODE_NUMPAD_2, "KEYCODE_NUMPAD_2"},
+    {KeyEvent::KEYCODE_NUMPAD_3, "KEYCODE_NUMPAD_3"},
+    {KeyEvent::KEYCODE_NUMPAD_4, "KEYCODE_NUMPAD_4"},
+    {KeyEvent::KEYCODE_NUMPAD_5, "KEYCODE_NUMPAD_5"},
+    {KeyEvent::KEYCODE_NUMPAD_6, "KEYCODE_NUMPAD_6"},
+    {KeyEvent::KEYCODE_NUMPAD_7, "KEYCODE_NUMPAD_7"},
+    {KeyEvent::KEYCODE_NUMPAD_8, "KEYCODE_NUMPAD_8"},
+    {KeyEvent::KEYCODE_NUMPAD_9, "KEYCODE_NUMPAD_9"},
+    {KeyEvent::KEYCODE_NUMPAD_DIVIDE, "KEYCODE_NUMPAD_DIVIDE"},
+    {KeyEvent::KEYCODE_NUMPAD_MULTIPLY, "KEYCODE_NUMPAD_MULTIPLY"},
+    {KeyEvent::KEYCODE_NUMPAD_SUBTRACT, "KEYCODE_NUMPAD_SUBTRACT"},
+    {KeyEvent::KEYCODE_NUMPAD_ADD, "KEYCODE_NUMPAD_ADD"},
+    {KeyEvent::KEYCODE_NUMPAD_DOT, "KEYCODE_NUMPAD_DOT"},
+    {KeyEvent::KEYCODE_NUMPAD_COMMA, "KEYCODE_NUMPAD_COMMA"},
+    {KeyEvent::KEYCODE_NUMPAD_ENTER, "KEYCODE_NUMPAD_ENTER"},
+    {KeyEvent::KEYCODE_NUMPAD_EQUALS, "KEYCODE_NUMPAD_EQUALS"},
+    {KeyEvent::KEYCODE_NUMPAD_LEFT_PAREN, "KEYCODE_NUMPAD_LEFT_PAREN"},
+    {KeyEvent::KEYCODE_NUMPAD_RIGHT_PAREN, "KEYCODE_NUMPAD_RIGHT_PAREN"},
+    {KeyEvent::KEYCODE_VIRTUAL_MULTITASK, "KEYCODE_VIRTUAL_MULTITASK"},
+    {KeyEvent::KEYCODE_BUTTON_A, "KEYCODE_BUTTON_A"},
+    {KeyEvent::KEYCODE_BUTTON_B, "KEYCODE_BUTTON_B"},
+    {KeyEvent::KEYCODE_BUTTON_C, "KEYCODE_BUTTON_C"},
+    {KeyEvent::KEYCODE_BUTTON_X, "KEYCODE_BUTTON_X"},
+    {KeyEvent::KEYCODE_BUTTON_Y, "KEYCODE_BUTTON_Y"},
+    {KeyEvent::KEYCODE_BUTTON_Z, "KEYCODE_BUTTON_Z"},
+    {KeyEvent::KEYCODE_BUTTON_L1, "KEYCODE_BUTTON_L1"},
+    {KeyEvent::KEYCODE_BUTTON_R1, "KEYCODE_BUTTON_R1"},
+    {KeyEvent::KEYCODE_BUTTON_L2, "KEYCODE_BUTTON_L2"},
+    {KeyEvent::KEYCODE_BUTTON_R2, "KEYCODE_BUTTON_R2"},
+    {KeyEvent::KEYCODE_BUTTON_SELECT, "KEYCODE_BUTTON_SELECT"},
+    {KeyEvent::KEYCODE_BUTTON_START, "KEYCODE_BUTTON_START"},
+    {KeyEvent::KEYCODE_BUTTON_MODE, "KEYCODE_BUTTON_MODE"},
+    {KeyEvent::KEYCODE_BUTTON_THUMBL, "KEYCODE_BUTTON_THUMBL"},
+    {KeyEvent::KEYCODE_BUTTON_THUMBR, "KEYCODE_BUTTON_THUMBR"},
+    {KeyEvent::KEYCODE_BUTTON_TRIGGER, "KEYCODE_BUTTON_TRIGGER"},
+    {KeyEvent::KEYCODE_BUTTON_THUMB, "KEYCODE_BUTTON_THUMB"},
+    {KeyEvent::KEYCODE_BUTTON_THUMB2, "KEYCODE_BUTTON_THUMB2"},
+    {KeyEvent::KEYCODE_BUTTON_TOP, "KEYCODE_BUTTON_TOP"},
+    {KeyEvent::KEYCODE_BUTTON_TOP2, "KEYCODE_BUTTON_TOP2"},
+    {KeyEvent::KEYCODE_BUTTON_PINKIE, "KEYCODE_BUTTON_PINKIE"},
+    {KeyEvent::KEYCODE_BUTTON_BASE1, "KEYCODE_BUTTON_BASE1"},
+    {KeyEvent::KEYCODE_BUTTON_BASE2, "KEYCODE_BUTTON_BASE2"},
+    {KeyEvent::KEYCODE_BUTTON_BASE3, "KEYCODE_BUTTON_BASE3"},
+    {KeyEvent::KEYCODE_BUTTON_BASE4, "KEYCODE_BUTTON_BASE4"},
+    {KeyEvent::KEYCODE_BUTTON_BASE5, "KEYCODE_BUTTON_BASE5"},
+    {KeyEvent::KEYCODE_BUTTON_BASE6, "KEYCODE_BUTTON_BASE6"},
+    {KeyEvent::KEYCODE_BUTTON_BASE7, "KEYCODE_BUTTON_BASE7"},
+    {KeyEvent::KEYCODE_BUTTON_BASE8, "KEYCODE_BUTTON_BASE8"},
+    {KeyEvent::KEYCODE_BUTTON_BASE9, "KEYCODE_BUTTON_BASE9"},
+    {KeyEvent::KEYCODE_BUTTON_DEAD, "KEYCODE_BUTTON_DEAD"},
+    {KeyEvent::KEYCODE_SLEEP, "KEYCODE_SLEEP"},
+    {KeyEvent::KEYCODE_ZENKAKU_HANKAKU, "KEYCODE_ZENKAKU_HANKAKU"},
+    {KeyEvent::KEYCODE_102ND, "KEYCODE_102ND"},
+    {KeyEvent::KEYCODE_RO, "KEYCODE_RO"},
+    {KeyEvent::KEYCODE_KATAKANA, "KEYCODE_KATAKANA"},
+    {KeyEvent::KEYCODE_HIRAGANA, "KEYCODE_HIRAGANA"},
+    {KeyEvent::KEYCODE_HENKAN, "KEYCODE_HENKAN"},
+    {KeyEvent::KEYCODE_KATAKANA_HIRAGANA, "KEYCODE_KATAKANA_HIRAGANA"},
+    {KeyEvent::KEYCODE_MUHENKAN, "KEYCODE_MUHENKAN"},
+    {KeyEvent::KEYCODE_LINEFEED, "KEYCODE_LINEFEED"},
+    {KeyEvent::KEYCODE_MACRO, "KEYCODE_MACRO"},
+    {KeyEvent::KEYCODE_NUMPAD_PLUSMINUS, "KEYCODE_NUMPAD_PLUSMINUS"},
+    {KeyEvent::KEYCODE_SCALE, "KEYCODE_SCALE"},
+    {KeyEvent::KEYCODE_HANGUEL, "KEYCODE_HANGUEL"},
+    {KeyEvent::KEYCODE_HANJA, "KEYCODE_HANJA"},
+    {KeyEvent::KEYCODE_YEN, "KEYCODE_YEN"},
+    {KeyEvent::KEYCODE_STOP, "KEYCODE_STOP"},
+    {KeyEvent::KEYCODE_AGAIN, "KEYCODE_AGAIN"},
+    {KeyEvent::KEYCODE_PROPS, "KEYCODE_PROPS"},
+    {KeyEvent::KEYCODE_UNDO, "KEYCODE_UNDO"},
+    {KeyEvent::KEYCODE_COPY, "KEYCODE_COPY"},
+    {KeyEvent::KEYCODE_OPEN, "KEYCODE_OPEN"},
+    {KeyEvent::KEYCODE_PASTE, "KEYCODE_PASTE"},
+    {KeyEvent::KEYCODE_FIND, "KEYCODE_FIND"},
+    {KeyEvent::KEYCODE_CUT, "KEYCODE_CUT"},
+    {KeyEvent::KEYCODE_HELP, "KEYCODE_HELP"},
+    {KeyEvent::KEYCODE_CALC, "KEYCODE_CALC"},
+    {KeyEvent::KEYCODE_FILE, "KEYCODE_FILE"},
+    {KeyEvent::KEYCODE_BOOKMARKS, "KEYCODE_BOOKMARKS"},
+    {KeyEvent::KEYCODE_NEXT, "KEYCODE_NEXT"},
+    {KeyEvent::KEYCODE_PLAYPAUSE, "KEYCODE_PLAYPAUSE"},
+    {KeyEvent::KEYCODE_PREVIOUS, "KEYCODE_PREVIOUS"},
+    {KeyEvent::KEYCODE_STOPCD, "KEYCODE_STOPCD"},
+    {KeyEvent::KEYCODE_CONFIG, "KEYCODE_CONFIG"},
+    {KeyEvent::KEYCODE_REFRESH, "KEYCODE_REFRESH"},
+    {KeyEvent::KEYCODE_EXIT, "KEYCODE_EXIT"},
+    {KeyEvent::KEYCODE_EDIT, "KEYCODE_EDIT"},
+    {KeyEvent::KEYCODE_SCROLLUP, "KEYCODE_SCROLLUP"},
+    {KeyEvent::KEYCODE_SCROLLDOWN, "KEYCODE_SCROLLDOWN"},
+    {KeyEvent::KEYCODE_NEW, "KEYCODE_NEW"},
+    {KeyEvent::KEYCODE_REDO, "KEYCODE_REDO"},
+    {KeyEvent::KEYCODE_CLOSE, "KEYCODE_CLOSE"},
+    {KeyEvent::KEYCODE_PLAY, "KEYCODE_PLAY"},
+    {KeyEvent::KEYCODE_BASSBOOST, "KEYCODE_BASSBOOST"},
+    {KeyEvent::KEYCODE_PRINT, "KEYCODE_PRINT"},
+    {KeyEvent::KEYCODE_CHAT, "KEYCODE_CHAT"},
+    {KeyEvent::KEYCODE_FINANCE, "KEYCODE_FINANCE"},
+    {KeyEvent::KEYCODE_CANCEL, "KEYCODE_CANCEL"},
+    {KeyEvent::KEYCODE_KBDILLUM_TOGGLE, "KEYCODE_KBDILLUM_TOGGLE"},
+    {KeyEvent::KEYCODE_KBDILLUM_DOWN, "KEYCODE_KBDILLUM_DOWN"},
+    {KeyEvent::KEYCODE_KBDILLUM_UP, "KEYCODE_KBDILLUM_UP"},
+    {KeyEvent::KEYCODE_SEND, "KEYCODE_SEND"},
+    {KeyEvent::KEYCODE_REPLY, "KEYCODE_REPLY"},
+    {KeyEvent::KEYCODE_FORWARDMAIL, "KEYCODE_FORWARDMAIL"},
+    {KeyEvent::KEYCODE_SAVE, "KEYCODE_SAVE"},
+    {KeyEvent::KEYCODE_DOCUMENTS, "KEYCODE_DOCUMENTS"},
+    {KeyEvent::KEYCODE_VIDEO_NEXT, "KEYCODE_VIDEO_NEXT"},
+    {KeyEvent::KEYCODE_VIDEO_PREV, "KEYCODE_VIDEO_PREV"},
+    {KeyEvent::KEYCODE_BRIGHTNESS_CYCLE, "KEYCODE_BRIGHTNESS_CYCLE"},
+    {KeyEvent::KEYCODE_BRIGHTNESS_ZERO, "KEYCODE_BRIGHTNESS_ZERO"},
+    {KeyEvent::KEYCODE_DISPLAY_OFF, "KEYCODE_DISPLAY_OFF"},
+    {KeyEvent::KEYCODE_BTN_MISC, "KEYCODE_BTN_MISC"},
+    {KeyEvent::KEYCODE_GOTO, "KEYCODE_GOTO"},
+    {KeyEvent::KEYCODE_INFO, "KEYCODE_INFO"},
+    {KeyEvent::KEYCODE_PROGRAM, "KEYCODE_PROGRAM"},
+    {KeyEvent::KEYCODE_PVR, "KEYCODE_PVR"},
+    {KeyEvent::KEYCODE_SUBTITLE, "KEYCODE_SUBTITLE"},
+    {KeyEvent::KEYCODE_FULL_SCREEN, "KEYCODE_FULL_SCREEN"},
+    {KeyEvent::KEYCODE_KEYBOARD, "KEYCODE_KEYBOARD"},
+    {KeyEvent::KEYCODE_ASPECT_RATIO, "KEYCODE_ASPECT_RATIO"},
+    {KeyEvent::KEYCODE_PC, "KEYCODE_PC"},
+    {KeyEvent::KEYCODE_TV, "KEYCODE_TV"},
+    {KeyEvent::KEYCODE_TV2, "KEYCODE_TV2"},
+    {KeyEvent::KEYCODE_VCR, "KEYCODE_VCR"},
+    {KeyEvent::KEYCODE_VCR2, "KEYCODE_VCR2"},
+    {KeyEvent::KEYCODE_SAT, "KEYCODE_SAT"},
+    {KeyEvent::KEYCODE_CD, "KEYCODE_CD"},
+    {KeyEvent::KEYCODE_TAPE, "KEYCODE_TAPE"},
+    {KeyEvent::KEYCODE_TUNER, "KEYCODE_TUNER"},
+    {KeyEvent::KEYCODE_PLAYER, "KEYCODE_PLAYER"},
+    {KeyEvent::KEYCODE_DVD, "KEYCODE_DVD"},
+    {KeyEvent::KEYCODE_AUDIO, "KEYCODE_AUDIO"},
+    {KeyEvent::KEYCODE_VIDEO, "KEYCODE_VIDEO"},
+    {KeyEvent::KEYCODE_MEMO, "KEYCODE_MEMO"},
+    {KeyEvent::KEYCODE_CALENDAR, "KEYCODE_CALENDAR"},
+    {KeyEvent::KEYCODE_RED, "KEYCODE_RED"},
+    {KeyEvent::KEYCODE_GREEN, "KEYCODE_GREEN"},
+    {KeyEvent::KEYCODE_YELLOW, "KEYCODE_YELLOW"},
+    {KeyEvent::KEYCODE_BLUE, "KEYCODE_BLUE"},
+    {KeyEvent::KEYCODE_CHANNELUP, "KEYCODE_CHANNELUP"},
+    {KeyEvent::KEYCODE_CHANNELDOWN, "KEYCODE_CHANNELDOWN"},
+    {KeyEvent::KEYCODE_LAST, "KEYCODE_LAST"},
+    {KeyEvent::KEYCODE_RESTART, "KEYCODE_RESTART"},
+    {KeyEvent::KEYCODE_SLOW, "KEYCODE_SLOW"},
+    {KeyEvent::KEYCODE_SHUFFLE, "KEYCODE_SHUFFLE"},
+    {KeyEvent::KEYCODE_VIDEOPHONE, "KEYCODE_VIDEOPHONE"},
+    {KeyEvent::KEYCODE_GAMES, "KEYCODE_GAMES"},
+    {KeyEvent::KEYCODE_ZOOMIN, "KEYCODE_ZOOMIN"},
+    {KeyEvent::KEYCODE_ZOOMOUT, "KEYCODE_ZOOMOUT"},
+    {KeyEvent::KEYCODE_ZOOMRESET, "KEYCODE_ZOOMRESET"},
+    {KeyEvent::KEYCODE_WORDPROCESSOR, "KEYCODE_WORDPROCESSOR"},
+    {KeyEvent::KEYCODE_EDITOR, "KEYCODE_EDITOR"},
+    {KeyEvent::KEYCODE_SPREADSHEET, "KEYCODE_SPREADSHEET"},
+    {KeyEvent::KEYCODE_GRAPHICSEDITOR, "KEYCODE_GRAPHICSEDITOR"},
+    {KeyEvent::KEYCODE_PRESENTATION, "KEYCODE_PRESENTATION"},
+    {KeyEvent::KEYCODE_DATABASE, "KEYCODE_DATABASE"},
+    {KeyEvent::KEYCODE_NEWS, "KEYCODE_NEWS"},
+    {KeyEvent::KEYCODE_VOICEMAIL, "KEYCODE_VOICEMAIL"},
+    {KeyEvent::KEYCODE_ADDRESSBOOK, "KEYCODE_ADDRESSBOOK"},
+    {KeyEvent::KEYCODE_MESSENGER, "KEYCODE_MESSENGER"},
+    {KeyEvent::KEYCODE_BRIGHTNESS_TOGGLE, "KEYCODE_BRIGHTNESS_TOGGLE"},
+    {KeyEvent::KEYCODE_SPELLCHECK, "KEYCODE_SPELLCHECK"},
+    {KeyEvent::KEYCODE_COFFEE, "KEYCODE_COFFEE"},
+    {KeyEvent::KEYCODE_MEDIA_REPEAT, "KEYCODE_MEDIA_REPEAT"},
+    {KeyEvent::KEYCODE_IMAGES, "KEYCODE_IMAGES"},
+    {KeyEvent::KEYCODE_BUTTONCONFIG, "KEYCODE_BUTTONCONFIG"},
+    {KeyEvent::KEYCODE_TASKMANAGER, "KEYCODE_TASKMANAGER"},
+    {KeyEvent::KEYCODE_JOURNAL, "KEYCODE_JOURNAL"},
+    {KeyEvent::KEYCODE_CONTROLPANEL, "KEYCODE_CONTROLPANEL"},
+    {KeyEvent::KEYCODE_APPSELECT, "KEYCODE_APPSELECT"},
+    {KeyEvent::KEYCODE_SCREENSAVER, "KEYCODE_SCREENSAVER"},
+    {KeyEvent::KEYCODE_ASSISTANT, "KEYCODE_ASSISTANT"},
+    {KeyEvent::KEYCODE_KBD_LAYOUT_NEXT, "KEYCODE_KBD_LAYOUT_NEXT"},
+    {KeyEvent::KEYCODE_BRIGHTNESS_MIN, "KEYCODE_BRIGHTNESS_MIN"},
+    {KeyEvent::KEYCODE_BRIGHTNESS_MAX, "KEYCODE_BRIGHTNESS_MAX"},
+    {KeyEvent::KEYCODE_KBDINPUTASSIST_PREV, "KEYCODE_KBDINPUTASSIST_PREV"},
+    {KeyEvent::KEYCODE_KBDINPUTASSIST_NEXT, "KEYCODE_KBDINPUTASSIST_NEXT"},
+    {KeyEvent::KEYCODE_KBDINPUTASSIST_PREVGROUP, "KEYCODE_KBDINPUTASSIST_PREVGROUP"},
+    {KeyEvent::KEYCODE_KBDINPUTASSIST_NEXTGROUP, "KEYCODE_KBDINPUTASSIST_NEXTGROUP"},
+    {KeyEvent::KEYCODE_KBDINPUTASSIST_ACCEPT, "KEYCODE_KBDINPUTASSIST_ACCEPT"},
+    {KeyEvent::KEYCODE_KBDINPUTASSIST_CANCEL, "KEYCODE_KBDINPUTASSIST_CANCEL"},
+    {KeyEvent::KEYCODE_FRONT, "KEYCODE_FRONT"},
+    {KeyEvent::KEYCODE_SETUP, "KEYCODE_SETUP"},
+    {KeyEvent::KEYCODE_WAKEUP, "KEYCODE_WAKEUP"},
+    {KeyEvent::KEYCODE_SENDFILE, "KEYCODE_SENDFILE"},
+    {KeyEvent::KEYCODE_DELETEFILE, "KEYCODE_DELETEFILE"},
+    {KeyEvent::KEYCODE_XFER, "KEYCODE_XFER"},
+    {KeyEvent::KEYCODE_PROG1, "KEYCODE_PROG1"},
+    {KeyEvent::KEYCODE_PROG2, "KEYCODE_PROG2"},
+    {KeyEvent::KEYCODE_MSDOS, "KEYCODE_MSDOS"},
+    {KeyEvent::KEYCODE_SCREENLOCK, "KEYCODE_SCREENLOCK"},
+    {KeyEvent::KEYCODE_DIRECTION_ROTATE_DISPLAY, "KEYCODE_DIRECTION_ROTATE_DISPLAY"},
+    {KeyEvent::KEYCODE_CYCLEWINDOWS, "KEYCODE_CYCLEWINDOWS"},
+    {KeyEvent::KEYCODE_COMPUTER, "KEYCODE_COMPUTER"},
+    {KeyEvent::KEYCODE_EJECTCLOSECD, "KEYCODE_EJECTCLOSECD"},
+    {KeyEvent::KEYCODE_ISO, "KEYCODE_ISO"},
+    {KeyEvent::KEYCODE_MOVE, "KEYCODE_MOVE"},
+    {KeyEvent::KEYCODE_F13, "KEYCODE_F13"},
+    {KeyEvent::KEYCODE_F14, "KEYCODE_F14"},
+    {KeyEvent::KEYCODE_F15, "KEYCODE_F15"},
+    {KeyEvent::KEYCODE_F16, "KEYCODE_F16"},
+    {KeyEvent::KEYCODE_F17, "KEYCODE_F17"},
+    {KeyEvent::KEYCODE_F18, "KEYCODE_F18"},
+    {KeyEvent::KEYCODE_F19, "KEYCODE_F19"},
+    {KeyEvent::KEYCODE_F20, "KEYCODE_F20"},
+    {KeyEvent::KEYCODE_F21, "KEYCODE_F21"},
+    {KeyEvent::KEYCODE_F22, "KEYCODE_F22"},
+    {KeyEvent::KEYCODE_F23, "KEYCODE_F23"},
+    {KeyEvent::KEYCODE_F24, "KEYCODE_F24"},
+    {KeyEvent::KEYCODE_PROG3, "KEYCODE_PROG3"},
+    {KeyEvent::KEYCODE_PROG4, "KEYCODE_PROG4"},
+    {KeyEvent::KEYCODE_DASHBOARD, "KEYCODE_DASHBOARD"},
+    {KeyEvent::KEYCODE_SUSPEND, "KEYCODE_SUSPEND"},
+    {KeyEvent::KEYCODE_HP, "KEYCODE_HP"},
+    {KeyEvent::KEYCODE_SOUND, "KEYCODE_SOUND"},
+    {KeyEvent::KEYCODE_QUESTION, "KEYCODE_QUESTION"},
+    {KeyEvent::KEYCODE_CONNECT, "KEYCODE_CONNECT"},
+    {KeyEvent::KEYCODE_SPORT, "KEYCODE_SPORT"},
+    {KeyEvent::KEYCODE_SHOP, "KEYCODE_SHOP"},
+    {KeyEvent::KEYCODE_ALTERASE, "KEYCODE_ALTERASE"},
+    {KeyEvent::KEYCODE_SWITCHVIDEOMODE, "KEYCODE_SWITCHVIDEOMODE"},
+    {KeyEvent::KEYCODE_BATTERY, "KEYCODE_BATTERY"},
+    {KeyEvent::KEYCODE_BLUETOOTH, "KEYCODE_BLUETOOTH"},
+    {KeyEvent::KEYCODE_WLAN, "KEYCODE_WLAN"},
+    {KeyEvent::KEYCODE_UWB, "KEYCODE_UWB"},
+    {KeyEvent::KEYCODE_WWAN_WIMAX, "KEYCODE_WWAN_WIMAX"},
+    {KeyEvent::KEYCODE_RFKILL, "KEYCODE_RFKILL"},
+    {KeyEvent::KEYCODE_CHANNEL, "KEYCODE_CHANNEL"},
+    {KeyEvent::KEYCODE_BTN_0, "KEYCODE_BTN_0"},
+    {KeyEvent::KEYCODE_BTN_1, "KEYCODE_BTN_1"},
+    {KeyEvent::KEYCODE_BTN_2, "KEYCODE_BTN_2"},
+    {KeyEvent::KEYCODE_BTN_3, "KEYCODE_BTN_3"},
+    {KeyEvent::KEYCODE_BTN_4, "KEYCODE_BTN_4"},
+    {KeyEvent::KEYCODE_BTN_5, "KEYCODE_BTN_5"},
+    {KeyEvent::KEYCODE_BTN_6, "KEYCODE_BTN_6"},
+    {KeyEvent::KEYCODE_BTN_7, "KEYCODE_BTN_7"},
+    {KeyEvent::KEYCODE_BTN_8, "KEYCODE_BTN_8"},
+    {KeyEvent::KEYCODE_BTN_9, "KEYCODE_BTN_9"},
+    {KeyEvent::KEYCODE_BRL_DOT1, "KEYCODE_BRL_DOT1"},
+    {KeyEvent::KEYCODE_BRL_DOT2, "KEYCODE_BRL_DOT2"},
+    {KeyEvent::KEYCODE_BRL_DOT3, "KEYCODE_BRL_DOT3"},
+    {KeyEvent::KEYCODE_BRL_DOT4, "KEYCODE_BRL_DOT4"},
+    {KeyEvent::KEYCODE_BRL_DOT5, "KEYCODE_BRL_DOT5"},
+    {KeyEvent::KEYCODE_BRL_DOT6, "KEYCODE_BRL_DOT6"},
+    {KeyEvent::KEYCODE_BRL_DOT7, "KEYCODE_BRL_DOT7"},
+    {KeyEvent::KEYCODE_BRL_DOT8, "KEYCODE_BRL_DOT8"},
+    {KeyEvent::KEYCODE_BRL_DOT9, "KEYCODE_BRL_DOT9"},
+    {KeyEvent::KEYCODE_BRL_DOT10, "KEYCODE_BRL_DOT10"},
+    {KeyEvent::KEYCODE_LEFT_KNOB_ROLL_UP, "KEYCODE_LEFT_KNOB_ROLL_UP"},
+    {KeyEvent::KEYCODE_LEFT_KNOB_ROLL_DOWN, "KEYCODE_LEFT_KNOB_ROLL_DOWN"},
+    {KeyEvent::KEYCODE_LEFT_KNOB, "KEYCODE_LEFT_KNOB"},
+    {KeyEvent::KEYCODE_RIGHT_KNOB_ROLL_UP, "KEYCODE_RIGHT_KNOB_ROLL_UP"},
+    {KeyEvent::KEYCODE_RIGHT_KNOB_ROLL_DOWN, "KEYCODE_RIGHT_KNOB_ROLL_DOWN"},
+    {KeyEvent::KEYCODE_RIGHT_KNOB, "KEYCODE_RIGHT_KNOB"},
+    {KeyEvent::KEYCODE_VOICE_SOURCE_SWITCH, "KEYCODE_VOICE_SOURCE_SWITCH"},
+    {KeyEvent::KEYCODE_LAUNCHER_MENU, "KEYCODE_LAUNCHER_MENU"},
+};
 } // namespace
 const int32_t KeyEvent::UNKOWN_FUNCTION_KEY = -1;
 const int32_t KeyEvent::NUM_LOCK_FUNCTION_KEY = 0;
@@ -622,399 +1013,8 @@ const char* KeyEvent::ActionToString(int32_t action)
 const char* KeyEvent::KeyCodeToString(int32_t keyCode)
 {
     CALL_DEBUG_ENTER;
-    static const std::map <int32_t, std::string> keyCodeToString = {
-        {KEYCODE_FN, "KEYCODE_FN"},
-        {KEYCODE_UNKNOWN, "KEYCODE_UNKNOWN"},
-        {KEYCODE_HOME, "KEYCODE_HOME"},
-        {KEYCODE_BACK, "KEYCODE_BACK"},
-        {KEYCODE_CALL, "KEYCODE_CALL"},
-        {KEYCODE_ENDCALL, "KEYCODE_ENDCALL"},
-        {KEYCODE_CLEAR, "KEYCODE_CLEAR"},
-        {KEYCODE_HEADSETHOOK, "KEYCODE_HEADSETHOOK"},
-        {KEYCODE_FOCUS, "KEYCODE_FOCUS"},
-        {KEYCODE_NOTIFICATION, "KEYCODE_NOTIFICATION"},
-        {KEYCODE_SEARCH, "KEYCODE_SEARCH"},
-        {KEYCODE_MEDIA_PLAY_PAUSE, "KEYCODE_MEDIA_PLAY_PAUSE"},
-        {KEYCODE_MEDIA_STOP, "KEYCODE_MEDIA_STOP"},
-        {KEYCODE_MEDIA_NEXT, "KEYCODE_MEDIA_NEXT"},
-        {KEYCODE_MEDIA_PREVIOUS, "KEYCODE_MEDIA_PREVIOUS"},
-        {KEYCODE_MEDIA_REWIND, "KEYCODE_MEDIA_REWIND"},
-        {KEYCODE_MEDIA_FAST_FORWARD, "KEYCODE_MEDIA_FAST_FORWARD"},
-        {KEYCODE_VOLUME_UP, "KEYCODE_VOLUME_UP"},
-        {KEYCODE_VOLUME_DOWN, "KEYCODE_VOLUME_DOWN"},
-        {KEYCODE_POWER, "KEYCODE_POWER"},
-        {KEYCODE_CAMERA, "KEYCODE_CAMERA"},
-        {KEYCODE_VOICE_ASSISTANT, "KEYCODE_VOICE_ASSISTANT"},
-        {KEYCODE_CUSTOM1, "KEYCODE_CUSTOM1"},
-        {KEYCODE_VOLUME_MUTE, "KEYCODE_VOLUME_MUTE"},
-        {KEYCODE_MUTE, "KEYCODE_MUTE"},
-        {KEYCODE_BRIGHTNESS_UP, "KEYCODE_BRIGHTNESS_UP"},
-        {KEYCODE_BRIGHTNESS_DOWN, "KEYCODE_BRIGHTNESS_DOWN"},
-        {KEYCODE_WEAR_1, "KEYCODE_WEAR_1"},
-        {KEYCODE_0, "KEYCODE_0"},
-        {KEYCODE_1, "KEYCODE_1"},
-        {KEYCODE_2, "KEYCODE_2"},
-        {KEYCODE_3, "KEYCODE_3"},
-        {KEYCODE_4, "KEYCODE_4"},
-        {KEYCODE_5, "KEYCODE_5"},
-        {KEYCODE_6, "KEYCODE_6"},
-        {KEYCODE_7, "KEYCODE_7"},
-        {KEYCODE_8, "KEYCODE_8"},
-        {KEYCODE_9, "KEYCODE_9"},
-        {KEYCODE_STAR, "KEYCODE_STAR"},
-        {KEYCODE_POUND, "KEYCODE_POUND"},
-        {KEYCODE_DPAD_UP, "KEYCODE_DPAD_UP"},
-        {KEYCODE_DPAD_DOWN, "KEYCODE_DPAD_DOWN"},
-        {KEYCODE_DPAD_LEFT, "KEYCODE_DPAD_LEFT"},
-        {KEYCODE_DPAD_RIGHT, "KEYCODE_DPAD_RIGHT"},
-        {KEYCODE_DPAD_CENTER, "KEYCODE_DPAD_CENTER"},
-        {KEYCODE_A, "KEYCODE_A"},
-        {KEYCODE_B, "KEYCODE_B"},
-        {KEYCODE_C, "KEYCODE_C"},
-        {KEYCODE_D, "KEYCODE_D"},
-        {KEYCODE_E, "KEYCODE_E"},
-        {KEYCODE_F, "KEYCODE_F"},
-        {KEYCODE_G, "KEYCODE_G"},
-        {KEYCODE_H, "KEYCODE_H"},
-        {KEYCODE_I, "KEYCODE_I"},
-        {KEYCODE_J, "KEYCODE_J"},
-        {KEYCODE_K, "KEYCODE_K"},
-        {KEYCODE_L, "KEYCODE_L"},
-        {KEYCODE_M, "KEYCODE_M"},
-        {KEYCODE_N, "KEYCODE_N"},
-        {KEYCODE_O, "KEYCODE_O"},
-        {KEYCODE_P, "KEYCODE_P"},
-        {KEYCODE_Q, "KEYCODE_Q"},
-        {KEYCODE_R, "KEYCODE_R"},
-        {KEYCODE_S, "KEYCODE_S"},
-        {KEYCODE_T, "KEYCODE_T"},
-        {KEYCODE_U, "KEYCODE_U"},
-        {KEYCODE_V, "KEYCODE_V"},
-        {KEYCODE_W, "KEYCODE_W"},
-        {KEYCODE_X, "KEYCODE_X"},
-        {KEYCODE_Y, "KEYCODE_Y"},
-        {KEYCODE_Z, "KEYCODE_Z"},
-        {KEYCODE_COMMA, "KEYCODE_COMMA"},
-        {KEYCODE_PERIOD, "KEYCODE_PERIOD"},
-        {KEYCODE_ALT_LEFT, "KEYCODE_ALT_LEFT"},
-        {KEYCODE_ALT_RIGHT, "KEYCODE_ALT_RIGHT"},
-        {KEYCODE_SHIFT_LEFT, "KEYCODE_SHIFT_LEFT"},
-        {KEYCODE_SHIFT_RIGHT, "KEYCODE_SHIFT_RIGHT"},
-        {KEYCODE_TAB, "KEYCODE_TAB"},
-        {KEYCODE_SPACE, "KEYCODE_SPACE"},
-        {KEYCODE_SYM, "KEYCODE_SYM"},
-        {KEYCODE_EXPLORER, "KEYCODE_EXPLORER"},
-        {KEYCODE_ENVELOPE, "KEYCODE_ENVELOPE"},
-        {KEYCODE_ENTER, "KEYCODE_ENTER"},
-        {KEYCODE_DEL, "KEYCODE_DEL"},
-        {KEYCODE_GRAVE, "KEYCODE_GRAVE"},
-        {KEYCODE_MINUS, "KEYCODE_MINUS"},
-        {KEYCODE_EQUALS, "KEYCODE_EQUALS"},
-        {KEYCODE_LEFT_BRACKET, "KEYCODE_LEFT_BRACKET"},
-        {KEYCODE_RIGHT_BRACKET, "KEYCODE_RIGHT_BRACKET"},
-        {KEYCODE_BACKSLASH, "KEYCODE_BACKSLASH"},
-        {KEYCODE_SEMICOLON, "KEYCODE_SEMICOLON"},
-        {KEYCODE_APOSTROPHE, "KEYCODE_APOSTROPHE"},
-        {KEYCODE_SLASH, "KEYCODE_SLASH"},
-        {KEYCODE_AT, "KEYCODE_AT"},
-        {KEYCODE_PLUS, "KEYCODE_PLUS"},
-        {KEYCODE_MENU, "KEYCODE_MENU"},
-        {KEYCODE_PAGE_UP, "KEYCODE_PAGE_UP"},
-        {KEYCODE_PAGE_DOWN, "KEYCODE_PAGE_DOWN"},
-        {KEYCODE_ESCAPE, "KEYCODE_ESCAPE"},
-        {KEYCODE_FORWARD_DEL, "KEYCODE_FORWARD_DEL"},
-        {KEYCODE_CTRL_LEFT, "KEYCODE_CTRL_LEFT"},
-        {KEYCODE_CTRL_RIGHT, "KEYCODE_CTRL_RIGHT"},
-        {KEYCODE_CAPS_LOCK, "KEYCODE_CAPS_LOCK"},
-        {KEYCODE_SCROLL_LOCK, "KEYCODE_SCROLL_LOCK"},
-        {KEYCODE_META_LEFT, "KEYCODE_META_LEFT"},
-        {KEYCODE_META_RIGHT, "KEYCODE_META_RIGHT"},
-        {KEYCODE_FUNCTION, "KEYCODE_FUNCTION"},
-        {KEYCODE_SYSRQ, "KEYCODE_SYSRQ"},
-        {KEYCODE_BREAK, "KEYCODE_BREAK"},
-        {KEYCODE_MOVE_HOME, "KEYCODE_MOVE_HOME"},
-        {KEYCODE_MOVE_END, "KEYCODE_MOVE_END"},
-        {KEYCODE_INSERT, "KEYCODE_INSERT"},
-        {KEYCODE_FORWARD, "KEYCODE_FORWARD"},
-        {KEYCODE_MEDIA_PLAY, "KEYCODE_MEDIA_PLAY"},
-        {KEYCODE_MEDIA_PAUSE, "KEYCODE_MEDIA_PAUSE"},
-        {KEYCODE_MEDIA_CLOSE, "KEYCODE_MEDIA_CLOSE"},
-        {KEYCODE_MEDIA_EJECT, "KEYCODE_MEDIA_EJECT"},
-        {KEYCODE_MEDIA_RECORD, "KEYCODE_MEDIA_RECORD"},
-        {KEYCODE_F1, "KEYCODE_F1"},
-        {KEYCODE_F2, "KEYCODE_F2"},
-        {KEYCODE_F3, "KEYCODE_F3"},
-        {KEYCODE_F4, "KEYCODE_F4"},
-        {KEYCODE_F5, "KEYCODE_F5"},
-        {KEYCODE_F6, "KEYCODE_F6"},
-        {KEYCODE_F7, "KEYCODE_F7"},
-        {KEYCODE_F8, "KEYCODE_F8"},
-        {KEYCODE_F9, "KEYCODE_F9"},
-        {KEYCODE_F10, "KEYCODE_F10"},
-        {KEYCODE_F11, "KEYCODE_F11"},
-        {KEYCODE_F12, "KEYCODE_F12"},
-        {KEYCODE_NUM_LOCK, "KEYCODE_NUM_LOCK"},
-        {KEYCODE_NUMPAD_0, "KEYCODE_NUMPAD_0"},
-        {KEYCODE_NUMPAD_1, "KEYCODE_NUMPAD_1"},
-        {KEYCODE_NUMPAD_2, "KEYCODE_NUMPAD_2"},
-        {KEYCODE_NUMPAD_3, "KEYCODE_NUMPAD_3"},
-        {KEYCODE_NUMPAD_4, "KEYCODE_NUMPAD_4"},
-        {KEYCODE_NUMPAD_5, "KEYCODE_NUMPAD_5"},
-        {KEYCODE_NUMPAD_6, "KEYCODE_NUMPAD_6"},
-        {KEYCODE_NUMPAD_7, "KEYCODE_NUMPAD_7"},
-        {KEYCODE_NUMPAD_8, "KEYCODE_NUMPAD_8"},
-        {KEYCODE_NUMPAD_9, "KEYCODE_NUMPAD_9"},
-        {KEYCODE_NUMPAD_DIVIDE, "KEYCODE_NUMPAD_DIVIDE"},
-        {KEYCODE_NUMPAD_MULTIPLY, "KEYCODE_NUMPAD_MULTIPLY"},
-        {KEYCODE_NUMPAD_SUBTRACT, "KEYCODE_NUMPAD_SUBTRACT"},
-        {KEYCODE_NUMPAD_ADD, "KEYCODE_NUMPAD_ADD"},
-        {KEYCODE_NUMPAD_DOT, "KEYCODE_NUMPAD_DOT"},
-        {KEYCODE_NUMPAD_COMMA, "KEYCODE_NUMPAD_COMMA"},
-        {KEYCODE_NUMPAD_ENTER, "KEYCODE_NUMPAD_ENTER"},
-        {KEYCODE_NUMPAD_EQUALS, "KEYCODE_NUMPAD_EQUALS"},
-        {KEYCODE_NUMPAD_LEFT_PAREN, "KEYCODE_NUMPAD_LEFT_PAREN"},
-        {KEYCODE_NUMPAD_RIGHT_PAREN, "KEYCODE_NUMPAD_RIGHT_PAREN"},
-        {KEYCODE_VIRTUAL_MULTITASK, "KEYCODE_VIRTUAL_MULTITASK"},
-        {KEYCODE_BUTTON_A, "KEYCODE_BUTTON_A"},
-        {KEYCODE_BUTTON_B, "KEYCODE_BUTTON_B"},
-        {KEYCODE_BUTTON_C, "KEYCODE_BUTTON_C"},
-        {KEYCODE_BUTTON_X, "KEYCODE_BUTTON_X"},
-        {KEYCODE_BUTTON_Y, "KEYCODE_BUTTON_Y"},
-        {KEYCODE_BUTTON_Z, "KEYCODE_BUTTON_Z"},
-        {KEYCODE_BUTTON_L1, "KEYCODE_BUTTON_L1"},
-        {KEYCODE_BUTTON_R1, "KEYCODE_BUTTON_R1"},
-        {KEYCODE_BUTTON_L2, "KEYCODE_BUTTON_L2"},
-        {KEYCODE_BUTTON_R2, "KEYCODE_BUTTON_R2"},
-        {KEYCODE_BUTTON_SELECT, "KEYCODE_BUTTON_SELECT"},
-        {KEYCODE_BUTTON_START, "KEYCODE_BUTTON_START"},
-        {KEYCODE_BUTTON_MODE, "KEYCODE_BUTTON_MODE"},
-        {KEYCODE_BUTTON_THUMBL, "KEYCODE_BUTTON_THUMBL"},
-        {KEYCODE_BUTTON_THUMBR, "KEYCODE_BUTTON_THUMBR"},
-        {KEYCODE_BUTTON_TRIGGER, "KEYCODE_BUTTON_TRIGGER"},
-        {KEYCODE_BUTTON_THUMB, "KEYCODE_BUTTON_THUMB"},
-        {KEYCODE_BUTTON_THUMB2, "KEYCODE_BUTTON_THUMB2"},
-        {KEYCODE_BUTTON_TOP, "KEYCODE_BUTTON_TOP"},
-        {KEYCODE_BUTTON_TOP2, "KEYCODE_BUTTON_TOP2"},
-        {KEYCODE_BUTTON_PINKIE, "KEYCODE_BUTTON_PINKIE"},
-        {KEYCODE_BUTTON_BASE1, "KEYCODE_BUTTON_BASE1"},
-        {KEYCODE_BUTTON_BASE2, "KEYCODE_BUTTON_BASE2"},
-        {KEYCODE_BUTTON_BASE3, "KEYCODE_BUTTON_BASE3"},
-        {KEYCODE_BUTTON_BASE4, "KEYCODE_BUTTON_BASE4"},
-        {KEYCODE_BUTTON_BASE5, "KEYCODE_BUTTON_BASE5"},
-        {KEYCODE_BUTTON_BASE6, "KEYCODE_BUTTON_BASE6"},
-        {KEYCODE_BUTTON_BASE7, "KEYCODE_BUTTON_BASE7"},
-        {KEYCODE_BUTTON_BASE8, "KEYCODE_BUTTON_BASE8"},
-        {KEYCODE_BUTTON_BASE9, "KEYCODE_BUTTON_BASE9"},
-        {KEYCODE_BUTTON_DEAD, "KEYCODE_BUTTON_DEAD"},
-        {KEYCODE_SLEEP, "KEYCODE_SLEEP"},
-        {KEYCODE_ZENKAKU_HANKAKU, "KEYCODE_ZENKAKU_HANKAKU"},
-        {KEYCODE_102ND, "KEYCODE_102ND"},
-        {KEYCODE_RO, "KEYCODE_RO"},
-        {KEYCODE_KATAKANA, "KEYCODE_KATAKANA"},
-        {KEYCODE_HIRAGANA, "KEYCODE_HIRAGANA"},
-        {KEYCODE_HENKAN, "KEYCODE_HENKAN"},
-        {KEYCODE_KATAKANA_HIRAGANA, "KEYCODE_KATAKANA_HIRAGANA"},
-        {KEYCODE_MUHENKAN, "KEYCODE_MUHENKAN"},
-        {KEYCODE_LINEFEED, "KEYCODE_LINEFEED"},
-        {KEYCODE_MACRO, "KEYCODE_MACRO"},
-        {KEYCODE_NUMPAD_PLUSMINUS, "KEYCODE_NUMPAD_PLUSMINUS"},
-        {KEYCODE_SCALE, "KEYCODE_SCALE"},
-        {KEYCODE_HANGUEL, "KEYCODE_HANGUEL"},
-        {KEYCODE_HANJA, "KEYCODE_HANJA"},
-        {KEYCODE_YEN, "KEYCODE_YEN"},
-        {KEYCODE_STOP, "KEYCODE_STOP"},
-        {KEYCODE_AGAIN, "KEYCODE_AGAIN"},
-        {KEYCODE_PROPS, "KEYCODE_PROPS"},
-        {KEYCODE_UNDO, "KEYCODE_UNDO"},
-        {KEYCODE_COPY, "KEYCODE_COPY"},
-        {KEYCODE_OPEN, "KEYCODE_OPEN"},
-        {KEYCODE_PASTE, "KEYCODE_PASTE"},
-        {KEYCODE_FIND, "KEYCODE_FIND"},
-        {KEYCODE_CUT, "KEYCODE_CUT"},
-        {KEYCODE_HELP, "KEYCODE_HELP"},
-        {KEYCODE_CALC, "KEYCODE_CALC"},
-        {KEYCODE_FILE, "KEYCODE_FILE"},
-        {KEYCODE_BOOKMARKS, "KEYCODE_BOOKMARKS"},
-        {KEYCODE_NEXT, "KEYCODE_NEXT"},
-        {KEYCODE_PLAYPAUSE, "KEYCODE_PLAYPAUSE"},
-        {KEYCODE_PREVIOUS, "KEYCODE_PREVIOUS"},
-        {KEYCODE_STOPCD, "KEYCODE_STOPCD"},
-        {KEYCODE_CONFIG, "KEYCODE_CONFIG"},
-        {KEYCODE_REFRESH, "KEYCODE_REFRESH"},
-        {KEYCODE_EXIT, "KEYCODE_EXIT"},
-        {KEYCODE_EDIT, "KEYCODE_EDIT"},
-        {KEYCODE_SCROLLUP, "KEYCODE_SCROLLUP"},
-        {KEYCODE_SCROLLDOWN, "KEYCODE_SCROLLDOWN"},
-        {KEYCODE_NEW, "KEYCODE_NEW"},
-        {KEYCODE_REDO, "KEYCODE_REDO"},
-        {KEYCODE_CLOSE, "KEYCODE_CLOSE"},
-        {KEYCODE_PLAY, "KEYCODE_PLAY"},
-        {KEYCODE_BASSBOOST, "KEYCODE_BASSBOOST"},
-        {KEYCODE_PRINT, "KEYCODE_PRINT"},
-        {KEYCODE_CHAT, "KEYCODE_CHAT"},
-        {KEYCODE_FINANCE, "KEYCODE_FINANCE"},
-        {KEYCODE_CANCEL, "KEYCODE_CANCEL"},
-        {KEYCODE_KBDILLUM_TOGGLE, "KEYCODE_KBDILLUM_TOGGLE"},
-        {KEYCODE_KBDILLUM_DOWN, "KEYCODE_KBDILLUM_DOWN"},
-        {KEYCODE_KBDILLUM_UP, "KEYCODE_KBDILLUM_UP"},
-        {KEYCODE_SEND, "KEYCODE_SEND"},
-        {KEYCODE_REPLY, "KEYCODE_REPLY"},
-        {KEYCODE_FORWARDMAIL, "KEYCODE_FORWARDMAIL"},
-        {KEYCODE_SAVE, "KEYCODE_SAVE"},
-        {KEYCODE_DOCUMENTS, "KEYCODE_DOCUMENTS"},
-        {KEYCODE_VIDEO_NEXT, "KEYCODE_VIDEO_NEXT"},
-        {KEYCODE_VIDEO_PREV, "KEYCODE_VIDEO_PREV"},
-        {KEYCODE_BRIGHTNESS_CYCLE, "KEYCODE_BRIGHTNESS_CYCLE"},
-        {KEYCODE_BRIGHTNESS_ZERO, "KEYCODE_BRIGHTNESS_ZERO"},
-        {KEYCODE_DISPLAY_OFF, "KEYCODE_DISPLAY_OFF"},
-        {KEYCODE_BTN_MISC, "KEYCODE_BTN_MISC"},
-        {KEYCODE_GOTO, "KEYCODE_GOTO"},
-        {KEYCODE_INFO, "KEYCODE_INFO"},
-        {KEYCODE_PROGRAM, "KEYCODE_PROGRAM"},
-        {KEYCODE_PVR, "KEYCODE_PVR"},
-        {KEYCODE_SUBTITLE, "KEYCODE_SUBTITLE"},
-        {KEYCODE_FULL_SCREEN, "KEYCODE_FULL_SCREEN"},
-        {KEYCODE_KEYBOARD, "KEYCODE_KEYBOARD"},
-        {KEYCODE_ASPECT_RATIO, "KEYCODE_ASPECT_RATIO"},
-        {KEYCODE_PC, "KEYCODE_PC"},
-        {KEYCODE_TV, "KEYCODE_TV"},
-        {KEYCODE_TV2, "KEYCODE_TV2"},
-        {KEYCODE_VCR, "KEYCODE_VCR"},
-        {KEYCODE_VCR2, "KEYCODE_VCR2"},
-        {KEYCODE_SAT, "KEYCODE_SAT"},
-        {KEYCODE_CD, "KEYCODE_CD"},
-        {KEYCODE_TAPE, "KEYCODE_TAPE"},
-        {KEYCODE_TUNER, "KEYCODE_TUNER"},
-        {KEYCODE_PLAYER, "KEYCODE_PLAYER"},
-        {KEYCODE_DVD, "KEYCODE_DVD"},
-        {KEYCODE_AUDIO, "KEYCODE_AUDIO"},
-        {KEYCODE_VIDEO, "KEYCODE_VIDEO"},
-        {KEYCODE_MEMO, "KEYCODE_MEMO"},
-        {KEYCODE_CALENDAR, "KEYCODE_CALENDAR"},
-        {KEYCODE_RED, "KEYCODE_RED"},
-        {KEYCODE_GREEN, "KEYCODE_GREEN"},
-        {KEYCODE_YELLOW, "KEYCODE_YELLOW"},
-        {KEYCODE_BLUE, "KEYCODE_BLUE"},
-        {KEYCODE_CHANNELUP, "KEYCODE_CHANNELUP"},
-        {KEYCODE_CHANNELDOWN, "KEYCODE_CHANNELDOWN"},
-        {KEYCODE_LAST, "KEYCODE_LAST"},
-        {KEYCODE_RESTART, "KEYCODE_RESTART"},
-        {KEYCODE_SLOW, "KEYCODE_SLOW"},
-        {KEYCODE_SHUFFLE, "KEYCODE_SHUFFLE"},
-        {KEYCODE_VIDEOPHONE, "KEYCODE_VIDEOPHONE"},
-        {KEYCODE_GAMES, "KEYCODE_GAMES"},
-        {KEYCODE_ZOOMIN, "KEYCODE_ZOOMIN"},
-        {KEYCODE_ZOOMOUT, "KEYCODE_ZOOMOUT"},
-        {KEYCODE_ZOOMRESET, "KEYCODE_ZOOMRESET"},
-        {KEYCODE_WORDPROCESSOR, "KEYCODE_WORDPROCESSOR"},
-        {KEYCODE_EDITOR, "KEYCODE_EDITOR"},
-        {KEYCODE_SPREADSHEET, "KEYCODE_SPREADSHEET"},
-        {KEYCODE_GRAPHICSEDITOR, "KEYCODE_GRAPHICSEDITOR"},
-        {KEYCODE_PRESENTATION, "KEYCODE_PRESENTATION"},
-        {KEYCODE_DATABASE, "KEYCODE_DATABASE"},
-        {KEYCODE_NEWS, "KEYCODE_NEWS"},
-        {KEYCODE_VOICEMAIL, "KEYCODE_VOICEMAIL"},
-        {KEYCODE_ADDRESSBOOK, "KEYCODE_ADDRESSBOOK"},
-        {KEYCODE_MESSENGER, "KEYCODE_MESSENGER"},
-        {KEYCODE_BRIGHTNESS_TOGGLE, "KEYCODE_BRIGHTNESS_TOGGLE"},
-        {KEYCODE_SPELLCHECK, "KEYCODE_SPELLCHECK"},
-        {KEYCODE_COFFEE, "KEYCODE_COFFEE"},
-        {KEYCODE_MEDIA_REPEAT, "KEYCODE_MEDIA_REPEAT"},
-        {KEYCODE_IMAGES, "KEYCODE_IMAGES"},
-        {KEYCODE_BUTTONCONFIG, "KEYCODE_BUTTONCONFIG"},
-        {KEYCODE_TASKMANAGER, "KEYCODE_TASKMANAGER"},
-        {KEYCODE_JOURNAL, "KEYCODE_JOURNAL"},
-        {KEYCODE_CONTROLPANEL, "KEYCODE_CONTROLPANEL"},
-        {KEYCODE_APPSELECT, "KEYCODE_APPSELECT"},
-        {KEYCODE_SCREENSAVER, "KEYCODE_SCREENSAVER"},
-        {KEYCODE_ASSISTANT, "KEYCODE_ASSISTANT"},
-        {KEYCODE_KBD_LAYOUT_NEXT, "KEYCODE_KBD_LAYOUT_NEXT"},
-        {KEYCODE_BRIGHTNESS_MIN, "KEYCODE_BRIGHTNESS_MIN"},
-        {KEYCODE_BRIGHTNESS_MAX, "KEYCODE_BRIGHTNESS_MAX"},
-        {KEYCODE_KBDINPUTASSIST_PREV, "KEYCODE_KBDINPUTASSIST_PREV"},
-        {KEYCODE_KBDINPUTASSIST_NEXT, "KEYCODE_KBDINPUTASSIST_NEXT"},
-        {KEYCODE_KBDINPUTASSIST_PREVGROUP, "KEYCODE_KBDINPUTASSIST_PREVGROUP"},
-        {KEYCODE_KBDINPUTASSIST_NEXTGROUP, "KEYCODE_KBDINPUTASSIST_NEXTGROUP"},
-        {KEYCODE_KBDINPUTASSIST_ACCEPT, "KEYCODE_KBDINPUTASSIST_ACCEPT"},
-        {KEYCODE_KBDINPUTASSIST_CANCEL, "KEYCODE_KBDINPUTASSIST_CANCEL"},
-        {KEYCODE_FRONT, "KEYCODE_FRONT"},
-        {KEYCODE_SETUP, "KEYCODE_SETUP"},
-        {KEYCODE_WAKEUP, "KEYCODE_WAKEUP"},
-        {KEYCODE_SENDFILE, "KEYCODE_SENDFILE"},
-        {KEYCODE_DELETEFILE, "KEYCODE_DELETEFILE"},
-        {KEYCODE_XFER, "KEYCODE_XFER"},
-        {KEYCODE_PROG1, "KEYCODE_PROG1"},
-        {KEYCODE_PROG2, "KEYCODE_PROG2"},
-        {KEYCODE_MSDOS, "KEYCODE_MSDOS"},
-        {KEYCODE_SCREENLOCK, "KEYCODE_SCREENLOCK"},
-        {KEYCODE_DIRECTION_ROTATE_DISPLAY, "KEYCODE_DIRECTION_ROTATE_DISPLAY"},
-        {KEYCODE_CYCLEWINDOWS, "KEYCODE_CYCLEWINDOWS"},
-        {KEYCODE_COMPUTER, "KEYCODE_COMPUTER"},
-        {KEYCODE_EJECTCLOSECD, "KEYCODE_EJECTCLOSECD"},
-        {KEYCODE_ISO, "KEYCODE_ISO"},
-        {KEYCODE_MOVE, "KEYCODE_MOVE"},
-        {KEYCODE_F13, "KEYCODE_F13"},
-        {KEYCODE_F14, "KEYCODE_F14"},
-        {KEYCODE_F15, "KEYCODE_F15"},
-        {KEYCODE_F16, "KEYCODE_F16"},
-        {KEYCODE_F17, "KEYCODE_F17"},
-        {KEYCODE_F18, "KEYCODE_F18"},
-        {KEYCODE_F19, "KEYCODE_F19"},
-        {KEYCODE_F20, "KEYCODE_F20"},
-        {KEYCODE_F21, "KEYCODE_F21"},
-        {KEYCODE_F22, "KEYCODE_F22"},
-        {KEYCODE_F23, "KEYCODE_F23"},
-        {KEYCODE_F24, "KEYCODE_F24"},
-        {KEYCODE_PROG3, "KEYCODE_PROG3"},
-        {KEYCODE_PROG4, "KEYCODE_PROG4"},
-        {KEYCODE_DASHBOARD, "KEYCODE_DASHBOARD"},
-        {KEYCODE_SUSPEND, "KEYCODE_SUSPEND"},
-        {KEYCODE_HP, "KEYCODE_HP"},
-        {KEYCODE_SOUND, "KEYCODE_SOUND"},
-        {KEYCODE_QUESTION, "KEYCODE_QUESTION"},
-        {KEYCODE_CONNECT, "KEYCODE_CONNECT"},
-        {KEYCODE_SPORT, "KEYCODE_SPORT"},
-        {KEYCODE_SHOP, "KEYCODE_SHOP"},
-        {KEYCODE_ALTERASE, "KEYCODE_ALTERASE"},
-        {KEYCODE_SWITCHVIDEOMODE, "KEYCODE_SWITCHVIDEOMODE"},
-        {KEYCODE_BATTERY, "KEYCODE_BATTERY"},
-        {KEYCODE_BLUETOOTH, "KEYCODE_BLUETOOTH"},
-        {KEYCODE_WLAN, "KEYCODE_WLAN"},
-        {KEYCODE_UWB, "KEYCODE_UWB"},
-        {KEYCODE_WWAN_WIMAX, "KEYCODE_WWAN_WIMAX"},
-        {KEYCODE_RFKILL, "KEYCODE_RFKILL"},
-        {KEYCODE_CHANNEL, "KEYCODE_CHANNEL"},
-        {KEYCODE_BTN_0, "KEYCODE_BTN_0"},
-        {KEYCODE_BTN_1, "KEYCODE_BTN_1"},
-        {KEYCODE_BTN_2, "KEYCODE_BTN_2"},
-        {KEYCODE_BTN_3, "KEYCODE_BTN_3"},
-        {KEYCODE_BTN_4, "KEYCODE_BTN_4"},
-        {KEYCODE_BTN_5, "KEYCODE_BTN_5"},
-        {KEYCODE_BTN_6, "KEYCODE_BTN_6"},
-        {KEYCODE_BTN_7, "KEYCODE_BTN_7"},
-        {KEYCODE_BTN_8, "KEYCODE_BTN_8"},
-        {KEYCODE_BTN_9, "KEYCODE_BTN_9"},
-        {KEYCODE_BRL_DOT1, "KEYCODE_BRL_DOT1"},
-        {KEYCODE_BRL_DOT2, "KEYCODE_BRL_DOT2"},
-        {KEYCODE_BRL_DOT3, "KEYCODE_BRL_DOT3"},
-        {KEYCODE_BRL_DOT4, "KEYCODE_BRL_DOT4"},
-        {KEYCODE_BRL_DOT5, "KEYCODE_BRL_DOT5"},
-        {KEYCODE_BRL_DOT6, "KEYCODE_BRL_DOT6"},
-        {KEYCODE_BRL_DOT7, "KEYCODE_BRL_DOT7"},
-        {KEYCODE_BRL_DOT8, "KEYCODE_BRL_DOT8"},
-        {KEYCODE_BRL_DOT9, "KEYCODE_BRL_DOT9"},
-        {KEYCODE_BRL_DOT10, "KEYCODE_BRL_DOT10"},
-        {KEYCODE_LEFT_KNOB_ROLL_UP, "KEYCODE_LEFT_KNOB_ROLL_UP"},
-        {KEYCODE_LEFT_KNOB_ROLL_DOWN, "KEYCODE_LEFT_KNOB_ROLL_DOWN"},
-        {KEYCODE_LEFT_KNOB, "KEYCODE_LEFT_KNOB"},
-        {KEYCODE_RIGHT_KNOB_ROLL_UP, "KEYCODE_RIGHT_KNOB_ROLL_UP"},
-        {KEYCODE_RIGHT_KNOB_ROLL_DOWN, "KEYCODE_RIGHT_KNOB_ROLL_DOWN"},
-        {KEYCODE_RIGHT_KNOB, "KEYCODE_RIGHT_KNOB"},
-        {KEYCODE_VOICE_SOURCE_SWITCH, "KEYCODE_VOICE_SOURCE_SWITCH"},
-        {KEYCODE_LAUNCHER_MENU, "KEYCODE_LAUNCHER_MENU"},
-    };
-    auto iter = keyCodeToString.find(keyCode);
-    if (iter == keyCodeToString.end()) {
+    auto iter = KEYCODE_TO_STRING.find(keyCode);
+    if (iter == KEYCODE_TO_STRING.end()) {
         MMI_HILOGD("Failed to find the keycode");
         return "KEYCODE_INVALID";
     }
diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index cfb053a7c9..234c9ffa31 100755
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -40,6 +40,8 @@ public:
     void TearDown();
     static void SetUpTestCase();
     std::string GetEventDump();
+    std::shared_ptr<KeyOption> InitOption(const std::set<int32_t> &preKeys,
+        int32_t finalKey, bool isFinalKeyDown, int32_t duration);
     std::shared_ptr<PointerEvent> SetupPointerEvent001();
     std::shared_ptr<PointerEvent> SetupPointerEvent002();
     std::shared_ptr<PointerEvent> SetupPointerEvent003();
@@ -1390,6 +1392,17 @@ HWTEST_F(InputManagerTest, InputManager_NotResponse_002, TestSize.Level1)
     InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
 }
 
+std::shared_ptr<KeyOption> InputManagerTest::InitOption(const std::set<int32_t> &preKeys,
+    int32_t finalKey, bool isFinalKeyDown, int32_t duration)
+{
+    std::shared_ptr<KeyOption> keyOption = std::make_shared<KeyOption>();
+    keyOption->SetPreKeys(preKeys);
+    keyOption->SetFinalKey(finalKey);
+    keyOption->SetFinalKeyDown(isFinalKeyDown);
+    keyOption->SetFinalKeyDownDuration(duration);
+    return keyOption;
+}
+
 /**
  * @tc.name: InputManagerTest_SubscribeKeyEvent_001
  * @tc.desc: Verify invalid parameter.
@@ -1401,11 +1414,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SubscribeKeyEvent_001, TestSize.Leve
 {
     CALL_DEBUG_ENTER;
     std::set<int32_t> preKeys;
-    std::shared_ptr<KeyOption> keyOption = std::make_shared<KeyOption>();
-    keyOption->SetPreKeys(preKeys);
-    keyOption->SetFinalKey(KeyEvent::KEYCODE_VOLUME_MUTE);
-    keyOption->SetFinalKeyDown(true);
-    keyOption->SetFinalKeyDownDuration(0);
+    std::shared_ptr<KeyOption> keyOption = InitOption(preKeys, KeyEvent::KEYCODE_VOLUME_MUTE, true, 0);
     int32_t response = -1;
     response = InputManager::GetInstance()->SubscribeKeyEvent(keyOption, nullptr);
     EXPECT_TRUE(response < 0);
@@ -1426,11 +1435,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SubscribeKeyEvent_02, TestSize.Level
     ASSERT_TRUE(MMIEventHdl.InitClient());
     // 电源键长按按下订阅
     std::set<int32_t> preKeys;
-    std::shared_ptr<KeyOption> keyOption = std::make_shared<KeyOption>();
-    keyOption->SetPreKeys(preKeys);
-    keyOption->SetFinalKey(KeyEvent::KEYCODE_POWER);
-    keyOption->SetFinalKeyDown(true);
-    keyOption->SetFinalKeyDownDuration(2000);
+    std::shared_ptr<KeyOption> keyOption = InitOption(preKeys, KeyEvent::KEYCODE_POWER, true, 2000);
     int32_t subscribeId1 = -1;
     subscribeId1 = InputManager::GetInstance()->SubscribeKeyEvent(keyOption,
         [](std::shared_ptr<KeyEvent> keyEvent) {
@@ -1444,11 +1449,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SubscribeKeyEvent_02, TestSize.Level
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
 
     // 电源键抬起订阅
-    std::shared_ptr<KeyOption> keyOption2 = std::make_shared<KeyOption>();
-    keyOption2->SetPreKeys(preKeys);
-    keyOption2->SetFinalKey(KeyEvent::KEYCODE_POWER);
-    keyOption2->SetFinalKeyDown(false);
-    keyOption2->SetFinalKeyDownDuration(0);
+    std::shared_ptr<KeyOption> keyOption2 = InitOption(preKeys, KeyEvent::KEYCODE_POWER, false, 0);
     int32_t subscribeId2 = -1;
     subscribeId2 = InputManager::GetInstance()->SubscribeKeyEvent(keyOption2,
         [](std::shared_ptr<KeyEvent> keyEvent) {
@@ -1478,44 +1479,28 @@ HWTEST_F(InputManagerTest, InputManagerTest_SubscribeKeyEvent_03, TestSize.Level
     CALL_DEBUG_ENTER;
     ASSERT_TRUE(MMIEventHdl.InitClient());
     std::set<int32_t> preKeys;
-    std::shared_ptr<KeyOption> keyOption1 = std::make_shared<KeyOption>();
-    keyOption1->SetPreKeys(preKeys);
-    keyOption1->SetFinalKey(KeyEvent::KEYCODE_VOLUME_UP);
-    keyOption1->SetFinalKeyDown(true);
-    keyOption1->SetFinalKeyDownDuration(10);
+    std::shared_ptr<KeyOption> keyOption1 = InitOption(preKeys, KeyEvent::KEYCODE_VOLUME_UP, true, 10);
     int32_t subscribeId1 = -1;
     subscribeId1 = InputManager::GetInstance()->SubscribeKeyEvent(keyOption1,
         [](std::shared_ptr<KeyEvent> keyEvent) {
         EventLogHelper::PrintEventData(keyEvent);
         MMI_HILOGD("Subscribe key event KEYCODE_VOLUME_UP down trigger callback");
     });
-    std::shared_ptr<KeyOption> keyOption2 = std::make_shared<KeyOption>();
-    keyOption2->SetPreKeys(preKeys);
-    keyOption2->SetFinalKey(KeyEvent::KEYCODE_VOLUME_UP);
-    keyOption2->SetFinalKeyDown(false);
-    keyOption2->SetFinalKeyDownDuration(0);
+    std::shared_ptr<KeyOption> keyOption2 = InitOption(preKeys, KeyEvent::KEYCODE_VOLUME_UP, false, 0);
     int32_t subscribeId2 = -1;
     subscribeId2 = InputManager::GetInstance()->SubscribeKeyEvent(keyOption2,
         [](std::shared_ptr<KeyEvent> keyEvent) {
         EventLogHelper::PrintEventData(keyEvent);
         MMI_HILOGD("Subscribe key event KEYCODE_VOLUME_UP up trigger callback");
     });
-    std::shared_ptr<KeyOption> keyOption3 = std::make_shared<KeyOption>();
-    keyOption3->SetPreKeys(preKeys);
-    keyOption3->SetFinalKey(KeyEvent::KEYCODE_VOLUME_UP);
-    keyOption3->SetFinalKeyDown(true);
-    keyOption3->SetFinalKeyDownDuration(0);
+    std::shared_ptr<KeyOption> keyOption3 = InitOption(preKeys, KeyEvent::KEYCODE_VOLUME_UP, true, 0);
     int32_t subscribeId3 = -1;
     subscribeId3 = InputManager::GetInstance()->SubscribeKeyEvent(keyOption3,
         [](std::shared_ptr<KeyEvent> keyEvent) {
         EventLogHelper::PrintEventData(keyEvent);
         MMI_HILOGD("Subscribe key event KEYCODE_VOLUME_UP down trigger callback");
     });
-    std::shared_ptr<KeyOption> keyOption4 = std::make_shared<KeyOption>();
-    keyOption4->SetPreKeys(preKeys);
-    keyOption4->SetFinalKey(KeyEvent::KEYCODE_VOLUME_UP);
-    keyOption4->SetFinalKeyDown(false);
-    keyOption4->SetFinalKeyDownDuration(0);
+    std::shared_ptr<KeyOption> keyOption4 = InitOption(preKeys, KeyEvent::KEYCODE_VOLUME_UP, false, 0);
     int32_t subscribeId4 = -1;
     subscribeId4 = InputManager::GetInstance()->SubscribeKeyEvent(keyOption4,
         [](std::shared_ptr<KeyEvent> keyEvent) {
diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp
index e82f59f7ad..8d2c1129e6 100644
--- a/service/module_loader/src/uds_server.cpp
+++ b/service/module_loader/src/uds_server.cpp
@@ -244,9 +244,6 @@ void UDSServer::OnEpollRecv(int32_t fd, epoll_event& ev)
     for (int32_t i = 0; i < MAX_RECV_LIMIT; i++) {
         auto size = recv(fd, szBuf, MAX_PACKET_BUF_SIZE, MSG_DONTWAIT | MSG_NOSIGNAL);
         if (size > 0) {
-#ifdef OHOS_BUILD_HAVE_DUMP_DATA
-            DumpData(szBuf, size, LINEINFO, "in %s, read message from fd: %d.", __func__, fd);
-#endif
             if (!buf.Write(szBuf, size)) {
                 MMI_HILOGW("Write data failed. size:%{public}zu", size);
             }
diff --git a/util/common/include/input_event_data_transformation.h b/util/common/include/input_event_data_transformation.h
index 0ae49f767e..e146db2021 100644
--- a/util/common/include/input_event_data_transformation.h
+++ b/util/common/include/input_event_data_transformation.h
@@ -34,6 +34,7 @@ public:
 private:
     static int32_t SerializePointerItem(NetPacket &pkt, PointerEvent::PointerItem &item);
     static int32_t DeserializePointerItem(NetPacket &pkt, PointerEvent::PointerItem &item);
+    static void SetAxisInfo(NetPacket &pkt, std::shared_ptr<PointerEvent> event);
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/util/common/include/util_ex.h b/util/common/include/util_ex.h
index d16ca68735..f9ad01e525 100644
--- a/util/common/include/util_ex.h
+++ b/util/common/include/util_ex.h
@@ -55,99 +55,6 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "UtilE
     return ret;
 }
 
-template<class ...Ts>
-void DumpData(const char* dataPtr, const size_t dataSize, const char* fileName, const int32_t lineNo,
-    const char* titleFormat, Ts... args)
-{
-    static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "UtilEx" };
-
-    constexpr size_t outBufSize = 1024;
-    char outBuf[outBufSize] = {};
-    int32_t writeLen = 0;
-    int32_t ret = 0;
-    auto funcAdvanceWriteLen = [&writeLen, ret]() {
-        if (ret > 0) {
-            writeLen += ret;
-        }
-    };
-
-    auto funcOutput = [&writeLen, &ret, &outBuf, outBufSize]() {
-        (void)memset_s(&outBuf[0], sizeof(outBuf), 0, sizeof(outBuf));
-        writeLen = 0;
-        ret = 0;
-    };
-
-    ret = sprintf_s(outBuf, outBufSize - writeLen, "[%s]", GetProgramName());
-    funcAdvanceWriteLen(ret);
-    ret = sprintf_s(outBuf, outBufSize - writeLen, titleFormat, args...);
-    funcAdvanceWriteLen(ret);
-    ret = sprintf_s(outBuf, outBufSize - writeLen, " data size = %zu. %s:%d\n", dataSize, fileName, lineNo);
-    funcAdvanceWriteLen(ret);
-
-    funcOutput();
-
-    static constexpr size_t bufSize = 81;
-    static constexpr size_t oneLineCharCount = 16;
-    static constexpr size_t countStep = 2;
-    static constexpr size_t byteSize = 8;
-    static constexpr size_t wordSize = 16;
-    char bufLeft[bufSize] = {};
-    char bufRight[bufSize] = {};
-    size_t writePosHex = 0;
-    size_t writePosChar = 0;
-    static constexpr size_t writePosHexStep1 = 2;
-    static constexpr size_t writePosHexStep2 = 3;
-    size_t i = 0;
-    auto funCheckRetAndLog = [ret](const char* fileName, const int32_t lineNo) -> void {
-        if (ret == -1) {
-            MMI_HILOGE("SEC_RET_EQ: ret:%{public}d, %s:%d", ret, fileName, lineNo);
-        }
-    };
-
-    for (i = 0; i < dataSize; i++) {
-        const unsigned char c = static_cast<unsigned char>(dataPtr[i]);
-        ret = sprintf_s(bufLeft + writePosHex, bufSize - writePosHex, "%02x ", c);
-        funCheckRetAndLog(MMI_LINE_INFO);
-        if (i != 0 && (i + 1) % byteSize == 0 && (i + 1) % wordSize != 0) {
-            ret = sprintf_s(bufLeft + writePosHex, bufSize - writePosHex, "- ");
-            funCheckRetAndLog(MMI_LINE_INFO);
-            writePosHex += writePosHexStep1;
-        } else {
-            writePosHex += writePosHexStep2;
-        }
-        if (isprint(c)) {
-            ret = sprintf_s(bufRight + writePosChar, bufSize - writePosChar, "%c", c);
-            funCheckRetAndLog(MMI_LINE_INFO);
-            writePosChar += 1;
-        } else {
-            ret = sprintf_s(bufRight + writePosChar, bufSize - writePosChar, "%c", ' ');
-            funCheckRetAndLog(MMI_LINE_INFO);
-            writePosChar += 1;
-        }
-        if ((i != 0) && ((i + 1) % oneLineCharCount == 0)) {
-            ret = sprintf_s(outBuf, outBufSize - writeLen, "%04zu-%04zu %s  %s\n",
-                            i - (oneLineCharCount - 1), i, bufLeft, bufRight);
-            funcAdvanceWriteLen(ret);
-            funcOutput();
-            (void)memset_s(bufLeft, sizeof(bufLeft), 0, sizeof(bufLeft));
-            (void)memset_s(bufRight, sizeof(bufRight), 0, sizeof(bufRight));
-            writePosHex = 0;
-            writePosChar = 0;
-        }
-    }
-
-    if (writePosHex != 0) {
-        size_t ibefore = 0;
-        if (i > (oneLineCharCount - 1)) {
-            i = ((i + (oneLineCharCount - countStep)) % (oneLineCharCount - 1)) - (oneLineCharCount - 1);
-        }
-        size_t iafter = ((i + (oneLineCharCount - 2)) % (oneLineCharCount - 1));
-        ret = sprintf_s(outBuf, outBufSize - writeLen, "%04zu-%04zu %s  %s\n", ibefore, iafter, bufLeft, bufRight);
-                        funcAdvanceWriteLen(ret);
-        funcOutput();
-    }
-}
-
 template <class Enum>
 constexpr auto EnumUnderlyingValue(Enum const e) -> typename std::underlying_type<Enum>::type
 {
diff --git a/util/common/src/input_event_data_transformation.cpp b/util/common/src/input_event_data_transformation.cpp
index f6c4d353cd..e9b919209f 100644
--- a/util/common/src/input_event_data_transformation.cpp
+++ b/util/common/src/input_event_data_transformation.cpp
@@ -214,15 +214,7 @@ int32_t InputEventDataTransformation::Unmarshalling(NetPacket &pkt, std::shared_
     event->SetSourceType(tField);
     pkt >> tField;
     event->SetButtonId(tField);
-    uint32_t tAxes;
-    pkt >> tAxes;
-    double axisValue;
-    for (int32_t i = PointerEvent::AXIS_TYPE_UNKNOWN; i < PointerEvent::AXIS_TYPE_MAX; ++i) {
-        if (PointerEvent::HasAxis(tAxes, static_cast<PointerEvent::AxisType>(i))) {
-            pkt >> axisValue;
-            event->SetAxisValue(static_cast<PointerEvent::AxisType>(i), axisValue);
-        }
-    }
+    SetAxisInfo(pkt, event);
 
     std::set<int32_t>::size_type nPressed;
     pkt >> nPressed;
@@ -257,6 +249,19 @@ int32_t InputEventDataTransformation::Unmarshalling(NetPacket &pkt, std::shared_
     return RET_OK;
 }
 
+void InputEventDataTransformation::SetAxisInfo(NetPacket &pkt, std::shared_ptr<PointerEvent> event)
+{
+    uint32_t tAxes;
+    pkt >> tAxes;
+    double axisValue;
+    for (int32_t i = PointerEvent::AXIS_TYPE_UNKNOWN; i < PointerEvent::AXIS_TYPE_MAX; ++i) {
+        if (PointerEvent::HasAxis(tAxes, static_cast<PointerEvent::AxisType>(i))) {
+            pkt >> axisValue;
+            event->SetAxisValue(static_cast<PointerEvent::AxisType>(i), axisValue);
+        }
+    }
+}
+
 int32_t InputEventDataTransformation::SerializePointerItem(NetPacket &pkt, PointerEvent::PointerItem &item)
 {
     pkt << item;
-- 
Gitee


From 3298c3162a2c4c220eaa21fb3ad5ea9fa9be56dd Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 27 Oct 2022 09:05:44 +0800
Subject: [PATCH 081/360] commit joystick process cdoe

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Idd380d20894e7e2529bc09228ad21c6499fa36f8
---
 .../src/joystick_transform_processor.cpp                    | 6 ++----
 service/touch_event_normalize/src/touch_event_normalize.cpp | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/service/touch_event_normalize/src/joystick_transform_processor.cpp b/service/touch_event_normalize/src/joystick_transform_processor.cpp
index d9627bbe79..53036fe217 100644
--- a/service/touch_event_normalize/src/joystick_transform_processor.cpp
+++ b/service/touch_event_normalize/src/joystick_transform_processor.cpp
@@ -57,14 +57,12 @@ bool JoystickTransformProcessor::OnEventJoystickButton(struct libinput_event* ev
     pointerEvent_->SetDeviceId(deviceId_);   
     uint32_t button = libinput_event_joystick_button_get_key(data);
     int32_t buttonId = LibinputButtonToPointer(button);
-    
     if (buttonId == PointerEvent::BUTTON_NONE) {
         MMI_HILOGE("Unknown btn, btn:%{public}u", button);
         return false;
     }
     pointerEvent_->SetButtonId(buttonId);
     auto state = libinput_event_joystick_button_get_key_state(data);
-    
     if (state == LIBINPUT_BUTTON_STATE_RELEASED) {
         pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_BUTTON_UP);
         pointerEvent_->DeleteReleaseButton(buttonId);
@@ -75,7 +73,7 @@ bool JoystickTransformProcessor::OnEventJoystickButton(struct libinput_event* ev
         MMI_HILOGE("Unknown state, state:%{public}u", state);
         return false;
     }
-    MMI_HILOGD("button:%{public}u, buttonId:%{public}d, state:%{public}d", button, buttonId ,state);
+    MMI_HILOGD("button:%{public}u, buttonId:%{public}d, state:%{public}d", button, buttonId, state);
     return true;
 }
 
@@ -121,7 +119,7 @@ std::shared_ptr<PointerEvent> JoystickTransformProcessor::OnEvent(struct libinpu
     auto type = libinput_event_get_type(event);
     switch (type) {
         case LIBINPUT_EVENT_JOYSTICK_BUTTON: {
-            if(!OnEventJoystickButton(event)) {
+            if (!OnEventJoystickButton(event)) {
                 MMI_HILOGE("Get OnEventJoystickButton failed");
                 return nullptr;
             }
diff --git a/service/touch_event_normalize/src/touch_event_normalize.cpp b/service/touch_event_normalize/src/touch_event_normalize.cpp
index f78d2feb58..35ea06f3c7 100644
--- a/service/touch_event_normalize/src/touch_event_normalize.cpp
+++ b/service/touch_event_normalize/src/touch_event_normalize.cpp
@@ -77,7 +77,7 @@ std::shared_ptr<TransformProcessor> TouchEventNormalize::MakeTransformProcessor(
         }
 #endif // OHOS_BUILD_ENABLE_POINTER
 #ifdef OHOS_BUILD_ENABLE_JOYSTICK
-	case DeviceType::JOYSTICK: {
+	    case DeviceType::JOYSTICK: {
             processor = std::make_shared<JoystickTransformProcessor>(deviceId);
             break;
         }
-- 
Gitee


From 29c0598445f64b892f8f30ff30ee93882d26b088 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 27 Oct 2022 20:13:55 +0800
Subject: [PATCH 082/360] Update Fuzztest

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I548f847634eed7119bb838e2350febeb33cd0b18
---
 .../src/key_event_input_subscribe_manager.cpp |   2 +-
 test/fuzztest/BUILD.gn                        |   4 +-
 .../BUILD.gn                                  |   8 +-
 .../corpus/init                               |   0
 .../functionkeystate_fuzzer.cpp}              |  18 +--
 .../functionkeystate_fuzzer.h}                |   8 +-
 .../project.xml                               |   0
 .../getpointerstyle_fuzzer.cpp                |  64 --------
 .../markconsumed_fuzzer.cpp                   |  23 ++-
 .../pointerspeed_fuzzer.cpp                   |   2 +-
 .../BUILD.gn                                  |  10 +-
 .../corpus/init                               |   0
 .../pointerstyle_fuzzer.cpp                   | 146 ++++++++++++++++++
 .../pointerstyle_fuzzer.h}                    |   8 +-
 .../project.xml                               |   0
 .../subscribekeyevent_fuzzer.cpp              |   2 +-
 .../updatedisplayinfo_fuzzer.cpp              |  39 ++++-
 17 files changed, 226 insertions(+), 108 deletions(-)
 rename test/fuzztest/{getpointerstyle_fuzzer => functionkeystate_fuzzer}/BUILD.gn (88%)
 rename test/fuzztest/{getfunctionkeystate_fuzzer => functionkeystate_fuzzer}/corpus/init (100%)
 rename test/fuzztest/{getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.cpp => functionkeystate_fuzzer/functionkeystate_fuzzer.cpp} (81%)
 rename test/fuzztest/{getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.h => functionkeystate_fuzzer/functionkeystate_fuzzer.h} (78%)
 rename test/fuzztest/{getfunctionkeystate_fuzzer => functionkeystate_fuzzer}/project.xml (100%)
 delete mode 100644 test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.cpp
 rename test/fuzztest/{getfunctionkeystate_fuzzer => pointerstyle_fuzzer}/BUILD.gn (86%)
 rename test/fuzztest/{getpointerstyle_fuzzer => pointerstyle_fuzzer}/corpus/init (100%)
 create mode 100644 test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.cpp
 rename test/fuzztest/{getpointerstyle_fuzzer/getpointerstyle_fuzzer.h => pointerstyle_fuzzer/pointerstyle_fuzzer.h} (80%)
 rename test/fuzztest/{getpointerstyle_fuzzer => pointerstyle_fuzzer}/project.xml (100%)

diff --git a/frameworks/proxy/event_handler/src/key_event_input_subscribe_manager.cpp b/frameworks/proxy/event_handler/src/key_event_input_subscribe_manager.cpp
index e9dd5ee27e..a5197a21b8 100755
--- a/frameworks/proxy/event_handler/src/key_event_input_subscribe_manager.cpp
+++ b/frameworks/proxy/event_handler/src/key_event_input_subscribe_manager.cpp
@@ -28,7 +28,7 @@ namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeyEventInputSubscribeManager" };
 constexpr int32_t INVALID_SUBSCRIBE_ID = -1;
-constexpr size_t PRE_KEYS_NUM = 4;
+constexpr size_t PRE_KEYS_NUM = 3;
 } // namespace
 int32_t KeyEventInputSubscribeManager::subscribeIdManager_ = 0;
 
diff --git a/test/fuzztest/BUILD.gn b/test/fuzztest/BUILD.gn
index 988372fe7c..5f71cdccc3 100644
--- a/test/fuzztest/BUILD.gn
+++ b/test/fuzztest/BUILD.gn
@@ -20,12 +20,12 @@ group("test") {
     "addinputeventfilter_fuzzer:fuzztest",
     "addinterceptor_fuzzer:fuzztest",
     "addmonitor_fuzzer:fuzztest",
-    "getfunctionkeystate_fuzzer:fuzztest",
+    "functionkeystate_fuzzer:fuzztest",
     "getkeyboardtype_fuzzer:fuzztest",
-    "getpointerstyle_fuzzer:fuzztest",
     "markconsumed_fuzzer:fuzztest",
     "movemouse_fuzzer:fuzztest",
     "pointerspeed_fuzzer:fuzztest",
+    "pointerstyle_fuzzer:fuzztest",
     "pointervisible_fuzzer:fuzztest",
     "simulateinputevent_fuzzer:fuzztest",
     "subscribekeyevent_fuzzer:fuzztest",
diff --git a/test/fuzztest/getpointerstyle_fuzzer/BUILD.gn b/test/fuzztest/functionkeystate_fuzzer/BUILD.gn
similarity index 88%
rename from test/fuzztest/getpointerstyle_fuzzer/BUILD.gn
rename to test/fuzztest/functionkeystate_fuzzer/BUILD.gn
index 24bbe86683..8d0be336fa 100644
--- a/test/fuzztest/getpointerstyle_fuzzer/BUILD.gn
+++ b/test/fuzztest/functionkeystate_fuzzer/BUILD.gn
@@ -18,10 +18,10 @@ import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
 module_output_path = "multimodalinput/fuzz"
 
 ##############################fuzztest##########################################
-ohos_fuzztest("GetPointerStyleFuzzTest") {
+ohos_fuzztest("FunctionkeyStateFuzzTest") {
   module_out_path = module_output_path
   fuzz_config_file =
-      "//foundation/multimodalinput/input/test/fuzztest/getpointerstyle_fuzzer"
+      "//foundation/multimodalinput/input/test/fuzztest/functionkeystate_fuzzer"
   include_dirs =
       [ "//foundation/multimodalinput/input/interfaces/util/common/include" ]
   cflags = [
@@ -30,7 +30,7 @@ ohos_fuzztest("GetPointerStyleFuzzTest") {
     "-Wno-unused-variable",
     "-fno-omit-frame-pointer",
   ]
-  sources = [ "getpointerstyle_fuzzer.cpp" ]
+  sources = [ "functionkeystate_fuzzer.cpp" ]
   deps = [ "${mmi_path}/frameworks/proxy:libmmi-client" ]
   external_deps = [
     "c_utils:utils",
@@ -44,7 +44,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    ":GetPointerStyleFuzzTest",
+    ":FunctionkeyStateFuzzTest",
   ]
 }
 ###############################################################################
diff --git a/test/fuzztest/getfunctionkeystate_fuzzer/corpus/init b/test/fuzztest/functionkeystate_fuzzer/corpus/init
similarity index 100%
rename from test/fuzztest/getfunctionkeystate_fuzzer/corpus/init
rename to test/fuzztest/functionkeystate_fuzzer/corpus/init
diff --git a/test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.cpp b/test/fuzztest/functionkeystate_fuzzer/functionkeystate_fuzzer.cpp
similarity index 81%
rename from test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.cpp
rename to test/fuzztest/functionkeystate_fuzzer/functionkeystate_fuzzer.cpp
index 0653784267..2e7b6a357e 100644
--- a/test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.cpp
+++ b/test/fuzztest/functionkeystate_fuzzer/functionkeystate_fuzzer.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "getfunctionkeystate_fuzzer.h"
+#include "functionkeystate_fuzzer.h"
 
 #include "securec.h"
 
@@ -36,18 +36,17 @@ size_t GetObject(T &object, const uint8_t *data, size_t size)
     return objectSize;
 }
 
-void GetFunctionkeyStateFuzzTest(const uint8_t* data, size_t  size)
+void FunctionkeyStateFuzzTest(const uint8_t* data, size_t size)
 {
     int32_t funcKey;
     size_t startPos = 0;
     startPos += GetObject<int32_t>(funcKey, data + startPos, size - startPos);
-    InputManager::GetInstance()->GetFunctionKeyState(funcKey);
-
-    int32_t random = 0;
-    startPos += GetObject<int32_t>(funcKey, data + startPos, size - startPos);
-    startPos += GetObject<int32_t>(random, data + startPos, size - startPos);
+    int32_t random;
+    GetObject<int32_t>(random, data + startPos, size - startPos);
     bool enable = (random % 2) ? false : true;
     InputManager::GetInstance()->SetFunctionKeyState(funcKey, enable);
+
+    InputManager::GetInstance()->GetFunctionKeyState(funcKey);
 }
 } // MMI
 } // OHOS
@@ -56,7 +55,6 @@ void GetFunctionkeyStateFuzzTest(const uint8_t* data, size_t  size)
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
     /* Run your code on data */
-    OHOS::MMI::GetFunctionkeyStateFuzzTest(data, size);
+    OHOS::MMI::FunctionkeyStateFuzzTest(data, size);
     return 0;
-}
-
+}
\ No newline at end of file
diff --git a/test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.h b/test/fuzztest/functionkeystate_fuzzer/functionkeystate_fuzzer.h
similarity index 78%
rename from test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.h
rename to test/fuzztest/functionkeystate_fuzzer/functionkeystate_fuzzer.h
index 86a3f68c09..37fe497145 100644
--- a/test/fuzztest/getfunctionkeystate_fuzzer/getfunctionkeystate_fuzzer.h
+++ b/test/fuzztest/functionkeystate_fuzzer/functionkeystate_fuzzer.h
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-#ifndef GETFUNCTIONKEYSTATE_FUZZER_H
-#define GETFUNCTIONKEYSTATE_FUZZER_H
+#ifndef FUNCTIONKEYSTATE_FUZZER_H
+#define FUNCTIONKEYSTATE_FUZZER_H
 
-#define FUZZ_PROJECT_NAME "getfunctionkeystate_fuzzer"
+#define FUZZ_PROJECT_NAME "functionkeystate_fuzzer"
 
-#endif // GETFUNCTIONKEYSTATE_FUZZER_H
+#endif // FUNCTIONKEYSTATE_FUZZER_H
diff --git a/test/fuzztest/getfunctionkeystate_fuzzer/project.xml b/test/fuzztest/functionkeystate_fuzzer/project.xml
similarity index 100%
rename from test/fuzztest/getfunctionkeystate_fuzzer/project.xml
rename to test/fuzztest/functionkeystate_fuzzer/project.xml
diff --git a/test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.cpp b/test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.cpp
deleted file mode 100644
index bf005b9db9..0000000000
--- a/test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "getpointerstyle_fuzzer.h"
-
-#include "securec.h"
-
-#include "input_manager.h"
-#include "define_multimodal.h"
-#include "mmi_log.h"
-
-namespace OHOS {
-namespace MMI {
-
-template<class T>
-size_t GetObject(T &object, const uint8_t *data, size_t size)
-{
-    size_t objectSize = sizeof(object);
-    if (objectSize > size) {
-        return 0;
-    }
-    errno_t ret = memcpy_s(&object, objectSize, data, objectSize);
-    if (ret != EOK) {
-        return 0;
-    }
-    return objectSize;
-}
-
-void GetPointerStyleFuzzTest(const uint8_t* data, size_t  size)
-{
-    int32_t windowId;
-    size_t startPos = 0;
-    startPos += GetObject<int32_t>(windowId, data + startPos, size - startPos);
-    int32_t pointerStyle;
-    startPos += GetObject<int32_t>(pointerStyle, data + startPos, size - startPos);
-    InputManager::GetInstance()->SetPointerStyle(windowId, pointerStyle);
-
-    startPos += GetObject<int32_t>(windowId, data + startPos, size - startPos);
-    startPos += GetObject<int32_t>(pointerStyle, data + startPos, size - startPos);
-    InputManager::GetInstance()->GetPointerStyle(windowId, pointerStyle);
-}
-} // MMI
-} // OHOS
-
-/* Fuzzer entry point */
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
-{
-    /* Run your code on data */
-    OHOS::MMI::GetPointerStyleFuzzTest(data, size);
-    return 0;
-}
-
diff --git a/test/fuzztest/markconsumed_fuzzer/markconsumed_fuzzer.cpp b/test/fuzztest/markconsumed_fuzzer/markconsumed_fuzzer.cpp
index 339befef00..7f0bd13007 100644
--- a/test/fuzztest/markconsumed_fuzzer/markconsumed_fuzzer.cpp
+++ b/test/fuzztest/markconsumed_fuzzer/markconsumed_fuzzer.cpp
@@ -26,10 +26,20 @@ namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MarkConsumedFuzzTest" };
 } // namespace
+
+class InputEventConsumerTest : public IInputEventConsumer {
+public:
+    virtual void OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override {};
+    virtual void OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override
+    {
+        MMI_HILOGD("Report pointer event success");
+    };
+    virtual void OnInputEvent(std::shared_ptr<AxisEvent> axisEvent) const override {};
+};
+
 template<class T>
-T GetObject(const uint8_t *data, size_t size)
+size_t GetObject(const uint8_t *data, size_t size, T &object)
 {
-    T object;
     size_t objectSize = sizeof(object);
     if (objectSize > size) {
         return 0;
@@ -38,15 +48,18 @@ T GetObject(const uint8_t *data, size_t size)
     if (ret != EOK) {
         return 0;
     }
-    return object;
+    return objectSize;
 }
 
 void MarkConsumedFuzzTest(const uint8_t* data, size_t size)
 {
     CALL_DEBUG_ENTER;
-    int32_t monitorId = GetObject<int32_t>(data, size);
-    int32_t eventId = GetObject<int32_t>(data, size);
+    int32_t eventId;
+    GetObject<int32_t>(data, size, eventId);
+    auto consumer = std::make_shared<InputEventConsumerTest>();
+    int32_t monitorId = InputManager::GetInstance()->AddMonitor(consumer);
     InputManager::GetInstance()->MarkConsumed(monitorId, eventId);
+    InputManager::GetInstance()->RemoveMonitor(monitorId);
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/test/fuzztest/pointerspeed_fuzzer/pointerspeed_fuzzer.cpp b/test/fuzztest/pointerspeed_fuzzer/pointerspeed_fuzzer.cpp
index 1f66610b0e..a89645f1e7 100644
--- a/test/fuzztest/pointerspeed_fuzzer/pointerspeed_fuzzer.cpp
+++ b/test/fuzztest/pointerspeed_fuzzer/pointerspeed_fuzzer.cpp
@@ -50,7 +50,7 @@ void PointerSpeedFuzzTest(const uint8_t* data, size_t size)
         MMI_HILOGD("Set pointer speed success");
     }
 
-    startPos += GetObject<int32_t>(data + startPos, size - startPos, speed);
+    GetObject<int32_t>(data + startPos, size - startPos, speed);
     if (InputManager::GetInstance()->GetPointerSpeed(speed) == RET_OK) {
         MMI_HILOGD("Get pointer speed success");
     }
diff --git a/test/fuzztest/getfunctionkeystate_fuzzer/BUILD.gn b/test/fuzztest/pointerstyle_fuzzer/BUILD.gn
similarity index 86%
rename from test/fuzztest/getfunctionkeystate_fuzzer/BUILD.gn
rename to test/fuzztest/pointerstyle_fuzzer/BUILD.gn
index a21aae9a89..0a48767102 100644
--- a/test/fuzztest/getfunctionkeystate_fuzzer/BUILD.gn
+++ b/test/fuzztest/pointerstyle_fuzzer/BUILD.gn
@@ -18,9 +18,10 @@ import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
 module_output_path = "multimodalinput/fuzz"
 
 ##############################fuzztest##########################################
-ohos_fuzztest("GetFunctionkeyStateFuzzTest") {
+ohos_fuzztest("PointerStyleFuzzTest") {
   module_out_path = module_output_path
-  fuzz_config_file = "//foundation/multimodalinput/input/test/fuzztest/getfunctionkeystate_fuzzer"
+  fuzz_config_file =
+      "//foundation/multimodalinput/input/test/fuzztest/pointerstyle_fuzzer"
   include_dirs =
       [ "//foundation/multimodalinput/input/interfaces/util/common/include" ]
   cflags = [
@@ -29,11 +30,12 @@ ohos_fuzztest("GetFunctionkeyStateFuzzTest") {
     "-Wno-unused-variable",
     "-fno-omit-frame-pointer",
   ]
-  sources = [ "getfunctionkeystate_fuzzer.cpp" ]
+  sources = [ "pointerstyle_fuzzer.cpp" ]
   deps = [ "${mmi_path}/frameworks/proxy:libmmi-client" ]
   external_deps = [
     "c_utils:utils",
     "hiviewdfx_hilog_native:libhilog",
+    "ipc:ipc_core",
   ]
 }
 
@@ -43,7 +45,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    ":GetFunctionkeyStateFuzzTest",
+    ":PointerStyleFuzzTest",
   ]
 }
 ###############################################################################
diff --git a/test/fuzztest/getpointerstyle_fuzzer/corpus/init b/test/fuzztest/pointerstyle_fuzzer/corpus/init
similarity index 100%
rename from test/fuzztest/getpointerstyle_fuzzer/corpus/init
rename to test/fuzztest/pointerstyle_fuzzer/corpus/init
diff --git a/test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.cpp b/test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.cpp
new file mode 100644
index 0000000000..6de03a4e75
--- /dev/null
+++ b/test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.cpp
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "pointerstyle_fuzzer.h"
+
+#include "ipc_skeleton.h"
+#include "securec.h"
+
+#include "input_manager.h"
+#include "mmi_log.h"
+
+namespace OHOS {
+namespace MMI {
+namespace {
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "PointerStyleFuzzTest" };
+} // namespace
+template<class T>
+size_t GetObject(const uint8_t *data, size_t size, T &object)
+{
+    size_t objectSize = sizeof(object);
+    if (objectSize > size) {
+        return 0;
+    }
+    errno_t ret = memcpy_s(&object, objectSize, data, objectSize);
+    if (ret != EOK) {
+        return 0;
+    }
+    return objectSize;
+}
+
+size_t GetString(size_t objectSize, const uint8_t *data, size_t size, std::string &object)
+{
+    if (objectSize > size) {
+        return 0;
+    }
+    errno_t ret = memcpy_s(&object, objectSize, data, objectSize);
+    if (ret != EOK) {
+        return 0;
+    }
+    return objectSize;
+}
+
+void UpdateHotAreas(const uint8_t* data, size_t size, WindowInfo &windowInfo)
+{
+    size_t startPos = 0;
+    std::vector<Rect> defaultHotAreasInfo;
+    std::vector<Rect> pointerHotAreasInfo;
+    for (size_t j = 0; j < WindowInfo::MAX_HOTAREA_COUNT; ++j) {
+        Rect defaultRect;
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, defaultRect.height);
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, defaultRect.width);
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, defaultRect.x);
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, defaultRect.y);
+        defaultHotAreasInfo.push_back(defaultRect);
+        Rect pointerRect;
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, pointerRect.height);
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, pointerRect.width);
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, pointerRect.x);
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, pointerRect.y);
+        pointerHotAreasInfo.push_back(pointerRect);
+    }
+    windowInfo.defaultHotAreas = defaultHotAreasInfo;
+    windowInfo.pointerHotAreas = pointerHotAreasInfo;
+}
+
+void UpdateDisplayInfo(const uint8_t* data, size_t size, int32_t windowId)
+{
+    DisplayGroupInfo displayGroupInfo;
+    size_t startPos = 0;
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, displayGroupInfo.width);
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, displayGroupInfo.height);
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, displayGroupInfo.focusWindowId);
+    std::vector<WindowInfo> windowsInfo;
+    std::vector<DisplayInfo> displaysInfo;
+    WindowInfo windowInfo;
+    windowInfo.id = windowId;
+    windowInfo.pid = IPCSkeleton::GetCallingPid();
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, windowInfo.uid);
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, windowInfo.area.x);
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, windowInfo.area.y);
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, windowInfo.area.width);
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, windowInfo.area.height);
+    UpdateHotAreas(data, size, windowInfo);
+    windowsInfo.push_back(windowInfo);
+
+    DisplayInfo displayInfo;
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.id);
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.x);
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.y);
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.width);
+    GetObject<int32_t>(data + startPos, size - startPos, displayInfo.height);
+
+    size_t objectSize = 0;
+    std::string name = "";
+    size_t ret = GetString(objectSize, data, size, name);
+    if (ret == 0) {
+        MMI_HILOGD("%{public}s:%{public}d GetString return 0", __func__, __LINE__);
+        return;
+    }
+    displayInfo.name = name;
+    std::string uniq = "";
+    ret = GetString(objectSize, data, size, uniq);
+    if (ret == 0) {
+        MMI_HILOGD("%{public}s:%{public}d GetString return 0", __func__, __LINE__);
+        return;
+    }
+    displayInfo.uniq = uniq;
+    displaysInfo.push_back(displayInfo);
+    displayGroupInfo.windowsInfo = windowsInfo;
+    displayGroupInfo.displaysInfo = displaysInfo;
+    InputManager::GetInstance()->UpdateDisplayInfo(displayGroupInfo);
+}
+
+void PointerStyleFuzzTest(const uint8_t* data, size_t size)
+{
+    int32_t windowId;
+    size_t startPos = 0;
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, windowId);
+    UpdateDisplayInfo(data, size, windowId);
+    int32_t pointerStyle;
+    GetObject<int32_t>(data + startPos, size - startPos, pointerStyle);
+    InputManager::GetInstance()->SetPointerStyle(windowId, pointerStyle);
+    InputManager::GetInstance()->GetPointerStyle(windowId, pointerStyle);
+}
+} // MMI
+} // OHOS
+
+/* Fuzzer entry point */
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    /* Run your code on data */
+    OHOS::MMI::PointerStyleFuzzTest(data, size);
+    return 0;
+}
\ No newline at end of file
diff --git a/test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.h b/test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.h
similarity index 80%
rename from test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.h
rename to test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.h
index 5d11f3a311..457dd0d4f8 100644
--- a/test/fuzztest/getpointerstyle_fuzzer/getpointerstyle_fuzzer.h
+++ b/test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.h
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-#ifndef GETPOINTERSTYLE_FUZZER_H
-#define GETPOINTERSTYLE_FUZZER_H
+#ifndef POINTERSTYLE_FUZZER_H
+#define POINTERSTYLE_FUZZER_H
 
-#define FUZZ_PROJECT_NAME "getpointerstyle_fuzzer"
+#define FUZZ_PROJECT_NAME "pointerstyle_fuzzer"
 
-#endif // GETPOINTERSTYLE_FUZZER_H
+#endif // POINTERSTYLE_FUZZER_H
diff --git a/test/fuzztest/getpointerstyle_fuzzer/project.xml b/test/fuzztest/pointerstyle_fuzzer/project.xml
similarity index 100%
rename from test/fuzztest/getpointerstyle_fuzzer/project.xml
rename to test/fuzztest/pointerstyle_fuzzer/project.xml
diff --git a/test/fuzztest/subscribekeyevent_fuzzer/subscribekeyevent_fuzzer.cpp b/test/fuzztest/subscribekeyevent_fuzzer/subscribekeyevent_fuzzer.cpp
index 948d4b684d..701ba0403b 100644
--- a/test/fuzztest/subscribekeyevent_fuzzer/subscribekeyevent_fuzzer.cpp
+++ b/test/fuzztest/subscribekeyevent_fuzzer/subscribekeyevent_fuzzer.cpp
@@ -24,7 +24,7 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "SubscribeKeyEventFuzzTest" };
-constexpr int32_t DEFAULT_PREKEY_COUNT = 4;
+constexpr int32_t DEFAULT_PREKEY_COUNT = 3;
 } // namespace
 
 class InputEventConsumerTest : public IInputEventConsumer {
diff --git a/test/fuzztest/updatedisplayinfo_fuzzer/updatedisplayinfo_fuzzer.cpp b/test/fuzztest/updatedisplayinfo_fuzzer/updatedisplayinfo_fuzzer.cpp
index c5e5f68160..49b9e14f86 100644
--- a/test/fuzztest/updatedisplayinfo_fuzzer/updatedisplayinfo_fuzzer.cpp
+++ b/test/fuzztest/updatedisplayinfo_fuzzer/updatedisplayinfo_fuzzer.cpp
@@ -54,6 +54,29 @@ size_t GetString(size_t objectSize, const uint8_t *data, size_t size, std::strin
     return objectSize;
 }
 
+void UpdateHotAreas(const uint8_t* data, size_t size, WindowInfo &windowInfo)
+{
+    size_t startPos = 0;
+    std::vector<Rect> defaultHotAreasInfo;
+    std::vector<Rect> pointerHotAreasInfo;
+    for (size_t j = 0; j < WindowInfo::MAX_HOTAREA_COUNT; ++j) {
+        Rect defaultRect;
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, defaultRect.height);
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, defaultRect.width);
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, defaultRect.x);
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, defaultRect.y);
+        defaultHotAreasInfo.push_back(defaultRect);
+        Rect pointerRect;
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, pointerRect.height);
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, pointerRect.width);
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, pointerRect.x);
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, pointerRect.y);
+        pointerHotAreasInfo.push_back(pointerRect);
+    }
+    windowInfo.defaultHotAreas = defaultHotAreasInfo;
+    windowInfo.pointerHotAreas = pointerHotAreasInfo;
+}
+
 void UpdateDisplayInfoFuzzTest(const uint8_t* data, size_t size)
 {
     DisplayGroupInfo displayGroupInfo;
@@ -61,8 +84,8 @@ void UpdateDisplayInfoFuzzTest(const uint8_t* data, size_t size)
     startPos += GetObject<int32_t>(data + startPos, size - startPos, displayGroupInfo.width);
     startPos += GetObject<int32_t>(data + startPos, size - startPos, displayGroupInfo.height);
     startPos += GetObject<int32_t>(data + startPos, size - startPos, displayGroupInfo.focusWindowId);
-    std::vector<WindowInfo> windowsInfos;
-    std::vector<DisplayInfo> displaysInfos;
+    std::vector<WindowInfo> windowsInfo;
+    std::vector<DisplayInfo> displaysInfo;
     for (size_t i = 0; i < WindowInfo::MAX_HOTAREA_COUNT + 1; ++i) {
         WindowInfo windowInfo;
         startPos += GetObject<int32_t>(data + startPos, size - startPos, windowInfo.id);
@@ -72,7 +95,8 @@ void UpdateDisplayInfoFuzzTest(const uint8_t* data, size_t size)
         startPos += GetObject<int32_t>(data + startPos, size - startPos, windowInfo.area.y);
         startPos += GetObject<int32_t>(data + startPos, size - startPos, windowInfo.area.width);
         startPos += GetObject<int32_t>(data + startPos, size - startPos, windowInfo.area.height);
-        windowsInfos.push_back(windowInfo);
+        UpdateHotAreas(data, size, windowInfo);
+        windowsInfo.push_back(windowInfo);
 
         DisplayInfo displayInfo;
         startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.id);
@@ -83,8 +107,7 @@ void UpdateDisplayInfoFuzzTest(const uint8_t* data, size_t size)
 
         size_t objectSize = 0;
         std::string name = "";
-        size_t ret = 0;
-        ret = GetString(objectSize, data, size, name);
+        size_t ret = GetString(objectSize, data, size, name);
         if (ret == 0) {
             MMI_HILOGD("%{public}s:%{public}d The return value is 0", __func__, __LINE__);
             return;
@@ -97,10 +120,10 @@ void UpdateDisplayInfoFuzzTest(const uint8_t* data, size_t size)
             return;
         }
         displayInfo.uniq = uniq;
-        displaysInfos.push_back(displayInfo);
+        displaysInfo.push_back(displayInfo);
     }
-    displayGroupInfo.windowsInfo = windowsInfos;
-    displayGroupInfo.displaysInfo = displaysInfos;
+    displayGroupInfo.windowsInfo = windowsInfo;
+    displayGroupInfo.displaysInfo = displaysInfo;
     InputManager::GetInstance()->UpdateDisplayInfo(displayGroupInfo);
     MMI_HILOGD("Update display info success");
 }
-- 
Gitee


From d5e9ebc4bdea721c580c653a11c72c445e541bac Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 28 Oct 2022 10:37:11 +0800
Subject: [PATCH 083/360] prekey max is 4

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I8ab985615ee319b3b9694bf016515f180c3e328e
---
 .../event_handler/src/key_event_input_subscribe_manager.cpp     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frameworks/proxy/event_handler/src/key_event_input_subscribe_manager.cpp b/frameworks/proxy/event_handler/src/key_event_input_subscribe_manager.cpp
index a5197a21b8..e9dd5ee27e 100755
--- a/frameworks/proxy/event_handler/src/key_event_input_subscribe_manager.cpp
+++ b/frameworks/proxy/event_handler/src/key_event_input_subscribe_manager.cpp
@@ -28,7 +28,7 @@ namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeyEventInputSubscribeManager" };
 constexpr int32_t INVALID_SUBSCRIBE_ID = -1;
-constexpr size_t PRE_KEYS_NUM = 3;
+constexpr size_t PRE_KEYS_NUM = 4;
 } // namespace
 int32_t KeyEventInputSubscribeManager::subscribeIdManager_ = 0;
 
-- 
Gitee


From 3535dbf3ab1b7f340d93ba633b68ab975074c88c Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 28 Oct 2022 10:43:25 +0800
Subject: [PATCH 084/360] watchdog cancel

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I23a135ec2ac70bda5bd4302f5ac101c6c6b3a1f9
---
 service/module_loader/src/mmi_service.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 5c48516a5f..8e9e59c556 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -310,8 +310,7 @@ void MMIService::OnStart()
             MMI_HILOGD("Set thread status flag to false");
             threadStatusFlag_ = false;
         } else {
-            MMI_HILOGE("Watchdog happened, process exit");
-            abort();
+            MMI_HILOGE("Watchdog happened");
         }
     };
     HiviewDFX::Watchdog::GetInstance().RunPeriodicalTask("MMIService", taskFunc,
-- 
Gitee


From 6bc0a835fc8c5e22823fe0024153e041172db25a Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Mon, 31 Oct 2022 01:50:21 +0000
Subject: [PATCH 085/360] Resolve P2P debug

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 .../device_manager/include/input_device_manager.h   |  1 +
 service/device_manager/src/input_device_manager.cpp | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/service/device_manager/include/input_device_manager.h b/service/device_manager/include/input_device_manager.h
index 5ee9f9d5dc..bd7c9dd4ce 100644
--- a/service/device_manager/include/input_device_manager.h
+++ b/service/device_manager/include/input_device_manager.h
@@ -39,6 +39,7 @@ class InputDeviceManager final : public IDeviceObject {
         struct libinput_device *inputDeviceOrigin_ { nullptr };
         std::string networkIdOrigin_;
         bool isRemote_ { false };
+        bool isPointerDevice_ { false };
         std::string dhid_;
     };
 public:
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index e0d17e0b2e..7f42c218e2 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -258,7 +258,7 @@ void InputDeviceManager::RemoveDevListener(SessionPtr sess)
 bool InputDeviceManager::HasPointerDevice()
 {
     for (auto it = inputDevice_.begin(); it != inputDevice_.end(); ++it) {
-        if (IsPointerDevice(it->second.inputDeviceOrigin_)) {
+        if (it->second.isPointerDevice_) {
             return true;
         }
     }
@@ -277,7 +277,7 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
             DfxHisysevent::OnDeviceConnect(item.first, OHOS::HiviewDFX::HiSysEvent::EventType::FAULT);
             return;
         }
-        if (!item.second.isRemote_ && IsPointerDevice(item.second.inputDeviceOrigin_)) {
+        if (!item.second.isRemote_ && item.second.isPointerDevice_) {
             hasLocalPointer = true;
         }
     }
@@ -306,7 +306,7 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
         InputDevCooSM->OnKeyboardOnline(info.dhid_);
     }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-    if (IsPointerDevice(inputDevice)) {
+    if (info.isPointerDevice_) {
         bool visible = !info.isRemote_ || hasLocalPointer;
         NotifyPointerDevice(true, visible);
         OHOS::system::SetParameter(INPUT_POINTER_DEVICE, "true");
@@ -319,6 +319,7 @@ void InputDeviceManager::MakeDeviceInfo(struct libinput_device *inputDevice, str
 {
     info.inputDeviceOrigin_ = inputDevice;
     info.isRemote_ = IsRemote(inputDevice);
+    info.isPointerDevice_ = IsPointerDevice(inputDevice);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     if (info.isRemote_) {
         info.networkIdOrigin_ = MakeNetworkId(libinput_device_get_phys(inputDevice));
@@ -374,7 +375,7 @@ void InputDeviceManager::ScanPointerDevice()
 {
     bool hasPointerDevice = false;
     for (auto it = inputDevice_.begin(); it != inputDevice_.end(); ++it) {
-        if (IsPointerDevice(it->second.inputDeviceOrigin_)) {
+        if (it->second.isPointerDevice_) {
             hasPointerDevice = true;
             break;
         }
@@ -538,7 +539,7 @@ std::vector<std::string> InputDeviceManager::GetCooperateDhids(int32_t deviceId)
         MMI_HILOGI("Find pointer id failed");
         return dhids;
     }
-    if (!IsPointerDevice(iter->second.inputDeviceOrigin_)) {
+    if (!iter->second.isPointerDevice_) {
         MMI_HILOGI("Not pointer device");
         return dhids;
     }
@@ -618,7 +619,7 @@ std::string InputDeviceManager::GetDhid(int32_t deviceId) const
 bool InputDeviceManager::HasLocalPointerDevice() const
 {
     for (auto it = inputDevice_.begin(); it != inputDevice_.end(); ++it) {
-        if (!it->second.isRemote_ && IsPointerDevice(it->second.inputDeviceOrigin_)) {
+        if (!it->second.isRemote_ && it->second.isPointerDevice_) {
             return true;
         }
     }
-- 
Gitee


From f973c1e558012126b9c7b539d1cc238731b21c17 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 31 Oct 2022 10:18:37 +0800
Subject: [PATCH 086/360] =?UTF-8?q?/dev/fuse=E6=9D=83=E9=99=90=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I24180c3e06e1bd8f56be291da08b2233444b4c51
---
 patch/prebuild_eudev/rules.d/50-udev-default.rules | 2 +-
 patch/prebuild_eudev/rules.d/99-fuse.rules         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patch/prebuild_eudev/rules.d/50-udev-default.rules b/patch/prebuild_eudev/rules.d/50-udev-default.rules
index f7815fa7c1..a64fbd405d 100644
--- a/patch/prebuild_eudev/rules.d/50-udev-default.rules
+++ b/patch/prebuild_eudev/rules.d/50-udev-default.rules
@@ -79,7 +79,7 @@ SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
 KERNEL=="rfkill", MODE="0664"
 KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun"
 
-KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse"
+KERNEL=="fuse", MODE="0660", OPTIONS+="static_node=fuse"
 
 # The static_node is required on s390x and ppc (they are using MODULE_ALIAS)
 KERNEL=="kvm", GROUP="kvm", MODE="0660", OPTIONS+="static_node=kvm"
diff --git a/patch/prebuild_eudev/rules.d/99-fuse.rules b/patch/prebuild_eudev/rules.d/99-fuse.rules
index 958511146e..bda279d138 100644
--- a/patch/prebuild_eudev/rules.d/99-fuse.rules
+++ b/patch/prebuild_eudev/rules.d/99-fuse.rules
@@ -1 +1 @@
-KERNEL=="fuse", MODE="0666"
+KERNEL=="fuse", MODE="0660"
-- 
Gitee


From b1a41584c2f75a28fc802d6fe340c4b58b88ab96 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 31 Oct 2022 12:05:49 +0800
Subject: [PATCH 087/360] Change the delay of the key sequence

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ia69c1c2d421e6d69d39fcbaa37460c3022b8d304
---
 frameworks/proxy/events/src/key_option.cpp    |  16 +-
 .../innerkits/event/include/key_option.h      |  13 ++
 .../include/input_event_handler.h             |   3 +
 .../event_handler/src/input_event_handler.cpp |  13 +-
 .../key_command/include/key_command_handler.h |  11 ++
 .../key_command/src/key_command_handler.cpp   | 155 +++++++++++++++---
 .../include/key_subscriber_handler.h          |  11 +-
 .../subscriber/src/key_subscriber_handler.cpp | 124 ++++++++++----
 8 files changed, 281 insertions(+), 65 deletions(-)

diff --git a/frameworks/proxy/events/src/key_option.cpp b/frameworks/proxy/events/src/key_option.cpp
index 90093be922..ed6f7203c9 100644
--- a/frameworks/proxy/events/src/key_option.cpp
+++ b/frameworks/proxy/events/src/key_option.cpp
@@ -57,11 +57,21 @@ int32_t KeyOption::GetFinalKeyDownDuration() const
     return finalKeyDownDuration_;
 }
 
+int32_t KeyOption::GetFinalKeyUpDelay() const
+{
+    return finalKeyUpDelay_;
+}
+
 void KeyOption::SetFinalKeyDownDuration(int32_t duration)
 {
     finalKeyDownDuration_ = duration;
 }
 
+void KeyOption::SetFinalKeyUpDelay(int32_t delay)
+{
+    finalKeyUpDelay_ = delay;
+}
+
 bool KeyOption::ReadFromParcel(Parcel &in)
 {
     int32_t preKeysSize;
@@ -82,7 +92,8 @@ bool KeyOption::ReadFromParcel(Parcel &in)
     return (
         in.ReadInt32(finalKey_) &&
         in.ReadBool(isFinalKeyDown_) &&
-        in.ReadInt32(finalKeyDownDuration_)
+        in.ReadInt32(finalKeyDownDuration_) &&
+        in.ReadInt32(finalKeyUpDelay_)
     );
 }
 
@@ -101,7 +112,8 @@ bool KeyOption::WriteToParcel(Parcel &out) const
     return (
         out.WriteInt32(finalKey_) &&
         out.WriteBool(isFinalKeyDown_) &&
-        out.WriteInt32(finalKeyDownDuration_)
+        out.WriteInt32(finalKeyDownDuration_) &&
+        out.WriteInt32(finalKeyUpDelay_)
     );
 }
 } // namespace MMI
diff --git a/interfaces/native/innerkits/event/include/key_option.h b/interfaces/native/innerkits/event/include/key_option.h
index 34d8eb846a..14ce2267c6 100644
--- a/interfaces/native/innerkits/event/include/key_option.h
+++ b/interfaces/native/innerkits/event/include/key_option.h
@@ -87,6 +87,12 @@ public:
      */
     int32_t GetFinalKeyDownDuration() const;
 
+    /**
+     * @brief 获取最后一个按键抬起的延时时间，当最后一个按键抬起时，会延时触发订阅
+     * @return
+     */
+    int32_t GetFinalKeyUpDelay() const;
+
     /**
      * @brief Sets the duration when the final key is held down or the maximum duration between when
      * the key is pressed and when the key is released.
@@ -100,6 +106,12 @@ public:
      */
     void SetFinalKeyDownDuration(int32_t duration);
 
+    /**
+     * @brief 设置最后一个按键抬起后的延时时间
+     * @param delay
+     */
+    void SetFinalKeyUpDelay(int32_t delay);
+
 public:
     /**
      * @brief Writes data to a <b>Parcel</b> object.
@@ -122,6 +134,7 @@ private:
     int32_t finalKey_ { -1 };
     bool isFinalKeyDown_ { false };
     int32_t finalKeyDownDuration_ { 0 };
+    int32_t finalKeyUpDelay_ { 0 };
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/event_handler/include/input_event_handler.h b/service/event_handler/include/input_event_handler.h
index 4461d6d5b2..10f0585bf5 100644
--- a/service/event_handler/include/input_event_handler.h
+++ b/service/event_handler/include/input_event_handler.h
@@ -28,6 +28,7 @@
 #include "i_event_filter.h"
 #include "i_input_event_handler.h"
 #include "key_subscriber_handler.h"
+#include "key_command_handler.h"
 #include "mouse_event_normalize.h"
 
 namespace OHOS {
@@ -45,6 +46,7 @@ public:
     std::shared_ptr<EventNormalizeHandler> GetEventNormalizeHandler() const;
     std::shared_ptr<EventInterceptorHandler> GetInterceptorHandler() const;
     std::shared_ptr<KeySubscriberHandler> GetSubscriberHandler() const;
+    std::shared_ptr<KeyCommandHandler> GetKeyCommandHandler() const;
     std::shared_ptr<EventMonitorHandler> GetMonitorHandler() const;
     std::shared_ptr<EventFilterHandler> GetFilterHandler() const;
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
@@ -60,6 +62,7 @@ private:
     std::shared_ptr<EventFilterHandler> eventFilterHandler_ { nullptr };
     std::shared_ptr<EventInterceptorHandler> eventInterceptorHandler_ { nullptr };
     std::shared_ptr<KeySubscriberHandler> eventSubscriberHandler_ { nullptr };
+    std::shared_ptr<KeyCommandHandler> eventKeyCommandHandler_ { nullptr };
     std::shared_ptr<EventMonitorHandler> eventMonitorHandler_ { nullptr };
 
     uint64_t idSeed_ { 0 };
diff --git a/service/event_handler/src/input_event_handler.cpp b/service/event_handler/src/input_event_handler.cpp
index 59f5b6a6c5..894fb34f47 100644
--- a/service/event_handler/src/input_event_handler.cpp
+++ b/service/event_handler/src/input_event_handler.cpp
@@ -104,10 +104,10 @@ int32_t InputEventHandler::BuildInputHandlerChain()
 
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
 #ifdef OHOS_BUILD_ENABLE_COMBINATION_KEY
-    auto keyCommandHandler = std::make_shared<KeyCommandHandler>();
-    CHKPR(keyCommandHandler, ERROR_NULL_POINTER);
-    handler->SetNext(keyCommandHandler);
-    handler = keyCommandHandler;
+    eventKeyCommandHandler_ = std::make_shared<KeyCommandHandler>();
+    CHKPR(eventKeyCommandHandler_, ERROR_NULL_POINTER);
+    handler->SetNext(eventKeyCommandHandler_);
+    handler = eventKeyCommandHandler_;
 #endif // OHOS_BUILD_ENABLE_COMBINATION_KEY
     eventSubscriberHandler_ = std::make_shared<KeySubscriberHandler>();
     CHKPR(eventSubscriberHandler_, ERROR_NULL_POINTER);
@@ -146,6 +146,11 @@ std::shared_ptr<KeySubscriberHandler> InputEventHandler::GetSubscriberHandler()
     return eventSubscriberHandler_;
 }
 
+std::shared_ptr<KeyCommandHandler> InputEventHandler::GetKeyCommandHandler() const
+{
+    return eventKeyCommandHandler_;
+}
+
 std::shared_ptr<EventMonitorHandler> InputEventHandler::GetMonitorHandler() const
 {
     return eventMonitorHandler_;
diff --git a/service/key_command/include/key_command_handler.h b/service/key_command/include/key_command_handler.h
index 263cf98a4f..f2758de8df 100755
--- a/service/key_command/include/key_command_handler.h
+++ b/service/key_command/include/key_command_handler.h
@@ -34,6 +34,12 @@
 
 namespace OHOS {
 namespace MMI {
+enum SpecialType {
+    SPECIAL_ALL = 0,
+    SUBSCRIBER_BEFORE_DELAY = 1,
+    KEY_DOWN_ACTION = 2
+};
+
 struct Ability {
     std::string bundleName;
     std::string abilityName;
@@ -104,6 +110,9 @@ private:
     bool HandleSequences(const std::shared_ptr<KeyEvent> keyEvent);
     bool HandleShortKeys(const std::shared_ptr<KeyEvent> keyEvent);
     bool AddSequenceKey(const std::shared_ptr<KeyEvent> keyEvent);
+    void RemoveSubscriberFrontTimer(int32_t keyCode);
+    void HandleSpecialKeys(int32_t keyCode, int32_t keyAction);
+    void InterruptTimers();
     void ResetLastMatchedKey()
     {
         lastMatchedKey_.preKeys.clear();
@@ -125,6 +134,8 @@ private:
     std::vector<Sequence> filterSequences_;
     std::vector<SequenceKey> keys_;
     bool isParseConfig_ { false };
+    std::map<int32_t, int32_t> specialKeys_;
+    std::map<int32_t, std::list<int32_t>> specialTimers_;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index e4758f51fe..1b4ba20f69 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -17,22 +17,34 @@
 
 #include "dfx_hisysevent.h"
 #include "ability_manager_client.h"
+#include "bytrace_adapter.h"
 #include "cJSON.h"
 #include "config_policy_utils.h"
-#include "file_ex.h"
-#include "bytrace_adapter.h"
+#include "define_multimodal.h"
 #include "error_multimodal.h"
+#include "file_ex.h"
+#include "input_event_data_transformation.h"
+#include "input_event_handler.h"
 #include "mmi_log.h"
+#include "net_packet.h"
+#include "proto.h"
 #include "timer_manager.h"
+#include "util_ex.h"
 
 namespace OHOS {
 namespace MMI {
 namespace {
 constexpr int32_t MAX_PREKEYS_NUM = 4;
 constexpr int32_t MAX_SEQUENCEKEYS_NUM = 10;
-constexpr int64_t MAX_DELAY_TIME = 3000000;
+constexpr int64_t MAX_DELAY_TIME = 1000000;
 constexpr int64_t SECONDS_SYSTEM = 1000;
+constexpr int32_t SPECIAL_KEY_DOWN_DELAY = 150;
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeyCommandHandler" };
+const std::map<int32_t, SpecialType> SPECIAL_KEYS = {
+    { KeyEvent::KEYCODE_POWER, SpecialType::KEY_DOWN_ACTION },
+    { KeyEvent::KEYCODE_VOLUME_DOWN, SpecialType::SPECIAL_ALL },
+    { KeyEvent::KEYCODE_VOLUME_UP, SpecialType::SUBSCRIBER_BEFORE_DELAY }
+};
 struct JsonParser {
     JsonParser() = default;
     ~JsonParser()
@@ -48,6 +60,18 @@ struct JsonParser {
     cJSON *json_ { nullptr };
 };
 
+bool IsSpeialType(int32_t keyCode, SpecialType type)
+{
+    auto it = SPECIAL_KEYS.find(keyCode);
+    if (it == SPECIAL_KEYS.end()) {
+        return false;
+    }
+    if (it->second != SpecialType::SPECIAL_ALL && it->second != type) {
+        return false;
+    }
+    return true;
+}
+
 bool GetPreKeys(const cJSON* jsonData, ShortcutKey &shortcutKey)
 {
     if (!cJSON_IsObject(jsonData)) {
@@ -584,8 +608,9 @@ bool KeyCommandHandler::ParseJson(const std::string &configFile)
         return false;
     }
 
-    if (!ParseShortcutKeys(parser, shortcutKeys_) &&
-        !ParseSequences(parser, sequences_)) {
+    bool ret = ParseShortcutKeys(parser, shortcutKeys_);
+    ret = ParseSequences(parser, sequences_) && ret;
+    if (!ret) {
         MMI_HILOGE("Parse configFile failed");
         return false;
     }
@@ -638,12 +663,49 @@ bool KeyCommandHandler::OnHandleEvent(const std::shared_ptr<KeyEvent> key)
         }
         isParseConfig_ = true;
     }
-    if (!HandleShortKeys(key) ||
-        !HandleSequences(key)) {
-        MMI_HILOGE("Handle key event failed");
-        return false;
+
+    bool ret = HandleShortKeys(key);
+    ret = HandleSequences(key) || ret;
+    if (ret) {
+        return true;
     }
-    return true;
+
+    if (!specialKeys_.empty() && specialKeys_.find(key->GetKeyCode()) != specialKeys_.end()) {
+        HandleSpecialKeys(key->GetKeyCode(), key->GetAction());
+        return true;
+    }
+
+    if (IsSpeialType(key->GetKeyCode(), SpecialType::SUBSCRIBER_BEFORE_DELAY)) {
+        int32_t timerId = TimerMgr->AddTimer(SPECIAL_KEY_DOWN_DELAY, 1, [this, key] () {
+            MMI_HILOGD("Timer callback");
+            auto it = specialTimers_.find(key->GetKeyCode());
+            if (it != specialTimers_.end() && !it->second.empty()) {
+                it->second.pop_front();
+            }
+            InputHandler->GetSubscriberHandler()->HandleKeyEvent(key);
+        });
+        if (timerId < 0) {
+            MMI_HILOGE("Add timer failed");
+            return false;
+        }
+
+        auto it = specialTimers_.find(key->GetKeyCode());
+        if (it == specialTimers_.end()) {
+            std::list<int32_t> timerIds;
+            timerIds.push_back(timerId);
+            auto it = specialTimers_.emplace(key->GetKeyCode(), timerIds);
+            if (!it.second) {
+                MMI_HILOGE("Emplace duplicated");
+                return false;
+            }
+        } else {
+            it->second.push_back(timerId);
+        }
+        MMI_HILOGD("Add timer success");
+        return true;
+    }
+    
+    return false;
 }
 
 bool KeyCommandHandler::HandleShortKeys(const std::shared_ptr<KeyEvent> keyEvent)
@@ -723,6 +785,16 @@ bool KeyCommandHandler::HandleSequences(const std::shared_ptr<KeyEvent> keyEvent
         }
     }
 
+    if (isLaunchAbility) {
+        for (const auto& item : keys_) {
+            if (IsSpeialType(item.keyCode, SpecialType::KEY_DOWN_ACTION)) {
+                HandleSpecialKeys(item.keyCode, item.keyAction);
+            }
+            InputHandler->GetSubscriberHandler()->RemoveSubscriberKeyUpTimer(item.keyCode);
+            RemoveSubscriberFrontTimer(item.keyCode);
+        }
+    }
+
     if (tempSeqs.empty()) {
         MMI_HILOGD("No matching sequence found");
     } else {
@@ -740,6 +812,10 @@ bool KeyCommandHandler::AddSequenceKey(const std::shared_ptr<KeyEvent> keyEvent)
     sequenceKey.keyAction = keyEvent->GetKeyAction();
     sequenceKey.actionTime = keyEvent->GetActionTime();
     size_t size = keys_.size();
+    if (size > MAX_SEQUENCEKEYS_NUM) {
+        MMI_HILOGD("The save key size more than the max size");
+        return false;
+    }
     if (size > 0) {
         if (keys_[size - 1].actionTime > sequenceKey.actionTime) {
             MMI_HILOGE("The current event time is greater than the last event time");
@@ -755,20 +831,9 @@ bool KeyCommandHandler::AddSequenceKey(const std::shared_ptr<KeyEvent> keyEvent)
                 return false;
             }
             keys_[size - 1].delay = sequenceKey.actionTime - keys_[size - 1].actionTime;
-            for (Sequence& item : filterSequences_) {
-                if (item.timerId >= 0) {
-                    MMI_HILOGD("The key sequence change, close the timer");
-                    TimerMgr->RemoveTimer(item.timerId);
-                    item.timerId = -1;
-                }
-            }
+            InterruptTimers();
         }
     }
-
-    if (size > MAX_SEQUENCEKEYS_NUM) {
-        MMI_HILOGD("The save key size more than the max size");
-        return false;
-    }
     keys_.push_back(sequenceKey);
     return true;
 }
@@ -959,5 +1024,51 @@ void ShortcutKey::Print() const
     MMI_HILOGD("Eventkey matched, finalKey:%{public}d, bundleName:%{public}s",
         finalKey, ability.bundleName.c_str());
 }
+
+void KeyCommandHandler::RemoveSubscriberFrontTimer(int32_t keyCode)
+{
+    CALL_DEBUG_ENTER;
+    auto iter = specialTimers_.find(keyCode);
+    if (iter != specialTimers_.end()) {
+        for (auto& item : iter->second) {
+            TimerMgr->RemoveTimer(item);
+        }
+        specialTimers_.erase(keyCode);
+        MMI_HILOGD("Remove timer success");
+    }
+}
+
+void KeyCommandHandler::HandleSpecialKeys(int32_t keyCode, int32_t keyAction)
+{
+    CALL_DEBUG_ENTER;
+    auto iter = specialKeys_.find(keyCode);
+    if (keyAction == KeyEvent::KEY_ACTION_UP) {
+        if (iter != specialKeys_.end()) {
+            specialKeys_.erase(iter);
+            return;
+        }
+    }
+
+    if (keyAction == KeyEvent::KEY_ACTION_DOWN) {
+        if (iter == specialKeys_.end()) {
+            auto it = specialKeys_.emplace(keyCode, keyAction);
+            if (!it.second) {
+                MMI_HILOGD("Add keyCode failed");
+                return;
+            }
+        }
+    }
+}
+
+void KeyCommandHandler::InterruptTimers()
+{
+    for (Sequence& item : filterSequences_) {
+        if (item.timerId >= 0) {
+            MMI_HILOGD("The key sequence change, close the timer");
+            TimerMgr->RemoveTimer(item.timerId);
+            item.timerId = -1;
+        }
+    }
+}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/service/subscriber/include/key_subscriber_handler.h b/service/subscriber/include/key_subscriber_handler.h
index c10a4eb227..ef32e1534a 100644
--- a/service/subscriber/include/key_subscriber_handler.h
+++ b/service/subscriber/include/key_subscriber_handler.h
@@ -47,6 +47,7 @@ public:
     int32_t SubscribeKeyEvent(SessionPtr sess, int32_t subscribeId,
             const std::shared_ptr<KeyOption> keyOption);
     int32_t UnsubscribeKeyEvent(SessionPtr sess, int32_t subscribeId);
+    void RemoveSubscriberKeyUpTimer(int32_t keyCode);
     void Dump(int32_t fd, const std::vector<std::string> &args);
 private:
     struct Subscriber {
@@ -61,7 +62,7 @@ private:
     void InsertSubScriber(std::shared_ptr<Subscriber> subs);
 
 private:
-    bool SubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
+    bool OnSubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
     bool HandleKeyDown(const std::shared_ptr<KeyEvent> &keyEvent);
     bool HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent);
     bool HandleKeyCancel(const std::shared_ptr<KeyEvent> &keyEvent);
@@ -69,7 +70,7 @@ private:
     bool IsPreKeysMatch(const std::set<int32_t> &preKeys, const std::vector<int32_t> &pressedKeys) const;
 
     void NotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
-            const std::shared_ptr<Subscriber> &subscriber);
+                          const std::shared_ptr<Subscriber> &subscriber);
 
     bool AddTimer(const std::shared_ptr<Subscriber> &subscriber, const std::shared_ptr<KeyEvent> &keyEvent);
     void ClearTimer(const std::shared_ptr<Subscriber> &subscriber);
@@ -79,11 +80,15 @@ private:
     bool CloneKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
     void RemoveKeyCode(int32_t keyCode, std::vector<int32_t> &keyCodes);
     bool IsRepeatedKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
+    bool IsNotifyPowerKeySubsciber(int32_t keyCode, const std::vector<int32_t> &keyCodes);
+    void StartKeyUpNotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
+                                    const std::shared_ptr<Subscriber> &subscriber);
+    void PrintKeyUpLog(const std::shared_ptr<Subscriber> &subscriber);
 
 private:
     std::list<std::shared_ptr<Subscriber>> subscribers_ {};
     bool callbackInitialized_ { false };
-    bool hasEventExecuting { false };
+    bool hasEventExecuting_ { false };
     std::shared_ptr<KeyEvent> keyEvent_ { nullptr };
 };
 } // namespace MMI
diff --git a/service/subscriber/src/key_subscriber_handler.cpp b/service/subscriber/src/key_subscriber_handler.cpp
index 58990b466d..32033f0186 100644
--- a/service/subscriber/src/key_subscriber_handler.cpp
+++ b/service/subscriber/src/key_subscriber_handler.cpp
@@ -36,7 +36,7 @@ constexpr uint32_t MAX_PRE_KEY_COUNT = 4;
 void KeySubscriberHandler::HandleKeyEvent(const std::shared_ptr<KeyEvent> keyEvent)
 {
     CHKPV(keyEvent);
-    if (SubscribeKeyEvent(keyEvent)) {
+    if (OnSubscribeKeyEvent(keyEvent)) {
         MMI_HILOGD("Subscribe keyEvent filter success. keyCode:%{public}d", keyEvent->GetKeyCode());
         BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::KEY_SUBSCRIBE_EVENT);
         return;
@@ -83,8 +83,8 @@ int32_t KeySubscriberHandler::SubscribeKeyEvent(
     for (const auto &keyCode : keyOption->GetPreKeys()) {
         MMI_HILOGD("keyOption->prekey:%{public}d", keyCode);
     }
-    MMI_HILOGD("subscribeId:%{public}d,keyOption->finalKey:%{public}d,"
-        "keyOption->isFinalKeyDown:%{public}s,keyOption->finalKeyDownDuration:%{public}d",
+    MMI_HILOGD("subscribeId:%{public}d, keyOption->finalKey:%{public}d,"
+        "keyOption->isFinalKeyDown:%{public}s, keyOption->finalKeyDownDuration:%{public}d",
         subscribeId, keyOption->GetFinalKey(), keyOption->IsFinalKeyDown() ? "true" : "false",
         keyOption->GetFinalKeyDownDuration());
     auto subscriber = std::make_shared<Subscriber>(subscribeId, sess, keyOption);
@@ -107,7 +107,7 @@ int32_t KeySubscriberHandler::UnsubscribeKeyEvent(SessionPtr sess, int32_t subsc
     return RET_ERR;
 }
 
-bool KeySubscriberHandler::SubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
+bool KeySubscriberHandler::OnSubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
 {
     CHKPF(keyEvent);
     if (IsRepeatedKeyEvent(keyEvent)) {
@@ -116,7 +116,7 @@ bool KeySubscriberHandler::SubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
     }
     keyEvent_ = KeyEvent::Clone(keyEvent);
     int32_t keyAction = keyEvent->GetKeyAction();
-    MMI_HILOGD("keyCode:%{public}d,keyAction:%{public}s", keyEvent->GetKeyCode(),
+    MMI_HILOGD("keyCode:%{public}d, keyAction:%{public}s", keyEvent->GetKeyCode(),
         KeyEvent::ActionToString(keyAction));
     for (const auto &keyCode : keyEvent->GetPressedKeys()) {
         MMI_HILOGD("Pressed KeyCode:%{public}d", keyCode);
@@ -125,10 +125,10 @@ bool KeySubscriberHandler::SubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
     if (keyAction == KeyEvent::KEY_ACTION_DOWN) {
         handled = HandleKeyDown(keyEvent);
     } else if (keyAction == KeyEvent::KEY_ACTION_UP) {
-        hasEventExecuting = false;
+        hasEventExecuting_ = false;
         handled = HandleKeyUp(keyEvent);
     } else if (keyAction == KeyEvent::KEY_ACTION_CANCEL) {
-        hasEventExecuting = false;
+        hasEventExecuting_ = false;
         handled = HandleKeyCancel(keyEvent);
     } else {
         MMI_HILOGW("keyAction exception");
@@ -164,9 +164,13 @@ void KeySubscriberHandler::OnSessionDelete(SessionPtr sess)
     }
 }
 
-bool KeySubscriberHandler::IsPreKeysMatch(
-    const std::set<int32_t> &preKeys, const std::vector<int32_t> &pressedKeys) const
+bool KeySubscriberHandler::IsPreKeysMatch(const std::set<int32_t> &preKeys,
+                                          const std::vector<int32_t> &pressedKeys) const
 {
+    if (preKeys.size() == 0) {
+        return true;
+    }
+
     if (preKeys.size() != pressedKeys.size()) {
         return false;
     }
@@ -182,7 +186,7 @@ bool KeySubscriberHandler::IsPreKeysMatch(
 }
 
 void KeySubscriberHandler::NotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
-    const std::shared_ptr<Subscriber> &subscriber)
+                                            const std::shared_ptr<Subscriber> &subscriber)
 {
     CALL_DEBUG_ENTER;
     CHKPV(keyEvent);
@@ -204,7 +208,7 @@ void KeySubscriberHandler::NotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
 }
 
 bool KeySubscriberHandler::AddTimer(const std::shared_ptr<Subscriber> &subscriber,
-    const std::shared_ptr<KeyEvent> &keyEvent)
+                                    const std::shared_ptr<KeyEvent> &keyEvent)
 {
     CALL_DEBUG_ENTER;
     CHKPF(keyEvent);
@@ -216,7 +220,9 @@ bool KeySubscriberHandler::AddTimer(const std::shared_ptr<Subscriber> &subscribe
     }
 
     auto &keyOption = subscriber->keyOption_;
-    if (keyOption->GetFinalKeyDownDuration() <= 0) {
+    bool isKeyDown = keyOption->IsFinalKeyDown();
+    int32_t duration = isKeyDown ? keyOption->GetFinalKeyDownDuration() : keyOption->GetFinalKeyUpDelay();
+    if (duration <= 0) {
         MMI_HILOGE("Leave, duration <= 0");
         return true;
     }
@@ -227,7 +233,7 @@ bool KeySubscriberHandler::AddTimer(const std::shared_ptr<Subscriber> &subscribe
     }
 
     std::weak_ptr<Subscriber> weakSubscriber = subscriber;
-    subscriber->timerId_ = TimerMgr->AddTimer(keyOption->GetFinalKeyDownDuration(), 1, [this, weakSubscriber] () {
+    subscriber->timerId_ = TimerMgr->AddTimer(duration, 1, [this, weakSubscriber] () {
         MMI_HILOGD("Timer callback");
         auto subscriber = weakSubscriber.lock();
         CHKPV(subscriber);
@@ -239,10 +245,10 @@ bool KeySubscriberHandler::AddTimer(const std::shared_ptr<Subscriber> &subscribe
         return false;
     }
     subscriber->keyEvent_ = keyEvent_;
-    hasEventExecuting = true;
+    hasEventExecuting_ = true;
     MMI_HILOGD("Leave, add timer success, subscribeId:%{public}d,"
-        "duration:%{public}d,timerId:%{public}d",
-        subscriber->id_, keyOption->GetFinalKeyDownDuration(), subscriber->timerId_);
+        "duration:%{public}d, timerId:%{public}d",
+        subscriber->id_, duration, subscriber->timerId_);
     return true;
 }
 
@@ -252,22 +258,23 @@ void KeySubscriberHandler::ClearTimer(const std::shared_ptr<Subscriber> &subscri
     CHKPV(subscriber);
 
     if (subscriber->timerId_ < 0) {
-        MMI_HILOGW("Leave, subscribeId:%{public}d,null timerId < 0", subscriber->id_);
+        MMI_HILOGW("Leave, subscribeId:%{public}d, null timerId < 0", subscriber->id_);
         return;
     }
 
+    TimerMgr->RemoveTimer(subscriber->timerId_);
     auto timerId = subscriber->timerId_;
     subscriber->keyEvent_.reset();
     subscriber->timerId_ = -1;
-    TimerMgr->RemoveTimer(timerId);
-    hasEventExecuting = false;
-    MMI_HILOGD("subscribeId:%{public}d,timerId:%{public}d", subscriber->id_, timerId);
+    hasEventExecuting_ = false;
+    MMI_HILOGD("subscribeId:%{public}d, timerId:%{public}d", subscriber->id_, timerId);
 }
 
 void KeySubscriberHandler::OnTimer(const std::shared_ptr<Subscriber> subscriber)
 {
     CALL_DEBUG_ENTER;
     CHKPV(subscriber);
+    hasEventExecuting_ = false;
     subscriber->timerId_ = -1;
     if (subscriber->keyEvent_ == nullptr) {
         MMI_HILOGE("Leave, subscriber->keyEvent is nullptr, subscribeId:%{public}d", subscriber->id_);
@@ -305,8 +312,8 @@ bool KeySubscriberHandler::HandleKeyDown(const std::shared_ptr<KeyEvent> &keyEve
     RemoveKeyCode(keyCode, pressedKeys);
     for (const auto &subscriber : subscribers_) {
         auto &keyOption = subscriber->keyOption_;
-        MMI_HILOGD("subscribeId:%{public}d,keyOption->finalKey:%{public}d,"
-            "keyOption->isFinalKeyDown:%{public}s,keyOption->finalKeyDownDuration:%{public}d",
+        MMI_HILOGD("subscribeId:%{public}d, keyOption->finalKey:%{public}d,"
+            "keyOption->isFinalKeyDown:%{public}s, keyOption->finalKeyDownDuration:%{public}d",
             subscriber->id_, keyOption->GetFinalKey(), keyOption->IsFinalKeyDown() ? "true" : "false",
             keyOption->GetFinalKeyDownDuration());
         for (const auto &keyCode : keyOption->GetPreKeys()) {
@@ -354,15 +361,8 @@ bool KeySubscriberHandler::HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent
     std::vector<int32_t> pressedKeys = keyEvent->GetPressedKeys();
     RemoveKeyCode(keyCode, pressedKeys);
     for (const auto &subscriber : subscribers_) {
+        PrintKeyUpLog(subscriber);
         auto &keyOption = subscriber->keyOption_;
-        MMI_HILOGD("subscribeId:%{public}d,keyOption->finalKey:%{public}d,"
-            "keyOption->isFinalKeyDown:%{public}s,keyOption->finalKeyDownDuration:%{public}d",
-            subscriber->id_, keyOption->GetFinalKey(), keyOption->IsFinalKeyDown() ? "true" : "false",
-            keyOption->GetFinalKeyDownDuration());
-        for (const auto &keyCode : keyOption->GetPreKeys()) {
-            MMI_HILOGD("keyOption->prekey:%{public}d", keyCode);
-        }
-
         if (keyOption->IsFinalKeyDown()) {
             ClearTimer(subscriber);
             MMI_HILOGD("keyOption->IsFinalKeyDown()");
@@ -379,10 +379,15 @@ bool KeySubscriberHandler::HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent
             continue;
         }
 
+        if (!IsNotifyPowerKeySubsciber(keyOption->GetFinalKey(), pressedKeys)) {
+            MMI_HILOGD("In special case, subscriber are not notified");
+            continue;
+        }
+
         auto duration = keyOption->GetFinalKeyDownDuration();
         if (duration <= 0) {
             MMI_HILOGD("duration <= 0");
-            NotifySubscriber(keyEvent, subscriber);
+            StartKeyUpNotifySubscriber(keyEvent, subscriber);
             handled = true;
             continue;
         }
@@ -396,7 +401,7 @@ bool KeySubscriberHandler::HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent
             continue;
         }
         MMI_HILOGD("upTime - downTime < duration");
-        NotifySubscriber(keyEvent, subscriber);
+        StartKeyUpNotifySubscriber(keyEvent, subscriber);
         handled = true;
     }
     MMI_HILOGD("%{public}s", handled ? "true" : "false");
@@ -417,7 +422,7 @@ bool KeySubscriberHandler::CloneKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
 {
     CHKPF(keyEvent);
     if (keyEvent_ == nullptr) {
-        MMI_HILOGW("The keyEvent_ is nullptr");
+        MMI_HILOGW("keyEvent_ is nullptr");
         keyEvent_ = KeyEvent::Clone(keyEvent);
     }
     CHKPF(keyEvent_);
@@ -437,7 +442,7 @@ void KeySubscriberHandler::RemoveKeyCode(int32_t keyCode, std::vector<int32_t> &
 bool KeySubscriberHandler::IsRepeatedKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
 {
     CHKPF(keyEvent);
-    if (!hasEventExecuting) {
+    if (!hasEventExecuting_) {
         return false;
     }
 
@@ -469,6 +474,57 @@ bool KeySubscriberHandler::IsRepeatedKeyEvent(std::shared_ptr<KeyEvent> keyEvent
     return true;
 }
 
+void KeySubscriberHandler::RemoveSubscriberKeyUpTimer(int32_t keyCode)
+{
+    for (const auto& item : subscribers_) {
+        if ((item->timerId_ >= 0) && (item->keyOption_->GetFinalKey() == keyCode)) {
+            ClearTimer(item);
+        }
+    }
+}
+
+bool KeySubscriberHandler::IsNotifyPowerKeySubsciber(int32_t keyCode, const std::vector<int32_t> &keyCodes)
+{
+    if (keyCode != KeyEvent::KEYCODE_POWER) {
+        return true;
+    }
+
+    bool isVolumePress = true;
+    for (const auto& pressedKey: keyCodes) {
+        if (pressedKey == KeyEvent::KEYCODE_VOLUME_DOWN || pressedKey == KeyEvent::KEYCODE_VOLUME_UP) {
+            isVolumePress = false;
+            break;
+        }
+    }
+    return isVolumePress;
+}
+
+void KeySubscriberHandler::StartKeyUpNotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
+                                                      const std::shared_ptr<Subscriber> &subscriber)
+{
+    auto keyUpDelay = subscriber->keyOption_->GetFinalKeyUpDelay();
+    if (keyUpDelay <= 0) {
+        NotifySubscriber(keyEvent, subscriber);
+    } else {
+        if (!AddTimer(subscriber, keyEvent)) {
+            MMI_HILOGE("Leave, add timer failed");
+        }
+    }
+}
+
+void KeySubscriberHandler::PrintKeyUpLog(const std::shared_ptr<Subscriber> &subscriber)
+{
+    auto &keyOption = subscriber->keyOption_;
+    MMI_HILOGD("subscribeId:%{public}d, keyOption->finalKey:%{public}d,"
+        "keyOption->isFinalKeyDown:%{public}s, keyOption->finalKeyDownDuration:%{public}d,"
+        "keyOption->finalKeyUpDelay:%{public}d",
+        subscriber->id_, keyOption->GetFinalKey(), keyOption->IsFinalKeyDown() ? "true" : "false",
+        keyOption->GetFinalKeyDownDuration(), keyOption->GetFinalKeyUpDelay());
+    for (const auto &keyCode : keyOption->GetPreKeys()) {
+        MMI_HILOGD("keyOption->prekey:%{public}d", keyCode);
+    }
+}
+
 void KeySubscriberHandler::Dump(int32_t fd, const std::vector<std::string> &args)
 {
     CALL_DEBUG_ENTER;
-- 
Gitee


From f9c8aa5f9e354948aa57a083c1ca602d64866190 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Mon, 31 Oct 2022 14:19:10 +0800
Subject: [PATCH 088/360] =?UTF-8?q?=E6=8C=87=E9=92=88=E6=8D=95=E8=8E=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 frameworks/proxy/event_handler/include/input_manager_impl.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index ba31ba5f27..416622d2f5 100644
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -102,7 +102,8 @@ public:
     void OnAnr(int32_t pid);
 
     int32_t EnterCaptureMode(int32_t windowId);
-    int32_t LeaveCaptureMode(int32_t windowId);    int32_t RegisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener);
+    int32_t LeaveCaptureMode(int32_t windowId);    
+	int32_t RegisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener);
     int32_t UnregisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener = nullptr);
     int32_t EnableInputDeviceCooperate(bool enabled, std::function<void(std::string, CooperationMessage)> callback);
     int32_t StartInputDeviceCooperate(const std::string &sinkDeviceId, int32_t srcInputDeviceId,
-- 
Gitee


From 8943a61c126809601438de2209d6865a5ef41ccb Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Mon, 31 Oct 2022 14:24:56 +0800
Subject: [PATCH 089/360] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 service/mouse_event_normalize/src/mouse_event_normalize.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index 84da97ec22..15a4336d9c 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -66,7 +66,8 @@ int32_t PointerSpeedCheck(int32_t speed)
     }
 }
 } // namespace
-MouseEventNormalize::MouseEventNormalize(){
+MouseEventNormalize::MouseEventNormalize()
+{
     pointerEvent_ = PointerEvent::Create();
     CHKPL(pointerEvent_);
 }
@@ -479,7 +480,8 @@ int32_t MouseEventNormalize::GetPointerSpeedByDeviceId(int32_t deviceId) const
     return pointerDeviceSpeeds.at(deviceId);
 }
 
-int32_t MouseEventNormalize::GetPointerSpeed() const{
+int32_t MouseEventNormalize::GetPointerSpeed() const
+{
     CALL_DEBUG_ENTER;
     MMI_HILOGD("Get pointer speed:%{public}d", speed_);
     return speed_;
-- 
Gitee


From e3e5f337ac019cca10561a48cb53a30d99f0bb1a Mon Sep 17 00:00:00 2001
From: hhh2 <pengfei.hou@huawei.com>
Date: Mon, 31 Oct 2022 14:42:10 +0800
Subject: [PATCH 090/360] return error on key event subscription failure

Signed-off-by: hhh2 <pengfei.hou@huawei.com>
Change-Id: I79018f4b06368e0a9fd0c3f15fdaa02ba7697353
---
 .../event_handler/src/key_event_input_subscribe_manager.cpp     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frameworks/proxy/event_handler/src/key_event_input_subscribe_manager.cpp b/frameworks/proxy/event_handler/src/key_event_input_subscribe_manager.cpp
index e9dd5ee27e..81b2b04609 100755
--- a/frameworks/proxy/event_handler/src/key_event_input_subscribe_manager.cpp
+++ b/frameworks/proxy/event_handler/src/key_event_input_subscribe_manager.cpp
@@ -113,6 +113,8 @@ int32_t KeyEventInputSubscribeManager::SubscribeKeyEvent(std::shared_ptr<KeyOpti
     }
     if (MMIEventHdl.SubscribeKeyEvent(*tIter) != RET_OK) {
         MMI_HILOGE("Subscribing key event failed");
+        subscribeInfos_.erase(tIter);
+        return INVALID_SUBSCRIBE_ID;
     }
 
     MMI_HILOGD("subscribeId:%{public}d,keyOption->finalKey:%{public}d,"
-- 
Gitee


From 4b1949b77acce5b91b66c0665ee79df93c044a2d Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 1 Nov 2022 10:29:24 +0800
Subject: [PATCH 091/360] =?UTF-8?q?watchdog=E5=AE=9A=E6=97=B6=E5=99=A8?=
 =?UTF-8?q?=E4=B8=8B=E6=AC=A1=E8=A7=A6=E5=8F=91=E6=97=B6=E9=97=B4=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Id63ace8b2ed94c9fe128f8e62b5e65159cc7e82a
---
 .../src/js_input_device_cooperate_context.cpp                   | 2 +-
 frameworks/proxy/events/src/key_option.cpp                      | 2 +-
 service/timer_manager/src/timer_manager.cpp                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
index 038de3dc5c..a682f4d5ec 100755
--- a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
@@ -170,7 +170,7 @@ napi_value JsInputDeviceCooperateContext::GetState(napi_env env, napi_callback_i
         return nullptr;
     }
     if (!UtilNapi::TypeOf(env, argv[0], napi_string)) {
-        MMI_HILOGE("The first paramter is not string");
+        MMI_HILOGE("The first parameter is not string");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "deviceDescriptor", "string");
         return nullptr;
     }
diff --git a/frameworks/proxy/events/src/key_option.cpp b/frameworks/proxy/events/src/key_option.cpp
index 90093be922..52ca91429e 100644
--- a/frameworks/proxy/events/src/key_option.cpp
+++ b/frameworks/proxy/events/src/key_option.cpp
@@ -21,7 +21,7 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeyOption" };
-constexpr int32_t PRE_KEYS_MAX_SIZE = 3;
+constexpr int32_t PRE_KEYS_MAX_SIZE = 4;
 }
 std::set<int32_t> KeyOption::GetPreKeys() const
 {
diff --git a/service/timer_manager/src/timer_manager.cpp b/service/timer_manager/src/timer_manager.cpp
index e90873aca0..f9130d51b1 100644
--- a/service/timer_manager/src/timer_manager.cpp
+++ b/service/timer_manager/src/timer_manager.cpp
@@ -192,7 +192,7 @@ void TimerManager::ProcessTimersInternal()
             curTimer->callback();
             continue;
         }
-        if (!AddInt64(nowTime, curTimer->intervalMs, curTimer->nextCallTime)) {
+        if (!AddInt64(curTimer->nextCallTime, curTimer->intervalMs, curTimer->nextCallTime)) {
             MMI_HILOGE("The addition of nextCallTime in TimerItem overflows");
             return;
         }
-- 
Gitee


From 31e75c2d7834041ef2cb54b8d36cc816e74d9d26 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 1 Nov 2022 10:34:01 +0800
Subject: [PATCH 092/360] =?UTF-8?q?watchdog=E5=AE=9A=E6=97=B6=E5=99=A8?=
 =?UTF-8?q?=E4=B8=8B=E6=AC=A1=E8=A7=A6=E5=8F=91=E6=97=B6=E9=97=B4=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: If7e2d61509baa85c4b7d971377757e50ad3abe52
---
 frameworks/napi/input_consumer/src/js_register_module.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frameworks/napi/input_consumer/src/js_register_module.cpp b/frameworks/napi/input_consumer/src/js_register_module.cpp
index 16b689b7cd..e9eec980f2 100644
--- a/frameworks/napi/input_consumer/src/js_register_module.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_module.cpp
@@ -220,7 +220,7 @@ static napi_value JsOn(napi_env env, napi_callback_info info)
     napi_value argv[3] = { 0 };
     CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 3) {
-        THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "paramter number error");
+        THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "parameter number error");
         return nullptr;
     }
     KeyEventMonitorInfo *event = new (std::nothrow) KeyEventMonitorInfo {
-- 
Gitee


From b4c77c6e9d32a627974fae6f9499619aa12fc69f Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 2 Nov 2022 10:42:54 +0800
Subject: [PATCH 093/360] Optimize and open the device fd to 100ms

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I1a2854cb6f3e4299b860a58241b65ee1a7f2b692
---
 service/libinput_adapter/src/libinput_adapter.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 service/libinput_adapter/src/libinput_adapter.cpp

diff --git a/service/libinput_adapter/src/libinput_adapter.cpp b/service/libinput_adapter/src/libinput_adapter.cpp
old mode 100644
new mode 100755
index b668fc2989..b1bd7aecb6
--- a/service/libinput_adapter/src/libinput_adapter.cpp
+++ b/service/libinput_adapter/src/libinput_adapter.cpp
@@ -30,8 +30,7 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "LibinputAdapter" };
-constexpr int32_t WAIT_TIME_FOR_INPUT { 500 };
-constexpr int32_t MAX_RETRY_COUNT = 60;
+constexpr int32_t WAIT_TIME_FOR_INPUT { 10 };
 } // namespace
 
 static void HiLogFunc(struct libinput* input, libinput_log_priority priority, const char* fmt, va_list args)
@@ -79,14 +78,9 @@ constexpr static libinput_interface LIBINPUT_INTERFACE = {
             return RET_ERR;
         }
         char realPath[PATH_MAX] = {};
-        int32_t count = 0;
-        while ((realpath(path, realPath) == nullptr) && (count < MAX_RETRY_COUNT)) {
-            MMI_HILOGWK("Path is error, count:%{public}d, path:%{public}s", count, path);
+        if (realpath(path, realPath) == nullptr) {
             std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_TIME_FOR_INPUT));
-            ++count;
-        }
-        if (count >= MAX_RETRY_COUNT) {
-            MMI_HILOGWK("Retry %{public}d times realpath failed", count);
+            MMI_HILOGWK("The error path is %{public}s", path);
             return RET_ERR;
         }
         int32_t fd = open(realPath, flags);
-- 
Gitee


From b48d6597a7abff2920876308a3a4e5bc136f80c1 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 2 Nov 2022 10:43:05 +0800
Subject: [PATCH 094/360] Optimize and open the device fd to 100ms

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I808f2c730b1e33a0793e3107f172c701c6981a42
---
 service/libinput_adapter/src/libinput_adapter.cpp | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 service/libinput_adapter/src/libinput_adapter.cpp

diff --git a/service/libinput_adapter/src/libinput_adapter.cpp b/service/libinput_adapter/src/libinput_adapter.cpp
old mode 100755
new mode 100644
-- 
Gitee


From 61e4cfa2f54617630d740768824d7c33725822ad Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Wed, 2 Nov 2022 19:17:16 +0800
Subject: [PATCH 095/360] Signed-off-by:wuliangdong<wuliangdong1@huawei.com>

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
Change-Id: I69a4a6eb8c44a712cadb079375d50861c9084161
---
 .../input_consumer/src/js_register_util.cpp   |   6 +-
 .../input_device/include/js_event_target.h    |   2 +-
 .../napi/input_device/include/js_util.h       |   9 ++
 .../napi/input_device/src/js_event_target.cpp | 119 ++++++++++++------
 .../include/js_event_target.h                 |   2 +-
 .../src/js_event_target.cpp                   |  18 +--
 6 files changed, 105 insertions(+), 51 deletions(-)

diff --git a/frameworks/napi/input_consumer/src/js_register_util.cpp b/frameworks/napi/input_consumer/src/js_register_util.cpp
index 3fed12574e..6a34140a67 100644
--- a/frameworks/napi/input_consumer/src/js_register_util.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_util.cpp
@@ -316,7 +316,11 @@ void EmitAsyncCallbackWork(KeyEventMonitorInfo *reportEvent)
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     KeyEventMonitorInfoWorker *dataWorker = new (std::nothrow) KeyEventMonitorInfoWorker();
-    CHKPV(dataWorker);
+    if (dataWorker == nullptr) {
+        MMI_HILOGE("dataWorker is nullptr");
+        delete work;
+        return;
+    }
 
     dataWorker->env = reportEvent->env;
     dataWorker->reportEvent = reportEvent;
diff --git a/frameworks/napi/input_device/include/js_event_target.h b/frameworks/napi/input_device/include/js_event_target.h
index abd0a3cc08..e190f923f8 100644
--- a/frameworks/napi/input_device/include/js_event_target.h
+++ b/frameworks/napi/input_device/include/js_event_target.h
@@ -61,7 +61,7 @@ private:
     static void CallDevInfoPromiseWork(uv_work_t *work, int32_t status);
     static void EmitAddedDeviceEvent(uv_work_t *work, int32_t status);
     static void EmitRemoveDeviceEvent(uv_work_t *work, int32_t status);
-    static std::unique_ptr<JsUtil::CallbackInfo> GetCallbackInfo(uv_work_t *work);
+    static std::unique_ptr<JsUtil::CallbackInfo> GetCallbackInfoAndFreeWork(uv_work_t *work);
     static napi_value GreateBusinessError(napi_env env, int32_t errCode, std::string errMessage);
 private:
     inline static std::map<int32_t, std::unique_ptr<JsUtil::CallbackInfo>> callback_ {};
diff --git a/frameworks/napi/input_device/include/js_util.h b/frameworks/napi/input_device/include/js_util.h
index 6cabb8afbb..76bc208288 100644
--- a/frameworks/napi/input_device/include/js_util.h
+++ b/frameworks/napi/input_device/include/js_util.h
@@ -67,6 +67,15 @@ public:
             ptr = nullptr;
         }
     }
+
+    template <typename T>
+    static void ChkAndDeletePtr(T &ptr)
+    {
+        if (ptr != nullptr && ptr->data == nullptr) {
+            JsUtil::DeletePtr<uv_work_t*>(ptr);
+            return;
+        }
+    }
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/napi/input_device/src/js_event_target.cpp b/frameworks/napi/input_device/src/js_event_target.cpp
index 3ddeae113a..48a42ad429 100755
--- a/frameworks/napi/input_device/src/js_event_target.cpp
+++ b/frameworks/napi/input_device/src/js_event_target.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "js_event_target.h"
-
+#include "js_util.h"
 #include "napi_constants.h"
 #include "util_napi_error.h"
 
@@ -203,7 +203,7 @@ void JsEventTarget::CallIdsAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
 
@@ -241,7 +241,7 @@ void JsEventTarget::CallIdsPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
 
@@ -324,7 +324,7 @@ void JsEventTarget::CallDevAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -354,7 +354,7 @@ void JsEventTarget::CallDevPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -398,7 +398,11 @@ void JsEventTarget::EmitJsDev(int32_t userData, std::shared_ptr<InputDevice> dev
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
-    CHKPV(uData);
+    if (uData == nullptr) {
+        MMI_HILOGE("uData is nullptr");
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        return;
+    }
     work->data = static_cast<void*>(uData);
     int32_t ret;
     if (iter->second->isApi9) {
@@ -431,7 +435,7 @@ void JsEventTarget::CallKeystrokeAbilityPromise(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
 
@@ -452,6 +456,11 @@ void JsEventTarget::CallKeystrokeAbilityPromise(uv_work_t *work, int32_t status)
             return;
         }
         callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult == nullptr) {
+            MMI_HILOGE("callResult is null");
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
         CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
     } else {
         CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &callResult), CREATE_ARRAY, scope);
@@ -474,12 +483,8 @@ void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
 {
     CALL_DEBUG_ENTER;
     CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    JsUtil::ChkAndDeletePtr<uv_work_t*>(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
 
@@ -500,6 +505,11 @@ void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
             return;
         }
         callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult[0] == nullptr) {
+            MMI_HILOGE("callResult is null");
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
     } else {
         CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &callResult[1]), CREATE_ARRAY, scope);
@@ -515,11 +525,9 @@ void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
     }
     napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler),
-        GET_REFERENCE, scope);
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler),GET_REFERENCE, scope);
     napi_value result = nullptr;
-    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result),
-        CALL_FUNCTION, scope);
+    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result),CALL_FUNCTION, scope);
     napi_close_handle_scope(cb->env, scope);
     JsUtil::DeleteCallbackInfo(std::move(cb));
 }
@@ -547,7 +555,11 @@ void JsEventTarget::EmitSupportKeys(int32_t userData, std::vector<bool> &keystro
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
-    CHKPV(uData);
+    if (uData == nullptr) {
+        MMI_HILOGE("uData is null");
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        return;
+    }
     work->data = static_cast<void*>(uData);
     int32_t ret;
     if (iter->second->ref == nullptr) {
@@ -586,7 +598,11 @@ void JsEventTarget::EmitJsKeyboardType(int32_t userData, int32_t keyboardType)
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
-    CHKPV(uData);
+    if (uData == nullptr) {
+        MMI_HILOGE("uData is null");
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        return;
+    }
     work->data = static_cast<void*>(uData);
     int32_t ret = 0;
     if (iter->second->ref == nullptr) {
@@ -611,7 +627,7 @@ void JsEventTarget::CallKeyboardTypeAsync(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
 
@@ -633,6 +649,11 @@ void JsEventTarget::CallKeyboardTypeAsync(uv_work_t *work, int32_t status)
             return;
         }
         callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult[0] == nullptr) {
+            MMI_HILOGE("callResult is null");
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
     } else {
         CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, cb->data.keyboardType, &callResult[1]), CREATE_INT32, scope);
@@ -656,7 +677,7 @@ void JsEventTarget::CallKeyboardTypePromise(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
 
@@ -678,6 +699,11 @@ void JsEventTarget::CallKeyboardTypePromise(uv_work_t *work, int32_t status)
             return;
         }
         callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult == nullptr) {
+            MMI_HILOGE("callResult is null");
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
         CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
     } else {
         CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, cb->data.keyboardType, &callResult), CREATE_INT32, scope);
@@ -691,12 +717,8 @@ void JsEventTarget::CallDevListAsyncWork(uv_work_t *work, int32_t status)
 {
     CALL_DEBUG_ENTER;
     CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    JsUtil::ChkAndDeletePtr<uv_work_t*>(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -717,6 +739,11 @@ void JsEventTarget::CallDevListAsyncWork(uv_work_t *work, int32_t status)
             return;
         }
         callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult[0] == nullptr) {
+            MMI_HILOGE("callResult is null");
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
     } else {
         CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &callResult[1]), CREATE_ARRAY, scope);
@@ -732,8 +759,7 @@ void JsEventTarget::CallDevListAsyncWork(uv_work_t *work, int32_t status)
     napi_value handler = nullptr;
     CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
     napi_value result = nullptr;
-    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result),
-        CALL_FUNCTION, scope);
+    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result),CALL_FUNCTION, scope);
     napi_close_handle_scope(cb->env, scope);
     JsUtil::DeleteCallbackInfo(std::move(cb));
 }
@@ -747,7 +773,7 @@ void JsEventTarget::CallDevListPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -767,6 +793,11 @@ void JsEventTarget::CallDevListPromiseWork(uv_work_t *work, int32_t status)
             return;
         }
         callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult == nullptr) {
+            MMI_HILOGE("callResult is null");
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
         CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
     } else {
         CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &callResult), CREATE_ARRAY, scope);
@@ -787,17 +818,17 @@ void JsEventTarget::CallDevInfoPromiseWork(uv_work_t *work, int32_t status)
 {
     CALL_DEBUG_ENTER;
     CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    JsUtil::ChkAndDeletePtr<uv_work_t*>(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
-    CHKPV(scope);
+    if (scope == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        JsUtil::DeleteCallbackInfo(std::move(cb));
+        return;
+    }
     napi_value callResult = nullptr;
     if (cb->errCode != RET_OK) {
         if (cb->errCode == RET_ERR) {
@@ -812,6 +843,11 @@ void JsEventTarget::CallDevInfoPromiseWork(uv_work_t *work, int32_t status)
             return;
         }
         callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult == nullptr) {
+            MMI_HILOGE("callResult is null");
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
         CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
     } else {
         callResult = JsUtil::GetDeviceInfo(cb);
@@ -835,7 +871,7 @@ void JsEventTarget::CallDevInfoAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -855,6 +891,11 @@ void JsEventTarget::CallDevInfoAsyncWork(uv_work_t *work, int32_t status)
             return;
         }
         callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult[0] == nullptr) {
+            MMI_HILOGE("callResult is null");
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
     } else {
         callResult[1] = JsUtil::GetDeviceInfo(cb);
@@ -965,7 +1006,7 @@ napi_value JsEventTarget::GreateBusinessError(napi_env env, int32_t errCode, std
     return result;
 }
 
-std::unique_ptr<JsUtil::CallbackInfo> JsEventTarget::GetCallbackInfo(uv_work_t *work)
+std::unique_ptr<JsUtil::CallbackInfo> JsEventTarget::GetCallbackInfoAndFreeWork(uv_work_t *work)
 {
     std::lock_guard<std::mutex> guard(mutex_);
     int32_t *uData = static_cast<int32_t*>(work->data);
diff --git a/frameworks/napi/input_device_cooperate/include/js_event_target.h b/frameworks/napi/input_device_cooperate/include/js_event_target.h
index da0b8d8ced..22ffe49254 100755
--- a/frameworks/napi/input_device_cooperate/include/js_event_target.h
+++ b/frameworks/napi/input_device_cooperate/include/js_event_target.h
@@ -69,7 +69,7 @@ private:
     static void CallGetStateAsyncWork(uv_work_t *work, int32_t status);
     static void EmitCooperateMessageEvent(uv_work_t *work, int32_t status);
 
-    static std::unique_ptr<JsUtil::CallbackInfo> GetCallbackInfo(uv_work_t *work);
+    static std::unique_ptr<JsUtil::CallbackInfo> GetCallbackInfoAndFreeWork(uv_work_t *work);
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
index f8504eb895..b4bb3b15e3 100755
--- a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
@@ -349,7 +349,7 @@ void JsEventTarget::CallEnablePromsieWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -384,7 +384,7 @@ void JsEventTarget::CallEnableAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -411,7 +411,7 @@ void JsEventTarget::CallStartPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -446,7 +446,7 @@ void JsEventTarget::CallStartAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -473,7 +473,7 @@ void JsEventTarget::CallStopPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -509,7 +509,7 @@ void JsEventTarget::CallStopAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -536,7 +536,7 @@ void JsEventTarget::CallGetStatePromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -560,7 +560,7 @@ void JsEventTarget::CallGetStateAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
     CHKPV(cb);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -626,7 +626,7 @@ void JsEventTarget::EmitCooperateMessageEvent(uv_work_t *work, int32_t status)
     }
 }
 
-std::unique_ptr<JsUtil::CallbackInfo> JsEventTarget::GetCallbackInfo(uv_work_t *work)
+std::unique_ptr<JsUtil::CallbackInfo> JsEventTarget::GetCallbackInfoAndFreeWork(uv_work_t *work)
 {
     CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(mutex_);
-- 
Gitee


From 560a2fedd5c93b7167104db1247e00538ae020a6 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Wed, 2 Nov 2022 22:28:00 +0800
Subject: [PATCH 096/360] Signed-off-by:wuliangdong<wuliangdong1@huawei.com>

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
Change-Id: I1559f61ba6dde47a84021e823eb2f6c39724a8a0
---
 test/unittest/common/src/system_info.cpp   | 6 ++++--
 tools/vuinput/src/virtual_device.cpp       | 4 ++--
 tools/vuinput/test/virtual_device_test.cpp | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/unittest/common/src/system_info.cpp b/test/unittest/common/src/system_info.cpp
index 18b35dc8a2..8df8333027 100644
--- a/test/unittest/common/src/system_info.cpp
+++ b/test/unittest/common/src/system_info.cpp
@@ -85,7 +85,9 @@ int32_t CpuInfo::GetTaskPidFile(const std::string &process_name)
         filePath.close();
         break;
     }
-    ::closedir(dir);
+     if (::closedir(dir) != 0) {
+        MMI_HILOGE("Failed to closedir");
+    }
 
     return pid;
 }
@@ -115,7 +117,7 @@ int32_t CpuInfo::GetTaskPidCmd(const std::string &process_name, int32_t flag, st
         return DEFAULT_PID;
     }
     ::pclose(fp);
-    return ::atoi(buf);
+    return std::stoi(buf);
 }
 
 int32_t CpuInfo::GetProcOccupy(int32_t pid)
diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index 195861cb29..c32cdba572 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -588,14 +588,14 @@ bool VirtualDevice::CloseDevice(const std::string& closeDeviceName, const std::v
     }
     if (closeDeviceName == "all") {
         for (const auto &it : deviceList) {
-            kill(atoi(it.c_str()), SIGKILL);
+            kill(std::stoi(it), SIGKILL);
         }
         RemoveDir(g_folderPath);
         return true;
     }
     for (const auto &it : deviceList) {
         if (it.find(closeDeviceName) == 0) {
-            kill(atoi(it.c_str()), SIGKILL);
+            kill(std::stoi(it), SIGKILL);
             if (BrowseDirectory(g_folderPath).size() == 0) {
                 RemoveDir(g_folderPath);
             }
diff --git a/tools/vuinput/test/virtual_device_test.cpp b/tools/vuinput/test/virtual_device_test.cpp
index 6873383c45..0e196d70d5 100644
--- a/tools/vuinput/test/virtual_device_test.cpp
+++ b/tools/vuinput/test/virtual_device_test.cpp
@@ -343,6 +343,7 @@ HWTEST_F(VirtualDeviceTest, Test_FindDevice_closeTrue01, TestSize.Level1)
     symbolFileTest.append(g_folderPath).append("1111111").append("_").append("testDevice");
     std::ofstream flagFile;
     flagFile.open(symbolFileTest.c_str());
+    flagFile.close(symbolFileTest.c_str());
     std::vector<std::string> argvList;
     argvList.push_back("binName ");
     argvList.push_back("close ");
-- 
Gitee


From 86003ab7ab69312046f65ed7f0fcaed12f1d716e Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Thu, 3 Nov 2022 01:58:58 +0000
Subject: [PATCH 097/360] Delete redundant code

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 .../multimodal_input_connect_remoter.h        |  53 -------
 .../src/multimodal_input_connect_remoter.cpp  | 144 ------------------
 .../src/i_input_device_cooperate_state.cpp    |   4 +-
 .../src/input_device_cooperate_state_free.cpp |   2 +-
 .../src/input_device_cooperate_state_in.cpp   |  10 +-
 .../src/input_device_cooperate_state_out.cpp  |   6 +-
 6 files changed, 10 insertions(+), 209 deletions(-)
 delete mode 100755 service/connect_manager/include/multimodal_input_connect_remoter.h
 delete mode 100755 service/connect_manager/src/multimodal_input_connect_remoter.cpp

diff --git a/service/connect_manager/include/multimodal_input_connect_remoter.h b/service/connect_manager/include/multimodal_input_connect_remoter.h
deleted file mode 100755
index 88c37793bf..0000000000
--- a/service/connect_manager/include/multimodal_input_connect_remoter.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MULTIMODAL_INPUT_CONNECT_REMOTER_H
-#define MULTIMODAL_INPUT_CONNECT_REMOTER_H
-
-#include <map>
-#include <memory>
-#include <string>
-
-#include "nocopyable.h"
-
-#include "i_multimodal_input_connect.h"
-
-namespace OHOS {
-namespace MMI {
-class MultimodalInputConnectRemoter final : public std::enable_shared_from_this<MultimodalInputConnectRemoter> {
-public:
-    ~MultimodalInputConnectRemoter() = default;
-    static std::shared_ptr<MultimodalInputConnectRemoter> GetInstance();
-    int32_t StartRemoteCooperate(const std::string &localDeviceId, const std::string &remoteDeviceId);
-    int32_t StartRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess,
-        const std::string &startDhid, int32_t xPercent, int32_t yPercent);
-    int32_t StopRemoteCooperate(const std::string &remoteDeviceId);
-    int32_t StopRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess);
-    int32_t StartCooperateOtherResult(const std::string &remoteDeviceId, const std::string &srcNetworkId);
-
-private:
-    MultimodalInputConnectRemoter() = default;
-    DISALLOW_COPY_AND_MOVE(MultimodalInputConnectRemoter);
-
-    sptr<IMultimodalInputConnect> GetProxyById(const std::string &remoteDeviceId);
-    void OnRemoteDeath(const std::string &remoteDeviceId);
-    std::mutex lock_;
-    std::map<std::string, sptr<IMultimodalInputConnect>> mmiRemoteServices_;
-    std::map<std::string, sptr<IRemoteObject::DeathRecipient>> mmiDeathRecipients_;
-};
-} // namespace MMI
-} // namespace OHOS
-#define RemoteMgr MultimodalInputConnectRemoter::GetInstance()
-#endif // MULTIMODAL_INPUT_CONNECT_REMOTER_H
diff --git a/service/connect_manager/src/multimodal_input_connect_remoter.cpp b/service/connect_manager/src/multimodal_input_connect_remoter.cpp
deleted file mode 100755
index ca3555f33b..0000000000
--- a/service/connect_manager/src/multimodal_input_connect_remoter.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "multimodal_input_connect_remoter.h"
-
-#include <chrono>
-#include <thread>
-
-#include "iservice_registry.h"
-#include "system_ability_definition.h"
-
-#include "mmi_log.h"
-#include "multimodal_input_connect_death_recipient.h"
-#include "multimodal_input_connect_define.h"
-#include "util.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-std::shared_ptr<MultimodalInputConnectRemoter> g_instance = nullptr;
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MultimodalInputConnectRemoter" };
-} // namespace
-
-std::shared_ptr<MultimodalInputConnectRemoter> MultimodalInputConnectRemoter::GetInstance()
-{
-    static std::once_flag flag;
-    std::call_once(flag, [&]() {
-        g_instance.reset(new (std::nothrow) MultimodalInputConnectRemoter());
-    });
-    return g_instance;
-}
-
-int32_t MultimodalInputConnectRemoter::StartRemoteCooperate(const std::string &localDeviceId,
-    const std::string &remoteDeviceId)
-{
-    CALL_DEBUG_ENTER;
-    auto proxy = GetProxyById(remoteDeviceId);
-    CHKPR(proxy, RET_ERR);
-    return proxy->StartRemoteCooperate(localDeviceId);
-}
-
-int32_t MultimodalInputConnectRemoter::StartRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess,
-    const std::string &startDhid, int32_t xPercent, int32_t yPercent)
-{
-    CALL_DEBUG_ENTER;
-    auto proxy = GetProxyById(remoteDeviceId);
-    CHKPR(proxy, RET_ERR);
-    return proxy->StartRemoteCooperateResult(isSuccess, startDhid, xPercent, yPercent);
-}
-
-int32_t MultimodalInputConnectRemoter::StopRemoteCooperate(const std::string &remoteDeviceId)
-{
-    CALL_DEBUG_ENTER;
-    auto proxy = GetProxyById(remoteDeviceId);
-    CHKPR(proxy, RET_ERR);
-    return proxy->StopRemoteCooperate();
-}
-
-int32_t MultimodalInputConnectRemoter::StopRemoteCooperateResult(const std::string &remoteDeviceId, bool isSuccess)
-{
-    CALL_DEBUG_ENTER;
-    auto proxy = GetProxyById(remoteDeviceId);
-    CHKPR(proxy, RET_ERR);
-    return proxy->StopRemoteCooperateResult(isSuccess);
-}
-
-int32_t MultimodalInputConnectRemoter::StartCooperateOtherResult(const std::string &remoteDeviceId,
-    const std::string &srcNetworkId)
-{
-    CALL_DEBUG_ENTER;
-    auto proxy = GetProxyById(remoteDeviceId);
-    CHKPR(proxy, RET_ERR);
-    return proxy->StartCooperateOtherResult(srcNetworkId);
-}
-
-sptr<IMultimodalInputConnect> MultimodalInputConnectRemoter::GetProxyById(const std::string &remoteDeviceId)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(lock_);
-    auto iterService = mmiRemoteServices_.find(remoteDeviceId);
-    if (iterService != mmiRemoteServices_.end()) {
-        return iterService->second;
-    }
-    auto sm = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
-    CHKPP(sm);
-    auto sa = sm->GetSystemAbility(IMultimodalInputConnect::MULTIMODAL_INPUT_CONNECT_SERVICE_ID, remoteDeviceId);
-    CHKPP(sa);
-    std::weak_ptr<MultimodalInputConnectRemoter> weakPtr = shared_from_this();
-    auto deathCallback = [remoteDeviceId, weakPtr](const wptr<IRemoteObject> &object) {
-        auto sharedPtr = weakPtr.lock();
-        if (sharedPtr != nullptr) {
-            sharedPtr->OnRemoteDeath(remoteDeviceId);
-        }
-    };
-    sptr<IRemoteObject::DeathRecipient> deathRecipient =
-        new (std::nothrow) MultimodalInputConnectDeathRecipient(deathCallback);
-    CHKPP(deathRecipient);
-    sa->AddDeathRecipient(deathRecipient);
-    auto retDeath = mmiDeathRecipients_.emplace(remoteDeviceId, deathRecipient);
-    if (!retDeath.second) {
-        MMI_HILOGE("Get proxy faild, death recipient not set");
-        return nullptr;
-    }
-    sptr<IMultimodalInputConnect> remoteService = iface_cast<IMultimodalInputConnect>(sa);
-    if (remoteService == nullptr) {
-        MMI_HILOGE("Get proxy faild, get remote service is null!");
-        OnRemoteDeath(remoteDeviceId);
-        return nullptr;
-    }
-    auto retService = mmiRemoteServices_.emplace(remoteDeviceId, remoteService);
-    if (!retService.second) {
-        MMI_HILOGE("Get proxy faild, remote service not set!");
-        OnRemoteDeath(remoteDeviceId);
-        return nullptr;
-    }
-    return remoteService;
-}
-
-void MultimodalInputConnectRemoter::OnRemoteDeath(const std::string &remoteDeviceId)
-{
-    CALL_DEBUG_ENTER;
-    auto iterService = mmiRemoteServices_.find(remoteDeviceId);
-    if (iterService != mmiRemoteServices_.end()) {
-        mmiRemoteServices_.erase(iterService);
-    }
-    auto iterRecipient = mmiDeathRecipients_.find(remoteDeviceId);
-    if (iterRecipient != mmiDeathRecipients_.end()) {
-        mmiDeathRecipients_.erase(iterRecipient);
-    }
-}
-} // namespace MMI
-} // namespace OHOS
\ No newline at end of file
diff --git a/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp b/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp
index 1166592775..2192bad8c6 100755
--- a/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp
+++ b/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp
@@ -73,7 +73,7 @@ void IInputDeviceCooperateState::OnPrepareDistributedInput(
         std::function<void()> handleStartDinputFunc =
             std::bind(&IInputDeviceCooperateState::StartRemoteInput, this, startInputDeviceId);
         CHKPV(eventHandler_);
-        eventHandler_->PostTask(handleStartDinputFunc, taskName, 0, AppExecFwk::EventQueue::Priority::HIGH);
+        eventHandler_->ProxyPostTask(handleStartDinputFunc, taskName, 0);
     }
 }
 
@@ -105,7 +105,7 @@ void IInputDeviceCooperateState::OnStartRemoteInput(
     std::function<void()> handleStartFinishFunc =
         std::bind(&InputDeviceCooperateSM::OnStartFinish, InputDevCooSM, isSuccess, srcNetworkId, startInputDeviceId);
     CHKPV(eventHandler_);
-    eventHandler_->PostTask(handleStartFinishFunc, taskName, 0, AppExecFwk::EventQueue::Priority::HIGH);
+    eventHandler_->ProxyPostTask(handleStartFinishFunc, taskName, 0);
 }
 
 bool IInputDeviceCooperateState::NeedPrepare(const std::string &srcNetworkId, const std::string &sinkNetworkId)
diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp
index 5c5016852c..d90d5081b0 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_state_free.cpp
@@ -47,7 +47,7 @@ int32_t InputDeviceCooperateStateFree::StartInputDeviceCooperate(
     std::function<void()> handleProcessStartFunc =
         std::bind(&InputDeviceCooperateStateFree::ProcessStart, this, remoteNetworkId, startInputDeviceId);
     CHKPR(eventHandler_, RET_ERR);
-    eventHandler_->PostTask(handleProcessStartFunc, taskName, 0, AppExecFwk::EventQueue::Priority::HIGH);
+    eventHandler_->ProxyPostTask(handleProcessStartFunc, taskName, 0);
     return RET_OK;
 }
 
diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp
index 4518f5f205..401ae77f3d 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_state_in.cpp
@@ -53,7 +53,7 @@ int32_t InputDeviceCooperateStateIn::StartInputDeviceCooperate(const std::string
     std::function<void()> handleProcessStartFunc =
         std::bind(&InputDeviceCooperateStateIn::ProcessStart, this, remoteNetworkId, startInputDeviceId);
     CHKPR(eventHandler_, RET_ERR);
-    eventHandler_->PostTask(handleProcessStartFunc, taskName, 0, AppExecFwk::EventQueue::Priority::HIGH);
+    eventHandler_->ProxyPostTask(handleProcessStartFunc, taskName, 0);
     return RET_OK;
 }
 
@@ -80,7 +80,7 @@ int32_t InputDeviceCooperateStateIn::StopInputDeviceCooperate(const std::string
     std::string taskName = "process_stop_task";
     std::function<void()> handleProcessStopFunc = std::bind(&InputDeviceCooperateStateIn::ProcessStop, this);
     CHKPR(eventHandler_, RET_ERR);
-    eventHandler_->PostTask(handleProcessStopFunc, taskName, 0, AppExecFwk::EventQueue::Priority::HIGH);
+    eventHandler_->ProxyPostTask(handleProcessStopFunc, taskName, 0);
     return RET_OK;
 }
 
@@ -112,7 +112,7 @@ void InputDeviceCooperateStateIn::OnStartRemoteInput(
     std::function<void()> handleRelayStopFunc = std::bind(&InputDeviceCooperateStateIn::StopRemoteInput,
         this, sinkNetworkId, srcNetworkId, dhid, startInputDeviceId);
     CHKPV(eventHandler_);
-    eventHandler_->PostTask(handleRelayStopFunc, taskName, 0, AppExecFwk::EventQueue::Priority::HIGH);
+    eventHandler_->ProxyPostTask(handleRelayStopFunc, taskName, 0);
 }
 
 void InputDeviceCooperateStateIn::StopRemoteInput(const std::string &sinkNetworkId,
@@ -136,13 +136,13 @@ void InputDeviceCooperateStateIn::OnStopRemoteInput(bool isSuccess,
         std::function<void()> handleStartFinishFunc = std::bind(&InputDeviceCooperateSM::OnStartFinish,
             InputDevCooSM, isSuccess, remoteNetworkId, startInputDeviceId);
         CHKPV(eventHandler_);
-        eventHandler_->PostTask(handleStartFinishFunc, taskName, 0, AppExecFwk::EventQueue::Priority::HIGH);
+        eventHandler_->ProxyPostTask(handleStartFinishFunc, taskName, 0);
     } else if (InputDevCooSM->IsStopping()) {
         std::string taskName = "stop_finish_task";
         std::function<void()> handleStopFinishFunc =
             std::bind(&InputDeviceCooperateSM::OnStopFinish, InputDevCooSM, isSuccess, remoteNetworkId);
         CHKPV(eventHandler_);
-        eventHandler_->PostTask(handleStopFinishFunc, taskName, 0, AppExecFwk::EventQueue::Priority::HIGH);
+        eventHandler_->ProxyPostTask(handleStopFinishFunc, taskName, 0);
     }
 }
 
diff --git a/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp b/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
index 4d3bd15221..ea128d5f8e 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_state_out.cpp
@@ -49,8 +49,7 @@ int32_t InputDeviceCooperateStateOut::StopInputDeviceCooperate(const std::string
     std::function<void()> handleProcessStopFunc =
         std::bind(&InputDeviceCooperateStateOut::ProcessStop, this, srcNetworkId);
     CHKPR(eventHandler_, RET_ERR);
-    eventHandler_->PostTask(handleProcessStopFunc, taskName, 0,
-        AppExecFwk::EventQueue::Priority::HIGH);
+    eventHandler_->ProxyPostTask(handleProcessStopFunc, taskName, 0);
     return RET_OK;
 }
 
@@ -77,8 +76,7 @@ void InputDeviceCooperateStateOut::OnStopRemoteInput(bool isSuccess, const std::
     std::function<void()> handleStopFinishFunc =
         std::bind(&InputDeviceCooperateSM::OnStopFinish, InputDevCooSM, isSuccess, srcNetworkId);
     CHKPV(eventHandler_);
-    eventHandler_->PostTask(handleStopFinishFunc, taskName, 0,
-        AppExecFwk::EventQueue::Priority::HIGH);
+    eventHandler_->ProxyPostTask(handleStopFinishFunc, taskName, 0);
 }
 
 void InputDeviceCooperateStateOut::OnKeyboardOnline(const std::string &dhid)
-- 
Gitee


From a0bdb3e990e01fde5116c50fdc7c436c77e4cf4e Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Thu, 3 Nov 2022 02:25:26 +0000
Subject: [PATCH 098/360] Delete redundat dependencies

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 service/BUILD.gn                 |  1 -
 service/connect_manager/BUILD.gn | 12 ++++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/service/BUILD.gn b/service/BUILD.gn
index 36ee8eb9ff..75e8b85cc3 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -549,7 +549,6 @@ ohos_shared_library("libmmi-server") {
       "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler",
       "//foundation/deviceprofile/device_info_manager/interfaces/innerkits/core:distributed_device_profile_client",
       "//foundation/distributedhardware/distributed_input/interfaces/inner_kits:libdinput_sdk",
-      "//foundation/multimodalinput/input/service/connect_manager:mmi_connect_manager_proxy",
     ]
   }
 
diff --git a/service/connect_manager/BUILD.gn b/service/connect_manager/BUILD.gn
index 0358d045ae..581464961d 100644
--- a/service/connect_manager/BUILD.gn
+++ b/service/connect_manager/BUILD.gn
@@ -34,14 +34,10 @@ config("mmi_connect_manager_config") {
 ohos_source_set("mmi_connect_manager_service") {
   part_name = "input"
   subsystem_name = "multimodalinput"
-  sources =
-      [ "${mmi_connect_manager_path}/src/multimodal_input_connect_stub.cpp" ]
-
-  if (!input_feature_input_cooperation) {
-    sources += [
-      "${mmi_connect_manager_path}/src/multimodal_input_connect_def_parcel.cpp",
-    ]
-  }
+  sources = [
+    "${mmi_connect_manager_path}/src/multimodal_input_connect_stub.cpp",
+    "${mmi_connect_manager_path}/src/multimodal_input_connect_def_parcel.cpp",
+  ]
 
   configs = [ ":mmi_connect_manager_config" ]
 
-- 
Gitee


From 9d59ef34a93f2050a3792769733f104e40e68422 Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Thu, 3 Nov 2022 02:51:10 +0000
Subject: [PATCH 099/360] repair format check failed

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 service/connect_manager/BUILD.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/connect_manager/BUILD.gn b/service/connect_manager/BUILD.gn
index 581464961d..e9e24fc829 100644
--- a/service/connect_manager/BUILD.gn
+++ b/service/connect_manager/BUILD.gn
@@ -35,8 +35,8 @@ ohos_source_set("mmi_connect_manager_service") {
   part_name = "input"
   subsystem_name = "multimodalinput"
   sources = [
-    "${mmi_connect_manager_path}/src/multimodal_input_connect_stub.cpp",
     "${mmi_connect_manager_path}/src/multimodal_input_connect_def_parcel.cpp",
+    "${mmi_connect_manager_path}/src/multimodal_input_connect_stub.cpp",
   ]
 
   configs = [ ":mmi_connect_manager_config" ]
-- 
Gitee


From 0f3d090af97bcc9c1c7a4863ef1ebe6a6c27e946 Mon Sep 17 00:00:00 2001
From: joe49 <liqiao49@huawei.com>
Date: Thu, 3 Nov 2022 14:41:08 +0800
Subject: [PATCH 100/360] change name of distributed input node

Signed-off-by: joe49 <liqiao49@huawei.com>
---
 service/device_manager/src/input_device_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 7f42c218e2..0421b1a321 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -48,7 +48,7 @@ const std::string UNKNOWN_SCREEN_ID = "";
 const char *SPLIT_SYMBOL = "|";
 const std::string DH_ID_PREFIX = "Input_";
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-const std::string INPUT_VIRTUAL_DEVICE_NAME = "Hos Distributed Virtual Device ";
+const std::string INPUT_VIRTUAL_DEVICE_NAME = "DistributedInput ";
 std::unordered_map<int32_t, std::string> axisType = {
     {ABS_MT_TOUCH_MAJOR, "TOUCH_MAJOR"},
     {ABS_MT_TOUCH_MINOR, "TOUCH_MINOR"},
-- 
Gitee


From b3e4a75bf12ffcd2fc775eef448db291930c8b4e Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Fri, 4 Nov 2022 02:42:42 +0000
Subject: [PATCH 101/360] update
 frameworks/napi/input_device/src/js_event_target.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 frameworks/napi/input_device/src/js_event_target.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frameworks/napi/input_device/src/js_event_target.cpp b/frameworks/napi/input_device/src/js_event_target.cpp
index 48a42ad429..5665f8c726 100755
--- a/frameworks/napi/input_device/src/js_event_target.cpp
+++ b/frameworks/napi/input_device/src/js_event_target.cpp
@@ -525,9 +525,9 @@ void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
     }
     napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler),GET_REFERENCE, scope);
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
     napi_value result = nullptr;
-    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result),CALL_FUNCTION, scope);
+    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION, scope);
     napi_close_handle_scope(cb->env, scope);
     JsUtil::DeleteCallbackInfo(std::move(cb));
 }
@@ -759,7 +759,7 @@ void JsEventTarget::CallDevListAsyncWork(uv_work_t *work, int32_t status)
     napi_value handler = nullptr;
     CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
     napi_value result = nullptr;
-    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result),CALL_FUNCTION, scope);
+    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION, scope);
     napi_close_handle_scope(cb->env, scope);
     JsUtil::DeleteCallbackInfo(std::move(cb));
 }
-- 
Gitee


From 7a399f0516b7106e71568b1f400b60419a555cd4 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Fri, 4 Nov 2022 20:49:23 +0800
Subject: [PATCH 102/360] Signed-off-by:wuliangdong<wuliangdong1@huawei.com>

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
Change-Id: Icc52ec5b129058490cfa19128a30d83a943630c6
---
 service/module_loader/src/mmi_service.cpp |   4 +-
 service/module_loader/src/uds_server.cpp  | 107 +++++++++++-----------
 tools/vuinput/src/virtual_device.cpp      |  10 +-
 util/socket/include/uds_socket.h          |   2 +-
 util/socket/src/uds_socket.cpp            |   2 +-
 util/socket/test/uds_socket_test.cpp      |   8 +-
 6 files changed, 67 insertions(+), 66 deletions(-)

diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 8e9e59c556..7a7a4fe056 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -204,7 +204,7 @@ bool MMIService::InitService()
         MMI_HILOGE("Service running status is not enabled");
         return false;
     }
-    if (EpollCreat(MAX_EVENT_SIZE) < 0) {
+    if (EpollCreate(MAX_EVENT_SIZE) < 0) {
         MMI_HILOGE("Create epoll failed");
         return false;
     }
@@ -253,7 +253,7 @@ int32_t MMIService::Init()
         return POINTER_DRAW_INIT_FAIL;
     }
 #endif // OHOS_BUILD_ENABLE_POINTER
-    mmiFd_ = EpollCreat(MAX_EVENT_SIZE);
+    mmiFd_ = EpollCreate(MAX_EVENT_SIZE);
     if (mmiFd_ < 0) {
         MMI_HILOGE("Create epoll failed");
         return EPOLL_CREATE_FAIL;
diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp
index 8d2c1129e6..43a2665c28 100644
--- a/service/module_loader/src/uds_server.cpp
+++ b/service/module_loader/src/uds_server.cpp
@@ -97,72 +97,73 @@ int32_t UDSServer::AddSocketPairInfo(const std::string& programName,
 {
     CALL_DEBUG_ENTER;
     int32_t sockFds[2] = {};
-
     if (socketpair(AF_UNIX, SOCK_STREAM, 0, sockFds) != 0) {
         MMI_HILOGE("Call socketpair failed, errno:%{public}d", errno);
         return RET_ERR;
     }
-
     serverFd = sockFds[0];
     toReturnClientFd = sockFds[1];
-    if (toReturnClientFd < 0) {
+    if (serverFd < 0 || toReturnClientFd < 0) {
         MMI_HILOGE("Call fcntl failed, errno:%{public}d", errno);
         return RET_ERR;
     }
-
-    static constexpr size_t bufferSize = 32 * 1024;
-    setsockopt(sockFds[0], SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize));
-    setsockopt(sockFds[0], SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize));
-    if (tokenType == TokenType::TOKEN_NATIVE) {
-        static constexpr size_t nativeBufferSize = 64 * 1024;
-        setsockopt(sockFds[1], SOL_SOCKET, SO_SNDBUF, &nativeBufferSize, sizeof(nativeBufferSize));
-        setsockopt(sockFds[1], SOL_SOCKET, SO_RCVBUF, &nativeBufferSize, sizeof(nativeBufferSize));
-    } else {
-        setsockopt(sockFds[1], SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize));
-        setsockopt(sockFds[1], SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize));
-    }
-    MMI_HILOGD("Alloc socketpair, serverFd:%{public}d,clientFd:%{public}d(%{public}d)",
-               serverFd, toReturnClientFd, sockFds[1]);
-    auto closeSocketFdWhenError = [&serverFd, &toReturnClientFd] {
+    do {
+        static constexpr size_t bufferSize = 32 * 1024;
+        if (setsockopt(serverFd, SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize)) != 0) {
+            MMI_HILOGE("setsockopt serverFd failed, errno: %{public}d", errno);
+            break;
+        }
+        if (setsockopt(serverFd, SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize)) != 0) {
+            MMI_HILOGE("setsockopt serverFd failed, errno: %{public}d", errno);
+            break;
+        }
+        if (tokenType == TokenType::TOKEN_NATIVE) {
+            static constexpr size_t nativeBufferSize = 64 * 1024;
+            if (setsockopt(toReturnClientFd, SOL_SOCKET, SO_SNDBUF, &nativeBufferSize, sizeof(nativeBufferSize)) != 0) {
+                MMI_HILOGE("setsockopt toReturnClientFd failed, errno: %{public}d", errno);
+                break;
+            }
+            if (setsockopt(toReturnClientFd, SOL_SOCKET, SO_RCVBUF, &nativeBufferSize, sizeof(nativeBufferSize)) != 0) {
+                MMI_HILOGE("setsockopt toReturnClientFd failed, errno: %{public}d", errno);
+                break;
+            }
+        } else {
+            if (setsockopt(toReturnClientFd, SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize)) != 0) {
+                MMI_HILOGE("setsockopt toReturnClientFd failed, errno: %{public}d", errno);
+                break;
+            }
+            if (setsockopt(toReturnClientFd, SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize)) != 0) {
+                MMI_HILOGE("setsockopt toReturnClientFd failed, errno: %{public}d", errno);
+                break;
+            }
+        }
+        if (AddEpoll(EPOLL_EVENT_SOCKET, serverFd) != RET_OK) {
+            MMI_HILOGE("epoll_ctl EPOLL_CTL_ADD failed, errCode:%{public}d", EPOLL_MODIFY_FAIL);
+            break;
+        }
+        SessionPtr sess = std::make_shared<UDSSession>(programName, moduleType, serverFd, uid, pid);
+        if (sess == nullptr) {
+            MMI_HILOGE("make_shared fail. progName:%{public}s,pid:%{public}d,errCode:%{public}d",
+                programName.c_str(), pid, MAKE_SHARED_FAIL);
+            break;
+        }
+        sess->SetTokenType(tokenType);
+        if (!AddSession(sess)) {
+            MMI_HILOGE("AddSession fail errCode:%{public}d", ADD_SESSION_FAIL);
+            break;
+        }
+        OnConnected(sess);
+        return RET_OK;
+    } while(0);
+    if (serverFd != -1) {
         close(serverFd);
-        close(toReturnClientFd);
         serverFd = IMultimodalInputConnect::INVALID_SOCKET_FD;
-        toReturnClientFd = IMultimodalInputConnect::INVALID_SOCKET_FD;
-    };
-
-    std::list<std::function<void()> > cleanTaskList;
-    auto cleanTaskWhenError = [cleanTaskList] {
-        for (const auto &item : cleanTaskList) {
-            item();
-        }
-    };
-
-    cleanTaskList.push_back(closeSocketFdWhenError);
-
-    int32_t ret = RET_OK;
-    ret = AddEpoll(EPOLL_EVENT_SOCKET, serverFd);
-    if (ret != RET_OK) {
-        cleanTaskWhenError();
-        MMI_HILOGE("epoll_ctl EPOLL_CTL_ADD return %{public}d,errCode:%{public}d", ret, EPOLL_MODIFY_FAIL);
-        return ret;
     }
-
-    SessionPtr sess = std::make_shared<UDSSession>(programName, moduleType, serverFd, uid, pid);
-    if (sess == nullptr) {
-        cleanTaskWhenError();
-        MMI_HILOGE("make_shared fail. progName:%{public}s,pid:%{public}d,errCode:%{public}d",
-            programName.c_str(), pid, MAKE_SHARED_FAIL);
-        return RET_ERR;
-    }
-    sess->SetTokenType(tokenType);
-
-    if (!AddSession(sess)) {
-        cleanTaskWhenError();
-        MMI_HILOGE("AddSession fail errCode:%{public}d", ADD_SESSION_FAIL);
-        return RET_ERR;
+    if(toReturnClientFd != -1) {
+        close(toReturnClientFd);
+        toReturnClientFd = IMultimodalInputConnect::INVALID_SOCKET_FD;
     }
-    OnConnected(sess);
-    return RET_OK;
+    return RET_ERR;
 }
 
 void UDSServer::Dump(int32_t fd, const std::vector<std::string> &args)
diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index 195861cb29..ec9fa2335b 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -299,8 +299,8 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
 {
     DIR *dir = nullptr;
     const std::string::size_type pos = fileName.find("_");
-    const std::string procressPath = "/proc/" + fileName.substr(0, pos) + "/";
-    const std::string filePath = procressPath + "cmdline";
+    const std::string processPath = "/proc/" + fileName.substr(0, pos) + "/";
+    const std::string filePath = processPath + "cmdline";
     std::string temp;
     std::string processName;
     if (!CheckFileName(fileName)) {
@@ -311,9 +311,9 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
         std::cout << "Failed to create file" << std::endl;
         goto RELEASE_RES;
     }
-    dir = opendir(procressPath.c_str());
+    dir = opendir(processPath.c_str());
     if (dir == nullptr) {
-        std::cout << "Useless flag file:" << procressPath << std::endl;
+        std::cout << "Useless flag file:" << processPath << std::endl;
         goto RELEASE_RES;
     }
     temp = ReadUinputToolFile(filePath);
@@ -324,7 +324,7 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
     processName.append(temp);
     if (processName.find(VIRTUAL_DEVICE_NAME.c_str()) != std::string::npos) {
         if (closedir(dir) != 0) {
-            std::cout << "Close dir:" << procressPath <<"failed" << std::endl;
+            std::cout << "Close dir:" << processPath <<"failed" << std::endl;
         }
         return true;
     }
diff --git a/util/socket/include/uds_socket.h b/util/socket/include/uds_socket.h
index 42c327b21d..e2e3970715 100644
--- a/util/socket/include/uds_socket.h
+++ b/util/socket/include/uds_socket.h
@@ -40,7 +40,7 @@ public:
     virtual ~UDSSocket();
     using PacketCallBackFun = std::function<void(NetPacket&)>;
 
-    int32_t EpollCreat(int32_t size);
+    int32_t EpollCreate(int32_t size);
     int32_t EpollCtl(int32_t fd, int32_t op, struct epoll_event &event, int32_t epollFd = -1);
     int32_t EpollWait(struct epoll_event &events, int32_t maxevents, int32_t timeout, int32_t epollFd = -1);
     int32_t SetNonBlockMode(int32_t fd, bool isNonBlock = true);
diff --git a/util/socket/src/uds_socket.cpp b/util/socket/src/uds_socket.cpp
index 8e1ee8433f..1cb63d4e8b 100644
--- a/util/socket/src/uds_socket.cpp
+++ b/util/socket/src/uds_socket.cpp
@@ -34,7 +34,7 @@ UDSSocket::~UDSSocket()
     EpollClose();
 }
 
-int32_t UDSSocket::EpollCreat(int32_t size)
+int32_t UDSSocket::EpollCreate(int32_t size)
 {
     epollFd_ = epoll_create(size);
     if (epollFd_ < 0) {
diff --git a/util/socket/test/uds_socket_test.cpp b/util/socket/test/uds_socket_test.cpp
index ccec53017b..d9670120b7 100644
--- a/util/socket/test/uds_socket_test.cpp
+++ b/util/socket/test/uds_socket_test.cpp
@@ -44,21 +44,21 @@ HWTEST_F(UDSSocketTest, Close, TestSize.Level1)
     EXPECT_EQ(RET_OK, retResult);
 }
 
-HWTEST_F(UDSSocketTest, EpollCreat_001, TestSize.Level1)
+HWTEST_F(UDSSocketTest, EpollCreate_001, TestSize.Level1)
 {
     int32_t size = 0;
 
     UDSSocketUnitTest socObj;
-    int32_t retResult = socObj.EpollCreat(size);
+    int32_t retResult = socObj.EpollCreate(size);
     ASSERT_EQ(-1, retResult);
 }
 
-HWTEST_F(UDSSocketTest, EpollCreat_002, TestSize.Level1)
+HWTEST_F(UDSSocketTest, EpollCreate_002, TestSize.Level1)
 {
     int32_t size = -1001;
 
     UDSSocketUnitTest socObj;
-    int32_t retResult = socObj.EpollCreat(size);
+    int32_t retResult = socObj.EpollCreate(size);
     ASSERT_EQ(-1, retResult);
 }
 
-- 
Gitee


From c44bc3f5d61be7114128b356684720355778aac7 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 7 Nov 2022 11:29:13 +0800
Subject: [PATCH 103/360] Modifying the size of the mouse icon

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Icd956b8e9d16307123f07337ff0fa579b8d09762
---
 .../event_handler/src/input_manager_impl.cpp  |  6 ++--
 .../innerkits/proxy/include/display_info.h    |  7 +++++
 .../message_handle/src/server_msg_handler.cpp |  2 +-
 .../src/pointer_drawing_manager.cpp           | 25 +++--------------
 .../pointerstyle_fuzzer.cpp                   | 28 ++++++-------------
 .../updatedisplayinfo_fuzzer.cpp              | 22 +++++----------
 6 files changed, 30 insertions(+), 60 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index c347cdf3ea..dfff5ad55a 100755
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -288,7 +288,7 @@ int32_t InputManagerImpl::PackDisplayInfo(NetPacket &pkt)
     pkt << num;
     for (const auto &item : displayGroupInfo_.displaysInfo) {
         pkt << item.id << item.x << item.y << item.width
-            << item.height << item.name << item.uniq << item.direction;
+            << item.height << item.dpi << item.name << item.uniq << item.direction;
     }
     if (pkt.ChkRWError()) {
         MMI_HILOGE("Packet write display data failed");
@@ -323,9 +323,9 @@ void InputManagerImpl::PrintDisplayInfo()
     MMI_HILOGI("displayInfos,num:%{public}zu", displayGroupInfo_.displaysInfo.size());
     for (const auto &item : displayGroupInfo_.displaysInfo) {
         MMI_HILOGI("displayInfos,id:%{public}d,x:%{public}d,y:%{public}d,"
-            "width:%{public}d,height:%{public}d,name:%{public}s,"
+            "width:%{public}d,height:%{public}d,dpi:%{public}d,name:%{public}s,"
             "uniq:%{public}s,direction:%{public}d",
-            item.id, item.x, item.y, item.width, item.height, item.name.c_str(),
+            item.id, item.x, item.y, item.width, item.height, item.dpi, item.name.c_str(),
             item.uniq.c_str(), item.direction);
     }
 }
diff --git a/interfaces/native/innerkits/proxy/include/display_info.h b/interfaces/native/innerkits/proxy/include/display_info.h
index baa44133ae..339223e742 100644
--- a/interfaces/native/innerkits/proxy/include/display_info.h
+++ b/interfaces/native/innerkits/proxy/include/display_info.h
@@ -199,6 +199,13 @@ struct DisplayInfo {
      */
     int32_t height;
 
+    /**
+     * 像素密度，表示一英寸包含的像素点数。
+     *
+     * @since 10
+     */
+    int32_t dpi;
+
     /**
      * Name of the physical display, which is used for debugging
      *
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index 37b09d1bb3..5054316632 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -220,7 +220,7 @@ int32_t ServerMsgHandler::OnDisplayInfo(SessionPtr sess, NetPacket &pkt)
     for (uint32_t i = 0; i < num; i++) {
         DisplayInfo info;
         pkt >> info.id >> info.x >> info.y >> info.width >> info.height
-            >> info.name >> info.uniq >> info.direction;
+            >> info.dpi >> info.name >> info.uniq >> info.direction;
         displayGroupInfo.displaysInfo.push_back(info);
         if (pkt.ChkRWError()) {
         MMI_HILOGE("Packet read display info failed");
diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
index 9800cdbca8..dfa4a4b4c9 100644
--- a/service/window_manager/src/pointer_drawing_manager.cpp
+++ b/service/window_manager/src/pointer_drawing_manager.cpp
@@ -31,14 +31,8 @@ namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "PointerDrawingManager" };
 const std::string IMAGE_POINTER_DEFAULT_PATH = "/system/etc/multimodalinput/mouse_icon/";
-constexpr int32_t PAD_SCREEN_WIDTH = 2560;
-constexpr int32_t PHONE_SCREEN_WIDTH = 2160;
-constexpr int32_t SMALL_ICON_WIDTH = 40;
-constexpr int32_t SMALL_ICON_HEIGHT = 40;
-constexpr int32_t MIDDLE_ICON_WIDTH = 60;
-constexpr int32_t MIDDLE_ICON_HEIGHT = 60;
-constexpr int32_t LARGE_ICON_WIDTH = 80;
-constexpr int32_t LARGE_ICON_HEIGHT = 80;
+constexpr int32_t BASELINE_DENSITY = 160;
+constexpr int32_t DEVICE_INDEPENDENT_PIXELS = 40;
 } // namespace
 } // namespace MMI
 } // namespace OHOS
@@ -291,19 +285,8 @@ void PointerDrawingManager::UpdateDisplayInfo(const DisplayInfo& displayInfo)
     CALL_DEBUG_ENTER;
     hasDisplay_ = true;
     displayInfo_ = displayInfo;
-
-    if ((displayInfo_.width >= PHONE_SCREEN_WIDTH) || (displayInfo_.height >= PHONE_SCREEN_WIDTH)) {
-        if ((displayInfo_.width == PAD_SCREEN_WIDTH) || (displayInfo_.height == PAD_SCREEN_WIDTH)) {
-            imageWidth_ = MIDDLE_ICON_WIDTH;
-            imageHeight_ = MIDDLE_ICON_HEIGHT;
-        } else {
-            imageWidth_ = LARGE_ICON_WIDTH;
-            imageHeight_ = LARGE_ICON_HEIGHT;
-        }
-    } else {
-        imageWidth_ = SMALL_ICON_WIDTH;
-        imageHeight_ = SMALL_ICON_HEIGHT;
-    }
+    imageWidth_ = displayInfo.dpi * DEVICE_INDEPENDENT_PIXELS / BASELINE_DENSITY;
+    imageHeight_ = displayInfo.dpi * DEVICE_INDEPENDENT_PIXELS / BASELINE_DENSITY;
 }
 
 void PointerDrawingManager::OnDisplayInfo(const DisplayGroupInfo& displayGroupInfo)
diff --git a/test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.cpp b/test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.cpp
index 6de03a4e75..a5d6d8854a 100644
--- a/test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.cpp
+++ b/test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.cpp
@@ -19,13 +19,9 @@
 #include "securec.h"
 
 #include "input_manager.h"
-#include "mmi_log.h"
 
 namespace OHOS {
 namespace MMI {
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "PointerStyleFuzzTest" };
-} // namespace
 template<class T>
 size_t GetObject(const uint8_t *data, size_t size, T &object)
 {
@@ -40,7 +36,7 @@ size_t GetObject(const uint8_t *data, size_t size, T &object)
     return objectSize;
 }
 
-size_t GetString(size_t objectSize, const uint8_t *data, size_t size, std::string &object)
+size_t GetString(const uint8_t *data, size_t size, char *object, size_t objectSize)
 {
     if (objectSize > size) {
         return 0;
@@ -79,6 +75,7 @@ void UpdateDisplayInfo(const uint8_t* data, size_t size, int32_t windowId)
 {
     DisplayGroupInfo displayGroupInfo;
     size_t startPos = 0;
+    size_t stringSize = 4;
     startPos += GetObject<int32_t>(data + startPos, size - startPos, displayGroupInfo.width);
     startPos += GetObject<int32_t>(data + startPos, size - startPos, displayGroupInfo.height);
     startPos += GetObject<int32_t>(data + startPos, size - startPos, displayGroupInfo.focusWindowId);
@@ -100,22 +97,13 @@ void UpdateDisplayInfo(const uint8_t* data, size_t size, int32_t windowId)
     startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.x);
     startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.y);
     startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.width);
-    GetObject<int32_t>(data + startPos, size - startPos, displayInfo.height);
-
-    size_t objectSize = 0;
-    std::string name = "";
-    size_t ret = GetString(objectSize, data, size, name);
-    if (ret == 0) {
-        MMI_HILOGD("%{public}s:%{public}d GetString return 0", __func__, __LINE__);
-        return;
-    }
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.height);
+    startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.dpi);
+    char name[] = "name";
+    startPos += GetString(data + startPos, size - startPos, name, stringSize);
     displayInfo.name = name;
-    std::string uniq = "";
-    ret = GetString(objectSize, data, size, uniq);
-    if (ret == 0) {
-        MMI_HILOGD("%{public}s:%{public}d GetString return 0", __func__, __LINE__);
-        return;
-    }
+    char uniq[] = "uniq";
+    GetString(data + startPos, size - startPos, uniq, stringSize);
     displayInfo.uniq = uniq;
     displaysInfo.push_back(displayInfo);
     displayGroupInfo.windowsInfo = windowsInfo;
diff --git a/test/fuzztest/updatedisplayinfo_fuzzer/updatedisplayinfo_fuzzer.cpp b/test/fuzztest/updatedisplayinfo_fuzzer/updatedisplayinfo_fuzzer.cpp
index 49b9e14f86..21679fec40 100644
--- a/test/fuzztest/updatedisplayinfo_fuzzer/updatedisplayinfo_fuzzer.cpp
+++ b/test/fuzztest/updatedisplayinfo_fuzzer/updatedisplayinfo_fuzzer.cpp
@@ -42,7 +42,7 @@ size_t GetObject(const uint8_t *data, size_t size, T &object)
     return objectSize;
 }
 
-size_t GetString(size_t objectSize, const uint8_t *data, size_t size, std::string &object)
+size_t GetString(const uint8_t *data, size_t size, char *object, size_t objectSize)
 {
     if (objectSize > size) {
         return 0;
@@ -81,6 +81,7 @@ void UpdateDisplayInfoFuzzTest(const uint8_t* data, size_t size)
 {
     DisplayGroupInfo displayGroupInfo;
     size_t startPos = 0;
+    size_t stringSize = 4;
     startPos += GetObject<int32_t>(data + startPos, size - startPos, displayGroupInfo.width);
     startPos += GetObject<int32_t>(data + startPos, size - startPos, displayGroupInfo.height);
     startPos += GetObject<int32_t>(data + startPos, size - startPos, displayGroupInfo.focusWindowId);
@@ -104,21 +105,12 @@ void UpdateDisplayInfoFuzzTest(const uint8_t* data, size_t size)
         startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.y);
         startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.width);
         startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.height);
-
-        size_t objectSize = 0;
-        std::string name = "";
-        size_t ret = GetString(objectSize, data, size, name);
-        if (ret == 0) {
-            MMI_HILOGD("%{public}s:%{public}d The return value is 0", __func__, __LINE__);
-            return;
-        }
+        startPos += GetObject<int32_t>(data + startPos, size - startPos, displayInfo.dpi);
+        char name[] = "name";
+        startPos += GetString(data + startPos, size - startPos, name, stringSize);
         displayInfo.name = name;
-        std::string uniq = "";
-        ret = GetString(objectSize, data, size, uniq);
-        if (ret == 0) {
-            MMI_HILOGD("%{public}s:%{public}d The return value is 0", __func__, __LINE__);
-            return;
-        }
+        char uniq[] = "uniq";
+        startPos += GetString(data + startPos, size - startPos, uniq, stringSize);
         displayInfo.uniq = uniq;
         displaysInfo.push_back(displayInfo);
     }
-- 
Gitee


From c2a1a8b59c265194100a7e017b8809ace8a372e5 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Mon, 7 Nov 2022 06:22:34 +0000
Subject: [PATCH 104/360] update test/unittest/common/src/system_info.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 test/unittest/common/src/system_info.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unittest/common/src/system_info.cpp b/test/unittest/common/src/system_info.cpp
index 8df8333027..91a64c1237 100644
--- a/test/unittest/common/src/system_info.cpp
+++ b/test/unittest/common/src/system_info.cpp
@@ -85,7 +85,7 @@ int32_t CpuInfo::GetTaskPidFile(const std::string &process_name)
         filePath.close();
         break;
     }
-     if (::closedir(dir) != 0) {
+    if (::closedir(dir) != 0) {
         MMI_HILOGE("Failed to closedir");
     }
 
-- 
Gitee


From 8fbb5ac5b81f01134b9ae0344076d0b671571d37 Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Mon, 7 Nov 2022 06:59:20 +0000
Subject: [PATCH 105/360] fix mouse display bug

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 service/module_loader/src/mmi_service.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 8e9e59c556..96920f6e0d 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -259,7 +259,7 @@ int32_t MMIService::Init()
         return EPOLL_CREATE_FAIL;
     }
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-    InputDevCooSM->Init(std::bind(&DelegateTasks::PostSyncTask, &delegateTasks_, std::placeholders::_1));
+    InputDevCooSM->Init(std::bind(&DelegateTasks::PostAsyncTask, &delegateTasks_, std::placeholders::_1));
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     MMI_HILOGD("Input msg handler init");
     InputHandler->Init(*this);
-- 
Gitee


From a11c1f94ae335442098cded817e1c8a7f0f5686c Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Mon, 7 Nov 2022 16:36:25 +0800
Subject: [PATCH 106/360] Signed-off-by:wuliangdong<wuliangdong1@huawei.com>

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
Change-Id: I4fc8eac755b9971d592954c84c04d200fd22f8d3
---
 tools/vuinput/src/virtual_device.cpp | 60 ++++++++++++++--------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index 195861cb29..ac57892d30 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -53,29 +53,29 @@ const std::string PROC_PATH = "/proc";
 const std::string VIRTUAL_DEVICE_NAME = "vuinput";
 const std::string g_pid = std::to_string(getpid());
 
-inline bool IsNum(const std::string& str)
+static inline bool IsNum(const std::string& str)
 {
     std::istringstream sin(str);
     double num;
     return (sin >> num) && sin.eof();
 }
 
-inline bool IsValidPath(const std::string& rootDir, const std::string& filePath)
+static inline bool IsValidPath(const std::string& rootDir, const std::string& filePath)
 {
     return (filePath.compare(0, rootDir.size(), rootDir) == 0);
 }
 
-inline bool IsValidUinputPath(const std::string& filePath)
+static inline bool IsValidUinputPath(const std::string& filePath)
 {
     return IsValidPath(PROC_PATH, filePath);
 }
 
-inline bool IsFileExists(const std::string& fileName)
+static inline bool IsFileExists(const std::string& fileName)
 {
     return (access(fileName.c_str(), F_OK) == 0);
 }
 
-bool CheckFileName(const std::string& fileName)
+static bool CheckFileName(const std::string& fileName)
 {
     std::string::size_type pos = fileName.find("_");
     if (pos == std::string::npos) {
@@ -101,7 +101,7 @@ bool CheckFileName(const std::string& fileName)
     return result;
 }
 
-void RemoveDir(const std::string& filePath)
+static void RemoveDir(const std::string& filePath)
 {
     if (filePath.empty()) {
         std::cout << "File path is empty" << std::endl;
@@ -121,30 +121,29 @@ void RemoveDir(const std::string& filePath)
         if (ptr->d_type == DT_REG) {
             std::string rmFile = filePath + ptr->d_name;
             if (std::remove(rmFile.c_str()) != 0) {
-                std::cout << "Remove file:" << rmFile << "failed" << std::endl;
+                std::cout << "Remove file:" << rmFile << " failed" << std::endl;
             }
         } else if (ptr->d_type == DT_DIR) {
             RemoveDir((filePath + ptr->d_name + "/"));
         } else {
-            std::cout << "File name:" << ptr << "type is error" << std::endl;
+            std::cout << "File name:" << ptr << " type is error" << std::endl;
         }
     }
     if (closedir(dir) != 0) {
-        std::cout << "Close dir:" << filePath << "failed" << std::endl;
+        std::cout << "Close dir:" << filePath << " failed" << std::endl;
     }
     if (std::remove(filePath.c_str()) != 0) {
-        std::cout << "Remove dir:" << filePath <<"failed" << std::endl;
+        std::cout << "Remove dir:" << filePath <<" failed" << std::endl;
     }
-    return;
 }
 
-void StartMouse()
+static void StartMouse()
 {
     static VirtualMouse virtualMouse;
     virtualMouse.SetUp();
 }
 
-void StartKeyboard()
+static void StartKeyboard()
 {
     static VirtualKeyboard virtualKey;
     virtualKey.SetUp();
@@ -156,25 +155,25 @@ void StartKeyboard()
     virtualKeyext.SetUp();
 }
 
-void StartJoystick()
+static void StartJoystick()
 {
     static VirtualJoystick virtualJoystick;
     virtualJoystick.SetUp();
 }
 
-void StartTrackball()
+static void StartTrackball()
 {
     static VirtualTrackball virtualTrackball;
     virtualTrackball.SetUp();
 }
 
-void StartRemoteControl()
+static void StartRemoteControl()
 {
     static VirtualRemoteControl virtualRemoteControl;
     virtualRemoteControl.SetUp();
 }
 
-void StartTrackpad()
+static void StartTrackpad()
 {
     static VirtualTrackpad virtualTrackpad;
     virtualTrackpad.SetUp();
@@ -184,7 +183,7 @@ void StartTrackpad()
     virtualTrackpadSysCtrl.SetUp();
 }
 
-void StartKnob()
+static void StartKnob()
 {
     static VirtualKnob virtualKnob;
     virtualKnob.SetUp();
@@ -196,13 +195,13 @@ void StartKnob()
     virtualKnobSysCtrl.SetUp();
 }
 
-void StartGamePad()
+static void StartGamePad()
 {
     static VirtualGamePad virtualGamePad;
     virtualGamePad.SetUp();
 }
 
-void StartTouchPad()
+static void StartTouchPad()
 {
     static VirtualStylus virtualStylus;
     virtualStylus.SetUp();
@@ -214,7 +213,7 @@ void StartTouchPad()
     virtualSingleFinger.SetUp();
 }
 
-void StartTouchScreen()
+static void StartTouchScreen()
 {
     static VirtualTouchScreen virtualTouchScreen;
     virtualTouchScreen.SetUp();
@@ -222,7 +221,7 @@ void StartTouchScreen()
     virtualSingleTouchScreen.SetUp();
 }
 
-void StartPen()
+static void StartPen()
 {
     static VirtualPen virtualPen;
     virtualPen.SetUp();
@@ -247,7 +246,7 @@ std::map<std::string, virtualFun> mapFun = {
     {"pen", &StartPen}
 };
 
-void StartAllDevices()
+static void StartAllDevices()
 {
     if (mapFun.empty()) {
         std::cout << "mapFun is empty" << std::endl;
@@ -275,7 +274,6 @@ VirtualDevice::~VirtualDevice()
 std::vector<std::string> VirtualDevice::BrowseDirectory(const std::string& filePath)
 {
     std::vector<std::string> fileList;
-    fileList.clear();
     DIR* dir = opendir(filePath.c_str());
     if (dir == nullptr) {
         std::cout << "Failed to open folder" << std::endl;
@@ -290,17 +288,16 @@ std::vector<std::string> VirtualDevice::BrowseDirectory(const std::string& fileP
         }
     }
     if (closedir(dir) != 0) {
-        std::cout << "Close dir:" << filePath << "failed" << std::endl;
+        std::cout << "Close dir:" << filePath << " failed" << std::endl;
     }
     return fileList;
 }
 
 bool VirtualDevice::ClearFileResidues(const std::string& fileName)
 {
-    DIR *dir = nullptr;
     const std::string::size_type pos = fileName.find("_");
-    const std::string procressPath = "/proc/" + fileName.substr(0, pos) + "/";
-    const std::string filePath = procressPath + "cmdline";
+    const std::string processPath = "/proc/" + fileName.substr(0, pos) + "/";
+    const std::string filePath = processPath + "cmdline";
     std::string temp;
     std::string processName;
     if (!CheckFileName(fileName)) {
@@ -311,9 +308,10 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
         std::cout << "Failed to create file" << std::endl;
         goto RELEASE_RES;
     }
-    dir = opendir(procressPath.c_str());
+    DIR *dir = nullptr;
+    dir = opendir(processPath.c_str());
     if (dir == nullptr) {
-        std::cout << "Useless flag file:" << procressPath << std::endl;
+        std::cout << "Useless flag file:" << processPath << std::endl;
         goto RELEASE_RES;
     }
     temp = ReadUinputToolFile(filePath);
@@ -324,7 +322,7 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
     processName.append(temp);
     if (processName.find(VIRTUAL_DEVICE_NAME.c_str()) != std::string::npos) {
         if (closedir(dir) != 0) {
-            std::cout << "Close dir:" << procressPath <<"failed" << std::endl;
+            std::cout << "Close dir:" << processPath <<" failed" << std::endl;
         }
         return true;
     }
-- 
Gitee


From 74c796b0d6c9593d97fec7a32005118be903c30e Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Mon, 7 Nov 2022 10:17:17 +0000
Subject: [PATCH 107/360] add comment

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 service/module_loader/src/mmi_service.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 96920f6e0d..94edf607bc 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -259,6 +259,10 @@ int32_t MMIService::Init()
         return EPOLL_CREATE_FAIL;
     }
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
+    /* 
+     * PostAsyncTask is used here to prevent InputDeviceCooperateSM:: StartRemoteCooperate() and
+     * CheckPointerEvent() from holding locks, resulting in deadlocks
+     */
     InputDevCooSM->Init(std::bind(&DelegateTasks::PostAsyncTask, &delegateTasks_, std::placeholders::_1));
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     MMI_HILOGD("Input msg handler init");
-- 
Gitee


From dc4e89e5f8898aa8c546e2e1e885dbfea8947157 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Mon, 7 Nov 2022 11:30:25 +0000
Subject: [PATCH 108/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I69b0dbb67b2b935a7847a4e7f23983eb228db6c4
---
 .../proxy/module_loader/src/mmi_client.cpp    |  3 +++
 .../src/multimodal_input_connect_proxy.cpp    | 12 +++++++----
 .../src/multimodal_input_connect_stub.cpp     |  7 ++++++-
 .../src/cooperate_event_handler.cpp           |  3 +++
 .../src/device_cooperate_softbus_adapter.cpp  |  6 +++++-
 .../src/device_profile_adapter.cpp            | 10 ++++++++-
 .../src/distributed_input_adapter.cpp         | 13 ++++++++++++
 .../key_command/src/key_command_handler.cpp   |  2 ++
 service/module_loader/src/mmi_service.cpp     |  8 ++++++-
 .../src/pointer_drawing_manager.cpp           | 21 ++++++++++++++++---
 10 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/frameworks/proxy/module_loader/src/mmi_client.cpp b/frameworks/proxy/module_loader/src/mmi_client.cpp
index c12757511d..18b8112c9c 100755
--- a/frameworks/proxy/module_loader/src/mmi_client.cpp
+++ b/frameworks/proxy/module_loader/src/mmi_client.cpp
@@ -155,6 +155,7 @@ bool MMIClient::DelFdListener(int32_t fd)
     CHKPF(eventHandler_);
     if (fd >= 0) {
         eventHandler_->RemoveFileDescriptorListener(fd);
+        MMI_HILOGI("Remove file descriptor listener success");
     } else {
         MMI_HILOGE("Invalid fd:%{public}d", fd);
     }
@@ -162,6 +163,7 @@ bool MMIClient::DelFdListener(int32_t fd)
     CHKPF(runner);
     if (runner->GetRunnerThreadName() == THREAD_NAME) {
         eventHandler_->RemoveAllEvents();
+        MMI_HILOGI("Remove all events success");
     }
     isRunning_ = false;
     return true;
@@ -283,6 +285,7 @@ void MMIClient::Stop()
             runner->Stop();
             eventHandler_->RemoveAllEvents();
             eventHandler_->RemoveAllFileDescriptorListeners();
+            MMI_HILOGI("Remove all file descriptor listeners success");
         }
     }
 }
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index ef18518c9c..8856857a65 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -61,6 +61,10 @@ int32_t MultimodalInputConnectProxy::AllocSocketFd(const std::string &programNam
         return RET_ERR;
     }
     socketFd = reply.ReadFileDescriptor();
+    if (socketFd < RET_OK) {
+        MMI_HILOGE("Read file fescriptor failed, fd: %{public}d", socketFd);
+        return IPC_PROXY_DEAD_OBJECT_ERR;
+    }
     READINT32(reply, tokenType, IPC_PROXY_DEAD_OBJECT_ERR);
     MMI_HILOGD("socketFd:%{public}d tokenType:%{public}d", socketFd, tokenType);
     return RET_OK;
@@ -86,7 +90,7 @@ int32_t MultimodalInputConnectProxy::AddInputEventFilter(sptr<IEventFilter> filt
     CHKPR(remote, RET_ERR);
     int32_t ret = remote->SendRequest(ADD_INPUT_EVENT_FILTER, data, reply, option);
     if (ret != RET_OK) {
-        MMI_HILOGE("Reply readint32 error:%{public}d", ret);
+        MMI_HILOGE("Send request message failed, ret:%{public}d", ret);
         return ret;
     }
     return RET_OK;
@@ -133,7 +137,7 @@ int32_t MultimodalInputConnectProxy::IsPointerVisible(bool &visible)
         MMI_HILOGE("Send request failed, ret:%{public}d", ret);
         return ret;
     }
-    visible = reply.ReadBool();
+    READBOOL(reply, visible, IPC_PROXY_DEAD_OBJECT_ERR);
     return RET_OK;
 }
 
@@ -175,7 +179,7 @@ int32_t MultimodalInputConnectProxy::GetPointerSpeed(int32_t &speed)
         MMI_HILOGE("Send request failed, ret:%{public}d", ret);
         return RET_ERR;
     }
-    speed = reply.ReadInt32();
+    READINT32(reply, speed, IPC_PROXY_DEAD_OBJECT_ERR);
     return RET_OK;
 }
 
@@ -221,7 +225,7 @@ int32_t MultimodalInputConnectProxy::GetPointerStyle(int32_t windowId, int32_t &
         MMI_HILOGE("Send request fail, ret:%{public}d", ret);
         return ret;
     }
-    pointerStyle = reply.ReadInt32();
+    READINT32(reply, pointerStyle, IPC_PROXY_DEAD_OBJECT_ERR);
     return RET_OK;
 }
 
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index e0608208b8..82e3082ee8 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -115,7 +115,12 @@ int32_t MultimodalInputConnectStub::StubHandleAllocSocketFd(MessageParcel& data,
         }
         return ret;
     }
-    reply.WriteFileDescriptor(clientFd);
+
+    if (!reply.WriteFileDescriptor(clientFd)) {
+        MMI_HILOGE("Write file descriptor failed");
+        return IPC_STUB_WRITE_PARCEL_ERR;
+    }
+
     WRITEINT32(reply, tokenType, IPC_STUB_WRITE_PARCEL_ERR);
     MMI_HILOGI("Send clientFd to client, clientFd:%{public}d, tokenType:%{public}d", clientFd, tokenType);
     close(clientFd);
diff --git a/service/input_device_cooperate/src/cooperate_event_handler.cpp b/service/input_device_cooperate/src/cooperate_event_handler.cpp
index 8347fd93d5..bd9a1e326e 100755
--- a/service/input_device_cooperate/src/cooperate_event_handler.cpp
+++ b/service/input_device_cooperate/src/cooperate_event_handler.cpp
@@ -25,17 +25,20 @@ CooperateEventHandler::CooperateEventHandler(
 
 bool CooperateEventHandler::ProxyPostTask(const Callback &callback, int64_t delayTime)
 {
+    CALL_DEBUG_ENTER;
     return AppExecFwk::EventHandler::PostTask(callback, delayTime);
 }
 
 bool CooperateEventHandler::ProxyPostTask(const Callback &callback, const std::string &name,
     int64_t delayTime)
 {
+    CALL_DEBUG_ENTER;
     return AppExecFwk::EventHandler::PostTask(callback, name, delayTime);
 }
 
 void CooperateEventHandler::ProxyRemoveTask(const std::string &name)
 {
+    CALL_DEBUG_ENTER;
     AppExecFwk::EventHandler::RemoveTask(name);
 }
 } // namespace MMI
diff --git a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
index 6d7462262e..b9f1f12dd0 100755
--- a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
+++ b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
@@ -162,8 +162,12 @@ DeviceCooperateSoftbusAdapter::~DeviceCooperateSoftbusAdapter()
 
 void DeviceCooperateSoftbusAdapter::Release()
 {
+    CALL_INFO_TRACE;
     std::unique_lock<std::mutex> sessionLock(operationMutex_);
-    std::for_each(sessionDevMap_.begin(), sessionDevMap_.end(), [](auto item) { CloseSession(item.second); });
+    std::for_each(sessionDevMap_.begin(), sessionDevMap_.end(), [](auto item) {
+        CloseSession(item.second);
+        MMI_HILOGD("Close session success");
+    });
     int32_t ret = RemoveSessionServer(MMI_DINPUT_PKG_NAME, localSessionName_.c_str());
     MMI_HILOGD("RemoveSessionServer ret:%{public}d", ret);
     sessionDevMap_.clear();
diff --git a/service/input_device_cooperate/src/device_profile_adapter.cpp b/service/input_device_cooperate/src/device_profile_adapter.cpp
index faa90e811f..26c0cab82d 100755
--- a/service/input_device_cooperate/src/device_profile_adapter.cpp
+++ b/service/input_device_cooperate/src/device_profile_adapter.cpp
@@ -44,6 +44,7 @@ DeviceProfileAdapter::~DeviceProfileAdapter()
 
 int32_t DeviceProfileAdapter::UpdateCrossingSwitchState(bool state, const std::vector<std::string> &deviceIds)
 {
+    CALL_INFO_TRACE;
     ServiceCharacteristicProfile profile;
     profile.SetServiceId(SERVICE_ID);
     profile.SetServiceType(SERVICE_TYPE);
@@ -61,7 +62,10 @@ int32_t DeviceProfileAdapter::UpdateCrossingSwitchState(bool state, const std::v
     }
     SyncOptions syncOptions;
     std::for_each(deviceIds.begin(), deviceIds.end(),
-                  [&syncOptions](auto &deviceId) { syncOptions.AddDevice(deviceId); });
+                  [&syncOptions](auto &deviceId) {
+                      syncOptions.AddDevice(deviceId);
+                      MMI_HILOGD("Add device success");
+                  });
     auto syncCallback = std::make_shared<DeviceProfileAdapter::ProfileEventCallbackImpl>();
     ret =
         DistributedDeviceProfileClient::GetInstance().SyncDeviceProfile(syncOptions, syncCallback);
@@ -73,6 +77,7 @@ int32_t DeviceProfileAdapter::UpdateCrossingSwitchState(bool state, const std::v
 
 int32_t DeviceProfileAdapter::UpdateCrossingSwitchState(bool state)
 {
+    CALL_INFO_TRACE;
     ServiceCharacteristicProfile profile;
     profile.SetServiceId(SERVICE_ID);
     profile.SetServiceType(SERVICE_TYPE);
@@ -88,6 +93,7 @@ int32_t DeviceProfileAdapter::UpdateCrossingSwitchState(bool state)
 
 bool DeviceProfileAdapter::GetCrossingSwitchState(const std::string &deviceId)
 {
+    CALL_INFO_TRACE;
     ServiceCharacteristicProfile profile;
     DistributedDeviceProfileClient::GetInstance().GetDeviceProfile(deviceId, SERVICE_ID, profile);
     std::string jsonData = profile.GetCharacteristicProfileJson();
@@ -130,6 +136,7 @@ int32_t DeviceProfileAdapter::RegisterCrossingStateListener(const std::string &d
 
 int32_t DeviceProfileAdapter::UnregisterCrossingStateListener(const std::string &deviceId)
 {
+    CALL_INFO_TRACE;
     if (deviceId.empty()) {
         MMI_HILOGE("DeviceId is empty");
         return RET_ERR;
@@ -155,6 +162,7 @@ int32_t DeviceProfileAdapter::UnregisterCrossingStateListener(const std::string
 
 int32_t DeviceProfileAdapter::RegisterProfileListener(const std::string &deviceId)
 {
+    CALL_INFO_TRACE;
     std::list<std::string> serviceIdList;
     serviceIdList.emplace_back(SERVICE_ID);
     ExtraInfo extraInfo;
diff --git a/service/input_device_cooperate/src/distributed_input_adapter.cpp b/service/input_device_cooperate/src/distributed_input_adapter.cpp
index c035c09780..b4d17f4262 100755
--- a/service/input_device_cooperate/src/distributed_input_adapter.cpp
+++ b/service/input_device_cooperate/src/distributed_input_adapter.cpp
@@ -32,6 +32,7 @@ constexpr int32_t RETRY_TIME = 2;
 } // namespace
 DistributedInputAdapter::DistributedInputAdapter()
 {
+    CALL_INFO_TRACE;
     simulationEventListener_ = new (std::nothrow) SimulateEventCallbackImpl();
     CHKPL(simulationEventListener_);
     DistributedInputKit::RegisterSimulationEventListener(simulationEventListener_);
@@ -39,6 +40,7 @@ DistributedInputAdapter::DistributedInputAdapter()
 
 DistributedInputAdapter::~DistributedInputAdapter()
 {
+    CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(adapterLock_);
     DistributedInputKit::UnregisterSimulationEventListener(simulationEventListener_);
     simulationEventListener_ = nullptr;
@@ -47,12 +49,14 @@ DistributedInputAdapter::~DistributedInputAdapter()
 
 bool DistributedInputAdapter::IsNeedFilterOut(const std::string &deviceId, const BusinessEvent &event)
 {
+    CALL_INFO_TRACE;
     return DistributedInputKit::IsNeedFilterOut(deviceId, event);
 }
 
 int32_t DistributedInputAdapter::StartRemoteInput(const std::string &deviceId, const std::vector<std::string> &dhIds,
                                                   DInputCallback callback)
 {
+    CALL_INFO_TRACE;
     sptr<IStartStopDInputsCallback> cb = new (std::nothrow) StartDInputCallbackDHIds();
     CHKPR(cb, ERROR_NULL_POINTER);
     SaveCallback(CallbackType::StartDInputCallbackDHIds, callback);
@@ -62,6 +66,7 @@ int32_t DistributedInputAdapter::StartRemoteInput(const std::string &deviceId, c
 int32_t DistributedInputAdapter::StartRemoteInput(const std::string &srcId, const std::string &sinkId,
                                                   const uint32_t &inputTypes, DInputCallback callback)
 {
+    CALL_INFO_TRACE;
     sptr<IStartDInputCallback> cb = new (std::nothrow) StartDInputCallback();
     CHKPR(cb, ERROR_NULL_POINTER);
     SaveCallback(CallbackType::StartDInputCallback, callback);
@@ -71,6 +76,7 @@ int32_t DistributedInputAdapter::StartRemoteInput(const std::string &srcId, cons
 int32_t DistributedInputAdapter::StartRemoteInput(const std::string &srcId, const std::string &sinkId,
                                                   const std::vector<std::string> &dhIds, DInputCallback callback)
 {
+    CALL_INFO_TRACE;
     sptr<IStartStopDInputsCallback> cb = new (std::nothrow) StartDInputCallbackSink();
     CHKPR(cb, ERROR_NULL_POINTER);
     SaveCallback(CallbackType::StartDInputCallbackSink, callback);
@@ -80,6 +86,7 @@ int32_t DistributedInputAdapter::StartRemoteInput(const std::string &srcId, cons
 int32_t DistributedInputAdapter::StopRemoteInput(const std::string &deviceId, const std::vector<std::string> &dhIds,
                                                  DInputCallback callback)
 {
+    CALL_INFO_TRACE;
     sptr<IStartStopDInputsCallback> cb = new (std::nothrow) StopDInputCallbackDHIds();
     CHKPR(cb, ERROR_NULL_POINTER);
     SaveCallback(CallbackType::StopDInputCallbackDHIds, callback);
@@ -89,6 +96,7 @@ int32_t DistributedInputAdapter::StopRemoteInput(const std::string &deviceId, co
 int32_t DistributedInputAdapter::StopRemoteInput(const std::string &srcId, const std::string &sinkId,
                                                  const uint32_t &inputTypes, DInputCallback callback)
 {
+    CALL_INFO_TRACE;
     sptr<IStopDInputCallback> cb = new (std::nothrow) StopDInputCallback();
     CHKPR(cb, ERROR_NULL_POINTER);
     SaveCallback(CallbackType::StopDInputCallback, callback);
@@ -98,6 +106,7 @@ int32_t DistributedInputAdapter::StopRemoteInput(const std::string &srcId, const
 int32_t DistributedInputAdapter::StopRemoteInput(const std::string &srcId, const std::string &sinkId,
                                                  const std::vector<std::string> &dhIds, DInputCallback callback)
 {
+    CALL_INFO_TRACE;
     sptr<IStartStopDInputsCallback> cb = new (std::nothrow) StopDInputCallbackSink();
     CHKPR(cb, ERROR_NULL_POINTER);
     SaveCallback(CallbackType::StopDInputCallbackSink, callback);
@@ -107,6 +116,7 @@ int32_t DistributedInputAdapter::StopRemoteInput(const std::string &srcId, const
 int32_t DistributedInputAdapter::PrepareRemoteInput(const std::string &srcId, const std::string &sinkId,
                                                     DInputCallback callback)
 {
+    CALL_INFO_TRACE;
     sptr<IPrepareDInputCallback> cb = new (std::nothrow) PrepareStartDInputCallbackSink();
     CHKPR(cb, ERROR_NULL_POINTER);
     SaveCallback(CallbackType::PrepareStartDInputCallbackSink, callback);
@@ -116,6 +126,7 @@ int32_t DistributedInputAdapter::PrepareRemoteInput(const std::string &srcId, co
 int32_t DistributedInputAdapter::UnPrepareRemoteInput(const std::string &srcId, const std::string &sinkId,
                                                       DInputCallback callback)
 {
+    CALL_INFO_TRACE;
     sptr<IUnprepareDInputCallback> cb = new (std::nothrow) UnPrepareStopDInputCallbackSink();
     CHKPR(cb, ERROR_NULL_POINTER);
     SaveCallback(CallbackType::UnPrepareStopDInputCallbackSink, callback);
@@ -124,6 +135,7 @@ int32_t DistributedInputAdapter::UnPrepareRemoteInput(const std::string &srcId,
 
 int32_t DistributedInputAdapter::PrepareRemoteInput(const std::string &deviceId, DInputCallback callback)
 {
+    CALL_INFO_TRACE;
     sptr<IPrepareDInputCallback> cb = new (std::nothrow) PrepareStartDInputCallback();
     CHKPR(cb, ERROR_NULL_POINTER);
     SaveCallback(CallbackType::PrepareStartDInputCallback, callback);
@@ -132,6 +144,7 @@ int32_t DistributedInputAdapter::PrepareRemoteInput(const std::string &deviceId,
 
 int32_t DistributedInputAdapter::UnPrepareRemoteInput(const std::string &deviceId, DInputCallback callback)
 {
+    CALL_INFO_TRACE;
     sptr<IUnprepareDInputCallback> cb = new (std::nothrow) UnPrepareStopDInputCallback();
     CHKPR(cb, ERROR_NULL_POINTER);
     SaveCallback(CallbackType::UnPrepareStopDInputCallback, callback);
diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index e4758f51fe..8186dec9f5 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -905,6 +905,7 @@ bool KeyCommandHandler::HandleKeyCancel(ShortcutKey &shortcutKey)
 
 void KeyCommandHandler::LaunchAbility(const ShortcutKey &key)
 {
+    CALL_INFO_TRACE;
     AAFwk::Want want;
     want.SetElementName(key.ability.deviceId, key.ability.bundleName, key.ability.abilityName);
     want.SetAction(key.ability.action);
@@ -929,6 +930,7 @@ void KeyCommandHandler::LaunchAbility(const ShortcutKey &key)
 
 void KeyCommandHandler::LaunchAbility(const Sequence &sequence)
 {
+    CALL_INFO_TRACE;
     AAFwk::Want want;
     want.SetElementName(sequence.ability.deviceId, sequence.ability.bundleName, sequence.ability.abilityName);
     want.SetAction(sequence.ability.action);
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 8e9e59c556..aeef6442cc 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -298,7 +298,9 @@ void MMIService::OnStart()
     AddReloadDeviceTimer();
     t_ = std::thread(std::bind(&MMIService::OnThread, this));
 #ifdef OHOS_RSS_CLIENT
+    MMI_HILOGI("Add system ability listener start");
     AddSystemAbilityListener(RES_SCHED_SYS_ABILITY_ID);
+    MMI_HILOGI("Add system ability listener success");
 #endif
 
     TimerMgr->AddTimer(WATCHDOG_INTERVAL_TIME, -1, [this]() {
@@ -313,9 +315,10 @@ void MMIService::OnStart()
             MMI_HILOGE("Watchdog happened");
         }
     };
+    MMI_HILOGI("Run periodical task start");
     HiviewDFX::Watchdog::GetInstance().RunPeriodicalTask("MMIService", taskFunc,
         WATCHDOG_INTERVAL_TIME, WATCHDOG_DELAY_TIME);
-
+    MMI_HILOGI("Run periodical task success");
     t_.join();
 }
 
@@ -326,7 +329,9 @@ void MMIService::OnStop()
     libinputAdapter_.Stop();
     state_ = ServiceRunningState::STATE_NOT_START;
 #ifdef OHOS_RSS_CLIENT
+    MMI_HILOGI("Remove system ability listener start");
     RemoveSystemAbilityListener(RES_SCHED_SYS_ABILITY_ID);
+    MMI_HILOGI("Remove system ability listener success");
 #endif
 }
 
@@ -829,6 +834,7 @@ int32_t MMIService::InjectPointerEvent(const std::shared_ptr<PointerEvent> point
 #ifdef OHOS_RSS_CLIENT
 void MMIService::OnAddSystemAbility(int32_t systemAbilityId, const std::string& deviceId)
 {
+    CALL_INFO_TRACE;
     if (systemAbilityId == RES_SCHED_SYS_ABILITY_ID) {
         int sleepSeconds = 1;
         sleep(sleepSeconds);
diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
index 9800cdbca8..377dcac9ae 100644
--- a/service/window_manager/src/pointer_drawing_manager.cpp
+++ b/service/window_manager/src/pointer_drawing_manager.cpp
@@ -63,6 +63,7 @@ void PointerDrawingManager::DrawPointer(int32_t displayId, int32_t physicalX, in
     AdjustMouseFocus(ICON_TYPE(mouseIcons_[mouseStyle].alignmentWay), physicalX, physicalY);
     if (pointerWindow_ != nullptr) {
         pointerWindow_->MoveTo(physicalX + displayInfo_.x, physicalY + displayInfo_.y);
+        MMI_HILOGD("Pointer window move success");
         if (lastMouseStyle_ == mouseStyle) {
             MMI_HILOGD("The lastMouseStyle is equal with mouseStyle");
             return;
@@ -96,17 +97,19 @@ int32_t PointerDrawingManager::InitLayer(const MOUSE_ICON mouseStyle)
     CHKPR(pointerWindow_, RET_ERR);
     sptr<OHOS::Surface> layer = GetLayer();
     if (layer == nullptr) {
+        MMI_HILOGE("Init layer is failed, Layer is nullptr");
         pointerWindow_->Destroy();
         pointerWindow_ = nullptr;
-        MMI_HILOGE("Init layer is failed, Layer is nullptr");
+        MMI_HILOGD("Pointer window destroy success");
         return RET_ERR;
     }
 
     sptr<OHOS::SurfaceBuffer> buffer = GetSurfaceBuffer(layer);
     if (buffer == nullptr || buffer->GetVirAddr() == nullptr) {
+        MMI_HILOGE("Init layer is failed, buffer or virAddr is nullptr");
         pointerWindow_->Destroy();
         pointerWindow_ = nullptr;
-        MMI_HILOGE("Init layer is failed, buffer or virAddr is nullptr");
+        MMI_HILOGD("Pointer window destroy success");
         return RET_ERR;
     }
 
@@ -178,6 +181,7 @@ void PointerDrawingManager::FixCursorPosition(int32_t &physicalX, int32_t &physi
 
 void PointerDrawingManager::CreatePointerWindow(int32_t displayId, int32_t physicalX, int32_t physicalY)
 {
+    CALL_INFO_TRACE;
     sptr<OHOS::Rosen::WindowOption> option = new (std::nothrow) OHOS::Rosen::WindowOption();
     CHKPV(option);
     option->SetWindowType(OHOS::Rosen::WindowType::WINDOW_TYPE_POINTER);
@@ -198,11 +202,13 @@ void PointerDrawingManager::CreatePointerWindow(int32_t displayId, int32_t physi
 
 sptr<OHOS::Surface> PointerDrawingManager::GetLayer()
 {
+    CALL_DEBUG_ENTER;
     std::shared_ptr<OHOS::Rosen::RSSurfaceNode> surfaceNode = pointerWindow_->GetSurfaceNode();
     if (surfaceNode == nullptr) {
         MMI_HILOGE("Draw pointer is failed, get node is nullptr");
         pointerWindow_->Destroy();
         pointerWindow_ = nullptr;
+        MMI_HILOGD("Pointer window destroy success");
         return nullptr;
     }
     return surfaceNode->GetSurface();
@@ -210,6 +216,7 @@ sptr<OHOS::Surface> PointerDrawingManager::GetLayer()
 
 sptr<OHOS::SurfaceBuffer> PointerDrawingManager::GetSurfaceBuffer(sptr<OHOS::Surface> layer) const
 {
+    CALL_DEBUG_ENTER;
     sptr<OHOS::SurfaceBuffer> buffer;
     int32_t releaseFence = 0;
     OHOS::BufferRequestConfig config = {
@@ -264,6 +271,7 @@ void PointerDrawingManager::DrawPixelmap(OHOS::Rosen::Drawing::Canvas &canvas, c
 
 std::unique_ptr<OHOS::Media::PixelMap> PointerDrawingManager::DecodeImageToPixelMap(const std::string &imagePath)
 {
+    CALL_DEBUG_ENTER;
     OHOS::Media::SourceOptions opts;
     opts.formatHint = "image/png";
     uint32_t ret = 0;
@@ -323,6 +331,7 @@ void PointerDrawingManager::OnDisplayInfo(const DisplayGroupInfo& displayGroupIn
     if (pointerWindow_ != nullptr) {
         pointerWindow_->Destroy();
         pointerWindow_ = nullptr;
+        MMI_HILOGD("Pointer window destroy success");
     }
     MMI_HILOGD("displayId_:%{public}d, displayWidth_:%{public}d, displayHeight_:%{public}d",
         displayInfo_.id, displayInfo_.width, displayInfo_.height);
@@ -363,9 +372,10 @@ void PointerDrawingManager::DrawManager()
         return;
     }
     if (!hasPointerDevice_ && pointerWindow_ != nullptr) {
-        MMI_HILOGD("Destroy draw pointer");
+        MMI_HILOGD("Pointer window destroy start");
         pointerWindow_->Destroy();
         pointerWindow_ = nullptr;
+        MMI_HILOGD("Pointer window destroy success");
     }
 }
 
@@ -415,8 +425,10 @@ void PointerDrawingManager::UpdatePointerVisible()
     CHKPV(pointerWindow_);
     if (IsPointerVisible()) {
         pointerWindow_->Show();
+        MMI_HILOGD("Pointer window show success");
     } else {
         pointerWindow_->Hide();
+        MMI_HILOGD("Pointer window hide success");
     }
 }
 
@@ -455,6 +467,7 @@ void PointerDrawingManager::SetPointerLocation(int32_t pid, int32_t x, int32_t y
     lastPhysicalY_ = y;
     if (pointerWindow_ != nullptr) {
         pointerWindow_->MoveTo(x, y);
+        MMI_HILOGD("Pointer window move success");
         SetPointerVisible(pid, true);
     }
 }
@@ -488,7 +501,9 @@ int32_t PointerDrawingManager::SetPointerStyle(int32_t pid, int32_t windowId, in
         int32_t physicalX = lastPhysicalX_;
         int32_t physicalY = lastPhysicalY_;
         AdjustMouseFocus(ICON_TYPE(mouseIcons_[MOUSE_ICON(pointerStyle)].alignmentWay), physicalX, physicalY);
+        MMI_HILOGD("Pointer window move start");
         pointerWindow_->MoveTo(physicalX + displayInfo_.x, physicalY + displayInfo_.y);
+        MMI_HILOGD("Pointer window move success");
 
         lastMouseStyle_ = pointerStyle;
         int32_t ret = InitLayer(MOUSE_ICON(pointerStyle));
-- 
Gitee


From bcc5f916c6b5f30fdbca4a85f3893f7b4038d02c Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Mon, 7 Nov 2022 11:36:31 +0000
Subject: [PATCH 109/360] update
 frameworks/napi/input_device/include/js_event_target.h.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 .../input_device/include/js_event_target.h    | 1102 ++++++++++++++++-
 1 file changed, 1048 insertions(+), 54 deletions(-)

diff --git a/frameworks/napi/input_device/include/js_event_target.h b/frameworks/napi/input_device/include/js_event_target.h
index e190f923f8..fdbbced2b2 100644
--- a/frameworks/napi/input_device/include/js_event_target.h
+++ b/frameworks/napi/input_device/include/js_event_target.h
@@ -13,62 +13,1056 @@
  * limitations under the License.
  */
 
-#ifndef JS_EVENT_TARGET_H
-#define JS_EVENT_TARGET_H
-
-#include "napi/native_api.h"
-#include "napi/native_node_api.h"
-#include "util_napi.h"
-#include "utils/log.h"
-
-#include "define_multimodal.h"
-#include "error_multimodal.h"
-
-#include "input_manager.h"
+#include "js_event_target.h"
 #include "js_util.h"
+#include "napi_constants.h"
+#include "util_napi_error.h"
 
 namespace OHOS {
 namespace MMI {
-class JsEventTarget : public IInputDeviceListener, public std::enable_shared_from_this<JsEventTarget> {
-public:
-    JsEventTarget();
-    virtual ~JsEventTarget() = default;
-    DISALLOW_COPY_AND_MOVE(JsEventTarget);
-    static void EmitJsIds(int32_t userData, std::vector<int32_t> &ids);
-    static void EmitJsDev(int32_t userData, std::shared_ptr<InputDevice> device);
-    static void EmitSupportKeys(int32_t userData, std::vector<bool> &keystrokeAbility);
-    static void EmitJsKeyboardType(int32_t userData, int32_t keyboardType);
-    void AddListener(napi_env env, const std::string &type, napi_value handle);
-    void RemoveListener(napi_env env, const std::string &type, napi_value handle);
-    void RemoveCallbackInfo(napi_env env, napi_value handle, int32_t userData);
-    napi_value CreateCallbackInfo(napi_env env, napi_value handle, const int32_t userData, bool isApi9 = false);
-    void ResetEnv();
-    void OnDeviceAdded(int32_t deviceId, const std::string &type) override;
-    void OnDeviceRemoved(int32_t deviceId, const std::string &type) override;
-
-private:
-    static void CallIdsPromiseWork(uv_work_t *work, int32_t status);
-    static void CallIdsAsyncWork(uv_work_t *work, int32_t status);
-    static void CallDevAsyncWork(uv_work_t *work, int32_t status);
-    static void CallDevPromiseWork(uv_work_t *work, int32_t status);
-    static void CallKeystrokeAbilityPromise(uv_work_t *work, int32_t status);
-    static void CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status);
-    static void CallKeyboardTypeAsync(uv_work_t *work, int32_t status);
-    static void CallKeyboardTypePromise(uv_work_t *work, int32_t status);
-    static void CallDevListPromiseWork(uv_work_t *work, int32_t status);
-    static void CallDevListAsyncWork(uv_work_t *work, int32_t status);
-    static void CallDevInfoAsyncWork(uv_work_t *work, int32_t status);
-    static void CallDevInfoPromiseWork(uv_work_t *work, int32_t status);
-    static void EmitAddedDeviceEvent(uv_work_t *work, int32_t status);
-    static void EmitRemoveDeviceEvent(uv_work_t *work, int32_t status);
-    static std::unique_ptr<JsUtil::CallbackInfo> GetCallbackInfoAndFreeWork(uv_work_t *work);
-    static napi_value GreateBusinessError(napi_env env, int32_t errCode, std::string errMessage);
-private:
-    inline static std::map<int32_t, std::unique_ptr<JsUtil::CallbackInfo>> callback_ {};
-    inline static std::map<std::string, std::vector<std::unique_ptr<JsUtil::CallbackInfo>>> devListener_ {};
-    bool isListeningProcess_ { false };
-};
-} // namespace MMI
-} // namespace OHOS
+namespace {
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "JsEventTarget" };
+
+std::mutex mutex_;
+const std::string ADD_EVENT = "add";
+const std::string REMOVE_EVENT = "remove";
+} // namespace
+
+JsEventTarget::JsEventTarget()
+{
+    CALL_DEBUG_ENTER;
+    auto ret = devListener_.insert({ CHANGED_TYPE, std::vector<std::unique_ptr<JsUtil::CallbackInfo>>() });
+    CK(ret.second, VAL_NOT_EXP);
+}
+
+void JsEventTarget::EmitAddedDeviceEvent(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mutex_);
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is null");
+        return;
+    }
+    auto temp = static_cast<std::unique_ptr<JsUtil::CallbackInfo>*>(work->data);
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    auto addEvent = devListener_.find(CHANGED_TYPE);
+    if (addEvent == devListener_.end()) {
+        MMI_HILOGE("Find change event failed");
+        return;
+    }
+
+    for (const auto &item : addEvent->second) {
+        CHKPC(item->env);
+        if (item->ref != (*temp)->ref) {
+            continue;
+        }
+        napi_handle_scope scope = nullptr;
+        napi_open_handle_scope(item->env, &scope);
+        if (scope == nullptr) {
+            MMI_HILOGE("scope is nullptr");
+            return;
+        }
+        napi_value eventType = nullptr;
+        CHKRV_SCOPE(item->env, napi_create_string_utf8(item->env, ADD_EVENT.c_str(), NAPI_AUTO_LENGTH, &eventType),
+                CREATE_STRING_UTF8, scope);
+        napi_value deviceId = nullptr;
+        CHKRV_SCOPE(item->env, napi_create_int32(item->env, item->data.deviceId, &deviceId), CREATE_INT32, scope);
+        napi_value object = nullptr;
+        CHKRV_SCOPE(item->env, napi_create_object(item->env, &object), CREATE_OBJECT, scope);
+        CHKRV_SCOPE(item->env, napi_set_named_property(item->env, object, "type", eventType),
+                SET_NAMED_PROPERTY, scope);
+        CHKRV_SCOPE(item->env, napi_set_named_property(item->env, object, "deviceId", deviceId),
+                SET_NAMED_PROPERTY, scope);
+        napi_value handler = nullptr;
+        CHKRV_SCOPE(item->env, napi_get_reference_value(item->env, item->ref, &handler), GET_REFERENCE, scope);
+        napi_value ret = nullptr;
+        CHKRV_SCOPE(item->env, napi_call_function(item->env, nullptr, handler, 1, &object, &ret),
+                CALL_FUNCTION, scope);
+        napi_close_handle_scope(item->env, scope);
+    }
+}
+
+void JsEventTarget::EmitRemoveDeviceEvent(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mutex_);
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is null");
+        return;
+    }
+    auto temp = static_cast<std::unique_ptr<JsUtil::CallbackInfo>*>(work->data);
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    auto removeEvent = devListener_.find(CHANGED_TYPE);
+    if (removeEvent == devListener_.end()) {
+        MMI_HILOGE("Find change event failed");
+        return;
+    }
+
+    for (const auto &item : removeEvent->second) {
+        CHKPC(item->env);
+        if (item->ref != (*temp)->ref) {
+            continue;
+        }
+        napi_handle_scope scope = nullptr;
+        napi_open_handle_scope(item->env, &scope);
+        if (scope == nullptr) {
+            MMI_HILOGE("scope is nullptr");
+            return;
+        }
+        napi_value eventType = nullptr;
+        CHKRV_SCOPE(item->env, napi_create_string_utf8(item->env, REMOVE_EVENT.c_str(), NAPI_AUTO_LENGTH,
+             &eventType),
+             CREATE_STRING_UTF8, scope);
+
+        napi_value deviceId = nullptr;
+        CHKRV_SCOPE(item->env, napi_create_int32(item->env, item->data.deviceId, &deviceId),
+             CREATE_INT32, scope);
+        
+        napi_value object = nullptr;
+        CHKRV_SCOPE(item->env, napi_create_object(item->env, &object), CREATE_OBJECT, scope);
+        CHKRV_SCOPE(item->env, napi_set_named_property(item->env, object, "type", eventType),
+             SET_NAMED_PROPERTY, scope);
+        CHKRV_SCOPE(item->env, napi_set_named_property(item->env, object, "deviceId", deviceId),
+             SET_NAMED_PROPERTY, scope);
+
+        napi_value handler = nullptr;
+        CHKRV_SCOPE(item->env, napi_get_reference_value(item->env, item->ref, &handler), GET_REFERENCE, scope);
+
+        napi_value ret = nullptr;
+        CHKRV_SCOPE(item->env, napi_call_function(item->env, nullptr, handler, 1, &object, &ret),
+             CALL_FUNCTION, scope);
+        napi_close_handle_scope(item->env, scope);
+    }
+}
+
+void JsEventTarget::OnDeviceAdded(int32_t deviceId, const std::string &type)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mutex_);
+    auto changeEvent = devListener_.find(CHANGED_TYPE);
+    if (changeEvent == devListener_.end()) {
+        MMI_HILOGE("Find %{public}s failed", CHANGED_TYPE.c_str());
+        return;
+    }
+
+    for (auto &item : changeEvent->second) {
+        CHKPC(item);
+        CHKPC(item->env);
+        uv_loop_s *loop = nullptr;
+        CHKRV(item->env, napi_get_uv_event_loop(item->env, &loop), GET_UV_LOOP);
+        uv_work_t *work = new (std::nothrow) uv_work_t;
+        CHKPV(work);
+        item->data.deviceId = deviceId;
+        work->data = static_cast<void*>(&item);
+        int32_t ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, EmitAddedDeviceEvent);
+        if (ret != 0) {
+            MMI_HILOGE("uv_queue_work failed");
+            JsUtil::DeletePtr<uv_work_t*>(work);
+            return;
+        }
+    }
+}
+
+void JsEventTarget::OnDeviceRemoved(int32_t deviceId, const std::string &type)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mutex_);
+    auto changeEvent = devListener_.find(CHANGED_TYPE);
+    if (changeEvent == devListener_.end()) {
+        MMI_HILOGE("Find %{public}s failed", CHANGED_TYPE.c_str());
+        return;
+    }
+    for (auto &item : changeEvent->second) {
+        CHKPC(item);
+        CHKPC(item->env);
+        uv_loop_s *loop = nullptr;
+        CHKRV(item->env, napi_get_uv_event_loop(item->env, &loop), GET_UV_LOOP);
+        uv_work_t *work = new (std::nothrow) uv_work_t;
+        CHKPV(work);
+        item->data.deviceId = deviceId;
+        work->data = static_cast<void*>(&item);
+        int32_t ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, EmitRemoveDeviceEvent);
+        if (ret != 0) {
+            MMI_HILOGE("uv_queue_work failed");
+            JsUtil::DeletePtr<uv_work_t*>(work);
+            return;
+        }
+    }
+}
+
+void JsEventTarget::CallIdsAsyncWork(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is null");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    CHKPV(cb);
+    CHKPV(cb->env);
+
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(cb->env, &scope);
+    if (scope == nullptr) {
+        MMI_HILOGE("scope is nullptr");
+        return;
+    }
+    napi_value arr[2];
+    CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &arr[0]), GET_UNDEFINED, scope);
+    CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &arr[1]), CREATE_ARRAY, scope);
+    uint32_t index = 0;
+    napi_value value = nullptr;
+    for (const auto &item : cb->data.ids) {
+        CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, item, &value), CREATE_INT32, scope);
+        CHKRV_SCOPE(cb->env, napi_set_element(cb->env, arr[1], index, value), SET_ELEMENT, scope);
+        ++index;
+    }
+    
+    napi_value handler = nullptr;
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
+    napi_value result = nullptr;
+    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, arr, &result), CALL_FUNCTION, scope);
+    napi_close_handle_scope(cb->env, scope);
+    JsUtil::DeleteCallbackInfo(std::move(cb));
+}
+
+void JsEventTarget::CallIdsPromiseWork(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is null");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    CHKPV(cb);
+    CHKPV(cb->env);
+
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(cb->env, &scope);
+    if (scope == nullptr) {
+        MMI_HILOGE("scope is nullptr");
+        return;
+    }
+    napi_value arr = nullptr;
+    CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &arr), CREATE_ARRAY, scope);
+    uint32_t index = 0;
+    napi_value value = nullptr;
+    for (const auto &item : cb->data.ids) {
+        CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, item, &value), CREATE_INT32, scope);
+        CHKRV_SCOPE(cb->env, napi_set_element(cb->env, arr, index, value), SET_ELEMENT, scope);
+        ++index;
+    }
+    CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, arr), RESOLVE_DEFERRED, scope);
+    napi_close_handle_scope(cb->env, scope);
+    JsUtil::DeleteCallbackInfo(std::move(cb));
+}
+
+void JsEventTarget::EmitJsIds(int32_t userData, std::vector<int32_t> &ids)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mutex_);
+    auto iter = callback_.find(userData);
+    if (iter == callback_.end()) {
+        MMI_HILOGE("Failed to search for userData");
+        return;
+    }
+    CHKPV(iter->second);
+    if (iter->second->env == nullptr) {
+        callback_.erase(iter);
+        MMI_HILOGE("The env is nullptr");
+        return;
+    }
+
+    iter->second->data.ids = ids;
+    iter->second->errCode = RET_OK;
+    uv_loop_s *loop = nullptr;
+    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
+    uv_work_t *work = new (std::nothrow) uv_work_t;
+    CHKPV(work);
+    int32_t *uData = new (std::nothrow) int32_t(userData);
+    if (uData == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check uData is null");
+        return;
+    }
+    work->data = static_cast<void*>(uData);
+    int32_t ret;
+    if (iter->second->isApi9) {
+        if (iter->second->ref == nullptr) {
+            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevListPromiseWork);
+        } else {
+            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevListAsyncWork);
+        }
+    } else {
+        if (iter->second->ref == nullptr) {
+            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallIdsPromiseWork);
+        } else {
+            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallIdsAsyncWork);
+        }
+    }
+    if (ret != 0) {
+        MMI_HILOGE("uv_queue_work failed");
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        JsUtil::DeletePtr<int32_t*>(uData);
+    }
+}
+
+void JsEventTarget::CallDevAsyncWork(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is null");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    CHKPV(cb);
+    CHKPV(cb->env);
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(cb->env, &scope);
+    if (scope == nullptr) {
+        MMI_HILOGE("scope is nullptr");
+        return;
+    }
+    napi_value object[2];
+    CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &object[0]), GET_UNDEFINED, scope);
+    object[1] = JsUtil::GetDeviceInfo(cb);
+    napi_value handler = nullptr;
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
+    napi_value result = nullptr;
+    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, object, &result), CALL_FUNCTION,
+        scope);
+    napi_close_handle_scope(cb->env, scope);
+    JsUtil::DeleteCallbackInfo(std::move(cb));
+}
+
+void JsEventTarget::CallDevPromiseWork(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is null");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    CHKPV(cb);
+    CHKPV(cb->env);
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(cb->env, &scope);
+    if (scope == nullptr) {
+        MMI_HILOGE("scope is nullptr");
+        return;
+    }
+    napi_value object = JsUtil::GetDeviceInfo(cb);
+    if (object == nullptr) {
+        MMI_HILOGE("Check object is null");
+        napi_close_handle_scope(cb->env, scope);
+        return;
+    }
+    CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, object), RESOLVE_DEFERRED, scope);
+    napi_close_handle_scope(cb->env, scope);
+    JsUtil::DeleteCallbackInfo(std::move(cb));
+}
+
+void JsEventTarget::EmitJsDev(int32_t userData, std::shared_ptr<InputDevice> device)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mutex_);
+    CHKPV(device);
+    auto iter = callback_.find(userData);
+    if (iter == callback_.end()) {
+        MMI_HILOGE("Failed to search for userData");
+        return;
+    }
+    CHKPV(iter->second);
+    if (iter->second->env == nullptr) {
+        callback_.erase(iter);
+        MMI_HILOGE("The env is nullptr");
+        return;
+    }
+
+    iter->second->data.device = device;
+    iter->second->errCode = RET_OK;
+    uv_loop_s *loop = nullptr;
+    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
+    uv_work_t *work = new (std::nothrow) uv_work_t;
+    CHKPV(work);
+    int32_t *uData = new (std::nothrow) int32_t(userData);
+    if (uData == nullptr) {
+        MMI_HILOGE("uData is nullptr");
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        return;
+    }
+    work->data = static_cast<void*>(uData);
+    int32_t ret;
+    if (iter->second->isApi9) {
+        if (iter->second->ref == nullptr) {
+            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevInfoPromiseWork);
+        } else {
+            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevInfoAsyncWork);
+        }
+    } else {
+        if (iter->second->ref == nullptr) {
+            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevPromiseWork);
+        } else {
+            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevAsyncWork);
+        }
+    }
+    if (ret != 0) {
+        MMI_HILOGE("uv_queue_work failed");
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        JsUtil::DeletePtr<int32_t*>(uData);
+        return;
+    }
+}
+
+void JsEventTarget::CallKeystrokeAbilityPromise(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is null");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    CHKPV(cb);
+    CHKPV(cb->env);
+
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(cb->env, &scope);
+    CHKPV(scope);
+    napi_value callResult = nullptr;
+    if (cb->errCode != RET_OK) {
+        if (cb->errCode == RET_ERR) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Other errors");
+            return;
+        }
+        NapiError codeMsg;
+        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
+            return;
+        }
+        callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult == nullptr) {
+            MMI_HILOGE("callResult is nullptr");
+            napi_close_handle_scope(cb->env, scope);
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
+        CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
+    } else {
+        CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &callResult), CREATE_ARRAY, scope);
+        for (size_t i = 0; i < cb->data.keystrokeAbility.size(); ++i) {
+            napi_value ret = nullptr;
+            napi_value isSupport = nullptr;
+            CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, cb->data.keystrokeAbility[i] ? 1 : 0, &ret),
+                CREATE_INT32, scope);
+            CHKRV_SCOPE(cb->env, napi_coerce_to_bool(cb->env, ret, &isSupport), COERCE_TO_BOOL, scope);
+            CHKRV_SCOPE(cb->env, napi_set_element(cb->env, callResult, static_cast<uint32_t>(i), isSupport),
+                SET_ELEMENT, scope);
+        }
+        CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, callResult), RESOLVE_DEFERRED, scope);
+    }
+    napi_close_handle_scope(cb->env, scope);
+    JsUtil::DeleteCallbackInfo(std::move(cb));
+}
 
-#endif // JS_EVENT_TARGET_H
\ No newline at end of file
+void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is nullptr");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    CHKPV(cb);
+    CHKPV(cb->env);
+
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(cb->env, &scope);
+    CHKPV(scope);
+    napi_value callResult[2] = { 0 };
+    if (cb->errCode != RET_OK) {
+        if (cb->errCode == RET_ERR) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Other errors");
+            return;
+        }
+        NapiError codeMsg;
+        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
+            return;
+        }
+        callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult[0] == nullptr) {
+            MMI_HILOGE("callResult[0] is nullptr");
+            napi_close_handle_scope(cb->env, scope);
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
+        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
+    } else {
+        CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &callResult[1]), CREATE_ARRAY, scope);
+        for (size_t i = 0; i < cb->data.keystrokeAbility.size(); ++i) {
+            napi_value ret = nullptr;
+            napi_value isSupport = nullptr;
+            CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, cb->data.keystrokeAbility[i] ? 1 : 0, &ret),
+                CREATE_INT32, scope);
+            CHKRV_SCOPE(cb->env, napi_coerce_to_bool(cb->env, ret, &isSupport), COERCE_TO_BOOL, scope);
+            CHKRV_SCOPE(cb->env, napi_set_element(cb->env, callResult[1], static_cast<uint32_t>(i), isSupport),
+                SET_ELEMENT, scope);
+        }
+        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
+    }
+    napi_value handler = nullptr;
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
+    napi_value result = nullptr;
+    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION, scope);
+    napi_close_handle_scope(cb->env, scope);
+    JsUtil::DeleteCallbackInfo(std::move(cb));
+}
+
+void JsEventTarget::EmitSupportKeys(int32_t userData, std::vector<bool> &keystrokeAbility)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mutex_);
+    auto iter = callback_.find(userData);
+    if (iter == callback_.end()) {
+        MMI_HILOGE("Failed to search for userData");
+        return;
+    }
+    CHKPV(iter->second);
+    if (iter->second->env == nullptr) {
+        callback_.erase(iter);
+        MMI_HILOGE("The env is nullptr");
+        return;
+    }
+
+    iter->second->data.keystrokeAbility = keystrokeAbility;
+    iter->second->errCode = RET_OK;
+    uv_loop_s *loop = nullptr;
+    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
+    uv_work_t *work = new (std::nothrow) uv_work_t;
+    CHKPV(work);
+    int32_t *uData = new (std::nothrow) int32_t(userData);
+    if (uData == nullptr) {
+        MMI_HILOGE("uData is nullptr");
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        return;
+    }
+    work->data = static_cast<void*>(uData);
+    int32_t ret;
+    if (iter->second->ref == nullptr) {
+        ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallKeystrokeAbilityPromise);
+    } else {
+        ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallKeystrokeAbilityAsync);
+    }
+    if (ret != 0) {
+        MMI_HILOGE("uv_queue_work failed");
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        JsUtil::DeletePtr<int32_t*>(uData);
+        return;
+    }
+}
+
+void JsEventTarget::EmitJsKeyboardType(int32_t userData, int32_t keyboardType)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mutex_);
+    auto iter = callback_.find(userData);
+    if (iter == callback_.end()) {
+        MMI_HILOGE("Failed to search for userData");
+        return;
+    }
+    CHKPV(iter->second);
+    if (iter->second->env == nullptr) {
+        callback_.erase(iter);
+        MMI_HILOGE("The env is nullptr");
+        return;
+    }
+    iter->second->data.keyboardType = keyboardType;
+    iter->second->errCode = RET_OK;
+    uv_loop_s *loop = nullptr;
+    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
+
+    uv_work_t *work = new (std::nothrow) uv_work_t;
+    CHKPV(work);
+    int32_t *uData = new (std::nothrow) int32_t(userData);
+    if (uData == nullptr) {
+        MMI_HILOGE("uData is nullptr");
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        return;
+    }
+    work->data = static_cast<void*>(uData);
+    int32_t ret = 0;
+    if (iter->second->ref == nullptr) {
+        ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallKeyboardTypePromise);
+    } else {
+        ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallKeyboardTypeAsync);
+    }
+    if (ret != 0) {
+        MMI_HILOGE("uv_queue_work failed");
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        JsUtil::DeletePtr<int32_t*>(uData);
+        return;
+    }
+}
+
+void JsEventTarget::CallKeyboardTypeAsync(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is nullptr");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    CHKPV(cb);
+    CHKPV(cb->env);
+
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(cb->env, &scope);
+    CHKPV(scope);
+
+    napi_value callResult[2] = { 0 };
+    if (cb->errCode != RET_OK) {
+        if (cb->errCode == RET_ERR) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Other errors");
+            return;
+        }
+        NapiError codeMsg;
+        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
+            return;
+        }
+        callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult[0] == nullptr) {
+            MMI_HILOGE("callResult[0] is nullptr");
+            napi_close_handle_scope(cb->env, scope);
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
+        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
+    } else {
+        CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, cb->data.keyboardType, &callResult[1]), CREATE_INT32, scope);
+        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
+    }
+    napi_value handler = nullptr;
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
+    napi_value result = nullptr;
+    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result),
+	    CALL_FUNCTION, scope);
+    napi_close_handle_scope(cb->env, scope);
+    JsUtil::DeleteCallbackInfo(std::move(cb));
+}
+
+void JsEventTarget::CallKeyboardTypePromise(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is null");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    CHKPV(cb);
+    CHKPV(cb->env);
+
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(cb->env, &scope);
+    CHKPV(scope);
+
+    napi_value callResult;
+    if (cb->errCode != RET_OK) {
+        if (cb->errCode == RET_ERR) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Other errors");
+            return;
+        }
+        NapiError codeMsg;
+        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
+            return;
+        }
+        callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult == nullptr) {
+            MMI_HILOGE("callResult is nullptr");
+            napi_close_handle_scope(cb->env, scope);
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
+        CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
+    } else {
+        CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, cb->data.keyboardType, &callResult), CREATE_INT32, scope);
+        CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, callResult), RESOLVE_DEFERRED, scope);
+    }
+    napi_close_handle_scope(cb->env, scope);
+    JsUtil::DeleteCallbackInfo(std::move(cb));
+}
+
+void JsEventTarget::CallDevListAsyncWork(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is nullptr");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    CHKPV(cb);
+    CHKPV(cb->env);
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(cb->env, &scope);
+    CHKPV(scope);
+
+    napi_value callResult[2] = { 0 };
+    if (cb->errCode != RET_OK) {
+        if (cb->errCode == RET_ERR) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Other errors");
+            return;
+        }
+        NapiError codeMsg;
+        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
+            return;
+        }
+        callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult[0] == nullptr) {
+            MMI_HILOGE("callResult[0] is nullptr");
+            napi_close_handle_scope(cb->env, scope);
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
+        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
+    } else {
+        CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &callResult[1]), CREATE_ARRAY, scope);
+        uint32_t index = 0;
+        napi_value value = nullptr;
+        for (const auto &item : cb->data.ids) {
+            CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, item, &value), CREATE_INT32, scope);
+            CHKRV_SCOPE(cb->env, napi_set_element(cb->env, callResult[1], index, value), SET_ELEMENT, scope);
+            ++index;
+        }
+        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
+    }
+    napi_value handler = nullptr;
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
+    napi_value result = nullptr;
+    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION, scope);
+    napi_close_handle_scope(cb->env, scope);
+    JsUtil::DeleteCallbackInfo(std::move(cb));
+}
+
+void JsEventTarget::CallDevListPromiseWork(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is null");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    CHKPV(cb);
+    CHKPV(cb->env);
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(cb->env, &scope);
+    CHKPV(scope);
+    napi_value callResult = nullptr;
+    if (cb->errCode != RET_OK) {
+        if (cb->errCode == RET_ERR) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Other errors");
+            return;
+        }
+        NapiError codeMsg;
+        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
+            return;
+        }
+        callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult == nullptr) {
+            MMI_HILOGE("callResult is nullptr");
+            napi_close_handle_scope(cb->env, scope);
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
+        CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
+    } else {
+        CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &callResult), CREATE_ARRAY, scope);
+        uint32_t index = 0;
+        napi_value value = nullptr;
+        for (const auto &item : cb->data.ids) {
+            CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, item, &value), CREATE_INT32, scope);
+            CHKRV_SCOPE(cb->env, napi_set_element(cb->env, callResult, index, value), SET_ELEMENT, scope);
+            ++index;
+        }
+        CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, callResult), RESOLVE_DEFERRED, scope);
+    }
+    napi_close_handle_scope(cb->env, scope);
+    JsUtil::DeleteCallbackInfo(std::move(cb));
+}
+
+void JsEventTarget::CallDevInfoPromiseWork(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is nullptr");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    CHKPV(cb);
+    CHKPV(cb->env);
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(cb->env, &scope);
+    if (scope == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        JsUtil::DeleteCallbackInfo(std::move(cb));
+        return;
+    }
+    napi_value callResult = nullptr;
+    if (cb->errCode != RET_OK) {
+        if (cb->errCode == RET_ERR) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Other errors");
+            return;
+        }
+        NapiError codeMsg;
+        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
+            return;
+        }
+        callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult == nullptr) {
+            MMI_HILOGE("callResult is nullptr");
+            napi_close_handle_scope(cb->env, scope);
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
+        CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
+    } else {
+        callResult = JsUtil::GetDeviceInfo(cb);
+        if (callResult == nullptr) {
+            MMI_HILOGE("Check callResult is nullptr");
+            napi_close_handle_scope(cb->env, scope);
+            return;
+        }
+        CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, callResult), RESOLVE_DEFERRED, scope);
+    }
+    napi_close_handle_scope(cb->env, scope);
+    JsUtil::DeleteCallbackInfo(std::move(cb));
+}
+
+void JsEventTarget::CallDevInfoAsyncWork(uv_work_t *work, int32_t status)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is null");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
+    CHKPV(cb);
+    CHKPV(cb->env);
+    napi_handle_scope scope = nullptr;
+    napi_open_handle_scope(cb->env, &scope);
+    CHKPV(scope);
+    napi_value callResult[2] = { 0 };
+    if (cb->errCode != RET_OK) {
+        if (cb->errCode == RET_ERR) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Other errors");
+            return;
+        }
+        NapiError codeMsg;
+        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
+            napi_close_handle_scope(cb->env, scope);
+            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
+            return;
+        }
+        callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
+        if (callResult[0] == nullptr) {
+            MMI_HILOGE("callResult[0] is nullptr");
+            napi_close_handle_scope(cb->env, scope);
+            JsUtil::DeleteCallbackInfo(std::move(cb));
+            return;
+        }
+        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
+    } else {
+        callResult[1] = JsUtil::GetDeviceInfo(cb);
+        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
+    }
+    napi_value handler = nullptr;
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
+    napi_value result = nullptr;
+    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION,
+        scope);
+    napi_close_handle_scope(cb->env, scope);
+    JsUtil::DeleteCallbackInfo(std::move(cb));
+}
+
+void JsEventTarget::AddListener(napi_env env, const std::string &type, napi_value handle)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mutex_);
+    auto iter = devListener_.find(type);
+    if (iter == devListener_.end()) {
+        MMI_HILOGE("Find %{public}s failed", type.c_str());
+        return;
+    }
+
+    for (const auto &temp : iter->second) {
+        CHKPC(temp);
+        if (temp->env != env) {
+            continue;
+        }
+        if (JsUtil::IsSameHandle(env, handle, temp->ref)) {
+            MMI_HILOGW("The handle already exists");
+            return;
+        }
+    }
+    napi_ref ref = nullptr;
+    CHKRV(env, napi_create_reference(env, handle, 1, &ref), CREATE_REFERENCE);
+    auto monitor = std::make_unique<JsUtil::CallbackInfo>();
+    CHKPV(monitor);
+    monitor->env = env;
+    monitor->ref = ref;
+    iter->second.push_back(std::move(monitor));
+    if (!isListeningProcess_) {
+        isListeningProcess_ = true;
+        InputMgr->RegisterDevListener("change", shared_from_this());
+    }
+}
+
+void JsEventTarget::RemoveListener(napi_env env, const std::string &type, napi_value handle)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mutex_);
+    auto iter = devListener_.find(type);
+    if (iter == devListener_.end()) {
+        MMI_HILOGE("Find %{public}s failed", type.c_str());
+        return;
+    }
+    if (handle == nullptr) {
+        iter->second.clear();
+        goto monitorLabel;
+    }
+    for (auto it = iter->second.begin(); it != iter->second.end(); ++it) {
+        if ((*it)->env != env) {
+            continue;
+        }
+        if (JsUtil::IsSameHandle(env, handle, (*it)->ref)) {
+            MMI_HILOGD("Succeeded in removing monitor");
+            JsUtil::DeleteCallbackInfo(std::move(*it));
+            iter->second.erase(it);
+            goto monitorLabel;
+        }
+    }
+
+monitorLabel:
+    if (isListeningProcess_ && iter->second.empty()) {
+        isListeningProcess_ = false;
+        InputMgr->UnregisterDevListener("change", shared_from_this());
+    }
+}
+
+napi_value JsEventTarget::CreateCallbackInfo(napi_env env, napi_value handle, const int32_t userData, bool isApi9)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mutex_);
+    auto cb = std::make_unique<JsUtil::CallbackInfo>();
+    CHKPP(cb);
+    cb->env = env;
+    cb->isApi9 = isApi9;
+    napi_value promise = nullptr;
+    if (handle == nullptr) {
+        CHKRP(env, napi_create_promise(env, &cb->deferred, &promise), CREATE_PROMISE);
+    } else {
+        CHKRP(env, napi_create_reference(env, handle, 1, &cb->ref), CREATE_REFERENCE);
+    }
+    callback_.emplace(userData, std::move(cb));
+    return promise;
+}
+
+napi_value JsEventTarget::GreateBusinessError(napi_env env, int32_t errCode, std::string errMessage)
+{
+    CALL_DEBUG_ENTER;
+    napi_value result = nullptr;
+    napi_value resultCode = nullptr;
+    napi_value resultMessage = nullptr;
+    CHKRP(env, napi_create_int32(env, errCode, &resultCode), CREATE_INT32);
+    CHKRP(env, napi_create_string_utf8(env, errMessage.data(), NAPI_AUTO_LENGTH, &resultMessage), CREATE_STRING_UTF8);
+    CHKRP(env, napi_create_error(env, nullptr, resultMessage, &result), CREATE_ERROR);
+    CHKRP(env, napi_set_named_property(env, result, ERR_CODE.c_str(), resultCode), SET_NAMED_PROPERTY);
+    return result;
+}
+
+std::unique_ptr<JsUtil::CallbackInfo> JsEventTarget::GetCallbackInfo(uv_work_t *work)
+{
+    std::lock_guard<std::mutex> guard(mutex_);
+    int32_t *uData = static_cast<int32_t*>(work->data);
+    int32_t userData = *uData;
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    JsUtil::DeletePtr<int32_t*>(uData);
+
+    auto iter = callback_.find(userData);
+    if (iter == callback_.end()) {
+        MMI_HILOGE("Find userData failed");
+        return nullptr;
+    }
+    auto cb = std::move(iter->second);
+    callback_.erase(iter);
+    return cb;
+}
+
+void JsEventTarget::RemoveCallbackInfo(napi_env env, napi_value handle, int32_t userData)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mutex_);
+    auto iter = callback_.find(userData);
+    if (iter != callback_.end()) {
+        auto cb = std::move(iter->second);
+        JsUtil::DeleteCallbackInfo(std::move(cb));
+        callback_.erase(iter);
+    }
+}
+
+void JsEventTarget::ResetEnv()
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mutex_);
+    callback_.clear();
+    devListener_.clear();
+    InputMgr->UnregisterDevListener("change", shared_from_this());
+}
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
-- 
Gitee


From c54b8f98ba6387b18a3c1fd3b47c988a02cb2787 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Mon, 7 Nov 2022 11:37:16 +0000
Subject: [PATCH 110/360] update
 frameworks/napi/input_device/include/js_util.h.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 frameworks/napi/input_device/include/js_util.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/frameworks/napi/input_device/include/js_util.h b/frameworks/napi/input_device/include/js_util.h
index 76bc208288..6cabb8afbb 100644
--- a/frameworks/napi/input_device/include/js_util.h
+++ b/frameworks/napi/input_device/include/js_util.h
@@ -67,15 +67,6 @@ public:
             ptr = nullptr;
         }
     }
-
-    template <typename T>
-    static void ChkAndDeletePtr(T &ptr)
-    {
-        if (ptr != nullptr && ptr->data == nullptr) {
-            JsUtil::DeletePtr<uv_work_t*>(ptr);
-            return;
-        }
-    }
 };
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From 5dedb064aa2857844d6d86ba1c6222ba35b03cef Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Mon, 7 Nov 2022 11:37:55 +0000
Subject: [PATCH 111/360] update
 frameworks/napi/input_device/include/js_event_target.h.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 .../input_device/include/js_event_target.h    | 1102 +----------------
 1 file changed, 54 insertions(+), 1048 deletions(-)

diff --git a/frameworks/napi/input_device/include/js_event_target.h b/frameworks/napi/input_device/include/js_event_target.h
index fdbbced2b2..abd0a3cc08 100644
--- a/frameworks/napi/input_device/include/js_event_target.h
+++ b/frameworks/napi/input_device/include/js_event_target.h
@@ -13,1056 +13,62 @@
  * limitations under the License.
  */
 
-#include "js_event_target.h"
-#include "js_util.h"
-#include "napi_constants.h"
-#include "util_napi_error.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "JsEventTarget" };
-
-std::mutex mutex_;
-const std::string ADD_EVENT = "add";
-const std::string REMOVE_EVENT = "remove";
-} // namespace
-
-JsEventTarget::JsEventTarget()
-{
-    CALL_DEBUG_ENTER;
-    auto ret = devListener_.insert({ CHANGED_TYPE, std::vector<std::unique_ptr<JsUtil::CallbackInfo>>() });
-    CK(ret.second, VAL_NOT_EXP);
-}
-
-void JsEventTarget::EmitAddedDeviceEvent(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
-        return;
-    }
-    auto temp = static_cast<std::unique_ptr<JsUtil::CallbackInfo>*>(work->data);
-    JsUtil::DeletePtr<uv_work_t*>(work);
-    auto addEvent = devListener_.find(CHANGED_TYPE);
-    if (addEvent == devListener_.end()) {
-        MMI_HILOGE("Find change event failed");
-        return;
-    }
-
-    for (const auto &item : addEvent->second) {
-        CHKPC(item->env);
-        if (item->ref != (*temp)->ref) {
-            continue;
-        }
-        napi_handle_scope scope = nullptr;
-        napi_open_handle_scope(item->env, &scope);
-        if (scope == nullptr) {
-            MMI_HILOGE("scope is nullptr");
-            return;
-        }
-        napi_value eventType = nullptr;
-        CHKRV_SCOPE(item->env, napi_create_string_utf8(item->env, ADD_EVENT.c_str(), NAPI_AUTO_LENGTH, &eventType),
-                CREATE_STRING_UTF8, scope);
-        napi_value deviceId = nullptr;
-        CHKRV_SCOPE(item->env, napi_create_int32(item->env, item->data.deviceId, &deviceId), CREATE_INT32, scope);
-        napi_value object = nullptr;
-        CHKRV_SCOPE(item->env, napi_create_object(item->env, &object), CREATE_OBJECT, scope);
-        CHKRV_SCOPE(item->env, napi_set_named_property(item->env, object, "type", eventType),
-                SET_NAMED_PROPERTY, scope);
-        CHKRV_SCOPE(item->env, napi_set_named_property(item->env, object, "deviceId", deviceId),
-                SET_NAMED_PROPERTY, scope);
-        napi_value handler = nullptr;
-        CHKRV_SCOPE(item->env, napi_get_reference_value(item->env, item->ref, &handler), GET_REFERENCE, scope);
-        napi_value ret = nullptr;
-        CHKRV_SCOPE(item->env, napi_call_function(item->env, nullptr, handler, 1, &object, &ret),
-                CALL_FUNCTION, scope);
-        napi_close_handle_scope(item->env, scope);
-    }
-}
-
-void JsEventTarget::EmitRemoveDeviceEvent(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
-        return;
-    }
-    auto temp = static_cast<std::unique_ptr<JsUtil::CallbackInfo>*>(work->data);
-    JsUtil::DeletePtr<uv_work_t*>(work);
-    auto removeEvent = devListener_.find(CHANGED_TYPE);
-    if (removeEvent == devListener_.end()) {
-        MMI_HILOGE("Find change event failed");
-        return;
-    }
-
-    for (const auto &item : removeEvent->second) {
-        CHKPC(item->env);
-        if (item->ref != (*temp)->ref) {
-            continue;
-        }
-        napi_handle_scope scope = nullptr;
-        napi_open_handle_scope(item->env, &scope);
-        if (scope == nullptr) {
-            MMI_HILOGE("scope is nullptr");
-            return;
-        }
-        napi_value eventType = nullptr;
-        CHKRV_SCOPE(item->env, napi_create_string_utf8(item->env, REMOVE_EVENT.c_str(), NAPI_AUTO_LENGTH,
-             &eventType),
-             CREATE_STRING_UTF8, scope);
-
-        napi_value deviceId = nullptr;
-        CHKRV_SCOPE(item->env, napi_create_int32(item->env, item->data.deviceId, &deviceId),
-             CREATE_INT32, scope);
-        
-        napi_value object = nullptr;
-        CHKRV_SCOPE(item->env, napi_create_object(item->env, &object), CREATE_OBJECT, scope);
-        CHKRV_SCOPE(item->env, napi_set_named_property(item->env, object, "type", eventType),
-             SET_NAMED_PROPERTY, scope);
-        CHKRV_SCOPE(item->env, napi_set_named_property(item->env, object, "deviceId", deviceId),
-             SET_NAMED_PROPERTY, scope);
-
-        napi_value handler = nullptr;
-        CHKRV_SCOPE(item->env, napi_get_reference_value(item->env, item->ref, &handler), GET_REFERENCE, scope);
-
-        napi_value ret = nullptr;
-        CHKRV_SCOPE(item->env, napi_call_function(item->env, nullptr, handler, 1, &object, &ret),
-             CALL_FUNCTION, scope);
-        napi_close_handle_scope(item->env, scope);
-    }
-}
-
-void JsEventTarget::OnDeviceAdded(int32_t deviceId, const std::string &type)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto changeEvent = devListener_.find(CHANGED_TYPE);
-    if (changeEvent == devListener_.end()) {
-        MMI_HILOGE("Find %{public}s failed", CHANGED_TYPE.c_str());
-        return;
-    }
-
-    for (auto &item : changeEvent->second) {
-        CHKPC(item);
-        CHKPC(item->env);
-        uv_loop_s *loop = nullptr;
-        CHKRV(item->env, napi_get_uv_event_loop(item->env, &loop), GET_UV_LOOP);
-        uv_work_t *work = new (std::nothrow) uv_work_t;
-        CHKPV(work);
-        item->data.deviceId = deviceId;
-        work->data = static_cast<void*>(&item);
-        int32_t ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, EmitAddedDeviceEvent);
-        if (ret != 0) {
-            MMI_HILOGE("uv_queue_work failed");
-            JsUtil::DeletePtr<uv_work_t*>(work);
-            return;
-        }
-    }
-}
-
-void JsEventTarget::OnDeviceRemoved(int32_t deviceId, const std::string &type)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto changeEvent = devListener_.find(CHANGED_TYPE);
-    if (changeEvent == devListener_.end()) {
-        MMI_HILOGE("Find %{public}s failed", CHANGED_TYPE.c_str());
-        return;
-    }
-    for (auto &item : changeEvent->second) {
-        CHKPC(item);
-        CHKPC(item->env);
-        uv_loop_s *loop = nullptr;
-        CHKRV(item->env, napi_get_uv_event_loop(item->env, &loop), GET_UV_LOOP);
-        uv_work_t *work = new (std::nothrow) uv_work_t;
-        CHKPV(work);
-        item->data.deviceId = deviceId;
-        work->data = static_cast<void*>(&item);
-        int32_t ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, EmitRemoveDeviceEvent);
-        if (ret != 0) {
-            MMI_HILOGE("uv_queue_work failed");
-            JsUtil::DeletePtr<uv_work_t*>(work);
-            return;
-        }
-    }
-}
-
-void JsEventTarget::CallIdsAsyncWork(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
-    CHKPV(cb->env);
-
-    napi_handle_scope scope = nullptr;
-    napi_open_handle_scope(cb->env, &scope);
-    if (scope == nullptr) {
-        MMI_HILOGE("scope is nullptr");
-        return;
-    }
-    napi_value arr[2];
-    CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &arr[0]), GET_UNDEFINED, scope);
-    CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &arr[1]), CREATE_ARRAY, scope);
-    uint32_t index = 0;
-    napi_value value = nullptr;
-    for (const auto &item : cb->data.ids) {
-        CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, item, &value), CREATE_INT32, scope);
-        CHKRV_SCOPE(cb->env, napi_set_element(cb->env, arr[1], index, value), SET_ELEMENT, scope);
-        ++index;
-    }
-    
-    napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
-    napi_value result = nullptr;
-    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, arr, &result), CALL_FUNCTION, scope);
-    napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
-}
-
-void JsEventTarget::CallIdsPromiseWork(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
-    CHKPV(cb->env);
-
-    napi_handle_scope scope = nullptr;
-    napi_open_handle_scope(cb->env, &scope);
-    if (scope == nullptr) {
-        MMI_HILOGE("scope is nullptr");
-        return;
-    }
-    napi_value arr = nullptr;
-    CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &arr), CREATE_ARRAY, scope);
-    uint32_t index = 0;
-    napi_value value = nullptr;
-    for (const auto &item : cb->data.ids) {
-        CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, item, &value), CREATE_INT32, scope);
-        CHKRV_SCOPE(cb->env, napi_set_element(cb->env, arr, index, value), SET_ELEMENT, scope);
-        ++index;
-    }
-    CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, arr), RESOLVE_DEFERRED, scope);
-    napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
-}
-
-void JsEventTarget::EmitJsIds(int32_t userData, std::vector<int32_t> &ids)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Failed to search for userData");
-        return;
-    }
-    CHKPV(iter->second);
-    if (iter->second->env == nullptr) {
-        callback_.erase(iter);
-        MMI_HILOGE("The env is nullptr");
-        return;
-    }
-
-    iter->second->data.ids = ids;
-    iter->second->errCode = RET_OK;
-    uv_loop_s *loop = nullptr;
-    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
-    uv_work_t *work = new (std::nothrow) uv_work_t;
-    CHKPV(work);
-    int32_t *uData = new (std::nothrow) int32_t(userData);
-    if (uData == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check uData is null");
-        return;
-    }
-    work->data = static_cast<void*>(uData);
-    int32_t ret;
-    if (iter->second->isApi9) {
-        if (iter->second->ref == nullptr) {
-            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevListPromiseWork);
-        } else {
-            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevListAsyncWork);
-        }
-    } else {
-        if (iter->second->ref == nullptr) {
-            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallIdsPromiseWork);
-        } else {
-            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallIdsAsyncWork);
-        }
-    }
-    if (ret != 0) {
-        MMI_HILOGE("uv_queue_work failed");
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeletePtr<int32_t*>(uData);
-    }
-}
-
-void JsEventTarget::CallDevAsyncWork(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
-    CHKPV(cb->env);
-    napi_handle_scope scope = nullptr;
-    napi_open_handle_scope(cb->env, &scope);
-    if (scope == nullptr) {
-        MMI_HILOGE("scope is nullptr");
-        return;
-    }
-    napi_value object[2];
-    CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &object[0]), GET_UNDEFINED, scope);
-    object[1] = JsUtil::GetDeviceInfo(cb);
-    napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
-    napi_value result = nullptr;
-    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, object, &result), CALL_FUNCTION,
-        scope);
-    napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
-}
-
-void JsEventTarget::CallDevPromiseWork(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
-    CHKPV(cb->env);
-    napi_handle_scope scope = nullptr;
-    napi_open_handle_scope(cb->env, &scope);
-    if (scope == nullptr) {
-        MMI_HILOGE("scope is nullptr");
-        return;
-    }
-    napi_value object = JsUtil::GetDeviceInfo(cb);
-    if (object == nullptr) {
-        MMI_HILOGE("Check object is null");
-        napi_close_handle_scope(cb->env, scope);
-        return;
-    }
-    CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, object), RESOLVE_DEFERRED, scope);
-    napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
-}
-
-void JsEventTarget::EmitJsDev(int32_t userData, std::shared_ptr<InputDevice> device)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    CHKPV(device);
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Failed to search for userData");
-        return;
-    }
-    CHKPV(iter->second);
-    if (iter->second->env == nullptr) {
-        callback_.erase(iter);
-        MMI_HILOGE("The env is nullptr");
-        return;
-    }
-
-    iter->second->data.device = device;
-    iter->second->errCode = RET_OK;
-    uv_loop_s *loop = nullptr;
-    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
-    uv_work_t *work = new (std::nothrow) uv_work_t;
-    CHKPV(work);
-    int32_t *uData = new (std::nothrow) int32_t(userData);
-    if (uData == nullptr) {
-        MMI_HILOGE("uData is nullptr");
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        return;
-    }
-    work->data = static_cast<void*>(uData);
-    int32_t ret;
-    if (iter->second->isApi9) {
-        if (iter->second->ref == nullptr) {
-            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevInfoPromiseWork);
-        } else {
-            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevInfoAsyncWork);
-        }
-    } else {
-        if (iter->second->ref == nullptr) {
-            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevPromiseWork);
-        } else {
-            ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevAsyncWork);
-        }
-    }
-    if (ret != 0) {
-        MMI_HILOGE("uv_queue_work failed");
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeletePtr<int32_t*>(uData);
-        return;
-    }
-}
-
-void JsEventTarget::CallKeystrokeAbilityPromise(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
-    CHKPV(cb->env);
-
-    napi_handle_scope scope = nullptr;
-    napi_open_handle_scope(cb->env, &scope);
-    CHKPV(scope);
-    napi_value callResult = nullptr;
-    if (cb->errCode != RET_OK) {
-        if (cb->errCode == RET_ERR) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Other errors");
-            return;
-        }
-        NapiError codeMsg;
-        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
-            return;
-        }
-        callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
-        if (callResult == nullptr) {
-            MMI_HILOGE("callResult is nullptr");
-            napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
-            return;
-        }
-        CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
-    } else {
-        CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &callResult), CREATE_ARRAY, scope);
-        for (size_t i = 0; i < cb->data.keystrokeAbility.size(); ++i) {
-            napi_value ret = nullptr;
-            napi_value isSupport = nullptr;
-            CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, cb->data.keystrokeAbility[i] ? 1 : 0, &ret),
-                CREATE_INT32, scope);
-            CHKRV_SCOPE(cb->env, napi_coerce_to_bool(cb->env, ret, &isSupport), COERCE_TO_BOOL, scope);
-            CHKRV_SCOPE(cb->env, napi_set_element(cb->env, callResult, static_cast<uint32_t>(i), isSupport),
-                SET_ELEMENT, scope);
-        }
-        CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, callResult), RESOLVE_DEFERRED, scope);
-    }
-    napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
-}
+#ifndef JS_EVENT_TARGET_H
+#define JS_EVENT_TARGET_H
 
-void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is nullptr");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
-    CHKPV(cb->env);
+#include "napi/native_api.h"
+#include "napi/native_node_api.h"
+#include "util_napi.h"
+#include "utils/log.h"
 
-    napi_handle_scope scope = nullptr;
-    napi_open_handle_scope(cb->env, &scope);
-    CHKPV(scope);
-    napi_value callResult[2] = { 0 };
-    if (cb->errCode != RET_OK) {
-        if (cb->errCode == RET_ERR) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Other errors");
-            return;
-        }
-        NapiError codeMsg;
-        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
-            return;
-        }
-        callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
-        if (callResult[0] == nullptr) {
-            MMI_HILOGE("callResult[0] is nullptr");
-            napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
-            return;
-        }
-        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
-    } else {
-        CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &callResult[1]), CREATE_ARRAY, scope);
-        for (size_t i = 0; i < cb->data.keystrokeAbility.size(); ++i) {
-            napi_value ret = nullptr;
-            napi_value isSupport = nullptr;
-            CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, cb->data.keystrokeAbility[i] ? 1 : 0, &ret),
-                CREATE_INT32, scope);
-            CHKRV_SCOPE(cb->env, napi_coerce_to_bool(cb->env, ret, &isSupport), COERCE_TO_BOOL, scope);
-            CHKRV_SCOPE(cb->env, napi_set_element(cb->env, callResult[1], static_cast<uint32_t>(i), isSupport),
-                SET_ELEMENT, scope);
-        }
-        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
-    }
-    napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
-    napi_value result = nullptr;
-    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION, scope);
-    napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
-}
+#include "define_multimodal.h"
+#include "error_multimodal.h"
 
-void JsEventTarget::EmitSupportKeys(int32_t userData, std::vector<bool> &keystrokeAbility)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Failed to search for userData");
-        return;
-    }
-    CHKPV(iter->second);
-    if (iter->second->env == nullptr) {
-        callback_.erase(iter);
-        MMI_HILOGE("The env is nullptr");
-        return;
-    }
-
-    iter->second->data.keystrokeAbility = keystrokeAbility;
-    iter->second->errCode = RET_OK;
-    uv_loop_s *loop = nullptr;
-    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
-    uv_work_t *work = new (std::nothrow) uv_work_t;
-    CHKPV(work);
-    int32_t *uData = new (std::nothrow) int32_t(userData);
-    if (uData == nullptr) {
-        MMI_HILOGE("uData is nullptr");
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        return;
-    }
-    work->data = static_cast<void*>(uData);
-    int32_t ret;
-    if (iter->second->ref == nullptr) {
-        ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallKeystrokeAbilityPromise);
-    } else {
-        ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallKeystrokeAbilityAsync);
-    }
-    if (ret != 0) {
-        MMI_HILOGE("uv_queue_work failed");
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeletePtr<int32_t*>(uData);
-        return;
-    }
-}
-
-void JsEventTarget::EmitJsKeyboardType(int32_t userData, int32_t keyboardType)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Failed to search for userData");
-        return;
-    }
-    CHKPV(iter->second);
-    if (iter->second->env == nullptr) {
-        callback_.erase(iter);
-        MMI_HILOGE("The env is nullptr");
-        return;
-    }
-    iter->second->data.keyboardType = keyboardType;
-    iter->second->errCode = RET_OK;
-    uv_loop_s *loop = nullptr;
-    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
-
-    uv_work_t *work = new (std::nothrow) uv_work_t;
-    CHKPV(work);
-    int32_t *uData = new (std::nothrow) int32_t(userData);
-    if (uData == nullptr) {
-        MMI_HILOGE("uData is nullptr");
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        return;
-    }
-    work->data = static_cast<void*>(uData);
-    int32_t ret = 0;
-    if (iter->second->ref == nullptr) {
-        ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallKeyboardTypePromise);
-    } else {
-        ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallKeyboardTypeAsync);
-    }
-    if (ret != 0) {
-        MMI_HILOGE("uv_queue_work failed");
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeletePtr<int32_t*>(uData);
-        return;
-    }
-}
-
-void JsEventTarget::CallKeyboardTypeAsync(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is nullptr");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
-    CHKPV(cb->env);
-
-    napi_handle_scope scope = nullptr;
-    napi_open_handle_scope(cb->env, &scope);
-    CHKPV(scope);
-
-    napi_value callResult[2] = { 0 };
-    if (cb->errCode != RET_OK) {
-        if (cb->errCode == RET_ERR) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Other errors");
-            return;
-        }
-        NapiError codeMsg;
-        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
-            return;
-        }
-        callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
-        if (callResult[0] == nullptr) {
-            MMI_HILOGE("callResult[0] is nullptr");
-            napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
-            return;
-        }
-        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
-    } else {
-        CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, cb->data.keyboardType, &callResult[1]), CREATE_INT32, scope);
-        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
-    }
-    napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
-    napi_value result = nullptr;
-    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result),
-	    CALL_FUNCTION, scope);
-    napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
-}
-
-void JsEventTarget::CallKeyboardTypePromise(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
-    CHKPV(cb->env);
-
-    napi_handle_scope scope = nullptr;
-    napi_open_handle_scope(cb->env, &scope);
-    CHKPV(scope);
-
-    napi_value callResult;
-    if (cb->errCode != RET_OK) {
-        if (cb->errCode == RET_ERR) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Other errors");
-            return;
-        }
-        NapiError codeMsg;
-        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
-            return;
-        }
-        callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
-        if (callResult == nullptr) {
-            MMI_HILOGE("callResult is nullptr");
-            napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
-            return;
-        }
-        CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
-    } else {
-        CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, cb->data.keyboardType, &callResult), CREATE_INT32, scope);
-        CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, callResult), RESOLVE_DEFERRED, scope);
-    }
-    napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
-}
-
-void JsEventTarget::CallDevListAsyncWork(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is nullptr");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
-    CHKPV(cb->env);
-    napi_handle_scope scope = nullptr;
-    napi_open_handle_scope(cb->env, &scope);
-    CHKPV(scope);
-
-    napi_value callResult[2] = { 0 };
-    if (cb->errCode != RET_OK) {
-        if (cb->errCode == RET_ERR) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Other errors");
-            return;
-        }
-        NapiError codeMsg;
-        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
-            return;
-        }
-        callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
-        if (callResult[0] == nullptr) {
-            MMI_HILOGE("callResult[0] is nullptr");
-            napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
-            return;
-        }
-        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
-    } else {
-        CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &callResult[1]), CREATE_ARRAY, scope);
-        uint32_t index = 0;
-        napi_value value = nullptr;
-        for (const auto &item : cb->data.ids) {
-            CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, item, &value), CREATE_INT32, scope);
-            CHKRV_SCOPE(cb->env, napi_set_element(cb->env, callResult[1], index, value), SET_ELEMENT, scope);
-            ++index;
-        }
-        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
-    }
-    napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
-    napi_value result = nullptr;
-    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION, scope);
-    napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
-}
-
-void JsEventTarget::CallDevListPromiseWork(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
-    CHKPV(cb->env);
-    napi_handle_scope scope = nullptr;
-    napi_open_handle_scope(cb->env, &scope);
-    CHKPV(scope);
-    napi_value callResult = nullptr;
-    if (cb->errCode != RET_OK) {
-        if (cb->errCode == RET_ERR) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Other errors");
-            return;
-        }
-        NapiError codeMsg;
-        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
-            return;
-        }
-        callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
-        if (callResult == nullptr) {
-            MMI_HILOGE("callResult is nullptr");
-            napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
-            return;
-        }
-        CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
-    } else {
-        CHKRV_SCOPE(cb->env, napi_create_array(cb->env, &callResult), CREATE_ARRAY, scope);
-        uint32_t index = 0;
-        napi_value value = nullptr;
-        for (const auto &item : cb->data.ids) {
-            CHKRV_SCOPE(cb->env, napi_create_int32(cb->env, item, &value), CREATE_INT32, scope);
-            CHKRV_SCOPE(cb->env, napi_set_element(cb->env, callResult, index, value), SET_ELEMENT, scope);
-            ++index;
-        }
-        CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, callResult), RESOLVE_DEFERRED, scope);
-    }
-    napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
-}
-
-void JsEventTarget::CallDevInfoPromiseWork(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is nullptr");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
-    CHKPV(cb->env);
-    napi_handle_scope scope = nullptr;
-    napi_open_handle_scope(cb->env, &scope);
-    if (scope == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeleteCallbackInfo(std::move(cb));
-        return;
-    }
-    napi_value callResult = nullptr;
-    if (cb->errCode != RET_OK) {
-        if (cb->errCode == RET_ERR) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Other errors");
-            return;
-        }
-        NapiError codeMsg;
-        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
-            return;
-        }
-        callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
-        if (callResult == nullptr) {
-            MMI_HILOGE("callResult is nullptr");
-            napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
-            return;
-        }
-        CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
-    } else {
-        callResult = JsUtil::GetDeviceInfo(cb);
-        if (callResult == nullptr) {
-            MMI_HILOGE("Check callResult is nullptr");
-            napi_close_handle_scope(cb->env, scope);
-            return;
-        }
-        CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, callResult), RESOLVE_DEFERRED, scope);
-    }
-    napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
-}
-
-void JsEventTarget::CallDevInfoAsyncWork(uv_work_t *work, int32_t status)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(work);
-    if (work->data == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
-        return;
-    }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
-    CHKPV(cb->env);
-    napi_handle_scope scope = nullptr;
-    napi_open_handle_scope(cb->env, &scope);
-    CHKPV(scope);
-    napi_value callResult[2] = { 0 };
-    if (cb->errCode != RET_OK) {
-        if (cb->errCode == RET_ERR) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Other errors");
-            return;
-        }
-        NapiError codeMsg;
-        if (!UtilNapiError::GetApiError(cb->errCode, codeMsg)) {
-            napi_close_handle_scope(cb->env, scope);
-            MMI_HILOGE("Error code %{public}d not found", cb->errCode);
-            return;
-        }
-        callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
-        if (callResult[0] == nullptr) {
-            MMI_HILOGE("callResult[0] is nullptr");
-            napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
-            return;
-        }
-        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
-    } else {
-        callResult[1] = JsUtil::GetDeviceInfo(cb);
-        CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
-    }
-    napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
-    napi_value result = nullptr;
-    CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION,
-        scope);
-    napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
-}
-
-void JsEventTarget::AddListener(napi_env env, const std::string &type, napi_value handle)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = devListener_.find(type);
-    if (iter == devListener_.end()) {
-        MMI_HILOGE("Find %{public}s failed", type.c_str());
-        return;
-    }
-
-    for (const auto &temp : iter->second) {
-        CHKPC(temp);
-        if (temp->env != env) {
-            continue;
-        }
-        if (JsUtil::IsSameHandle(env, handle, temp->ref)) {
-            MMI_HILOGW("The handle already exists");
-            return;
-        }
-    }
-    napi_ref ref = nullptr;
-    CHKRV(env, napi_create_reference(env, handle, 1, &ref), CREATE_REFERENCE);
-    auto monitor = std::make_unique<JsUtil::CallbackInfo>();
-    CHKPV(monitor);
-    monitor->env = env;
-    monitor->ref = ref;
-    iter->second.push_back(std::move(monitor));
-    if (!isListeningProcess_) {
-        isListeningProcess_ = true;
-        InputMgr->RegisterDevListener("change", shared_from_this());
-    }
-}
-
-void JsEventTarget::RemoveListener(napi_env env, const std::string &type, napi_value handle)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = devListener_.find(type);
-    if (iter == devListener_.end()) {
-        MMI_HILOGE("Find %{public}s failed", type.c_str());
-        return;
-    }
-    if (handle == nullptr) {
-        iter->second.clear();
-        goto monitorLabel;
-    }
-    for (auto it = iter->second.begin(); it != iter->second.end(); ++it) {
-        if ((*it)->env != env) {
-            continue;
-        }
-        if (JsUtil::IsSameHandle(env, handle, (*it)->ref)) {
-            MMI_HILOGD("Succeeded in removing monitor");
-            JsUtil::DeleteCallbackInfo(std::move(*it));
-            iter->second.erase(it);
-            goto monitorLabel;
-        }
-    }
-
-monitorLabel:
-    if (isListeningProcess_ && iter->second.empty()) {
-        isListeningProcess_ = false;
-        InputMgr->UnregisterDevListener("change", shared_from_this());
-    }
-}
-
-napi_value JsEventTarget::CreateCallbackInfo(napi_env env, napi_value handle, const int32_t userData, bool isApi9)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto cb = std::make_unique<JsUtil::CallbackInfo>();
-    CHKPP(cb);
-    cb->env = env;
-    cb->isApi9 = isApi9;
-    napi_value promise = nullptr;
-    if (handle == nullptr) {
-        CHKRP(env, napi_create_promise(env, &cb->deferred, &promise), CREATE_PROMISE);
-    } else {
-        CHKRP(env, napi_create_reference(env, handle, 1, &cb->ref), CREATE_REFERENCE);
-    }
-    callback_.emplace(userData, std::move(cb));
-    return promise;
-}
-
-napi_value JsEventTarget::GreateBusinessError(napi_env env, int32_t errCode, std::string errMessage)
-{
-    CALL_DEBUG_ENTER;
-    napi_value result = nullptr;
-    napi_value resultCode = nullptr;
-    napi_value resultMessage = nullptr;
-    CHKRP(env, napi_create_int32(env, errCode, &resultCode), CREATE_INT32);
-    CHKRP(env, napi_create_string_utf8(env, errMessage.data(), NAPI_AUTO_LENGTH, &resultMessage), CREATE_STRING_UTF8);
-    CHKRP(env, napi_create_error(env, nullptr, resultMessage, &result), CREATE_ERROR);
-    CHKRP(env, napi_set_named_property(env, result, ERR_CODE.c_str(), resultCode), SET_NAMED_PROPERTY);
-    return result;
-}
-
-std::unique_ptr<JsUtil::CallbackInfo> JsEventTarget::GetCallbackInfo(uv_work_t *work)
-{
-    std::lock_guard<std::mutex> guard(mutex_);
-    int32_t *uData = static_cast<int32_t*>(work->data);
-    int32_t userData = *uData;
-    JsUtil::DeletePtr<uv_work_t*>(work);
-    JsUtil::DeletePtr<int32_t*>(uData);
-
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Find userData failed");
-        return nullptr;
-    }
-    auto cb = std::move(iter->second);
-    callback_.erase(iter);
-    return cb;
-}
-
-void JsEventTarget::RemoveCallbackInfo(napi_env env, napi_value handle, int32_t userData)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = callback_.find(userData);
-    if (iter != callback_.end()) {
-        auto cb = std::move(iter->second);
-        JsUtil::DeleteCallbackInfo(std::move(cb));
-        callback_.erase(iter);
-    }
-}
+#include "input_manager.h"
+#include "js_util.h"
 
-void JsEventTarget::ResetEnv()
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    callback_.clear();
-    devListener_.clear();
-    InputMgr->UnregisterDevListener("change", shared_from_this());
-}
+namespace OHOS {
+namespace MMI {
+class JsEventTarget : public IInputDeviceListener, public std::enable_shared_from_this<JsEventTarget> {
+public:
+    JsEventTarget();
+    virtual ~JsEventTarget() = default;
+    DISALLOW_COPY_AND_MOVE(JsEventTarget);
+    static void EmitJsIds(int32_t userData, std::vector<int32_t> &ids);
+    static void EmitJsDev(int32_t userData, std::shared_ptr<InputDevice> device);
+    static void EmitSupportKeys(int32_t userData, std::vector<bool> &keystrokeAbility);
+    static void EmitJsKeyboardType(int32_t userData, int32_t keyboardType);
+    void AddListener(napi_env env, const std::string &type, napi_value handle);
+    void RemoveListener(napi_env env, const std::string &type, napi_value handle);
+    void RemoveCallbackInfo(napi_env env, napi_value handle, int32_t userData);
+    napi_value CreateCallbackInfo(napi_env env, napi_value handle, const int32_t userData, bool isApi9 = false);
+    void ResetEnv();
+    void OnDeviceAdded(int32_t deviceId, const std::string &type) override;
+    void OnDeviceRemoved(int32_t deviceId, const std::string &type) override;
+
+private:
+    static void CallIdsPromiseWork(uv_work_t *work, int32_t status);
+    static void CallIdsAsyncWork(uv_work_t *work, int32_t status);
+    static void CallDevAsyncWork(uv_work_t *work, int32_t status);
+    static void CallDevPromiseWork(uv_work_t *work, int32_t status);
+    static void CallKeystrokeAbilityPromise(uv_work_t *work, int32_t status);
+    static void CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status);
+    static void CallKeyboardTypeAsync(uv_work_t *work, int32_t status);
+    static void CallKeyboardTypePromise(uv_work_t *work, int32_t status);
+    static void CallDevListPromiseWork(uv_work_t *work, int32_t status);
+    static void CallDevListAsyncWork(uv_work_t *work, int32_t status);
+    static void CallDevInfoAsyncWork(uv_work_t *work, int32_t status);
+    static void CallDevInfoPromiseWork(uv_work_t *work, int32_t status);
+    static void EmitAddedDeviceEvent(uv_work_t *work, int32_t status);
+    static void EmitRemoveDeviceEvent(uv_work_t *work, int32_t status);
+    static std::unique_ptr<JsUtil::CallbackInfo> GetCallbackInfo(uv_work_t *work);
+    static napi_value GreateBusinessError(napi_env env, int32_t errCode, std::string errMessage);
+private:
+    inline static std::map<int32_t, std::unique_ptr<JsUtil::CallbackInfo>> callback_ {};
+    inline static std::map<std::string, std::vector<std::unique_ptr<JsUtil::CallbackInfo>>> devListener_ {};
+    bool isListeningProcess_ { false };
+};
 } // namespace MMI
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
+
+#endif // JS_EVENT_TARGET_H
\ No newline at end of file
-- 
Gitee


From de7520bd22eac1877b1eeae08048126bf418cc15 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Mon, 7 Nov 2022 11:38:42 +0000
Subject: [PATCH 112/360] update
 frameworks/napi/input_device_cooperate/include/js_event_target.h.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 .../napi/input_device_cooperate/include/js_event_target.h       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frameworks/napi/input_device_cooperate/include/js_event_target.h b/frameworks/napi/input_device_cooperate/include/js_event_target.h
index 22ffe49254..da0b8d8ced 100755
--- a/frameworks/napi/input_device_cooperate/include/js_event_target.h
+++ b/frameworks/napi/input_device_cooperate/include/js_event_target.h
@@ -69,7 +69,7 @@ private:
     static void CallGetStateAsyncWork(uv_work_t *work, int32_t status);
     static void EmitCooperateMessageEvent(uv_work_t *work, int32_t status);
 
-    static std::unique_ptr<JsUtil::CallbackInfo> GetCallbackInfoAndFreeWork(uv_work_t *work);
+    static std::unique_ptr<JsUtil::CallbackInfo> GetCallbackInfo(uv_work_t *work);
 };
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From 52489904261a8f02bd1674080ea4e1a7a1c9dc84 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Mon, 7 Nov 2022 11:39:21 +0000
Subject: [PATCH 113/360] update
 frameworks/napi/input_device_cooperate/src/js_event_target.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 .../src/js_event_target.cpp                    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
index b4bb3b15e3..f8504eb895 100755
--- a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
@@ -349,7 +349,7 @@ void JsEventTarget::CallEnablePromsieWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -384,7 +384,7 @@ void JsEventTarget::CallEnableAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -411,7 +411,7 @@ void JsEventTarget::CallStartPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -446,7 +446,7 @@ void JsEventTarget::CallStartAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -473,7 +473,7 @@ void JsEventTarget::CallStopPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -509,7 +509,7 @@ void JsEventTarget::CallStopAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -536,7 +536,7 @@ void JsEventTarget::CallGetStatePromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -560,7 +560,7 @@ void JsEventTarget::CallGetStateAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -626,7 +626,7 @@ void JsEventTarget::EmitCooperateMessageEvent(uv_work_t *work, int32_t status)
     }
 }
 
-std::unique_ptr<JsUtil::CallbackInfo> JsEventTarget::GetCallbackInfoAndFreeWork(uv_work_t *work)
+std::unique_ptr<JsUtil::CallbackInfo> JsEventTarget::GetCallbackInfo(uv_work_t *work)
 {
     CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(mutex_);
-- 
Gitee


From aa5a952ff96ce43898d65f2e8f06c3e6b51cd07d Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Mon, 7 Nov 2022 11:47:38 +0000
Subject: [PATCH 114/360] update
 frameworks/napi/input_device/src/js_event_target.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 .../napi/input_device/src/js_event_target.cpp | 76 ++++++++++++-------
 1 file changed, 48 insertions(+), 28 deletions(-)

diff --git a/frameworks/napi/input_device/src/js_event_target.cpp b/frameworks/napi/input_device/src/js_event_target.cpp
index 5665f8c726..fdbbced2b2 100755
--- a/frameworks/napi/input_device/src/js_event_target.cpp
+++ b/frameworks/napi/input_device/src/js_event_target.cpp
@@ -203,7 +203,7 @@ void JsEventTarget::CallIdsAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
 
@@ -241,7 +241,7 @@ void JsEventTarget::CallIdsPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
 
@@ -324,7 +324,7 @@ void JsEventTarget::CallDevAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -354,7 +354,7 @@ void JsEventTarget::CallDevPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -435,7 +435,7 @@ void JsEventTarget::CallKeystrokeAbilityPromise(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
 
@@ -457,7 +457,8 @@ void JsEventTarget::CallKeystrokeAbilityPromise(uv_work_t *work, int32_t status)
         }
         callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
         if (callResult == nullptr) {
-            MMI_HILOGE("callResult is null");
+            MMI_HILOGE("callResult is nullptr");
+            napi_close_handle_scope(cb->env, scope);
             JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
@@ -483,8 +484,12 @@ void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
 {
     CALL_DEBUG_ENTER;
     CHKPV(work);
-    JsUtil::ChkAndDeletePtr<uv_work_t*>(work);
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is nullptr");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
 
@@ -506,7 +511,8 @@ void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
         }
         callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
         if (callResult[0] == nullptr) {
-            MMI_HILOGE("callResult is null");
+            MMI_HILOGE("callResult[0] is nullptr");
+            napi_close_handle_scope(cb->env, scope);
             JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
@@ -556,7 +562,7 @@ void JsEventTarget::EmitSupportKeys(int32_t userData, std::vector<bool> &keystro
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
     if (uData == nullptr) {
-        MMI_HILOGE("uData is null");
+        MMI_HILOGE("uData is nullptr");
         JsUtil::DeletePtr<uv_work_t*>(work);
         return;
     }
@@ -599,7 +605,7 @@ void JsEventTarget::EmitJsKeyboardType(int32_t userData, int32_t keyboardType)
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
     if (uData == nullptr) {
-        MMI_HILOGE("uData is null");
+        MMI_HILOGE("uData is nullptr");
         JsUtil::DeletePtr<uv_work_t*>(work);
         return;
     }
@@ -624,10 +630,10 @@ void JsEventTarget::CallKeyboardTypeAsync(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
 
@@ -650,7 +656,8 @@ void JsEventTarget::CallKeyboardTypeAsync(uv_work_t *work, int32_t status)
         }
         callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
         if (callResult[0] == nullptr) {
-            MMI_HILOGE("callResult is null");
+            MMI_HILOGE("callResult[0] is nullptr");
+            napi_close_handle_scope(cb->env, scope);
             JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
@@ -677,7 +684,7 @@ void JsEventTarget::CallKeyboardTypePromise(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
 
@@ -700,7 +707,8 @@ void JsEventTarget::CallKeyboardTypePromise(uv_work_t *work, int32_t status)
         }
         callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
         if (callResult == nullptr) {
-            MMI_HILOGE("callResult is null");
+            MMI_HILOGE("callResult is nullptr");
+            napi_close_handle_scope(cb->env, scope);
             JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
@@ -717,8 +725,12 @@ void JsEventTarget::CallDevListAsyncWork(uv_work_t *work, int32_t status)
 {
     CALL_DEBUG_ENTER;
     CHKPV(work);
-    JsUtil::ChkAndDeletePtr<uv_work_t*>(work);
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is nullptr");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -740,7 +752,8 @@ void JsEventTarget::CallDevListAsyncWork(uv_work_t *work, int32_t status)
         }
         callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
         if (callResult[0] == nullptr) {
-            MMI_HILOGE("callResult is null");
+            MMI_HILOGE("callResult[0] is nullptr");
+            napi_close_handle_scope(cb->env, scope);
             JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
@@ -773,7 +786,7 @@ void JsEventTarget::CallDevListPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -794,7 +807,8 @@ void JsEventTarget::CallDevListPromiseWork(uv_work_t *work, int32_t status)
         }
         callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
         if (callResult == nullptr) {
-            MMI_HILOGE("callResult is null");
+            MMI_HILOGE("callResult is nullptr");
+            napi_close_handle_scope(cb->env, scope);
             JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
@@ -818,8 +832,12 @@ void JsEventTarget::CallDevInfoPromiseWork(uv_work_t *work, int32_t status)
 {
     CALL_DEBUG_ENTER;
     CHKPV(work);
-    JsUtil::ChkAndDeletePtr<uv_work_t*>(work);
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    if (work->data == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is nullptr");
+        return;
+    }
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -844,7 +862,8 @@ void JsEventTarget::CallDevInfoPromiseWork(uv_work_t *work, int32_t status)
         }
         callResult = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
         if (callResult == nullptr) {
-            MMI_HILOGE("callResult is null");
+            MMI_HILOGE("callResult is nullptr");
+            napi_close_handle_scope(cb->env, scope);
             JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
@@ -852,7 +871,7 @@ void JsEventTarget::CallDevInfoPromiseWork(uv_work_t *work, int32_t status)
     } else {
         callResult = JsUtil::GetDeviceInfo(cb);
         if (callResult == nullptr) {
-            MMI_HILOGE("Check callResult is null");
+            MMI_HILOGE("Check callResult is nullptr");
             napi_close_handle_scope(cb->env, scope);
             return;
         }
@@ -871,7 +890,7 @@ void JsEventTarget::CallDevInfoAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is null");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfoAndFreeWork(work);
+    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
     CHKPV(cb);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
@@ -892,7 +911,8 @@ void JsEventTarget::CallDevInfoAsyncWork(uv_work_t *work, int32_t status)
         }
         callResult[0] = GreateBusinessError(cb->env, cb->errCode, codeMsg.msg);
         if (callResult[0] == nullptr) {
-            MMI_HILOGE("callResult is null");
+            MMI_HILOGE("callResult[0] is nullptr");
+            napi_close_handle_scope(cb->env, scope);
             JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
@@ -1006,7 +1026,7 @@ napi_value JsEventTarget::GreateBusinessError(napi_env env, int32_t errCode, std
     return result;
 }
 
-std::unique_ptr<JsUtil::CallbackInfo> JsEventTarget::GetCallbackInfoAndFreeWork(uv_work_t *work)
+std::unique_ptr<JsUtil::CallbackInfo> JsEventTarget::GetCallbackInfo(uv_work_t *work)
 {
     std::lock_guard<std::mutex> guard(mutex_);
     int32_t *uData = static_cast<int32_t*>(work->data);
-- 
Gitee


From 95439b2fa16afc52278e9f0a7dcfa6df45cd9a66 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Mon, 7 Nov 2022 12:32:44 +0000
Subject: [PATCH 115/360] update
 frameworks/napi/input_device/src/js_event_target.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 frameworks/napi/input_device/src/js_event_target.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frameworks/napi/input_device/src/js_event_target.cpp b/frameworks/napi/input_device/src/js_event_target.cpp
index fdbbced2b2..a4364fc1a3 100755
--- a/frameworks/napi/input_device/src/js_event_target.cpp
+++ b/frameworks/napi/input_device/src/js_event_target.cpp
@@ -843,8 +843,7 @@ void JsEventTarget::CallDevInfoPromiseWork(uv_work_t *work, int32_t status)
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
     if (scope == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeleteCallbackInfo(std::move(cb));
+        MMI_HILOGE("scope is nullptr");
         return;
     }
     napi_value callResult = nullptr;
-- 
Gitee


From b956899e979110d855fe490210a37feff3195a30 Mon Sep 17 00:00:00 2001
From: hhh2 <pengfei.hou@huawei.com>
Date: Mon, 7 Nov 2022 20:40:00 +0800
Subject: [PATCH 116/360] add device-capability updating logic for tablet tool

Signed-off-by: hhh2 <pengfei.hou@huawei.com>
Change-Id: If85683d3e03b826e15275b1debb4b24f0be64dc6
---
 multimodalinput.cfg                           |   2 +-
 .../libinput/libinput_0000.diff               | 140 +++++++++++-------
 2 files changed, 84 insertions(+), 58 deletions(-)

diff --git a/multimodalinput.cfg b/multimodalinput.cfg
index 4355408f38..75181d7c16 100644
--- a/multimodalinput.cfg
+++ b/multimodalinput.cfg
@@ -10,7 +10,7 @@
             "cmds" : [
                 "start udevd_service",
                 "start mmi_uinput_service",
-                "exec /system/bin/udevadm trigger",
+                "exec /system/bin/udevadm trigger -s input",
                 "start multimodalinput"
             ]
         },{
diff --git a/patch/diff_libinput_mmi/libinput/libinput_0000.diff b/patch/diff_libinput_mmi/libinput/libinput_0000.diff
index 02c9e2c788..b4cf3fd86d 100644
--- a/patch/diff_libinput_mmi/libinput/libinput_0000.diff
+++ b/patch/diff_libinput_mmi/libinput/libinput_0000.diff
@@ -12,8 +12,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 diff -Naur old/BUILD.gn new/BUILD.gn
---- old/BUILD.gn	2022-10-17 15:22:59.435710212 +0800
-+++ new/BUILD.gn	2022-10-17 17:29:22.211403639 +0800
+--- old/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
++++ new/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
 @@ -21,9 +21,16 @@
  config("libinput-third_public_config") {
    include_dirs = [
@@ -77,8 +77,8 @@ diff -Naur old/BUILD.gn new/BUILD.gn
  }
 \ No newline at end of file
 diff -Naur old/export_include/libinput.h new/export_include/libinput.h
---- old/export_include/libinput.h	2022-10-17 15:22:59.443710306 +0800
-+++ new/export_include/libinput.h	2022-10-17 17:29:08.379240969 +0800
+--- old/export_include/libinput.h	2021-01-01 00:00:00.000000000 +0800
++++ new/export_include/libinput.h	2021-01-01 00:00:00.000000000 +0800
 @@ -196,6 +196,22 @@
  	LIBINPUT_DEVICE_CAP_TABLET_PAD = 4,
  	LIBINPUT_DEVICE_CAP_GESTURE = 5,
@@ -842,7 +842,7 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
 +
 diff -Naur old/hm_src/hm_missing.c new/hm_src/hm_missing.c
 --- old/hm_src/hm_missing.c	1970-01-01 08:00:00.000000000 +0800
-+++ new/hm_src/hm_missing.c	2022-10-17 17:29:08.087237536 +0800
++++ new/hm_src/hm_missing.c	2021-01-01 00:00:00.000000000 +0800
 @@ -0,0 +1,22 @@
 +/*
 + * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
@@ -869,7 +869,7 @@ diff -Naur old/hm_src/hm_missing.c new/hm_src/hm_missing.c
 \ No newline at end of file
 diff -Naur old/hm_src/hm_missing.h new/hm_src/hm_missing.h
 --- old/hm_src/hm_missing.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/hm_src/hm_missing.h	2022-10-17 17:29:07.971236172 +0800
++++ new/hm_src/hm_missing.h	2021-01-01 00:00:00.000000000 +0800
 @@ -0,0 +1,25 @@
 +/*
 + * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
@@ -897,8 +897,8 @@ diff -Naur old/hm_src/hm_missing.h new/hm_src/hm_missing.h
 +
 +#endif
 diff -Naur old/include/config.h new/include/config.h
---- old/include/config.h	2022-10-17 15:22:59.443710306 +0800
-+++ new/include/config.h	2022-10-17 17:29:07.855234807 +0800
+--- old/include/config.h	2021-01-01 00:00:00.000000000 +0800
++++ new/include/config.h	2021-01-01 00:00:00.000000000 +0800
 @@ -18,14 +18,17 @@
  #endif
  #define HTTP_DOC_LINK "https://wayland.freedesktop.org/libinput/doc/latest"
@@ -934,7 +934,7 @@ diff -Naur old/include/config.h new/include/config.h
 +
 +
 diff -Naur old/include/linux/linux/input-event-codes.h new/include/linux/linux/input-event-codes.h
---- old/include/linux/linux/input-event-codes.h	2022-10-17 15:22:59.443710306 +0800
+--- old/include/linux/linux/input-event-codes.h	2021-01-01 00:00:00.000000000 +0800
 +++ new/include/linux/linux/input-event-codes.h	1970-01-01 08:00:00.000000000 +0800
 @@ -1,945 +0,0 @@
 -/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
@@ -1883,8 +1883,8 @@ diff -Naur old/include/linux/linux/input-event-codes.h new/include/linux/linux/i
 -
 -#endif
 diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
---- old/src/evdev-fallback.c	2022-10-17 15:22:59.447710353 +0800
-+++ new/src/evdev-fallback.c	2022-10-17 17:29:01.959165469 +0800
+--- old/src/evdev-fallback.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-fallback.c	2021-01-01 00:00:00.000000000 +0800
 @@ -284,8 +284,11 @@
  	struct libinput_device *base = &device->base;
  	struct libinput_seat *seat = base->seat;
@@ -2106,8 +2106,8 @@ diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
 +	return hw_is_key_down(dispatch, btnToolType);
 +}
 diff -Naur old/src/evdev-fallback.h new/src/evdev-fallback.h
---- old/src/evdev-fallback.h	2022-10-17 15:22:59.447710353 +0800
-+++ new/src/evdev-fallback.h	2022-10-17 17:29:01.799163587 +0800
+--- old/src/evdev-fallback.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-fallback.h	2021-01-01 00:00:00.000000000 +0800
 @@ -66,6 +66,10 @@
  	struct device_coords point;
  	struct device_coords hysteresis_center;
@@ -2146,7 +2146,7 @@ diff -Naur old/src/evdev-fallback.h new/src/evdev-fallback.h
  
 diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
 --- old/src/evdev-joystick.c	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/evdev-joystick.c	2022-10-17 17:29:01.675162129 +0800
++++ new/src/evdev-joystick.c	2021-01-01 00:00:00.000000000 +0800
 @@ -0,0 +1,593 @@
 +/*
 + * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
@@ -2743,7 +2743,7 @@ diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
 +
 diff -Naur old/src/evdev-joystick.h new/src/evdev-joystick.h
 --- old/src/evdev-joystick.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/evdev-joystick.h	2022-10-17 17:29:01.539160530 +0800
++++ new/src/evdev-joystick.h	2021-01-01 00:00:00.000000000 +0800
 @@ -0,0 +1,71 @@
 +/*
 + * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
@@ -2817,8 +2817,8 @@ diff -Naur old/src/evdev-joystick.h new/src/evdev-joystick.h
 +
 +#endif
 diff -Naur old/src/evdev-mt-touchpad-gestures.c new/src/evdev-mt-touchpad-gestures.c
---- old/src/evdev-mt-touchpad-gestures.c	2022-10-17 15:22:59.447710353 +0800
-+++ new/src/evdev-mt-touchpad-gestures.c	2022-10-17 17:29:01.031154555 +0800
+--- old/src/evdev-mt-touchpad-gestures.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-mt-touchpad-gestures.c	2021-01-01 00:00:00.000000000 +0800
 @@ -80,6 +80,37 @@
  }
  
@@ -2889,8 +2889,8 @@ diff -Naur old/src/evdev-mt-touchpad-gestures.c new/src/evdev-mt-touchpad-gestur
  
  	return GESTURE_STATE_SWIPE;
 diff -Naur old/src/evdev-mt-touchpad-tap.c new/src/evdev-mt-touchpad-tap.c
---- old/src/evdev-mt-touchpad-tap.c	2022-10-17 15:22:59.447710353 +0800
-+++ new/src/evdev-mt-touchpad-tap.c	2022-10-17 17:29:00.891152908 +0800
+--- old/src/evdev-mt-touchpad-tap.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-mt-touchpad-tap.c	2021-01-01 00:00:00.000000000 +0800
 @@ -72,6 +72,7 @@
  	CASE_RETURN_STRING(TAP_STATE_DRAGGING_OR_TAP);
  	CASE_RETURN_STRING(TAP_STATE_DRAGGING_2);
@@ -3059,8 +3059,8 @@ diff -Naur old/src/evdev-mt-touchpad-tap.c new/src/evdev-mt-touchpad-tap.c
 +}
 \ No newline at end of file
 diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
---- old/src/evdev-mt-touchpad.c	2022-10-17 15:22:59.447710353 +0800
-+++ new/src/evdev-mt-touchpad.c	2022-10-17 17:29:00.623149756 +0800
+--- old/src/evdev-mt-touchpad.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-mt-touchpad.c	2021-01-01 00:00:00.000000000 +0800
 @@ -308,6 +308,35 @@
  }
  
@@ -3350,8 +3350,8 @@ diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
 +}
 \ No newline at end of file
 diff -Naur old/src/evdev-mt-touchpad.h new/src/evdev-mt-touchpad.h
---- old/src/evdev-mt-touchpad.h	2022-10-17 15:22:59.447710353 +0800
-+++ new/src/evdev-mt-touchpad.h	2022-10-17 17:29:00.431147499 +0800
+--- old/src/evdev-mt-touchpad.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-mt-touchpad.h	2021-01-01 00:00:00.000000000 +0800
 @@ -118,6 +118,7 @@
  	TAP_STATE_DRAGGING_WAIT,
  	TAP_STATE_DRAGGING_2,
@@ -3427,8 +3427,8 @@ diff -Naur old/src/evdev-mt-touchpad.h new/src/evdev-mt-touchpad.h
 +
  #endif
 diff -Naur old/src/evdev-tablet.c new/src/evdev-tablet.c
---- old/src/evdev-tablet.c	2022-10-17 15:22:59.447710353 +0800
-+++ new/src/evdev-tablet.c	2022-10-17 17:28:59.923141525 +0800
+--- old/src/evdev-tablet.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-tablet.c	2021-01-01 00:00:00.000000000 +0800
 @@ -219,6 +219,7 @@
  	case ABS_TILT_Y:
  	case ABS_DISTANCE:
@@ -3453,6 +3453,20 @@ diff -Naur old/src/evdev-tablet.c new/src/evdev-tablet.c
  		};
  
  		tool_set_pressure_thresholds(tablet, tool);
+@@ -2117,11 +2118,11 @@
+ {
+ 	struct tablet_dispatch *tablet = tablet_dispatch(device->dispatch);
+ 	bool is_touchscreen, is_ext_touchpad;
+-
++/*
+ 	if (libinput_device_get_device_group(&device->base) !=
+ 	    libinput_device_get_device_group(&added_device->base))
+ 		return;
+-
++*/
+ 	is_touchscreen = evdev_device_has_capability(added_device,
+ 						     LIBINPUT_DEVICE_CAP_TOUCH);
+ 	is_ext_touchpad = evdev_device_has_capability(added_device,
 @@ -2368,6 +2369,34 @@
  	return true;
  }
@@ -3497,8 +3511,8 @@ diff -Naur old/src/evdev-tablet.c new/src/evdev-tablet.c
  	if (tablet_reject_device(device))
  		return -1;
 diff -Naur old/src/evdev-tablet.h new/src/evdev-tablet.h
---- old/src/evdev-tablet.h	2022-10-17 15:22:59.447710353 +0800
-+++ new/src/evdev-tablet.h	2022-10-17 17:28:59.739139361 +0800
+--- old/src/evdev-tablet.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-tablet.h	2021-01-01 00:00:00.000000000 +0800
 @@ -151,6 +151,9 @@
  	case ABS_WHEEL:
  		axis = LIBINPUT_TABLET_TOOL_AXIS_SLIDER;
@@ -3520,8 +3534,8 @@ diff -Naur old/src/evdev-tablet.h new/src/evdev-tablet.h
  		evcode = ABS_MT_TOUCH_MINOR;
  		break;
 diff -Naur old/src/evdev.c new/src/evdev.c
---- old/src/evdev.c	2022-10-17 15:22:59.451710400 +0800
-+++ new/src/evdev.c	2022-10-17 17:28:59.503136585 +0800
+--- old/src/evdev.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev.c	2021-01-01 00:00:00.000000000 +0800
 @@ -54,25 +54,7 @@
  #define DEFAULT_BUTTON_SCROLL_TIMEOUT ms2us(200)
  #define MAX_RETRY_OPEN_DEVICE_COUNT 10
@@ -3720,7 +3734,7 @@ diff -Naur old/src/evdev.c new/src/evdev.c
  	default:
  		return false;
  	}
-@@ -2917,3 +2969,45 @@
+@@ -2917,3 +2969,57 @@
  #endif
  	return has_left_handed;
  }
@@ -3750,10 +3764,20 @@ diff -Naur old/src/evdev.c new/src/evdev.c
 +			!libevdev_has_event_type(evdev, EV_REL));
 +}
 +
++static inline bool
++is_tablet_tool(const struct libevdev *evdev)
++{
++	return (libevdev_has_event_type(evdev, EV_KEY) &&
++			(libevdev_has_event_code(evdev, EV_KEY, BTN_TOOL_PEN) ||
++			 libevdev_has_event_code(evdev, EV_KEY, BTN_STYLUS)) &&
++			libevdev_has_event_type(evdev, EV_ABS) &&
++			libevdev_has_event_code(evdev, EV_ABS, ABS_X) &&
++			libevdev_has_event_code(evdev, EV_ABS, ABS_Y));
++}
++
 +static enum evdev_device_udev_tags
 +update_device_capability(struct evdev_device *device)
 +{
-+    evdev_log_info(device, "update_device_capability() enter\n");
 +	if (is_touchscreen(device->evdev)) {
 +        return (EVDEV_UDEV_TAG_INPUT | EVDEV_UDEV_TAG_TOUCHSCREEN);
 +	}
@@ -3763,12 +3787,14 @@ diff -Naur old/src/evdev.c new/src/evdev.c
 +	if (is_keyboard(device->evdev)) {
 +		return (EVDEV_UDEV_TAG_INPUT | EVDEV_UDEV_TAG_KEYBOARD);
 +	}
-+	evdev_log_info(device, "update_device_capability() leave\n");
++	if (is_tablet_tool(device->evdev)) {
++		return (EVDEV_UDEV_TAG_INPUT | EVDEV_UDEV_TAG_TABLET);
++	}
 +    return 0;
 +}
 diff -Naur old/src/evdev.h new/src/evdev.h
---- old/src/evdev.h	2022-10-17 15:22:59.451710400 +0800
-+++ new/src/evdev.h	2022-10-17 17:28:59.319134421 +0800
+--- old/src/evdev.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev.h	2021-01-01 00:00:00.000000000 +0800
 @@ -61,6 +61,7 @@
  	EVDEV_DEVICE_TABLET_PAD		= bit(4),
  	EVDEV_DEVICE_GESTURE		= bit(5),
@@ -3919,14 +3945,14 @@ diff -Naur old/src/evdev.h new/src/evdev.h
  
 diff -Naur old/src/libinput-git-version.h new/src/libinput-git-version.h
 --- old/src/libinput-git-version.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-git-version.h	2022-10-17 17:28:57.835116969 +0800
++++ new/src/libinput-git-version.h	2021-01-01 00:00:00.000000000 +0800
 @@ -0,0 +1,3 @@
 +#pragma once
 +
 +#define LIBINPUT_GIT_VERSION "@VCS_TAG@"
 diff -Naur old/src/libinput-private.h new/src/libinput-private.h
---- old/src/libinput-private.h	2022-10-17 15:22:59.451710400 +0800
-+++ new/src/libinput-private.h	2022-10-17 17:28:57.583114005 +0800
+--- old/src/libinput-private.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/libinput-private.h	2021-01-01 00:00:00.000000000 +0800
 @@ -48,6 +48,12 @@
  	int x, y;
  };
@@ -4072,7 +4098,7 @@ diff -Naur old/src/libinput-private.h new/src/libinput-private.h
  {
 diff -Naur old/src/libinput-util.c new/src/libinput-util.c
 --- old/src/libinput-util.c	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-util.c	2022-10-17 17:28:57.207109584 +0800
++++ new/src/libinput-util.c	2021-01-01 00:00:00.000000000 +0800
 @@ -0,0 +1,102 @@
 +/*
 + * Copyright © 2008-2011 Kristian Høgsberg
@@ -4177,8 +4203,8 @@ diff -Naur old/src/libinput-util.c new/src/libinput-util.c
 +}
 +#endif
 diff -Naur old/src/libinput-util.h new/src/libinput-util.h
---- old/src/libinput-util.h	2022-10-17 15:22:59.451710400 +0800
-+++ new/src/libinput-util.h	2022-10-17 17:28:57.075108031 +0800
+--- old/src/libinput-util.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/libinput-util.h	2021-01-01 00:00:00.000000000 +0800
 @@ -27,10 +27,9 @@
  
  #include "config.h"
@@ -4211,7 +4237,7 @@ diff -Naur old/src/libinput-util.h new/src/libinput-util.h
  	printf("%s() - \033[0;31m", __func__); \
 diff -Naur old/src/libinput-version.h new/src/libinput-version.h
 --- old/src/libinput-version.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-version.h	2022-10-17 17:28:56.935106384 +0800
++++ new/src/libinput-version.h	2021-01-01 00:00:00.000000000 +0800
 @@ -0,0 +1,32 @@
 +/*
 + * Copyright © 2013 Jonas Ådahl
@@ -4246,8 +4272,8 @@ diff -Naur old/src/libinput-version.h new/src/libinput-version.h
 +
 +#endif
 diff -Naur old/src/libinput.c new/src/libinput.c
---- old/src/libinput.c	2022-10-17 15:22:59.451710400 +0800
-+++ new/src/libinput.c	2022-10-17 17:28:56.547101822 +0800
+--- old/src/libinput.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/libinput.c	2021-01-01 00:00:00.000000000 +0800
 @@ -39,6 +39,7 @@
  #include "evdev.h"
  #include "timer.h"
@@ -5561,8 +5587,8 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +}
 +
 diff -Naur old/src/libinput.h new/src/libinput.h
---- old/src/libinput.h	2022-10-17 15:22:59.451710400 +0800
-+++ new/src/libinput.h	2022-10-17 17:28:56.247098294 +0800
+--- old/src/libinput.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/libinput.h	2021-01-01 00:00:00.000000000 +0800
 @@ -196,6 +196,22 @@
  	LIBINPUT_DEVICE_CAP_TABLET_PAD = 4,
  	LIBINPUT_DEVICE_CAP_GESTURE = 5,
@@ -6325,8 +6351,8 @@ diff -Naur old/src/libinput.h new/src/libinput.h
  #endif /* LIBINPUT_H */
 +
 diff -Naur old/src/udev-seat.c new/src/udev-seat.c
---- old/src/udev-seat.c	2022-10-17 15:22:59.451710400 +0800
-+++ new/src/udev-seat.c	2022-10-17 17:28:55.039084087 +0800
+--- old/src/udev-seat.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/udev-seat.c	2021-01-01 00:00:00.000000000 +0800
 @@ -189,6 +189,7 @@
  
  		/* Skip unconfigured device. udev will send an event
@@ -6350,8 +6376,8 @@ diff -Naur old/src/udev-seat.c new/src/udev-seat.c
  		if (device_added(device, input, NULL) < 0) {
  			udev_device_unref(device);
 diff -Naur old/src/util-strings.h new/src/util-strings.h
---- old/src/util-strings.h	2022-10-17 15:22:59.451710400 +0800
-+++ new/src/util-strings.h	2022-10-17 17:28:53.399064800 +0800
+--- old/src/util-strings.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/util-strings.h	2021-01-01 00:00:00.000000000 +0800
 @@ -281,7 +281,7 @@
  	if (npairs == 0)
  		goto error;
@@ -6362,8 +6388,8 @@ diff -Naur old/src/util-strings.h new/src/util-strings.h
  	for (pair = pairs; *pair; pair++) {
  		char **kv = strv_from_string(*pair, kv_separator);
 diff -Naur old/src/util-time.h new/src/util-time.h
---- old/src/util-time.h	2022-10-17 15:22:59.451710400 +0800
-+++ new/src/util-time.h	2022-10-17 17:28:53.255063107 +0800
+--- old/src/util-time.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/util-time.h	2021-01-01 00:00:00.000000000 +0800
 @@ -97,7 +97,8 @@
  static inline struct human_time
  to_human_time(uint64_t us)
@@ -6393,8 +6419,8 @@ diff -Naur old/src/util-time.h new/src/util-time.h
 +	//assert(1);
  }
 diff -Naur old/tools/libinput-debug-events.c new/tools/libinput-debug-events.c
---- old/tools/libinput-debug-events.c	2022-10-17 15:22:59.459710493 +0800
-+++ new/tools/libinput-debug-events.c	2022-10-17 17:28:35.914859184 +0800
+--- old/tools/libinput-debug-events.c	2021-01-01 00:00:00.000000000 +0800
++++ new/tools/libinput-debug-events.c	2021-01-01 00:00:00.000000000 +0800
 @@ -101,6 +101,15 @@
  	case LIBINPUT_EVENT_TOUCH_FRAME:
  		type = "TOUCH_FRAME";
@@ -6495,8 +6521,8 @@ diff -Naur old/tools/libinput-debug-events.c new/tools/libinput-debug-events.c
  
  		libinput_event_destroy(ev);
 diff -Naur old/tools/libinput-record.c new/tools/libinput-record.c
---- old/tools/libinput-record.c	2022-10-17 15:22:59.459710493 +0800
-+++ new/tools/libinput-record.c	2022-10-17 17:28:32.954824372 +0800
+--- old/tools/libinput-record.c	2021-01-01 00:00:00.000000000 +0800
++++ new/tools/libinput-record.c	2021-01-01 00:00:00.000000000 +0800
 @@ -50,6 +50,7 @@
  #include "util-time.h"
  #include "util-input-event.h"
@@ -6506,8 +6532,8 @@ diff -Naur old/tools/libinput-record.c new/tools/libinput-record.c
  static const int FILE_VERSION_NUMBER = 1;
  
 diff -Naur old/udev/libinput-device-group.c new/udev/libinput-device-group.c
---- old/udev/libinput-device-group.c	2022-10-17 15:22:59.463710540 +0800
-+++ new/udev/libinput-device-group.c	2022-10-17 17:28:31.338805368 +0800
+--- old/udev/libinput-device-group.c	2021-01-01 00:00:00.000000000 +0800
++++ new/udev/libinput-device-group.c	2021-01-01 00:00:00.000000000 +0800
 @@ -138,7 +138,7 @@
  				*product_id = pid;
  				best_dist = dist;
-- 
Gitee


From 56f1460111a2ce677fc23f4e78e9410e7c0d51c0 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Mon, 7 Nov 2022 22:06:33 +0800
Subject: [PATCH 117/360] Signed-off-by:wuliangdong<wuliangdong1@huawei.com>

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
Change-Id: I5b851492d59aa3ff899c8f7bd0921a064a4b7aa5
---
 service/event_dump/src/event_dump.cpp         |  8 +++++++-
 test/unittest/common/src/system_info.cpp      | 18 +++++++++++-------
 tools/vuinput/src/mmi_virtual_device_main.cpp | 10 +++-------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/service/event_dump/src/event_dump.cpp b/service/event_dump/src/event_dump.cpp
index af6c8e5bbf..b6fb50e3c9 100644
--- a/service/event_dump/src/event_dump.cpp
+++ b/service/event_dump/src/event_dump.cpp
@@ -92,6 +92,10 @@ void EventDump::ParseCommand(int32_t fd, const std::vector<std::string> &args)
 #endif // OHOS_BUILD_ENABLE_COOPERATE
         {NULL, 0, 0, 0}
     };
+    if (args.empty()) {
+        MMI_HILOGE("size of args can't be zero");
+        return;
+    }
     char **argv = new (std::nothrow) char *[args.size()];
     CHKPV(argv);
     if (memset_s(argv, args.size() * sizeof(char*), 0, args.size() * sizeof(char*)) != EOK) {
@@ -191,7 +195,9 @@ void EventDump::ParseCommand(int32_t fd, const std::vector<std::string> &args)
     }
     RELEASE_RES:
     for (size_t i = 0; i < args.size(); ++i) {
-        delete[] argv[i];
+        if (argv[i] != nullptr) {
+            delete[] argv[i];
+        }
     }
     delete[] argv;
 }
diff --git a/test/unittest/common/src/system_info.cpp b/test/unittest/common/src/system_info.cpp
index 18b35dc8a2..244aaf531f 100644
--- a/test/unittest/common/src/system_info.cpp
+++ b/test/unittest/common/src/system_info.cpp
@@ -60,21 +60,25 @@ int32_t CpuInfo::GetTaskPidFile(const std::string &process_name)
             continue;
         }
         const std::string path = procPath + "/" + pidFile->d_name + "/status";
-        std::ifstream filePath(path);
-        if (!filePath.is_open()) {
+        std::ifstream file(path);
+        if (!file.is_open()) {
             continue;
         }
         std::string strLine;
-        std::getline(filePath, strLine);
+        if (!std::getline(file, strLine)) {
+            MMI_HILOGE("getline failed");
+            file.close();
+            return DEFAULT_PID;
+        }
         if (strLine.empty()) {
-            filePath.close();
+            file.close();
             continue;
         }
         if ((strLine.find(process_name)) == std::string::npos) {
-            filePath.close();
+            file.close();
             continue;
         }
-        while (std::getline(filePath, strLine)) {
+        while (std::getline(file, strLine)) {
             if ((strLine.find("Pid")) != std::string::npos) {
                 if (::sscanf_s(strLine.c_str(), "%*s%d", &pid, sizeof(pid)) != 1) {
                     MMI_HILOGE("Failed to cut out the pid");
@@ -82,7 +86,7 @@ int32_t CpuInfo::GetTaskPidFile(const std::string &process_name)
                 break;
             }
         }
-        filePath.close();
+        file.close();
         break;
     }
     ::closedir(dir);
diff --git a/tools/vuinput/src/mmi_virtual_device_main.cpp b/tools/vuinput/src/mmi_virtual_device_main.cpp
index 73a2d37673..e11a0fff02 100644
--- a/tools/vuinput/src/mmi_virtual_device_main.cpp
+++ b/tools/vuinput/src/mmi_virtual_device_main.cpp
@@ -21,14 +21,10 @@ int32_t main(int32_t argc, const char *argv[])
         std::cout << "Invalid Input Para, Please Check the validity of the para" << std::endl;
         return 0;
     }
-    DIR* dir = opendir(OHOS::MMI::g_folderPath.c_str());
-    if (dir == nullptr) {
+    if (access(OHOS::MMI::g_folderPath.c_str(), F_OK) != 0) {
+        MMI_HILOGW("Directory %{public}s did not exist, errno: %{public}d", g_folderPath.c_str(), errno);
         mkdir(OHOS::MMI::g_folderPath.c_str(), SYMBOL_FOLDER_PERMISSIONS);
-    } else {
-        if (closedir(dir) != 0) {
-            std::cout << "Close dir:" << OHOS::MMI::g_folderPath << "failed" << std::endl;
-        }
-    }
+    } 
     std::vector<std::string> argvList;
     for (uint16_t i = 0; i < argc; i++) {
         argvList.push_back(argv[i]);
-- 
Gitee


From ad68d1da6068249a847351e4491b7a7647bb1c16 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Mon, 7 Nov 2022 14:48:27 +0000
Subject: [PATCH 118/360] update tools/vuinput/src/mmi_virtual_device_main.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 tools/vuinput/src/mmi_virtual_device_main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/vuinput/src/mmi_virtual_device_main.cpp b/tools/vuinput/src/mmi_virtual_device_main.cpp
index e11a0fff02..836307fca6 100644
--- a/tools/vuinput/src/mmi_virtual_device_main.cpp
+++ b/tools/vuinput/src/mmi_virtual_device_main.cpp
@@ -24,7 +24,7 @@ int32_t main(int32_t argc, const char *argv[])
     if (access(OHOS::MMI::g_folderPath.c_str(), F_OK) != 0) {
         MMI_HILOGW("Directory %{public}s did not exist, errno: %{public}d", g_folderPath.c_str(), errno);
         mkdir(OHOS::MMI::g_folderPath.c_str(), SYMBOL_FOLDER_PERMISSIONS);
-    } 
+    }
     std::vector<std::string> argvList;
     for (uint16_t i = 0; i < argc; i++) {
         argvList.push_back(argv[i]);
-- 
Gitee


From e8cc84b85e4946d28f7af9f17ecb37e0409a9e4d Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Tue, 8 Nov 2022 00:51:59 +0000
Subject: [PATCH 119/360] delete extra space

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 service/module_loader/src/mmi_service.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 94edf607bc..26d5642d10 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -259,7 +259,7 @@ int32_t MMIService::Init()
         return EPOLL_CREATE_FAIL;
     }
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-    /* 
+    /*
      * PostAsyncTask is used here to prevent InputDeviceCooperateSM:: StartRemoteCooperate() and
      * CheckPointerEvent() from holding locks, resulting in deadlocks
      */
-- 
Gitee


From 1d0683facde32e28c221fb7142d35339e44729ca Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Wed, 9 Nov 2022 01:45:27 +0000
Subject: [PATCH 120/360] Code optimization

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
Change-Id: I5e1ff99f1aaecf8fc1b01119eec9a3a8a2e58ec2
---
 frameworks/proxy/events/src/input_event.cpp   |  20 ---
 frameworks/proxy/events/src/key_event.cpp     |   2 -
 .../libinput_adapter/src/libinput_adapter.cpp |   3 +-
 service/module_loader/src/uds_server.cpp      |   2 +-
 tools/event_inject/src/device_base.cpp        |   8 +-
 tools/event_inject/src/get_device_node.cpp    |   8 +-
 tools/event_inject/src/get_device_object.cpp  |   6 +-
 .../src/injection_tools_help_func.cpp         |   7 +-
 .../event_inject/src/manage_inject_device.cpp |   8 +-
 .../src/processing_finger_device.cpp          |   6 +-
 .../src/processing_game_pad_device.cpp        |   6 +-
 .../src/processing_joystick_device.cpp        |   6 +-
 .../src/processing_keyboard_device.cpp        |   8 +-
 .../src/processing_mouse_device.cpp           |   6 +-
 .../src/processing_pad_device.cpp             |   6 +-
 .../src/processing_pen_device.cpp             |   8 +-
 .../src/processing_touch_screen_device.cpp    |   8 +-
 util/BUILD.gn                                 |   1 -
 util/common/include/util.h                    |   4 +-
 util/common/include/uuid.h                    | 103 --------------
 util/common/src/util.cpp                      |  10 +-
 util/common/src/uuid.cpp                      | 134 ------------------
 22 files changed, 64 insertions(+), 306 deletions(-)
 delete mode 100644 util/common/include/uuid.h
 delete mode 100644 util/common/src/uuid.cpp

diff --git a/frameworks/proxy/events/src/input_event.cpp b/frameworks/proxy/events/src/input_event.cpp
index 8f9ea6cb80..a2c77033a9 100644
--- a/frameworks/proxy/events/src/input_event.cpp
+++ b/frameworks/proxy/events/src/input_event.cpp
@@ -218,50 +218,30 @@ void InputEvent::MarkProcessed()
 bool InputEvent::WriteToParcel(Parcel &out) const
 {
     WRITEINT32(out, eventType_);
-
     WRITEINT32(out, id_);
-
     WRITEINT64(out, actionTime_);
-
     WRITEINT32(out, action_);
-
     WRITEINT64(out, actionStartTime_);
-
     WRITEINT32(out, deviceId_);
-
     WRITEINT32(out, targetDisplayId_);
-
     WRITEINT32(out, targetWindowId_);
-
     WRITEINT32(out, agentWindowId_);
-
     WRITEUINT32(out, bitwise_);
-
     return true;
 }
 
 bool InputEvent::ReadFromParcel(Parcel &in)
 {
     READINT32(in, eventType_);
-
     READINT32(in, id_);
-
     READINT64(in, actionTime_);
-
     READINT32(in, action_);
-
     READINT64(in, actionStartTime_);
-
     READINT32(in, deviceId_);
-
     READINT32(in, targetDisplayId_);
-
     READINT32(in, targetWindowId_);
-
     READINT32(in, agentWindowId_);
-
     READUINT32(in, bitwise_);
-
     return true;
 }
 } // namespace MMI
diff --git a/frameworks/proxy/events/src/key_event.cpp b/frameworks/proxy/events/src/key_event.cpp
index 2f9d309d8e..2a75d68c17 100644
--- a/frameworks/proxy/events/src/key_event.cpp
+++ b/frameworks/proxy/events/src/key_event.cpp
@@ -1125,7 +1125,6 @@ bool KeyEvent::WriteToParcel(Parcel &out) const
         }
     }
     WRITEINT32(out, keyAction_);
-
     return true;
 }
 
@@ -1147,7 +1146,6 @@ bool KeyEvent::ReadFromParcel(Parcel &in)
         keys_.push_back(val);
     }
     READINT32(in, keyAction_);
-
     return true;
 }
 
diff --git a/service/libinput_adapter/src/libinput_adapter.cpp b/service/libinput_adapter/src/libinput_adapter.cpp
index b1bd7aecb6..041f08a08f 100644
--- a/service/libinput_adapter/src/libinput_adapter.cpp
+++ b/service/libinput_adapter/src/libinput_adapter.cpp
@@ -36,7 +36,8 @@ constexpr int32_t WAIT_TIME_FOR_INPUT { 10 };
 static void HiLogFunc(struct libinput* input, libinput_log_priority priority, const char* fmt, va_list args)
 {
     CHKPV(input);
-    char buffer[256];
+    CHKPV(fmt);
+    char buffer[256] = {};
     if (vsnprintf_s(buffer, sizeof(buffer), sizeof(buffer) - 1, fmt, args) == -1) {
         MMI_HILOGE("Call vsnprintf_s failed");
         va_end(args);
diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp
index 8d2c1129e6..e6c3d82c6a 100644
--- a/service/module_loader/src/uds_server.cpp
+++ b/service/module_loader/src/uds_server.cpp
@@ -96,7 +96,7 @@ int32_t UDSServer::AddSocketPairInfo(const std::string& programName,
     int32_t& serverFd, int32_t& toReturnClientFd, int32_t& tokenType)
 {
     CALL_DEBUG_ENTER;
-    int32_t sockFds[2] = {};
+    int32_t sockFds[2] = { -1 };
 
     if (socketpair(AF_UNIX, SOCK_STREAM, 0, sockFds) != 0) {
         MMI_HILOGE("Call socketpair failed, errno:%{public}d", errno);
diff --git a/tools/event_inject/src/device_base.cpp b/tools/event_inject/src/device_base.cpp
index e5de668ea1..40ac6f9e49 100644
--- a/tools/event_inject/src/device_base.cpp
+++ b/tools/event_inject/src/device_base.cpp
@@ -15,8 +15,8 @@
 
 #include "device_base.h"
 
-using namespace OHOS::MMI;
-
+namespace OHOS {
+namespace MMI {
 namespace {
 constexpr int32_t FIRST_FINGER = 1;
 constexpr int32_t SECOND_FINGER = 2;
@@ -480,4 +480,6 @@ void DeviceBase::SetThrottle(InputEventArray& inputEventArray, int64_t blockTime
     injectEvent.event.value = value;
     SetTimeToLibinputEvent(injectEvent);
     inputEventArray.events.push_back(injectEvent);
-}
\ No newline at end of file
+}
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/tools/event_inject/src/get_device_node.cpp b/tools/event_inject/src/get_device_node.cpp
index 663bd4b1df..057068d9d1 100644
--- a/tools/event_inject/src/get_device_node.cpp
+++ b/tools/event_inject/src/get_device_node.cpp
@@ -15,8 +15,8 @@
 
 #include "get_device_node.h"
 
-using namespace OHOS::MMI;
-
+namespace OHOS {
+namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "GetDeviceNode" };
 const std::string DEVICES_INFO_PATH = "/proc/bus/input/devices";
@@ -131,4 +131,6 @@ void GetDeviceNode::AnalyseDevices(const std::vector<std::string> &deviceStrs, D
             }
         }
     }
-}
\ No newline at end of file
+}
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/tools/event_inject/src/get_device_object.cpp b/tools/event_inject/src/get_device_object.cpp
index 0d52fe6852..97cae843f9 100644
--- a/tools/event_inject/src/get_device_object.cpp
+++ b/tools/event_inject/src/get_device_object.cpp
@@ -19,8 +19,8 @@
 #include <thread>
 #include<regex>
 
-using namespace OHOS::MMI;
-
+namespace OHOS {
+namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "GetDeviceObject" };
 bool IsKeyboardDevice(const std::string& deviceName)
@@ -75,3 +75,5 @@ DeviceBase* GetDeviceObject::CreateDeviceObject(const std::string deviceName)
 
     return deviceBasePtr;
 }
+} // namespace MMI
+} // namespace OHOS
diff --git a/tools/event_inject/src/injection_tools_help_func.cpp b/tools/event_inject/src/injection_tools_help_func.cpp
index c4e8ac85e1..178fe39eb6 100644
--- a/tools/event_inject/src/injection_tools_help_func.cpp
+++ b/tools/event_inject/src/injection_tools_help_func.cpp
@@ -17,10 +17,13 @@
 
 #include <string>
 
-using namespace OHOS::MMI;
-
+namespace OHOS {
+namespace MMI {
+    
 std::string InjectionToolsHelpFunc::GetHelpText()
 {
     std::string ret = "\n                           Harmony device event injection ...\n\n";
     return ret;
 }
+} // namespace MMI
+} // namespace OHOS
diff --git a/tools/event_inject/src/manage_inject_device.cpp b/tools/event_inject/src/manage_inject_device.cpp
index b9b1724dab..29ab705a24 100644
--- a/tools/event_inject/src/manage_inject_device.cpp
+++ b/tools/event_inject/src/manage_inject_device.cpp
@@ -18,8 +18,8 @@
 #include <chrono>
 #include <thread>
 
-using namespace OHOS::MMI;
-
+namespace OHOS {
+namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ManageInjectDevice" };
 constexpr int64_t INJECT_SLEEP_TIMES = 10;
@@ -96,4 +96,6 @@ int32_t ManageInjectDevice::SendEventToDeviceNode(const InputEventArray &inputEv
         fd = -1;
     }
     return RET_OK;
-}
\ No newline at end of file
+}
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/tools/event_inject/src/processing_finger_device.cpp b/tools/event_inject/src/processing_finger_device.cpp
index 8737715932..eaea94d293 100644
--- a/tools/event_inject/src/processing_finger_device.cpp
+++ b/tools/event_inject/src/processing_finger_device.cpp
@@ -15,8 +15,8 @@
 
 #include "processing_finger_device.h"
 
-using namespace OHOS::MMI;
-
+namespace OHOS {
+namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ProcessingFingerDevice" };
 constexpr int64_t FINGER_BLOCK_TIME = 6;
@@ -123,3 +123,5 @@ void ProcessingFingerDevice::AnalysisTouchPadFingerReleaseData(InputEventArray &
     }
     SetSynReport(inputEventArray);
 }
+} // namespace MMI
+} // namespace OHOS
diff --git a/tools/event_inject/src/processing_game_pad_device.cpp b/tools/event_inject/src/processing_game_pad_device.cpp
index f785620ec3..999b388dd1 100644
--- a/tools/event_inject/src/processing_game_pad_device.cpp
+++ b/tools/event_inject/src/processing_game_pad_device.cpp
@@ -15,8 +15,8 @@
 
 #include "processing_game_pad_device.h"
 
-using namespace OHOS::MMI;
-
+namespace OHOS {
+namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ProcessingGamePadDevice" };
 } // namespace
@@ -218,3 +218,5 @@ void ProcessingGamePadDevice::TransformDirectionKeyEvent(const DeviceEvent& padE
         MMI_HILOGW("Unknown direction type");
     }
 }
+} // namespace MMI
+} // namespace OHOS
diff --git a/tools/event_inject/src/processing_joystick_device.cpp b/tools/event_inject/src/processing_joystick_device.cpp
index 012343f6d1..cf28c63477 100644
--- a/tools/event_inject/src/processing_joystick_device.cpp
+++ b/tools/event_inject/src/processing_joystick_device.cpp
@@ -15,8 +15,8 @@
 
 #include "processing_joystick_device.h"
 
-using namespace OHOS::MMI;
-
+namespace OHOS {
+namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ProcessingJoystickDevice" };
 constexpr int32_t DEFAULT_ABSX_VALUE = 8188;
@@ -170,3 +170,5 @@ void ProcessingJoystickDevice::TransformThrottle1Event(const DeviceEvent& joysti
     SetThrottle(inputEventArray, joystickEvent.blockTime, joystickEvent.keyValue);
     SetSynReport(inputEventArray);
 }
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/tools/event_inject/src/processing_keyboard_device.cpp b/tools/event_inject/src/processing_keyboard_device.cpp
index d34759ce42..dec27b50b9 100644
--- a/tools/event_inject/src/processing_keyboard_device.cpp
+++ b/tools/event_inject/src/processing_keyboard_device.cpp
@@ -15,8 +15,8 @@
 
 #include "processing_keyboard_device.h"
 
-using namespace OHOS::MMI;
-
+namespace OHOS {
+namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ProcessingKeyboardDevice" };
 constexpr int32_t EVENT_REPORT_COUNTS = 50;
@@ -113,4 +113,6 @@ void ProcessingKeyboardDevice::TransformKeyClickEvent(const KeyBoardEvent& keyBo
     SetSynReport(inputEventArray);
     SetKeyReleaseEvent(inputEventArray, keyBoardEvent.blockTime, keyValue);
     SetSynReport(inputEventArray);
-}
\ No newline at end of file
+}
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/tools/event_inject/src/processing_mouse_device.cpp b/tools/event_inject/src/processing_mouse_device.cpp
index 36ce84884b..2dbdde87a0 100644
--- a/tools/event_inject/src/processing_mouse_device.cpp
+++ b/tools/event_inject/src/processing_mouse_device.cpp
@@ -15,8 +15,8 @@
 
 #include "processing_mouse_device.h"
 
-using namespace OHOS::MMI;
-
+namespace OHOS {
+namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ProcessingMouseDevice" };
 } // namespace
@@ -134,3 +134,5 @@ void ProcessingMouseDevice::TransformMouseHwheelEvent(const MouseEvent& mouseEve
     SetRelWheel(inputEventArray, mouseEvent.blockTime, static_cast<int32_t>(distance));
     SetSynReport(inputEventArray);
 }
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/tools/event_inject/src/processing_pad_device.cpp b/tools/event_inject/src/processing_pad_device.cpp
index 4ea7c3877f..82dfd3983f 100644
--- a/tools/event_inject/src/processing_pad_device.cpp
+++ b/tools/event_inject/src/processing_pad_device.cpp
@@ -15,8 +15,8 @@
 
 #include "processing_pad_device.h"
 
-using namespace OHOS::MMI;
-
+namespace OHOS {
+namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ProcessingPadDevice" };
 } // namespace
@@ -110,3 +110,5 @@ void ProcessingPadDevice::TransformRingEvent(const PadEvent& padEvent, InputEven
         SetSynReport(inputEventArray);
     }
 }
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/tools/event_inject/src/processing_pen_device.cpp b/tools/event_inject/src/processing_pen_device.cpp
index abdccb69d5..c26028b75c 100644
--- a/tools/event_inject/src/processing_pen_device.cpp
+++ b/tools/event_inject/src/processing_pen_device.cpp
@@ -15,8 +15,8 @@
 
 #include "processing_pen_device.h"
 
-using namespace OHOS::MMI;
-
+namespace OHOS {
+namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ProcessingPenDevice" };
 constexpr int32_t EV_ABS_Z_DEFAULT_VALUE = 450;
@@ -215,4 +215,6 @@ int32_t ProcessingPenDevice::AnalysisPenLeavePadEvent(const DeviceEvent& event,
     penEventArray.push_back(penEvent);
 
     return RET_OK;
-}
\ No newline at end of file
+}
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/tools/event_inject/src/processing_touch_screen_device.cpp b/tools/event_inject/src/processing_touch_screen_device.cpp
index 9c0214f971..8b9e06999e 100644
--- a/tools/event_inject/src/processing_touch_screen_device.cpp
+++ b/tools/event_inject/src/processing_touch_screen_device.cpp
@@ -15,8 +15,8 @@
 
 #include "processing_touch_screen_device.h"
 
-using namespace OHOS::MMI;
-
+namespace OHOS {
+namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ProcessingTouchScreenDevice" };
 } // namespace
@@ -201,4 +201,6 @@ void ProcessingTouchScreenDevice::AnalysisTouchScreenReleaseData(InputEventArray
         SetSynMtReport(inputEventArray, 0);
         SetSynReport(inputEventArray, touchSingleEventData.blockTime);
     }
-}
\ No newline at end of file
+}
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 1443804b94..b143279990 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -38,7 +38,6 @@ ohos_shared_library("libmmi-util") {
     "common/src/util.cpp",
     "common/src/util_napi.cpp",
     "common/src/util_napi_error.cpp",
-    "common/src/uuid.cpp",
     "network/src/circle_stream_buffer.cpp",
     "network/src/net_packet.cpp",
     "network/src/stream_buffer.cpp",
diff --git a/util/common/include/util.h b/util/common/include/util.h
index 2792f0028f..f2ff5cc62f 100644
--- a/util/common/include/util.h
+++ b/util/common/include/util.h
@@ -32,11 +32,9 @@ struct DeviceConfig {
 };
 
 int64_t GetSysClockTime();
-
+ 
 int64_t GetMillisTime();
 
-std::string GetUUid();
-
 uint64_t GetThisThreadId();
 
 size_t StringSplit(const std::string &str, const std::string &sep, std::vector<std::string> &vecList);
diff --git a/util/common/include/uuid.h b/util/common/include/uuid.h
deleted file mode 100644
index 41689b0d3e..0000000000
--- a/util/common/include/uuid.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef UUID_H
-#define UUID_H
-
-#include <array>
-#include <cstdint>
-#include <cstring>
-#include <string>
-
-/**
- * @brief The OHOS subsystem.
- */
-namespace OHOS {
-namespace MMI {
-/**
- * @brief This class provides service uuid.
- *
- * @since 1.0
- * @version 1.0
- */
-class Uuid {
-public:
-    static constexpr int32_t UUID128_BYTES_TYPE = 16;
-    static constexpr int32_t UUID32_BYTES_TYPE = 4;
-    static constexpr int32_t UUID16_BYTES_TYPE = 2;
-    using UUID128Bit = std::array<uint8_t, UUID128_BYTES_TYPE>;
-    /**
-     * @brief A constructor used to create an <b>UUID</b> instance.
-     *
-     * @since 1.0
-     * @version 1.0
-     */
-    Uuid();
-
-    /**
-     * @brief A constructor used to create an <b>UUID</b> instance.
-     *
-     * @param other Other uuid to create an <b>UUID</b> instance.
-     * @since 1.0
-     * @version 1.0
-     */
-    Uuid(const Uuid& other) = default;
-
-    /**
-     * @brief The assignment constructor.
-     *
-     * @param other Other uuid object.
-     * @return Returns the reference of Uuid.
-     * @since 1.0
-     * @version 1.0
-     */
-    Uuid& operator=(const Uuid& other) = default;
-
-    /**
-     * @brief A destructor used to delete the <b>UUID</b> instance.
-     *
-     * @since 1.0
-     * @version 1.0
-     */
-    ~Uuid() = default;
-
-    /**
-     * @brief Convert uuid to uint8_t* with little endian.
-     *
-     * @param[in] value : The 128 bits value for a uuid.
-     * @return Returns <b>true</b> if the operation is successful;
-     *         returns <b>false</b> if the operation fails.
-     * @since 1.0
-     * @version 1.0
-     */
-    void ConvertToStdString(std::string& s) const;
-
-protected:
-    /**
-     * @brief Constructor.
-     */
-    Uuid(const UUID128Bit uuid) : uuid_(uuid) {};
-
-    // base uuid value
-    std::array<uint8_t, UUID128_BYTES_TYPE> BASE_UUID = {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
-        0x80, 0x00, 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB
-    };
-
-    std::array<uint8_t, UUID128_BYTES_TYPE> uuid_ = BASE_UUID;
-};
-}  // namespace MMI
-}  // namespace OHOS
-#endif // UUID_H
\ No newline at end of file
diff --git a/util/common/src/util.cpp b/util/common/src/util.cpp
index 366aa9e2d8..66a4c5337e 100644
--- a/util/common/src/util.cpp
+++ b/util/common/src/util.cpp
@@ -15,6 +15,7 @@
 
 #include "util.h"
 
+#include <array>
 #include <chrono>
 #include <cinttypes>
 #include <cstdarg>
@@ -32,7 +33,6 @@
 #include "error_multimodal.h"
 #include "mmi_log.h"
 #include "securec.h"
-#include "uuid.h"
 
 namespace OHOS {
 namespace MMI {
@@ -77,14 +77,6 @@ int64_t GetMillisTime()
     return tmp.count();
 }
 
-std::string GetUUid()
-{
-    Uuid uid;
-    std::string strUuid;
-    uid.ConvertToStdString(strUuid);
-    return strUuid;
-}
-
 static std::string GetThisThreadIdOfString()
 {
     thread_local std::string threadLocalId;
diff --git a/util/common/src/uuid.cpp b/util/common/src/uuid.cpp
deleted file mode 100644
index 7284e5e288..0000000000
--- a/util/common/src/uuid.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "uuid.h"
-
-#include <algorithm>
-#include <climits>
-#include <iomanip>
-#include <iostream>
-
-#include <sys/time.h>
-
-namespace OHOS {
-namespace MMI {
-namespace {
-constexpr int32_t UUID_TIME_LOW_FIRST_BYTE = 0;
-constexpr int32_t UUID_TIME_LOW_SECOND_BYTE = 1;
-constexpr int32_t UUID_TIME_LOW_THIRD_BYTE = 2;
-constexpr int32_t UUID_TIME_LOW_FOURTH_BYTE = 3;
-constexpr int32_t UUID_TIME_MID_FIRST_BYTE = 4;
-constexpr int32_t UUID_TIME_MID_SECOND_BYTE = 5;
-constexpr int32_t UUID_VERSION = 6;
-constexpr int32_t UUID_TIME_HIGH = 7;
-constexpr int32_t UUID_VARIANT = 8;
-constexpr int32_t UUID_CLOCK_SEQ = 9;
-constexpr int32_t UUID_NODE_FIRST_BYTE = 10;
-constexpr int32_t UUID_NODE_THIRD_BYTE = 12;
-constexpr int32_t UUID_NODE_FOURTH_BYTE = 13;
-constexpr int32_t UUID_NODE_FIFTH_BYTE = 14;
-constexpr int32_t UUID_NODE_SIXTH_BYTE = 15;
-
-constexpr int32_t BASE_BIT_OPT_SIZE = 8;
-constexpr int32_t BIT_OPT_TWO_BYTE = 2;
-constexpr int32_t BIT_OPT_THREE_BYTE = 3;
-constexpr int32_t BIT_OPT_FOUR_BYTE = 4;
-constexpr int32_t BIT_OPT_FIVE_BYTE = 5;
-constexpr int32_t BIT_OPT_SIX_BYTE = 6;
-constexpr int32_t BIT_OPT_SEVEN_BYTE = 7;
-} // namespace
-
-Uuid::Uuid()
-{
-    struct timeval tv;
-    struct timezone tz;
-    struct tm randomTime;
-    uint32_t randNum = 0;
-
-    rand_r(&randNum);
-    gettimeofday(&tv, &tz);
-    localtime_r(&tv.tv_sec, &randomTime);
-
-    unsigned long int tvUsec = 0;
-    tvUsec = (unsigned long int)tv.tv_usec;
-
-    uuid_[UUID_NODE_SIXTH_BYTE] =
-        static_cast<uint8_t>(tvUsec & 0x00000000000000FF);
-    uuid_[UUID_NODE_FIFTH_BYTE] =
-        static_cast<uint8_t>((tvUsec & 0x000000000000FF00) >> BASE_BIT_OPT_SIZE);
-    uuid_[UUID_NODE_FOURTH_BYTE] =
-        static_cast<uint8_t>((tvUsec & 0x0000000000FF0000) >> BIT_OPT_TWO_BYTE * BASE_BIT_OPT_SIZE);
-    uuid_[UUID_NODE_THIRD_BYTE] =
-        static_cast<uint8_t>((tvUsec & 0x00000000FF000000) >> BIT_OPT_THREE_BYTE * BASE_BIT_OPT_SIZE);
-    uuid_[UUID_NODE_FIRST_BYTE] =
-        static_cast<uint8_t>((tvUsec & 0x000000FF00000000) >> BIT_OPT_FOUR_BYTE * BASE_BIT_OPT_SIZE);
-    uuid_[UUID_CLOCK_SEQ] =
-        static_cast<uint8_t>((tvUsec & 0x0000FF0000000000) >> BIT_OPT_FIVE_BYTE * BASE_BIT_OPT_SIZE);
-    uuid_[UUID_VARIANT] =
-        static_cast<uint8_t>((tvUsec & 0x00FF000000000000) >> BIT_OPT_SIX_BYTE * BASE_BIT_OPT_SIZE);
-    uuid_[UUID_TIME_HIGH] =
-        static_cast<uint8_t>((tvUsec & 0xFF00000000000000) >> BIT_OPT_SEVEN_BYTE * BASE_BIT_OPT_SIZE);
-    // 4 - 6
-    uuid_[UUID_VERSION] =
-        static_cast<uint8_t>((static_cast<uint32_t>(randomTime.tm_sec) + randNum) & 0xFF);
-    uuid_[UUID_TIME_MID_SECOND_BYTE] =
-        static_cast<uint8_t>((static_cast<uint32_t>(randomTime.tm_min) + (randNum >> BASE_BIT_OPT_SIZE)) & 0xFF);
-    uuid_[UUID_TIME_MID_FIRST_BYTE] = static_cast<uint8_t>((static_cast<uint32_t>(randomTime.tm_hour) +
-                                      (randNum >> BIT_OPT_TWO_BYTE * BASE_BIT_OPT_SIZE)) & 0xFF);
-    // 0 - 3
-    uuid_[UUID_TIME_LOW_FOURTH_BYTE] = static_cast<uint8_t>((static_cast<uint32_t>(randomTime.tm_mday) +
-                                       (randNum >> BIT_OPT_THREE_BYTE * BASE_BIT_OPT_SIZE)) & 0xFF);
-    uuid_[UUID_TIME_LOW_THIRD_BYTE] =
-        static_cast<uint8_t>(static_cast<uint32_t>(randomTime.tm_mon) & 0xFF);
-    uuid_[UUID_TIME_LOW_SECOND_BYTE] =
-        static_cast<uint8_t>(static_cast<uint32_t>(randomTime.tm_year) & 0xFF);
-    uuid_[UUID_TIME_LOW_FIRST_BYTE] =
-        static_cast<uint8_t>((static_cast<uint32_t>(randomTime.tm_year) & 0xFF00) >> BASE_BIT_OPT_SIZE);
-}
-
-char ConvertToHex(uint8_t c)
-{
-    if (c < 0xa) {
-        return static_cast<char>(c + '0');
-    } else if (c >= 0xa && c <= 0xf) {
-        return static_cast<char>(c - 0xa + 'a');
-    }
-
-    return '0';
-}
-
-void Uuid::ConvertToStdString(std::string& s) const
-{
-    static constexpr int32_t uuidBufMaxSize = 37;
-    char uuidBuf[uuidBufMaxSize + 1] = {0};
-    int32_t writePos = 0;
-    for (size_t i = 0; i < UUID128_BYTES_TYPE; i++) {
-        const uint8_t c = uuid_[i];
-        const uint8_t low4Bit = (c & 0xf);
-        const uint8_t high4Bit = ((c >> 4) & 0xf);
-        if (writePos <= uuidBufMaxSize) {
-            uuidBuf[writePos++] = ConvertToHex(low4Bit);
-            uuidBuf[writePos++] = ConvertToHex(high4Bit);
-            // 3 5 7 9 uuid 按标准格式(8-4-4-4-12)分隔符
-            if (i == 3 || i == 5 || i == 7 || i == 9) {
-                uuidBuf[writePos++] = '-';
-            }
-        }
-    }
-    uuidBuf[uuidBufMaxSize - 1] = '\0';
-    s = uuidBuf;
-}
-} // namespace MMI
-} // namespace OHOS
-- 
Gitee


From 7882d79cd2f30170fda68af85ecbabb8dc789f76 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Wed, 9 Nov 2022 02:58:58 +0000
Subject: [PATCH 121/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I2b10f81513eba4f32faf0c2c09a2b7035f5ad1ed
---
 .../input_device_cooperate/src/cooperate_event_handler.cpp   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/service/input_device_cooperate/src/cooperate_event_handler.cpp b/service/input_device_cooperate/src/cooperate_event_handler.cpp
index bd9a1e326e..770ee9834c 100755
--- a/service/input_device_cooperate/src/cooperate_event_handler.cpp
+++ b/service/input_device_cooperate/src/cooperate_event_handler.cpp
@@ -15,8 +15,13 @@
 
 #include "cooperate_event_handler.h"
 
+#include "mmi_log.h"
+
 namespace OHOS {
 namespace MMI {
+namespace {
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "CooperateEventHandler" };
+} // namespace
 CooperateEventHandler::CooperateEventHandler(
     const std::shared_ptr<AppExecFwk::EventRunner> &runner)
     : AppExecFwk::EventHandler(runner)
-- 
Gitee


From 95d0d1e8450e7b0684fe8df383b2e5d1b9746094 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Wed, 9 Nov 2022 03:06:14 +0000
Subject: [PATCH 122/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I6745c9b792b26ccf58120eb89e600830d8f35b17
---
 etc/ability_launch_config.json                |   6 +
 etc/mouse_icon/BUILD.gn                       | 348 +++++++++++++++
 .../mouse_icon/src}/Colorsucker.png           | Bin
 .../mouse_icon/src}/Copy.png                  | Bin
 .../mouse_icon/src}/Cross.png                 | Bin
 .../mouse_icon/src}/Default.png               | Bin
 .../mouse_icon/src}/East.png                  | Bin
 .../mouse_icon/src}/Forbid.png                | Bin
 .../mouse_icon/src}/Hand_Grabbing.png         | Bin
 .../mouse_icon/src}/Hand_Open.png             | Bin
 .../mouse_icon/src}/Hand_Pointing.png         | Bin
 .../mouse_icon/src}/Help.png                  | Bin
 .../mouse_icon/src}/MID_Btn_East.png          | Bin
 .../mouse_icon/src}/MID_Btn_North.png         | Bin
 .../mouse_icon/src}/MID_Btn_North_East.png    | Bin
 .../mouse_icon/src}/MID_Btn_North_South.png   | Bin
 .../src}/MID_Btn_North_South_West_East.png    | Bin
 .../mouse_icon/src}/MID_Btn_North_West.png    | Bin
 .../mouse_icon/src}/MID_Btn_South.png         | Bin
 .../mouse_icon/src}/MID_Btn_South_East.png    | Bin
 .../mouse_icon/src}/MID_Btn_South_West.png    | Bin
 .../mouse_icon/src}/MID_Btn_West.png          | Bin
 .../mouse_icon/src}/Move.png                  | Bin
 .../mouse_icon/src}/North.png                 | Bin
 .../mouse_icon/src}/North_East.png            | Bin
 .../mouse_icon/src}/North_East_South_West.png | Bin
 .../mouse_icon/src}/North_South.png           | Bin
 .../mouse_icon/src}/North_West.png            | Bin
 .../mouse_icon/src}/North_West_South_East.png | Bin
 .../mouse_icon/src}/Resize_Left_Right.png     | Bin
 .../mouse_icon/src}/Resize_Up_Down.png        | Bin
 .../mouse_icon/src}/Screenshot_Cross.png      | Bin
 .../mouse_icon/src}/Screenshot_Cursor.png     | Bin
 .../mouse_icon/src}/South.png                 | Bin
 .../mouse_icon/src}/South_East.png            | Bin
 .../mouse_icon/src}/South_West.png            | Bin
 .../mouse_icon/src}/Text_Cursor.png           | Bin
 .../mouse_icon/src}/West.png                  | Bin
 .../mouse_icon/src}/West_East.png             | Bin
 .../mouse_icon/src}/Zoom_In.png               | Bin
 .../mouse_icon/src}/Zoom_Out.png              | Bin
 frameworks/napi/input_monitor/BUILD.gn        |   5 +-
 frameworks/proxy/BUILD.gn                     |  75 +---
 multimodalinput_mini.gni                      |  34 ++
 service/BUILD.gn                              | 422 +-----------------
 service/filter/BUILD.gn                       |  15 +-
 .../etc/ability_launch_config.json            |   6 -
 util/BUILD.gn                                 |  16 +-
 48 files changed, 421 insertions(+), 506 deletions(-)
 create mode 100644 etc/ability_launch_config.json
 create mode 100644 etc/mouse_icon/BUILD.gn
 rename {util/source_icon => etc/mouse_icon/src}/Colorsucker.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Copy.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Cross.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Default.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/East.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Forbid.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Hand_Grabbing.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Hand_Open.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Hand_Pointing.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Help.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/MID_Btn_East.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/MID_Btn_North.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/MID_Btn_North_East.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/MID_Btn_North_South.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/MID_Btn_North_South_West_East.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/MID_Btn_North_West.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/MID_Btn_South.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/MID_Btn_South_East.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/MID_Btn_South_West.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/MID_Btn_West.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Move.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/North.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/North_East.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/North_East_South_West.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/North_South.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/North_West.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/North_West_South_East.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Resize_Left_Right.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Resize_Up_Down.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Screenshot_Cross.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Screenshot_Cursor.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/South.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/South_East.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/South_West.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Text_Cursor.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/West.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/West_East.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Zoom_In.png (100%)
 rename {util/source_icon => etc/mouse_icon/src}/Zoom_Out.png (100%)
 delete mode 100644 service/key_command/etc/ability_launch_config.json

diff --git a/etc/ability_launch_config.json b/etc/ability_launch_config.json
new file mode 100644
index 0000000000..30f51eb13c
--- /dev/null
+++ b/etc/ability_launch_config.json
@@ -0,0 +1,6 @@
+{
+    "Shortkeys": [
+    ],
+    "Sequences" : [
+    ]
+  }
\ No newline at end of file
diff --git a/etc/mouse_icon/BUILD.gn b/etc/mouse_icon/BUILD.gn
new file mode 100644
index 0000000000..6f99ab4786
--- /dev/null
+++ b/etc/mouse_icon/BUILD.gn
@@ -0,0 +1,348 @@
+# Copyright (c) 2022 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
+
+ohos_prebuilt_etc("drawing_pointer_image_Colorsucker") {
+  source = "src/Colorsucker.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Copy") {
+  source = "src/Copy.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Cross") {
+  source = "src/Cross.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Default") {
+  source = "src/Default.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_East") {
+  source = "src/East.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Forbid") {
+  source = "src/Forbid.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Hand_Grabbing") {
+  source = "src/Hand_Grabbing.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Hand_Open") {
+  source = "src/Hand_Open.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Hand_Pointing") {
+  source = "src/Hand_Pointing.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Help") {
+  source = "src/Help.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_East") {
+  source = "src/MID_Btn_East.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_North") {
+  source = "src/MID_Btn_North.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_North_East") {
+  source = "src/MID_Btn_North_East.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_North_South") {
+  source = "src/MID_Btn_North_South.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_North_South_West_East") {
+  source = "src/MID_Btn_North_South_West_East.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_North_West") {
+  source = "src/MID_Btn_North_West.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_South") {
+  source = "src/MID_Btn_South.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_South_East") {
+  source = "src/MID_Btn_South_East.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_South_West") {
+  source = "src/MID_Btn_South_West.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_West") {
+  source = "src/MID_Btn_West.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Move") {
+  source = "src/Move.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_North") {
+  source = "src/North.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_North_East") {
+  source = "src/North_East.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_North_East_South_West") {
+  source = "src/North_East_South_West.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_North_South") {
+  source = "src/North_South.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_North_West") {
+  source = "src/North_West.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_North_West_South_East") {
+  source = "src/North_West_South_East.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Resize_Left_Right") {
+  source = "src/Resize_Left_Right.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Resize_Up_Down") {
+  source = "src/Resize_Up_Down.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Screenshot_Cross") {
+  source = "src/Screenshot_Cross.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Screenshot_Cursor") {
+  source = "src/Screenshot_Cursor.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_South") {
+  source = "src/South.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_South_East") {
+  source = "src/South_East.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_South_West") {
+  source = "src/South_West.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Text_Cursor") {
+  source = "src/Text_Cursor.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_West") {
+  source = "src/West.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_West_East") {
+  source = "src/West_East.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Zoom_In") {
+  source = "src/Zoom_In.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("drawing_pointer_image_Zoom_Out") {
+  source = "src/Zoom_Out.png"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput/mouse_icon"
+}
+
+ohos_prebuilt_etc("multimodalinput_config_ability.json") {
+  source = "${mmi_path}/etc/ability_launch_config.json"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  relative_install_dir = "multimodalinput"
+}
+
+ohos_prebuilt_etc("multimodalinput.para.dac") {
+  source = "${mmi_path}/etc/multimodalinput.para.dac"
+  part_name = "input"
+  subsystem_name = "multimodalinput"
+  module_install_dir = "etc/param"
+}
+
+group("input_mouse_icon") {
+  deps = [
+    ":drawing_pointer_image_Colorsucker",
+    ":drawing_pointer_image_Copy",
+    ":drawing_pointer_image_Cross",
+    ":drawing_pointer_image_Default",
+    ":drawing_pointer_image_East",
+    ":drawing_pointer_image_Forbid",
+    ":drawing_pointer_image_Hand_Grabbing",
+    ":drawing_pointer_image_Hand_Open",
+    ":drawing_pointer_image_Hand_Pointing",
+    ":drawing_pointer_image_Help",
+    ":drawing_pointer_image_MID_Btn_East",
+    ":drawing_pointer_image_MID_Btn_North",
+    ":drawing_pointer_image_MID_Btn_North_East",
+    ":drawing_pointer_image_MID_Btn_North_South",
+    ":drawing_pointer_image_MID_Btn_North_South_West_East",
+    ":drawing_pointer_image_MID_Btn_North_West",
+    ":drawing_pointer_image_MID_Btn_South",
+    ":drawing_pointer_image_MID_Btn_South_East",
+    ":drawing_pointer_image_MID_Btn_South_West",
+    ":drawing_pointer_image_MID_Btn_West",
+    ":drawing_pointer_image_Move",
+    ":drawing_pointer_image_North",
+    ":drawing_pointer_image_North_East",
+    ":drawing_pointer_image_North_East_South_West",
+    ":drawing_pointer_image_North_South",
+    ":drawing_pointer_image_North_West",
+    ":drawing_pointer_image_North_West_South_East",
+    ":drawing_pointer_image_Resize_Left_Right",
+    ":drawing_pointer_image_Resize_Up_Down",
+    ":drawing_pointer_image_Screenshot_Cross",
+    ":drawing_pointer_image_Screenshot_Cursor",
+    ":drawing_pointer_image_South",
+    ":drawing_pointer_image_South_East",
+    ":drawing_pointer_image_South_West",
+    ":drawing_pointer_image_Text_Cursor",
+    ":drawing_pointer_image_West",
+    ":drawing_pointer_image_West_East",
+    ":drawing_pointer_image_Zoom_In",
+    ":drawing_pointer_image_Zoom_Out",
+    ":multimodalinput.para.dac",
+    ":multimodalinput_config_ability.json",
+  ]
+}
diff --git a/util/source_icon/Colorsucker.png b/etc/mouse_icon/src/Colorsucker.png
similarity index 100%
rename from util/source_icon/Colorsucker.png
rename to etc/mouse_icon/src/Colorsucker.png
diff --git a/util/source_icon/Copy.png b/etc/mouse_icon/src/Copy.png
similarity index 100%
rename from util/source_icon/Copy.png
rename to etc/mouse_icon/src/Copy.png
diff --git a/util/source_icon/Cross.png b/etc/mouse_icon/src/Cross.png
similarity index 100%
rename from util/source_icon/Cross.png
rename to etc/mouse_icon/src/Cross.png
diff --git a/util/source_icon/Default.png b/etc/mouse_icon/src/Default.png
similarity index 100%
rename from util/source_icon/Default.png
rename to etc/mouse_icon/src/Default.png
diff --git a/util/source_icon/East.png b/etc/mouse_icon/src/East.png
similarity index 100%
rename from util/source_icon/East.png
rename to etc/mouse_icon/src/East.png
diff --git a/util/source_icon/Forbid.png b/etc/mouse_icon/src/Forbid.png
similarity index 100%
rename from util/source_icon/Forbid.png
rename to etc/mouse_icon/src/Forbid.png
diff --git a/util/source_icon/Hand_Grabbing.png b/etc/mouse_icon/src/Hand_Grabbing.png
similarity index 100%
rename from util/source_icon/Hand_Grabbing.png
rename to etc/mouse_icon/src/Hand_Grabbing.png
diff --git a/util/source_icon/Hand_Open.png b/etc/mouse_icon/src/Hand_Open.png
similarity index 100%
rename from util/source_icon/Hand_Open.png
rename to etc/mouse_icon/src/Hand_Open.png
diff --git a/util/source_icon/Hand_Pointing.png b/etc/mouse_icon/src/Hand_Pointing.png
similarity index 100%
rename from util/source_icon/Hand_Pointing.png
rename to etc/mouse_icon/src/Hand_Pointing.png
diff --git a/util/source_icon/Help.png b/etc/mouse_icon/src/Help.png
similarity index 100%
rename from util/source_icon/Help.png
rename to etc/mouse_icon/src/Help.png
diff --git a/util/source_icon/MID_Btn_East.png b/etc/mouse_icon/src/MID_Btn_East.png
similarity index 100%
rename from util/source_icon/MID_Btn_East.png
rename to etc/mouse_icon/src/MID_Btn_East.png
diff --git a/util/source_icon/MID_Btn_North.png b/etc/mouse_icon/src/MID_Btn_North.png
similarity index 100%
rename from util/source_icon/MID_Btn_North.png
rename to etc/mouse_icon/src/MID_Btn_North.png
diff --git a/util/source_icon/MID_Btn_North_East.png b/etc/mouse_icon/src/MID_Btn_North_East.png
similarity index 100%
rename from util/source_icon/MID_Btn_North_East.png
rename to etc/mouse_icon/src/MID_Btn_North_East.png
diff --git a/util/source_icon/MID_Btn_North_South.png b/etc/mouse_icon/src/MID_Btn_North_South.png
similarity index 100%
rename from util/source_icon/MID_Btn_North_South.png
rename to etc/mouse_icon/src/MID_Btn_North_South.png
diff --git a/util/source_icon/MID_Btn_North_South_West_East.png b/etc/mouse_icon/src/MID_Btn_North_South_West_East.png
similarity index 100%
rename from util/source_icon/MID_Btn_North_South_West_East.png
rename to etc/mouse_icon/src/MID_Btn_North_South_West_East.png
diff --git a/util/source_icon/MID_Btn_North_West.png b/etc/mouse_icon/src/MID_Btn_North_West.png
similarity index 100%
rename from util/source_icon/MID_Btn_North_West.png
rename to etc/mouse_icon/src/MID_Btn_North_West.png
diff --git a/util/source_icon/MID_Btn_South.png b/etc/mouse_icon/src/MID_Btn_South.png
similarity index 100%
rename from util/source_icon/MID_Btn_South.png
rename to etc/mouse_icon/src/MID_Btn_South.png
diff --git a/util/source_icon/MID_Btn_South_East.png b/etc/mouse_icon/src/MID_Btn_South_East.png
similarity index 100%
rename from util/source_icon/MID_Btn_South_East.png
rename to etc/mouse_icon/src/MID_Btn_South_East.png
diff --git a/util/source_icon/MID_Btn_South_West.png b/etc/mouse_icon/src/MID_Btn_South_West.png
similarity index 100%
rename from util/source_icon/MID_Btn_South_West.png
rename to etc/mouse_icon/src/MID_Btn_South_West.png
diff --git a/util/source_icon/MID_Btn_West.png b/etc/mouse_icon/src/MID_Btn_West.png
similarity index 100%
rename from util/source_icon/MID_Btn_West.png
rename to etc/mouse_icon/src/MID_Btn_West.png
diff --git a/util/source_icon/Move.png b/etc/mouse_icon/src/Move.png
similarity index 100%
rename from util/source_icon/Move.png
rename to etc/mouse_icon/src/Move.png
diff --git a/util/source_icon/North.png b/etc/mouse_icon/src/North.png
similarity index 100%
rename from util/source_icon/North.png
rename to etc/mouse_icon/src/North.png
diff --git a/util/source_icon/North_East.png b/etc/mouse_icon/src/North_East.png
similarity index 100%
rename from util/source_icon/North_East.png
rename to etc/mouse_icon/src/North_East.png
diff --git a/util/source_icon/North_East_South_West.png b/etc/mouse_icon/src/North_East_South_West.png
similarity index 100%
rename from util/source_icon/North_East_South_West.png
rename to etc/mouse_icon/src/North_East_South_West.png
diff --git a/util/source_icon/North_South.png b/etc/mouse_icon/src/North_South.png
similarity index 100%
rename from util/source_icon/North_South.png
rename to etc/mouse_icon/src/North_South.png
diff --git a/util/source_icon/North_West.png b/etc/mouse_icon/src/North_West.png
similarity index 100%
rename from util/source_icon/North_West.png
rename to etc/mouse_icon/src/North_West.png
diff --git a/util/source_icon/North_West_South_East.png b/etc/mouse_icon/src/North_West_South_East.png
similarity index 100%
rename from util/source_icon/North_West_South_East.png
rename to etc/mouse_icon/src/North_West_South_East.png
diff --git a/util/source_icon/Resize_Left_Right.png b/etc/mouse_icon/src/Resize_Left_Right.png
similarity index 100%
rename from util/source_icon/Resize_Left_Right.png
rename to etc/mouse_icon/src/Resize_Left_Right.png
diff --git a/util/source_icon/Resize_Up_Down.png b/etc/mouse_icon/src/Resize_Up_Down.png
similarity index 100%
rename from util/source_icon/Resize_Up_Down.png
rename to etc/mouse_icon/src/Resize_Up_Down.png
diff --git a/util/source_icon/Screenshot_Cross.png b/etc/mouse_icon/src/Screenshot_Cross.png
similarity index 100%
rename from util/source_icon/Screenshot_Cross.png
rename to etc/mouse_icon/src/Screenshot_Cross.png
diff --git a/util/source_icon/Screenshot_Cursor.png b/etc/mouse_icon/src/Screenshot_Cursor.png
similarity index 100%
rename from util/source_icon/Screenshot_Cursor.png
rename to etc/mouse_icon/src/Screenshot_Cursor.png
diff --git a/util/source_icon/South.png b/etc/mouse_icon/src/South.png
similarity index 100%
rename from util/source_icon/South.png
rename to etc/mouse_icon/src/South.png
diff --git a/util/source_icon/South_East.png b/etc/mouse_icon/src/South_East.png
similarity index 100%
rename from util/source_icon/South_East.png
rename to etc/mouse_icon/src/South_East.png
diff --git a/util/source_icon/South_West.png b/etc/mouse_icon/src/South_West.png
similarity index 100%
rename from util/source_icon/South_West.png
rename to etc/mouse_icon/src/South_West.png
diff --git a/util/source_icon/Text_Cursor.png b/etc/mouse_icon/src/Text_Cursor.png
similarity index 100%
rename from util/source_icon/Text_Cursor.png
rename to etc/mouse_icon/src/Text_Cursor.png
diff --git a/util/source_icon/West.png b/etc/mouse_icon/src/West.png
similarity index 100%
rename from util/source_icon/West.png
rename to etc/mouse_icon/src/West.png
diff --git a/util/source_icon/West_East.png b/etc/mouse_icon/src/West_East.png
similarity index 100%
rename from util/source_icon/West_East.png
rename to etc/mouse_icon/src/West_East.png
diff --git a/util/source_icon/Zoom_In.png b/etc/mouse_icon/src/Zoom_In.png
similarity index 100%
rename from util/source_icon/Zoom_In.png
rename to etc/mouse_icon/src/Zoom_In.png
diff --git a/util/source_icon/Zoom_Out.png b/etc/mouse_icon/src/Zoom_Out.png
similarity index 100%
rename from util/source_icon/Zoom_Out.png
rename to etc/mouse_icon/src/Zoom_Out.png
diff --git a/frameworks/napi/input_monitor/BUILD.gn b/frameworks/napi/input_monitor/BUILD.gn
index c65178b567..0bbc2cf3d2 100644
--- a/frameworks/napi/input_monitor/BUILD.gn
+++ b/frameworks/napi/input_monitor/BUILD.gn
@@ -22,10 +22,7 @@ config("inputmonitor_config") {
     "//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include",
   ]
 
-  defines = []
-  if (input_feature_input_cooperation) {
-    defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
-  }
+  defines = input_default_defines
 }
 
 ohos_shared_library("inputmonitor") {
diff --git a/frameworks/proxy/BUILD.gn b/frameworks/proxy/BUILD.gn
index 8cdbe0bc8c..342f90051f 100755
--- a/frameworks/proxy/BUILD.gn
+++ b/frameworks/proxy/BUILD.gn
@@ -64,11 +64,8 @@ ohos_source_set("libmmi-common") {
     "events/src/pointer_event.cpp",
   ]
 
-  defines = []
+  defines = input_default_defines
 
-  if (input_feature_input_cooperation) {
-    defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
-  }
   public_configs = [ ":libmmi_client_config" ]
 
   external_deps = [
@@ -97,26 +94,7 @@ ohos_shared_library("libmmi-client") {
     sources += [ "event_handler/src/input_device_cooperate_impl.cpp" ]
   }
 
-  defines = []
-
-  if (input_feature_pointer_drawing) {
-    defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
-  }
-  if (input_feature_monitor) {
-    defines += [ "OHOS_BUILD_ENABLE_MONITOR" ]
-  }
-  if (input_feature_interceptor) {
-    defines += [ "OHOS_BUILD_ENABLE_INTERCEPTOR" ]
-  }
-  if (input_feature_keyboard) {
-    defines += [ "OHOS_BUILD_ENABLE_KEYBOARD" ]
-  }
-  if (input_feature_mouse) {
-    defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
-  }
-  if (input_feature_touchscreen) {
-    defines += [ "OHOS_BUILD_ENABLE_TOUCH" ]
-  }
+  defines = input_default_defines
 
   if (input_feature_interceptor) {
     sources += [ "event_handler/src/input_interceptor_manager.cpp" ]
@@ -130,14 +108,6 @@ ohos_shared_library("libmmi-client") {
     sources += [ "event_handler/src/key_event_input_subscribe_manager.cpp" ]
   }
 
-  if (input_feature_input_cooperation) {
-    defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
-  }
-
-  if (input_feature_joystick) {
-    defines += [ "OHOS_BUILD_ENABLE_JOYSTICK" ]
-  }
-
   configs = [
     ":libmmi_client_config",
     "//foundation/multimodalinput/input/util:libmmi_util_public_config",
@@ -172,7 +142,7 @@ ohos_unittest("ut-mmi-proxy-out") {
     "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  defines = []
+  defines = input_default_defines
 
   sources = [ "module_loader/test/mmi_client_test.cpp" ]
 
@@ -198,7 +168,7 @@ ohos_unittest("KeyEventTest") {
     "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  defines = []
+  defines = input_default_defines
 
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
@@ -232,30 +202,8 @@ ohos_unittest("InputManagerTest") {
     "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  defines = []
-
-  if (input_feature_pointer_drawing) {
-    defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
-  }
+  defines = input_default_defines
 
-  if (input_feature_keyboard) {
-    defines += [ "OHOS_BUILD_ENABLE_KEYBOARD" ]
-  }
-  if (input_feature_mouse) {
-    defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
-  }
-  if (input_feature_touchscreen) {
-    defines += [ "OHOS_BUILD_ENABLE_TOUCH" ]
-  }
-  if (input_feature_interceptor) {
-    defines += [ "OHOS_BUILD_ENABLE_INTERCEPTOR" ]
-  }
-  if (input_feature_monitor) {
-    defines += [ "OHOS_BUILD_ENABLE_MONITOR" ]
-  }
-  if (input_feature_joystick) {
-    defines += [ "OHOS_BUILD_ENABLE_JOYSTICK" ]
-  }
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/system_info.cpp",
@@ -290,14 +238,8 @@ ohos_unittest("InputManagerManualTest") {
     "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  defines = []
+  defines = input_default_defines
 
-  if (input_feature_mouse) {
-    defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
-  }
-  if (input_feature_touchscreen) {
-    defines += [ "OHOS_BUILD_ENABLE_TOUCH" ]
-  }
   sources = [ "events/test/input_manager_manual_test.cpp" ]
 
   configs = [ ":libmmi_test_util" ]
@@ -321,11 +263,8 @@ ohos_unittest("PointerEventTest") {
   module_out_path = module_output_path
   include_dirs = [ "$root_out_dir/diff_libinput_mmi/export_include" ]
 
-  defines = []
+  defines = input_default_defines
 
-  if (input_feature_mouse) {
-    defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
-  }
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/window_utils_test.cpp",
diff --git a/multimodalinput_mini.gni b/multimodalinput_mini.gni
index 89a735ca67..f843d2f016 100644
--- a/multimodalinput_mini.gni
+++ b/multimodalinput_mini.gni
@@ -50,3 +50,37 @@ print("input_feature_joystick = ${input_feature_joystick}")
 print("input_feature_touchscreen = ${input_feature_touchscreen}")
 print("input_feature_input_device = ${input_feature_input_device}")
 print("input_feature_input_cooperation = ${input_feature_input_cooperation}")
+
+input_default_defines = []
+
+if (input_feature_pointer_drawing) {
+  input_default_defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
+}
+
+if (input_feature_interceptor) {
+  input_default_defines += [ "OHOS_BUILD_ENABLE_INTERCEPTOR" ]
+}
+
+if (input_feature_keyboard) {
+  input_default_defines += [ "OHOS_BUILD_ENABLE_KEYBOARD" ]
+}
+
+if (input_feature_monitor) {
+  input_default_defines += [ "OHOS_BUILD_ENABLE_MONITOR" ]
+}
+
+if (input_feature_input_cooperation) {
+  input_default_defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
+}
+
+if (input_feature_touchscreen) {
+  input_default_defines += [ "OHOS_BUILD_ENABLE_TOUCH" ]
+}
+
+if (input_feature_mouse) {
+  input_default_defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
+}
+
+if (input_feature_joystick) {
+  input_default_defines += [ "OHOS_BUILD_ENABLE_JOYSTICK" ]
+}
diff --git a/service/BUILD.gn b/service/BUILD.gn
index bc4ac75ded..2f2e7bd1d0 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -13,8 +13,16 @@
 
 import("//build/ohos.gni")
 import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
+
 mmi_service_path = "${mmi_path}/service"
 
+ohos_prebuilt_etc("mmi_device_config.ini") {
+  source = "mmi_device_config.ini"
+  relative_install_dir = "."
+  subsystem_name = "multimodalinput"
+  part_name = "input"
+}
+
 config("libmmi_server_config") {
   include_dirs = [
     "input_device_cooperate/include",
@@ -54,354 +62,27 @@ config("libmmi_server_config") {
     "//third_party/cJSON",
   ]
 
-  if (input_feature_input_cooperation) {
-    include_dirs += [
-      "input_device_cooperate/include",
-      "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
-      "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include",
-    ]
-  }
+  defines = input_default_defines
 
-  defines = []
+  service_defines = []
 
   if (input_feature_combination_key) {
-    defines += [ "OHOS_BUILD_ENABLE_COMBINATION_KEY" ]
-  }
-
-  if (input_feature_pointer_drawing) {
-    defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
-  }
-
-  if (input_feature_interceptor) {
-    defines += [ "OHOS_BUILD_ENABLE_INTERCEPTOR" ]
+    service_defines += [ "OHOS_BUILD_ENABLE_COMBINATION_KEY" ]
   }
 
   if (resource_schedule_service_enabled) {
-    defines += [ "OHOS_RSS_CLIENT" ]
-  }
-
-  if (input_feature_pointer_drawing) {
-    defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
-  }
-  if (input_feature_keyboard) {
-    defines += [ "OHOS_BUILD_ENABLE_KEYBOARD" ]
-  }
-
-  if (input_feature_mouse) {
-    defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
-  }
-
-  if (input_feature_touchscreen) {
-    defines += [ "OHOS_BUILD_ENABLE_TOUCH" ]
-  }
-  if (input_feature_monitor) {
-    defines += [ "OHOS_BUILD_ENABLE_MONITOR" ]
+    service_defines += [ "OHOS_RSS_CLIENT" ]
   }
 
   if (input_feature_input_cooperation) {
-    defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
-  }
-
-  if (input_feature_joystick) {
-    defines += [ "OHOS_BUILD_ENABLE_JOYSTICK" ]
+    include_dirs += [
+      "input_device_cooperate/include",
+      "//foundation/deviceprofile/device_profile_core/interfaces/innerkits/core/include",
+      "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include",
+    ]
   }
 }
 
-ohos_prebuilt_etc("multimodalinput_config_ability.json") {
-  source = "key_command/etc/ability_launch_config.json"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Default") {
-  source = "//foundation/multimodalinput/input/util/source_icon/Default.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_East") {
-  source = "//foundation/multimodalinput/input/util/source_icon/East.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_West") {
-  source = "//foundation/multimodalinput/input/util/source_icon/West.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_South") {
-  source = "//foundation/multimodalinput/input/util/source_icon/South.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_North") {
-  source = "//foundation/multimodalinput/input/util/source_icon/North.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_West_East") {
-  source = "//foundation/multimodalinput/input/util/source_icon/West_East.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_North_South") {
-  source = "//foundation/multimodalinput/input/util/source_icon/North_South.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_North_East") {
-  source = "//foundation/multimodalinput/input/util/source_icon/North_East.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_North_West") {
-  source = "//foundation/multimodalinput/input/util/source_icon/North_West.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_South_East") {
-  source = "//foundation/multimodalinput/input/util/source_icon/South_East.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_South_West") {
-  source = "//foundation/multimodalinput/input/util/source_icon/South_West.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_North_East_South_West") {
-  source = "//foundation/multimodalinput/input/util/source_icon/North_East_South_West.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_North_West_South_East") {
-  source = "//foundation/multimodalinput/input/util/source_icon/North_West_South_East.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Cross") {
-  source = "//foundation/multimodalinput/input/util/source_icon/Cross.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Copy") {
-  source = "//foundation/multimodalinput/input/util/source_icon/Copy.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Forbid") {
-  source = "//foundation/multimodalinput/input/util/source_icon/Forbid.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Colorsucker") {
-  source = "//foundation/multimodalinput/input/util/source_icon/Colorsucker.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Hand_Grabbing") {
-  source =
-      "//foundation/multimodalinput/input/util/source_icon/Hand_Grabbing.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Hand_Open") {
-  source = "//foundation/multimodalinput/input/util/source_icon/Hand_Open.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Hand_Pointing") {
-  source =
-      "//foundation/multimodalinput/input/util/source_icon/Hand_Pointing.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Help") {
-  source = "//foundation/multimodalinput/input/util/source_icon/Help.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Move") {
-  source = "//foundation/multimodalinput/input/util/source_icon/Move.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Resize_Left_Right") {
-  source = "//foundation/multimodalinput/input/util/source_icon/Resize_Left_Right.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Resize_Up_Down") {
-  source =
-      "//foundation/multimodalinput/input/util/source_icon/Resize_Up_Down.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Screenshot_Cross") {
-  source =
-      "//foundation/multimodalinput/input/util/source_icon/Screenshot_Cross.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Screenshot_Cursor") {
-  source = "//foundation/multimodalinput/input/util/source_icon/Screenshot_Cursor.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Text_Cursor") {
-  source = "//foundation/multimodalinput/input/util/source_icon/Text_Cursor.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Zoom_In") {
-  source = "//foundation/multimodalinput/input/util/source_icon/Zoom_In.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_Zoom_Out") {
-  source = "//foundation/multimodalinput/input/util/source_icon/Zoom_Out.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_East") {
-  source =
-      "//foundation/multimodalinput/input/util/source_icon/MID_Btn_East.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_West") {
-  source =
-      "//foundation/multimodalinput/input/util/source_icon/MID_Btn_West.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_South") {
-  source =
-      "//foundation/multimodalinput/input/util/source_icon/MID_Btn_South.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_North") {
-  source =
-      "//foundation/multimodalinput/input/util/source_icon/MID_Btn_North.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_North_South") {
-  source = "//foundation/multimodalinput/input/util/source_icon/MID_Btn_North_South.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_North_East") {
-  source = "//foundation/multimodalinput/input/util/source_icon/MID_Btn_North_East.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_North_West") {
-  source = "//foundation/multimodalinput/input/util/source_icon/MID_Btn_North_West.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_South_East") {
-  source = "//foundation/multimodalinput/input/util/source_icon/MID_Btn_South_East.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_South_West") {
-  source = "//foundation/multimodalinput/input/util/source_icon/MID_Btn_South_West.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("drawing_pointer_image_MID_Btn_North_South_West_East") {
-  source = "//foundation/multimodalinput/input/util/source_icon/MID_Btn_North_South_West_East.png"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  relative_install_dir = "multimodalinput/mouse_icon"
-}
-
-ohos_prebuilt_etc("multimodalinput.para.dac") {
-  source = "${mmi_path}/etc/multimodalinput.para.dac"
-  part_name = "input"
-  subsystem_name = "multimodalinput"
-  module_install_dir = "etc/param"
-}
-
 ohos_shared_library("libmmi-server") {
   sources = [
     "//foundation/multimodalinput/input/frameworks/proxy/event_handler/src/bytrace_adapter.cpp",
@@ -482,51 +163,11 @@ ohos_shared_library("libmmi-server") {
   configs = [ ":libmmi_server_config" ]
 
   deps = [
-    ":drawing_pointer_image_Colorsucker",
-    ":drawing_pointer_image_Copy",
-    ":drawing_pointer_image_Cross",
-    ":drawing_pointer_image_Default",
-    ":drawing_pointer_image_East",
-    ":drawing_pointer_image_Forbid",
-    ":drawing_pointer_image_Hand_Grabbing",
-    ":drawing_pointer_image_Hand_Open",
-    ":drawing_pointer_image_Hand_Pointing",
-    ":drawing_pointer_image_Help",
-    ":drawing_pointer_image_MID_Btn_East",
-    ":drawing_pointer_image_MID_Btn_North",
-    ":drawing_pointer_image_MID_Btn_North_East",
-    ":drawing_pointer_image_MID_Btn_North_South",
-    ":drawing_pointer_image_MID_Btn_North_South_West_East",
-    ":drawing_pointer_image_MID_Btn_North_West",
-    ":drawing_pointer_image_MID_Btn_South",
-    ":drawing_pointer_image_MID_Btn_South_East",
-    ":drawing_pointer_image_MID_Btn_South_West",
-    ":drawing_pointer_image_MID_Btn_West",
-    ":drawing_pointer_image_Move",
-    ":drawing_pointer_image_North",
-    ":drawing_pointer_image_North_East",
-    ":drawing_pointer_image_North_East_South_West",
-    ":drawing_pointer_image_North_South",
-    ":drawing_pointer_image_North_West",
-    ":drawing_pointer_image_North_West_South_East",
-    ":drawing_pointer_image_Resize_Left_Right",
-    ":drawing_pointer_image_Resize_Up_Down",
-    ":drawing_pointer_image_Screenshot_Cross",
-    ":drawing_pointer_image_Screenshot_Cursor",
-    ":drawing_pointer_image_South",
-    ":drawing_pointer_image_South_East",
-    ":drawing_pointer_image_South_West",
-    ":drawing_pointer_image_Text_Cursor",
-    ":drawing_pointer_image_West",
-    ":drawing_pointer_image_West_East",
-    ":drawing_pointer_image_Zoom_In",
-    ":drawing_pointer_image_Zoom_Out",
     ":mmi_device_config.ini",
-    ":multimodalinput.para.dac",
-    ":multimodalinput_config_ability.json",
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/multimodalinput/input/etc/mouse_icon:input_mouse_icon",
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
     "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//foundation/multimodalinput/input/service/connect_manager:mmi_connect_manager_service",
@@ -579,13 +220,6 @@ ohos_shared_library("libmmi-server") {
   subsystem_name = "multimodalinput"
 }
 
-ohos_prebuilt_etc("mmi_device_config.ini") {
-  source = "mmi_device_config.ini"
-  relative_install_dir = "."
-  subsystem_name = "multimodalinput"
-  part_name = "input"
-}
-
 import("//build/test.gni")
 module_output_path = "multimodalinput/unit_out"
 
@@ -630,23 +264,7 @@ ohos_unittest("ut-mmi-service-out") {
     "window_manager/test/input_windows_manager_test.cpp",
   ]
 
-  defines = []
-
-  if (input_feature_pointer_drawing) {
-    defines += [ "OHOS_BUILD_ENABLE_POINTER_DRAWING" ]
-  }
-  if (input_feature_keyboard) {
-    defines += [ "OHOS_BUILD_ENABLE_KEYBOARD" ]
-  }
-  if (input_feature_mouse) {
-    defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
-  }
-  if (input_feature_touchscreen) {
-    defines += [ "OHOS_BUILD_ENABLE_TOUCH" ]
-  }
-  if (input_feature_monitor) {
-    defines += [ "OHOS_BUILD_ENABLE_MONITOR" ]
-  }
+  defines = input_default_defines
 
   configs = [ ":libmmi_server_config" ]
 
@@ -675,7 +293,7 @@ ohos_unittest("TransformPointTest") {
 
   sources = [ "touch_event_normalize/test/transform_point_test.cpp" ]
 
-  defines = []
+  defines = input_default_defines
 
   deps = [
     "${mmi_path}/tools/vuinput:libmmi-virtual-device",
diff --git a/service/filter/BUILD.gn b/service/filter/BUILD.gn
index 6d7e23e5f3..4f24769561 100644
--- a/service/filter/BUILD.gn
+++ b/service/filter/BUILD.gn
@@ -55,20 +55,7 @@ ohos_source_set("mmi_event_filter_proxy") {
 
   configs = [ ":mmi_event_filter_config" ]
 
-  defines = []
-
-  if (input_feature_keyboard) {
-    defines += [ "OHOS_BUILD_ENABLE_KEYBOARD" ]
-  }
-  if (input_feature_touchscreen) {
-    defines += [ "OHOS_BUILD_ENABLE_TOUCH" ]
-  }
-  if (input_feature_mouse) {
-    defines += [ "OHOS_BUILD_ENABLE_POINTER" ]
-  }
-  if (input_feature_touchscreen) {
-    defines += [ "OHOS_BUILD_ENABLE_TOUCH" ]
-  }
+  defines = input_default_defines
 
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
diff --git a/service/key_command/etc/ability_launch_config.json b/service/key_command/etc/ability_launch_config.json
deleted file mode 100644
index 37cf22f356..0000000000
--- a/service/key_command/etc/ability_launch_config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "Shortkeys": [
-  ],
-  "Sequences" : [
-  ]
-}
\ No newline at end of file
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 1443804b94..f90ced6cdc 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -24,10 +24,8 @@ config("libmmi_util_public_config") {
     "//foundation/multimodalinput/input/interfaces/native/innerkits/common/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
   ]
-  defines = []
-  if (input_feature_input_cooperation) {
-    defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
-  }
+
+  defines = input_default_defines
 }
 
 ohos_shared_library("libmmi-util") {
@@ -89,10 +87,7 @@ ohos_unittest("ut-mmi-util-out") {
     "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  defines = []
-  if (input_feature_input_cooperation) {
-    defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
-  }
+  defines = input_default_defines
 
   sources = [
     "network/test/net_packet_test.cpp",
@@ -138,10 +133,7 @@ ohos_unittest("RunShellUtilTest") {
     "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  defines = []
-  if (input_feature_input_cooperation) {
-    defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
-  }
+  defines = input_default_defines
 
   sources = [ "common/test/run_shell_util_test.cpp" ]
 
-- 
Gitee


From c8c361499b27d3e4a33e5742c8d54a49d13b7246 Mon Sep 17 00:00:00 2001
From: wangdi <wangdi119@huawei.com>
Date: Wed, 9 Nov 2022 18:54:13 +0800
Subject: [PATCH 123/360] =?UTF-8?q?=E4=BF=AE=E6=94=B9gn=E4=B8=AD=E6=97=A0?=
 =?UTF-8?q?=E6=95=88defines?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangdi <wangdi119@huawei.com>
Change-Id: I2ed5c986b3ed42d3105034f425b5b94bf1564621
---
 service/BUILD.gn | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/service/BUILD.gn b/service/BUILD.gn
index d3c64fe465..ddc05b23e7 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -64,14 +64,12 @@ config("libmmi_server_config") {
 
   defines = input_default_defines
 
-  service_defines = []
-
   if (input_feature_combination_key) {
-    service_defines += [ "OHOS_BUILD_ENABLE_COMBINATION_KEY" ]
+    defines += [ "OHOS_BUILD_ENABLE_COMBINATION_KEY" ]
   }
 
   if (resource_schedule_service_enabled) {
-    service_defines += [ "OHOS_RSS_CLIENT" ]
+    defines += [ "OHOS_RSS_CLIENT" ]
   }
 
   if (input_feature_input_cooperation) {
-- 
Gitee


From 6c1e27ac7f904f6a8c0f7945c2e37ceb8f1d89d2 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Wed, 9 Nov 2022 14:22:06 +0000
Subject: [PATCH 124/360] update
 frameworks/napi/input_device/src/js_event_target.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 .../napi/input_device/src/js_event_target.cpp | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/frameworks/napi/input_device/src/js_event_target.cpp b/frameworks/napi/input_device/src/js_event_target.cpp
index a4364fc1a3..b10d2c4128 100755
--- a/frameworks/napi/input_device/src/js_event_target.cpp
+++ b/frameworks/napi/input_device/src/js_event_target.cpp
@@ -229,7 +229,6 @@ void JsEventTarget::CallIdsAsyncWork(uv_work_t *work, int32_t status)
     napi_value result = nullptr;
     CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, arr, &result), CALL_FUNCTION, scope);
     napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
 }
 
 void JsEventTarget::CallIdsPromiseWork(uv_work_t *work, int32_t status)
@@ -262,7 +261,6 @@ void JsEventTarget::CallIdsPromiseWork(uv_work_t *work, int32_t status)
     }
     CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, arr), RESOLVE_DEFERRED, scope);
     napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
 }
 
 void JsEventTarget::EmitJsIds(int32_t userData, std::vector<int32_t> &ids)
@@ -342,7 +340,6 @@ void JsEventTarget::CallDevAsyncWork(uv_work_t *work, int32_t status)
     CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, object, &result), CALL_FUNCTION,
         scope);
     napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
 }
 
 void JsEventTarget::CallDevPromiseWork(uv_work_t *work, int32_t status)
@@ -371,7 +368,6 @@ void JsEventTarget::CallDevPromiseWork(uv_work_t *work, int32_t status)
     }
     CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, object), RESOLVE_DEFERRED, scope);
     napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
 }
 
 void JsEventTarget::EmitJsDev(int32_t userData, std::shared_ptr<InputDevice> device)
@@ -459,7 +455,6 @@ void JsEventTarget::CallKeystrokeAbilityPromise(uv_work_t *work, int32_t status)
         if (callResult == nullptr) {
             MMI_HILOGE("callResult is nullptr");
             napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
         CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
@@ -477,7 +472,6 @@ void JsEventTarget::CallKeystrokeAbilityPromise(uv_work_t *work, int32_t status)
         CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, callResult), RESOLVE_DEFERRED, scope);
     }
     napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
 }
 
 void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
@@ -513,7 +507,6 @@ void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
         if (callResult[0] == nullptr) {
             MMI_HILOGE("callResult[0] is nullptr");
             napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
@@ -535,7 +528,6 @@ void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
     napi_value result = nullptr;
     CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION, scope);
     napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
 }
 
 void JsEventTarget::EmitSupportKeys(int32_t userData, std::vector<bool> &keystrokeAbility)
@@ -658,7 +650,6 @@ void JsEventTarget::CallKeyboardTypeAsync(uv_work_t *work, int32_t status)
         if (callResult[0] == nullptr) {
             MMI_HILOGE("callResult[0] is nullptr");
             napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
@@ -672,7 +663,6 @@ void JsEventTarget::CallKeyboardTypeAsync(uv_work_t *work, int32_t status)
     CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result),
 	    CALL_FUNCTION, scope);
     napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
 }
 
 void JsEventTarget::CallKeyboardTypePromise(uv_work_t *work, int32_t status)
@@ -709,7 +699,6 @@ void JsEventTarget::CallKeyboardTypePromise(uv_work_t *work, int32_t status)
         if (callResult == nullptr) {
             MMI_HILOGE("callResult is nullptr");
             napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
         CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
@@ -718,7 +707,6 @@ void JsEventTarget::CallKeyboardTypePromise(uv_work_t *work, int32_t status)
         CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, callResult), RESOLVE_DEFERRED, scope);
     }
     napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
 }
 
 void JsEventTarget::CallDevListAsyncWork(uv_work_t *work, int32_t status)
@@ -754,7 +742,6 @@ void JsEventTarget::CallDevListAsyncWork(uv_work_t *work, int32_t status)
         if (callResult[0] == nullptr) {
             MMI_HILOGE("callResult[0] is nullptr");
             napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
@@ -774,7 +761,6 @@ void JsEventTarget::CallDevListAsyncWork(uv_work_t *work, int32_t status)
     napi_value result = nullptr;
     CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION, scope);
     napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
 }
 
 void JsEventTarget::CallDevListPromiseWork(uv_work_t *work, int32_t status)
@@ -809,7 +795,6 @@ void JsEventTarget::CallDevListPromiseWork(uv_work_t *work, int32_t status)
         if (callResult == nullptr) {
             MMI_HILOGE("callResult is nullptr");
             napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
         CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
@@ -825,7 +810,6 @@ void JsEventTarget::CallDevListPromiseWork(uv_work_t *work, int32_t status)
         CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, callResult), RESOLVE_DEFERRED, scope);
     }
     napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
 }
 
 void JsEventTarget::CallDevInfoPromiseWork(uv_work_t *work, int32_t status)
@@ -863,7 +847,6 @@ void JsEventTarget::CallDevInfoPromiseWork(uv_work_t *work, int32_t status)
         if (callResult == nullptr) {
             MMI_HILOGE("callResult is nullptr");
             napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
         CHKRV_SCOPE(cb->env, napi_reject_deferred(cb->env, cb->deferred, callResult), REJECT_DEFERRED, scope);
@@ -877,7 +860,6 @@ void JsEventTarget::CallDevInfoPromiseWork(uv_work_t *work, int32_t status)
         CHKRV_SCOPE(cb->env, napi_resolve_deferred(cb->env, cb->deferred, callResult), RESOLVE_DEFERRED, scope);
     }
     napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
 }
 
 void JsEventTarget::CallDevInfoAsyncWork(uv_work_t *work, int32_t status)
@@ -912,7 +894,6 @@ void JsEventTarget::CallDevInfoAsyncWork(uv_work_t *work, int32_t status)
         if (callResult[0] == nullptr) {
             MMI_HILOGE("callResult[0] is nullptr");
             napi_close_handle_scope(cb->env, scope);
-            JsUtil::DeleteCallbackInfo(std::move(cb));
             return;
         }
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[1]), GET_UNDEFINED, scope);
@@ -926,7 +907,6 @@ void JsEventTarget::CallDevInfoAsyncWork(uv_work_t *work, int32_t status)
     CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION,
         scope);
     napi_close_handle_scope(cb->env, scope);
-    JsUtil::DeleteCallbackInfo(std::move(cb));
 }
 
 void JsEventTarget::AddListener(napi_env env, const std::string &type, napi_value handle)
@@ -1050,7 +1030,6 @@ void JsEventTarget::RemoveCallbackInfo(napi_env env, napi_value handle, int32_t
     auto iter = callback_.find(userData);
     if (iter != callback_.end()) {
         auto cb = std::move(iter->second);
-        JsUtil::DeleteCallbackInfo(std::move(cb));
         callback_.erase(iter);
     }
 }
-- 
Gitee


From 62c206324c623a1a2774aa7c3f768cc0ef922b35 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Wed, 9 Nov 2022 14:30:41 +0000
Subject: [PATCH 125/360] update tools/vuinput/src/virtual_device.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 tools/vuinput/src/virtual_device.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index ac57892d30..b65b2ea664 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -327,10 +327,8 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
         return true;
     }
     RELEASE_RES:
-    if (dir != nullptr) {
-        if (closedir(dir) != 0) {
-            std::cout << "Close dir failed" << std::endl;
-        }
+    if (closedir(dir) != 0) {
+        std::cout << "Close dir failed" << std::endl;
     }
     if (std::remove((g_folderPath + fileName).c_str()) != 0) {
         std::cout << "Remove file failed" << std::endl;
-- 
Gitee


From a1124212d30c1a01c7b9f5905a8c0097fa5c9090 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Wed, 9 Nov 2022 14:33:38 +0000
Subject: [PATCH 126/360] update service/module_loader/src/uds_server.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 service/module_loader/src/uds_server.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp
index 43a2665c28..6cbae144aa 100644
--- a/service/module_loader/src/uds_server.cpp
+++ b/service/module_loader/src/uds_server.cpp
@@ -155,14 +155,10 @@ int32_t UDSServer::AddSocketPairInfo(const std::string& programName,
         OnConnected(sess);
         return RET_OK;
     } while(0);
-    if (serverFd != -1) {
-        close(serverFd);
-        serverFd = IMultimodalInputConnect::INVALID_SOCKET_FD;
-    }
-    if(toReturnClientFd != -1) {
-        close(toReturnClientFd);
-        toReturnClientFd = IMultimodalInputConnect::INVALID_SOCKET_FD;
-    }
+    close(serverFd);
+    serverFd = IMultimodalInputConnect::INVALID_SOCKET_FD;
+    close(toReturnClientFd);
+    toReturnClientFd = IMultimodalInputConnect::INVALID_SOCKET_FD;
     return RET_ERR;
 }
 
-- 
Gitee


From 00773ecbc0944d84c1c8578dabecc94aa360e9d7 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Thu, 10 Nov 2022 01:12:03 +0000
Subject: [PATCH 127/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I9ebd6482b8ed94b37e338e9dc3ce0b2da17cb370
---
 .../event_handler/include/input_handler_manager.h   |  1 +
 .../event_handler/src/input_handler_manager.cpp     | 13 +++++++++++--
 .../proxy/event_handler/src/input_manager_impl.cpp  |  2 +-
 service/device_manager/src/input_device_manager.cpp |  2 +-
 service/event_handler/src/key_auto_repeat.cpp       |  4 ++--
 service/event_handler/src/key_map_manager.cpp       |  2 +-
 service/filter/src/event_filter_handler.cpp         |  5 ++++-
 .../interceptor/src/event_interceptor_handler.cpp   |  2 +-
 service/key_command/src/key_command_handler.cpp     |  6 +++---
 .../window_manager/src/input_windows_manager.cpp    | 11 ++++++++---
 .../window_manager/src/pointer_drawing_manager.cpp  |  5 ++++-
 util/common/src/util.cpp                            |  4 ++--
 12 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/frameworks/proxy/event_handler/include/input_handler_manager.h b/frameworks/proxy/event_handler/include/input_handler_manager.h
index 0b0f94ae0a..0bedee5408 100755
--- a/frameworks/proxy/event_handler/include/input_handler_manager.h
+++ b/frameworks/proxy/event_handler/include/input_handler_manager.h
@@ -77,6 +77,7 @@ private:
 private:
     std::map<int32_t, Handler> inputHandlers_;
     std::map<int32_t, int32_t> processedEvents_;
+    std::set<int32_t> mouseEventIds_;
     std::function<void(int32_t)> monitorCallback_ { nullptr };
     int32_t nextId_ { 1 };
     std::mutex mtxHandlers_;
diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
index 40ba6f7710..35d27e5228 100644
--- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp
+++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
@@ -204,8 +204,13 @@ void InputHandlerManager::GetConsumerInfos(std::shared_ptr<PointerEvent> pointer
         return;
     }
     int32_t tokenType = MultimodalInputConnMgr->GetTokenType();
-    if (tokenType == TokenType::TOKEN_HAP &&
-        pointerEvent->GetSourceType() == PointerEvent::SOURCE_TYPE_TOUCHSCREEN) {
+    if (tokenType != TokenType::TOKEN_HAP) {
+        return;
+    }
+    if (pointerEvent->GetSourceType() == PointerEvent::SOURCE_TYPE_MOUSE) {
+        mouseEventIds_.emplace(pointerEvent->GetId());
+    }
+    if (pointerEvent->GetSourceType() == PointerEvent::SOURCE_TYPE_TOUCHSCREEN) {
         processedEvents_.emplace(pointerEvent->GetId(), consumerCount);
     }
 }
@@ -266,6 +271,10 @@ void InputHandlerManager::OnDispatchEventProcessed(int32_t eventId)
     std::lock_guard<std::mutex> guard(mtxHandlers_);
     MMIClientPtr client = MMIEventHdl.GetMMIClient();
     CHKPV(client);
+    if (mouseEventIds_.find(eventId) != mouseEventIds_.end()) {
+        mouseEventIds_.erase(eventId);
+        return;
+    }
     auto iter = processedEvents_.find(eventId);
     if (iter == processedEvents_.end()) {
         MMI_HILOGE("EventId not in processedEvents_");
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index c347cdf3ea..be29c7de90 100755
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -612,7 +612,7 @@ void InputManagerImpl::OnConnected()
 {
     CALL_DEBUG_ENTER;
     if (displayGroupInfo_.windowsInfo.empty() || displayGroupInfo_.displaysInfo.empty()) {
-        MMI_HILOGE("The windows info or display info is empty");
+        MMI_HILOGI("The windows info or display info is empty");
         return;
     }
     SendDisplayInfo();
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 0421b1a321..a4283e2fce 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -726,8 +726,8 @@ const std::string& InputDeviceManager::GetScreenId(int32_t deviceId) const
             return iter->second;
         }
     }
-#endif // OHOS_BUILD_ENABLE_COOPERATE
     MMI_HILOGE("Find input device screen id failed");
+#endif // OHOS_BUILD_ENABLE_COOPERATE
     return UNKNOWN_SCREEN_ID;
 }
 } // namespace MMI
diff --git a/service/event_handler/src/key_auto_repeat.cpp b/service/event_handler/src/key_auto_repeat.cpp
index 1201a633df..174407266e 100644
--- a/service/event_handler/src/key_auto_repeat.cpp
+++ b/service/event_handler/src/key_auto_repeat.cpp
@@ -48,7 +48,7 @@ int32_t KeyAutoRepeat::AddDeviceConfig(struct libinput_device *device)
     DeviceConfig devConf;
     auto ret = ReadTomlFile(GetTomlFilePath(fileName), devConf);
     if (ret == RET_ERR) {
-        MMI_HILOGE("Read device config file error");
+        MMI_HILOGI("Can not read device config file");
         return RET_ERR;
     }
     int32_t deviceId = InputDevMgr->FindInputDeviceId(device);
@@ -147,7 +147,7 @@ void KeyAutoRepeat::RemoveDeviceConfig(struct libinput_device *device)
     int32_t deviceId = InputDevMgr->FindInputDeviceId(device);
     auto iter = deviceConfig_.find(deviceId);
     if (iter == deviceConfig_.end()) {
-        MMI_HILOGE("Device config file remove failed");
+        MMI_HILOGI("Can not remove device config file");
         return;
     }
     deviceConfig_.erase(iter);
diff --git a/service/event_handler/src/key_map_manager.cpp b/service/event_handler/src/key_map_manager.cpp
index 2675574758..9851668493 100644
--- a/service/event_handler/src/key_map_manager.cpp
+++ b/service/event_handler/src/key_map_manager.cpp
@@ -57,7 +57,7 @@ void KeyMapManager::RemoveKeyValue(struct libinput_device *device)
     int32_t deviceId = InputDevMgr->FindInputDeviceId(device);
     auto iter = configKeyValue_.find(deviceId);
     if (iter == configKeyValue_.end()) {
-        MMI_HILOGE("Device config file does not exist");
+        MMI_HILOGI("Device config file does not exist");
         return;
     }
     configKeyValue_.erase(iter);
diff --git a/service/filter/src/event_filter_handler.cpp b/service/filter/src/event_filter_handler.cpp
index 73a0c3944a..4853d7b225 100644
--- a/service/filter/src/event_filter_handler.cpp
+++ b/service/filter/src/event_filter_handler.cpp
@@ -73,7 +73,10 @@ bool EventFilterHandler::HandlePointerEventFilter(std::shared_ptr<PointerEvent>
     CALL_DEBUG_ENTER;
     CHKPF(point);
     std::lock_guard<std::mutex> guard(lockFilter_);
-    CHKPF(filter_);
+    if (filter_ == nullptr) {
+        MMI_HILOGD("The filter is not setted");
+        return false;
+    }
     if (filter_->HandlePointerEvent(point)) {
         MMI_HILOGD("Call HandlePointerEvent return true");
         return true;
diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp
index 846cf7f7f7..1864f1d53b 100644
--- a/service/interceptor/src/event_interceptor_handler.cpp
+++ b/service/interceptor/src/event_interceptor_handler.cpp
@@ -216,7 +216,7 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
 {
     CHKPF(pointerEvent);
     if (interceptors_.empty()) {
-        MMI_HILOGE("Pointer interceptors is empty");
+        MMI_HILOGI("Interceptors are empty");
         return false;
     }
     MMI_HILOGD("There are currently:%{public}zu interceptors", interceptors_.size());
diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index e4758f51fe..e75304a588 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -640,7 +640,7 @@ bool KeyCommandHandler::OnHandleEvent(const std::shared_ptr<KeyEvent> key)
     }
     if (!HandleShortKeys(key) ||
         !HandleSequences(key)) {
-        MMI_HILOGE("Handle key event failed");
+        MMI_HILOGD("Shortkeys and Sequences is empty");
         return false;
     }
     return true;
@@ -655,12 +655,12 @@ bool KeyCommandHandler::HandleShortKeys(const std::shared_ptr<KeyEvent> keyEvent
         return false;
     }
     if (IsKeyMatch(lastMatchedKey_, keyEvent)) {
-        MMI_HILOGE("The same key is waiting timeout, skip");
+        MMI_HILOGD("The same key is waiting timeout, skip");
         return true;
     }
     DfxHisysevent::GetComboStartTime();
     if (lastMatchedKey_.timerId >= 0) {
-        MMI_HILOGE("Remove timer:%{public}d", lastMatchedKey_.timerId);
+        MMI_HILOGD("Remove timer:%{public}d", lastMatchedKey_.timerId);
         TimerMgr->RemoveTimer(lastMatchedKey_.timerId);
     }
     ResetLastMatchedKey();
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index fcb72b40d5..2647ddbcc8 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -265,8 +265,10 @@ void InputWindowsManager::SendPointerEvent(int32_t pointerAction)
 
     auto fd = udsServer_->GetClientFd(lastWindowInfo_.pid);
     auto sess = udsServer_->GetSession(fd);
-    CHKPV(sess);
-
+    if (sess == nullptr) {
+        MMI_HILOGI("The last window has disappeared");
+        return;
+    }
     NetPacket pkt(MmiMessageId::ON_POINTER_EVENT);
     InputEventDataTransformation::Marshalling(pointerEvent, pkt);
     if (!sess->SendMsg(pkt)) {
@@ -332,7 +334,10 @@ void InputWindowsManager::DispatchPointer(int32_t pointerAction)
         fd = udsServer_->GetClientFd(windowInfo->pid);
     }
     auto sess = udsServer_->GetSession(fd);
-    CHKPV(sess);
+    if (sess == nullptr) {
+        MMI_HILOGI("The last window has disappeared");
+        return;
+    }
 
     NetPacket pkt(MmiMessageId::ON_POINTER_EVENT);
     InputEventDataTransformation::Marshalling(pointerEvent, pkt);
diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
index 9800cdbca8..d23d87bcba 100644
--- a/service/window_manager/src/pointer_drawing_manager.cpp
+++ b/service/window_manager/src/pointer_drawing_manager.cpp
@@ -93,7 +93,10 @@ void PointerDrawingManager::DrawPointer(int32_t displayId, int32_t physicalX, in
 int32_t PointerDrawingManager::InitLayer(const MOUSE_ICON mouseStyle)
 {
     CALL_DEBUG_ENTER;
-    CHKPR(pointerWindow_, RET_ERR);
+    if (pointerWindow_ == nullptr) {
+        MMI_HILOGD("pointerWindow_ is nullptr");
+        return RET_ERR;
+    }
     sptr<OHOS::Surface> layer = GetLayer();
     if (layer == nullptr) {
         pointerWindow_->Destroy();
diff --git a/util/common/src/util.cpp b/util/common/src/util.cpp
index 366aa9e2d8..ea4ad29f3d 100644
--- a/util/common/src/util.cpp
+++ b/util/common/src/util.cpp
@@ -308,7 +308,7 @@ void ReadProFile(const std::string &filePath, int32_t deviceId,
     }
     char realPath[PATH_MAX] = {};
     if (realpath(filePath.c_str(), realPath) == nullptr) {
-        MMI_HILOGE("Path is error");
+        MMI_HILOGI("The realpath return nullptr");
         return;
     }
     if (!IsValidProPath(realPath)) {
@@ -493,7 +493,7 @@ int32_t ReadTomlFile(const std::string &filePath, DeviceConfig &devConf)
     }
     char realPath[PATH_MAX] = {};
     if (realpath(filePath.c_str(), realPath) == nullptr) {
-        MMI_HILOGE("Path is error");
+        MMI_HILOGI("The realpath return nullptr");
         return RET_ERR;
     }
     if (!IsValidTomlPath(realPath)) {
-- 
Gitee


From 1f8f9747bed76d8a11c96fe4a3c5945fc7968a3a Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Thu, 10 Nov 2022 01:17:45 +0000
Subject: [PATCH 128/360] update service/module_loader/src/uds_server.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 service/module_loader/src/uds_server.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp
index 6cbae144aa..c368a518a1 100644
--- a/service/module_loader/src/uds_server.cpp
+++ b/service/module_loader/src/uds_server.cpp
@@ -154,7 +154,7 @@ int32_t UDSServer::AddSocketPairInfo(const std::string& programName,
         }
         OnConnected(sess);
         return RET_OK;
-    } while(0);
+    } while (0);
     close(serverFd);
     serverFd = IMultimodalInputConnect::INVALID_SOCKET_FD;
     close(toReturnClientFd);
-- 
Gitee


From 9822a6f5e57023020b6656ae4d330d8fae067ffb Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Thu, 10 Nov 2022 01:55:16 +0000
Subject: [PATCH 129/360] update tools/vuinput/src/virtual_device.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 tools/vuinput/src/virtual_device.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index b65b2ea664..ac57892d30 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -327,8 +327,10 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
         return true;
     }
     RELEASE_RES:
-    if (closedir(dir) != 0) {
-        std::cout << "Close dir failed" << std::endl;
+    if (dir != nullptr) {
+        if (closedir(dir) != 0) {
+            std::cout << "Close dir failed" << std::endl;
+        }
     }
     if (std::remove((g_folderPath + fileName).c_str()) != 0) {
         std::cout << "Remove file failed" << std::endl;
-- 
Gitee


From 04714909ef5949cbd22f6d763cb9c990aa246412 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 11 Nov 2022 09:17:22 +0800
Subject: [PATCH 130/360] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E5=92=8C=E8=A7=A6?=
 =?UTF-8?q?=E6=91=B8=E5=B1=8F=E5=90=8C=E6=97=B6=E8=BF=9E=E6=8E=A5=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=BC=A0=E6=A0=87=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I2eda32c8f6dcf45bbdfba00b280258b92bcae07c
---
 .../include/input_device_manager.h            |  14 ++-
 .../src/input_device_manager.cpp              | 105 +++++++++++-------
 .../include/i_pointer_drawing_manager.h       |   5 +
 .../include/pointer_drawing_manager.h         |   4 +-
 .../src/input_windows_manager.cpp             |   3 +-
 .../src/pointer_drawing_manager.cpp           |  17 ++-
 6 files changed, 99 insertions(+), 49 deletions(-)

diff --git a/service/device_manager/include/input_device_manager.h b/service/device_manager/include/input_device_manager.h
index bd7c9dd4ce..7691d9a603 100644
--- a/service/device_manager/include/input_device_manager.h
+++ b/service/device_manager/include/input_device_manager.h
@@ -27,6 +27,7 @@
 #include "key_map_manager.h"
 #include "msg_handler.h"
 #include "nocopyable.h"
+#include "pointer_drawing_manager.h"
 #include "singleton.h"
 #include "util.h"
 
@@ -36,11 +37,12 @@ class InputDeviceManager final : public IDeviceObject {
     DECLARE_DELAYED_SINGLETON(InputDeviceManager);
 
     struct InputDeviceInfo {
-        struct libinput_device *inputDeviceOrigin_ { nullptr };
-        std::string networkIdOrigin_;
-        bool isRemote_ { false };
-        bool isPointerDevice_ { false };
-        std::string dhid_;
+        struct libinput_device *inputDeviceOrigin { nullptr };
+        std::string networkIdOrigin;
+        bool isRemote { false };
+        bool isPointerDevice { false };
+        bool isTouchableDevice { false };
+        std::string dhid;
     };
 public:
     DISALLOW_COPY_AND_MOVE(InputDeviceManager);
@@ -73,10 +75,12 @@ public:
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     bool IsKeyboardDevice(struct libinput_device* device) const;
     bool IsPointerDevice(struct libinput_device* device) const;
+    bool IsTouchDevice(struct libinput_device* device) const;
     struct libinput_device* GetKeyboardDevice() const;
 #ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
     bool HasPointerDevice();
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
+    bool HasTouchDevice();
     int32_t SetInputDevice(const std::string& dhid, const std::string& screenId);
     const std::string& GetScreenId(int32_t deviceId) const;
 
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index a4283e2fce..6bf6fb991d 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -76,7 +76,7 @@ std::shared_ptr<InputDevice> InputDeviceManager::GetInputDevice(int32_t id) cons
     std::shared_ptr<InputDevice> inputDevice = std::make_shared<InputDevice>();
     CHKPP(inputDevice);
     inputDevice->SetId(iter->first);
-    struct libinput_device *inputDeviceOrigin = iter->second.inputDeviceOrigin_;
+    struct libinput_device *inputDeviceOrigin = iter->second.inputDeviceOrigin;
     inputDevice->SetType(static_cast<int32_t>(libinput_device_get_tags(inputDeviceOrigin)));
     const char* name = libinput_device_get_name(inputDeviceOrigin);
     inputDevice->SetName((name == nullptr) ? ("null") : (name));
@@ -132,7 +132,7 @@ int32_t InputDeviceManager::SupportKeys(int32_t deviceId, std::vector<int32_t> &
     for (const auto &item : keyCodes) {
         bool ret = false;
         for (const auto &it : KeyMapMgr->InputTransferKeyValue(deviceId, item)) {
-            ret |= libinput_device_has_key(iter->second.inputDeviceOrigin_, it) == SUPPORT_KEY;
+            ret |= libinput_device_has_key(iter->second.inputDeviceOrigin, it) == SUPPORT_KEY;
         }
         keystroke.push_back(ret);
     }
@@ -258,7 +258,7 @@ void InputDeviceManager::RemoveDevListener(SessionPtr sess)
 bool InputDeviceManager::HasPointerDevice()
 {
     for (auto it = inputDevice_.begin(); it != inputDevice_.end(); ++it) {
-        if (it->second.isPointerDevice_) {
+        if (it->second.isPointerDevice) {
             return true;
         }
     }
@@ -266,18 +266,29 @@ bool InputDeviceManager::HasPointerDevice()
 }
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
 
+bool InputDeviceManager::HasTouchDevice()
+{
+    CALL_DEBUG_ENTER;
+    for (auto it = inputDevice_.begin(); it != inputDevice_.end(); ++it) {
+        if (it->second.isTouchableDevice) {
+            return true;
+        }
+    }
+    return false;
+}
+
 void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
 {
     CALL_DEBUG_ENTER;
     CHKPV(inputDevice);
     bool hasLocalPointer = false;
     for (const auto &item : inputDevice_) {
-        if (item.second.inputDeviceOrigin_ == inputDevice) {
+        if (item.second.inputDeviceOrigin == inputDevice) {
             MMI_HILOGI("The device is already existent");
             DfxHisysevent::OnDeviceConnect(item.first, OHOS::HiviewDFX::HiSysEvent::EventType::FAULT);
             return;
         }
-        if (!item.second.isRemote_ && item.second.isPointerDevice_) {
+        if (!item.second.isRemote && item.second.isPointerDevice) {
             hasLocalPointer = true;
         }
     }
@@ -286,13 +297,6 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
         DfxHisysevent::OnDeviceConnect(INT32_MAX, OHOS::HiviewDFX::HiSysEvent::EventType::FAULT);
         return;
     }
-#ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
-    if (IsPointerDevice(inputDevice) && !HasPointerDevice()) {
-#ifdef OHOS_BUILD_ENABLE_POINTER
-        WinMgr->DispatchPointer(PointerEvent::POINTER_ACTION_ENTER_WINDOW);
-#endif // OHOS_BUILD_ENABLE_POINTER
-    }
-#endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
     struct InputDeviceInfo info;
     MakeDeviceInfo(inputDevice, info);
     inputDevice_[nextId_] = info;
@@ -303,28 +307,40 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
     ++nextId_;
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     if (IsKeyboardDevice(inputDevice)) {
-        InputDevCooSM->OnKeyboardOnline(info.dhid_);
+        InputDevCooSM->OnKeyboardOnline(info.dhid);
     }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-    if (info.isPointerDevice_) {
-        bool visible = !info.isRemote_ || hasLocalPointer;
+    if (info.isPointerDevice) {
+        bool visible = !info.isRemote || hasLocalPointer;
+        if (HasTouchDevice()) {
+            IPointerDrawingManager::GetInstance()->SetMouseDisplayState(false);
+        }
         NotifyPointerDevice(true, visible);
         OHOS::system::SetParameter(INPUT_POINTER_DEVICE, "true");
         MMI_HILOGI("Set para input.pointer.device true");
     }
+#ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
+    if (IsPointerDevice(inputDevice) && !HasPointerDevice() &&
+        IPointerDrawingManager::GetInstance()->GetMouseDisplayState()) {
+#ifdef OHOS_BUILD_ENABLE_POINTER
+        WinMgr->DispatchPointer(PointerEvent::POINTER_ACTION_ENTER_WINDOW);
+#endif // OHOS_BUILD_ENABLE_POINTER
+    }
+#endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
     DfxHisysevent::OnDeviceConnect(nextId_ - 1, OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR);
 }
 
 void InputDeviceManager::MakeDeviceInfo(struct libinput_device *inputDevice, struct InputDeviceInfo& info)
 {
-    info.inputDeviceOrigin_ = inputDevice;
-    info.isRemote_ = IsRemote(inputDevice);
-    info.isPointerDevice_ = IsPointerDevice(inputDevice);
+    info.inputDeviceOrigin = inputDevice;
+    info.isRemote = IsRemote(inputDevice);
+    info.isPointerDevice = IsPointerDevice(inputDevice);
+    info.isTouchableDevice = IsTouchDevice(inputDevice);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-    if (info.isRemote_) {
-        info.networkIdOrigin_ = MakeNetworkId(libinput_device_get_phys(inputDevice));
+    if (info.isRemote) {
+        info.networkIdOrigin = MakeNetworkId(libinput_device_get_phys(inputDevice));
     }
-    info.dhid_ = GenerateDescriptor(inputDevice, info.isRemote_);
+    info.dhid = GenerateDescriptor(inputDevice, info.isRemote);
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 }
 
@@ -338,7 +354,7 @@ void InputDeviceManager::OnInputDeviceRemoved(struct libinput_device *inputDevic
     std::vector<std::string> dhids;
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     for (auto it = inputDevice_.begin(); it != inputDevice_.end(); ++it) {
-        if (it->second.inputDeviceOrigin_ == inputDevice) {
+        if (it->second.inputDeviceOrigin == inputDevice) {
             deviceId = it->first;
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
             removedInfo = it->second;
@@ -350,7 +366,8 @@ void InputDeviceManager::OnInputDeviceRemoved(struct libinput_device *inputDevic
         }
     }
 #ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
-    if (IsPointerDevice(inputDevice) && !HasPointerDevice()) {
+    if (IsPointerDevice(inputDevice) && !HasPointerDevice() &&
+        IPointerDrawingManager::GetInstance()->GetMouseDisplayState()) {
 #ifdef OHOS_BUILD_ENABLE_POINTER
         WinMgr->DispatchPointer(PointerEvent::POINTER_ACTION_LEAVE_WINDOW);
 #endif // OHOS_BUILD_ENABLE_POINTER
@@ -363,7 +380,7 @@ void InputDeviceManager::OnInputDeviceRemoved(struct libinput_device *inputDevic
     ScanPointerDevice();
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     if (IsPointerDevice(inputDevice)) {
-        InputDevCooSM->OnPointerOffline(removedInfo.dhid_, removedInfo.networkIdOrigin_, dhids);
+        InputDevCooSM->OnPointerOffline(removedInfo.dhid, removedInfo.networkIdOrigin, dhids);
     }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     if (deviceId == INVALID_DEVICE_ID) {
@@ -375,7 +392,7 @@ void InputDeviceManager::ScanPointerDevice()
 {
     bool hasPointerDevice = false;
     for (auto it = inputDevice_.begin(); it != inputDevice_.end(); ++it) {
-        if (it->second.isPointerDevice_) {
+        if (it->second.isPointerDevice) {
             hasPointerDevice = true;
             break;
         }
@@ -404,6 +421,12 @@ bool InputDeviceManager::IsKeyboardDevice(struct libinput_device* device) const
     return udevTags & EVDEV_UDEV_TAG_KEYBOARD;
 }
 
+bool InputDeviceManager::IsTouchDevice(struct libinput_device* device) const
+{
+    CHKPF(device);
+    return libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TOUCH);
+}
+
 void InputDeviceManager::Attach(std::shared_ptr<IDeviceObserver> observer)
 {
     CALL_DEBUG_ENTER;
@@ -429,7 +452,7 @@ int32_t InputDeviceManager::FindInputDeviceId(struct libinput_device* inputDevic
     CALL_DEBUG_ENTER;
     CHKPR(inputDevice, INVALID_DEVICE_ID);
     for (const auto &item : inputDevice_) {
-        if (item.second.inputDeviceOrigin_ == inputDevice) {
+        if (item.second.inputDeviceOrigin == inputDevice) {
             MMI_HILOGI("Find input device id success");
             return item.first;
         }
@@ -445,7 +468,7 @@ struct libinput_device* InputDeviceManager::GetKeyboardDevice() const
     keyCodes.push_back(KeyEvent::KEYCODE_Q);
     keyCodes.push_back(KeyEvent::KEYCODE_NUMPAD_1);
     for (const auto &item : inputDevice_) {
-        const auto &device = item.second.inputDeviceOrigin_;
+        const auto &device = item.second.inputDeviceOrigin;
         if (IsMatchKeys(device, keyCodes)) {
             MMI_HILOGI("Find keyboard device success");
             return device;
@@ -524,7 +547,7 @@ bool InputDeviceManager::IsRemote(int32_t id) const
     bool isRemote = false;
     auto device = inputDevice_.find(id);
     if (device != inputDevice_.end()) {
-        isRemote = device->second.isRemote_;
+        isRemote = device->second.isRemote;
     }
     MMI_HILOGD("isRemote:%{public}s", isRemote ? "true" : "false");
     return isRemote;
@@ -539,17 +562,17 @@ std::vector<std::string> InputDeviceManager::GetCooperateDhids(int32_t deviceId)
         MMI_HILOGI("Find pointer id failed");
         return dhids;
     }
-    if (!iter->second.isPointerDevice_) {
+    if (!iter->second.isPointerDevice) {
         MMI_HILOGI("Not pointer device");
         return dhids;
     }
-    dhids.push_back(iter->second.dhid_);
+    dhids.push_back(iter->second.dhid);
     MMI_HILOGI("unq: %{public}s, type:%{public}s", dhids.back().c_str(), "pointer");
-    auto pointerNetworkId = iter->second.networkIdOrigin_;
+    auto pointerNetworkId = iter->second.networkIdOrigin;
     std::string localNetworkId = GetLocalDeviceId();
-    pointerNetworkId = iter->second.isRemote_ ? iter->second.networkIdOrigin_ : localNetworkId;
+    pointerNetworkId = iter->second.isRemote ? iter->second.networkIdOrigin : localNetworkId;
     for (const auto &item : inputDevice_) {
-        auto networkId = item.second.isRemote_ ? item.second.networkIdOrigin_ : localNetworkId;
+        auto networkId = item.second.isRemote ? item.second.networkIdOrigin : localNetworkId;
         if (networkId != pointerNetworkId) {
             continue;
         }
@@ -559,7 +582,7 @@ std::vector<std::string> InputDeviceManager::GetCooperateDhids(int32_t deviceId)
             return dhids;
         }
         if (keyboardType == KEYBOARD_TYPE_ALPHABETICKEYBOARD) {
-            dhids.push_back(item.second.dhid_);
+            dhids.push_back(item.second.dhid);
             MMI_HILOGI("unq: %{public}s, type:%{public}s", dhids.back().c_str(), "supportkey");
         }
     }
@@ -570,7 +593,7 @@ std::vector<std::string> InputDeviceManager::GetCooperateDhids(const std::string
 {
     int32_t inputDeviceId = INVALID_DEVICE_ID;
     for (const auto &iter : inputDevice_) {
-        if (iter.second.dhid_ == dhid) {
+        if (iter.second.dhid == dhid) {
             inputDeviceId = iter.first;
             break;
         }
@@ -585,7 +608,7 @@ std::string InputDeviceManager::GetOriginNetworkId(int32_t id)
         MMI_HILOGE("Failed to search for the device: id %{public}d", id);
         return "";
     }
-    auto networkId = iter->second.networkIdOrigin_;
+    auto networkId = iter->second.networkIdOrigin;
     if (networkId.empty()) {
         networkId = GetLocalDeviceId();
     }
@@ -599,8 +622,8 @@ std::string InputDeviceManager::GetOriginNetworkId(const std::string &dhid)
     }
     std::string networkId;
     for (const auto &iter : inputDevice_) {
-        if (iter.second.isRemote_ && iter.second.dhid_ == dhid) {
-            networkId = iter.second.networkIdOrigin_;
+        if (iter.second.isRemote && iter.second.dhid == dhid) {
+            networkId = iter.second.networkIdOrigin;
             break;
         }
     }
@@ -611,7 +634,7 @@ std::string InputDeviceManager::GetDhid(int32_t deviceId) const
 {
     auto dev = inputDevice_.find(deviceId);
     if (dev != inputDevice_.end()) {
-        return dev->second.dhid_;
+        return dev->second.dhid;
     }
     return "";
 }
@@ -619,7 +642,7 @@ std::string InputDeviceManager::GetDhid(int32_t deviceId) const
 bool InputDeviceManager::HasLocalPointerDevice() const
 {
     for (auto it = inputDevice_.begin(); it != inputDevice_.end(); ++it) {
-        if (!it->second.isRemote_ && it->second.isPointerDevice_) {
+        if (!it->second.isRemote && it->second.isPointerDevice) {
             return true;
         }
     }
@@ -721,7 +744,7 @@ const std::string& InputDeviceManager::GetScreenId(int32_t deviceId) const
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     auto item = inputDevice_.find(deviceId);
     if (item != inputDevice_.end()) {
-        auto iter = inputDeviceScreens_.find(item->second.dhid_);
+        auto iter = inputDeviceScreens_.find(item->second.dhid);
         if (iter != inputDeviceScreens_.end()) {
             return iter->second;
         }
diff --git a/service/window_manager/include/i_pointer_drawing_manager.h b/service/window_manager/include/i_pointer_drawing_manager.h
index 448bcb2f31..26ccb861fc 100644
--- a/service/window_manager/include/i_pointer_drawing_manager.h
+++ b/service/window_manager/include/i_pointer_drawing_manager.h
@@ -57,6 +57,11 @@ public:
         return false;
     }
     virtual void SetPointerLocation(int32_t pid, int32_t x, int32_t y) {}
+    virtual void SetMouseDisplayState(bool state) {}
+    virtual bool GetMouseDisplayState() const
+    {
+        return true;
+    }
 public:
     static inline std::shared_ptr<IPointerDrawingManager> iPointDrawMgr_ { nullptr };
 };
diff --git a/service/window_manager/include/pointer_drawing_manager.h b/service/window_manager/include/pointer_drawing_manager.h
index 1dbccbe079..5403b67c75 100644
--- a/service/window_manager/include/pointer_drawing_manager.h
+++ b/service/window_manager/include/pointer_drawing_manager.h
@@ -59,7 +59,8 @@ public:
     bool IsPointerVisible() override;
     void SetPointerLocation(int32_t pid, int32_t x, int32_t y) override;
     void AdjustMouseFocus(ICON_TYPE iconType, int32_t &physicalX, int32_t &physicalY);
-
+    void SetMouseDisplayState(bool state) override;
+    bool GetMouseDisplayState() const override;
 private:
     void CreatePointerWindow(int32_t displayId, int32_t physicalX, int32_t physicalY);
     sptr<OHOS::Surface> GetLayer();
@@ -93,6 +94,7 @@ private:
     int32_t imageHeight_ { 0 };
     std::map<MOUSE_ICON, IconStyle> mouseIcons_;
     std::list<PidInfo> pidInfos_;
+    bool mouseDisplayState_ { false };
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 2647ddbcc8..b3b50ee4d4 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -838,12 +838,12 @@ int32_t InputWindowsManager::UpdateMouseTarget(std::shared_ptr<PointerEvent> poi
         MMI_HILOGE("Get pointer style failed, pointerStyleInfo is nullptr");
         return ret;
     }
+    IPointerDrawingManager::GetInstance()->SetMouseDisplayState(true);
     IPointerDrawingManager::GetInstance()->UpdateDisplayInfo(*physicalDisplayInfo);
     WinInfo info = { .windowPid = touchWindow->pid, .windowId = touchWindow->id };
     IPointerDrawingManager::GetInstance()->OnWindowInfo(info);
     IPointerDrawingManager::GetInstance()->DrawPointer(displayId, pointerItem.GetDisplayX(),
         pointerItem.GetDisplayY(), MOUSE_ICON(mouseStyle));
-
     pointerEvent->SetTargetWindowId(touchWindow->id);
     pointerEvent->SetAgentWindowId(touchWindow->agentWindowId);
     int32_t windowX = logicalX - touchWindow->area.x;
@@ -939,6 +939,7 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
                "displayId:%{public}d,TargetWindowId:%{public}d,AgentWindowId:%{public}d",
                touchWindow->pid, logicalX, logicalY, physicalX, physicalY,
                windowX, windowY, displayId, pointerEvent->GetTargetWindowId(), pointerEvent->GetAgentWindowId());
+    IPointerDrawingManager::GetInstance()->SetMouseDisplayState(false);
     return ERR_OK;
 }
 #endif // OHOS_BUILD_ENABLE_TOUCH
diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
index 4179c015ae..dc93ec7140 100644
--- a/service/window_manager/src/pointer_drawing_manager.cpp
+++ b/service/window_manager/src/pointer_drawing_manager.cpp
@@ -149,6 +149,21 @@ void PointerDrawingManager::AdjustMouseFocus(ICON_TYPE iconType, int32_t &physic
     }
 }
 
+
+void PointerDrawingManager::SetMouseDisplayState(bool state)
+{
+    CALL_DEBUG_ENTER;
+    if (mouseDisplayState_ != state) {
+        mouseDisplayState_ = state;
+        InitLayer(MOUSE_ICON(lastMouseStyle_));
+    }
+}
+
+bool PointerDrawingManager::GetMouseDisplayState() const
+{
+    return mouseDisplayState_;
+}
+    
 void PointerDrawingManager::FixCursorPosition(int32_t &physicalX, int32_t &physicalY)
 {
     if (physicalX < 0) {
@@ -409,7 +424,7 @@ void PointerDrawingManager::UpdatePointerVisible()
 {
     CALL_DEBUG_ENTER;
     CHKPV(pointerWindow_);
-    if (IsPointerVisible()) {
+    if (IsPointerVisible() && mouseDisplayState_) {
         pointerWindow_->Show();
         MMI_HILOGD("Pointer window show success");
     } else {
-- 
Gitee


From e834d60143548949721ec811c41b9513cf1c34dd Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Thu, 10 Nov 2022 08:27:40 +0000
Subject: [PATCH 131/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: Ieb0d08696b226b2549d3bea03bb50b423f3ef73a
---
 .../include/server_msg_handler.h              |  6 +++
 .../message_handle/src/server_msg_handler.cpp | 43 +++++++++++--------
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
index 24f66b67e3..9128a44ffa 100644
--- a/service/message_handle/include/server_msg_handler.h
+++ b/service/message_handle/include/server_msg_handler.h
@@ -65,6 +65,12 @@ protected:
     int32_t MarkProcessed(SessionPtr sess, NetPacket& pkt);
     int32_t OnRegisterMsgHandler(SessionPtr sess, NetPacket& pkt);
     int32_t OnDisplayInfo(SessionPtr sess, NetPacket& pkt);
+
+private:
+#ifdef OHOS_BUILD_ENABLE_TOUCH
+    void FixTargetWindowId(std::shared_ptr<PointerEvent> pointerEvent, int32_t action);
+#endif // OHOS_BUILD_ENABLE_TOUCH
+
 private:
     UDSServer *udsServer_ { nullptr };
     int32_t targetWindowId_ { -1 };
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index 5054316632..718c61b259 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -140,29 +140,13 @@ int32_t ServerMsgHandler::OnInjectPointerEvent(const std::shared_ptr<PointerEven
     CHKPR(pointerEvent, ERROR_NULL_POINTER);
     pointerEvent->UpdateId();
     int32_t action = pointerEvent->GetPointerAction();
-    if ((action == PointerEvent::POINTER_ACTION_MOVE || action == PointerEvent::POINTER_ACTION_UP)
-        && targetWindowId_ > 0) {
-        pointerEvent->SetTargetWindowId(targetWindowId_);
-        PointerEvent::PointerItem pointerItem;
-        auto pointerIds = pointerEvent->GetPointerIds();
-        if (pointerIds.empty()) {
-            MMI_HILOGE("GetPointerIds is empty");
-            return RET_ERR;
-        }
-        auto id = pointerIds.front();
-        if (!pointerEvent->GetPointerItem(id, pointerItem)) {
-            MMI_HILOGE("Can't find pointer item");
-            return RET_ERR;
-        }
-        pointerItem.SetTargetWindowId(targetWindowId_);
-        pointerEvent->UpdatePointerItem(id, pointerItem);
-    }
     auto source = pointerEvent->GetSourceType();
     switch (source) {
         case PointerEvent::SOURCE_TYPE_TOUCHSCREEN: {
 #ifdef OHOS_BUILD_ENABLE_TOUCH
             auto inputEventNormalizeHandler = InputHandler->GetEventNormalizeHandler();
             CHKPR(inputEventNormalizeHandler, ERROR_NULL_POINTER);
+            FixTargetWindowId(pointerEvent, action);
             inputEventNormalizeHandler->HandleTouchEvent(pointerEvent);
 #endif // OHOS_BUILD_ENABLE_TOUCH
             break;
@@ -187,13 +171,36 @@ int32_t ServerMsgHandler::OnInjectPointerEvent(const std::shared_ptr<PointerEven
             break;
         }
     }
-    if (action == PointerEvent::POINTER_ACTION_DOWN) {
+    if (source == PointerEvent::SOURCE_TYPE_TOUCHSCREEN && action == PointerEvent::POINTER_ACTION_DOWN) {
         targetWindowId_ = pointerEvent->GetTargetWindowId();
     }
     return RET_OK;
 }
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 
+#ifdef OHOS_BUILD_ENABLE_TOUCH
+void ServerMsgHandler::FixTargetWindowId(std::shared_ptr<PointerEvent> pointerEvent, int32_t action)
+{
+    if (action == PointerEvent::POINTER_ACTION_DOWN || targetWindowId_ < 0) {
+        return;
+    }
+    pointerEvent->SetTargetWindowId(targetWindowId_);
+    PointerEvent::PointerItem pointerItem;
+    auto pointerIds = pointerEvent->GetPointerIds();
+    if (pointerIds.empty()) {
+        MMI_HILOGE("GetPointerIds is empty");
+        return;
+    }
+    auto id = pointerIds.front();
+    if (!pointerEvent->GetPointerItem(id, pointerItem)) {
+        MMI_HILOGE("Can't find pointer item");
+        return;
+    }
+    pointerItem.SetTargetWindowId(targetWindowId_);
+    pointerEvent->UpdatePointerItem(id, pointerItem);
+}
+#endif // OHOS_BUILD_ENABLE_TOUCH
+
 int32_t ServerMsgHandler::OnDisplayInfo(SessionPtr sess, NetPacket &pkt)
 {
     CALL_DEBUG_ENTER;
-- 
Gitee


From 23033ef7396213beb3bc432e83376a9351aa5609 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 11 Nov 2022 11:35:12 +0800
Subject: [PATCH 132/360] =?UTF-8?q?fuzz=E5=A4=B1=E8=B4=A5=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I287ca7f3e935192b3129334efa92c4449b057b9d
---
 test/fuzztest/getdevice_fuzzer/getdevice_fuzzer.cpp        | 7 ++++++-
 .../removeinterceptor_fuzzer/removeinterceptor_fuzzer.cpp  | 7 ++++++-
 .../startinputdevicecooperate_fuzzer.cpp                   | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/test/fuzztest/getdevice_fuzzer/getdevice_fuzzer.cpp b/test/fuzztest/getdevice_fuzzer/getdevice_fuzzer.cpp
index dba55f714b..fcc31d9692 100755
--- a/test/fuzztest/getdevice_fuzzer/getdevice_fuzzer.cpp
+++ b/test/fuzztest/getdevice_fuzzer/getdevice_fuzzer.cpp
@@ -38,7 +38,12 @@ void GetDeviceFuzzTest(const uint8_t* data, size_t /* size */)
 /* Fuzzer entry point */
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
-    /* Run your code on data */
+    if (data == nullptr) {
+        return 0;
+    }
+    if (size < sizeof(int32_t)) {
+        return 0;
+    }
     OHOS::MMI::GetDeviceFuzzTest(data, size);
     return 0;
 }
diff --git a/test/fuzztest/removeinterceptor_fuzzer/removeinterceptor_fuzzer.cpp b/test/fuzztest/removeinterceptor_fuzzer/removeinterceptor_fuzzer.cpp
index 0f8304d502..6079d1a2af 100755
--- a/test/fuzztest/removeinterceptor_fuzzer/removeinterceptor_fuzzer.cpp
+++ b/test/fuzztest/removeinterceptor_fuzzer/removeinterceptor_fuzzer.cpp
@@ -40,7 +40,12 @@ void RemoveInterceptorFuzzTest(const uint8_t* data, size_t /* size */)
 /* Fuzzer entry point */
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
-    /* Run your code on data */
+    if (data == nullptr) {
+        return 0;
+    }
+    if (size < sizeof(int32_t)) {
+        return 0;
+    }
     OHOS::MMI::RemoveInterceptorFuzzTest(data, size);
     return 0;
 }
diff --git a/test/fuzztest/startinputdevicecooperate_fuzzer/startinputdevicecooperate_fuzzer.cpp b/test/fuzztest/startinputdevicecooperate_fuzzer/startinputdevicecooperate_fuzzer.cpp
index 409d8a5cee..af0f89b5a8 100644
--- a/test/fuzztest/startinputdevicecooperate_fuzzer/startinputdevicecooperate_fuzzer.cpp
+++ b/test/fuzztest/startinputdevicecooperate_fuzzer/startinputdevicecooperate_fuzzer.cpp
@@ -42,7 +42,12 @@ void StartInputDeviceCooperateFuzzTest(const uint8_t* data, size_t  size)
 /* Fuzzer entry point */
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
-    /* Run your code on data */
+    if (data == nullptr) {
+        return 0;
+    }
+    if (size < sizeof(int32_t)) {
+        return 0;
+    }
     OHOS::MMI::StartInputDeviceCooperateFuzzTest(data, size);
     return 0;
 }
-- 
Gitee


From 1debbc734bad0a954ce05a35f9509540e0dc4319 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Mon, 14 Nov 2022 06:55:09 +0000
Subject: [PATCH 133/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I2fe8af0f7e30d4f711daae57deab99a1d4de7ef7
---
 .../include/pointer_drawing_manager.h         |  2 -
 .../src/pointer_drawing_manager.cpp           | 70 ++++++++++---------
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/service/window_manager/include/pointer_drawing_manager.h b/service/window_manager/include/pointer_drawing_manager.h
index 5403b67c75..2e5a0ddf79 100644
--- a/service/window_manager/include/pointer_drawing_manager.h
+++ b/service/window_manager/include/pointer_drawing_manager.h
@@ -70,9 +70,7 @@ private:
     void DrawManager();
     void FixCursorPosition(int32_t &physicalX, int32_t &physicalY);
     std::unique_ptr<OHOS::Media::PixelMap> DecodeImageToPixelMap(const std::string &imagePath);
-    void DeletePidInfo(int32_t pid);
     void UpdatePointerVisible();
-    void UpdatePidInfo(int32_t pid, bool visible);
     void InitStyle();
     int32_t InitLayer(const MOUSE_ICON mouseStyle);
 
diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
index dc93ec7140..83e263310d 100644
--- a/service/window_manager/src/pointer_drawing_manager.cpp
+++ b/service/window_manager/src/pointer_drawing_manager.cpp
@@ -68,6 +68,7 @@ void PointerDrawingManager::DrawPointer(int32_t displayId, int32_t physicalX, in
             MMI_HILOGE("Init layer failed");
             return;
         }
+        UpdatePointerVisible();
         MMI_HILOGD("Leave, display:%{public}d,physicalX:%{public}d,physicalY:%{public}d",
             displayId, physicalX, physicalY);
         return;
@@ -80,7 +81,8 @@ void PointerDrawingManager::DrawPointer(int32_t displayId, int32_t physicalX, in
         MMI_HILOGE("Init layer failed");
         return;
     }
-
+    pointerWindow_->Show();
+    MMI_HILOGD("Pointer window show success");
     MMI_HILOGD("Leave, display:%{public}d,physicalX:%{public}d,physicalY:%{public}d",
         displayId, physicalX, physicalY);
 }
@@ -124,7 +126,6 @@ int32_t PointerDrawingManager::InitLayer(const MOUSE_ICON mouseStyle)
         return RET_ERR;
     }
     MMI_HILOGD("Init layer success");
-    UpdatePointerVisible();
     return RET_OK;
 }
 
@@ -155,7 +156,10 @@ void PointerDrawingManager::SetMouseDisplayState(bool state)
     CALL_DEBUG_ENTER;
     if (mouseDisplayState_ != state) {
         mouseDisplayState_ = state;
-        InitLayer(MOUSE_ICON(lastMouseStyle_));
+        if (mouseDisplayState_) {
+            InitLayer(MOUSE_ICON(lastMouseStyle_));
+        }
+        UpdatePointerVisible();
     }
 }
 
@@ -349,7 +353,11 @@ void PointerDrawingManager::UpdatePointerDevice(bool hasPointerDevice, bool isPo
 {
     CALL_DEBUG_ENTER;
     hasPointerDevice_ = hasPointerDevice;
-    SetPointerVisible(getpid(), isPointerVisible);
+    if (hasPointerDevice_) {
+        SetPointerVisible(getpid(), isPointerVisible);
+    } else {
+        DeletePointerVisible(getpid());
+    }
     DrawManager();
 }
 
@@ -396,30 +404,6 @@ std::shared_ptr<IPointerDrawingManager> IPointerDrawingManager::GetInstance()
     return iPointDrawMgr_;
 }
 
-void PointerDrawingManager::DeletePidInfo(int32_t pid)
-{
-    CALL_DEBUG_ENTER;
-    for (auto it = pidInfos_.begin(); it != pidInfos_.end(); ++it) {
-        if (it->pid == pid) {
-            pidInfos_.erase(it);
-            return;
-        }
-    }
-}
-
-void PointerDrawingManager::UpdatePidInfo(int32_t pid, bool visible)
-{
-    CALL_DEBUG_ENTER;
-    for (auto it = pidInfos_.begin(); it != pidInfos_.end(); ++it) {
-        if (it->pid == pid) {
-            pidInfos_.erase(it);
-            break;
-        }
-    }
-    PidInfo info = { .pid = pid, .visible = visible };
-    pidInfos_.push_back(info);
-}
-
 void PointerDrawingManager::UpdatePointerVisible()
 {
     CALL_DEBUG_ENTER;
@@ -448,15 +432,36 @@ bool PointerDrawingManager::IsPointerVisible()
 void PointerDrawingManager::DeletePointerVisible(int32_t pid)
 {
     CALL_DEBUG_ENTER;
-    DeletePidInfo(pid);
-    UpdatePointerVisible();
+    auto it = pidInfos_.begin();
+    for (; it != pidInfos_.end(); ++it) {
+        if (it->pid == pid) {
+            pidInfos_.erase(it);
+            break;
+        }
+    }
+    if (it != pidInfos_.end()) {
+        if (IsPointerVisible()) {
+            InitLayer(MOUSE_ICON(lastMouseStyle_));
+        }
+        UpdatePointerVisible();
+    }
 }
 
 int32_t PointerDrawingManager::SetPointerVisible(int32_t pid, bool visible)
 {
     CALL_DEBUG_ENTER;
-    UpdatePidInfo(pid, visible);
-    InitLayer(MOUSE_ICON(lastMouseStyle_));
+    for (auto it = pidInfos_.begin(); it != pidInfos_.end(); ++it) {
+        if (it->pid == pid) {
+            pidInfos_.erase(it);
+            break;
+        }
+    }
+    PidInfo info = { .pid = pid, .visible = visible };
+    pidInfos_.push_back(info);
+    if (visible) {
+        InitLayer(MOUSE_ICON(lastMouseStyle_));
+    }
+    UpdatePointerVisible();
     return RET_OK;
 }
 
@@ -512,6 +517,7 @@ int32_t PointerDrawingManager::SetPointerStyle(int32_t pid, int32_t windowId, in
             MMI_HILOGE("Init layer failed");
             return RET_ERR;
         }
+        UpdatePointerVisible();
     }
     MMI_HILOGD("Window id:%{public}d set pointer style:%{public}d success", windowId, pointerStyle);
     return RET_OK;
-- 
Gitee


From 82401b89ea1f3879884946795624ded8d5481b6e Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Mon, 14 Nov 2022 18:57:28 +0800
Subject: [PATCH 134/360] Signed-off-by:wuliangdong<wuliangdong1@huawei.com>

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
Change-Id: I15c485101a98e420379388635890d3e16570ffbc
---
 .../napi/input_device/src/js_event_target.cpp  | 18 +++++++++++++++---
 .../src/js_input_device_context.cpp            |  5 ++++-
 service/delegate_task/include/delegate_tasks.h |  2 +-
 service/delegate_task/src/delegate_tasks.cpp   | 13 +++++++++++++
 .../libinput_adapter/src/libinput_adapter.cpp  |  3 ++-
 tools/vuinput/src/virtual_device.cpp           |  1 +
 util/socket/src/uds_socket.cpp                 |  2 ++
 7 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/frameworks/napi/input_device/src/js_event_target.cpp b/frameworks/napi/input_device/src/js_event_target.cpp
index 3ddeae113a..06d097e4ba 100755
--- a/frameworks/napi/input_device/src/js_event_target.cpp
+++ b/frameworks/napi/input_device/src/js_event_target.cpp
@@ -398,7 +398,11 @@ void JsEventTarget::EmitJsDev(int32_t userData, std::shared_ptr<InputDevice> dev
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
-    CHKPV(uData);
+    if (uData == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check uData is nullptr");
+        return;
+    }
     work->data = static_cast<void*>(uData);
     int32_t ret;
     if (iter->second->isApi9) {
@@ -547,7 +551,11 @@ void JsEventTarget::EmitSupportKeys(int32_t userData, std::vector<bool> &keystro
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
-    CHKPV(uData);
+    if (uData == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check data is null");
+        return;
+    }
     work->data = static_cast<void*>(uData);
     int32_t ret;
     if (iter->second->ref == nullptr) {
@@ -586,7 +594,11 @@ void JsEventTarget::EmitJsKeyboardType(int32_t userData, int32_t keyboardType)
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
-    CHKPV(uData);
+    if (uData == nullptr) {
+        JsUtil::DeletePtr<uv_work_t*>(work);
+        MMI_HILOGE("Check uDdata is nullptr");
+        return;
+    }
     work->data = static_cast<void*>(uData);
     int32_t ret = 0;
     if (iter->second->ref == nullptr) {
diff --git a/frameworks/napi/input_device/src/js_input_device_context.cpp b/frameworks/napi/input_device/src/js_input_device_context.cpp
index 111d03bc16..b701ab188c 100644
--- a/frameworks/napi/input_device/src/js_input_device_context.cpp
+++ b/frameworks/napi/input_device/src/js_input_device_context.cpp
@@ -93,7 +93,10 @@ napi_value JsInputDeviceContext::JsConstructor(napi_env env, napi_callback_info
     napi_status status = napi_wrap(env, thisVar, jsContext, [](napi_env env, void* data, void* hin) {
         MMI_HILOGI("jsvm ends");
         JsInputDeviceContext *context = static_cast<JsInputDeviceContext*>(data);
-        delete context;
+        if (context != nullptr) {
+            delete context;
+            context = nullptr;
+        }
     }, nullptr, nullptr);
     if (status != napi_ok) {
         delete jsContext;
diff --git a/service/delegate_task/include/delegate_tasks.h b/service/delegate_task/include/delegate_tasks.h
index 457426a678..c5d2a98547 100644
--- a/service/delegate_task/include/delegate_tasks.h
+++ b/service/delegate_task/include/delegate_tasks.h
@@ -68,7 +68,7 @@ public:
 
 public:
     DelegateTasks() = default;
-    ~DelegateTasks() override = default;
+    ~DelegateTasks();
 
     bool Init();
     void ProcessTasks();
diff --git a/service/delegate_task/src/delegate_tasks.cpp b/service/delegate_task/src/delegate_tasks.cpp
index 71fd9e3fb8..98181db164 100644
--- a/service/delegate_task/src/delegate_tasks.cpp
+++ b/service/delegate_task/src/delegate_tasks.cpp
@@ -42,6 +42,17 @@ void DelegateTasks::Task::ProcessTask()
     }
 }
 
+DelegateTasks::~DelegateTasks() {
+    if (fds_[0] >= 0) {
+        close(fds_[0]);
+        fds_[0] = -1;
+    }
+    if (fds_[1] >= 0) {
+        close(fds_[1]);
+        fds_[1] = -1;
+    }
+}
+
 bool DelegateTasks::Init()
 {
     CALL_DEBUG_ENTER;
@@ -52,10 +63,12 @@ bool DelegateTasks::Init()
     }
     if (fcntl(fds_[0], F_SETFL, O_NONBLOCK) == -1) {
         MMI_HILOGE("The fcntl read failed,errno:%{public}d", errno);
+        close(fds_[0]);
         return false;
     }
     if (fcntl(fds_[1], F_SETFL, O_NONBLOCK) == -1) {
         MMI_HILOGE("The fcntl write failed,errno:%{public}d", errno);
+        close(fds_[1]);
         return false;
     }
     return true;
diff --git a/service/libinput_adapter/src/libinput_adapter.cpp b/service/libinput_adapter/src/libinput_adapter.cpp
index b1bd7aecb6..deca92ef1e 100644
--- a/service/libinput_adapter/src/libinput_adapter.cpp
+++ b/service/libinput_adapter/src/libinput_adapter.cpp
@@ -188,7 +188,8 @@ void LibinputAdapter::RetriggerHotplugEvents()
         MMI_HILOGE("Failed to open directory: \'/sys/class/input\'");
         return;
     }
-    for (struct dirent *pdirent = readdir(pdir); pdirent != nullptr; pdirent = readdir(pdir)) {
+    struct dirent *pdirent = nullptr;
+    while ((pdirent = readdir(pdir)) != nullptr) {
         char path[PATH_MAX];
         if (sprintf_s(path, sizeof(path), "/sys/class/input/%s/uevent", pdirent->d_name) < 0) {
             continue;
diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index 195861cb29..62e3bab75d 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -572,6 +572,7 @@ bool VirtualDevice::AddDevice(const std::string& startDeviceName)
         std::cout << "Failed to create file" <<std::endl;
         return false;
     }
+    flagFile.close();
     return true;
 }
 
diff --git a/util/socket/src/uds_socket.cpp b/util/socket/src/uds_socket.cpp
index 8e1ee8433f..1bdf7a5427 100644
--- a/util/socket/src/uds_socket.cpp
+++ b/util/socket/src/uds_socket.cpp
@@ -98,6 +98,7 @@ int32_t UDSSocket::SetNonBlockMode(int32_t fd, bool isNonBlock)
     if (flags < 0) {
         MMI_HILOGE("fcntl F_GETFL fail. fd:%{public}d,flags:%{public}d,errno:%{public}d,errCode:%{public}d",
             fd, flags, errno, FCNTL_FAIL);
+        close(fd);
         return flags;
     }
     MMI_HILOGI("F_GETFL fd:%{public}d,flags:%{public}d", fd, flags);
@@ -110,6 +111,7 @@ int32_t UDSSocket::SetNonBlockMode(int32_t fd, bool isNonBlock)
     if (flags < 0) {
         MMI_HILOGE("fcntl F_SETFL fail. fd:%{public}d,flags:%{public}d,errno:%{public}d,errCode:%{public}d",
             fd, flags, errno, FCNTL_FAIL);
+        close(fd);
         return flags;
     }
     MMI_HILOGI("F_SETFL fd:%{public}d,flags:%{public}d", fd, flags);
-- 
Gitee


From 5cac2cf1f4c64b0c076fcead2b78d2e2f09a08db Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Mon, 14 Nov 2022 10:10:00 +0000
Subject: [PATCH 135/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: Ifaf629ef3c0707acabc284858ce50ded659d0f90
---
 .../message_handle/include/server_msg_handler.h    |  2 +-
 service/message_handle/src/server_msg_handler.cpp  | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
index 9128a44ffa..4d84640f65 100644
--- a/service/message_handle/include/server_msg_handler.h
+++ b/service/message_handle/include/server_msg_handler.h
@@ -68,7 +68,7 @@ protected:
 
 private:
 #ifdef OHOS_BUILD_ENABLE_TOUCH
-    void FixTargetWindowId(std::shared_ptr<PointerEvent> pointerEvent, int32_t action);
+    bool FixTargetWindowId(std::shared_ptr<PointerEvent> pointerEvent, int32_t action);
 #endif // OHOS_BUILD_ENABLE_TOUCH
 
 private:
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index 718c61b259..223b7b0858 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -146,7 +146,9 @@ int32_t ServerMsgHandler::OnInjectPointerEvent(const std::shared_ptr<PointerEven
 #ifdef OHOS_BUILD_ENABLE_TOUCH
             auto inputEventNormalizeHandler = InputHandler->GetEventNormalizeHandler();
             CHKPR(inputEventNormalizeHandler, ERROR_NULL_POINTER);
-            FixTargetWindowId(pointerEvent, action);
+            if (!FixTargetWindowId(pointerEvent, action)) {
+                return RET_ERR;
+            }
             inputEventNormalizeHandler->HandleTouchEvent(pointerEvent);
 #endif // OHOS_BUILD_ENABLE_TOUCH
             break;
@@ -179,25 +181,27 @@ int32_t ServerMsgHandler::OnInjectPointerEvent(const std::shared_ptr<PointerEven
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 
 #ifdef OHOS_BUILD_ENABLE_TOUCH
-void ServerMsgHandler::FixTargetWindowId(std::shared_ptr<PointerEvent> pointerEvent, int32_t action)
+bool ServerMsgHandler::FixTargetWindowId(std::shared_ptr<PointerEvent> pointerEvent, int32_t action)
 {
     if (action == PointerEvent::POINTER_ACTION_DOWN || targetWindowId_ < 0) {
-        return;
+        MMI_HILOGD("Down event or targetWindowId_ less 0 is not need fix window id");
+        return true;
     }
     pointerEvent->SetTargetWindowId(targetWindowId_);
     PointerEvent::PointerItem pointerItem;
     auto pointerIds = pointerEvent->GetPointerIds();
     if (pointerIds.empty()) {
         MMI_HILOGE("GetPointerIds is empty");
-        return;
+        return false;
     }
     auto id = pointerIds.front();
     if (!pointerEvent->GetPointerItem(id, pointerItem)) {
         MMI_HILOGE("Can't find pointer item");
-        return;
+        return false;
     }
     pointerItem.SetTargetWindowId(targetWindowId_);
     pointerEvent->UpdatePointerItem(id, pointerItem);
+    return true;
 }
 #endif // OHOS_BUILD_ENABLE_TOUCH
 
-- 
Gitee


From 2012e4e27bd3c896cd71fccf06039d19619730b5 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 15 Nov 2022 11:11:58 +0800
Subject: [PATCH 136/360] Adding Key Action Matching During Key Subscription

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: If4eaf156fcacc390637c5722c233e2003b6e40cc
---
 .../input_consumer/src/js_register_module.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/frameworks/napi/input_consumer/src/js_register_module.cpp b/frameworks/napi/input_consumer/src/js_register_module.cpp
index e9eec980f2..bd1692b113 100644
--- a/frameworks/napi/input_consumer/src/js_register_module.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_module.cpp
@@ -143,6 +143,21 @@ napi_value GetEventInfoAPI9(napi_env env, napi_callback_info info, KeyEventMonit
     return ret;
 }
 
+static bool IsMatchKeyAction(bool isFinalKeydown, int32_t keyAction)
+{
+    CALL_DEBUG_ENTER;
+    MMI_HILOGD("isFinalKeydown:%{public}d,keyAction:%{public}d", isFinalKeydown, keyAction);
+    if (isFinalKeydown && keyAction == KeyEvent::KEY_ACTION_DOWN) {
+        return true;
+    }
+
+    if (!isFinalKeydown && keyAction == KeyEvent::KEY_ACTION_UP) {
+        return true;
+    }
+    MMI_HILOGE("isFinalKeydown not matched with keyAction");
+    return false;
+}
+
 static bool MatchCombinationKeys(KeyEventMonitorInfo* monitorInfo, std::shared_ptr<KeyEvent> keyEvent)
 {
     CALL_DEBUG_ENTER;
@@ -153,8 +168,10 @@ static bool MatchCombinationKeys(KeyEventMonitorInfo* monitorInfo, std::shared_p
     std::vector<KeyEvent::KeyItem> items = keyEvent->GetKeyItems();
     int32_t infoFinalKey = keyOption->GetFinalKey();
     int32_t keyEventFinalKey = keyEvent->GetKeyCode();
+    bool isFinalKeydown = keyOption->IsFinalKeyDown();
     MMI_HILOGD("infoFinalKey:%{public}d,keyEventFinalKey:%{public}d", infoFinalKey, keyEventFinalKey);
-    if (infoFinalKey != keyEventFinalKey || items.size() > PRE_KEYS_SIZE) {
+    if (infoFinalKey != keyEventFinalKey || items.size() > PRE_KEYS_SIZE ||
+        !IsMatchKeyAction(isFinalKeydown, keyEvent->GetKeyAction())) {
         MMI_HILOGE("Param invalid");
         return false;
     }
-- 
Gitee


From 8570bca4cff11aac9faf6eadf6193935907964f6 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 15 Nov 2022 14:01:15 +0800
Subject: [PATCH 137/360] Test cases add use case name printing

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I999e1ad40fc81668dc30086e1fe73e9ef6df2c4a
---
 .../proxy/events/test/input_manager_test.cpp  | 178 +++++++++---------
 util/common/include/mmi_log.h                 |   4 +
 2 files changed, 93 insertions(+), 89 deletions(-)

diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 234c9ffa31..fd3ed925b8 100755
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -766,7 +766,7 @@ void InputManagerTest::TestMarkConsumed(int32_t monitorId, int32_t eventId)
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SimulateKeyEvent_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     int64_t downTime = GetNanoTime() / NANOSECOND_TO_MILLISECOND;
     std::shared_ptr<KeyEvent> injectDownEvent = KeyEvent::Create();
     ASSERT_TRUE(injectDownEvent != nullptr);
@@ -804,7 +804,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SimulateKeyEvent_001, TestSize.Level
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SimulateKeyEvent_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<KeyEvent> injectDownEvent = KeyEvent::Create();
     ASSERT_TRUE(injectDownEvent != nullptr);
     int64_t downTime = -1;
@@ -828,7 +828,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SimulateKeyEvent_002, TestSize.Level
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SimulateKeyEvent_003, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<KeyEvent> injectDownEvent = KeyEvent::Create();
     ASSERT_TRUE(injectDownEvent != nullptr);
     int64_t downTime = 0;
@@ -865,7 +865,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SimulateKeyEvent_003, TestSize.Level
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SimulateKeyEvent_004, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<KeyEvent> injectDownEvent = KeyEvent::Create();
     ASSERT_TRUE(injectDownEvent != nullptr);
     int64_t downTime = GetNanoTime() / NANOSECOND_TO_MILLISECOND;
@@ -889,7 +889,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SimulateKeyEvent_004, TestSize.Level
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SimulateKeyEvent_005, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<KeyEvent> injectDownEvent = KeyEvent::Create();
     ASSERT_TRUE(injectDownEvent != nullptr);
     int64_t downTime = GetNanoTime() / NANOSECOND_TO_MILLISECOND;
@@ -927,7 +927,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SimulateKeyEvent_005, TestSize.Level
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SimulatePointerEvent_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent001() };
     ASSERT_TRUE(pointerEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_TOUCH
@@ -943,7 +943,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SimulatePointerEvent_001, TestSize.L
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SimulatePointerEvent_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent002() };
     ASSERT_TRUE(pointerEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_TOUCH
@@ -959,7 +959,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SimulatePointerEvent_002, TestSize.L
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_003, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent003() };
     ASSERT_TRUE(pointerEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_TOUCH
@@ -975,7 +975,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_003, Test
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_004, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_UP);
@@ -994,7 +994,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_004, Test
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_005, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent005() };
     ASSERT_TRUE(pointerEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -1010,7 +1010,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_005, Test
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_006, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent006() };
     ASSERT_TRUE(pointerEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -1026,7 +1026,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_006, Test
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_007, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent007() };
     ASSERT_TRUE(pointerEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -1042,7 +1042,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_007, Test
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_008, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_UP);
@@ -1061,7 +1061,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_008, Test
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_009, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent009() };
     ASSERT_TRUE(pointerEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -1077,7 +1077,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_009, Test
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_010, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent010() };
     ASSERT_TRUE(pointerEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -1093,7 +1093,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_010, Test
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_011, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
@@ -1129,7 +1129,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_011, Test
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_012, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
@@ -1165,7 +1165,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_012, Test
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_013, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
@@ -1202,7 +1202,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_013, Test
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_014, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent016() };
     ASSERT_TRUE(pointerEvent != nullptr);
     TestSimulateInputEvent(pointerEvent);
@@ -1217,7 +1217,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePointerEvent_014, Test
  */
 HWTEST_F(InputManagerTest, InputManagerTest_MouseEventEnterAndLeave_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent014() };
     ASSERT_TRUE(pointerEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -1233,7 +1233,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_MouseEventEnterAndLeave_001, TestSiz
  */
 HWTEST_F(InputManagerTest, InputManagerTest_MouseEventEnterAndLeave_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<KeyEvent> keyEvent { SetupKeyEvent002() };
     ASSERT_TRUE(keyEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
@@ -1249,7 +1249,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_MouseEventEnterAndLeave_002, TestSiz
  */
 HWTEST_F(InputManagerTest, InputManagerTest_MouseEventEnterAndLeave_003, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<KeyEvent> keyEvent { SetupKeyEvent003() };
     ASSERT_TRUE(keyEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
@@ -1265,7 +1265,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_MouseEventEnterAndLeave_003, TestSiz
  */
 HWTEST_F(InputManagerTest, InputManagerTest_MouseEventEnterAndLeave_004, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent015() };
     ASSERT_TRUE(pointerEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -1281,7 +1281,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_MouseEventEnterAndLeave_004, TestSiz
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePencil2Event_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent011() };
     ASSERT_TRUE(pointerEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_TOUCH
@@ -1297,7 +1297,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePencil2Event_001, Test
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePencil2Event_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent012() };
     ASSERT_TRUE(pointerEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_TOUCH
@@ -1313,7 +1313,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePencil2Event_002, Test
  */
 HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePencil2Event_003, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupPointerEvent013() };
     ASSERT_TRUE(pointerEvent != nullptr);
 #ifdef OHOS_BUILD_ENABLE_TOUCH
@@ -1329,7 +1329,7 @@ HWTEST_F(InputManagerTest, MultimodalEventHandler_SimulatePencil2Event_003, Test
  */
 HWTEST_F(InputManagerTest, InputManager_Pencil2InputEvent_004, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_MOVE);
@@ -1348,7 +1348,7 @@ HWTEST_F(InputManagerTest, InputManager_Pencil2InputEvent_004, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, InputManager_NotResponse_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_NE(pointerEvent, nullptr);
 
@@ -1374,7 +1374,7 @@ HWTEST_F(InputManagerTest, InputManager_NotResponse_001, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, InputManager_NotResponse_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_NE(pointerEvent, nullptr);
 
@@ -1412,7 +1412,7 @@ std::shared_ptr<KeyOption> InputManagerTest::InitOption(const std::set<int32_t>
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SubscribeKeyEvent_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::set<int32_t> preKeys;
     std::shared_ptr<KeyOption> keyOption = InitOption(preKeys, KeyEvent::KEYCODE_VOLUME_MUTE, true, 0);
     int32_t response = -1;
@@ -1431,7 +1431,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SubscribeKeyEvent_001, TestSize.Leve
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SubscribeKeyEvent_02, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     ASSERT_TRUE(MMIEventHdl.InitClient());
     // 电源键长按按下订阅
     std::set<int32_t> preKeys;
@@ -1476,7 +1476,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SubscribeKeyEvent_02, TestSize.Level
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SubscribeKeyEvent_03, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     ASSERT_TRUE(MMIEventHdl.InitClient());
     std::set<int32_t> preKeys;
     std::shared_ptr<KeyOption> keyOption1 = InitOption(preKeys, KeyEvent::KEYCODE_VOLUME_UP, true, 10);
@@ -1524,7 +1524,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SubscribeKeyEvent_03, TestSize.Level
  */
 HWTEST_F(InputManagerTest, TestGetKeystrokeAbility_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::vector<int32_t> keyCodes = {17, 22, 2055};
     InputManager::GetInstance()->SupportKeys(0, keyCodes, [](std::vector<bool> keystrokeAbility) {
         MMI_HILOGD("TestGetKeystrokeAbility_001 callback ok");
@@ -1540,7 +1540,7 @@ HWTEST_F(InputManagerTest, TestGetKeystrokeAbility_001, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, TestInputEventInterceptor_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     PointerEvent::PointerItem item;
@@ -1582,7 +1582,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_001, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, TestInputEventInterceptor_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     PointerEvent::PointerItem item;
@@ -1624,7 +1624,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_002, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, TestInputEventInterceptor_003, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     PointerEvent::PointerItem item;
@@ -1666,7 +1666,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_003, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, TestInputEventInterceptor_004, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
@@ -1721,7 +1721,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_004, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, TestInputEventInterceptor_005, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
@@ -1764,7 +1764,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_005, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, TestInputEventInterceptor_006, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     PointerEvent::PointerItem item;
@@ -1811,7 +1811,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_006, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, TestInputEventInterceptor_007, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<KeyEvent> injectDownEvent = KeyEvent::Create();
     ASSERT_TRUE(injectDownEvent != nullptr);
     int64_t downTime = GetNanoTime() / NANOSECOND_TO_MILLISECOND;
@@ -1850,7 +1850,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_007, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, TestInputEventInterceptor_008, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
@@ -1898,7 +1898,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_008, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, TestInputEventInterceptor_009, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
@@ -1946,7 +1946,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_009, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, TestInputEventInterceptor_010, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
     std::shared_ptr<KeyEvent> injectDownEvent = KeyEvent::Create();
     ASSERT_TRUE(injectDownEvent != nullptr);
@@ -1991,7 +1991,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_010, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, TestInputEventInterceptor_011, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
     std::shared_ptr<KeyEvent> injectDownEvent = KeyEvent::Create();
     ASSERT_TRUE(injectDownEvent != nullptr);
@@ -2036,7 +2036,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_011, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, InputManagerTest_OnAddScreenMonitor_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = SetupPointerEvent001();
     ASSERT_TRUE(pointerEvent != nullptr);
 
@@ -2068,7 +2068,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_OnAddScreenMonitor_001, TestSize.Lev
  */
 HWTEST_F(InputManagerTest, InputManagerTest_OnAddScreenMonitor_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     TestUtil->SetRecvFlag(RECV_FLAG::RECV_MONITOR);
     const std::vector<int32_t>::size_type N_TEST_CASES { 3 };
     std::vector<int32_t> ids(N_TEST_CASES);
@@ -2112,7 +2112,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_OnAddScreenMonitor_002, TestSize.Lev
  */
 HWTEST_F(InputManagerTest, InputManagerTest_OnAddScreenMonitor_003, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = SetupPointerEvent003();
     ASSERT_TRUE(pointerEvent != nullptr);
 
@@ -2144,7 +2144,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_OnAddScreenMonitor_003, TestSize.Lev
  */
 HWTEST_F(InputManagerTest, InputManagerTest_OnAddScreenMonitor_004, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto callbackPtr = GetPtr<InputEventCallback>();
     ASSERT_TRUE(callbackPtr != nullptr);
     int32_t monitorId = TestAddMonitor(callbackPtr);
@@ -2177,7 +2177,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_OnAddScreenMonitor_004, TestSize.Lev
  */
 HWTEST_F(InputManagerTest, InputManagerTest_OnAddScreenMonitor_005, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto callbackPtr = GetPtr<InputEventCallback>();
     ASSERT_TRUE(callbackPtr != nullptr);
     int32_t monitorId = TestAddMonitor(callbackPtr);
@@ -2209,7 +2209,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_OnAddScreenMonitor_005, TestSize.Lev
  */
 HWTEST_F(InputManagerTest, InputManagerTest_OnAddTouchPadMonitor_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     PointerEvent::PointerItem item;
@@ -2252,7 +2252,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_OnAddTouchPadMonitor_001, TestSize.L
  */
 HWTEST_F(InputManagerTest, InputManagerTest_OnAddTouchPadMonitor_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     PointerEvent::PointerItem item;
@@ -2295,7 +2295,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_OnAddTouchPadMonitor_002, TestSize.L
  */
 HWTEST_F(InputManagerTest, InputManagerTest_OnAddTouchPadMonitor_003, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     PointerEvent::PointerItem item;
@@ -2338,7 +2338,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_OnAddTouchPadMonitor_003, TestSize.L
  */
 HWTEST_F(InputManagerTest, InputManagerTest_OnAddTouchPadMonitor_004, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     TestUtil->SetRecvFlag(RECV_FLAG::RECV_MONITOR);
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
@@ -2393,7 +2393,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_OnAddTouchPadMonitor_004, TestSize.L
  */
 HWTEST_F(InputManagerTest, InputManagerTest_OnAddTouchPadMonitor_005, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto pointerEvent = PointerEvent::Create();
     ASSERT_TRUE(pointerEvent != nullptr);
     PointerEvent::PointerItem item;
@@ -2436,7 +2436,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_OnAddTouchPadMonitor_005, TestSize.L
  */
 HWTEST_F(InputManagerTest, InputManager_TouchPadSimulateInputEvent_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto callbackPtr = GetPtr<InputEventCallback>();
     ASSERT_TRUE(callbackPtr != nullptr);
     int32_t monitorId { TestAddMonitor(callbackPtr) };
@@ -2481,7 +2481,7 @@ HWTEST_F(InputManagerTest, InputManager_TouchPadSimulateInputEvent_001, TestSize
  */
 HWTEST_F(InputManagerTest, InputManager_TouchPadSimulateInputEvent_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto callbackPtr = GetPtr<InputEventCallback>();
     ASSERT_TRUE(callbackPtr != nullptr);
     int32_t monitorId { TestAddMonitor(callbackPtr) };
@@ -2526,7 +2526,7 @@ HWTEST_F(InputManagerTest, InputManager_TouchPadSimulateInputEvent_002, TestSize
  */
 HWTEST_F(InputManagerTest, InputManager_TouchPadSimulateInputEvent_003, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto callbackPtr = GetPtr<InputEventCallback>();
     ASSERT_TRUE(callbackPtr != nullptr);
     int32_t monitorId { TestAddMonitor(callbackPtr) };
@@ -2571,7 +2571,7 @@ HWTEST_F(InputManagerTest, InputManager_TouchPadSimulateInputEvent_003, TestSize
  */
 HWTEST_F(InputManagerTest, InputManager_TouchPadSimulateInputEvent_004, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto callbackPtr = GetPtr<InputEventCallback>();
     ASSERT_TRUE(callbackPtr != nullptr);
     int32_t monitorId { TestAddMonitor(callbackPtr) };
@@ -2630,7 +2630,7 @@ HWTEST_F(InputManagerTest, InputManager_TouchPadSimulateInputEvent_004, TestSize
  */
 HWTEST_F(InputManagerTest, InputManagerTest_AddMouseMonitor_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto callbackPtr = GetPtr<InputEventCallback>();
     ASSERT_TRUE(callbackPtr != nullptr);
     int32_t monitorId = TestAddMonitor(callbackPtr);
@@ -2660,7 +2660,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_AddMouseMonitor_001, TestSize.Level1
  */
 HWTEST_F(InputManagerTest, InputManagerTest_AddMouseMonitor_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto callbackPtr = GetPtr<InputEventCallback>();
     ASSERT_TRUE(callbackPtr != nullptr);
     int32_t monitorId = TestAddMonitor(callbackPtr);
@@ -2694,7 +2694,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_AddMouseMonitor_002, TestSize.Level1
  */
 HWTEST_F(InputManagerTest, InputManagerTest_AddMouseMonitor_003, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto callbackPtr = GetPtr<InputEventCallback>();
     ASSERT_TRUE(callbackPtr != nullptr);
     int32_t monitorId = TestAddMonitor(callbackPtr);
@@ -2725,7 +2725,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_AddMouseMonitor_003, TestSize.Level1
  */
 HWTEST_F(InputManagerTest, InputManagerTest_AddMouseMonitor_004, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     TestUtil->SetRecvFlag(RECV_FLAG::RECV_MONITOR);
     const std::vector<int32_t>::size_type N_TEST_CASES { MAX_N_INPUT_HANDLERS - 1 };
     std::vector<int32_t> ids;
@@ -2769,7 +2769,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_AddMouseMonitor_004, TestSize.Level1
  */
 HWTEST_F(InputManagerTest, InputManagerTest_OnAddKeyboardMonitor_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     TestUtil->SetRecvFlag(RECV_FLAG::RECV_MONITOR);
     const std::vector<int32_t>::size_type N_TEST_CASES { 3 };
     std::vector<int32_t> ids;
@@ -2810,7 +2810,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_OnAddKeyboardMonitor_001, TestSize.L
  */
 HWTEST_F(InputManagerTest, InputManagerTest_OnAddKeyboardMonitor_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     const std::vector<int32_t>::size_type N_TEST_CASES { 3 };
     std::vector<int32_t> ids;
     auto callbackPtr = GetPtr<InputEventCallback>();
@@ -2847,7 +2847,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_OnAddKeyboardMonitor_002, TestSize.L
  */
 HWTEST_F(InputManagerTest, InputManagerTest_RemoteControlAutoRepeat, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     int64_t downTime = GetNanoTime() / NANOSECOND_TO_MILLISECOND;
     std::shared_ptr<KeyEvent> injectDownEvent = KeyEvent::Create();
     ASSERT_TRUE(injectDownEvent != nullptr);
@@ -2887,7 +2887,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_RemoteControlAutoRepeat, TestSize.Le
  */
 HWTEST_F(InputManagerTest, InputManagerTest_MoveMouse_01, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     InputManager::GetInstance()->MoveMouse(50, 50);
 }
 
@@ -2899,7 +2899,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_MoveMouse_01, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, InputManagerTest_MoveMouse_02, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     InputManager::GetInstance()->MoveMouse(-1000, 100);
 }
 
@@ -2960,7 +2960,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_GetKeyboardType, TestSize.Level1)
 
 HWTEST_F(InputManagerTest, InputManagerTest_GetProcCpuUsage, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     SYSTEM_INFO::CpuInfo cpuInfo;
     const std::string process_name = "multimodalinput";
     auto usage = cpuInfo.GetProcCpuUsage(process_name);
@@ -2976,7 +2976,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_GetProcCpuUsage, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SetWindowInputEventConsumer_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto runner = AppExecFwk::EventRunner::Create(true);
     ASSERT_TRUE(runner != nullptr);
     auto eventHandler = std::make_shared<AppExecFwk::EventHandler>(runner);
@@ -3013,7 +3013,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SetWindowInputEventConsumer_001, Tes
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SetWindowInputEventConsumer_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     const std::string threadTest = "threadNameTest";
     auto runner = AppExecFwk::EventRunner::Create(threadTest);
     ASSERT_TRUE(runner != nullptr);
@@ -3080,7 +3080,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SetPointerVisible_002, TestSize.Leve
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SetPointSpeed_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     const int32_t speed = -1;
     InputManager::GetInstance()->SetPointerSpeed(speed);
     int32_t speed1;
@@ -3109,7 +3109,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SetPointSpeed_001, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SetPointSpeed_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     const int32_t speed = 1;
     InputManager::GetInstance()->SetPointerSpeed(speed);
     int32_t speed1;
@@ -3138,7 +3138,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SetPointSpeed_002, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SetPointSpeed_003, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     const int32_t speed = 4;
     InputManager::GetInstance()->SetPointerSpeed(speed);
     int32_t speed1;
@@ -3167,7 +3167,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SetPointSpeed_003, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SetPointSpeed_004, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     const int32_t speed = 11;
     InputManager::GetInstance()->SetPointerSpeed(speed);
     int32_t speed1;
@@ -3196,7 +3196,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SetPointSpeed_004, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SetPointSpeed_005, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     const int32_t speed = 20;
     InputManager::GetInstance()->SetPointerSpeed(speed);
     int32_t speed1;
@@ -3225,7 +3225,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SetPointSpeed_005, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SetPointerStyle_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto window = WindowUtilsTest::GetInstance()->GetWindow();
     uint32_t windowId = window->GetWindowId();
     int32_t pointerStyle;
@@ -3243,7 +3243,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SetPointerStyle_001, TestSize.Level1
  */
 HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     InputManager::GetInstance()->SetFunctionKeyState(KeyEvent::NUM_LOCK_FUNCTION_KEY, true);
     InputManager::GetInstance()->GetFunctionKeyState(KeyEvent::NUM_LOCK_FUNCTION_KEY);
 }
@@ -3256,7 +3256,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_001, TestSize.Level
  */
 HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     InputManager::GetInstance()->SetFunctionKeyState(KeyEvent::NUM_LOCK_FUNCTION_KEY, false);
     bool result = InputManager::GetInstance()->GetFunctionKeyState(KeyEvent::NUM_LOCK_FUNCTION_KEY);
     ASSERT_FALSE(result);
@@ -3270,7 +3270,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_002, TestSize.Level
  */
 HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_003, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     InputManager::GetInstance()->SetFunctionKeyState(KeyEvent::SCROLL_LOCK_FUNCTION_KEY, true);
     InputManager::GetInstance()->GetFunctionKeyState(KeyEvent::SCROLL_LOCK_FUNCTION_KEY);
 }
@@ -3283,7 +3283,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_003, TestSize.Level
  */
 HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_004, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     InputManager::GetInstance()->SetFunctionKeyState(KeyEvent::SCROLL_LOCK_FUNCTION_KEY, false);
     bool result = InputManager::GetInstance()->GetFunctionKeyState(KeyEvent::SCROLL_LOCK_FUNCTION_KEY);
     ASSERT_FALSE(result);
@@ -3297,7 +3297,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_004, TestSize.Level
  */
 HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_005, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     InputManager::GetInstance()->SetFunctionKeyState(KeyEvent::CAPS_LOCK_FUNCTION_KEY, true);
     InputManager::GetInstance()->GetFunctionKeyState(KeyEvent::CAPS_LOCK_FUNCTION_KEY);
 }
@@ -3310,7 +3310,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_005, TestSize.Level
  */
 HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_006, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     InputManager::GetInstance()->SetFunctionKeyState(KeyEvent::CAPS_LOCK_FUNCTION_KEY, false);
     bool result = InputManager::GetInstance()->GetFunctionKeyState(KeyEvent::CAPS_LOCK_FUNCTION_KEY);
     ASSERT_FALSE(result);
@@ -3324,7 +3324,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_006, TestSize.Level
  */
 HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_007, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     InputManager::GetInstance()->SetFunctionKeyState(KeyEvent::UNKOWN_FUNCTION_KEY, true);
     bool result = InputManager::GetInstance()->GetFunctionKeyState(KeyEvent::UNKOWN_FUNCTION_KEY);
     ASSERT_FALSE(result);
@@ -3342,7 +3342,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_007, TestSize.Level
  */
 HWTEST_F(InputManagerTest, InputManagerTest_TouchScreenHotArea_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupTouchScreenEvent001() };
     ASSERT_TRUE(pointerEvent != nullptr);
     InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
@@ -3357,7 +3357,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_TouchScreenHotArea_001, TestSize.Lev
  */
 HWTEST_F(InputManagerTest, InputManagerTest_TouchScreenHotArea_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupTouchScreenEvent002() };
     ASSERT_TRUE(pointerEvent != nullptr);
     InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
@@ -3372,7 +3372,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_TouchScreenHotArea_002, TestSize.Lev
  */
 HWTEST_F(InputManagerTest, InputManagerTest_MouseHotArea_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupmouseEvent001() };
     ASSERT_TRUE(pointerEvent != nullptr);
     InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
@@ -3387,7 +3387,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_MouseHotArea_001, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, InputManagerTest_MouseHotArea_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::shared_ptr<PointerEvent> pointerEvent { SetupmouseEvent002() };
     ASSERT_TRUE(pointerEvent != nullptr);
     ASSERT_EQ(pointerEvent->GetSourceType(), PointerEvent::SOURCE_TYPE_MOUSE);
@@ -3423,7 +3423,7 @@ std::shared_ptr<PointerEvent> InputManagerTest::SetupTabletToolEvent001()
  */
 HWTEST_F(InputManagerTest, InputManagerTest_MonitorTabletToolEvent_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto callbackPtr = GetPtr<InputEventCallback>();
     ASSERT_TRUE(callbackPtr != nullptr);
     int32_t monitorId = TestAddMonitor(callbackPtr);
@@ -3455,7 +3455,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_MonitorTabletToolEvent_001, TestSize
  */
 HWTEST_F(InputManagerTest, InputManagerTest_InterceptTabletToolEvent_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto interceptor = GetPtr<InputEventCallback>();
     int32_t interceptorId { InputManager::GetInstance()->AddInterceptor(interceptor) };
     EXPECT_TRUE(IsValidHandlerId(interceptorId));
diff --git a/util/common/include/mmi_log.h b/util/common/include/mmi_log.h
index 2ee11d31a1..86124e2c9f 100644
--- a/util/common/include/mmi_log.h
+++ b/util/common/include/mmi_log.h
@@ -134,4 +134,8 @@ private:
 
 #define CALL_INFO_TRACE         ::OHOS::MMI::InnerFunctionTracer ___innerFuncTracer_Info___     \
     { std::bind(&::OHOS::HiviewDFX::HiLog::Info, LABEL, std::placeholders::_1, __FUNCTION__), LABEL.tag, LOG_INFO }
+
+#define CALL_TEST_DEBUG         ::OHOS::MMI::InnerFunctionTracer ___innerFuncTracer_Info___     \
+    { std::bind(&::OHOS::HiviewDFX::HiLog::Info, LABEL, std::placeholders::_1,     \
+    (test_info_ == nullptr ? "TestBody" : test_info_->name())), LABEL.tag, LOG_DEBUG }
 #endif // MMI_LOG_H
-- 
Gitee


From b9ebe89b0bd2f8b878ff5f1b0977e5db6b0fc691 Mon Sep 17 00:00:00 2001
From: fuchao33 <fuchao33@huawei.com>
Date: Tue, 15 Nov 2022 14:23:18 +0800
Subject: [PATCH 138/360] =?UTF-8?q?Description:=20=E9=94=AE=E9=BC=A0?=
 =?UTF-8?q?=E7=A9=BF=E8=B6=8A=E7=81=AD=E5=B1=8F=E5=90=8E=E5=85=B3=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=E9=BC=A0=E6=A0=87=E4=B8=8D=E5=A4=8D=E4=BD=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=20Sig:=20SIG=5FBscSoftSrv=20Feature?=
 =?UTF-8?q?=20or=20Bugfix:=20Feature=20Binary=20Source:=20No=20Signed-off-?=
 =?UTF-8?q?by:=20<zhenying.wu@thundersoft.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../include/input_device_cooperate_sm.h       |  1 +
 .../src/device_cooperate_softbus_adapter.cpp  |  2 +-
 .../src/input_device_cooperate_sm.cpp         | 49 ++++++++++---------
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/service/input_device_cooperate/include/input_device_cooperate_sm.h b/service/input_device_cooperate/include/input_device_cooperate_sm.h
index 7459910aca..c379409448 100755
--- a/service/input_device_cooperate/include/input_device_cooperate_sm.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_sm.h
@@ -89,6 +89,7 @@ public:
     void OnStopFinish(bool isSuccess, const std::string &remoteNetworkId);
     bool IsStarting() const;
     bool IsStopping() const;
+    void Reset(const std::string &networkId);
     void Dump(int32_t fd, const std::vector<std::string> &args);
 
 private:
diff --git a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
index b9f1f12dd0..533563bd4f 100755
--- a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
+++ b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
@@ -498,7 +498,7 @@ void DeviceCooperateSoftbusAdapter::OnSessionClosed(int32_t sessionId)
     if (GetSessionSide(sessionId) != 0) {
         channelStatusMap_.erase(deviceId);
     }
-    InputDevCooSM->OnDeviceOffline(deviceId);
+    InputDevCooSM->Reset(deviceId);
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index cb09dfe252..4bd221743a 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -60,6 +60,28 @@ void InputDeviceCooperateSM::Init(DelegateTasksCallback delegateTasksCallback)
     });
 }
 
+void InputDeviceCooperateSM::Reset(const std::string &networkId)
+{
+    CALL_INFO_TRACE;
+    std::lock_guard<std::mutex> guard(mutex_);
+    bool needReset = true;
+    if (cooperateState_ == CooperateState::STATE_OUT) {
+        if (networkId != srcNetworkId_) {
+            needReset = false;
+        }
+    }
+    if (cooperateState_ == CooperateState::STATE_IN) {
+        std::string sinkNetwoekId = InputDevMgr->GetOriginNetworkId(startDhid_);
+        if (networkId != sinkNetwoekId) {
+            needReset = false;
+        }
+    }
+    if (needReset) {
+        preparedNetworkId_ = std::make_pair("", "");
+        Reset(true);
+    }
+}
+
 void InputDeviceCooperateSM::Reset(bool adjustAbsolutionLocation)
 {
     CALL_INFO_TRACE;
@@ -536,7 +558,7 @@ bool InputDeviceCooperateSM::InitDeviceManager()
     return true;
 }
 
-void InputDeviceCooperateSM::OnDeviceOnline(const std::string& networkId)
+void InputDeviceCooperateSM::OnDeviceOnline(const std::string &networkId)
 {
     CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(mutex_);
@@ -546,30 +568,12 @@ void InputDeviceCooperateSM::OnDeviceOnline(const std::string& networkId)
         InputDevCooSM, std::placeholders::_1, std::placeholders::_2));
 }
 
-void InputDeviceCooperateSM::OnDeviceOffline(const std::string& networkId)
+void InputDeviceCooperateSM::OnDeviceOffline(const std::string &networkId)
 {
     CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mutex_);
     DProfileAdapter->UnregisterCrossingStateListener(networkId);
-    bool needReset = true;
-    if (cooperateState_ == CooperateState::STATE_OUT) {
-        if (networkId != srcNetworkId_) {
-            needReset = false;
-            MMI_HILOGE("OnDeviceOffline: needReset false");
-        }
-    }
-    if (cooperateState_ == CooperateState::STATE_IN) {
-        std::string sinkNetwoekId = InputDevMgr->GetOriginNetworkId(startDhid_);
-        if (networkId != sinkNetwoekId) {
-            needReset = false;
-            MMI_HILOGE("OnDeviceOffline: needReset false");
-        }
-    }
-    if (needReset) {
-        MMI_HILOGE("OnDeviceOffline: needReset true");
-        preparedNetworkId_ = std::make_pair("", "");
-        Reset(true);
-    }
+    Reset(networkId);
+    std::lock_guard<std::mutex> guard(mutex_);
     if (!onlineDevice_.empty()) {
         auto it = std::find(onlineDevice_.begin(), onlineDevice_.end(), networkId);
         if (it != onlineDevice_.end()) {
@@ -606,6 +610,7 @@ void InputDeviceCooperateSM::MmiDeviceStateCallback::OnDeviceOffline(
     const DistributedHardware::DmDeviceInfo &deviceInfo)
 {
     CALL_INFO_TRACE;
+    InputDevCooSM->OnDeviceOffline(deviceInfo.deviceId);
 }
 
 void InputDeviceCooperateSM::MmiDeviceStateCallback::OnDeviceChanged(
-- 
Gitee


From bc8b81e27aaba8aee2074c34f4257a3e5e2f38d3 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 15 Nov 2022 16:30:29 +0800
Subject: [PATCH 139/360] =?UTF-8?q?NAPI=20refactoring=EF=BC=9ADelete=20red?=
 =?UTF-8?q?undant=20parameters?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I69e4674f5fdcc39ec4813090677bde521abf90f3
---
 .../input_consumer/src/js_register_module.cpp |  16 +--
 .../input_consumer/src/js_register_util.cpp   |  28 ++--
 .../napi/input_device/src/js_event_target.cpp |  43 +++---
 .../src/js_input_device_context.cpp           |  80 +++++------
 frameworks/napi/input_device/src/js_util.cpp  |  86 +++++------
 .../src/js_event_target.cpp                   |  18 +--
 .../src/js_input_device_cooperate_context.cpp |  70 ++++-----
 .../input_device_cooperate/src/js_util.cpp    |  25 ++--
 .../src/js_register_module.cpp                |  10 +-
 .../src/js_register_util.cpp                  |   6 +-
 .../src/js_input_monitor_manager.cpp          |   2 +-
 .../src/js_input_monitor_module.cpp           |  22 +--
 frameworks/napi/key_code/src/js_key_code.cpp  |   8 +-
 .../napi/key_event/src/js_key_event.cpp       |   8 +-
 .../napi/mouse_event/src/js_mouse_event.cpp   |  16 +--
 .../napi/pointer/src/js_pointer_context.cpp   | 134 +++++++++---------
 .../napi/pointer/src/js_pointer_manager.cpp   |  68 ++++-----
 .../napi/touch_event/src/js_touch_event.cpp   |  16 +--
 util/common/include/napi_constants.h          |  14 +-
 util/common/include/util_napi.h               |  20 ++-
 util/common/src/util_napi.cpp                 |   2 +-
 21 files changed, 343 insertions(+), 349 deletions(-)

diff --git a/frameworks/napi/input_consumer/src/js_register_module.cpp b/frameworks/napi/input_consumer/src/js_register_module.cpp
index bd1692b113..7f4f4e34d7 100644
--- a/frameworks/napi/input_consumer/src/js_register_module.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_module.cpp
@@ -42,7 +42,7 @@ napi_value GetEventInfoAPI9(napi_env env, napi_callback_info info, KeyEventMonit
     CHKPP(keyOption);
     size_t argc = 3;
     napi_value argv[3] = { 0 };
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     napi_valuetype valueType = napi_undefined;
     if (!UtilNapi::TypeOf(env, argv[0], napi_string)) {
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "type", "string");
@@ -56,7 +56,7 @@ napi_value GetEventInfoAPI9(napi_env env, napi_callback_info info, KeyEventMonit
     }
     char eventType[EVENT_NAME_LEN] = { 0 };
     size_t typeLen = 0;
-    CHKRP(env, napi_get_value_string_utf8(env, argv[0], eventType, EVENT_NAME_LEN - 1, &typeLen), GET_STRING_UTF8);
+    CHKRP(napi_get_value_string_utf8(env, argv[0], eventType, EVENT_NAME_LEN - 1, &typeLen), GET_VALUE_STRING_UTF8);
     std::string type = eventType;
     if (type != SUBSCRIBE_TYPE) {
         MMI_HILOGE("Type is not key");
@@ -64,7 +64,7 @@ napi_value GetEventInfoAPI9(napi_env env, napi_callback_info info, KeyEventMonit
         return nullptr;
     }
     napi_value receiveValue = nullptr;
-    CHKRP(env, napi_get_named_property(env, argv[1], "preKeys", &receiveValue), GET_NAMED_PROPERTY);
+    CHKRP(napi_get_named_property(env, argv[1], "preKeys", &receiveValue), GET_NAMED_PROPERTY);
     if (receiveValue == nullptr) {
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "preKeys not found");
         return nullptr;
@@ -128,18 +128,18 @@ napi_value GetEventInfoAPI9(napi_env env, napi_callback_info info, KeyEventMonit
     event->eventType = subKeyNames;
     MMI_HILOGD("FinalKeyDownDuration:%{public}d", finalKeyDownDuration);
     if (argc == 3) {
-        CHKRP(env, napi_typeof(env, argv[2], &valueType), TYPEOF);
+        CHKRP(napi_typeof(env, argv[2], &valueType), TYPEOF);
         if (valueType != napi_function) {
             MMI_HILOGE("the third parameter is not napi_function");
             THROWERR_API9(env, COMMON_PARAMETER_ERROR, "callback", "function");
             return nullptr;
         }
-        CHKRP(env, napi_create_reference(env, argv[2], 1, &event->callback[0]), REFERENCE_REF);
+        CHKRP(napi_create_reference(env, argv[2], 1, &event->callback[0]), REFERENCE_REF);
     } else {
         event->callback[0] = nullptr;
     }
     napi_value ret;
-    CHKRP(env, napi_create_int32(env, RET_OK, &ret), CREATE_INT32);
+    CHKRP(napi_create_int32(env, RET_OK, &ret), CREATE_INT32);
     return ret;
 }
 
@@ -235,7 +235,7 @@ static napi_value JsOn(napi_env env, napi_callback_info info)
     CALL_DEBUG_ENTER;
     size_t argc = 3;
     napi_value argv[3] = { 0 };
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 3) {
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "parameter number error");
         return nullptr;
@@ -292,7 +292,7 @@ static napi_value JsOff(napi_env env, napi_callback_info info)
     CALL_DEBUG_ENTER;
     size_t argc = 3;
     napi_value argv[3] = { 0 };
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 2) {
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "parameter number error");
         return nullptr;
diff --git a/frameworks/napi/input_consumer/src/js_register_util.cpp b/frameworks/napi/input_consumer/src/js_register_util.cpp
index 6a34140a67..84cbbd64bb 100644
--- a/frameworks/napi/input_consumer/src/js_register_util.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_util.cpp
@@ -34,7 +34,7 @@ void SetNamedProperty(const napi_env &env, napi_value &object, const std::string
 {
     MMI_HILOGD("%{public}s=%{public}d", name.c_str(), value);
     napi_value napiValue;
-    CHKRV(env, napi_create_int32(env, value, &napiValue), CREATE_INT32);
+    CHKRV(napi_create_int32(env, value, &napiValue), CREATE_INT32);
     NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, object, name.c_str(), napiValue));
 }
 
@@ -42,7 +42,7 @@ void SetNamedProperty(const napi_env &env, napi_value &object, const std::string
 {
     MMI_HILOGD("%{public}s=%{public}s", name.c_str(), value.c_str());
     napi_value napiValue;
-    CHKRV(env, napi_create_string_utf8(env, value.c_str(), NAPI_AUTO_LENGTH, &napiValue), CREATE_STRING_UTF8);
+    CHKRV(napi_create_string_utf8(env, value.c_str(), NAPI_AUTO_LENGTH, &napiValue), CREATE_STRING_UTF8);
     NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, object, name.c_str(), napiValue));
 }
 
@@ -52,13 +52,13 @@ bool GetNamedPropertyBool(const napi_env &env, const napi_value &object, const s
     napi_get_named_property(env, object, name.c_str(), &napiValue);
     napi_valuetype tmpType = napi_undefined;
 
-    CHKRF(env, napi_typeof(env, napiValue, &tmpType), TYPEOF);
+    CHKRF(napi_typeof(env, napiValue, &tmpType), TYPEOF);
     if (tmpType != napi_boolean) {
         MMI_HILOGE("The value is not bool");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, name.c_str(), "bool");
         return false;
     }
-    CHKRF(env, napi_get_value_bool(env, napiValue, &ret), GET_BOOL);
+    CHKRF(napi_get_value_bool(env, napiValue, &ret), GET_VALUE_BOOL);
     MMI_HILOGD("%{public}s=%{public}d", name.c_str(), ret);
     return true;
 }
@@ -90,19 +90,19 @@ napi_value GetPreKeys(const napi_env &env, const napi_value &value, std::set<int
 {
     CALL_DEBUG_ENTER;
     uint32_t arrayLength = 0;
-    CHKRP(env, napi_get_array_length(env, value, &arrayLength), GET_ARRAY_LENGTH);
+    CHKRP(napi_get_array_length(env, value, &arrayLength), GET_ARRAY_LENGTH);
     for (uint32_t i = 0; i < arrayLength; i++) {
         napi_value napiElement;
-        CHKRP(env, napi_get_element(env, value, i, &napiElement), GET_ELEMENT);
+        CHKRP(napi_get_element(env, value, i, &napiElement), GET_ELEMENT);
         napi_valuetype valuetype;
-        CHKRP(env, napi_typeof(env, napiElement, &valuetype), TYPEOF);
+        CHKRP(napi_typeof(env, napiElement, &valuetype), TYPEOF);
         if (valuetype != napi_number) {
             MMI_HILOGE("PreKeys Wrong argument type, Number expected");
             THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "element of preKeys must be number");
             return nullptr;
         }
         int32_t value = 0;
-        CHKRP(env, napi_get_value_int32(env, napiElement, &value), GET_INT32);
+        CHKRP(napi_get_value_int32(env, napiElement, &value), GET_VALUE_INT32);
         if (value < 0) {
             MMI_HILOGE("preKey:%{public}d is less 0, can not process", value);
             THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "element of preKeys must be greater than or equal to 0");
@@ -115,7 +115,7 @@ napi_value GetPreKeys(const napi_env &env, const napi_value &value, std::set<int
         }
     }
     napi_value ret;
-    CHKRP(env, napi_create_int32(env, RET_OK, &ret), CREATE_INT32);
+    CHKRP(napi_create_int32(env, RET_OK, &ret), CREATE_INT32);
     return ret;
 }
 
@@ -250,15 +250,15 @@ static void AsyncWorkFn(const napi_env &env, KeyEventMonitorInfo *event, napi_va
     CHKPV(event);
     CHKPV(event->keyOption);
     MMI_HILOGD("Status > 0 enter");
-    CHKRV(env, napi_create_object(env, &result), CREATE_OBJECT);
+    CHKRV(napi_create_object(env, &result), CREATE_OBJECT);
     napi_value arr;
-    CHKRV(env, napi_create_array(env, &arr), CREATE_ARRAY);
+    CHKRV(napi_create_array(env, &arr), CREATE_ARRAY);
     std::set<int32_t> preKeys = event->keyOption->GetPreKeys();
     int32_t i = 0;
     napi_value value;
     for (const auto &preKey : preKeys) {
-        CHKRV(env, napi_create_int32(env, preKey, &value), CREATE_INT32);
-        CHKRV(env, napi_set_element(env, arr, i, value), SET_ELEMENT);
+        CHKRV(napi_create_int32(env, preKey, &value), CREATE_INT32);
+        CHKRV(napi_set_element(env, arr, i, value), SET_ELEMENT);
         ++i;
     }
     std::string preKeysStr = "preKeys";
@@ -312,7 +312,7 @@ void EmitAsyncCallbackWork(KeyEventMonitorInfo *reportEvent)
     CALL_DEBUG_ENTER;
     CHKPV(reportEvent);
     uv_loop_s *loop = nullptr;
-    CHKRV(reportEvent->env, napi_get_uv_event_loop(reportEvent->env, &loop), GET_UV_LOOP);
+    CHKRV(napi_get_uv_event_loop(reportEvent->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     KeyEventMonitorInfoWorker *dataWorker = new (std::nothrow) KeyEventMonitorInfoWorker();
diff --git a/frameworks/napi/input_device/src/js_event_target.cpp b/frameworks/napi/input_device/src/js_event_target.cpp
index b10d2c4128..7047fda087 100755
--- a/frameworks/napi/input_device/src/js_event_target.cpp
+++ b/frameworks/napi/input_device/src/js_event_target.cpp
@@ -76,7 +76,7 @@ void JsEventTarget::EmitAddedDeviceEvent(uv_work_t *work, int32_t status)
         CHKRV_SCOPE(item->env, napi_set_named_property(item->env, object, "deviceId", deviceId),
                 SET_NAMED_PROPERTY, scope);
         napi_value handler = nullptr;
-        CHKRV_SCOPE(item->env, napi_get_reference_value(item->env, item->ref, &handler), GET_REFERENCE, scope);
+        CHKRV_SCOPE(item->env, napi_get_reference_value(item->env, item->ref, &handler), GET_REFERENCE_VALUE, scope);
         napi_value ret = nullptr;
         CHKRV_SCOPE(item->env, napi_call_function(item->env, nullptr, handler, 1, &object, &ret),
                 CALL_FUNCTION, scope);
@@ -130,7 +130,7 @@ void JsEventTarget::EmitRemoveDeviceEvent(uv_work_t *work, int32_t status)
              SET_NAMED_PROPERTY, scope);
 
         napi_value handler = nullptr;
-        CHKRV_SCOPE(item->env, napi_get_reference_value(item->env, item->ref, &handler), GET_REFERENCE, scope);
+        CHKRV_SCOPE(item->env, napi_get_reference_value(item->env, item->ref, &handler), GET_REFERENCE_VALUE, scope);
 
         napi_value ret = nullptr;
         CHKRV_SCOPE(item->env, napi_call_function(item->env, nullptr, handler, 1, &object, &ret),
@@ -153,7 +153,7 @@ void JsEventTarget::OnDeviceAdded(int32_t deviceId, const std::string &type)
         CHKPC(item);
         CHKPC(item->env);
         uv_loop_s *loop = nullptr;
-        CHKRV(item->env, napi_get_uv_event_loop(item->env, &loop), GET_UV_LOOP);
+        CHKRV(napi_get_uv_event_loop(item->env, &loop), GET_UV_EVENT_LOOP);
         uv_work_t *work = new (std::nothrow) uv_work_t;
         CHKPV(work);
         item->data.deviceId = deviceId;
@@ -180,7 +180,7 @@ void JsEventTarget::OnDeviceRemoved(int32_t deviceId, const std::string &type)
         CHKPC(item);
         CHKPC(item->env);
         uv_loop_s *loop = nullptr;
-        CHKRV(item->env, napi_get_uv_event_loop(item->env, &loop), GET_UV_LOOP);
+        CHKRV(napi_get_uv_event_loop(item->env, &loop), GET_UV_EVENT_LOOP);
         uv_work_t *work = new (std::nothrow) uv_work_t;
         CHKPV(work);
         item->data.deviceId = deviceId;
@@ -225,7 +225,7 @@ void JsEventTarget::CallIdsAsyncWork(uv_work_t *work, int32_t status)
     }
     
     napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE_VALUE, scope);
     napi_value result = nullptr;
     CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, arr, &result), CALL_FUNCTION, scope);
     napi_close_handle_scope(cb->env, scope);
@@ -282,7 +282,7 @@ void JsEventTarget::EmitJsIds(int32_t userData, std::vector<int32_t> &ids)
     iter->second->data.ids = ids;
     iter->second->errCode = RET_OK;
     uv_loop_s *loop = nullptr;
-    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
+    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
@@ -335,7 +335,7 @@ void JsEventTarget::CallDevAsyncWork(uv_work_t *work, int32_t status)
     CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &object[0]), GET_UNDEFINED, scope);
     object[1] = JsUtil::GetDeviceInfo(cb);
     napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE_VALUE, scope);
     napi_value result = nullptr;
     CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, object, &result), CALL_FUNCTION,
         scope);
@@ -390,7 +390,7 @@ void JsEventTarget::EmitJsDev(int32_t userData, std::shared_ptr<InputDevice> dev
     iter->second->data.device = device;
     iter->second->errCode = RET_OK;
     uv_loop_s *loop = nullptr;
-    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
+    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
@@ -524,7 +524,8 @@ void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
     }
     napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler),
+        GET_REFERENCE_VALUE, scope);
     napi_value result = nullptr;
     CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION, scope);
     napi_close_handle_scope(cb->env, scope);
@@ -549,7 +550,7 @@ void JsEventTarget::EmitSupportKeys(int32_t userData, std::vector<bool> &keystro
     iter->second->data.keystrokeAbility = keystrokeAbility;
     iter->second->errCode = RET_OK;
     uv_loop_s *loop = nullptr;
-    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
+    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
@@ -591,7 +592,7 @@ void JsEventTarget::EmitJsKeyboardType(int32_t userData, int32_t keyboardType)
     iter->second->data.keyboardType = keyboardType;
     iter->second->errCode = RET_OK;
     uv_loop_s *loop = nullptr;
-    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
+    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
 
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
@@ -658,7 +659,7 @@ void JsEventTarget::CallKeyboardTypeAsync(uv_work_t *work, int32_t status)
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
     }
     napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE_VALUE, scope);
     napi_value result = nullptr;
     CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result),
 	    CALL_FUNCTION, scope);
@@ -757,7 +758,7 @@ void JsEventTarget::CallDevListAsyncWork(uv_work_t *work, int32_t status)
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
     }
     napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE_VALUE, scope);
     napi_value result = nullptr;
     CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION, scope);
     napi_close_handle_scope(cb->env, scope);
@@ -902,7 +903,7 @@ void JsEventTarget::CallDevInfoAsyncWork(uv_work_t *work, int32_t status)
         CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &callResult[0]), GET_UNDEFINED, scope);
     }
     napi_value handler = nullptr;
-    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE, scope);
+    CHKRV_SCOPE(cb->env, napi_get_reference_value(cb->env, cb->ref, &handler), GET_REFERENCE_VALUE, scope);
     napi_value result = nullptr;
     CHKRV_SCOPE(cb->env, napi_call_function(cb->env, nullptr, handler, 2, callResult, &result), CALL_FUNCTION,
         scope);
@@ -930,7 +931,7 @@ void JsEventTarget::AddListener(napi_env env, const std::string &type, napi_valu
         }
     }
     napi_ref ref = nullptr;
-    CHKRV(env, napi_create_reference(env, handle, 1, &ref), CREATE_REFERENCE);
+    CHKRV(napi_create_reference(env, handle, 1, &ref), CREATE_REFERENCE);
     auto monitor = std::make_unique<JsUtil::CallbackInfo>();
     CHKPV(monitor);
     monitor->env = env;
@@ -984,9 +985,9 @@ napi_value JsEventTarget::CreateCallbackInfo(napi_env env, napi_value handle, co
     cb->isApi9 = isApi9;
     napi_value promise = nullptr;
     if (handle == nullptr) {
-        CHKRP(env, napi_create_promise(env, &cb->deferred, &promise), CREATE_PROMISE);
+        CHKRP(napi_create_promise(env, &cb->deferred, &promise), CREATE_PROMISE);
     } else {
-        CHKRP(env, napi_create_reference(env, handle, 1, &cb->ref), CREATE_REFERENCE);
+        CHKRP(napi_create_reference(env, handle, 1, &cb->ref), CREATE_REFERENCE);
     }
     callback_.emplace(userData, std::move(cb));
     return promise;
@@ -998,10 +999,10 @@ napi_value JsEventTarget::GreateBusinessError(napi_env env, int32_t errCode, std
     napi_value result = nullptr;
     napi_value resultCode = nullptr;
     napi_value resultMessage = nullptr;
-    CHKRP(env, napi_create_int32(env, errCode, &resultCode), CREATE_INT32);
-    CHKRP(env, napi_create_string_utf8(env, errMessage.data(), NAPI_AUTO_LENGTH, &resultMessage), CREATE_STRING_UTF8);
-    CHKRP(env, napi_create_error(env, nullptr, resultMessage, &result), CREATE_ERROR);
-    CHKRP(env, napi_set_named_property(env, result, ERR_CODE.c_str(), resultCode), SET_NAMED_PROPERTY);
+    CHKRP(napi_create_int32(env, errCode, &resultCode), CREATE_INT32);
+    CHKRP(napi_create_string_utf8(env, errMessage.data(), NAPI_AUTO_LENGTH, &resultMessage), CREATE_STRING_UTF8);
+    CHKRP(napi_create_error(env, nullptr, resultMessage, &result), CREATE_ERROR);
+    CHKRP(napi_set_named_property(env, result, ERR_CODE.c_str(), resultCode), SET_NAMED_PROPERTY);
     return result;
 }
 
diff --git a/frameworks/napi/input_device/src/js_input_device_context.cpp b/frameworks/napi/input_device/src/js_input_device_context.cpp
index 111d03bc16..0923f1783e 100644
--- a/frameworks/napi/input_device/src/js_input_device_context.cpp
+++ b/frameworks/napi/input_device/src/js_input_device_context.cpp
@@ -55,29 +55,29 @@ napi_value JsInputDeviceContext::CreateInstance(napi_env env)
 {
     CALL_DEBUG_ENTER;
     napi_value global = nullptr;
-    CHKRP(env, napi_get_global(env, &global), GET_GLOBAL);
+    CHKRP(napi_get_global(env, &global), GET_GLOBAL);
 
     constexpr char className[] = "JsInputDeviceContext";
     napi_value jsClass = nullptr;
     napi_property_descriptor desc[] = {};
     napi_status status = napi_define_class(env, className, sizeof(className), JsInputDeviceContext::JsConstructor,
                                            nullptr, sizeof(desc) / sizeof(desc[0]), nullptr, &jsClass);
-    CHKRP(env, status, DEFINE_CLASS);
+    CHKRP(status, DEFINE_CLASS);
 
     status = napi_set_named_property(env, global, "multimodalinput_input_device_class", jsClass);
-    CHKRP(env, status, SET_NAMED_PROPERTY);
+    CHKRP(status, SET_NAMED_PROPERTY);
 
     napi_value jsInstance = nullptr;
-    CHKRP(env, napi_new_instance(env, jsClass, 0, nullptr, &jsInstance), NEW_INSTANCE);
-    CHKRP(env, napi_set_named_property(env, global, "multimodal_input_device", jsInstance), SET_NAMED_PROPERTY);
+    CHKRP(napi_new_instance(env, jsClass, 0, nullptr, &jsInstance), NEW_INSTANCE);
+    CHKRP(napi_set_named_property(env, global, "multimodal_input_device", jsInstance), SET_NAMED_PROPERTY);
 
     JsInputDeviceContext *jsContext = nullptr;
-    CHKRP(env, napi_unwrap(env, jsInstance, (void**)&jsContext), UNWRAP);
+    CHKRP(napi_unwrap(env, jsInstance, (void**)&jsContext), UNWRAP);
     CHKPP(jsContext);
-    CHKRP(env, napi_create_reference(env, jsInstance, 1, &(jsContext->contextRef_)), CREATE_REFERENCE);
+    CHKRP(napi_create_reference(env, jsInstance, 1, &(jsContext->contextRef_)), CREATE_REFERENCE);
 
     uint32_t refCount = 0;
-    CHKRP(env, napi_reference_ref(env, jsContext->contextRef_, &refCount), REFERENCE_REF);
+    CHKRP(napi_reference_ref(env, jsContext->contextRef_, &refCount), REFERENCE_REF);
     return jsInstance;
 }
 
@@ -86,7 +86,7 @@ napi_value JsInputDeviceContext::JsConstructor(napi_env env, napi_callback_info
     CALL_DEBUG_ENTER;
     napi_value thisVar = nullptr;
     void *data = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, &data), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, &data), GET_CB_INFO);
 
     JsInputDeviceContext *jsContext = new (std::nothrow) JsInputDeviceContext();
     CHKPP(jsContext);
@@ -107,24 +107,24 @@ JsInputDeviceContext* JsInputDeviceContext::GetInstance(napi_env env)
 {
     CALL_DEBUG_ENTER;
     napi_value global = nullptr;
-    CHKRP(env, napi_get_global(env, &global), GET_GLOBAL);
+    CHKRP(napi_get_global(env, &global), GET_GLOBAL);
 
     bool result = false;
-    CHKRP(env, napi_has_named_property(env, global, "multimodal_input_device", &result), HAS_NAMED_PROPERTY);
+    CHKRP(napi_has_named_property(env, global, "multimodal_input_device", &result), HAS_NAMED_PROPERTY);
     if (!result) {
         MMI_HILOGE("multimodal_input_device was not found");
         return nullptr;
     }
 
     napi_value object = nullptr;
-    CHKRP(env, napi_get_named_property(env, global, "multimodal_input_device", &object), GET_NAMED_PROPERTY);
+    CHKRP(napi_get_named_property(env, global, "multimodal_input_device", &object), GET_NAMED_PROPERTY);
     if (object == nullptr) {
         MMI_HILOGE("object is nullptr");
         return nullptr;
     }
 
     JsInputDeviceContext *instance = nullptr;
-    CHKRP(env, napi_unwrap(env, object, (void**)&instance), UNWRAP);
+    CHKRP(napi_unwrap(env, object, (void**)&instance), UNWRAP);
     if (instance == nullptr) {
         MMI_HILOGE("instance is nullptr");
         return nullptr;
@@ -142,7 +142,7 @@ napi_value JsInputDeviceContext::On(napi_env env, napi_callback_info info)
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc == 0) {
         MMI_HILOGE("Require two parameters");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Parameter count error");
@@ -156,7 +156,7 @@ napi_value JsInputDeviceContext::On(napi_env env, napi_callback_info info)
 
     char eventType[MAX_STRING_LEN] = {0};
     size_t ret = 0;
-    CHKRP(env, napi_get_value_string_utf8(env, argv[0], eventType, MAX_STRING_LEN - 1, &ret), GET_STRING_UTF8);
+    CHKRP(napi_get_value_string_utf8(env, argv[0], eventType, MAX_STRING_LEN - 1, &ret), GET_VALUE_STRING_UTF8);
     std::string type = eventType;
     if (type != CHANGED_TYPE) {
         MMI_HILOGE("Type is not change");
@@ -181,7 +181,7 @@ napi_value JsInputDeviceContext::Off(napi_env env, napi_callback_info info)
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc == 0) {
         MMI_HILOGE("Require two parameters");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Parameter count error");
@@ -195,7 +195,7 @@ napi_value JsInputDeviceContext::Off(napi_env env, napi_callback_info info)
 
     char eventType[MAX_STRING_LEN] = {0};
     size_t ret = 0;
-    CHKRP(env, napi_get_value_string_utf8(env, argv[0], eventType, MAX_STRING_LEN - 1, &ret), GET_STRING_UTF8);
+    CHKRP(napi_get_value_string_utf8(env, argv[0], eventType, MAX_STRING_LEN - 1, &ret), GET_VALUE_STRING_UTF8);
     std::string type = eventType;
     if (type != CHANGED_TYPE) {
         MMI_HILOGE("Type is not change");
@@ -224,7 +224,7 @@ napi_value JsInputDeviceContext::GetDeviceIds(napi_env env, napi_callback_info i
     CALL_DEBUG_ENTER;
     size_t argc = 1;
     napi_value argv[1];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc > 1) {
         THROWERR(env, "too many parameters");
         return nullptr;
@@ -248,7 +248,7 @@ napi_value JsInputDeviceContext::GetDevice(napi_env env, napi_callback_info info
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 1 || argc > 2) {
         THROWERR(env, "the number of parameters is not as expected");
         return nullptr;
@@ -258,7 +258,7 @@ napi_value JsInputDeviceContext::GetDevice(napi_env env, napi_callback_info info
         return nullptr;
     }
     int32_t id = 0;
-    CHKRP(env, napi_get_value_int32(env, argv[0], &id), GET_INT32);
+    CHKRP(napi_get_value_int32(env, argv[0], &id), GET_VALUE_INT32);
     JsInputDeviceContext *jsDev = JsInputDeviceContext::GetInstance(env);
     CHKPP(jsDev);
     auto jsInputDeviceMgr = jsDev->GetJsInputDeviceMgr();
@@ -277,7 +277,7 @@ napi_value JsInputDeviceContext::SupportKeys(napi_env env, napi_callback_info in
     CALL_DEBUG_ENTER;
     size_t argc = 3;
     napi_value argv[3];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 2) {
         MMI_HILOGE("Require three parameters");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Parameter count error");
@@ -290,7 +290,7 @@ napi_value JsInputDeviceContext::SupportKeys(napi_env env, napi_callback_info in
         return nullptr;
     }
     int32_t deviceId = 0;
-    CHKRP(env, napi_get_value_int32(env, argv[0], &deviceId), GET_INT32);
+    CHKRP(napi_get_value_int32(env, argv[0], &deviceId), GET_VALUE_INT32);
 
     if (!JsUtil::TypeOf(env, argv[1], napi_object)) {
         MMI_HILOGE("Second parameter type error");
@@ -298,7 +298,7 @@ napi_value JsInputDeviceContext::SupportKeys(napi_env env, napi_callback_info in
         return nullptr;
     }
     uint32_t size = 0;
-    CHKRP(env, napi_get_array_length(env, argv[1], &size), GET_ARRAY_LENGTH);
+    CHKRP(napi_get_array_length(env, argv[1], &size), GET_ARRAY_LENGTH);
     if (size < MIN_N_SIZE || size > MAX_N_SIZE) {
         MMI_HILOGE("Size range error");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "size range error");
@@ -309,13 +309,13 @@ napi_value JsInputDeviceContext::SupportKeys(napi_env env, napi_callback_info in
     std::vector<int32_t> keyCodes;
     for (uint32_t i = 0; i < size; ++i) {
         napi_value keyValue = nullptr;
-        CHKRP(env, napi_get_element(env, argv[1], i, &keyValue), GET_ELEMENT);
+        CHKRP(napi_get_element(env, argv[1], i, &keyValue), GET_ELEMENT);
         if (!JsUtil::TypeOf(env, keyValue, napi_number)) {
             MMI_HILOGE("Second parameter type error");
             THROWERR_API9(env, COMMON_PARAMETER_ERROR, "KeyCode", "number");
             return nullptr;
         }
-        CHKRP(env, napi_get_value_int32(env, keyValue, &data), GET_INT32);
+        CHKRP(napi_get_value_int32(env, keyValue, &data), GET_VALUE_INT32);
         keyCodes.push_back(data);
     }
 
@@ -337,7 +337,7 @@ napi_value JsInputDeviceContext::GetKeyboardType(napi_env env, napi_callback_inf
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc == 0) {
         MMI_HILOGE("Require two parameters");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Parameter count error");
@@ -350,7 +350,7 @@ napi_value JsInputDeviceContext::GetKeyboardType(napi_env env, napi_callback_inf
         return nullptr;
     }
     int32_t id = 0;
-    CHKRP(env, napi_get_value_int32(env, argv[0], &id), GET_INT32);
+    CHKRP(napi_get_value_int32(env, argv[0], &id), GET_VALUE_INT32);
 
     JsInputDeviceContext *jsDev = JsInputDeviceContext::GetInstance(env);
     CHKPP(jsDev);
@@ -372,7 +372,7 @@ napi_value JsInputDeviceContext::GetDeviceList(napi_env env, napi_callback_info
     CALL_DEBUG_ENTER;
     size_t argc = 1;
     napi_value argv[1];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
 
     JsInputDeviceContext *jsIds = JsInputDeviceContext::GetInstance(env);
     CHKPP(jsIds);
@@ -393,7 +393,7 @@ napi_value JsInputDeviceContext::GetDeviceInfo(napi_env env, napi_callback_info
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc == 0) {
         MMI_HILOGE("Require two parameters");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Parameter count error");
@@ -405,7 +405,7 @@ napi_value JsInputDeviceContext::GetDeviceInfo(napi_env env, napi_callback_info
         return nullptr;
     }
     int32_t id = 0;
-    CHKRP(env, napi_get_value_int32(env, argv[0], &id), GET_INT32);
+    CHKRP(napi_get_value_int32(env, argv[0], &id), GET_VALUE_INT32);
 
     JsInputDeviceContext *jsDev = JsInputDeviceContext::GetInstance(env);
     CHKPP(jsDev);
@@ -428,7 +428,7 @@ napi_value JsInputDeviceContext::EnumClassConstructor(napi_env env, napi_callbac
     napi_value args[1] = {0};
     napi_value ret = nullptr;
     void *data = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
     return ret;
 }
 
@@ -436,17 +436,17 @@ napi_value JsInputDeviceContext::CreateEnumKeyboardType(napi_env env, napi_value
 {
     CALL_DEBUG_ENTER;
     napi_value none = nullptr;
-    CHKRP(env, napi_create_int32(env, KeyboardType::NONE, &none), CREATE_INT32);
+    CHKRP(napi_create_int32(env, KeyboardType::NONE, &none), CREATE_INT32);
     napi_value unknown = nullptr;
-    CHKRP(env, napi_create_int32(env, KeyboardType::UNKNOWN, &unknown), CREATE_INT32);
+    CHKRP(napi_create_int32(env, KeyboardType::UNKNOWN, &unknown), CREATE_INT32);
     napi_value alphabeticKeyboard = nullptr;
-    CHKRP(env, napi_create_int32(env, KeyboardType::ALPHABETIC_KEYBOARD, &alphabeticKeyboard), CREATE_INT32);
+    CHKRP(napi_create_int32(env, KeyboardType::ALPHABETIC_KEYBOARD, &alphabeticKeyboard), CREATE_INT32);
     napi_value digitalKeyboard = nullptr;
-    CHKRP(env, napi_create_int32(env, KeyboardType::DIGITAL_KEYBOARD, &digitalKeyboard), CREATE_INT32);
+    CHKRP(napi_create_int32(env, KeyboardType::DIGITAL_KEYBOARD, &digitalKeyboard), CREATE_INT32);
     napi_value handwritingPen = nullptr;
-    CHKRP(env, napi_create_int32(env, KeyboardType::HANDWRITING_PEN, &handwritingPen), CREATE_INT32);
+    CHKRP(napi_create_int32(env, KeyboardType::HANDWRITING_PEN, &handwritingPen), CREATE_INT32);
     napi_value remoteControl = nullptr;
-    CHKRP(env, napi_create_int32(env, KeyboardType::REMOTE_CONTROL, &remoteControl), CREATE_INT32);
+    CHKRP(napi_create_int32(env, KeyboardType::REMOTE_CONTROL, &remoteControl), CREATE_INT32);
     napi_property_descriptor desc[] = {
         DECLARE_NAPI_STATIC_PROPERTY("NONE", none),
         DECLARE_NAPI_STATIC_PROPERTY("UNKNOWN", unknown),
@@ -456,9 +456,9 @@ napi_value JsInputDeviceContext::CreateEnumKeyboardType(napi_env env, napi_value
         DECLARE_NAPI_STATIC_PROPERTY("REMOTE_CONTROL", remoteControl),
     };
     napi_value result = nullptr;
-    CHKRP(env, napi_define_class(env, "KeyboardType", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
+    CHKRP(napi_define_class(env, "KeyboardType", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
         sizeof(desc) / sizeof(*desc), desc, &result), DEFINE_CLASS);
-    CHKRP(env, napi_set_named_property(env, exports, "KeyboardType", result), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(env, exports, "KeyboardType", result), SET_NAMED_PROPERTY);
     return exports;
 }
 
@@ -480,7 +480,7 @@ napi_value JsInputDeviceContext::Export(napi_env env, napi_value exports)
         DECLARE_NAPI_STATIC_FUNCTION("getDeviceList", GetDeviceList),
         DECLARE_NAPI_STATIC_FUNCTION("getDeviceInfo", GetDeviceInfo),
     };
-    CHKRP(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc), DEFINE_PROPERTIES);
+    CHKRP(napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc), DEFINE_PROPERTIES);
     if (CreateEnumKeyboardType(env, exports) == nullptr) {
         MMI_HILOGE("Failed to create keyboard type enum");
         return nullptr;
diff --git a/frameworks/napi/input_device/src/js_util.cpp b/frameworks/napi/input_device/src/js_util.cpp
index ff98f31108..cad5926453 100644
--- a/frameworks/napi/input_device/src/js_util.cpp
+++ b/frameworks/napi/input_device/src/js_util.cpp
@@ -53,9 +53,9 @@ JsUtil::DeviceType g_deviceType[] = {
 bool JsUtil::IsSameHandle(napi_env env, napi_value handle, napi_ref ref)
 {
     napi_value handlerTemp = nullptr;
-    CHKRF(env, napi_get_reference_value(env, ref, &handlerTemp), GET_REFERENCE);
+    CHKRF(napi_get_reference_value(env, ref, &handlerTemp), GET_REFERENCE_VALUE);
     bool isEqual = false;
-    CHKRF(env, napi_strict_equals(env, handle, handlerTemp, &isEqual), STRICT_EQUALS);
+    CHKRF(napi_strict_equals(env, handle, handlerTemp, &isEqual), STRICT_EQUALS);
     return isEqual;
 }
 
@@ -65,34 +65,34 @@ napi_value JsUtil::GetDeviceInfo(const std::unique_ptr<CallbackInfo> &cb)
     CHKPP(cb->env);
     CHKPP(cb->data.device);
     napi_value object = nullptr;
-    CHKRP(cb->env, napi_create_object(cb->env, &object), CREATE_OBJECT);
+    CHKRP(napi_create_object(cb->env, &object), CREATE_OBJECT);
     napi_value id = nullptr;
-    CHKRP(cb->env, napi_create_int32(cb->env, cb->data.device->GetId(), &id), CREATE_INT32);
+    CHKRP(napi_create_int32(cb->env, cb->data.device->GetId(), &id), CREATE_INT32);
     napi_value name = nullptr;
-    CHKRP(cb->env, napi_create_string_utf8(cb->env, (cb->data.device->GetName()).c_str(),
+    CHKRP(napi_create_string_utf8(cb->env, (cb->data.device->GetName()).c_str(),
         NAPI_AUTO_LENGTH, &name), CREATE_STRING_UTF8);
-    CHKRP(cb->env, napi_set_named_property(cb->env, object, "id", id), SET_NAMED_PROPERTY);
-    CHKRP(cb->env, napi_set_named_property(cb->env, object, "name", name), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(cb->env, object, "id", id), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(cb->env, object, "name", name), SET_NAMED_PROPERTY);
     napi_value busType = nullptr;
-    CHKRP(cb->env, napi_create_int32(cb->env, cb->data.device->GetBus(), &busType), CREATE_INT32);
-    CHKRP(cb->env, napi_set_named_property(cb->env, object, "bus", busType), SET_NAMED_PROPERTY);
+    CHKRP(napi_create_int32(cb->env, cb->data.device->GetBus(), &busType), CREATE_INT32);
+    CHKRP(napi_set_named_property(cb->env, object, "bus", busType), SET_NAMED_PROPERTY);
     napi_value product = nullptr;
-    CHKRP(cb->env, napi_create_int32(cb->env, cb->data.device->GetProduct(), &product), CREATE_INT32);
-    CHKRP(cb->env, napi_set_named_property(cb->env, object, "product", product), SET_NAMED_PROPERTY);
+    CHKRP(napi_create_int32(cb->env, cb->data.device->GetProduct(), &product), CREATE_INT32);
+    CHKRP(napi_set_named_property(cb->env, object, "product", product), SET_NAMED_PROPERTY);
     napi_value vendor = nullptr;
-    CHKRP(cb->env, napi_create_int32(cb->env, cb->data.device->GetVendor(), &vendor), CREATE_INT32);
-    CHKRP(cb->env, napi_set_named_property(cb->env, object, "vendor", vendor), SET_NAMED_PROPERTY);
+    CHKRP(napi_create_int32(cb->env, cb->data.device->GetVendor(), &vendor), CREATE_INT32);
+    CHKRP(napi_set_named_property(cb->env, object, "vendor", vendor), SET_NAMED_PROPERTY);
     napi_value version = nullptr;
-    CHKRP(cb->env, napi_create_int32(cb->env, cb->data.device->GetVersion(), &version), CREATE_INT32);
-    CHKRP(cb->env, napi_set_named_property(cb->env, object, "version", version), SET_NAMED_PROPERTY);
+    CHKRP(napi_create_int32(cb->env, cb->data.device->GetVersion(), &version), CREATE_INT32);
+    CHKRP(napi_set_named_property(cb->env, object, "version", version), SET_NAMED_PROPERTY);
     napi_value uniq = nullptr;
-    CHKRP(cb->env, napi_create_string_utf8(cb->env, (cb->data.device->GetUniq()).c_str(),
+    CHKRP(napi_create_string_utf8(cb->env, (cb->data.device->GetUniq()).c_str(),
         NAPI_AUTO_LENGTH, &uniq), CREATE_STRING_UTF8);
-    CHKRP(cb->env, napi_set_named_property(cb->env, object, "uniq", uniq), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(cb->env, object, "uniq", uniq), SET_NAMED_PROPERTY);
     napi_value phys = nullptr;
-    CHKRP(cb->env, napi_create_string_utf8(cb->env, (cb->data.device->GetPhys()).c_str(),
+    CHKRP(napi_create_string_utf8(cb->env, (cb->data.device->GetPhys()).c_str(),
         NAPI_AUTO_LENGTH, &phys), CREATE_STRING_UTF8);
-    CHKRP(cb->env, napi_set_named_property(cb->env, object, "phys", phys), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(cb->env, object, "phys", phys), SET_NAMED_PROPERTY);
 
     if (!GetDeviceSourceType(cb, object)) {
         MMI_HILOGE("Get device source type failed");
@@ -114,13 +114,13 @@ bool JsUtil::GetDeviceAxisInfo(const std::unique_ptr<CallbackInfo> &cb, napi_val
     uint32_t types = cb->data.device->GetType();
     for (const auto &item : g_deviceType) {
         if (types &item.typeBit) {
-            CHKRF(cb->env, napi_create_string_utf8(cb->env, item.sourceTypeName.c_str(),
+            CHKRF(napi_create_string_utf8(cb->env, item.sourceTypeName.c_str(),
                 NAPI_AUTO_LENGTH, &sourceType), CREATE_STRING_UTF8);
             break;
         }
     }
     napi_value axisRanges = nullptr;
-    CHKRF(cb->env, napi_create_array(cb->env, &axisRanges), CREATE_ARRAY);
+    CHKRF(napi_create_array(cb->env, &axisRanges), CREATE_ARRAY);
     napi_value axisRange = nullptr;
     uint32_t i = 0;
     for (const auto &item : cb->data.device->GetAxisInfo()) {
@@ -129,31 +129,31 @@ bool JsUtil::GetDeviceAxisInfo(const std::unique_ptr<CallbackInfo> &cb, napi_val
             MMI_HILOGD("Find axisType failed");
             continue;
         }
-        CHKRF(cb->env, napi_create_object(cb->env, &axisRange), CREATE_OBJECT);
-        CHKRF(cb->env, napi_set_named_property(cb->env, axisRange, "source", sourceType), SET_NAMED_PROPERTY);
+        CHKRF(napi_create_object(cb->env, &axisRange), CREATE_OBJECT);
+        CHKRF(napi_set_named_property(cb->env, axisRange, "source", sourceType), SET_NAMED_PROPERTY);
         napi_value axisType = nullptr;
-        CHKRF(cb->env, napi_create_string_utf8(cb->env, iter->second.c_str(),
+        CHKRF(napi_create_string_utf8(cb->env, iter->second.c_str(),
             NAPI_AUTO_LENGTH, &axisType), CREATE_STRING_UTF8);
-        CHKRF(cb->env, napi_set_named_property(cb->env, axisRange, "axis", axisType), SET_NAMED_PROPERTY);
+        CHKRF(napi_set_named_property(cb->env, axisRange, "axis", axisType), SET_NAMED_PROPERTY);
         napi_value min = nullptr;
-        CHKRF(cb->env, napi_create_int32(cb->env, item.GetMinimum(), &min), CREATE_INT32);
-        CHKRF(cb->env, napi_set_named_property(cb->env, axisRange, "min", min), SET_NAMED_PROPERTY);
+        CHKRF(napi_create_int32(cb->env, item.GetMinimum(), &min), CREATE_INT32);
+        CHKRF(napi_set_named_property(cb->env, axisRange, "min", min), SET_NAMED_PROPERTY);
         napi_value max = nullptr;
-        CHKRF(cb->env, napi_create_int32(cb->env, item.GetMaximum(), &max), CREATE_INT32);
-        CHKRF(cb->env, napi_set_named_property(cb->env, axisRange, "max", max), SET_NAMED_PROPERTY);
+        CHKRF(napi_create_int32(cb->env, item.GetMaximum(), &max), CREATE_INT32);
+        CHKRF(napi_set_named_property(cb->env, axisRange, "max", max), SET_NAMED_PROPERTY);
         napi_value fuzz = nullptr;
-        CHKRF(cb->env, napi_create_int32(cb->env, item.GetFuzz(), &fuzz), CREATE_INT32);
-        CHKRF(cb->env, napi_set_named_property(cb->env, axisRange, "fuzz", fuzz), SET_NAMED_PROPERTY);
+        CHKRF(napi_create_int32(cb->env, item.GetFuzz(), &fuzz), CREATE_INT32);
+        CHKRF(napi_set_named_property(cb->env, axisRange, "fuzz", fuzz), SET_NAMED_PROPERTY);
         napi_value flat = nullptr;
-        CHKRF(cb->env, napi_create_int32(cb->env, item.GetFlat(), &flat), CREATE_INT32);
-        CHKRF(cb->env, napi_set_named_property(cb->env, axisRange, "flat", flat), SET_NAMED_PROPERTY);
+        CHKRF(napi_create_int32(cb->env, item.GetFlat(), &flat), CREATE_INT32);
+        CHKRF(napi_set_named_property(cb->env, axisRange, "flat", flat), SET_NAMED_PROPERTY);
         napi_value resolution = nullptr;
-        CHKRF(cb->env, napi_create_int32(cb->env, item.GetResolution(), &resolution), CREATE_INT32);
-        CHKRF(cb->env, napi_set_named_property(cb->env, axisRange, "resolution", resolution), SET_NAMED_PROPERTY);
-        CHKRF(cb->env, napi_set_element(cb->env, axisRanges, i, axisRange), SET_ELEMENT);
+        CHKRF(napi_create_int32(cb->env, item.GetResolution(), &resolution), CREATE_INT32);
+        CHKRF(napi_set_named_property(cb->env, axisRange, "resolution", resolution), SET_NAMED_PROPERTY);
+        CHKRF(napi_set_element(cb->env, axisRanges, i, axisRange), SET_ELEMENT);
         ++i;
     }
-    CHKRF(cb->env, napi_set_named_property(cb->env, object, "axisRanges", axisRanges), SET_NAMED_PROPERTY);
+    CHKRF(napi_set_named_property(cb->env, object, "axisRanges", axisRanges), SET_NAMED_PROPERTY);
     return true;
 }
 
@@ -170,21 +170,21 @@ bool JsUtil::GetDeviceSourceType(const std::unique_ptr<CallbackInfo> &cb, napi_v
         }
     }
     napi_value devSources = nullptr;
-    CHKRF(cb->env, napi_create_array(cb->env, &devSources), CREATE_ARRAY);
+    CHKRF(napi_create_array(cb->env, &devSources), CREATE_ARRAY);
     napi_value value = nullptr;
     for (size_t i = 0; i < sources.size(); ++i) {
-        CHKRF(cb->env, napi_create_string_utf8(cb->env, sources[i].c_str(), NAPI_AUTO_LENGTH, &value),
+        CHKRF(napi_create_string_utf8(cb->env, sources[i].c_str(), NAPI_AUTO_LENGTH, &value),
             CREATE_STRING_UTF8);
-        CHKRF(cb->env, napi_set_element(cb->env, devSources, i, value), SET_ELEMENT);
+        CHKRF(napi_set_element(cb->env, devSources, i, value), SET_ELEMENT);
     }
-    CHKRF(cb->env, napi_set_named_property(cb->env, object, "sources", devSources), SET_NAMED_PROPERTY);
+    CHKRF(napi_set_named_property(cb->env, object, "sources", devSources), SET_NAMED_PROPERTY);
     return true;
 }
 
 bool JsUtil::TypeOf(napi_env env, napi_value value, napi_valuetype type)
 {
     napi_valuetype valueType = napi_undefined;
-    CHKRF(env, napi_typeof(env, value, &valueType), TYPEOF);
+    CHKRF(napi_typeof(env, value, &valueType), TYPEOF);
     if (valueType != type) {
         return false;
     }
@@ -195,7 +195,7 @@ void JsUtil::DeleteCallbackInfo(std::unique_ptr<CallbackInfo> callback)
 {
     CALL_DEBUG_ENTER;
     if (callback->ref != nullptr && callback->env != nullptr) {
-        CHKRV(callback->env, napi_delete_reference(callback->env, callback->ref), DELETE_REFERENCE);
+        CHKRV(napi_delete_reference(callback->env, callback->ref), DELETE_REFERENCE);
         callback->env = nullptr;
     }
 }
diff --git a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
index f8504eb895..3c1a7c24f3 100755
--- a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
@@ -61,7 +61,7 @@ void JsEventTarget::EmitJsEnable(int32_t userData, std::string deviceId, Coopera
         (msg == CooperationMessage::OPEN_SUCCESS || msg == CooperationMessage::CLOSE_SUCCESS) ? true : false;
     iter->second->data.errCode = static_cast<int32_t>(msg);
     uv_loop_s *loop = nullptr;
-    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
+    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_s *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
@@ -104,7 +104,7 @@ void JsEventTarget::EmitJsStart(int32_t userData, std::string deviceId, Cooperat
     iter->second->data.startResult = (msg == CooperationMessage::INFO_SUCCESS ? true : false);
     iter->second->data.errCode = static_cast<int32_t>(msg);
     uv_loop_s *loop = nullptr;
-    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
+    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_s *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
@@ -147,7 +147,7 @@ void JsEventTarget::EmitJsStop(int32_t userData, std::string deviceId, Cooperati
     iter->second->data.stopResult = (msg == CooperationMessage::STOP_SUCCESS ? true : false);
     iter->second->data.errCode = static_cast<int32_t>(msg);
     uv_loop_s *loop = nullptr;
-    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
+    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_s *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
@@ -189,7 +189,7 @@ void JsEventTarget::EmitJsGetState(int32_t userData, bool state)
     }
     iter->second->data.cooperateOpened = state;
     uv_loop_s *loop = nullptr;
-    CHKRV(iter->second->env, napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_LOOP);
+    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_s *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
     int32_t *uData = new (std::nothrow) int32_t(userData);
@@ -232,7 +232,7 @@ void JsEventTarget::AddListener(napi_env env, const std::string &type, napi_valu
         }
     }
     napi_ref ref = nullptr;
-    CHKRV(env, napi_create_reference(env, handle, 1, &ref), CREATE_REFERENCE);
+    CHKRV(napi_create_reference(env, handle, 1, &ref), CREATE_REFERENCE);
     auto monitor = std::make_unique<JsUtil::CallbackInfo>();
     if (monitor == nullptr) {
         napi_delete_reference(env, ref);
@@ -285,9 +285,9 @@ napi_value JsEventTarget::CreateCallbackInfo(napi_env env, napi_value handle, in
     cb->env = env;
     napi_value promise = nullptr;
     if (handle == nullptr) {
-        CHKRP(env, napi_create_promise(env, &cb->deferred, &promise), CREATE_PROMISE);
+        CHKRP(napi_create_promise(env, &cb->deferred, &promise), CREATE_PROMISE);
     } else {
-        CHKRP(env, napi_create_reference(env, handle, 1, &cb->ref), CREATE_REFERENCE);
+        CHKRP(napi_create_reference(env, handle, 1, &cb->ref), CREATE_REFERENCE);
     }
     callback_.emplace(userData, std::move(cb));
     return promise;
@@ -326,7 +326,7 @@ void JsEventTarget::OnCooperateMessage(const std::string &deviceId, CooperationM
         CHKPC(item);
         CHKPC(item->env);
         uv_loop_s *loop = nullptr;
-        CHKRV(item->env, napi_get_uv_event_loop(item->env, &loop), GET_UV_LOOP);
+        CHKRV(napi_get_uv_event_loop(item->env, &loop), GET_UV_EVENT_LOOP);
         uv_work_t *work = new (std::nothrow) uv_work_t;
         CHKPV(work);
         item->data.msg = msg;
@@ -607,7 +607,7 @@ void JsEventTarget::EmitCooperateMessageEvent(uv_work_t *work, int32_t status)
         }
         napi_value deviceDescriptor = nullptr;
         CHKRV_SCOPE(item->env, napi_create_string_utf8(item->env, item->data.deviceDescriptor.c_str(),
-            NAPI_AUTO_LENGTH, &deviceDescriptor), CREATE_STRING, scope);
+            NAPI_AUTO_LENGTH, &deviceDescriptor), CREATE_STRING_UTF8, scope);
         napi_value eventMsg = nullptr;
         CHKRV_SCOPE(item->env, napi_create_int32(item->env, static_cast<int32_t>(item->data.msg), &eventMsg),
             CREATE_INT32, scope);
diff --git a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
index a682f4d5ec..e62b0b2a85 100755
--- a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
@@ -63,7 +63,7 @@ napi_value JsInputDeviceCooperateContext::Enable(napi_env env, napi_callback_inf
     CALL_INFO_TRACE;
     size_t argc = 2;
     napi_value argv[2] = {};
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
 
     if (argc == 0) {
         MMI_HILOGE("Wrong number of parameters");
@@ -76,7 +76,7 @@ napi_value JsInputDeviceCooperateContext::Enable(napi_env env, napi_callback_inf
         return nullptr;
     }
     bool enable = false;
-    CHKRP(env, napi_get_value_bool(env, argv[0], &enable), GET_BOOL);
+    CHKRP(napi_get_value_bool(env, argv[0], &enable), GET_VALUE_BOOL);
 
     JsInputDeviceCooperateContext *jsDev = JsInputDeviceCooperateContext::GetInstance(env);
     CHKPP(jsDev);
@@ -97,7 +97,7 @@ napi_value JsInputDeviceCooperateContext::Start(napi_env env, napi_callback_info
     CALL_INFO_TRACE;
     size_t argc = 3;
     napi_value argv[3] = {};
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
 
     if (argc < 2) {
         MMI_HILOGE("Wrong number of parameters");
@@ -117,10 +117,10 @@ napi_value JsInputDeviceCooperateContext::Start(napi_env env, napi_callback_info
     char sinkDeviceDescriptor[MAX_STRING_LEN] = {};
     int32_t srcInputDeviceId = 0;
     size_t length = 0;
-    CHKRP(env, napi_get_value_string_utf8(env, argv[0], sinkDeviceDescriptor,
-        sizeof(sinkDeviceDescriptor), &length), GET_STRING);
+    CHKRP(napi_get_value_string_utf8(env, argv[0], sinkDeviceDescriptor,
+        sizeof(sinkDeviceDescriptor), &length), GET_VALUE_STRING_UTF8);
     std::string sinkDeviceDescriptor_ = sinkDeviceDescriptor;
-    CHKRP(env, napi_get_value_int32(env, argv[1], &srcInputDeviceId), GET_INT32);
+    CHKRP(napi_get_value_int32(env, argv[1], &srcInputDeviceId), GET_VALUE_INT32);
 
     JsInputDeviceCooperateContext *jsDev = JsInputDeviceCooperateContext::GetInstance(env);
     CHKPP(jsDev);
@@ -141,7 +141,7 @@ napi_value JsInputDeviceCooperateContext::Stop(napi_env env, napi_callback_info
     CALL_INFO_TRACE;
     size_t argc = 1;
     napi_value argv[1] = {};
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
 
     JsInputDeviceCooperateContext *jsDev = JsInputDeviceCooperateContext::GetInstance(env);
     CHKPP(jsDev);
@@ -162,7 +162,7 @@ napi_value JsInputDeviceCooperateContext::GetState(napi_env env, napi_callback_i
     CALL_INFO_TRACE;
     size_t argc = 2;
     napi_value argv[2] = {};
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
 
     if (argc == 0) {
         MMI_HILOGE("Wrong number of parameters");
@@ -176,8 +176,8 @@ napi_value JsInputDeviceCooperateContext::GetState(napi_env env, napi_callback_i
     }
     char deviceDescriptor[MAX_STRING_LEN] = { 0 };
     size_t length = 0;
-    CHKRP(env, napi_get_value_string_utf8(env, argv[0], deviceDescriptor,
-        sizeof(deviceDescriptor), &length), GET_STRING);
+    CHKRP(napi_get_value_string_utf8(env, argv[0], deviceDescriptor,
+        sizeof(deviceDescriptor), &length), GET_VALUE_STRING_UTF8);
     std::string deviceDescriptor_ = deviceDescriptor;
 
     JsInputDeviceCooperateContext *jsDev = JsInputDeviceCooperateContext::GetInstance(env);
@@ -199,7 +199,7 @@ napi_value JsInputDeviceCooperateContext::On(napi_env env, napi_callback_info in
     CALL_INFO_TRACE;
     size_t argc = 2;
     napi_value argv[2] = {};
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
 
     if (argc == 0) {
         MMI_HILOGE("Wrong number of parameters");
@@ -213,7 +213,7 @@ napi_value JsInputDeviceCooperateContext::On(napi_env env, napi_callback_info in
     }
     char type[MAX_STRING_LEN] = {};
     size_t length = 0;
-    CHKRP(env, napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &length), GET_STRING);
+    CHKRP(napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &length), GET_VALUE_STRING_UTF8);
     if (std::strcmp(type, "cooperation") != 0) {
         THROWERR(env, "Register listener failed, the first parameter is invalid");
         MMI_HILOGE("Register listener failed, the first parameter is invalid");
@@ -236,7 +236,7 @@ napi_value JsInputDeviceCooperateContext::Off(napi_env env, napi_callback_info i
     CALL_INFO_TRACE;
     size_t argc = 2;
     napi_value argv[2] = {};
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
 
     if (argc == 0) {
         MMI_HILOGE("Wrong number of parameters");
@@ -250,7 +250,7 @@ napi_value JsInputDeviceCooperateContext::Off(napi_env env, napi_callback_info i
     }
     char type[MAX_STRING_LEN] = {};
     size_t length = 0;
-    CHKRP(env, napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &length), GET_STRING);
+    CHKRP(napi_get_value_string_utf8(env, argv[0], type, sizeof(type), &length), GET_VALUE_STRING_UTF8);
     std::string type_ = type;
 
     JsInputDeviceCooperateContext *jsDev = JsInputDeviceCooperateContext::GetInstance(env);
@@ -279,27 +279,27 @@ napi_value JsInputDeviceCooperateContext::CreateInstance(napi_env env)
 {
     CALL_INFO_TRACE;
     napi_value global = nullptr;
-    CHKRP(env, napi_get_global(env, &global), GET_GLOBAL);
+    CHKRP(napi_get_global(env, &global), GET_GLOBAL);
 
     constexpr char className[] = "JsInputDeviceCooperateContext";
     napi_value jsClass = nullptr;
     napi_property_descriptor desc[] = {};
     napi_status status = napi_define_class(env, className, sizeof(className),
         JsInputDeviceCooperateContext::JsConstructor, nullptr, sizeof(desc) / sizeof(desc[0]), nullptr, &jsClass);
-    CHKRP(env, status, DEFINE_CLASS);
+    CHKRP(status, DEFINE_CLASS);
 
     status = napi_set_named_property(env, global, INPUT_DEVICE_CLASS, jsClass);
-    CHKRP(env, status, SET_NAMED_PROPERTY);
+    CHKRP(status, SET_NAMED_PROPERTY);
 
     napi_value jsInstance = nullptr;
-    CHKRP(env, napi_new_instance(env, jsClass, 0, nullptr, &jsInstance), NEW_INSTANCE);
-    CHKRP(env, napi_set_named_property(env, global, INPUT_DEVICE_COOPERATE, jsInstance),
+    CHKRP(napi_new_instance(env, jsClass, 0, nullptr, &jsInstance), NEW_INSTANCE);
+    CHKRP(napi_set_named_property(env, global, INPUT_DEVICE_COOPERATE, jsInstance),
         SET_NAMED_PROPERTY);
 
     JsInputDeviceCooperateContext *jsContext = nullptr;
-    CHKRP(env, napi_unwrap(env, jsInstance, (void**)&jsContext), UNWRAP);
+    CHKRP(napi_unwrap(env, jsInstance, (void**)&jsContext), UNWRAP);
     CHKPP(jsContext);
-    CHKRP(env, napi_create_reference(env, jsInstance, 1, &(jsContext->contextRef_)), CREATE_REFERENCE);
+    CHKRP(napi_create_reference(env, jsInstance, 1, &(jsContext->contextRef_)), CREATE_REFERENCE);
 
     uint32_t refCount = 0;
     status = napi_reference_ref(env, jsContext->contextRef_, &refCount);
@@ -316,7 +316,7 @@ napi_value JsInputDeviceCooperateContext::JsConstructor(napi_env env, napi_callb
     CALL_INFO_TRACE;
     napi_value thisVar = nullptr;
     void *data = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, &data), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, &data), GET_CB_INFO);
 
     JsInputDeviceCooperateContext *jsContext = new (std::nothrow) JsInputDeviceCooperateContext();
     CHKPP(jsContext);
@@ -339,24 +339,24 @@ JsInputDeviceCooperateContext *JsInputDeviceCooperateContext::GetInstance(napi_e
 {
     CALL_INFO_TRACE;
     napi_value global = nullptr;
-    CHKRP(env, napi_get_global(env, &global), GET_GLOBAL);
+    CHKRP(napi_get_global(env, &global), GET_GLOBAL);
 
     bool result = false;
-    CHKRP(env, napi_has_named_property(env, global, INPUT_DEVICE_COOPERATE, &result), HAS_NAMED_PROPERTY);
+    CHKRP(napi_has_named_property(env, global, INPUT_DEVICE_COOPERATE, &result), HAS_NAMED_PROPERTY);
     if (!result) {
         MMI_HILOGE("multimodal_input_device_cooperate was not found");
         return nullptr;
     }
 
     napi_value object = nullptr;
-    CHKRP(env, napi_get_named_property(env, global, INPUT_DEVICE_COOPERATE, &object), GET_NAMED_PROPERTY);
+    CHKRP(napi_get_named_property(env, global, INPUT_DEVICE_COOPERATE, &object), GET_NAMED_PROPERTY);
     if (object == nullptr) {
         MMI_HILOGE("object is nullptr");
         return nullptr;
     }
 
     JsInputDeviceCooperateContext *instance = nullptr;
-    CHKRP(env, napi_unwrap(env, object, (void**)&instance), UNWRAP);
+    CHKRP(napi_unwrap(env, object, (void**)&instance), UNWRAP);
     if (instance == nullptr) {
         MMI_HILOGE("instance is nullptr");
         return nullptr;
@@ -367,19 +367,19 @@ JsInputDeviceCooperateContext *JsInputDeviceCooperateContext::GetInstance(napi_e
 void JsInputDeviceCooperateContext::DeclareDeviceCooperateInterface(napi_env env, napi_value exports)
 {
     napi_value infoStart = nullptr;
-    CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::INFO_START), &infoStart),
+    CHKRV(napi_create_int32(env, static_cast<int32_t>(CooperationMessage::INFO_START), &infoStart),
         CREATE_INT32);
     napi_value infoSuccess = nullptr;
-    CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::INFO_SUCCESS), &infoSuccess),
+    CHKRV(napi_create_int32(env, static_cast<int32_t>(CooperationMessage::INFO_SUCCESS), &infoSuccess),
         CREATE_INT32);
     napi_value infoFail = nullptr;
-    CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::INFO_FAIL), &infoFail),
+    CHKRV(napi_create_int32(env, static_cast<int32_t>(CooperationMessage::INFO_FAIL), &infoFail),
         CREATE_INT32);
     napi_value stateOn = nullptr;
-    CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::STATE_ON), &stateOn),
+    CHKRV(napi_create_int32(env, static_cast<int32_t>(CooperationMessage::STATE_ON), &stateOn),
         CREATE_INT32);
     napi_value stateOff = nullptr;
-    CHKRV(env, napi_create_int32(env, static_cast<int32_t>(CooperationMessage::STATE_OFF), &stateOff),
+    CHKRV(napi_create_int32(env, static_cast<int32_t>(CooperationMessage::STATE_OFF), &stateOff),
         CREATE_INT32);
 
     napi_property_descriptor msg[] = {
@@ -391,9 +391,9 @@ void JsInputDeviceCooperateContext::DeclareDeviceCooperateInterface(napi_env env
     };
 
     napi_value eventMsg = nullptr;
-    CHKRV(env, napi_define_class(env, "EventMsg", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
+    CHKRV(napi_define_class(env, "EventMsg", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
         sizeof(msg) / sizeof(*msg), msg, &eventMsg), DEFINE_CLASS);
-    CHKRV(env, napi_set_named_property(env, exports, "EventMsg", eventMsg), SET_NAMED_PROPERTY);
+    CHKRV(napi_set_named_property(env, exports, "EventMsg", eventMsg), SET_NAMED_PROPERTY);
 }
 
 void JsInputDeviceCooperateContext::DeclareDeviceCooperateData(napi_env env, napi_value exports)
@@ -406,7 +406,7 @@ void JsInputDeviceCooperateContext::DeclareDeviceCooperateData(napi_env env, nap
         DECLARE_NAPI_STATIC_FUNCTION("on", On),
         DECLARE_NAPI_STATIC_FUNCTION("off", Off),
     };
-    CHKRV(env, napi_define_properties(env, exports,
+    CHKRV(napi_define_properties(env, exports,
         sizeof(functions) / sizeof(*functions), functions), DEFINE_PROPERTIES);
 }
 
@@ -416,7 +416,7 @@ napi_value JsInputDeviceCooperateContext::EnumClassConstructor(napi_env env, nap
     napi_value args[1] = {};
     napi_value result = nullptr;
     void *data = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, &argc, args, &result, &data), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, args, &result, &data), GET_CB_INFO);
     return result;
 }
 } // namespace MMI
diff --git a/frameworks/napi/input_device_cooperate/src/js_util.cpp b/frameworks/napi/input_device_cooperate/src/js_util.cpp
index 457a225804..b0d3aa3986 100755
--- a/frameworks/napi/input_device_cooperate/src/js_util.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_util.cpp
@@ -30,7 +30,7 @@ JsUtil::CallbackInfo::~CallbackInfo()
 {
     CALL_DEBUG_ENTER;
     if (ref != nullptr && env != nullptr) {
-        CHKRV(env, napi_delete_reference(env, ref), DELETE_REFERENCE);
+        CHKRV(napi_delete_reference(env, ref), DELETE_REFERENCE);
         env = nullptr;
     }
 }
@@ -62,9 +62,9 @@ napi_value JsUtil::GetStateInfo(const std::unique_ptr<CallbackInfo> &cb)
     CHKPP(cb->env);
     napi_value ret = nullptr;
     napi_value state = nullptr;
-    CHKRP(cb->env, napi_create_int32(cb->env, cb->data.cooperateOpened ? 1 : 0, &ret),
+    CHKRP(napi_create_int32(cb->env, cb->data.cooperateOpened ? 1 : 0, &ret),
         CREATE_INT32);
-    CHKRP(cb->env, napi_coerce_to_bool(cb->env, ret, &state), COERCE_TO_BOOL);
+    CHKRP(napi_coerce_to_bool(cb->env, ret, &state), COERCE_TO_BOOL);
     return state;
 }
 
@@ -81,11 +81,12 @@ napi_value JsUtil::GetResult(napi_env env, bool result, int32_t errCode)
             return nullptr;
         }
         napi_value resultCode = nullptr;
-        CHKRP(env, napi_create_int32(env, errCode, &resultCode), CREATE_INT32);
+        CHKRP(napi_create_int32(env, errCode, &resultCode), CREATE_INT32);
         napi_value resultMessage = nullptr;
-        CHKRP(env, napi_create_string_utf8(env, napiError.msg.data(), NAPI_AUTO_LENGTH, &resultMessage), CREATE_INT32);
-        CHKRP(env, napi_create_error(env, nullptr, resultMessage, &object), CREATE_ERROR);
-        CHKRP(env, napi_set_named_property(env, object, ERR_CODE.c_str(), resultCode), SET_NAMED_PROPERTY);
+        CHKRP(napi_create_string_utf8(env, napiError.msg.data(), NAPI_AUTO_LENGTH, &resultMessage),
+            CREATE_STRING_UTF8);
+        CHKRP(napi_create_error(env, nullptr, resultMessage, &object), CREATE_ERROR);
+        CHKRP(napi_set_named_property(env, object, ERR_CODE.c_str(), resultCode), SET_NAMED_PROPERTY);
     }
     return object;
 }
@@ -94,19 +95,19 @@ napi_value JsUtil::GetStateResult(napi_env env, bool result)
 {
     CHKPP(env);
     napi_value state = nullptr;
-    CHKRP(env, napi_get_boolean(env, result, &state), GET_BOOLEAN);
+    CHKRP(napi_get_boolean(env, result, &state), GET_BOOLEAN);
     napi_value object = nullptr;
-    CHKRP(env, napi_create_object(env, &object), CREATE_OBJECT);
-    CHKRP(env, napi_set_named_property(env,  object, "state", state), SET_NAMED_PROPERTY);
+    CHKRP(napi_create_object(env, &object), CREATE_OBJECT);
+    CHKRP(napi_set_named_property(env,  object, "state", state), SET_NAMED_PROPERTY);
     return object;
 }
 
 bool JsUtil::IsSameHandle(napi_env env, napi_value handle, napi_ref ref)
 {
     napi_value handlerTemp = nullptr;
-    CHKRF(env, napi_get_reference_value(env, ref, &handlerTemp), GET_REFERENCE_VALUE);
+    CHKRF(napi_get_reference_value(env, ref, &handlerTemp), GET_REFERENCE_VALUE);
     bool isEqual = false;
-    CHKRF(env, napi_strict_equals(env, handle, handlerTemp, &isEqual), STRICT_EQUALS);
+    CHKRF(napi_strict_equals(env, handle, handlerTemp, &isEqual), STRICT_EQUALS);
     return isEqual;
 }
 } // namespace MMI
diff --git a/frameworks/napi/input_event_client/src/js_register_module.cpp b/frameworks/napi/input_event_client/src/js_register_module.cpp
index 10da3d8c98..34cbd926c0 100644
--- a/frameworks/napi/input_event_client/src/js_register_module.cpp
+++ b/frameworks/napi/input_event_client/src/js_register_module.cpp
@@ -35,27 +35,27 @@ static napi_value InjectEvent(napi_env env, napi_callback_info info)
     napi_value result = nullptr;
     size_t argc = 1;
     napi_value argv[1] = { 0 };
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 1) {
         MMI_HILOGE("Paramater number error");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "parameter number error");
         return nullptr;
     }
     napi_valuetype tmpType = napi_undefined;
-    CHKRP(env, napi_typeof(env, argv[0], &tmpType), TYPEOF);
+    CHKRP(napi_typeof(env, argv[0], &tmpType), TYPEOF);
     if (tmpType != napi_object) {
         MMI_HILOGE("KeyEvent is not napi_object");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "KeyEvent", "object");
         return nullptr;
     }
     napi_value keyHandle = nullptr;
-    CHKRP(env, napi_get_named_property(env, argv[0], "KeyEvent", &keyHandle), GET_NAMED_PROPERTY);
+    CHKRP(napi_get_named_property(env, argv[0], "KeyEvent", &keyHandle), GET_NAMED_PROPERTY);
     if (keyHandle == nullptr) {
         MMI_HILOGE("KeyEvent is nullptr");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "KeyEvent not found");
         return nullptr;
     }
-    CHKRP(env, napi_typeof(env, keyHandle, &tmpType), TYPEOF);
+    CHKRP(napi_typeof(env, keyHandle, &tmpType), TYPEOF);
     if (tmpType != napi_object) {
         MMI_HILOGE("KeyEvent is not napi_object");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "KeyEvent", "object");
@@ -111,7 +111,7 @@ static napi_value InjectEvent(napi_env env, napi_callback_info info)
     item.SetDownTime(static_cast<int64_t>(keyDownDuration));
     keyEvent->AddKeyItem(item);
     InputManager::GetInstance()->SimulateInputEvent(keyEvent);
-    CHKRP(env, napi_create_int32(env, 0, &result), CREATE_INT32);
+    CHKRP(napi_create_int32(env, 0, &result), CREATE_INT32);
     return result;
 }
 
diff --git a/frameworks/napi/input_event_client/src/js_register_util.cpp b/frameworks/napi/input_event_client/src/js_register_util.cpp
index dc8c9d09be..e949cca7a0 100644
--- a/frameworks/napi/input_event_client/src/js_register_util.cpp
+++ b/frameworks/napi/input_event_client/src/js_register_util.cpp
@@ -30,20 +30,20 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "JSReg
 int32_t GetNamedPropertyBool(const napi_env& env, const napi_value& object, const std::string& name, bool& ret)
 {
     napi_value napiValue = {};
-    CHKRF(env, napi_get_named_property(env, object, name.c_str(), &napiValue), GET_NAMED_PROPERTY);
+    CHKRF(napi_get_named_property(env, object, name.c_str(), &napiValue), GET_NAMED_PROPERTY);
     if (napiValue == nullptr) {
         MMI_HILOGE("The value is null");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Invalid KeyEvent");
         return RET_ERR;
     }
     napi_valuetype tmpType = napi_undefined;
-    CHKRF(env, napi_typeof(env, napiValue, &tmpType), TYPEOF);
+    CHKRF(napi_typeof(env, napiValue, &tmpType), TYPEOF);
     if (tmpType != napi_boolean) {
         MMI_HILOGE("The name is not bool");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, name.c_str(), "bool");
         return RET_ERR;
     }
-    CHKRF(env, napi_get_value_bool(env, napiValue, &ret), GET_BOOL);
+    CHKRF(napi_get_value_bool(env, napiValue, &ret), GET_VALUE_BOOL);
     return RET_OK;
 }
 
diff --git a/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp b/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp
index e9dae772ef..347aa3f7fc 100644
--- a/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp
@@ -216,7 +216,7 @@ void JsInputMonitorManager::RemoveEnv(std::map<napi_env, napi_ref>::iterator it)
 {
     CALL_DEBUG_ENTER;
     uint32_t refCount;
-    CHKRV(it->first, napi_reference_unref(it->first, it->second, &refCount), REFERENCE_UNREF);
+    CHKRV(napi_reference_unref(it->first, it->second, &refCount), REFERENCE_UNREF);
     envManager_.erase(it);
 }
 
diff --git a/frameworks/napi/input_monitor/src/js_input_monitor_module.cpp b/frameworks/napi/input_monitor/src/js_input_monitor_module.cpp
index 90beff3f0e..5e20284484 100644
--- a/frameworks/napi/input_monitor/src/js_input_monitor_module.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor_module.cpp
@@ -37,9 +37,9 @@ static napi_value JsOnApi9(napi_env env, napi_callback_info info)
     size_t argc = 2;
     napi_value argv[2];
 
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     napi_valuetype valueType = napi_undefined;
-    CHKRP(env, napi_typeof(env, argv[0], &valueType), TYPEOF);
+    CHKRP(napi_typeof(env, argv[0], &valueType), TYPEOF);
     if (valueType != napi_string) {
         MMI_HILOGE("First Parameter type error");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "EventType", "string");
@@ -47,12 +47,12 @@ static napi_value JsOnApi9(napi_env env, napi_callback_info info)
     }
     char typeName[MAX_STRING_LEN] = { 0 };
     size_t len = 0;
-    CHKRP(env, napi_get_value_string_utf8(env, argv[0], typeName, MAX_STRING_LEN - 1, &len), GET_STRING_UTF8);
+    CHKRP(napi_get_value_string_utf8(env, argv[0], typeName, MAX_STRING_LEN - 1, &len), GET_VALUE_STRING_UTF8);
     if (std::strcmp(typeName, "touch") != 0 && std::strcmp(typeName, "mouse") != 0) {
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "EventType must be mouse or touch");
         return nullptr;
     }
-    CHKRP(env, napi_typeof(env, argv[1], &valueType), TYPEOF);
+    CHKRP(napi_typeof(env, argv[1], &valueType), TYPEOF);
     if (valueType != napi_function) {
         MMI_HILOGE("Second Parameter type error");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Second Parameter type error");
@@ -71,7 +71,7 @@ static napi_value JsOn(napi_env env, napi_callback_info info)
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 2) {
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "parameter number error");
         return nullptr;
@@ -85,9 +85,9 @@ static napi_value JsOffApi9(napi_env env, napi_callback_info info)
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     napi_valuetype valueType = napi_undefined;
-    CHKRP(env, napi_typeof(env, argv[0], &valueType), TYPEOF);
+    CHKRP(napi_typeof(env, argv[0], &valueType), TYPEOF);
     if (valueType != napi_string) {
         MMI_HILOGE("First Parameter type error");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "EventType", "string");
@@ -95,7 +95,7 @@ static napi_value JsOffApi9(napi_env env, napi_callback_info info)
     }
     char typeName[MAX_STRING_LEN] = { 0 };
     size_t len = 0;
-    CHKRP(env, napi_get_value_string_utf8(env, argv[0], typeName, MAX_STRING_LEN - 1, &len), GET_STRING_UTF8);
+    CHKRP(napi_get_value_string_utf8(env, argv[0], typeName, MAX_STRING_LEN - 1, &len), GET_VALUE_STRING_UTF8);
     if (std::strcmp(typeName, "touch") != 0 && std::strcmp(typeName, "mouse") != 0) {
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "EventType must be mouse or touch");
         return nullptr;
@@ -106,7 +106,7 @@ static napi_value JsOffApi9(napi_env env, napi_callback_info info)
         return nullptr;
     }
 
-    CHKRP(env, napi_typeof(env, argv[1], &valueType), TYPEOF);
+    CHKRP(napi_typeof(env, argv[1], &valueType), TYPEOF);
     if (valueType != napi_function) {
         MMI_HILOGE("Second Parameter type error");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Second Parameter type error");
@@ -128,7 +128,7 @@ static napi_value JsOff(napi_env env, napi_callback_info info)
     size_t argc = 2;
     napi_value argv[2];
 
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 1) {
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "parameter number error");
         return nullptr;
@@ -145,7 +145,7 @@ static napi_value MmiInputMonitorInit(napi_env env, napi_value exports)
         DECLARE_NAPI_FUNCTION("on", JsOn),
         DECLARE_NAPI_FUNCTION("off", JsOff),
     };
-    CHKRP(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc), DEFINE_PROPERTIES);
+    CHKRP(napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc), DEFINE_PROPERTIES);
     return exports;
 }
 EXTERN_C_END
diff --git a/frameworks/napi/key_code/src/js_key_code.cpp b/frameworks/napi/key_code/src/js_key_code.cpp
index 52f33f5505..c029129c24 100644
--- a/frameworks/napi/key_code/src/js_key_code.cpp
+++ b/frameworks/napi/key_code/src/js_key_code.cpp
@@ -30,7 +30,7 @@ napi_value JsKeyCode::GetNapiInt32(napi_env env, int32_t code)
 {
     CALL_DEBUG_ENTER;
     napi_value keyCode = nullptr;
-    CHKRP(env, napi_create_int32(env, code, &keyCode), CREATE_INT32);
+    CHKRP(napi_create_int32(env, code, &keyCode), CREATE_INT32);
     return keyCode;
 }
 
@@ -41,7 +41,7 @@ napi_value JsKeyCode::EnumClassConstructor(napi_env env, napi_callback_info info
     napi_value args[1] = {0};
     napi_value ret = nullptr;
     void *data = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
     return ret;
 }
 
@@ -397,9 +397,9 @@ napi_value JsKeyCode::Export(napi_env env, napi_value exports)
     };
 
     napi_value result = nullptr;
-    CHKRP(env, napi_define_class(env, "KeyCode", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
+    CHKRP(napi_define_class(env, "KeyCode", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
         sizeof(desc) / sizeof(*desc), desc, &result), DEFINE_CLASS);
-    CHKRP(env, napi_set_named_property(env, exports, "KeyCode", result), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(env, exports, "KeyCode", result), SET_NAMED_PROPERTY);
     return exports;
 }
 } // namespace MMI
diff --git a/frameworks/napi/key_event/src/js_key_event.cpp b/frameworks/napi/key_event/src/js_key_event.cpp
index 5cdbf9cdd8..1145306d92 100644
--- a/frameworks/napi/key_event/src/js_key_event.cpp
+++ b/frameworks/napi/key_event/src/js_key_event.cpp
@@ -35,7 +35,7 @@ napi_value JsKeyEvent::GetNapiInt32(napi_env env, int32_t code)
 {
     CALL_DEBUG_ENTER;
     napi_value ret = nullptr;
-    CHKRP(env, napi_create_int32(env, code, &ret), CREATE_INT32);
+    CHKRP(napi_create_int32(env, code, &ret), CREATE_INT32);
     return ret;
 }
 
@@ -46,7 +46,7 @@ napi_value JsKeyEvent::EnumClassConstructor(napi_env env, napi_callback_info inf
     napi_value args[1] = {0};
     napi_value ret = nullptr;
     void *data = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
     return ret;
 }
 
@@ -60,9 +60,9 @@ napi_value JsKeyEvent::Export(napi_env env, napi_value exports)
     };
 
     napi_value action = nullptr;
-    CHKRP(env, napi_define_class(env, "Action", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
+    CHKRP(napi_define_class(env, "Action", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
         sizeof(desc) / sizeof(*desc), desc, &action), DEFINE_CLASS);
-    CHKRP(env, napi_set_named_property(env, exports, "Action", action), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(env, exports, "Action", action), SET_NAMED_PROPERTY);
     return exports;
 }
 } // namespace MMI
diff --git a/frameworks/napi/mouse_event/src/js_mouse_event.cpp b/frameworks/napi/mouse_event/src/js_mouse_event.cpp
index 4ddd3aa75d..341e748261 100644
--- a/frameworks/napi/mouse_event/src/js_mouse_event.cpp
+++ b/frameworks/napi/mouse_event/src/js_mouse_event.cpp
@@ -56,7 +56,7 @@ napi_value JsMouseEvent::GetNapiInt32(napi_env env, int32_t code)
 {
     CALL_DEBUG_ENTER;
     napi_value ret = nullptr;
-    CHKRP(env, napi_create_int32(env, code, &ret), CREATE_INT32);
+    CHKRP(napi_create_int32(env, code, &ret), CREATE_INT32);
     return ret;
 }
 
@@ -67,7 +67,7 @@ napi_value JsMouseEvent::EnumClassConstructor(napi_env env, napi_callback_info i
     napi_value args[1] = {0};
     napi_value ret = nullptr;
     void *data = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
     return ret;
 }
 
@@ -84,9 +84,9 @@ napi_value JsMouseEvent::Export(napi_env env, napi_value exports)
         DECLARE_NAPI_STATIC_PROPERTY("AXIS_END", GetNapiInt32(env, static_cast<int32_t>(Action::AXIS_END))),
     };
     napi_value action = nullptr;
-    CHKRP(env, napi_define_class(env, "Action", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
+    CHKRP(napi_define_class(env, "Action", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
         sizeof(actionArr) / sizeof(*actionArr), actionArr, &action), DEFINE_CLASS);
-    CHKRP(env, napi_set_named_property(env, exports, "Action", action), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(env, exports, "Action", action), SET_NAMED_PROPERTY);
 
     napi_property_descriptor buttonArr[] = {
         DECLARE_NAPI_STATIC_PROPERTY("LEFT", GetNapiInt32(env, static_cast<int32_t>(Button::LEFT))),
@@ -99,9 +99,9 @@ napi_value JsMouseEvent::Export(napi_env env, napi_value exports)
         DECLARE_NAPI_STATIC_PROPERTY("TASK", GetNapiInt32(env, static_cast<int32_t>(Button::TASK))),
     };
     napi_value button = nullptr;
-    CHKRP(env, napi_define_class(env, "Button", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
+    CHKRP(napi_define_class(env, "Button", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
         sizeof(buttonArr) / sizeof(*buttonArr), buttonArr, &button), DEFINE_CLASS);
-    CHKRP(env, napi_set_named_property(env, exports, "Button", button), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(env, exports, "Button", button), SET_NAMED_PROPERTY);
 
     napi_property_descriptor axisArr[] = {
         DECLARE_NAPI_STATIC_PROPERTY("SCROLL_VERTICAL", GetNapiInt32(env, static_cast<int32_t>(Axis::SCROLL_VERTICAL))),
@@ -110,9 +110,9 @@ napi_value JsMouseEvent::Export(napi_env env, napi_value exports)
         DECLARE_NAPI_STATIC_PROPERTY("PINCH", GetNapiInt32(env, static_cast<int32_t>(Axis::PINCH))),
     };
     napi_value axis = nullptr;
-    CHKRP(env, napi_define_class(env, "Axis", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
+    CHKRP(napi_define_class(env, "Axis", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
         sizeof(axisArr) / sizeof(*axisArr), axisArr, &axis), DEFINE_CLASS);
-    CHKRP(env, napi_set_named_property(env, exports, "Axis", axis), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(env, exports, "Axis", axis), SET_NAMED_PROPERTY);
     return exports;
 }
 } // namespace MMI
diff --git a/frameworks/napi/pointer/src/js_pointer_context.cpp b/frameworks/napi/pointer/src/js_pointer_context.cpp
index fa27ced90a..7c5fe9192a 100644
--- a/frameworks/napi/pointer/src/js_pointer_context.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_context.cpp
@@ -30,29 +30,29 @@ napi_value JsPointerContext::CreateInstance(napi_env env)
 {
     CALL_DEBUG_ENTER;
     napi_value global = nullptr;
-    CHKRP(env, napi_get_global(env, &global), GET_GLOBAL);
+    CHKRP(napi_get_global(env, &global), GET_GLOBAL);
 
     constexpr char className[] = "JsPointerContext";
     napi_value jsClass = nullptr;
     napi_property_descriptor desc[] = {};
     napi_status status = napi_define_class(env, className, sizeof(className), JsPointerContext::CreateJsObject,
                                            nullptr, sizeof(desc) / sizeof(desc[0]), nullptr, &jsClass);
-    CHKRP(env, status, DEFINE_CLASS);
+    CHKRP(status, DEFINE_CLASS);
 
     status = napi_set_named_property(env, global, "multimodalinput_pointer_class", jsClass);
-    CHKRP(env, status, SET_NAMED_PROPERTY);
+    CHKRP(status, SET_NAMED_PROPERTY);
 
     napi_value jsInstance = nullptr;
-    CHKRP(env, napi_new_instance(env, jsClass, 0, nullptr, &jsInstance), NEW_INSTANCE);
-    CHKRP(env, napi_set_named_property(env, global, "multimodal_pointer", jsInstance), SET_NAMED_PROPERTY);
+    CHKRP(napi_new_instance(env, jsClass, 0, nullptr, &jsInstance), NEW_INSTANCE);
+    CHKRP(napi_set_named_property(env, global, "multimodal_pointer", jsInstance), SET_NAMED_PROPERTY);
 
     JsPointerContext *jsContext = nullptr;
-    CHKRP(env, napi_unwrap(env, jsInstance, (void**)&jsContext), UNWRAP);
+    CHKRP(napi_unwrap(env, jsInstance, (void**)&jsContext), UNWRAP);
     CHKPP(jsContext);
-    CHKRP(env, napi_create_reference(env, jsInstance, 1, &(jsContext->contextRef_)), CREATE_REFERENCE);
+    CHKRP(napi_create_reference(env, jsInstance, 1, &(jsContext->contextRef_)), CREATE_REFERENCE);
 
     uint32_t refCount = 0;
-    CHKRP(env, napi_reference_ref(env, jsContext->contextRef_, &refCount), REFERENCE_REF);
+    CHKRP(napi_reference_ref(env, jsContext->contextRef_, &refCount), REFERENCE_REF);
     return jsInstance;
 }
 
@@ -61,7 +61,7 @@ napi_value JsPointerContext::CreateJsObject(napi_env env, napi_callback_info inf
     CALL_DEBUG_ENTER;
     napi_value thisVar = nullptr;
     void *data = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, &data), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, &data), GET_CB_INFO);
 
     JsPointerContext *jsContext = new (std::nothrow) JsPointerContext();
     CHKPP(jsContext);
@@ -82,24 +82,24 @@ JsPointerContext* JsPointerContext::GetInstance(napi_env env)
 {
     CALL_DEBUG_ENTER;
     napi_value global = nullptr;
-    CHKRP(env, napi_get_global(env, &global), GET_GLOBAL);
+    CHKRP(napi_get_global(env, &global), GET_GLOBAL);
 
     bool result = false;
-    CHKRP(env, napi_has_named_property(env, global, "multimodal_pointer", &result), HAS_NAMED_PROPERTY);
+    CHKRP(napi_has_named_property(env, global, "multimodal_pointer", &result), HAS_NAMED_PROPERTY);
     if (!result) {
         THROWERR(env, "multimodal_pointer was not found");
         return nullptr;
     }
 
     napi_value object = nullptr;
-    CHKRP(env, napi_get_named_property(env, global, "multimodal_pointer", &object), SET_NAMED_PROPERTY);
+    CHKRP(napi_get_named_property(env, global, "multimodal_pointer", &object), SET_NAMED_PROPERTY);
     if (object == nullptr) {
         THROWERR(env, "object is nullptr");
         return nullptr;
     }
 
     JsPointerContext *instance = nullptr;
-    CHKRP(env, napi_unwrap(env, object, (void**)&instance), UNWRAP);
+    CHKRP(napi_unwrap(env, object, (void**)&instance), UNWRAP);
     if (instance == nullptr) {
         THROWERR(env, "instance is nullptr");
         return nullptr;
@@ -117,7 +117,7 @@ napi_value JsPointerContext::SetPointerVisible(napi_env env, napi_callback_info
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc == 0) {
         MMI_HILOGE("At least one parameter is required");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "visible", "boolean");
@@ -129,7 +129,7 @@ napi_value JsPointerContext::SetPointerVisible(napi_env env, napi_callback_info
         return nullptr;
     }
     bool visible = true;
-    CHKRP(env, napi_get_value_bool(env, argv[0], &visible), GET_BOOL);
+    CHKRP(napi_get_value_bool(env, argv[0], &visible), GET_VALUE_BOOL);
 
     JsPointerContext *jsPointer = JsPointerContext::GetInstance(env);
     auto jsPointerMgr = jsPointer->GetJsPointerMgr();
@@ -149,7 +149,7 @@ napi_value JsPointerContext::IsPointerVisible(napi_env env, napi_callback_info i
     CALL_DEBUG_ENTER;
     size_t argc = 1;
     napi_value argv[1];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
 
     JsPointerContext *jsPointer = JsPointerContext::GetInstance(env);
     auto jsPointerMgr = jsPointer->GetJsPointerMgr();
@@ -170,7 +170,7 @@ napi_value JsPointerContext::SetPointerSpeed(napi_env env, napi_callback_info in
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc == 0) {
         MMI_HILOGE("At least 1 parameter is required");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "speed", "number");
@@ -182,7 +182,7 @@ napi_value JsPointerContext::SetPointerSpeed(napi_env env, napi_callback_info in
         return nullptr;
     }
     int32_t pointerSpeed = STANDARD_SPEED;
-    CHKRP(env, napi_get_value_int32(env, argv[0], &pointerSpeed), GET_INT32);
+    CHKRP(napi_get_value_int32(env, argv[0], &pointerSpeed), GET_VALUE_INT32);
     if (pointerSpeed < MIN_SPEED) {
         pointerSpeed = MIN_SPEED;
     } else if (pointerSpeed > MAX_SPEED) {
@@ -206,7 +206,7 @@ napi_value JsPointerContext::GetPointerSpeed(napi_env env, napi_callback_info in
     CALL_DEBUG_ENTER;
     size_t argc = 1;
     napi_value argv[1];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     JsPointerContext *jsPointer = JsPointerContext::GetInstance(env);
     auto jsPointerMgr = jsPointer->GetJsPointerMgr();
     if (argc == 0) {
@@ -226,7 +226,7 @@ napi_value JsPointerContext::SetPointerStyle(napi_env env, napi_callback_info in
     CALL_DEBUG_ENTER;
     size_t argc = 3;
     napi_value argv[3];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 2) {
         MMI_HILOGE("At least 2 parameter is required");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "windowId", "number");
@@ -238,7 +238,7 @@ napi_value JsPointerContext::SetPointerStyle(napi_env env, napi_callback_info in
         return nullptr;
     }
     int32_t windowid = 0;
-    CHKRP(env, napi_get_value_int32(env, argv[0], &windowid), GET_INT32);
+    CHKRP(napi_get_value_int32(env, argv[0], &windowid), GET_VALUE_INT32);
     if (windowid < 0) {
         MMI_HILOGE("Invalid windowid");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Windowid is invalid");
@@ -250,7 +250,7 @@ napi_value JsPointerContext::SetPointerStyle(napi_env env, napi_callback_info in
         return nullptr;
     }
     int32_t pointerStyle = 0;
-    CHKRP(env, napi_get_value_int32(env, argv[1], &pointerStyle), GET_INT32);
+    CHKRP(napi_get_value_int32(env, argv[1], &pointerStyle), GET_VALUE_INT32);
     if (pointerStyle < DEFAULT || pointerStyle > MIDDLE_BTN_NORTH_SOUTH_WEST_EAST) {
         MMI_HILOGE("Undefined pointer style");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Pointer style does not exist");
@@ -274,7 +274,7 @@ napi_value JsPointerContext::GetPointerStyle(napi_env env, napi_callback_info in
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc == 0) {
         MMI_HILOGE("At least 1 parameter is required");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "windowId", "number");
@@ -286,7 +286,7 @@ napi_value JsPointerContext::GetPointerStyle(napi_env env, napi_callback_info in
         return nullptr;
     }
     int32_t windowid = 0;
-    CHKRP(env, napi_get_value_int32(env, argv[0], &windowid), GET_INT32);
+    CHKRP(napi_get_value_int32(env, argv[0], &windowid), GET_VALUE_INT32);
     if (windowid < 0) {
         MMI_HILOGE("Invalid windowid");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Windowid is invalid");
@@ -309,83 +309,83 @@ napi_value JsPointerContext::CreatePointerStyle(napi_env env, napi_value exports
 {
     CALL_DEBUG_ENTER;
     napi_value defaults = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::DEFAULT, &defaults), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::DEFAULT, &defaults), CREATE_INT32);
     napi_value east = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::EAST, &east), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::EAST, &east), CREATE_INT32);
     napi_value west = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::WEST, &west), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::WEST, &west), CREATE_INT32);
     napi_value south = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::SOUTH, &south), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::SOUTH, &south), CREATE_INT32);
     napi_value north = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::NORTH, &north), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::NORTH, &north), CREATE_INT32);
     napi_value west_east = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::WEST_EAST, &west_east), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::WEST_EAST, &west_east), CREATE_INT32);
     napi_value north_south = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::NORTH_SOUTH, &north_south), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::NORTH_SOUTH, &north_south), CREATE_INT32);
     napi_value north_east = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::NORTH_EAST, &north_east), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::NORTH_EAST, &north_east), CREATE_INT32);
     napi_value north_west = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::NORTH_WEST, &north_west), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::NORTH_WEST, &north_west), CREATE_INT32);
     napi_value south_east = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::SOUTH_EAST, &south_east), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::SOUTH_EAST, &south_east), CREATE_INT32);
     napi_value south_west = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::SOUTH_WEST, &south_west), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::SOUTH_WEST, &south_west), CREATE_INT32);
     napi_value north_east_south_west = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::NORTH_EAST_SOUTH_WEST, &north_east_south_west), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::NORTH_EAST_SOUTH_WEST, &north_east_south_west), CREATE_INT32);
     napi_value north_west_south_east = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::NORTH_WEST_SOUTH_EAST, &north_west_south_east), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::NORTH_WEST_SOUTH_EAST, &north_west_south_east), CREATE_INT32);
     napi_value cross = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::CROSS, &cross), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::CROSS, &cross), CREATE_INT32);
     napi_value cursor_copy = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::CURSOR_COPY, &cursor_copy), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::CURSOR_COPY, &cursor_copy), CREATE_INT32);
     napi_value cursor_forbid = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::CURSOR_FORBID, &cursor_forbid), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::CURSOR_FORBID, &cursor_forbid), CREATE_INT32);
     napi_value color_sucker = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::COLOR_SUCKER, &color_sucker), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::COLOR_SUCKER, &color_sucker), CREATE_INT32);
     napi_value hand_grabbing = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::HAND_GRABBING, &hand_grabbing), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::HAND_GRABBING, &hand_grabbing), CREATE_INT32);
     napi_value hand_open = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::HAND_OPEN, &hand_open), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::HAND_OPEN, &hand_open), CREATE_INT32);
     napi_value hand_pointing = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::HAND_POINTING, &hand_pointing), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::HAND_POINTING, &hand_pointing), CREATE_INT32);
     napi_value help = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::HELP, &help), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::HELP, &help), CREATE_INT32);
     napi_value move = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::CURSOR_MOVE, &move), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::CURSOR_MOVE, &move), CREATE_INT32);
     napi_value resize_up_down = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::RESIZE_LEFT_RIGHT, &resize_up_down), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::RESIZE_LEFT_RIGHT, &resize_up_down), CREATE_INT32);
     napi_value resize_left_right = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::RESIZE_UP_DOWN, &resize_left_right), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::RESIZE_UP_DOWN, &resize_left_right), CREATE_INT32);
     napi_value screenshot_choose = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::SCREENSHOT_CHOOSE, &screenshot_choose), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::SCREENSHOT_CHOOSE, &screenshot_choose), CREATE_INT32);
     napi_value screenshot_cursor = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::SCREENSHOT_CURSOR, &screenshot_cursor), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::SCREENSHOT_CURSOR, &screenshot_cursor), CREATE_INT32);
     napi_value text_cursor = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::TEXT_CURSOR, &text_cursor), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::TEXT_CURSOR, &text_cursor), CREATE_INT32);
     napi_value zoom_in = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::ZOOM_IN, &zoom_in), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::ZOOM_IN, &zoom_in), CREATE_INT32);
     napi_value zoom_out = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::ZOOM_OUT, &zoom_out), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::ZOOM_OUT, &zoom_out), CREATE_INT32);
     napi_value middle_btn_east = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_EAST, &middle_btn_east), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_EAST, &middle_btn_east), CREATE_INT32);
     napi_value middle_btn_west = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_WEST, &middle_btn_west), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_WEST, &middle_btn_west), CREATE_INT32);
     napi_value middle_btn_south = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_SOUTH, &middle_btn_south), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_SOUTH, &middle_btn_south), CREATE_INT32);
     napi_value middle_btn_north = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_NORTH, &middle_btn_north), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_NORTH, &middle_btn_north), CREATE_INT32);
     napi_value middle_btn_north_south = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_NORTH_SOUTH, &middle_btn_north_south), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_NORTH_SOUTH, &middle_btn_north_south), CREATE_INT32);
     napi_value middle_btn_north_east = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_NORTH_EAST, &middle_btn_north_east), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_NORTH_EAST, &middle_btn_north_east), CREATE_INT32);
     napi_value middle_btn_north_west = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_NORTH_WEST, &middle_btn_north_west), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_NORTH_WEST, &middle_btn_north_west), CREATE_INT32);
     napi_value middle_btn_south_east = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_SOUTH_EAST, &middle_btn_south_east), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_SOUTH_EAST, &middle_btn_south_east), CREATE_INT32);
     napi_value middle_btn_south_west = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_SOUTH_WEST, &middle_btn_south_west), CREATE_INT32);
+    CHKRP(napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_SOUTH_WEST, &middle_btn_south_west), CREATE_INT32);
     napi_value middle_btn_north_south_west_east = nullptr;
-    CHKRP(env, napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_NORTH_SOUTH_WEST_EAST,
+    CHKRP(napi_create_int32(env, MOUSE_ICON::MIDDLE_BTN_NORTH_SOUTH_WEST_EAST,
         &middle_btn_north_south_west_east), CREATE_INT32);
 
     napi_property_descriptor desc[] = {
@@ -430,9 +430,9 @@ napi_value JsPointerContext::CreatePointerStyle(napi_env env, napi_value exports
         DECLARE_NAPI_STATIC_PROPERTY("MIDDLE_BTN_NORTH_SOUTH_WEST_EAST", middle_btn_north_south_west_east),
     };
     napi_value result = nullptr;
-    CHKRP(env, napi_define_class(env, "PointerStyle", NAPI_AUTO_LENGTH, EnumConstructor, nullptr,
+    CHKRP(napi_define_class(env, "PointerStyle", NAPI_AUTO_LENGTH, EnumConstructor, nullptr,
         sizeof(desc) / sizeof(*desc), desc, &result), DEFINE_CLASS);
-    CHKRP(env, napi_set_named_property(env, exports, "PointerStyle", result), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(env, exports, "PointerStyle", result), SET_NAMED_PROPERTY);
     return exports;
 }
 
@@ -443,7 +443,7 @@ napi_value JsPointerContext::EnumConstructor(napi_env env, napi_callback_info in
     napi_value args[1] = { 0 };
     napi_value ret = nullptr;
     void *data = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
     return ret;
 }
 
@@ -463,7 +463,7 @@ napi_value JsPointerContext::Export(napi_env env, napi_value exports)
         DECLARE_NAPI_STATIC_FUNCTION("setPointerStyle", SetPointerStyle),
         DECLARE_NAPI_STATIC_FUNCTION("getPointerStyle", GetPointerStyle),
     };
-    CHKRP(env, napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc), DEFINE_PROPERTIES);
+    CHKRP(napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc), DEFINE_PROPERTIES);
     if (CreatePointerStyle(env, exports) == nullptr) {
         THROWERR(env, "Failed to create pointer style");
         return nullptr;
diff --git a/frameworks/napi/pointer/src/js_pointer_manager.cpp b/frameworks/napi/pointer/src/js_pointer_manager.cpp
index a151669134..b8daa380e5 100644
--- a/frameworks/napi/pointer/src/js_pointer_manager.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_manager.cpp
@@ -32,7 +32,7 @@ enum class ReturnType {
 bool JsCommon::TypeOf(napi_env env, napi_value value, napi_valuetype type)
 {
     napi_valuetype valueType = napi_undefined;
-    CHKRF(env, napi_typeof(env, value, &valueType), TYPEOF);
+    CHKRF(napi_typeof(env, value, &valueType), TYPEOF);
     if (valueType != type) {
         return false;
     }
@@ -43,10 +43,10 @@ AsyncContext::~AsyncContext()
 {
     CALL_DEBUG_ENTER;
     if (work != nullptr) {
-        CHKRV(env, napi_delete_async_work(env, work), DELETE_ASYNC_WORK);
+        CHKRV(napi_delete_async_work(env, work), DELETE_ASYNC_WORK);
     }
     if (callback != nullptr && env != nullptr) {
-        CHKRV(env, napi_delete_reference(env, callback), DELETE_REFERENCE);
+        CHKRV(napi_delete_reference(env, callback), DELETE_REFERENCE);
         env = nullptr;
     }
 }
@@ -68,14 +68,14 @@ bool getResult(sptr<AsyncContext> asyncContext, napi_value * results)
         napi_value errCode = nullptr;
         napi_value errMsg = nullptr;
         napi_value businessError = nullptr;
-        CHKRF(env, napi_create_int32(env, asyncContext->errorCode, &errCode), CREATE_INT32);
-        CHKRF(env, napi_create_string_utf8(env, codeMsg.msg.c_str(),
+        CHKRF(napi_create_int32(env, asyncContext->errorCode, &errCode), CREATE_INT32);
+        CHKRF(napi_create_string_utf8(env, codeMsg.msg.c_str(),
             NAPI_AUTO_LENGTH, &errMsg), CREATE_STRING_UTF8);
-        CHKRF(env, napi_create_error(env, nullptr, errMsg, &businessError), CREATE_ERROR);
-        CHKRF(env, napi_set_named_property(env, businessError, ERR_CODE.c_str(), errCode), SET_NAMED_PROPERTY);
+        CHKRF(napi_create_error(env, nullptr, errMsg, &businessError), CREATE_ERROR);
+        CHKRF(napi_set_named_property(env, businessError, ERR_CODE.c_str(), errCode), SET_NAMED_PROPERTY);
         results[0] = businessError;
     } else {
-        CHKRF(env, napi_get_undefined(env, &results[0]), GET_UNDEFINED);
+        CHKRF(napi_get_undefined(env, &results[0]), GET_UNDEFINED);
     }
 
     ReturnType resultType;
@@ -83,13 +83,13 @@ bool getResult(sptr<AsyncContext> asyncContext, napi_value * results)
     if (resultType == ReturnType::BOOL) {
         bool temp;
         asyncContext->reserve >> temp;
-        CHKRF(env, napi_get_boolean(env, temp, &results[1]), CREATE_BOOL);
+        CHKRF(napi_get_boolean(env, temp, &results[1]), GET_BOOLEAN);
     } else if (resultType == ReturnType::NUMBER) {
         int32_t temp;
         asyncContext->reserve >> temp;
-        CHKRF(env, napi_create_int32(env, temp, &results[1]), CREATE_INT32);
+        CHKRF(napi_create_int32(env, temp, &results[1]), CREATE_INT32);
     } else {
-        CHKRF(env, napi_get_undefined(env, &results[1]), GET_UNDEFINED);
+        CHKRF(napi_get_undefined(env, &results[1]), GET_UNDEFINED);
     }
     return true;
 }
@@ -101,7 +101,7 @@ void AsyncCallbackWork(sptr<AsyncContext> asyncContext)
     CHKPV(asyncContext->env);
     napi_env env = asyncContext->env;
     napi_value resource = nullptr;
-    CHKRV(env, napi_create_string_utf8(env, "AsyncCallbackWork", NAPI_AUTO_LENGTH, &resource), CREATE_STRING_UTF8);
+    CHKRV(napi_create_string_utf8(env, "AsyncCallbackWork", NAPI_AUTO_LENGTH, &resource), CREATE_STRING_UTF8);
     asyncContext->IncStrongRef(nullptr);
     napi_status status = napi_create_async_work(env, nullptr, resource, [](napi_env env, void* data) {},
         [](napi_env env, napi_status status, void* data) {
@@ -121,15 +121,15 @@ void AsyncCallbackWork(sptr<AsyncContext> asyncContext)
             }
             if (asyncContext->deferred) {
                 if (asyncContext->errorCode == RET_OK) {
-                    CHKRV(env, napi_resolve_deferred(env, asyncContext->deferred, results[1]), RESOLVE_DEFERRED);
+                    CHKRV(napi_resolve_deferred(env, asyncContext->deferred, results[1]), RESOLVE_DEFERRED);
                 } else {
-                    CHKRV(env, napi_reject_deferred(env, asyncContext->deferred, results[0]), REJECT_DEFERRED);
+                    CHKRV(napi_reject_deferred(env, asyncContext->deferred, results[0]), REJECT_DEFERRED);
                 }
             } else {
                 napi_value callback = nullptr;
-                CHKRV(env, napi_get_reference_value(env, asyncContext->callback, &callback), GET_REFERENCE);
+                CHKRV(napi_get_reference_value(env, asyncContext->callback, &callback), GET_REFERENCE_VALUE);
                 napi_value callResult = nullptr;
-                CHKRV(env, napi_call_function(env, nullptr, callback, 2, results, &callResult), CALL_FUNCTION);
+                CHKRV(napi_call_function(env, nullptr, callback, 2, results, &callResult), CALL_FUNCTION);
             }
         },
         asyncContext.GetRefPtr(), &asyncContext->work);
@@ -150,10 +150,10 @@ napi_value JsPointerManager::SetPointerVisible(napi_env env, bool visible, napi_
 
     napi_value promise = nullptr;
     if (handle != nullptr) {
-        CHKRP(env, napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
-        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
+        CHKRP(napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
+        CHKRP(napi_get_undefined(env, &promise), GET_UNDEFINED);
     } else {
-        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
+        CHKRP(napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
     }
     AsyncCallbackWork(asyncContext);
     return promise;
@@ -171,10 +171,10 @@ napi_value JsPointerManager::IsPointerVisible(napi_env env, napi_value handle)
 
     napi_value promise = nullptr;
     if (handle != nullptr) {
-        CHKRP(env, napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
-        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
+        CHKRP(napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
+        CHKRP(napi_get_undefined(env, &promise), GET_UNDEFINED);
     } else {
-        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
+        CHKRP(napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
     }
     AsyncCallbackWork(asyncContext);
     return promise;
@@ -189,10 +189,10 @@ napi_value JsPointerManager::SetPointerSpeed(napi_env env, int32_t pointerSpeed,
     asyncContext->reserve << ReturnType::VOID;
     napi_value promise = nullptr;
     if (handle != nullptr) {
-        CHKRP(env, napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
-        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
+        CHKRP(napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
+        CHKRP(napi_get_undefined(env, &promise), GET_UNDEFINED);
     } else {
-        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
+        CHKRP(napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
     }
     AsyncCallbackWork(asyncContext);
     return promise;
@@ -209,10 +209,10 @@ napi_value JsPointerManager::GetPointerSpeed(napi_env env, napi_value handle)
     napi_value promise = nullptr;
     uint32_t initial_refcount = 1;
     if (handle != nullptr) {
-        CHKRP(env, napi_create_reference(env, handle, initial_refcount, &asyncContext->callback), CREATE_REFERENCE);
-        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
+        CHKRP(napi_create_reference(env, handle, initial_refcount, &asyncContext->callback), CREATE_REFERENCE);
+        CHKRP(napi_get_undefined(env, &promise), GET_UNDEFINED);
     } else {
-        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
+        CHKRP(napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
     }
     AsyncCallbackWork(asyncContext);
     return promise;
@@ -228,10 +228,10 @@ napi_value JsPointerManager::SetPointerStyle(napi_env env, int32_t windowid, int
 
     napi_value promise = nullptr;
     if (handle != nullptr) {
-        CHKRP(env, napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
-        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
+        CHKRP(napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
+        CHKRP(napi_get_undefined(env, &promise), GET_UNDEFINED);
     } else {
-        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
+        CHKRP(napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
     }
     AsyncCallbackWork(asyncContext);
     return promise;
@@ -247,10 +247,10 @@ napi_value JsPointerManager::GetPointerStyle(napi_env env, int32_t windowid, nap
     asyncContext->reserve << ReturnType::NUMBER << pointerStyle;
     napi_value promise = nullptr;
     if (handle != nullptr) {
-        CHKRP(env, napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
-        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
+        CHKRP(napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
+        CHKRP(napi_get_undefined(env, &promise), GET_UNDEFINED);
     } else {
-        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
+        CHKRP(napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
     }
     AsyncCallbackWork(asyncContext);
     return promise;
diff --git a/frameworks/napi/touch_event/src/js_touch_event.cpp b/frameworks/napi/touch_event/src/js_touch_event.cpp
index 3e2fe32323..f68599e9a7 100644
--- a/frameworks/napi/touch_event/src/js_touch_event.cpp
+++ b/frameworks/napi/touch_event/src/js_touch_event.cpp
@@ -53,7 +53,7 @@ napi_value JsTouchEvent::GetNapiInt32(napi_env env, int32_t code)
 {
     CALL_DEBUG_ENTER;
     napi_value ret = nullptr;
-    CHKRP(env, napi_create_int32(env, code, &ret), CREATE_INT32);
+    CHKRP(napi_create_int32(env, code, &ret), CREATE_INT32);
     return ret;
 }
 
@@ -64,7 +64,7 @@ napi_value JsTouchEvent::EnumClassConstructor(napi_env env, napi_callback_info i
     napi_value args[1] = {0};
     napi_value ret = nullptr;
     void *data = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
     return ret;
 }
 
@@ -78,9 +78,9 @@ napi_value JsTouchEvent::Export(napi_env env, napi_value exports)
         DECLARE_NAPI_STATIC_PROPERTY("UP", GetNapiInt32(env, static_cast<int32_t>(Action::UP))),
     };
     napi_value action = nullptr;
-    CHKRP(env, napi_define_class(env, "Action", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
+    CHKRP(napi_define_class(env, "Action", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
         sizeof(actionArr) / sizeof(*actionArr), actionArr, &action), DEFINE_CLASS);
-    CHKRP(env, napi_set_named_property(env, exports, "Action", action), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(env, exports, "Action", action), SET_NAMED_PROPERTY);
 
     napi_property_descriptor toolTypeArr[] = {
         DECLARE_NAPI_STATIC_PROPERTY("FINGER", GetNapiInt32(env, static_cast<int32_t>(ToolType::FINGER))),
@@ -93,9 +93,9 @@ napi_value JsTouchEvent::Export(napi_env env, napi_value exports)
         DECLARE_NAPI_STATIC_PROPERTY("LENS", GetNapiInt32(env, static_cast<int32_t>(ToolType::LENS))),
     };
     napi_value toolType = nullptr;
-    CHKRP(env, napi_define_class(env, "ToolType", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
+    CHKRP(napi_define_class(env, "ToolType", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
         sizeof(toolTypeArr) / sizeof(*toolTypeArr), toolTypeArr, &toolType), DEFINE_CLASS);
-    CHKRP(env, napi_set_named_property(env, exports, "ToolType", toolType), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(env, exports, "ToolType", toolType), SET_NAMED_PROPERTY);
 
     napi_property_descriptor sourceTypeArr[] = {
         DECLARE_NAPI_STATIC_PROPERTY("TOUCH_SCREEN", GetNapiInt32(env, static_cast<int32_t>(SourceType::TOUCH_SCREEN))),
@@ -103,9 +103,9 @@ napi_value JsTouchEvent::Export(napi_env env, napi_value exports)
         DECLARE_NAPI_STATIC_PROPERTY("TOUCH_PAD", GetNapiInt32(env, static_cast<int32_t>(SourceType::TOUCH_PAD))),
     };
     napi_value sourceType = nullptr;
-    CHKRP(env, napi_define_class(env, "SourceType", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
+    CHKRP(napi_define_class(env, "SourceType", NAPI_AUTO_LENGTH, EnumClassConstructor, nullptr,
         sizeof(sourceTypeArr) / sizeof(*sourceTypeArr), sourceTypeArr, &sourceType), DEFINE_CLASS);
-    CHKRP(env, napi_set_named_property(env, exports, "SourceType", sourceType), SET_NAMED_PROPERTY);
+    CHKRP(napi_set_named_property(env, exports, "SourceType", sourceType), SET_NAMED_PROPERTY);
     return exports;
 }
 } // namespace MMI
diff --git a/util/common/include/napi_constants.h b/util/common/include/napi_constants.h
index 59c2d359df..dfed11412c 100644
--- a/util/common/include/napi_constants.h
+++ b/util/common/include/napi_constants.h
@@ -22,7 +22,6 @@
 namespace OHOS {
 namespace MMI {
 inline constexpr std::string_view CALL_FUNCTION = "napi_call_function";
-inline constexpr std::string_view CREATE_STRING = "napi_create_string_utf8";
 inline constexpr std::string_view CREATE_OBJECT = "napi_create_object";
 inline constexpr std::string_view CREATE_INT32 = "napi_create_int32";
 inline constexpr std::string_view CREATE_PROMISE = "napi_create_promise";
@@ -32,37 +31,34 @@ inline constexpr std::string_view DEFINE_PROPERTIES = "napi_define_properties";
 inline constexpr std::string_view DEFINE_CLASS = "napi_define_class";
 inline constexpr std::string_view DELETE_REFERENCE = "napi_delete_reference";
 inline constexpr std::string_view GET_CB_INFO = "napi_get_cb_info";
-inline constexpr std::string_view GET_BOOL = "napi_get_value_bool";
+inline constexpr std::string_view GET_VALUE_BOOL = "napi_get_value_bool";
 inline constexpr std::string_view GET_GLOBAL = "napi_get_global";
 inline constexpr std::string_view GET_REFERENCE_VALUE = "napi_get_reference_value";
 inline constexpr std::string_view GET_BOOLEAN = "napi_get_boolean";
-inline constexpr std::string_view GET_INT32 = "napi_get_value_int32";
-inline constexpr std::string_view GET_UV_LOOP = "napi_get_uv_event_loop";
+inline constexpr std::string_view GET_VALUE_INT32 = "napi_get_value_int32";
+inline constexpr std::string_view GET_UV_EVENT_LOOP = "napi_get_uv_event_loop";
 inline constexpr std::string_view GET_UNDEFINED = "napi_get_undefined";
-inline constexpr std::string_view GET_STRING = "napi_get_value_string_utf8";
 inline constexpr std::string_view GET_NAMED_PROPERTY = "napi_get_named_property";
 inline constexpr std::string_view HAS_NAMED_PROPERTY = "napi_has_named_property";
 inline constexpr std::string_view NEW_INSTANCE = "napi_new_instance";
 inline constexpr std::string_view QUEUE_ASYNC_WORK = "napi_queue_async_work";
 inline constexpr std::string_view RESOLVE_DEFERRED = "napi_resolve_deferred";
 inline constexpr std::string_view REJECT_DEFERRED = "napi_reject_deferred";
-inline constexpr std::string_view REFERENCE_REF = "napi_create_reference";
+inline constexpr std::string_view REFERENCE_REF = "napi_reference_ref";
 inline constexpr std::string_view SET_NAMED_PROPERTY = "napi_set_named_property";
 inline constexpr std::string_view STRICT_EQUALS = "napi_strict_equals";
 inline constexpr std::string_view TYPEOF = "napi_typeof";
 inline constexpr std::string_view UNWRAP = "napi_unwrap";
 inline constexpr std::string_view WRAP = "napi_wrap";
-inline constexpr std::string_view GET_STRING_UTF8 = "napi_get_value_string_utf8";
+inline constexpr std::string_view GET_VALUE_STRING_UTF8 = "napi_get_value_string_utf8";
 inline constexpr std::string_view GET_ARRAY_LENGTH = "napi_get_array_length";
 inline constexpr std::string_view GET_ELEMENT = "napi_get_element";
 inline constexpr std::string_view CREATE_ARRAY = "napi_create_array";
 inline constexpr std::string_view SET_ELEMENT = "napi_set_element";
-inline constexpr std::string_view GET_REFERENCE = "napi_get_reference_value";
 inline constexpr std::string_view CREATE_STRING_UTF8 = "napi_create_string_utf8";
 inline const std::string CHANGED_TYPE = "change";
 inline const std::string SUBSCRIBE_TYPE = "key";
 inline constexpr std::string_view DELETE_ASYNC_WORK = "napi_delete_async_work";
-inline constexpr std::string_view CREATE_BOOL = "napi_get_boolean";
 inline constexpr std::string_view COERCE_TO_BOOL = "napi_coerce_to_bool";
 inline constexpr std::string_view CREATE_ERROR = "napi_create_error";
 
diff --git a/util/common/include/util_napi.h b/util/common/include/util_napi.h
index 9654dd2b18..e69976b03a 100644
--- a/util/common/include/util_napi.h
+++ b/util/common/include/util_napi.h
@@ -21,40 +21,36 @@
 
 namespace OHOS {
 namespace MMI {
-#define CHKRV(env, state, desc) \
+#define CHKRV(state, desc) \
     do { \
         if ((state) != napi_ok) { \
             MMI_HILOGE("%{public}s failed", std::string(desc).c_str()); \
-            auto infoTemp = std::string(__FUNCTION__)+ ": " + std::string(desc) + " failed"; \
             return; \
         } \
     } while (0)
 
-#define CHKRV_SCOPE(env, state, desc, scope) \
+#define CHKRP(state, desc) \
     do { \
         if ((state) != napi_ok) { \
             MMI_HILOGE("%{public}s failed", std::string(desc).c_str()); \
-            auto infoTemp = std::string(__FUNCTION__)+ ":" + std::string(desc) + " failed"; \
-            napi_close_handle_scope(env, scope); \
-            return; \
+            return nullptr; \
         } \
     } while (0)
 
-#define CHKRP(env, state, desc) \
+#define CHKRF(state, desc) \
     do { \
         if ((state) != napi_ok) { \
             MMI_HILOGE("%{public}s failed", std::string(desc).c_str()); \
-            auto infoTemp = std::string(__FUNCTION__)+ ": " + std::string(desc) + " failed"; \
-            return nullptr; \
+            return false; \
         } \
     } while (0)
 
-#define CHKRF(env, state, desc) \
+#define CHKRV_SCOPE(env, state, desc, scope) \
     do { \
         if ((state) != napi_ok) { \
             MMI_HILOGE("%{public}s failed", std::string(desc).c_str()); \
-            auto infoTemp = std::string(__FUNCTION__)+ ": " + std::string(desc) + " failed"; \
-            return false; \
+            napi_close_handle_scope(env, scope); \
+            return; \
         } \
     } while (0)
 
diff --git a/util/common/src/util_napi.cpp b/util/common/src/util_napi.cpp
index 5bb3ab899c..74b09b9bb3 100644
--- a/util/common/src/util_napi.cpp
+++ b/util/common/src/util_napi.cpp
@@ -27,7 +27,7 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "UtilN
 bool TypeOf(napi_env env, napi_value value, napi_valuetype type)
 {
     napi_valuetype valueType = napi_undefined;
-    CHKRF(env, napi_typeof(env, value, &valueType), "napi_typeof");
+    CHKRF(napi_typeof(env, value, &valueType), "napi_typeof");
     return (valueType == type);
 }
 } // namespace UtilNapi
-- 
Gitee


From 5230765e78c7593a66eabbb1c010d3f8ff7d56fe Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Tue, 15 Nov 2022 13:16:46 +0000
Subject: [PATCH 140/360] update tools/vuinput/src/virtual_device.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 tools/vuinput/src/virtual_device.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index ac57892d30..a2dc25ee5f 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -312,7 +312,7 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
     dir = opendir(processPath.c_str());
     if (dir == nullptr) {
         std::cout << "Useless flag file:" << processPath << std::endl;
-        goto RELEASE_RES;
+        return false;
     }
     temp = ReadUinputToolFile(filePath);
     if (temp.empty()) {
@@ -327,10 +327,8 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
         return true;
     }
     RELEASE_RES:
-    if (dir != nullptr) {
-        if (closedir(dir) != 0) {
-            std::cout << "Close dir failed" << std::endl;
-        }
+    if (closedir(dir) != 0) {
+        std::cout << "Close dir failed" << std::endl;
     }
     if (std::remove((g_folderPath + fileName).c_str()) != 0) {
         std::cout << "Remove file failed" << std::endl;
-- 
Gitee


From 27a2b395c77e066254afbde0fdcf5b218ce570e6 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Tue, 15 Nov 2022 13:56:51 +0000
Subject: [PATCH 141/360] update service/module_loader/src/uds_server.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 service/module_loader/src/uds_server.cpp | 88 ++++++++++++------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp
index c368a518a1..b774e011e9 100644
--- a/service/module_loader/src/uds_server.cpp
+++ b/service/module_loader/src/uds_server.cpp
@@ -107,54 +107,54 @@ int32_t UDSServer::AddSocketPairInfo(const std::string& programName,
         MMI_HILOGE("Call fcntl failed, errno:%{public}d", errno);
         return RET_ERR;
     }
-    do {
-        static constexpr size_t bufferSize = 32 * 1024;
-        if (setsockopt(serverFd, SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize)) != 0) {
-            MMI_HILOGE("setsockopt serverFd failed, errno: %{public}d", errno);
-            break;
-        }
-        if (setsockopt(serverFd, SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize)) != 0) {
-            MMI_HILOGE("setsockopt serverFd failed, errno: %{public}d", errno);
-            break;
-        }
-        if (tokenType == TokenType::TOKEN_NATIVE) {
-            static constexpr size_t nativeBufferSize = 64 * 1024;
-            if (setsockopt(toReturnClientFd, SOL_SOCKET, SO_SNDBUF, &nativeBufferSize, sizeof(nativeBufferSize)) != 0) {
-                MMI_HILOGE("setsockopt toReturnClientFd failed, errno: %{public}d", errno);
-                break;
-            }
-            if (setsockopt(toReturnClientFd, SOL_SOCKET, SO_RCVBUF, &nativeBufferSize, sizeof(nativeBufferSize)) != 0) {
-                MMI_HILOGE("setsockopt toReturnClientFd failed, errno: %{public}d", errno);
-                break;
-            }
-        } else {
-            if (setsockopt(toReturnClientFd, SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize)) != 0) {
-                MMI_HILOGE("setsockopt toReturnClientFd failed, errno: %{public}d", errno);
-                break;
-            }
-            if (setsockopt(toReturnClientFd, SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize)) != 0) {
-                MMI_HILOGE("setsockopt toReturnClientFd failed, errno: %{public}d", errno);
-                break;
-            }
+    static constexpr size_t bufferSize = 32 * 1024;
+    static constexpr size_t nativeBufferSize = 64 * 1024;
+    SessionPtr sess = std::make_shared<UDSSession>(programName, moduleType, serverFd, uid, pid);
+    if (setsockopt(serverFd, SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize)) != 0) {
+        MMI_HILOGE("setsockopt serverFd failed, errno: %{public}d", errno);
+        goto CLOSE_SOCK;
+    }
+    if (setsockopt(serverFd, SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize)) != 0) {
+        MMI_HILOGE("setsockopt serverFd failed, errno: %{public}d", errno);
+        goto CLOSE_SOCK;
+    }
+    if (tokenType == TokenType::TOKEN_NATIVE) {
+        if (setsockopt(toReturnClientFd, SOL_SOCKET, SO_SNDBUF, &nativeBufferSize, sizeof(nativeBufferSize)) != 0) {
+            MMI_HILOGE("setsockopt toReturnClientFd failed, errno: %{public}d", errno);
+            goto CLOSE_SOCK;
         }
-        if (AddEpoll(EPOLL_EVENT_SOCKET, serverFd) != RET_OK) {
-            MMI_HILOGE("epoll_ctl EPOLL_CTL_ADD failed, errCode:%{public}d", EPOLL_MODIFY_FAIL);
-            break;
+        if (setsockopt(toReturnClientFd, SOL_SOCKET, SO_RCVBUF, &nativeBufferSize, sizeof(nativeBufferSize)) != 0) {
+            MMI_HILOGE("setsockopt toReturnClientFd failed, errno: %{public}d", errno);
+            goto CLOSE_SOCK;
         }
-        SessionPtr sess = std::make_shared<UDSSession>(programName, moduleType, serverFd, uid, pid);
-        if (sess == nullptr) {
-            MMI_HILOGE("make_shared fail. progName:%{public}s,pid:%{public}d,errCode:%{public}d",
-                programName.c_str(), pid, MAKE_SHARED_FAIL);
-            break;
+    } else {
+        if (setsockopt(toReturnClientFd, SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize)) != 0) {
+            MMI_HILOGE("setsockopt toReturnClientFd failed, errno: %{public}d", errno);
+            goto CLOSE_SOCK;
         }
-        sess->SetTokenType(tokenType);
-        if (!AddSession(sess)) {
-            MMI_HILOGE("AddSession fail errCode:%{public}d", ADD_SESSION_FAIL);
-            break;
+        if (setsockopt(toReturnClientFd, SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize)) != 0) {
+            MMI_HILOGE("setsockopt toReturnClientFd failed, errno: %{public}d", errno);
+            goto CLOSE_SOCK;
         }
-        OnConnected(sess);
-        return RET_OK;
-    } while (0);
+    }
+    if (AddEpoll(EPOLL_EVENT_SOCKET, serverFd) != RET_OK) {
+        MMI_HILOGE("epoll_ctl EPOLL_CTL_ADD failed, errCode:%{public}d", EPOLL_MODIFY_FAIL);
+        goto CLOSE_SOCK;
+    }
+    if (sess == nullptr) {
+        MMI_HILOGE("make_shared fail. progName:%{public}s,pid:%{public}d,errCode:%{public}d",
+            programName.c_str(), pid, MAKE_SHARED_FAIL);
+        goto CLOSE_SOCK;
+    }
+    sess->SetTokenType(tokenType);
+    if (!AddSession(sess)) {
+        MMI_HILOGE("AddSession fail errCode:%{public}d", ADD_SESSION_FAIL);
+        goto CLOSE_SOCK;
+    }
+    OnConnected(sess);
+    return RET_OK;
+    
+    CLOSE_SOCK:
     close(serverFd);
     serverFd = IMultimodalInputConnect::INVALID_SOCKET_FD;
     close(toReturnClientFd);
-- 
Gitee


From 3ad5479e244de23154b05154d88ea4def6b5fc90 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Tue, 15 Nov 2022 22:00:21 +0800
Subject: [PATCH 142/360] Signed-off-by:wuliangdong<wuliangdong1@huawei.com>

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
Change-Id: I3b367f8f0cb43873a2f5ada3e080f0e4ad869b8f
---
 util/socket/include/uds_socket.h |  1 -
 util/socket/src/uds_socket.cpp   | 30 ------------------------------
 2 files changed, 31 deletions(-)

diff --git a/util/socket/include/uds_socket.h b/util/socket/include/uds_socket.h
index 42c327b21d..96fb5554e4 100644
--- a/util/socket/include/uds_socket.h
+++ b/util/socket/include/uds_socket.h
@@ -43,7 +43,6 @@ public:
     int32_t EpollCreat(int32_t size);
     int32_t EpollCtl(int32_t fd, int32_t op, struct epoll_event &event, int32_t epollFd = -1);
     int32_t EpollWait(struct epoll_event &events, int32_t maxevents, int32_t timeout, int32_t epollFd = -1);
-    int32_t SetNonBlockMode(int32_t fd, bool isNonBlock = true);
     void OnReadPackets(CircleStreamBuffer &buf, PacketCallBackFun callbackFun);
     void EpollClose();
     void Close();
diff --git a/util/socket/src/uds_socket.cpp b/util/socket/src/uds_socket.cpp
index 1bdf7a5427..9f5adc0c76 100644
--- a/util/socket/src/uds_socket.cpp
+++ b/util/socket/src/uds_socket.cpp
@@ -88,36 +88,6 @@ int32_t UDSSocket::EpollWait(struct epoll_event &events, int32_t maxevents, int3
     return ret;
 }
 
-int32_t UDSSocket::SetNonBlockMode(int32_t fd, bool isNonBlock)
-{
-    if (fd < 0) {
-        MMI_HILOGE("Invalid fd");
-        return RET_ERR;
-    }
-    int32_t flags = fcntl(fd, F_GETFL);
-    if (flags < 0) {
-        MMI_HILOGE("fcntl F_GETFL fail. fd:%{public}d,flags:%{public}d,errno:%{public}d,errCode:%{public}d",
-            fd, flags, errno, FCNTL_FAIL);
-        close(fd);
-        return flags;
-    }
-    MMI_HILOGI("F_GETFL fd:%{public}d,flags:%{public}d", fd, flags);
-    uint32_t mask = static_cast<uint32_t>(flags);
-    mask |= O_NONBLOCK;
-    if (!isNonBlock) {
-        mask &= ~O_NONBLOCK;
-    }
-    flags = fcntl(fd, F_SETFL, static_cast<int32_t>(mask));
-    if (flags < 0) {
-        MMI_HILOGE("fcntl F_SETFL fail. fd:%{public}d,flags:%{public}d,errno:%{public}d,errCode:%{public}d",
-            fd, flags, errno, FCNTL_FAIL);
-        close(fd);
-        return flags;
-    }
-    MMI_HILOGI("F_SETFL fd:%{public}d,flags:%{public}d", fd, flags);
-    return flags;
-}
-
 void UDSSocket::OnReadPackets(CircleStreamBuffer &circBuf, UDSSocket::PacketCallBackFun callbackFun)
 {
     constexpr int32_t headSize = static_cast<int32_t>(sizeof(PackHead));
-- 
Gitee


From abff316cab6dea87c29d7b958805c4e6d657e586 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Tue, 15 Nov 2022 14:13:09 +0000
Subject: [PATCH 143/360] update tools/vuinput/src/virtual_device.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 tools/vuinput/src/virtual_device.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index ec9fa2335b..c3df722041 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -314,7 +314,7 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
     dir = opendir(processPath.c_str());
     if (dir == nullptr) {
         std::cout << "Useless flag file:" << processPath << std::endl;
-        goto RELEASE_RES;
+        return false;
     }
     temp = ReadUinputToolFile(filePath);
     if (temp.empty()) {
@@ -329,10 +329,8 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
         return true;
     }
     RELEASE_RES:
-    if (dir != nullptr) {
-        if (closedir(dir) != 0) {
-            std::cout << "Close dir failed" << std::endl;
-        }
+    if (closedir(dir) != 0) {
+        std::cout << "Close dir failed" << std::endl;
     }
     if (std::remove((g_folderPath + fileName).c_str()) != 0) {
         std::cout << "Remove file failed" << std::endl;
-- 
Gitee


From a1e91d690d01695d77ed1a1eda74820441873f95 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 16 Nov 2022 02:26:03 +0000
Subject: [PATCH 144/360] mod mouse icon

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I845c3cb33c8984af11cc63fe88bb6384ace4ff63
---
 .../window_manager/src/input_windows_manager.cpp   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index b3b50ee4d4..b6dc785c0f 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -281,6 +281,10 @@ void InputWindowsManager::DispatchPointer(int32_t pointerAction)
 {
     CALL_INFO_TRACE;
     CHKPV(udsServer_);
+    if (!IPointerDrawingManager::GetInstance()->GetMouseDisplayState()) {
+        MMI_HILOGI("the mouse is hide");
+        return;
+    }
     if (lastPointerEvent_ == nullptr) {
         SendPointerEvent(pointerAction);
         return;
@@ -838,7 +842,10 @@ int32_t InputWindowsManager::UpdateMouseTarget(std::shared_ptr<PointerEvent> poi
         MMI_HILOGE("Get pointer style failed, pointerStyleInfo is nullptr");
         return ret;
     }
-    IPointerDrawingManager::GetInstance()->SetMouseDisplayState(true);
+    if (!IPointerDrawingManager::GetInstance()->GetMouseDisplayState()) {
+        IPointerDrawingManager::GetInstance()->SetMouseDisplayState(true);
+        DispatchPointer(PointerEvent::POINTER_ACTION_ENTER_WINDOW);
+    }
     IPointerDrawingManager::GetInstance()->UpdateDisplayInfo(*physicalDisplayInfo);
     WinInfo info = { .windowPid = touchWindow->pid, .windowId = touchWindow->id };
     IPointerDrawingManager::GetInstance()->OnWindowInfo(info);
@@ -939,7 +946,10 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
                "displayId:%{public}d,TargetWindowId:%{public}d,AgentWindowId:%{public}d",
                touchWindow->pid, logicalX, logicalY, physicalX, physicalY,
                windowX, windowY, displayId, pointerEvent->GetTargetWindowId(), pointerEvent->GetAgentWindowId());
-    IPointerDrawingManager::GetInstance()->SetMouseDisplayState(false);
+    if (IPointerDrawingManager::GetInstance()->GetMouseDisplayState()) {
+        DispatchPointer(PointerEvent::POINTER_ACTION_LEAVE_WINDOW);
+        IPointerDrawingManager::GetInstance()->SetMouseDisplayState(false);
+    }
     return ERR_OK;
 }
 #endif // OHOS_BUILD_ENABLE_TOUCH
-- 
Gitee


From 44aaef8024da9c5d34efc5bce4cc80d4761dc7ba Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 16 Nov 2022 02:34:55 +0000
Subject: [PATCH 145/360] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../src/multimodal_input_connect_stub.cpp      |  0
 .../key_command/src/key_command_handler.cpp    | 18 +++++++++---------
 service/module_loader/src/mmi_service.cpp      |  0
 3 files changed, 9 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 service/connect_manager/src/multimodal_input_connect_stub.cpp
 mode change 100644 => 100755 service/key_command/src/key_command_handler.cpp
 mode change 100644 => 100755 service/module_loader/src/mmi_service.cpp

diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
old mode 100644
new mode 100755
diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
old mode 100644
new mode 100755
index 268589195e..d690065ffe
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -60,7 +60,7 @@ struct JsonParser {
     cJSON *json_ { nullptr };
 };
 
-bool IsSpeialType(int32_t keyCode, SpecialType type)
+bool IsSpecialType(int32_t keyCode, SpecialType type)
 {
     auto it = SPECIAL_KEYS.find(keyCode);
     if (it == SPECIAL_KEYS.end()) {
@@ -608,9 +608,9 @@ bool KeyCommandHandler::ParseJson(const std::string &configFile)
         return false;
     }
 
-    bool ret = ParseShortcutKeys(parser, shortcutKeys_);
-    ret = ParseSequences(parser, sequences_) && ret;
-    if (!ret) {
+    bool isParseShortKeys = ParseShortcutKeys(parser, shortcutKeys_);
+    bool isParseSequences = ParseSequences(parser, sequences_);
+    if (!isParseShortKeys && !isParseSequences) {
         MMI_HILOGE("Parse configFile failed");
         return false;
     }
@@ -664,9 +664,9 @@ bool KeyCommandHandler::OnHandleEvent(const std::shared_ptr<KeyEvent> key)
         isParseConfig_ = true;
     }
 
-    bool ret = HandleShortKeys(key);
-    ret = HandleSequences(key) || ret;
-    if (ret) {
+    bool isHandleShortKey = HandleShortKeys(key);
+    bool isHandleSequences = HandleSequences(key);
+    if (isHandleShortKey || isHandleSequences) {
         return true;
     }
 
@@ -675,7 +675,7 @@ bool KeyCommandHandler::OnHandleEvent(const std::shared_ptr<KeyEvent> key)
         return true;
     }
 
-    if (IsSpeialType(key->GetKeyCode(), SpecialType::SUBSCRIBER_BEFORE_DELAY)) {
+    if (IsSpecialType(key->GetKeyCode(), SpecialType::SUBSCRIBER_BEFORE_DELAY)) {
         int32_t timerId = TimerMgr->AddTimer(SPECIAL_KEY_DOWN_DELAY, 1, [this, key] () {
             MMI_HILOGD("Timer callback");
             auto it = specialTimers_.find(key->GetKeyCode());
@@ -787,7 +787,7 @@ bool KeyCommandHandler::HandleSequences(const std::shared_ptr<KeyEvent> keyEvent
 
     if (isLaunchAbility) {
         for (const auto& item : keys_) {
-            if (IsSpeialType(item.keyCode, SpecialType::KEY_DOWN_ACTION)) {
+            if (IsSpecialType(item.keyCode, SpecialType::KEY_DOWN_ACTION)) {
                 HandleSpecialKeys(item.keyCode, item.keyAction);
             }
             InputHandler->GetSubscriberHandler()->RemoveSubscriberKeyUpTimer(item.keyCode);
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
old mode 100644
new mode 100755
-- 
Gitee


From 2902d00f6c00d70db534863956cf9fbb1e832a1f Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 16 Nov 2022 02:39:29 +0000
Subject: [PATCH 146/360] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/connect_manager/src/multimodal_input_connect_stub.cpp | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 service/connect_manager/src/multimodal_input_connect_stub.cpp

diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
old mode 100755
new mode 100644
-- 
Gitee


From 93817a09545d5715963fa6c78e371701b6e61eaf Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 16 Nov 2022 02:41:17 +0000
Subject: [PATCH 147/360] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/key_command/src/key_command_handler.cpp | 0
 service/module_loader/src/mmi_service.cpp       | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 service/key_command/src/key_command_handler.cpp
 mode change 100755 => 100644 service/module_loader/src/mmi_service.cpp

diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
old mode 100755
new mode 100644
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
old mode 100755
new mode 100644
-- 
Gitee


From 5fe9e18dfe571ac64e4943b1ddcc43b5f73dec8f Mon Sep 17 00:00:00 2001
From: Chao Liu <liuchao741@huawei.com>
Date: Thu, 17 Nov 2022 15:37:43 +0800
Subject: [PATCH 148/360] Fix typo found in code review

Signed-off-by: Chao Liu <liuchao741@huawei.com>
---
 .../include/js_event_target.h                  |  2 +-
 .../src/js_event_target.cpp                    |  6 +++---
 .../src/js_input_device_cooperate_context.cpp  |  2 +-
 .../src/native_register_module.cpp             |  4 ++--
 .../src/js_register_module.cpp                 |  2 +-
 .../napi/pointer/src/js_pointer_manager.cpp    |  2 +-
 .../event_handler/include/client_msg_handler.h |  2 +-
 .../include/input_device_cooperate_impl.h      | 14 +++++++-------
 .../event_handler/src/bytrace_adapter.cpp      |  6 +++---
 .../event_handler/src/client_msg_handler.cpp   |  6 +++---
 .../src/input_device_cooperate_impl.cpp        | 14 +++++++-------
 .../event_handler/src/input_manager_impl.cpp   |  2 +-
 frameworks/proxy/events/src/key_event.cpp      |  6 +++---
 .../proxy/events/test/input_manager_test.cpp   | 10 +++++-----
 .../proxy/events/test/key_event_test.cpp       |  2 +-
 .../native/innerkits/event/include/key_event.h |  2 +-
 .../libinput/libinput_0000.diff                |  6 +++---
 .../src/multimodal_input_connect_proxy.cpp     |  2 +-
 .../src/input_device_manager.cpp               |  2 +-
 .../src/event_dispatch_handler.cpp             |  2 +-
 service/event_handler/src/key_auto_repeat.cpp  |  2 +-
 service/filter/src/event_filter_handler.cpp    |  2 +-
 service/filter/src/event_filter_stub.cpp       |  2 +-
 service/hisysevent.yaml                        |  4 ++--
 .../include/input_device_cooperate_sm.h        | 12 ++++++------
 .../src/device_cooperate_softbus_adapter.cpp   |  2 +-
 .../src/input_device_cooperate_sm.cpp          | 10 +++++-----
 .../src/event_interceptor_handler.cpp          |  4 ++--
 .../src/key_event_normalize.cpp                |  2 +-
 service/module_loader/include/mmi_service.h    |  2 +-
 .../src/mouse_event_normalize.cpp              | 18 +++++++++---------
 .../include/pointer_drawing_manager.h          |  2 +-
 .../src/input_windows_manager.cpp              |  4 ++--
 test/unittest/common/include/system_info.h     |  2 +-
 test/unittest/common/src/system_info.cpp       | 12 ++++++------
 ...st_TransformGamePadJsonDataToInputData.json |  2 +-
 ...est_TransformJsonDataCheckFileNotEmpty.json |  4 ++--
 ...st_TransformJsonDataGetDeviceNodeError.json |  4 ++--
 .../inject_event/src/input_manager_command.cpp |  4 ++--
 tools/inject_event/test/inject_event_test.cpp  |  2 +-
 tools/vuinput/src/virtual_device.cpp           | 10 +++++-----
 tools/vuinput/test/virtual_device_test.cpp     |  4 ++--
 util/common/include/util_napi_error.h          |  4 ++--
 util/network/include/circle_stream_buffer.h    |  6 +++---
 44 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/frameworks/napi/input_device_cooperate/include/js_event_target.h b/frameworks/napi/input_device_cooperate/include/js_event_target.h
index da0b8d8ced..a71e787c18 100755
--- a/frameworks/napi/input_device_cooperate/include/js_event_target.h
+++ b/frameworks/napi/input_device_cooperate/include/js_event_target.h
@@ -59,7 +59,7 @@ private:
     inline static std::map<int32_t, std::unique_ptr<JsUtil::CallbackInfo>> callback_ {};
     bool isListeningProcess_ { false };
 
-    static void CallEnablePromsieWork(uv_work_t *work, int32_t status);
+    static void CallEnablePromiseWork(uv_work_t *work, int32_t status);
     static void CallEnableAsyncWork(uv_work_t *work, int32_t status);
     static void CallStartPromiseWork(uv_work_t *work, int32_t status);
     static void CallStartAsyncWork(uv_work_t *work, int32_t status);
diff --git a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
index 3c1a7c24f3..3ad1513617 100755
--- a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
@@ -74,7 +74,7 @@ void JsEventTarget::EmitJsEnable(int32_t userData, std::string deviceId, Coopera
     work->data = static_cast<void*>(uData);
     int32_t result;
     if (iter->second->ref == nullptr) {
-        result = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallEnablePromsieWork);
+        result = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallEnablePromiseWork);
     } else {
         result = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallEnableAsyncWork);
     }
@@ -334,13 +334,13 @@ void JsEventTarget::OnCooperateMessage(const std::string &deviceId, CooperationM
         work->data = static_cast<void*>(&item);
         int32_t result = uv_queue_work(loop, work, [](uv_work_t *work) {}, EmitCooperateMessageEvent);
         if (result != 0) {
-            MMI_HILOGE("uv_queue_work faild");
+            MMI_HILOGE("uv_queue_work failed");
             JsUtil::DeletePtr<uv_work_t*>(work);
         }
     }
 }
 
-void JsEventTarget::CallEnablePromsieWork(uv_work_t *work, int32_t status)
+void JsEventTarget::CallEnablePromiseWork(uv_work_t *work, int32_t status)
 {
     CALL_INFO_TRACE;
     CHKPV(work);
diff --git a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
index e62b0b2a85..2af0c11bbb 100755
--- a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_context.cpp
@@ -223,7 +223,7 @@ napi_value JsInputDeviceCooperateContext::On(napi_env env, napi_callback_info in
     CHKPP(jsDev);
     auto jsInputDeviceMgr = jsDev->GetJsInputDeviceCooperateMgr();
     if (!UtilNapi::TypeOf(env, argv[1], napi_function)) {
-        MMI_HILOGE("The seocond parameter is not function");
+        MMI_HILOGE("The second parameter is not function");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "callback", "function");
         return nullptr;
     }
diff --git a/frameworks/napi/input_device_cooperate/src/native_register_module.cpp b/frameworks/napi/input_device_cooperate/src/native_register_module.cpp
index e7da0f9abd..ee60084e71 100755
--- a/frameworks/napi/input_device_cooperate/src/native_register_module.cpp
+++ b/frameworks/napi/input_device_cooperate/src/native_register_module.cpp
@@ -19,7 +19,7 @@
 
 namespace OHOS {
 namespace MMI {
-static napi_module mmiInputDeviceCooperateMoudle = {
+static napi_module mmiInputDeviceCooperateModule = {
     .nm_version = 1,
     .nm_flags = 0,
     .nm_filename = nullptr,
@@ -31,7 +31,7 @@ static napi_module mmiInputDeviceCooperateMoudle = {
 
 extern "C" __attribute__((constructor)) void RegisterModule(void)
 {
-    napi_module_register(&mmiInputDeviceCooperateMoudle);
+    napi_module_register(&mmiInputDeviceCooperateModule);
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/napi/input_event_client/src/js_register_module.cpp b/frameworks/napi/input_event_client/src/js_register_module.cpp
index 34cbd926c0..f452b735bd 100644
--- a/frameworks/napi/input_event_client/src/js_register_module.cpp
+++ b/frameworks/napi/input_event_client/src/js_register_module.cpp
@@ -37,7 +37,7 @@ static napi_value InjectEvent(napi_env env, napi_callback_info info)
     napi_value argv[1] = { 0 };
     CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 1) {
-        MMI_HILOGE("Paramater number error");
+        MMI_HILOGE("Parameter number error");
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "parameter number error");
         return nullptr;
     }
diff --git a/frameworks/napi/pointer/src/js_pointer_manager.cpp b/frameworks/napi/pointer/src/js_pointer_manager.cpp
index b8daa380e5..8b11f6e50e 100644
--- a/frameworks/napi/pointer/src/js_pointer_manager.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_manager.cpp
@@ -108,7 +108,7 @@ void AsyncCallbackWork(sptr<AsyncContext> asyncContext)
             sptr<AsyncContext> asyncContext(static_cast<AsyncContext *>(data));
             /**
              * After the asynchronous task is created, the asyncCallbackInfo reference count is reduced
-             * to 0 destructions, so you need to add 1 to the asyncCallbackInfo reference count when the
+             * to 0 destruction, so you need to add 1 to the asyncCallbackInfo reference count when the
              * asynchronous task is created, and subtract 1 from the reference count after the naked
              * pointer is converted to a pointer when the asynchronous task is executed, the reference
              * count of the smart pointer is guaranteed to be 1.
diff --git a/frameworks/proxy/event_handler/include/client_msg_handler.h b/frameworks/proxy/event_handler/include/client_msg_handler.h
index 6dfb4c3979..46c0a2e384 100644
--- a/frameworks/proxy/event_handler/include/client_msg_handler.h
+++ b/frameworks/proxy/event_handler/include/client_msg_handler.h
@@ -59,7 +59,7 @@ protected:
     int32_t OnDevListener(const UDSClient& client, NetPacket& pkt);
     int32_t OnAnr(const UDSClient& client, NetPacket& pkt);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-    int32_t OnCooperationListiner(const UDSClient& client, NetPacket& pkt);
+    int32_t OnCooperationListener(const UDSClient& client, NetPacket& pkt);
     int32_t OnCooperationMessage(const UDSClient& client, NetPacket& pkt);
     int32_t OnCooperationState(const UDSClient& client, NetPacket& pkt);
 #endif // OHOS_BUILD_ENABLE_COOPERATE
diff --git a/frameworks/proxy/event_handler/include/input_device_cooperate_impl.h b/frameworks/proxy/event_handler/include/input_device_cooperate_impl.h
index 6ed06919b3..09b6967f60 100755
--- a/frameworks/proxy/event_handler/include/input_device_cooperate_impl.h
+++ b/frameworks/proxy/event_handler/include/input_device_cooperate_impl.h
@@ -34,16 +34,16 @@ public:
     ~InputDeviceCooperateImpl() = default;
 
     using FuncCooperationMessage = std::function<void(std::string, CooperationMessage)>;
-    using FuncCooperateionState = std::function<void(bool)>;
+    using FuncCooperationState = std::function<void(bool)>;
 
     using DevCooperationMsg = FuncCooperationMessage;
-    using DevCooperateionState = FuncCooperateionState;
+    using DevCooperationState = FuncCooperationState;
 
     using InputDevCooperateListenerPtr = std::shared_ptr<IInputDeviceCooperateListener>;
 
     struct CooperateEvent {
         DevCooperationMsg msg;
-        DevCooperateionState state;
+        DevCooperationState state;
     };
 
     int32_t RegisterCooperateListener(InputDevCooperateListenerPtr listener);
@@ -52,15 +52,15 @@ public:
     int32_t StartInputDeviceCooperate(const std::string &sinkDeviceId, int32_t srcInputDeviceId,
         FuncCooperationMessage callback);
     int32_t StopDeviceCooperate(FuncCooperationMessage callback);
-    int32_t GetInputDeviceCooperateState(const std::string &deviceId, FuncCooperateionState callback);
+    int32_t GetInputDeviceCooperateState(const std::string &deviceId, FuncCooperationState callback);
     void OnDevCooperateListener(const std::string deviceId, CooperationMessage msg);
-    void OnCooprationMessage(int32_t userData, const std::string deviceId, CooperationMessage msg);
+    void OnCooperationMessage(int32_t userData, const std::string deviceId, CooperationMessage msg);
     void OnCooperationState(int32_t userData, bool state);
     int32_t GetUserData();
 
 private:
-    const DevCooperationMsg *GetCooprateMessageEvent(int32_t userData) const;
-    const DevCooperateionState *GetCooprateStateEvent(int32_t userData) const;
+    const DevCooperationMsg *GetCooperateMessageEvent(int32_t userData) const;
+    const DevCooperationState *GetCooperateStateEvent(int32_t userData) const;
 
 private:
     InputDeviceCooperateImpl() = default;
diff --git a/frameworks/proxy/event_handler/src/bytrace_adapter.cpp b/frameworks/proxy/event_handler/src/bytrace_adapter.cpp
index d769c06add..cba64e06ea 100644
--- a/frameworks/proxy/event_handler/src/bytrace_adapter.cpp
+++ b/frameworks/proxy/event_handler/src/bytrace_adapter.cpp
@@ -94,7 +94,7 @@ void BytraceAdapter::StartBytrace(std::shared_ptr<KeyEvent> key, HandlerType han
             break;
         }
         default: {
-            checkKeyCode = "Unknow keycode:" + std::to_string(keyCode);
+            checkKeyCode = "Unknown keycode:" + std::to_string(keyCode);
             break;
         }
     }
@@ -126,7 +126,7 @@ void BytraceAdapter::StartBytrace(std::shared_ptr<KeyEvent> keyEvent, TraceBtn t
                 break;
             }
             default: {
-                HITRACE_METER_NAME(HITRACE_TAG_MULTIMODALINPUT, "Unknow keycode:" + std::to_string(keyCode));
+                HITRACE_METER_NAME(HITRACE_TAG_MULTIMODALINPUT, "Unknown keycode:" + std::to_string(keyCode));
                 break;
             }
         }
@@ -145,7 +145,7 @@ void BytraceAdapter::StartBytrace(std::shared_ptr<KeyEvent> keyEvent, TraceBtn t
                 break;
             }
             default: {
-                HITRACE_METER_NAME(HITRACE_TAG_MULTIMODALINPUT, "Unknow keycode:" + std::to_string(keyCode));
+                HITRACE_METER_NAME(HITRACE_TAG_MULTIMODALINPUT, "Unknown keycode:" + std::to_string(keyCode));
                 break;
             }
         }
diff --git a/frameworks/proxy/event_handler/src/client_msg_handler.cpp b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
index 1c54f0cc4d..5c63cf3e8a 100644
--- a/frameworks/proxy/event_handler/src/client_msg_handler.cpp
+++ b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
@@ -73,7 +73,7 @@ void ClientMsgHandler::Init()
         {MmiMessageId::REPORT_POINTER_EVENT, MsgCallbackBind2(&ClientMsgHandler::ReportPointerEvent, this)},
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-        {MmiMessageId::COOPERATION_ADD_LISTENER, MsgCallbackBind2(&ClientMsgHandler::OnCooperationListiner, this)},
+        {MmiMessageId::COOPERATION_ADD_LISTENER, MsgCallbackBind2(&ClientMsgHandler::OnCooperationListener, this)},
         {MmiMessageId::COOPERATION_MESSAGE, MsgCallbackBind2(&ClientMsgHandler::OnCooperationMessage, this)},
         {MmiMessageId::COOPERATION_GET_STATE, MsgCallbackBind2(&ClientMsgHandler::OnCooperationState, this)},
 #endif // OHOS_BUILD_ENABLE_COOPERATE
@@ -393,7 +393,7 @@ int32_t ClientMsgHandler::OnAnr(const UDSClient& client, NetPacket& pkt)
 }
 
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-int32_t ClientMsgHandler::OnCooperationListiner(const UDSClient& client, NetPacket& pkt)
+int32_t ClientMsgHandler::OnCooperationListener(const UDSClient& client, NetPacket& pkt)
 {
     CALL_DEBUG_ENTER;
     int32_t userData;
@@ -419,7 +419,7 @@ int32_t ClientMsgHandler::OnCooperationMessage(const UDSClient& client, NetPacke
         MMI_HILOGE("Packet read cooperate msg failed");
         return RET_ERR;
     }
-    InputDevCooperateImpl.OnCooprationMessage(userData, deviceId, CooperationMessage(nType));
+    InputDevCooperateImpl.OnCooperationMessage(userData, deviceId, CooperationMessage(nType));
     return RET_OK;
 }
 
diff --git a/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp b/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp
index 3aca722b3b..fe572e3ce5 100755
--- a/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp
@@ -118,7 +118,7 @@ int32_t InputDeviceCooperateImpl::StopDeviceCooperate(FuncCooperationMessage cal
 }
 
 int32_t InputDeviceCooperateImpl::GetInputDeviceCooperateState(
-    const std::string &deviceId, FuncCooperateionState callback)
+    const std::string &deviceId, FuncCooperationState callback)
 {
     CALL_DEBUG_ENTER;
     std::lock_guard<std::mutex> guard(mtx_);
@@ -141,12 +141,12 @@ void InputDeviceCooperateImpl::OnDevCooperateListener(const std::string deviceId
     }
 }
 
-void InputDeviceCooperateImpl::OnCooprationMessage(int32_t userData, const std::string deviceId, CooperationMessage msg)
+void InputDeviceCooperateImpl::OnCooperationMessage(int32_t userData, const std::string deviceId, CooperationMessage msg)
 {
     CALL_DEBUG_ENTER;
     CHK_PID_AND_TID();
     std::lock_guard<std::mutex> guard(mtx_);
-    auto event = GetCooprateMessageEvent(userData);
+    auto event = GetCooperateMessageEvent(userData);
     CHKPV(event);
     (*event)(deviceId, msg);
 }
@@ -156,10 +156,10 @@ void InputDeviceCooperateImpl::OnCooperationState(int32_t userData, bool state)
     CALL_DEBUG_ENTER;
     CHK_PID_AND_TID();
     std::lock_guard<std::mutex> guard(mtx_);
-    auto event = GetCooprateStateEvent(userData);
+    auto event = GetCooperateStateEvent(userData);
     CHKPV(event);
     (*event)(state);
-    MMI_HILOGD("Cooperatinon state event callback userData:%{public}d state:(%{public}d)", userData, state);
+    MMI_HILOGD("Cooperation state event callback userData:%{public}d state:(%{public}d)", userData, state);
 }
 
 int32_t InputDeviceCooperateImpl::GetUserData()
@@ -168,14 +168,14 @@ int32_t InputDeviceCooperateImpl::GetUserData()
     return userData_;
 }
 
-const InputDeviceCooperateImpl::DevCooperationMsg *InputDeviceCooperateImpl::GetCooprateMessageEvent(
+const InputDeviceCooperateImpl::DevCooperationMsg *InputDeviceCooperateImpl::GetCooperateMessageEvent(
     int32_t userData) const
 {
     auto iter = devCooperateEvent_.find(userData);
     return iter == devCooperateEvent_.end() ? nullptr : &iter->second.msg;
 }
 
-const InputDeviceCooperateImpl::DevCooperateionState *InputDeviceCooperateImpl::GetCooprateStateEvent(
+const InputDeviceCooperateImpl::DevCooperationState *InputDeviceCooperateImpl::GetCooperateStateEvent(
     int32_t userData) const
 {
     auto iter = devCooperateEvent_.find(userData);
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 3f9e608054..4ae7f06f74 100755
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -622,7 +622,7 @@ void InputManagerImpl::OnConnected()
     }
     int32_t ret = MultimodalInputConnMgr->SetAnrObserver();
     if (ret != RET_OK) {
-        MMI_HILOGE("Set anr observerfailed, ret:%{public}d", ret);
+        MMI_HILOGE("Set anr observer failed, ret:%{public}d", ret);
     }
 }
 
diff --git a/frameworks/proxy/events/src/key_event.cpp b/frameworks/proxy/events/src/key_event.cpp
index 2f9d309d8e..b9b03aaa51 100644
--- a/frameworks/proxy/events/src/key_event.cpp
+++ b/frameworks/proxy/events/src/key_event.cpp
@@ -415,7 +415,7 @@ const std::map <int32_t, std::string> KEYCODE_TO_STRING = {
     {KeyEvent::KEYCODE_LAUNCHER_MENU, "KEYCODE_LAUNCHER_MENU"},
 };
 } // namespace
-const int32_t KeyEvent::UNKOWN_FUNCTION_KEY = -1;
+const int32_t KeyEvent::UNKNOWN_FUNCTION_KEY = -1;
 const int32_t KeyEvent::NUM_LOCK_FUNCTION_KEY = 0;
 const int32_t KeyEvent::CAPS_LOCK_FUNCTION_KEY = 1;
 const int32_t KeyEvent::SCROLL_LOCK_FUNCTION_KEY = 2;
@@ -1165,7 +1165,7 @@ int32_t KeyEvent::TransitionFunctionKey(int32_t keyCode)
         }
         default: {
             MMI_HILOGW("Unknown key code");
-            return UNKOWN_FUNCTION_KEY;
+            return UNKNOWN_FUNCTION_KEY;
         }
     }
 }
@@ -1207,7 +1207,7 @@ int32_t KeyEvent::SetFunctionKey(int32_t funcKey, int32_t value)
         }
         default: {
             MMI_HILOGW("Unknown function key");
-            return UNKOWN_FUNCTION_KEY;
+            return UNKNOWN_FUNCTION_KEY;
         }
     }
 }
diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index fd3ed925b8..984c4369fc 100755
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -2965,7 +2965,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_GetProcCpuUsage, TestSize.Level1)
     const std::string process_name = "multimodalinput";
     auto usage = cpuInfo.GetProcCpuUsage(process_name);
     MMI_HILOGD("The CPU usage of the %{public}s process is %{public}.2f", process_name.c_str(), usage);
-    ASSERT_TRUE(usage < SYSTEM_INFO::CPU_USAGE_LOAD && usage != SYSTEM_INFO::CPU_USAGE_UNKONW);
+    ASSERT_TRUE(usage < SYSTEM_INFO::CPU_USAGE_LOAD && usage != SYSTEM_INFO::CPU_USAGE_UNKNOWN);
 }
 
 /**
@@ -3325,12 +3325,12 @@ HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_006, TestSize.Level
 HWTEST_F(InputManagerTest, InputManagerTest_FunctionKeyState_007, TestSize.Level1)
 {
     CALL_TEST_DEBUG;
-    InputManager::GetInstance()->SetFunctionKeyState(KeyEvent::UNKOWN_FUNCTION_KEY, true);
-    bool result = InputManager::GetInstance()->GetFunctionKeyState(KeyEvent::UNKOWN_FUNCTION_KEY);
+    InputManager::GetInstance()->SetFunctionKeyState(KeyEvent::UNKNOWN_FUNCTION_KEY, true);
+    bool result = InputManager::GetInstance()->GetFunctionKeyState(KeyEvent::UNKNOWN_FUNCTION_KEY);
     ASSERT_FALSE(result);
     
-    InputManager::GetInstance()->SetFunctionKeyState(KeyEvent::UNKOWN_FUNCTION_KEY, false);
-    result = InputManager::GetInstance()->GetFunctionKeyState(KeyEvent::UNKOWN_FUNCTION_KEY);
+    InputManager::GetInstance()->SetFunctionKeyState(KeyEvent::UNKNOWN_FUNCTION_KEY, false);
+    result = InputManager::GetInstance()->GetFunctionKeyState(KeyEvent::UNKNOWN_FUNCTION_KEY);
     ASSERT_FALSE(result);
 }
 
diff --git a/frameworks/proxy/events/test/key_event_test.cpp b/frameworks/proxy/events/test/key_event_test.cpp
index bee91caa20..627d7c903f 100755
--- a/frameworks/proxy/events/test/key_event_test.cpp
+++ b/frameworks/proxy/events/test/key_event_test.cpp
@@ -365,7 +365,7 @@ HWTEST_F(KeyEventTest, KeyEventTest_TransitionFunctionKey_004, TestSize.Level1)
     std::shared_ptr<KeyEvent> keyEvent = KeyEvent::Create();
     ASSERT_NE(keyEvent, nullptr);
     int32_t lockCode = keyEvent->TransitionFunctionKey(KeyEvent::KEYCODE_A);
-    ASSERT_EQ(lockCode, KeyEvent::UNKOWN_FUNCTION_KEY);
+    ASSERT_EQ(lockCode, KeyEvent::UNKNOWN_FUNCTION_KEY);
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/interfaces/native/innerkits/event/include/key_event.h b/interfaces/native/innerkits/event/include/key_event.h
index f661ea99d0..f4fad15698 100644
--- a/interfaces/native/innerkits/event/include/key_event.h
+++ b/interfaces/native/innerkits/event/include/key_event.h
@@ -32,7 +32,7 @@ public:
      *
      * @since 9
      */
-    static const int32_t UNKOWN_FUNCTION_KEY;
+    static const int32_t UNKNOWN_FUNCTION_KEY;
 
     /**
      * Num Lock功能按键
diff --git a/patch/diff_libinput_mmi/libinput/libinput_0000.diff b/patch/diff_libinput_mmi/libinput/libinput_0000.diff
index b4cf3fd86d..2721ca128c 100644
--- a/patch/diff_libinput_mmi/libinput/libinput_0000.diff
+++ b/patch/diff_libinput_mmi/libinput/libinput_0000.diff
@@ -114,7 +114,7 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
 + * @since 1.16.4
 + */
 +enum libinput_joystick_axis_source {
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_UNKNOW = 0,
++	LIBINPUT_JOYSTICK_AXIS_SOURCE_UNKNOWN = 0,
 +	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_X = 1 << 0,
 +	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Y = 1 << 1,
 +	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Z = 1 << 2,
@@ -2421,7 +2421,7 @@ diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
 +    }
 +
 +    if (absinfo == NULL) {
-+        libinput_log_printf("unsupported joystick abs event: divice_name:%s code:%d value:%d.\n",
++        libinput_log_printf("unsupported joystick abs event: device_name:%s code:%d value:%d.\n",
 +            device->devname, code, event->value);
 +        return;
 +    }
@@ -5624,7 +5624,7 @@ diff -Naur old/src/libinput.h new/src/libinput.h
 + * @since 1.16.4
 + */
 +enum libinput_joystick_axis_source {
-+	LIBINPUT_JOYSTICK_AXIS_SOURCE_UNKNOW = 0,
++	LIBINPUT_JOYSTICK_AXIS_SOURCE_UNKNOWN = 0,
 +	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_X = 1 << 0,
 +	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Y = 1 << 1,
 +	LIBINPUT_JOYSTICK_AXIS_SOURCE_ABS_Z = 1 << 2,
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index 8856857a65..2cd7a91e1b 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -62,7 +62,7 @@ int32_t MultimodalInputConnectProxy::AllocSocketFd(const std::string &programNam
     }
     socketFd = reply.ReadFileDescriptor();
     if (socketFd < RET_OK) {
-        MMI_HILOGE("Read file fescriptor failed, fd: %{public}d", socketFd);
+        MMI_HILOGE("Read file descriptor failed, fd: %{public}d", socketFd);
         return IPC_PROXY_DEAD_OBJECT_ERR;
     }
     READINT32(reply, tokenType, IPC_PROXY_DEAD_OBJECT_ERR);
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 6bf6fb991d..1f4400c40d 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -706,7 +706,7 @@ std::string InputDeviceManager::GenerateDescriptor(struct libinput_device *input
     uint16_t product = libinput_device_get_id_product(inputDevice);
     std::string rawDescriptor;
     rawDescriptor += StringPrintf(":%04x:%04x:", vendor, product);
-    // add handling for USB devices to not uniqueify kbs that show up twice
+    // add handling for USB devices to not unique kbs that show up twice
     if (uniqueId != nullptr && uniqueId[0] != '\0') {
         rawDescriptor += "uniqueId:" + std::string(uniqueId);
     }
diff --git a/service/event_dispatch/src/event_dispatch_handler.cpp b/service/event_dispatch/src/event_dispatch_handler.cpp
index aa7a8c2111..250794d45e 100644
--- a/service/event_dispatch/src/event_dispatch_handler.cpp
+++ b/service/event_dispatch/src/event_dispatch_handler.cpp
@@ -109,7 +109,7 @@ void EventDispatchHandler::HandlePointerEventInner(const std::shared_ptr<Pointer
         for (const auto& id : pointerIdList) {
             PointerEvent::PointerItem pointeritem;
             if (!pointerEvent->GetPointerItem(id, pointeritem)) {
-                MMI_HILOGW("Can't find this poinerItem");
+                MMI_HILOGW("Can't find this pointerItem");
                 continue;
             }
             auto itemPid = WinMgr->GetWindowPid(pointeritem.GetTargetWindowId());
diff --git a/service/event_handler/src/key_auto_repeat.cpp b/service/event_handler/src/key_auto_repeat.cpp
index 174407266e..f820d2cb62 100644
--- a/service/event_handler/src/key_auto_repeat.cpp
+++ b/service/event_handler/src/key_auto_repeat.cpp
@@ -83,7 +83,7 @@ void KeyAutoRepeat::SelectAutoRepeat(std::shared_ptr<KeyEvent>& keyEvent)
     if (keyEvent_->GetKeyAction() == KeyEvent::KEY_ACTION_UP && TimerMgr->IsExist(timerId_)) {
         TimerMgr->RemoveTimer(timerId_);
         timerId_ = -1;
-        MMI_HILOGI("Stop kayboard autorepeat, keyCode:%{public}d", keyEvent_->GetKeyCode());
+        MMI_HILOGI("Stop keyboard autorepeat, keyCode:%{public}d", keyEvent_->GetKeyCode());
         if (repeatKeyCode_ != keyEvent_->GetKeyCode()) {
             auto pressedKeyItem = keyEvent_->GetKeyItem(keyEvent_->GetKeyCode());
             if (pressedKeyItem != nullptr) {
diff --git a/service/filter/src/event_filter_handler.cpp b/service/filter/src/event_filter_handler.cpp
index 4853d7b225..7348b084a5 100644
--- a/service/filter/src/event_filter_handler.cpp
+++ b/service/filter/src/event_filter_handler.cpp
@@ -74,7 +74,7 @@ bool EventFilterHandler::HandlePointerEventFilter(std::shared_ptr<PointerEvent>
     CHKPF(point);
     std::lock_guard<std::mutex> guard(lockFilter_);
     if (filter_ == nullptr) {
-        MMI_HILOGD("The filter is not setted");
+        MMI_HILOGD("The filter is not set");
         return false;
     }
     if (filter_->HandlePointerEvent(point)) {
diff --git a/service/filter/src/event_filter_stub.cpp b/service/filter/src/event_filter_stub.cpp
index 6c971035e7..00caad0bf5 100644
--- a/service/filter/src/event_filter_stub.cpp
+++ b/service/filter/src/event_filter_stub.cpp
@@ -47,7 +47,7 @@ int32_t EventFilterStub::OnRemoteRequest(
             return StubHandlePointerEvent(data, reply);
         }
         default: {
-            MMI_HILOGE("Unknown code:%{public}u, go switch defaut", code);
+            MMI_HILOGE("Unknown code:%{public}u, go switch default", code);
             return IPCObjectStub::OnRemoteRequest(code, data, reply, option);
         }
     }
diff --git a/service/hisysevent.yaml b/service/hisysevent.yaml
index ac350c6b40..0e2e86c75d 100644
--- a/service/hisysevent.yaml
+++ b/service/hisysevent.yaml
@@ -25,7 +25,7 @@
 #  // __BASE is used for defining the basic info of the event.
 #  // "type" optional values are: FAULT, STATISTICS, SECURITY, BEHAVIOR.
 #  // "level" optional values are: CRITICAL, MINOR.
-#  // "tag" set tags with may used by subscriber of this event, multiple tags devided by space.
+#  // "tag" set tags with may be used by subscriber of this event, multiple tags divided by space.
 #  // "desc" full description of this event.
 #  @PARAMETER: {type: parameter type, arrsize: array length(optional), desc: parameter description}.
 #  // follow the __BASE block, each line defines a parameter of this event.
@@ -146,7 +146,7 @@ TARGET_KEY_EVENT_FAILURE:
   MSG: {type: STRING, desc: message}
 
 FOCUS_WINDOW_CHANGE:
-  __BASE: {type: BEHAVIOR, level: MINOR, tag: PowerStats, desc: foucs window change}
+  __BASE: {type: BEHAVIOR, level: MINOR, tag: PowerStats, desc: focus window change}
   OLD_FOCUS_WINDOWID: {type: INT32, desc: old focus windowid}
   NEW_FOCUS_WINDOWID: {type: INT32, desc: new focus windowid}
   OLD_FOCUS_WINDOWPID: {type: INT32, desc: old focus windowpid}
diff --git a/service/input_device_cooperate/include/input_device_cooperate_sm.h b/service/input_device_cooperate/include/input_device_cooperate_sm.h
index 7459910aca..1238b8a2a5 100755
--- a/service/input_device_cooperate/include/input_device_cooperate_sm.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_sm.h
@@ -35,16 +35,16 @@ enum class CooperateState {
 };
 
 enum class CooperateMsg {
-    COOPERATE_ON_SUCESS = 0,
+    COOPERATE_ON_SUCCESS = 0,
     COOPERATE_ON_FAIL = 1,
-    COOPERATE_OFF_SUCESS = 2,
+    COOPERATE_OFF_SUCCESS = 2,
     COOPERATE_OFF_FAIL = 3,
     COOPERATE_START = 4,
-    COOPERATE_START_SUCESS = 5,
+    COOPERATE_START_SUCCESS = 5,
     COOPERATE_START_FAIL = 6,
     COOPERATE_STOP = 7,
-    COOPERATE_STOP_SUCESS = 8,
-    COOPERATE_STOP_FIAL = 9,
+    COOPERATE_STOP_SUCCESS = 8,
+    COOPERATE_STOP_FAIL = 9,
     COOPERATE_NULL = 10,
 };
 
@@ -96,7 +96,7 @@ private:
     void CheckPointerEvent(struct libinput_event *event);
     void OnCloseCooperation(const std::string &networkId, bool isLocal);
     void NotifyRemoteStartFail(const std::string &remoteNetworkId);
-    void NotifyRemoteStartSucess(const std::string &remoteNetworkId, const std::string &startDhid);
+    void NotifyRemoteStartSuccess(const std::string &remoteNetworkId, const std::string &startDhid);
     void NotifyRemoteStopFinish(bool isSuccess, const std::string &remoteNetworkId);
     bool UpdateMouseLocation();
     std::shared_ptr<IInputDeviceCooperateState> currentStateSM_ { nullptr };
diff --git a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
index b9f1f12dd0..43c2448b5e 100755
--- a/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
+++ b/service/input_device_cooperate/src/device_cooperate_softbus_adapter.cpp
@@ -430,7 +430,7 @@ int32_t DeviceCooperateSoftbusAdapter::SendMsg(int32_t sessionId, const std::str
 {
     CALL_DEBUG_ENTER;
     if (message.size() > MSG_MAX_SIZE) {
-        MMI_HILOGW("error:message.size() > MSG_MAX_SIZE msessage size:%{public}zu", message.size());
+        MMI_HILOGW("error:message.size() > MSG_MAX_SIZE message size:%{public}zu", message.size());
         return RET_ERR;
     }
     return SendBytes(sessionId, message.c_str(), strlen(message.c_str()));
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index cb09dfe252..3365100c06 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -269,7 +269,7 @@ void InputDeviceCooperateSM::OnStartFinish(bool isSuccess,
         NotifyRemoteStartFail(remoteNetworkId);
     } else {
         startDhid_ = InputDevMgr->GetDhid(startInputDeviceId);
-        NotifyRemoteStartSucess(remoteNetworkId, startDhid_);
+        NotifyRemoteStartSuccess(remoteNetworkId, startDhid_);
         if (cooperateState_ == CooperateState::STATE_FREE) {
             UpdateState(CooperateState::STATE_OUT);
         } else if (cooperateState_ == CooperateState::STATE_IN) {
@@ -316,7 +316,7 @@ void InputDeviceCooperateSM::NotifyRemoteStartFail(const std::string &remoteNetw
     CooperateEventMgr->OnStart(CooperationMessage::INFO_FAIL);
 }
 
-void InputDeviceCooperateSM::NotifyRemoteStartSucess(const std::string &remoteNetworkId, const std::string& startDhid)
+void InputDeviceCooperateSM::NotifyRemoteStartSuccess(const std::string &remoteNetworkId, const std::string& startDhid)
 {
     CALL_DEBUG_ENTER;
     DevCooperateSoftbusAdapter->StartRemoteCooperateResult(remoteNetworkId,
@@ -352,7 +352,7 @@ bool InputDeviceCooperateSM::UpdateMouseLocation()
     int32_t displayWidth = physicalDisplayInfo.width;
     int32_t displayHeight = physicalDisplayInfo.height;
     if (displayWidth == 0 || displayHeight == 0) {
-        MMI_HILOGE("diaplay width or height is 0");
+        MMI_HILOGE("display width or height is 0");
         return false;
     }
     auto mouseInfo = WinMgr->GetMouseInfo();
@@ -559,8 +559,8 @@ void InputDeviceCooperateSM::OnDeviceOffline(const std::string& networkId)
         }
     }
     if (cooperateState_ == CooperateState::STATE_IN) {
-        std::string sinkNetwoekId = InputDevMgr->GetOriginNetworkId(startDhid_);
-        if (networkId != sinkNetwoekId) {
+        std::string sinkNetworkId = InputDevMgr->GetOriginNetworkId(startDhid_);
+        if (networkId != sinkNetworkId) {
             needReset = false;
             MMI_HILOGE("OnDeviceOffline: needReset false");
         }
diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp
index 1864f1d53b..56d4363151 100644
--- a/service/interceptor/src/event_interceptor_handler.cpp
+++ b/service/interceptor/src/event_interceptor_handler.cpp
@@ -37,14 +37,14 @@ void EventInterceptorHandler::HandleKeyEvent(const std::shared_ptr<KeyEvent> key
     CHKPV(keyEvent);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     if (!InputHandler->GetJumpInterceptState() && OnHandleEvent(keyEvent)) {
-        MMI_HILOGD("KeyEvent filter find a keyEvent from Original event keyCode:%{puiblic}d",
+        MMI_HILOGD("KeyEvent filter find a keyEvent from Original event keyCode:%{public}d",
             keyEvent->GetKeyCode());
         BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::KEY_INTERCEPT_EVENT);
         return;
     }
 #else
     if (OnHandleEvent(keyEvent)) {
-        MMI_HILOGD("KeyEvent filter find a keyEvent from Original event keyCode:%{puiblic}d",
+        MMI_HILOGD("KeyEvent filter find a keyEvent from Original event keyCode:%{public}d",
             keyEvent->GetKeyCode());
         BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::KEY_INTERCEPT_EVENT);
         return;
diff --git a/service/key_event_normalize/src/key_event_normalize.cpp b/service/key_event_normalize/src/key_event_normalize.cpp
index e1d4cff876..ee2ff87ec3 100644
--- a/service/key_event_normalize/src/key_event_normalize.cpp
+++ b/service/key_event_normalize/src/key_event_normalize.cpp
@@ -87,7 +87,7 @@ int32_t KeyEventNormalize::Normalize(struct libinput_event *event, std::shared_p
     }
     if (keyAction == KeyEvent::KEY_ACTION_UP) {
         int32_t funcKey = keyEvent->TransitionFunctionKey(keyCode);
-        if (funcKey != KeyEvent::UNKOWN_FUNCTION_KEY) {
+        if (funcKey != KeyEvent::UNKNOWN_FUNCTION_KEY) {
             int32_t ret = keyEvent->SetFunctionKey(funcKey, libinput_get_funckey_state(device, funcKey));
             if (ret == funcKey) {
                 MMI_HILOGD("Set function key:%{public}d to state:%{public}d succeed",
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index e77ad9d19c..7c1d3713d2 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -37,7 +37,7 @@ namespace MMI {
 enum class ServiceRunningState {STATE_NOT_START, STATE_RUNNING, STATE_EXIT};
 class MMIService final : public UDSServer, public SystemAbility, public MultimodalInputConnectStub {
     DECLARE_DELAYED_SINGLETON(MMIService);
-    DECLEAR_SYSTEM_ABILITY(MMIService);
+    DECLARE_SYSTEM_ABILITY(MMIService);
     DISALLOW_COPY_AND_MOVE(MMIService);
 
 public:
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index 61536bcf99..945d1cdf6d 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -144,14 +144,14 @@ void MouseEventNormalize::InitAbsolution()
         return;
     }
     MMI_HILOGD("Init absolution");
-    auto dispalyGroupInfo = WinMgr->GetDisplayGroupInfo();
-    if (dispalyGroupInfo.displaysInfo.empty()) {
+    auto displayGroupInfo = WinMgr->GetDisplayGroupInfo();
+    if (displayGroupInfo.displaysInfo.empty()) {
         MMI_HILOGI("The displayInfo is empty");
         return;
     }
-    currentDisplayId_ = dispalyGroupInfo.displaysInfo[0].id;
-    absolutionX_ = dispalyGroupInfo.displaysInfo[0].width * 1.0 / 2;
-    absolutionY_ = dispalyGroupInfo.displaysInfo[0].height * 1.0 / 2;
+    currentDisplayId_ = displayGroupInfo.displaysInfo[0].id;
+    absolutionX_ = displayGroupInfo.displaysInfo[0].width * 1.0 / 2;
+    absolutionY_ = displayGroupInfo.displaysInfo[0].height * 1.0 / 2;
 }
 
 int32_t MouseEventNormalize::HandleButtonInner(struct libinput_event_pointer* data)
@@ -308,7 +308,7 @@ int32_t MouseEventNormalize::Normalize(struct libinput_event *event)
             break;
         }
         default: {
-            MMI_HILOGE("Unknow type:%{public}d", type);
+            MMI_HILOGE("Unknown type:%{public}d", type);
             return RET_ERR;
         }
     }
@@ -382,8 +382,8 @@ bool MouseEventNormalize::NormalizeMoveMouse(int32_t offsetX, int32_t offsetY)
 {
     CALL_DEBUG_ENTER;
     CHKPF(pointerEvent_);
-    bool bHasPoinerDevice = InputDevMgr->HasPointerDevice();
-    if (!bHasPoinerDevice) {
+    bool bHasPointerDevice = InputDevMgr->HasPointerDevice();
+    if (!bHasPointerDevice) {
         MMI_HILOGE("There hasn't any pointer device");
         return false;
     }
@@ -392,7 +392,7 @@ bool MouseEventNormalize::NormalizeMoveMouse(int32_t offsetX, int32_t offsetY)
     HandleMotionMoveMouse(offsetX, offsetY);
     HandlePostMoveMouse(pointerItem);
     DumpInner();
-    return bHasPoinerDevice;
+    return bHasPointerDevice;
 }
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
 
diff --git a/service/window_manager/include/pointer_drawing_manager.h b/service/window_manager/include/pointer_drawing_manager.h
index 2e5a0ddf79..0b3bc83bb3 100644
--- a/service/window_manager/include/pointer_drawing_manager.h
+++ b/service/window_manager/include/pointer_drawing_manager.h
@@ -49,7 +49,7 @@ public:
     void UpdateDisplayInfo(const DisplayInfo& displayInfo) override;
     void OnDisplayInfo(const DisplayGroupInfo& displayGroupInfo) override;
     void OnWindowInfo(const WinInfo &info) override;
-    void UpdatePointerDevice(bool hasPointerDevicee, bool isPointerVisible) override;
+    void UpdatePointerDevice(bool hasPointerDevice, bool isPointerVisible) override;
     bool Init() override;
     void DeletePointerVisible(int32_t pid) override;
     int32_t SetPointerVisible(int32_t pid, bool visible) override;
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index b6dc785c0f..99fdf5d5f1 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -745,12 +745,12 @@ std::optional<WindowInfo> InputWindowsManager::SelectWindowInfo(int32_t logicalX
             } else if ((targetWindowId < 0) && (IsInHotArea(logicalX, logicalY, item.pointerHotAreas))) {
                 firstBtnDownWindowId_ = item.id;
                 MMI_HILOGW("Find out the dispatch window of this pointer event when the targetWindowId "
-                           "hasn't been setted up yet, window:%{public}d", firstBtnDownWindowId_);
+                           "hasn't been set up yet, window:%{public}d", firstBtnDownWindowId_);
                 break;
             } else if ((targetWindowId >= 0) && (targetWindowId == item.id)) {
                 firstBtnDownWindowId_ = targetWindowId;
                 MMI_HILOGW("Find out the dispatch window of this pointer event when the targetWindowId "
-                           "has been setted up already, window:%{public}d", firstBtnDownWindowId_);
+                           "has been set up already, window:%{public}d", firstBtnDownWindowId_);
                 break;
             } else {
                 MMI_HILOGW("Continue searching for the dispatch window of this pointer event");
diff --git a/test/unittest/common/include/system_info.h b/test/unittest/common/include/system_info.h
index 038e962302..552f0b0812 100644
--- a/test/unittest/common/include/system_info.h
+++ b/test/unittest/common/include/system_info.h
@@ -21,7 +21,7 @@
 namespace OHOS {
 namespace MMI {
 namespace SYSTEM_INFO {
-static constexpr double CPU_USAGE_UNKONW = -1.0;
+static constexpr double CPU_USAGE_UNKNOWN = -1.0;
 static constexpr double CPU_USAGE_LOAD = 20.0;
 static constexpr double CPU_USAGE_MAX = 100.0;
 class SystemInfo {
diff --git a/test/unittest/common/src/system_info.cpp b/test/unittest/common/src/system_info.cpp
index 29e510c3ab..ab7589dbab 100644
--- a/test/unittest/common/src/system_info.cpp
+++ b/test/unittest/common/src/system_info.cpp
@@ -201,14 +201,14 @@ double CpuInfo::GetSystemCpuUsage()
     int32_t ret = GetSystemCpuStatInfo(first);
     if (ret != RET_OK) {
         MMI_HILOGE("Failed to obtain CPU information, errcode:%{public}d", ret);
-        return CPU_USAGE_UNKONW;
+        return CPU_USAGE_UNKNOWN;
     }
     std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
     Total_Cpu_Occupy second {};
     ret = GetSystemCpuStatInfo(second);
     if (ret != RET_OK) {
         MMI_HILOGE("Failed to obtain CPU information, errcode:%{public}d", ret);
-        return CPU_USAGE_UNKONW;
+        return CPU_USAGE_UNKNOWN;
     }
 
     return GetCpuUsage(first, second);
@@ -235,22 +235,22 @@ double CpuInfo::GetProcCpuUsage(const std::string &process_name)
 
     if ((totalTime1 = GetSystemTotalOccupy()) == RET_ERR) {
         MMI_HILOGE("Failed to obtain CPU occupy");
-        return CPU_USAGE_UNKONW;
+        return CPU_USAGE_UNKNOWN;
     }
     if ((procTime1 = GetProcOccupy(pid)) == RET_ERR) {
         MMI_HILOGE("Failed to obtain process CPU information");
-        return CPU_USAGE_UNKONW;
+        return CPU_USAGE_UNKNOWN;
     }
 
     std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
 
     if ((totalTime2 = GetSystemTotalOccupy()) == RET_ERR) {
         MMI_HILOGE("Failed to obtain CPU occupy");
-        return CPU_USAGE_UNKONW;
+        return CPU_USAGE_UNKNOWN;
     }
     if ((procTime2 = GetProcOccupy(pid)) == RET_ERR) {
         MMI_HILOGE("Failed to obtain process CPU information");
-        return CPU_USAGE_UNKONW;
+        return CPU_USAGE_UNKNOWN;
     }
 
     return CHK_RATE(CPU_USAGE_MAX * (procTime2 - procTime1) / (totalTime2 - totalTime1));
diff --git a/tools/event_inject/jsonFiles/Test_TransformGamePadJsonDataToInputData.json b/tools/event_inject/jsonFiles/Test_TransformGamePadJsonDataToInputData.json
index 00746ea4bc..2ad707931b 100644
--- a/tools/event_inject/jsonFiles/Test_TransformGamePadJsonDataToInputData.json
+++ b/tools/event_inject/jsonFiles/Test_TransformGamePadJsonDataToInputData.json
@@ -12,7 +12,7 @@
                 {"eventType": "KEY_EVENT_CLICK", "keyValue": 304},
                 {"eventType": "KEY_EVENT_CLICK", "keyValue": 305},
                 {"eventType": "KEY_EVENT_PRESS", "keyValue": 317},
-                {"eventType": "KEY_EVENT_RELESE", "keyValue": 317},
+                {"eventType": "KEY_EVENT_RELEASE", "keyValue": 317},
                 {"eventType": "KEY_EVENT_PRESS", "keyValue": 318},
                 {"eventType": "KEY_EVENT_RELEASE", "keyValue": 318},
                 {"eventType": "DIRECTION_KEY", "direction":"up"},
diff --git a/tools/event_inject/jsonFiles/Test_TransformJsonDataCheckFileNotEmpty.json b/tools/event_inject/jsonFiles/Test_TransformJsonDataCheckFileNotEmpty.json
index 5b9af6b7e5..bd0cb059b2 100644
--- a/tools/event_inject/jsonFiles/Test_TransformJsonDataCheckFileNotEmpty.json
+++ b/tools/event_inject/jsonFiles/Test_TransformJsonDataCheckFileNotEmpty.json
@@ -3,10 +3,10 @@
      "deviceName": "mouse",
      "events":[
                 {"eventType": "KEY_EVENT_PRESS", "keyValue": 272},
-                {"eventType": "KEY_EVENT_RELESE", "keyValue": 272},
+                {"eventType": "KEY_EVENT_RELEASE", "keyValue": 272},
                 {"eventType": "KEY_EVENT_CLICK", "keyValue": 273},
                 {"eventType": "KEY_EVENT_PRESS", "keyValue": 274, "blockTime":1000 },
-                {"eventType": "KEY_EVENT_RELESE", "keyValue": 274},
+                {"eventType": "KEY_EVENT_RELEASE", "keyValue": 274},
                 {"eventType": "MOUSE_EVENT_MOVE", "xPos": 10, "yPos": -20},
                 {"eventType": "MOUSE_EVENT_MOVE", "xPos": -10, "yPos": 20},
                 {"eventType": "MOUSE_EVENT_WHEEL", "direction": "down", "distance": 20},
diff --git a/tools/event_inject/jsonFiles/Test_TransformJsonDataGetDeviceNodeError.json b/tools/event_inject/jsonFiles/Test_TransformJsonDataGetDeviceNodeError.json
index 6272ec42a3..5429560633 100644
--- a/tools/event_inject/jsonFiles/Test_TransformJsonDataGetDeviceNodeError.json
+++ b/tools/event_inject/jsonFiles/Test_TransformJsonDataGetDeviceNodeError.json
@@ -3,10 +3,10 @@
      "deviceName": "Mouse",
      "events":[
                 {"eventType": "KEY_EVENT_PRESS", "keyValue": 272},
-                {"eventType": "KEY_EVENT_RELESE", "keyValue": 272},
+                {"eventType": "KEY_EVENT_RELEASE", "keyValue": 272},
                 {"eventType": "KEY_EVENT_CLICK", "keyValue": 273},
                 {"eventType": "KEY_EVENT_PRESS", "keyValue": 274, "blockTime":1000 },
-                {"eventType": "KEY_EVENT_RELESE", "keyValue": 274},
+                {"eventType": "KEY_EVENT_RELEASE", "keyValue": 274},
                 {"eventType": "MOUSE_EVENT_MOVE", "xPos": 10, "yPos": -20},
                 {"eventType": "MOUSE_EVENT_MOVE", "xPos": -10, "yPos": 20},
                 {"eventType": "MOUSE_EVENT_WHEEL", "direction": "down", "distance": 20},
diff --git a/tools/inject_event/src/input_manager_command.cpp b/tools/inject_event/src/input_manager_command.cpp
index 091aeaeeeb..17ae4ee598 100644
--- a/tools/inject_event/src/input_manager_command.cpp
+++ b/tools/inject_event/src/input_manager_command.cpp
@@ -1126,7 +1126,7 @@ int32_t InputManagerCommand::ParseCommand(int32_t argc, char *argv[])
                                 return EVENT_REG_FAIL;
                             }
                             if (joyInfo.buttonId > JOYSTICK_BUTTON_ID) {
-                                std::cout << "Pressd button value is greater than the max value" << std::endl;
+                                std::cout << "Pressed button value is greater than the max value" << std::endl;
                                 return EVENT_REG_FAIL;
                             }
                             state.push_back(std::pair<int32_t, JoystickInfo>(JOYSTICK_BUTTON_PRESS, joyInfo));
@@ -1253,7 +1253,7 @@ void InputManagerCommand::ShowUsage()
     std::cout << "-M  --mouse                                    " << std::endl;
     std::cout << "commands for mouse:                            " << std::endl;
     std::cout << "-m <dx> <dy>              --move   <dx> <dy>  -move to relative position (dx,dy),"    << std::endl;
-    std::cout << "   <dx1> <dy1> <dx2> <dy2> [soomth time] --trace -dx1 dy1 to dx2 dy2 smooth movement" << std::endl;
+    std::cout << "   <dx1> <dy1> <dx2> <dy2> [smooth time] --trace -dx1 dy1 to dx2 dy2 smooth movement" << std::endl;
     std::cout << "-d <key>                  --down   key        -press down a button, "                 << std::endl;
     std::cout << "                                               0 is the left button, 1 is the right," << std::endl;
     std::cout << "                                               2 is the middle"   << std::endl;
diff --git a/tools/inject_event/test/inject_event_test.cpp b/tools/inject_event/test/inject_event_test.cpp
index 176f57abda..3fd3570dba 100644
--- a/tools/inject_event/test/inject_event_test.cpp
+++ b/tools/inject_event/test/inject_event_test.cpp
@@ -144,7 +144,7 @@ HWTEST_F(InjectEventTest, InjectEvent_InjectMouse_006, TestSize.Level1)
 
 /**
  * @tc.name:InjectEvent_InjectMouse_007
- * @tc.desc: test inject mouse soomth movement interface
+ * @tc.desc: test inject mouse smooth movement interface
  * @tc.type: FUNC
  * @tc.require:SR000GGQBJ
  */
diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index c32cdba572..189daec65b 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -299,8 +299,8 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
 {
     DIR *dir = nullptr;
     const std::string::size_type pos = fileName.find("_");
-    const std::string procressPath = "/proc/" + fileName.substr(0, pos) + "/";
-    const std::string filePath = procressPath + "cmdline";
+    const std::string processPath = "/proc/" + fileName.substr(0, pos) + "/";
+    const std::string filePath = processPath + "cmdline";
     std::string temp;
     std::string processName;
     if (!CheckFileName(fileName)) {
@@ -311,9 +311,9 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
         std::cout << "Failed to create file" << std::endl;
         goto RELEASE_RES;
     }
-    dir = opendir(procressPath.c_str());
+    dir = opendir(processPath.c_str());
     if (dir == nullptr) {
-        std::cout << "Useless flag file:" << procressPath << std::endl;
+        std::cout << "Useless flag file:" << processPath << std::endl;
         goto RELEASE_RES;
     }
     temp = ReadUinputToolFile(filePath);
@@ -324,7 +324,7 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
     processName.append(temp);
     if (processName.find(VIRTUAL_DEVICE_NAME.c_str()) != std::string::npos) {
         if (closedir(dir) != 0) {
-            std::cout << "Close dir:" << procressPath <<"failed" << std::endl;
+            std::cout << "Close dir:" << processPath <<"failed" << std::endl;
         }
         return true;
     }
diff --git a/tools/vuinput/test/virtual_device_test.cpp b/tools/vuinput/test/virtual_device_test.cpp
index 0e196d70d5..b58dcc7633 100644
--- a/tools/vuinput/test/virtual_device_test.cpp
+++ b/tools/vuinput/test/virtual_device_test.cpp
@@ -230,12 +230,12 @@ HWTEST_F(VirtualDeviceTest, Test_AddDevice_false02, TestSize.Level1)
 }
 
 /**
- * @tc.name:Test_CloseDevice_flase02
+ * @tc.name:Test_CloseDevice_false02
  * @tc.desc:Verify VirtualDevice function CloseDevice
  * @tc.type: FUNC
  * @tc.require:
  */
-HWTEST_F(VirtualDeviceTest, Test_CloseDevice_flase02, TestSize.Level1)
+HWTEST_F(VirtualDeviceTest, Test_CloseDevice_false02, TestSize.Level1)
 {
     VirtualDevice device(DEVICE, BUS_TYPE, VENDOR_ID, PRODUCT_ID);
     std::vector<std::string> fileList;
diff --git a/util/common/include/util_napi_error.h b/util/common/include/util_napi_error.h
index 397fadd4d5..93b949a032 100644
--- a/util/common/include/util_napi_error.h
+++ b/util/common/include/util_napi_error.h
@@ -41,7 +41,7 @@ enum NapiErrorCode : int32_t {
     COMMON_PARAMETER_ERROR = 401,
     COOPERATOR_TARGET_DEV_DESCRIPTOR_ERROR = 4400001,
     COOPERATOR_FAIL = 4400002,
-    COOPERATOR_DEVICE_ID_ERROE = 4400003,
+    COOPERATOR_DEVICE_ID_ERROR = 4400003,
 };
 
 const std::map<int32_t, NapiError> NAPI_ERRORS = {
@@ -50,7 +50,7 @@ const std::map<int32_t, NapiError> NAPI_ERRORS = {
     {COMMON_PARAMETER_ERROR, {COMMON_PARAMETER_ERROR, "Parameter error. The type of %s must be %s."}},
     {COOPERATOR_TARGET_DEV_DESCRIPTOR_ERROR,
         {COOPERATOR_TARGET_DEV_DESCRIPTOR_ERROR, "Incorrect descriptor for the target device"}},
-    {COOPERATOR_DEVICE_ID_ERROE, {COMMON_PARAMETER_ERROR, "Incorrect ID of the input device"}},
+    {COOPERATOR_DEVICE_ID_ERROR, {COMMON_PARAMETER_ERROR, "Incorrect ID of the input device"}},
     {COOPERATOR_FAIL, {COOPERATOR_FAIL, "Input device operation failed"}},
 };
 
diff --git a/util/network/include/circle_stream_buffer.h b/util/network/include/circle_stream_buffer.h
index b055cdf080..f286132965 100644
--- a/util/network/include/circle_stream_buffer.h
+++ b/util/network/include/circle_stream_buffer.h
@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef CIRCLE_STEREAM_BUFFER_H
-#define CIRCLE_STEREAM_BUFFER_H
+#ifndef CIRCLE_STREAM_BUFFER_H
+#define CIRCLE_STREAM_BUFFER_H
 #include "stream_buffer.h"
 
 namespace OHOS {
@@ -33,4 +33,4 @@ protected:
 };
 } // namespace MMI
 } // namespace OHOS
-#endif // CIRCLE_STEREAM_BUFFER_H
\ No newline at end of file
+#endif // CIRCLE_STREAM_BUFFER_H
\ No newline at end of file
-- 
Gitee


From fa926c5c1023a22b725a12d5ddf1497a395acd52 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Thu, 17 Nov 2022 09:40:31 +0000
Subject: [PATCH 149/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I362bb5b59bd8eaf42837cd3fee585a2b361aa3f4
---
 service/window_manager/src/pointer_drawing_manager.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
index 83e263310d..8795fd537f 100644
--- a/service/window_manager/src/pointer_drawing_manager.cpp
+++ b/service/window_manager/src/pointer_drawing_manager.cpp
@@ -81,8 +81,7 @@ void PointerDrawingManager::DrawPointer(int32_t displayId, int32_t physicalX, in
         MMI_HILOGE("Init layer failed");
         return;
     }
-    pointerWindow_->Show();
-    MMI_HILOGD("Pointer window show success");
+    UpdatePointerVisible();
     MMI_HILOGD("Leave, display:%{public}d,physicalX:%{public}d,physicalY:%{public}d",
         displayId, physicalX, physicalY);
 }
-- 
Gitee


From 2c6bfe393220c6fca8be670d923688102fbe1b15 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Thu, 17 Nov 2022 11:04:57 +0000
Subject: [PATCH 150/360] update service/delegate_task/src/delegate_tasks.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 service/delegate_task/src/delegate_tasks.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/delegate_task/src/delegate_tasks.cpp b/service/delegate_task/src/delegate_tasks.cpp
index 98181db164..b84aef6da6 100644
--- a/service/delegate_task/src/delegate_tasks.cpp
+++ b/service/delegate_task/src/delegate_tasks.cpp
@@ -42,7 +42,8 @@ void DelegateTasks::Task::ProcessTask()
     }
 }
 
-DelegateTasks::~DelegateTasks() {
+DelegateTasks::~DelegateTasks()
+{
     if (fds_[0] >= 0) {
         close(fds_[0]);
         fds_[0] = -1;
-- 
Gitee


From c80614be7834e4393a26e265abd421ec0e392e33 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Thu, 17 Nov 2022 12:22:00 +0000
Subject: [PATCH 151/360] update service/module_loader/src/uds_server.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 service/module_loader/src/uds_server.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp
index b774e011e9..786ecc9095 100644
--- a/service/module_loader/src/uds_server.cpp
+++ b/service/module_loader/src/uds_server.cpp
@@ -109,7 +109,7 @@ int32_t UDSServer::AddSocketPairInfo(const std::string& programName,
     }
     static constexpr size_t bufferSize = 32 * 1024;
     static constexpr size_t nativeBufferSize = 64 * 1024;
-    SessionPtr sess = std::make_shared<UDSSession>(programName, moduleType, serverFd, uid, pid);
+    SessionPtr sess = nullptr;
     if (setsockopt(serverFd, SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize)) != 0) {
         MMI_HILOGE("setsockopt serverFd failed, errno: %{public}d", errno);
         goto CLOSE_SOCK;
@@ -141,6 +141,7 @@ int32_t UDSServer::AddSocketPairInfo(const std::string& programName,
         MMI_HILOGE("epoll_ctl EPOLL_CTL_ADD failed, errCode:%{public}d", EPOLL_MODIFY_FAIL);
         goto CLOSE_SOCK;
     }
+    sess = std::make_shared<UDSSession>(programName, moduleType, serverFd, uid, pid);
     if (sess == nullptr) {
         MMI_HILOGE("make_shared fail. progName:%{public}s,pid:%{public}d,errCode:%{public}d",
             programName.c_str(), pid, MAKE_SHARED_FAIL);
-- 
Gitee


From 6a9f070d63131c1973b455f0dbfcf3b361110572 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Thu, 17 Nov 2022 12:51:40 +0000
Subject: [PATCH 152/360] update tools/vuinput/src/virtual_device.cpp.

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 tools/vuinput/src/virtual_device.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index bd1619f254..9b5f443ce3 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -322,7 +322,7 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
     processName.append(temp);
     if (processName.find(VIRTUAL_DEVICE_NAME.c_str()) != std::string::npos) {
         if (closedir(dir) != 0) {
-            std::cout << "Close dir:" << processPath << "failed" << std::endl;
+            std::cout << "Close dir:" << processPath << " failed" << std::endl;
         }
         return true;
     }
-- 
Gitee


From 18ce06c19e2412710f9df0ff89fd71909c10e564 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Thu, 17 Nov 2022 15:16:58 +0000
Subject: [PATCH 153/360] =?UTF-8?q?update=20frameworks/napi/input=5Fdevice?=
 =?UTF-8?q?/src/js=5Fevent=5Ftarget.cpp.=20=E4=BF=AE=E6=94=B9=20null=20?=
 =?UTF-8?q?=E4=B8=BA=20nullptr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 .../napi/input_device/src/js_event_target.cpp | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/frameworks/napi/input_device/src/js_event_target.cpp b/frameworks/napi/input_device/src/js_event_target.cpp
index dbda780e6b..de3fcee615 100755
--- a/frameworks/napi/input_device/src/js_event_target.cpp
+++ b/frameworks/napi/input_device/src/js_event_target.cpp
@@ -42,7 +42,7 @@ void JsEventTarget::EmitAddedDeviceEvent(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
     auto temp = static_cast<std::unique_ptr<JsUtil::CallbackInfo>*>(work->data);
@@ -91,7 +91,7 @@ void JsEventTarget::EmitRemoveDeviceEvent(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
     auto temp = static_cast<std::unique_ptr<JsUtil::CallbackInfo>*>(work->data);
@@ -200,7 +200,7 @@ void JsEventTarget::CallIdsAsyncWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
     std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
@@ -237,7 +237,7 @@ void JsEventTarget::CallIdsPromiseWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
     std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
@@ -288,7 +288,7 @@ void JsEventTarget::EmitJsIds(int32_t userData, std::vector<int32_t> &ids)
     int32_t *uData = new (std::nothrow) int32_t(userData);
     if (uData == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check uData is null");
+        MMI_HILOGE("Check uData is nullptr");
         return;
     }
     work->data = static_cast<void*>(uData);
@@ -319,7 +319,7 @@ void JsEventTarget::CallDevAsyncWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
     std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
@@ -348,7 +348,7 @@ void JsEventTarget::CallDevPromiseWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
     std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
@@ -362,7 +362,7 @@ void JsEventTarget::CallDevPromiseWork(uv_work_t *work, int32_t status)
     }
     napi_value object = JsUtil::GetDeviceInfo(cb);
     if (object == nullptr) {
-        MMI_HILOGE("Check object is null");
+        MMI_HILOGE("Check object is nullptr");
         napi_close_handle_scope(cb->env, scope);
         return;
     }
@@ -428,7 +428,7 @@ void JsEventTarget::CallKeystrokeAbilityPromise(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
     std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
@@ -555,7 +555,7 @@ void JsEventTarget::EmitSupportKeys(int32_t userData, std::vector<bool> &keystro
     int32_t *uData = new (std::nothrow) int32_t(userData);
     if (uData == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
     work->data = static_cast<void*>(uData);
@@ -671,7 +671,7 @@ void JsEventTarget::CallKeyboardTypePromise(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
     std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
@@ -769,7 +769,7 @@ void JsEventTarget::CallDevListPromiseWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
     std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
@@ -868,7 +868,7 @@ void JsEventTarget::CallDevInfoAsyncWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
     std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-- 
Gitee


From 34a828f1e344b62914e5b1d570a25defd5106887 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 18 Nov 2022 10:42:46 +0800
Subject: [PATCH 154/360] =?UTF-8?q?anr=E5=90=88=E5=B9=B6=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=EF=BC=88binder=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ic2f483ee8f794b1a33f4e3255421c9c638cb04d7
---
 frameworks/proxy/BUILD.gn                     |   1 +
 .../proxy/event_handler/include/anr_handler.h |  53 ++++++++
 .../include/client_msg_handler.h              |   4 +-
 .../include/input_handler_manager.h           |   4 +-
 .../include/input_manager_impl.h              |   1 +
 .../proxy/event_handler/src/anr_handler.cpp   | 127 ++++++++++++++++++
 .../event_handler/src/client_msg_handler.cpp  |  19 +--
 .../src/input_handler_manager.cpp             |  18 +--
 .../event_handler/src/input_manager_impl.cpp  |   6 +
 frameworks/proxy/events/src/input_event.cpp   |   6 +-
 .../innerkits/event/include/input_event.h     |   4 +-
 .../include/i_multimodal_input_connect.h      |   2 +
 .../multimodal_input_connect_manager.h        |   1 +
 .../include/multimodal_input_connect_proxy.h  |   1 +
 .../include/multimodal_input_connect_stub.h   |   1 +
 .../src/multimodal_input_connect_manager.cpp  |   6 +
 .../src/multimodal_input_connect_proxy.cpp    |  23 ++++
 .../src/multimodal_input_connect_stub.cpp     |  19 +++
 service/event_handler/include/anr_manager.h   |   2 +-
 service/event_handler/src/anr_manager.cpp     |   9 +-
 .../include/server_msg_handler.h              |   1 -
 .../message_handle/src/server_msg_handler.cpp |  17 ---
 service/module_loader/include/mmi_service.h   |   1 +
 service/module_loader/src/mmi_service.cpp     |  12 ++
 util/common/include/proto.h                   |   5 +
 util/socket/src/uds_session.cpp               |   1 -
 26 files changed, 285 insertions(+), 59 deletions(-)
 create mode 100644 frameworks/proxy/event_handler/include/anr_handler.h
 create mode 100644 frameworks/proxy/event_handler/src/anr_handler.cpp

diff --git a/frameworks/proxy/BUILD.gn b/frameworks/proxy/BUILD.gn
index 342f90051f..7b0f694b75 100755
--- a/frameworks/proxy/BUILD.gn
+++ b/frameworks/proxy/BUILD.gn
@@ -79,6 +79,7 @@ ohos_source_set("libmmi-common") {
 
 ohos_shared_library("libmmi-client") {
   sources = [
+    "event_handler/src/anr_handler.cpp",
     "event_handler/src/bytrace_adapter.cpp",
     "event_handler/src/client_msg_handler.cpp",
     "event_handler/src/input_device_impl.cpp",
diff --git a/frameworks/proxy/event_handler/include/anr_handler.h b/frameworks/proxy/event_handler/include/anr_handler.h
new file mode 100644
index 0000000000..27029e4199
--- /dev/null
+++ b/frameworks/proxy/event_handler/include/anr_handler.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANR_HANDLER_H
+#define ANR_HANDLER_H
+
+#include <atomic>
+
+#include "singleton.h"
+
+#include "proto.h"
+
+namespace OHOS {
+namespace MMI {
+class ANRHandler {
+    DECLARE_DELAYED_SINGLETON(ANRHandler);
+public:
+    DISALLOW_COPY_AND_MOVE(ANRHandler);
+
+    void SetLastProcessedEventId(int32_t eventType, int32_t eventId, uint64_t actionTime);
+    void MarkProcessed(int32_t eventType);
+    std::mutex anrMtx_;
+
+private:
+    struct ANREvent {
+        bool sendStatus { false };
+        int32_t lastEventId { -1 };
+        int32_t lastReportId { -1 };
+    };
+    ANREvent event_[ANR_EVENT_TYPE_NUM];
+
+    void UpdateLastProcessedEventId(int32_t eventType, int32_t eventId);
+    void SetLastProcessedEventStatus(int32_t eventType, bool status);
+    int32_t GetLastProcessedEventId(int32_t eventType);
+    void SendEvent(int32_t eventType, int64_t delayTime);
+};
+
+#define ANRHdl ::OHOS::DelayedSingleton<ANRHandler>::GetInstance()
+} // namespace MMI
+} // namespace OHOS
+#endif // ANR_HANDLER_H
\ No newline at end of file
diff --git a/frameworks/proxy/event_handler/include/client_msg_handler.h b/frameworks/proxy/event_handler/include/client_msg_handler.h
index 46c0a2e384..2409a99cdc 100644
--- a/frameworks/proxy/event_handler/include/client_msg_handler.h
+++ b/frameworks/proxy/event_handler/include/client_msg_handler.h
@@ -65,10 +65,10 @@ protected:
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 
 private:
-    static void OnDispatchEventProcessed(int32_t eventId);
+    static void OnDispatchEventProcessed(int32_t eventId, int64_t actionTime);
 
 private:
-    std::function<void(int32_t)> dispatchCallback_ { nullptr };
+    std::function<void(int32_t, int64_t)> dispatchCallback_ { nullptr };
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/proxy/event_handler/include/input_handler_manager.h b/frameworks/proxy/event_handler/include/input_handler_manager.h
index 0bedee5408..f57327185e 100755
--- a/frameworks/proxy/event_handler/include/input_handler_manager.h
+++ b/frameworks/proxy/event_handler/include/input_handler_manager.h
@@ -68,7 +68,7 @@ private:
     void RemoveFromServer(InputHandlerType handlerType, HandleEventType eventType);
 
     std::shared_ptr<IInputEventConsumer> FindHandler(int32_t handlerId);
-    void OnDispatchEventProcessed(int32_t eventId);
+    void OnDispatchEventProcessed(int32_t eventId, int64_t actionTime);
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
     void GetConsumerInfos(std::shared_ptr<PointerEvent> pointerEvent,
         std::map<int32_t, std::shared_ptr<IInputEventConsumer>> &consumerInfos);
@@ -78,7 +78,7 @@ private:
     std::map<int32_t, Handler> inputHandlers_;
     std::map<int32_t, int32_t> processedEvents_;
     std::set<int32_t> mouseEventIds_;
-    std::function<void(int32_t)> monitorCallback_ { nullptr };
+    std::function<void(int32_t, int64_t)> monitorCallback_ { nullptr };
     int32_t nextId_ { 1 };
     std::mutex mtxHandlers_;
 };
diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index a2d9f61f39..6bccc1fc94 100755
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -112,6 +112,7 @@ public:
     bool GetFunctionKeyState(int32_t funcKey);
     int32_t SetFunctionKeyState(int32_t funcKey, bool enable);
 
+    EventHandlerPtr GetEventHandler() const;
 private:
     int32_t PackWindowInfo(NetPacket &pkt);
     int32_t PackDisplayInfo(NetPacket &pkt);
diff --git a/frameworks/proxy/event_handler/src/anr_handler.cpp b/frameworks/proxy/event_handler/src/anr_handler.cpp
new file mode 100644
index 0000000000..4c6a94de4e
--- /dev/null
+++ b/frameworks/proxy/event_handler/src/anr_handler.cpp
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "anr_handler.h"
+
+#include <cinttypes>
+
+#include "define_multimodal.h"
+
+#include "input_manager_impl.h"
+#include "multimodal_input_connect_manager.h"
+
+namespace OHOS {
+namespace MMI {
+namespace {
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ANRHandler" };
+constexpr int64_t MAX_MARK_PROCESS_DELAY_TIME = 3500000;
+constexpr int64_t MIN_MARK_PROCESS_DELAY_TIME = 50000;
+constexpr int32_t INVALID_OR_PROCESSED_ID = -1;
+} // namespace
+
+ANRHandler::ANRHandler() {}
+
+ANRHandler::~ANRHandler() {}
+
+void ANRHandler::SetLastProcessedEventStatus(int32_t eventType, bool status)
+{
+    std::lock_guard<std::mutex> guard(anrMtx_);
+    event_[eventType].sendStatus = status;
+}
+
+void ANRHandler::UpdateLastProcessedEventId(int32_t eventType, int32_t eventId)
+{
+    std::lock_guard<std::mutex> guard(anrMtx_);
+    event_[eventType].lastEventId = eventId;
+}
+
+void ANRHandler::SetLastProcessedEventId(int32_t eventType, int32_t eventId, uint64_t actionTime)
+{
+    CALL_DEBUG_ENTER;
+    if (event_[eventType].lastEventId > eventId) {
+        MMI_HILOGE("Event type:%{public}d, id %{public}d less then last processed lastEventId %{public}d",
+            eventType, eventId, event_[eventType].lastEventId);
+        return;
+    }
+    UpdateLastProcessedEventId(eventType, eventId);
+
+    int64_t currentTime = GetSysClockTime();
+    int64_t timeoutTime = INPUT_UI_TIMEOUT_TIME - (currentTime - actionTime);
+    MMI_HILOGD("Processed event type:%{public}d, id:%{public}d, actionTime:%{public}" PRId64 ", "
+        "currentTime:%{public}" PRId64 ", timeoutTime:%{public}" PRId64,
+        eventType, eventId, actionTime, currentTime, timeoutTime);
+
+    if (!event_[eventType].sendStatus) {
+        if (timeoutTime < MIN_MARK_PROCESS_DELAY_TIME) {
+            SendEvent(eventType, 0);
+        } else {
+            int64_t delayTime;
+            if (timeoutTime >= MAX_MARK_PROCESS_DELAY_TIME) {
+                delayTime = MAX_MARK_PROCESS_DELAY_TIME / 1000;
+            } else {
+                delayTime = timeoutTime / 1000;
+            }
+            SendEvent(eventType, delayTime);
+        }
+    }
+}
+
+int32_t ANRHandler::GetLastProcessedEventId(int32_t eventType)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(anrMtx_);
+    if (event_[eventType].lastEventId == INVALID_OR_PROCESSED_ID
+        || event_[eventType].lastEventId <= event_[eventType].lastReportId) {
+        MMI_HILOGD("Invalid or processed event type:%{public}d, lastEventId:%{public}d, lastReportId:%{public}d",
+            eventType, event_[eventType].lastEventId, event_[eventType].lastReportId);
+        return INVALID_OR_PROCESSED_ID;
+    }
+
+    event_[eventType].lastReportId = event_[eventType].lastEventId;
+    MMI_HILOGD("Processed event type:%{public}d, lastEventId:%{public}d, lastReportId:%{public}d",
+        eventType, event_[eventType].lastEventId, event_[eventType].lastReportId);
+    return event_[eventType].lastEventId;
+}
+
+void ANRHandler::MarkProcessed(int32_t eventType)
+{
+    CALL_DEBUG_ENTER;
+    int32_t eventId = GetLastProcessedEventId(eventType);
+    if (eventId == INVALID_OR_PROCESSED_ID) {
+        return;
+    }
+    MMI_HILOGD("Processed event type:%{public}d, id:%{public}d", eventType, eventId);
+    int32_t ret = MultimodalInputConnMgr->MarkProcessed(eventType, eventId);
+    if (ret != 0) {
+        MMI_HILOGE("Send to server failed, ret:%{public}d", ret);
+    }
+    SetLastProcessedEventStatus(eventType, false);
+}
+
+
+void ANRHandler::SendEvent(int32_t eventType, int64_t delayTime)
+{
+    CALL_DEBUG_ENTER;
+    MMI_HILOGD("Event type:%{public}d, delayTime:%{public}" PRId64, eventType, delayTime);
+    SetLastProcessedEventStatus(eventType, true);
+    auto eventHandler = InputMgrImpl.GetEventHandler();
+    CHKPV(eventHandler);
+    std::function<void()> eventFunc = std::bind(&ANRHandler::MarkProcessed, this, eventType);
+    if (!eventHandler->PostHighPriorityTask(eventFunc, delayTime)) {
+        MMI_HILOGE("Send dispatch event failed");
+    }
+}
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/frameworks/proxy/event_handler/src/client_msg_handler.cpp b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
index 5c63cf3e8a..6ce9d7c9fa 100644
--- a/frameworks/proxy/event_handler/src/client_msg_handler.cpp
+++ b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
@@ -29,6 +29,7 @@
 #include "input_event_data_transformation.h"
 #include "input_handler_manager.h"
 #include "input_manager_impl.h"
+#include "anr_handler.h"
 #ifdef OHOS_BUILD_ENABLE_MONITOR
 #include "input_monitor_manager.h"
 #endif // OHOS_BUILD_ENABLE_MONITOR
@@ -92,7 +93,8 @@ void ClientMsgHandler::InitProcessedCallback()
     int32_t tokenType = MultimodalInputConnMgr->GetTokenType();
     if (tokenType == TokenType::TOKEN_HAP) {
         MMI_HILOGD("Current session is hap");
-        dispatchCallback_ = std::bind(&ClientMsgHandler::OnDispatchEventProcessed, std::placeholders::_1);
+        dispatchCallback_ = std::bind(&ClientMsgHandler::OnDispatchEventProcessed, std::placeholders::_1,
+            std::placeholders::_2);
     } else if (tokenType == static_cast<int32_t>(TokenType::TOKEN_NATIVE)) {
         MMI_HILOGD("Current session is native");
     } else {
@@ -361,21 +363,10 @@ int32_t ClientMsgHandler::ReportPointerEvent(const UDSClient& client, NetPacket&
 }
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 
-void ClientMsgHandler::OnDispatchEventProcessed(int32_t eventId)
+void ClientMsgHandler::OnDispatchEventProcessed(int32_t eventId, int64_t actionTime)
 {
     CALL_DEBUG_ENTER;
-    MMIClientPtr client = MMIEventHdl.GetMMIClient();
-    CHKPV(client);
-    NetPacket pkt(MmiMessageId::MARK_PROCESS);
-    pkt << eventId << ANR_DISPATCH;
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet write event failed");
-        return;
-    }
-    if (!client->SendMessage(pkt)) {
-        MMI_HILOGE("Send message failed, errCode:%{public}d", MSG_SEND_FAIL);
-        return;
-    }
+    ANRHdl->SetLastProcessedEventId(ANR_DISPATCH, eventId, actionTime);
 }
 
 int32_t ClientMsgHandler::OnAnr(const UDSClient& client, NetPacket& pkt)
diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
index 35d27e5228..4b39cac4ef 100644
--- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp
+++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
@@ -19,6 +19,7 @@
 
 #include "bytrace_adapter.h"
 #include "input_handler_type.h"
+#include "anr_handler.h"
 #include "multimodal_event_handler.h"
 #include "multimodal_input_connect_manager.h"
 #include "mmi_log.h"
@@ -34,7 +35,8 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Input
 
 InputHandlerManager::InputHandlerManager()
 {
-    monitorCallback_ = std::bind(&InputHandlerManager::OnDispatchEventProcessed, this, std::placeholders::_1);
+    monitorCallback_ = std::bind(&InputHandlerManager::OnDispatchEventProcessed, this, std::placeholders::_1,
+        std::placeholders::_2);
 }
 
 int32_t InputHandlerManager::AddHandler(InputHandlerType handlerType,
@@ -265,10 +267,9 @@ HandleEventType InputHandlerManager::GetEventType() const
     return eventType;
 }
 
-void InputHandlerManager::OnDispatchEventProcessed(int32_t eventId)
+void InputHandlerManager::OnDispatchEventProcessed(int32_t eventId, int64_t actionTime)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mtxHandlers_);
     MMIClientPtr client = MMIEventHdl.GetMMIClient();
     CHKPV(client);
     if (mouseEventIds_.find(eventId) != mouseEventIds_.end()) {
@@ -287,16 +288,7 @@ void InputHandlerManager::OnDispatchEventProcessed(int32_t eventId)
         processedEvents_.emplace(eventId, count);
         return;
     }
-    NetPacket pkt(MmiMessageId::MARK_PROCESS);
-    pkt << eventId << ANR_MONITOR;
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet write event failed");
-        return;
-    }
-    if (!client->SendMessage(pkt)) {
-        MMI_HILOGE("Send message failed, errCode:%{public}d", MSG_SEND_FAIL);
-        return;
-    }
+    ANRHdl->SetLastProcessedEventId(ANR_MONITOR, eventId, actionTime);
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 4ae7f06f74..6a94c665f3 100755
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -126,6 +126,12 @@ int32_t InputManagerImpl::AddInputEventFilter(std::function<bool(std::shared_ptr
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 }
 
+EventHandlerPtr InputManagerImpl::GetEventHandler() const
+{
+    CHKPP(eventHandler_);
+    return eventHandler_;
+}
+
 void InputManagerImpl::SetWindowInputEventConsumer(std::shared_ptr<IInputEventConsumer> inputEventConsumer,
     std::shared_ptr<AppExecFwk::EventHandler> eventHandler)
 {
diff --git a/frameworks/proxy/events/src/input_event.cpp b/frameworks/proxy/events/src/input_event.cpp
index 8f9ea6cb80..46a82881b2 100644
--- a/frameworks/proxy/events/src/input_event.cpp
+++ b/frameworks/proxy/events/src/input_event.cpp
@@ -200,7 +200,7 @@ void InputEvent::ClearFlag()
     bitwise_ = EVENT_FLAG_NONE;
 }
 
-void InputEvent::SetProcessedCallback(std::function<void(int32_t)> callback)
+void InputEvent::SetProcessedCallback(std::function<void(int32_t, int64_t)> callback)
 {
     processedCallback_ = callback;
 }
@@ -211,8 +211,8 @@ void InputEvent::MarkProcessed()
         return;
     }
     auto func = processedCallback_;
-    processedCallback_ = std::function<void(int32_t)>();
-    func(id_);
+    processedCallback_ = std::function<void(int32_t, int64_t)>();
+    func(id_, actionTime_);
 }
 
 bool InputEvent::WriteToParcel(Parcel &out) const
diff --git a/interfaces/native/innerkits/event/include/input_event.h b/interfaces/native/innerkits/event/include/input_event.h
index 4db8f5b29d..95e9ed2812 100644
--- a/interfaces/native/innerkits/event/include/input_event.h
+++ b/interfaces/native/innerkits/event/include/input_event.h
@@ -315,7 +315,7 @@ public:
      * @return void
      * @since 9
      */
-    void SetProcessedCallback(std::function<void(int32_t)> callback);
+    void SetProcessedCallback(std::function<void(int32_t, int64_t)> callback);
 
 public:
     /**
@@ -353,7 +353,7 @@ private:
     int32_t targetWindowId_;
     int32_t agentWindowId_;
     uint32_t bitwise_;
-    std::function<void(int32_t)> processedCallback_;
+    std::function<void(int32_t, int64_t)> processedCallback_;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
index 603690721f..24cc41fc60 100644
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -33,6 +33,7 @@ public:
         ADD_INPUT_EVENT_FILTER = 1,
         SET_POINTER_VISIBLE = 2,
         IS_POINTER_VISIBLE = 3,
+        MARK_PROCESSED = 4,
         SUBSCRIBE_KEY_EVENT = 6,
         UNSUBSCRIBE_KEY_EVENT = 7,
         ADD_INPUT_HANDLER = 8,
@@ -75,6 +76,7 @@ public:
     virtual int32_t AddInputEventFilter(sptr<IEventFilter> filter) = 0;
     virtual int32_t SetPointerVisible(bool visible) = 0;
     virtual int32_t IsPointerVisible(bool &visible) = 0;
+    virtual int32_t MarkProcessed(int32_t eventType, int32_t eventId) = 0;
     virtual int32_t SetPointerSpeed(int32_t speed) = 0;
     virtual int32_t GetPointerSpeed(int32_t &speed) = 0;
     virtual int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle) = 0;
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
index c46e31c799..fa5e92285f 100644
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -40,6 +40,7 @@ public:
     int32_t AddInputEventFilter(sptr<IEventFilter> filter);
     int32_t SetPointerVisible(bool visible);
     int32_t IsPointerVisible(bool &visible);
+    int32_t MarkProcessed(int32_t eventType, int32_t eventId);
     int32_t SetPointerSpeed(int32_t speed);
     int32_t GetPointerSpeed(int32_t &speed);
     int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle);
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
index 4a299a0b20..057057a489 100644
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -35,6 +35,7 @@ public:
     int32_t AddInputEventFilter(sptr<IEventFilter> filter) override;
     int32_t SetPointerVisible(bool visible) override;
     int32_t IsPointerVisible(bool &visible) override;
+    int32_t MarkProcessed(int32_t eventType, int32_t eventId) override;
     int32_t SetPointerSpeed(int32_t speed) override;
     int32_t GetPointerSpeed(int32_t &speed) override;
     int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle) override;
diff --git a/service/connect_manager/include/multimodal_input_connect_stub.h b/service/connect_manager/include/multimodal_input_connect_stub.h
index 3c09974f97..912b2e6355 100644
--- a/service/connect_manager/include/multimodal_input_connect_stub.h
+++ b/service/connect_manager/include/multimodal_input_connect_stub.h
@@ -43,6 +43,7 @@ protected:
     int32_t StubSetPointerStyle(MessageParcel& data, MessageParcel& reply);
     int32_t StubGetPointerStyle(MessageParcel& data, MessageParcel& reply);
     int32_t StubIsPointerVisible(MessageParcel& data, MessageParcel& reply);
+    int32_t StubMarkProcessed(MessageParcel& data, MessageParcel& reply);
     int32_t StubSupportKeys(MessageParcel& data, MessageParcel& reply);
     int32_t StubGetDeviceIds(MessageParcel& data, MessageParcel& reply);
     int32_t StubGetDevice(MessageParcel& data, MessageParcel& reply);
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
index 9893ab9b6c..87fd6f8609 100644
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -95,6 +95,12 @@ int32_t MultimodalInputConnectManager::IsPointerVisible(bool &visible)
     return multimodalInputConnectService_->IsPointerVisible(visible);
 }
 
+int32_t MultimodalInputConnectManager::MarkProcessed(int32_t eventType, int32_t eventId)
+{
+    CHKPR(multimodalInputConnectService_, INVALID_HANDLER_ID);
+    return multimodalInputConnectService_->MarkProcessed(eventType, eventId);
+}
+
 int32_t MultimodalInputConnectManager::SetPointerSpeed(int32_t speed)
 {
     CHKPR(multimodalInputConnectService_, RET_ERR);
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index 2cd7a91e1b..8896650c2f 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -141,6 +141,29 @@ int32_t MultimodalInputConnectProxy::IsPointerVisible(bool &visible)
     return RET_OK;
 }
 
+int32_t MultimodalInputConnectProxy::MarkProcessed(int32_t eventType, int32_t eventId)
+{
+    CALL_DEBUG_ENTER;
+    MessageParcel data;
+    if (!data.WriteInterfaceToken(MultimodalInputConnectProxy::GetDescriptor())) {
+        MMI_HILOGE("Failed to write descriptor");
+        return ERR_INVALID_VALUE;
+    }
+    WRITEINT32(data, eventType, ERR_INVALID_VALUE);
+    WRITEINT32(data, eventId, ERR_INVALID_VALUE);
+    
+    MessageParcel reply;
+    MessageOption option;
+    sptr<IRemoteObject> remote = Remote();
+    CHKPR(remote, RET_ERR);
+    int32_t ret = remote->SendRequest(MARK_PROCESSED, data, reply, option);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Send request fail, ret:%{public}d", ret);
+        return ret;
+    }
+    return RET_OK;
+}
+
 int32_t MultimodalInputConnectProxy::SetPointerSpeed(int32_t speed)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 82e3082ee8..805277e85f 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -64,6 +64,7 @@ int32_t MultimodalInputConnectStub::OnRemoteRequest(uint32_t code, MessageParcel
         {IMultimodalInputConnect::GET_POINTER_SPEED, &MultimodalInputConnectStub::StubGetPointerSpeed},
         {IMultimodalInputConnect::SUBSCRIBE_KEY_EVENT, &MultimodalInputConnectStub::StubSubscribeKeyEvent},
         {IMultimodalInputConnect::UNSUBSCRIBE_KEY_EVENT, &MultimodalInputConnectStub::StubUnsubscribeKeyEvent},
+        {IMultimodalInputConnect::MARK_PROCESSED, &MultimodalInputConnectStub::StubMarkProcessed},
         {IMultimodalInputConnect::ADD_INPUT_HANDLER, &MultimodalInputConnectStub::StubAddInputHandler},
         {IMultimodalInputConnect::REMOVE_INPUT_HANDLER, &MultimodalInputConnectStub::StubRemoveInputHandler},
         {IMultimodalInputConnect::MARK_EVENT_CONSUMED, &MultimodalInputConnectStub::StubMarkEventConsumed},
@@ -187,6 +188,24 @@ int32_t MultimodalInputConnectStub::StubIsPointerVisible(MessageParcel& data, Me
     return RET_OK;
 }
 
+int32_t MultimodalInputConnectStub::StubMarkProcessed(MessageParcel& data, MessageParcel& reply)
+{
+    CALL_DEBUG_ENTER;
+    if (!IsRunning()) {
+        MMI_HILOGE("Service is not running");
+    }
+    int32_t eventType;
+    READINT32(data, eventType, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t eventId;
+    READINT32(data, eventId, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = MarkProcessed(eventType, eventId);
+    if (ret != RET_OK) {
+        MMI_HILOGE("MarkProcessed failed, ret:%{public}d", ret);
+        return ret;
+    }
+    return RET_OK;
+}
+
 int32_t MultimodalInputConnectStub::StubSetPointerSpeed(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/event_handler/include/anr_manager.h b/service/event_handler/include/anr_manager.h
index 677bfc610a..f40e5507f3 100644
--- a/service/event_handler/include/anr_manager.h
+++ b/service/event_handler/include/anr_manager.h
@@ -33,7 +33,7 @@ public:
     int32_t SetANRNoticedPid(int32_t anrPid);
     void OnSessionLost(SessionPtr session);
     void AddTimer(int32_t type, int32_t id, int64_t currentTime, SessionPtr sess);
-    void MarkProcessed(int32_t eventType, int32_t eventId, SessionPtr sess);
+    int32_t MarkProcessed(int32_t pid, int32_t eventType, int32_t eventId);
     void RemoveTimers(SessionPtr sess);
 private:
     int32_t anrNoticedPid_ { -1 };
diff --git a/service/event_handler/src/anr_manager.cpp b/service/event_handler/src/anr_manager.cpp
index 3fd907922a..51dc3e3237 100644
--- a/service/event_handler/src/anr_manager.cpp
+++ b/service/event_handler/src/anr_manager.cpp
@@ -28,7 +28,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "ANRManager" };
-constexpr int64_t INPUT_UI_TIMEOUT_TIME = 5 * 1000000;
 const std::string FOUNDATION = "foundation";
 constexpr int32_t MAX_ANR_TIMER_COUNT = 50;
 } // namespace
@@ -44,9 +43,12 @@ void ANRManager::Init(UDSServer &udsServer)
     udsServer_->AddSessionDeletedCallback(std::bind(&ANRManager::OnSessionLost, this, std::placeholders::_1));
 }
 
-void ANRManager::MarkProcessed(int32_t eventType, int32_t eventId, SessionPtr sess)
+int32_t ANRManager::MarkProcessed(int32_t pid, int32_t eventType, int32_t eventId)
 {
-    CHKPV(sess);
+    CALL_DEBUG_ENTER;
+    MMI_HILOGD("pid:%{public}d, eventType:%{public}d, eventId:%{public}d", pid, eventType, eventId);
+    SessionPtr sess = udsServer_->GetSessionByPid(pid);
+    CHKPR(sess, RET_ERR);
     std::list<int32_t> timerIds = sess->DelEvents(eventType, eventId);
     for (int32_t item : timerIds) {
         if (item != -1) {
@@ -56,6 +58,7 @@ void ANRManager::MarkProcessed(int32_t eventType, int32_t eventId, SessionPtr se
                 "count:%{public}d", eventType, eventId, item, anrTimerCount_);
         }
     }
+    return RET_OK;
 }
 
 void ANRManager::RemoveTimers(SessionPtr sess)
diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
index 4d84640f65..90022e681d 100644
--- a/service/message_handle/include/server_msg_handler.h
+++ b/service/message_handle/include/server_msg_handler.h
@@ -62,7 +62,6 @@ public:
     int32_t AddInputEventFilter(sptr<IEventFilter> filter);
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 protected:
-    int32_t MarkProcessed(SessionPtr sess, NetPacket& pkt);
     int32_t OnRegisterMsgHandler(SessionPtr sess, NetPacket& pkt);
     int32_t OnDisplayInfo(SessionPtr sess, NetPacket& pkt);
 
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index 223b7b0858..41350770d1 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -45,7 +45,6 @@ void ServerMsgHandler::Init(UDSServer& udsServer)
 {
     udsServer_ = &udsServer;
     MsgCallback funs[] = {
-        {MmiMessageId::MARK_PROCESS, MsgCallbackBind2(&ServerMsgHandler::MarkProcessed, this)},
         {MmiMessageId::DISPLAY_INFO, MsgCallbackBind2(&ServerMsgHandler::OnDisplayInfo, this)},
     };
     for (auto &it : funs) {
@@ -72,22 +71,6 @@ void ServerMsgHandler::OnMsgHandler(SessionPtr sess, NetPacket& pkt)
     }
 }
 
-int32_t ServerMsgHandler::MarkProcessed(SessionPtr sess, NetPacket& pkt)
-{
-    CALL_DEBUG_ENTER;
-    CHKPR(sess, ERROR_NULL_POINTER);
-    int32_t eventId = 0;
-    int32_t eventType = 0;
-    pkt >> eventId >> eventType;
-    MMI_HILOGD("Event type:%{public}d, id:%{public}d", eventType, eventId);
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet read data failed");
-        return PACKET_READ_FAIL;
-    }
-    ANRMgr->MarkProcessed(eventType, eventId, sess);
-    return RET_OK;
-}
-
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
 int32_t ServerMsgHandler::OnInjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent)
 {
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index 7c1d3713d2..4130f2a291 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -49,6 +49,7 @@ public:
     int32_t AddInputEventFilter(sptr<IEventFilter> filter) override;
     int32_t SetPointerVisible(bool visible) override;
     int32_t IsPointerVisible(bool &visible) override;
+    int32_t MarkProcessed(int32_t eventType, int32_t eventId) override;
     int32_t SetPointerSpeed(int32_t speed) override;
     int32_t GetPointerSpeed(int32_t &speed) override;
     int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle) override;
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index ec4311c2ee..74e817bb44 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -433,6 +433,18 @@ int32_t MMIService::IsPointerVisible(bool &visible)
     return RET_OK;
 }
 
+int32_t MMIService::MarkProcessed(int32_t eventType, int32_t eventId)
+{
+    CALL_DEBUG_ENTER;
+    int32_t ret = delegateTasks_.PostSyncTask(
+        std::bind(&ANRManager::MarkProcessed, ANRMgr, GetCallingPid(), eventType, eventId));
+    if (ret != RET_OK) {
+        MMI_HILOGE("Mark event processed failed, ret:%{public}d", ret);
+        return RET_ERR;
+    }
+    return RET_OK;
+}
+
 int32_t MMIService::SetPointerSpeed(int32_t speed)
 {
     CALL_DEBUG_ENTER;
diff --git a/util/common/include/proto.h b/util/common/include/proto.h
index 5f45f23dcd..600d01e023 100644
--- a/util/common/include/proto.h
+++ b/util/common/include/proto.h
@@ -57,8 +57,13 @@ enum TokenType : int32_t {
     TOKEN_SHELL,
 };
 
+enum ANTTimeOutTime : int64_t {
+    INPUT_UI_TIMEOUT_TIME = 5 * 1000000
+};
+
 enum ANREventType {
     ANR_DISPATCH,
     ANR_MONITOR,
+    ANR_EVENT_TYPE_NUM,
 };
 #endif // PROTO_H
\ No newline at end of file
diff --git a/util/socket/src/uds_session.cpp b/util/socket/src/uds_session.cpp
index e0bdeaa65f..c0b868fe51 100644
--- a/util/socket/src/uds_session.cpp
+++ b/util/socket/src/uds_session.cpp
@@ -30,7 +30,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "UDSSession" };
-constexpr int64_t INPUT_UI_TIMEOUT_TIME = 5 * 1000000;
 const std::string FOUNDATION = "foundation";
 } // namespace
 
-- 
Gitee


From 6224eb465fcfc7ce99c3a928dba3be01773f39e3 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Fri, 18 Nov 2022 02:43:44 +0000
Subject: [PATCH 155/360] =?UTF-8?q?update=20frameworks/napi/input=5Fdevice?=
 =?UTF-8?q?/src/js=5Finput=5Fdevice=5Fcontext.cpp.=20=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=E7=9A=84=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
---
 .../napi/input_device/src/js_input_device_context.cpp       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frameworks/napi/input_device/src/js_input_device_context.cpp b/frameworks/napi/input_device/src/js_input_device_context.cpp
index b701ab188c..476c6bb13b 100644
--- a/frameworks/napi/input_device/src/js_input_device_context.cpp
+++ b/frameworks/napi/input_device/src/js_input_device_context.cpp
@@ -93,10 +93,8 @@ napi_value JsInputDeviceContext::JsConstructor(napi_env env, napi_callback_info
     napi_status status = napi_wrap(env, thisVar, jsContext, [](napi_env env, void* data, void* hin) {
         MMI_HILOGI("jsvm ends");
         JsInputDeviceContext *context = static_cast<JsInputDeviceContext*>(data);
-        if (context != nullptr) {
-            delete context;
-            context = nullptr;
-        }
+        delete context;
+        context = nullptr;
     }, nullptr, nullptr);
     if (status != napi_ok) {
         delete jsContext;
-- 
Gitee


From 42fecd73468386d4a27f2c7278c429225fc12677 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 18 Nov 2022 06:40:00 +0000
Subject: [PATCH 156/360] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E6=8C=87?=
 =?UTF-8?q?=E5=B1=8F=E5=B9=95=E6=BB=91=E5=8A=A8=E5=AF=BC=E8=87=B4=E9=BB=91?=
 =?UTF-8?q?=E5=B1=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../input_monitor/src/js_input_monitor.cpp    | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 frameworks/napi/input_monitor/src/js_input_monitor.cpp

diff --git a/frameworks/napi/input_monitor/src/js_input_monitor.cpp b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
old mode 100644
new mode 100755
index 5df9209d92..ea5d71a581
--- a/frameworks/napi/input_monitor/src/js_input_monitor.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
@@ -242,28 +242,28 @@ std::string JsInputMonitor::GetAction(int32_t action) const
 int32_t JsInputMonitor::GetJsPointerItem(const PointerEvent::PointerItem &item, napi_value value) const
 {
     if (SetNameProperty(jsEnv_, value, "globalX", item.GetDisplayX()) != napi_ok) {
-        THROWERR(jsEnv_, "Set globalX property failed");
+        MMI_HILOGE("Set globalX property failed");
         return RET_ERR;
     }
     if (SetNameProperty(jsEnv_, value, "globalY", item.GetDisplayY()) != napi_ok) {
-        THROWERR(jsEnv_, "Set globalY property failed");
+        MMI_HILOGE("Set globalY property failed");
         return RET_ERR;
     }
     if (SetNameProperty(jsEnv_, value, "localX", 0) != napi_ok) {
-        THROWERR(jsEnv_, "Set localX property failed");
+        MMI_HILOGE("Set localX property failed");
         return RET_ERR;
     }
     if (SetNameProperty(jsEnv_, value, "localY", 0) != napi_ok) {
-        THROWERR(jsEnv_, "Set localY property failed");
+        MMI_HILOGE("Set localY property failed");
         return RET_ERR;
     }
     int32_t touchArea = (item.GetWidth() + item.GetHeight()) / 2;
     if (SetNameProperty(jsEnv_, value, "size", touchArea) != napi_ok) {
-        THROWERR(jsEnv_, "Set size property failed");
+        MMI_HILOGE("Set size property failed");
         return RET_ERR;
     }
     if (SetNameProperty(jsEnv_, value, "force", item.GetPressure()) != napi_ok) {
-        THROWERR(jsEnv_, "Set force property failed");
+        MMI_HILOGE("Set force property failed");
         return RET_ERR;
     }
     return RET_OK;
@@ -273,13 +273,13 @@ int32_t JsInputMonitor::TransformPointerEvent(const std::shared_ptr<PointerEvent
 {
     CHKPR(pointerEvent, ERROR_NULL_POINTER);
     if (SetNameProperty(jsEnv_, result, "type", GetAction(pointerEvent->GetPointerAction())) != napi_ok) {
-        THROWERR(jsEnv_, "Set type property failed");
+        MMI_HILOGE("Set type property failed");
         return RET_ERR;
     }
     napi_value pointers = nullptr;
     auto status = napi_create_array(jsEnv_, &pointers);
     if (status != napi_ok) {
-        THROWERR(jsEnv_, "napi_create_array is failed");
+        MMI_HILOGE("napi_create_array is failed");
         return RET_ERR;
     }
     std::vector<PointerEvent::PointerItem> pointerItems;
@@ -298,13 +298,13 @@ int32_t JsInputMonitor::TransformPointerEvent(const std::shared_ptr<PointerEvent
         napi_value element = nullptr;
         status = napi_create_object(jsEnv_, &element);
         if (status != napi_ok) {
-            THROWERR(jsEnv_, "napi_create_object is failed");
+            MMI_HILOGE("napi_create_object is failed");
             return RET_ERR;
         }
         if (currentPointerId == it.GetPointerId()) {
             status = napi_create_object(jsEnv_, &currentPointer);
             if (status != napi_ok) {
-                THROWERR(jsEnv_, "napi_create_object is failed");
+                MMI_HILOGE("napi_create_object is failed");
                 return RET_ERR;
             }
             if (GetJsPointerItem(it, currentPointer) != RET_OK) {
@@ -312,11 +312,11 @@ int32_t JsInputMonitor::TransformPointerEvent(const std::shared_ptr<PointerEvent
                 return RET_ERR;
             }
             if (SetNameProperty(jsEnv_, result, "timestamp", pointerEvent->GetActionTime()) != napi_ok) {
-                THROWERR(jsEnv_, "Set timestamp property failed");
+                MMI_HILOGE("Set timestamp property failed");
                 return RET_ERR;
             }
             if (SetNameProperty(jsEnv_, result, "deviceId", it.GetDeviceId()) != napi_ok) {
-                THROWERR(jsEnv_, "Set deviceId property failed");
+                MMI_HILOGE("Set deviceId property failed");
                 return RET_ERR;
             }
         }
@@ -326,17 +326,17 @@ int32_t JsInputMonitor::TransformPointerEvent(const std::shared_ptr<PointerEvent
         }
         status = napi_set_element(jsEnv_, pointers, index, element);
         if (status != napi_ok) {
-            THROWERR(jsEnv_, "napi_set_element is failed");
+            MMI_HILOGE("napi_set_element is failed");
             return RET_ERR;
         }
         ++index;
     }
     if (SetNameProperty(jsEnv_, result, "touches", pointers) != napi_ok) {
-            THROWERR(jsEnv_, "Set touches property failed");
+            MMI_HILOGE("Set touches property failed");
             return RET_ERR;
     }
     if (SetNameProperty(jsEnv_, result, "changedTouches", currentPointer) != napi_ok) {
-            THROWERR(jsEnv_, "Set changedTouches property failed");
+            MMI_HILOGE("Set changedTouches property failed");
             return RET_ERR;
     }
     return RET_OK;
@@ -612,7 +612,7 @@ int32_t JsInputMonitor::TransformMousePointerEvent(const std::shared_ptr<Pointer
         return RET_ERR;
     }
     if (SetNameProperty(jsEnv_, result, "action", actionValue) != napi_ok) {
-        THROWERR(jsEnv_, "Set property of action failed");
+        MMI_HILOGE("Set property of action failed");
         return RET_ERR;
     }
     std::vector<int32_t> pressedKeys = pointerEvent->GetPressedKeys();
-- 
Gitee


From 2d9618f95a3c7ce16fd26c4300e957269741eff5 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 18 Nov 2022 06:46:05 +0000
Subject: [PATCH 157/360] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E6=8C=87?=
 =?UTF-8?q?=E5=B1=8F=E5=B9=95=E6=BB=91=E5=8A=A8=E5=AF=BC=E8=87=B4=E9=BB=91?=
 =?UTF-8?q?=E5=B1=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 frameworks/napi/input_monitor/src/js_input_monitor.cpp | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 frameworks/napi/input_monitor/src/js_input_monitor.cpp

diff --git a/frameworks/napi/input_monitor/src/js_input_monitor.cpp b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
old mode 100755
new mode 100644
-- 
Gitee


From ba65e4c0474020642557a5266a945a87c59c83d7 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Fri, 18 Nov 2022 18:58:26 +0800
Subject: [PATCH 158/360] =?UTF-8?q?=E4=BF=AE=E6=94=B9tools=E4=B8=AD?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
Change-Id: I62762fcad5e0b8ff63ef0698ff8151348ee8cefb
---
 tools/vuinput/src/mmi_virtual_device_main.cpp | 2 +-
 tools/vuinput/src/virtual_device.cpp          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/vuinput/src/mmi_virtual_device_main.cpp b/tools/vuinput/src/mmi_virtual_device_main.cpp
index 836307fca6..a2ca4338b7 100644
--- a/tools/vuinput/src/mmi_virtual_device_main.cpp
+++ b/tools/vuinput/src/mmi_virtual_device_main.cpp
@@ -22,7 +22,7 @@ int32_t main(int32_t argc, const char *argv[])
         return 0;
     }
     if (access(OHOS::MMI::g_folderPath.c_str(), F_OK) != 0) {
-        MMI_HILOGW("Directory %{public}s did not exist, errno: %{public}d", g_folderPath.c_str(), errno);
+        std::cout << "Directory " << OHOS::MMI::g_folderPath.c_str() << " did not exist, errno: " << errno << std::endl;
         mkdir(OHOS::MMI::g_folderPath.c_str(), SYMBOL_FOLDER_PERMISSIONS);
     }
     std::vector<std::string> argvList;
diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index 8d5abdde10..b2a8d00c14 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -300,6 +300,7 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
     const std::string filePath = processPath + "cmdline";
     std::string temp;
     std::string processName;
+    DIR *dir = nullptr;
     if (!CheckFileName(fileName)) {
         std::cout << "File name check error" << std::endl;
         goto RELEASE_RES;
@@ -308,7 +309,6 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
         std::cout << "Failed to create file" << std::endl;
         goto RELEASE_RES;
     }
-    DIR *dir = nullptr;
     dir = opendir(processPath.c_str());
     if (dir == nullptr) {
         std::cout << "Useless flag file:" << processPath << std::endl;
-- 
Gitee


From 25b6a4f6de9b23a3bd31b9e8f0c16c20057a5a88 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Sat, 19 Nov 2022 10:44:59 +0800
Subject: [PATCH 159/360] volumn down+power start capturing screen, conflict
 resolved

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I8155ba65032c427fc2f20083b6ea9df4b7c13cac
---
 .../key_command/include/key_command_handler.h |  8 +------
 .../key_command/src/key_command_handler.cpp   | 24 ++++++++++---------
 .../include/key_subscriber_handler.h          |  2 +-
 .../subscriber/src/key_subscriber_handler.cpp | 13 +++++-----
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/service/key_command/include/key_command_handler.h b/service/key_command/include/key_command_handler.h
index f2758de8df..d0bedb5d11 100755
--- a/service/key_command/include/key_command_handler.h
+++ b/service/key_command/include/key_command_handler.h
@@ -34,12 +34,6 @@
 
 namespace OHOS {
 namespace MMI {
-enum SpecialType {
-    SPECIAL_ALL = 0,
-    SUBSCRIBER_BEFORE_DELAY = 1,
-    KEY_DOWN_ACTION = 2
-};
-
 struct Ability {
     std::string bundleName;
     std::string abilityName;
@@ -110,7 +104,7 @@ private:
     bool HandleSequences(const std::shared_ptr<KeyEvent> keyEvent);
     bool HandleShortKeys(const std::shared_ptr<KeyEvent> keyEvent);
     bool AddSequenceKey(const std::shared_ptr<KeyEvent> keyEvent);
-    void RemoveSubscriberFrontTimer(int32_t keyCode);
+    void RemoveSubscribedTimer(int32_t keyCode);
     void HandleSpecialKeys(int32_t keyCode, int32_t keyAction);
     void InterruptTimers();
     void ResetLastMatchedKey()
diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index d690065ffe..7be75d7b5d 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -45,6 +45,11 @@ const std::map<int32_t, SpecialType> SPECIAL_KEYS = {
     { KeyEvent::KEYCODE_VOLUME_DOWN, SpecialType::SPECIAL_ALL },
     { KeyEvent::KEYCODE_VOLUME_UP, SpecialType::SUBSCRIBER_BEFORE_DELAY }
 };
+enum SpecialType {
+    SPECIAL_ALL = 0,
+    SUBSCRIBER_BEFORE_DELAY = 1,
+    KEY_DOWN_ACTION = 2
+};
 struct JsonParser {
     JsonParser() = default;
     ~JsonParser()
@@ -66,10 +71,7 @@ bool IsSpecialType(int32_t keyCode, SpecialType type)
     if (it == SPECIAL_KEYS.end()) {
         return false;
     }
-    if (it->second != SpecialType::SPECIAL_ALL && it->second != type) {
-        return false;
-    }
-    return true;
+    return (it->second == SpecialType::SPECIAL_ALL || it->second == type);
 }
 
 bool GetPreKeys(const cJSON* jsonData, ShortcutKey &shortcutKey)
@@ -664,9 +666,9 @@ bool KeyCommandHandler::OnHandleEvent(const std::shared_ptr<KeyEvent> key)
         isParseConfig_ = true;
     }
 
-    bool isHandleShortKey = HandleShortKeys(key);
-    bool isHandleSequences = HandleSequences(key);
-    if (isHandleShortKey || isHandleSequences) {
+    bool isHandled = HandleShortKeys(key);
+    bool isHandled = HandleSequences(key) || isHandled;
+    if (isHandled) {
         return true;
     }
 
@@ -695,7 +697,7 @@ bool KeyCommandHandler::OnHandleEvent(const std::shared_ptr<KeyEvent> key)
             timerIds.push_back(timerId);
             auto it = specialTimers_.emplace(key->GetKeyCode(), timerIds);
             if (!it.second) {
-                MMI_HILOGE("Emplace duplicated");
+                MMI_HILOGE("Keycode duplicated");
                 return false;
             }
         } else {
@@ -791,7 +793,7 @@ bool KeyCommandHandler::HandleSequences(const std::shared_ptr<KeyEvent> keyEvent
                 HandleSpecialKeys(item.keyCode, item.keyAction);
             }
             InputHandler->GetSubscriberHandler()->RemoveSubscriberKeyUpTimer(item.keyCode);
-            RemoveSubscriberFrontTimer(item.keyCode);
+            RemoveSubscribedTimer(item.keyCode);
         }
     }
 
@@ -1027,7 +1029,7 @@ void ShortcutKey::Print() const
         finalKey, ability.bundleName.c_str());
 }
 
-void KeyCommandHandler::RemoveSubscriberFrontTimer(int32_t keyCode)
+void KeyCommandHandler::RemoveSubscribedTimer(int32_t keyCode)
 {
     CALL_DEBUG_ENTER;
     auto iter = specialTimers_.find(keyCode);
@@ -1055,7 +1057,7 @@ void KeyCommandHandler::HandleSpecialKeys(int32_t keyCode, int32_t keyAction)
         if (iter == specialKeys_.end()) {
             auto it = specialKeys_.emplace(keyCode, keyAction);
             if (!it.second) {
-                MMI_HILOGD("Add keyCode failed");
+                MMI_HILOGD("KeyCode duplicated");
                 return;
             }
         }
diff --git a/service/subscriber/include/key_subscriber_handler.h b/service/subscriber/include/key_subscriber_handler.h
index ef32e1534a..0f87d54043 100644
--- a/service/subscriber/include/key_subscriber_handler.h
+++ b/service/subscriber/include/key_subscriber_handler.h
@@ -81,7 +81,7 @@ private:
     void RemoveKeyCode(int32_t keyCode, std::vector<int32_t> &keyCodes);
     bool IsRepeatedKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
     bool IsNotifyPowerKeySubsciber(int32_t keyCode, const std::vector<int32_t> &keyCodes);
-    void StartKeyUpNotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
+    void HandleKeyUpWithDelay(std::shared_ptr<KeyEvent> keyEvent,
                                     const std::shared_ptr<Subscriber> &subscriber);
     void PrintKeyUpLog(const std::shared_ptr<Subscriber> &subscriber);
 
diff --git a/service/subscriber/src/key_subscriber_handler.cpp b/service/subscriber/src/key_subscriber_handler.cpp
index 32033f0186..709359f9e8 100644
--- a/service/subscriber/src/key_subscriber_handler.cpp
+++ b/service/subscriber/src/key_subscriber_handler.cpp
@@ -387,7 +387,7 @@ bool KeySubscriberHandler::HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent
         auto duration = keyOption->GetFinalKeyDownDuration();
         if (duration <= 0) {
             MMI_HILOGD("duration <= 0");
-            StartKeyUpNotifySubscriber(keyEvent, subscriber);
+            HandleKeyUpWithDelay(keyEvent, subscriber);
             handled = true;
             continue;
         }
@@ -401,7 +401,7 @@ bool KeySubscriberHandler::HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent
             continue;
         }
         MMI_HILOGD("upTime - downTime < duration");
-        StartKeyUpNotifySubscriber(keyEvent, subscriber);
+        HandleKeyUpWithDelay(keyEvent, subscriber);
         handled = true;
     }
     MMI_HILOGD("%{public}s", handled ? "true" : "false");
@@ -489,17 +489,15 @@ bool KeySubscriberHandler::IsNotifyPowerKeySubsciber(int32_t keyCode, const std:
         return true;
     }
 
-    bool isVolumePress = true;
     for (const auto& pressedKey: keyCodes) {
         if (pressedKey == KeyEvent::KEYCODE_VOLUME_DOWN || pressedKey == KeyEvent::KEYCODE_VOLUME_UP) {
-            isVolumePress = false;
-            break;
+            return false;
         }
     }
-    return isVolumePress;
+    return true;
 }
 
-void KeySubscriberHandler::StartKeyUpNotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
+void KeySubscriberHandler::HandleKeyUpWithDelay(std::shared_ptr<KeyEvent> keyEvent,
                                                       const std::shared_ptr<Subscriber> &subscriber)
 {
     auto keyUpDelay = subscriber->keyOption_->GetFinalKeyUpDelay();
@@ -514,6 +512,7 @@ void KeySubscriberHandler::StartKeyUpNotifySubscriber(std::shared_ptr<KeyEvent>
 
 void KeySubscriberHandler::PrintKeyUpLog(const std::shared_ptr<Subscriber> &subscriber)
 {
+    CHKPV(subscriber);
     auto &keyOption = subscriber->keyOption_;
     MMI_HILOGD("subscribeId:%{public}d, keyOption->finalKey:%{public}d,"
         "keyOption->isFinalKeyDown:%{public}s, keyOption->finalKeyDownDuration:%{public}d,"
-- 
Gitee


From 232bcc991ebae853c0e0db0833f2163381ebc045 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Thu, 17 Nov 2022 09:38:11 +0000
Subject: [PATCH 160/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I4db442a88de0ad330bb499fa75aea6a30e610b65
---
 .../include/input_windows_manager.h           |  3 +-
 .../src/input_windows_manager.cpp             | 43 ++++++++++++++++---
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
index 4f971dddfe..a4d992197a 100644
--- a/service/window_manager/include/input_windows_manager.h
+++ b/service/window_manager/include/input_windows_manager.h
@@ -39,7 +39,7 @@ class InputWindowsManager final {
 public:
     DISALLOW_COPY_AND_MOVE(InputWindowsManager);
     void Init(UDSServer& udsServer);
-    int32_t GetClientFd(std::shared_ptr<PointerEvent> pointerEvent) const;
+    int32_t GetClientFd(std::shared_ptr<PointerEvent> pointerEvent);
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     int32_t GetPidAndUpdateTarget(std::shared_ptr<InputEvent> inputEvent);
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
@@ -141,6 +141,7 @@ private:
 #endif // OHOS_BUILD_ENABLE_POINTER
     DisplayGroupInfo displayGroupInfo_;
     MouseLocation mouseLocation_ = { -1, -1 };
+    std::map<int32_t, WindowInfo> touchItemDownInfos_;
 };
 
 #define WinMgr ::OHOS::DelayedSingleton<InputWindowsManager>::GetInstance()
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index b6dc785c0f..c061155c5e 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -49,7 +49,7 @@ void InputWindowsManager::Init(UDSServer& udsServer)
 #endif // OHOS_BUILD_ENABLE_POINTER
 }
 
-int32_t InputWindowsManager::GetClientFd(std::shared_ptr<PointerEvent> pointerEvent) const
+int32_t InputWindowsManager::GetClientFd(std::shared_ptr<PointerEvent> pointerEvent)
 {
     CALL_DEBUG_ENTER;
     CHKPR(pointerEvent, INVALID_FD);
@@ -60,9 +60,21 @@ int32_t InputWindowsManager::GetClientFd(std::shared_ptr<PointerEvent> pointerEv
             break;
         }
     }
-    CHKPR(windowInfo, INVALID_FD);
+    
     CHKPR(udsServer_, INVALID_FD);
-    return udsServer_->GetClientFd(windowInfo->pid);
+    if (windowInfo != nullptr) {
+        return udsServer_->GetClientFd(windowInfo->pid);
+    }
+    if (pointerEvent->GetPointerAction() != PointerEvent::POINTER_ACTION_CANCEL) {
+        return udsServer_->GetClientFd(-1);
+    }
+    int32_t pid = -1;
+    auto iter = touchItemDownInfos_.find(pointerEvent->GetPointerId());
+    if (iter != touchItemDownInfos_.end()) {
+        pid = iter->second.pid;
+        touchItemDownInfos_.erase(iter);
+    }
+    return udsServer_->GetClientFd(pid);
 }
 
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
@@ -925,9 +937,16 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
         }
     }
     if (touchWindow == nullptr) {
-        MMI_HILOGE("The touchWindow is nullptr, logicalX:%{public}d, logicalY:%{public}d",
-            logicalX, logicalY);
-        return RET_ERR;
+        auto it = touchItemDownInfos_.find(pointerId);
+        if (it == touchItemDownInfos_.end() ||
+            pointerEvent->GetPointerAction() == PointerEvent::POINTER_ACTION_DOWN) {
+            MMI_HILOGE("The touchWindow is nullptr, logicalX:%{public}d, logicalY:%{public}d",
+                logicalX, logicalY);
+            return RET_ERR;
+        }
+        touchWindow = &it->second;
+        pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_CANCEL);
+        MMI_HILOGD("touch event send cancel, window:%{public}d", touchWindow->id);
     }
     auto windowX = logicalX - touchWindow->area.x;
     auto windowY = logicalY - touchWindow->area.y;
@@ -950,6 +969,18 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
         DispatchPointer(PointerEvent::POINTER_ACTION_LEAVE_WINDOW);
         IPointerDrawingManager::GetInstance()->SetMouseDisplayState(false);
     }
+
+    int32_t pointerAction = pointerEvent->GetPointerAction();
+    if (pointerAction == PointerEvent::POINTER_ACTION_DOWN) {
+        touchItemDownInfos_.insert(std::make_pair(pointerId, *touchWindow));
+    }
+    if (pointerAction == PointerEvent::POINTER_ACTION_UP) {
+        auto iter = touchItemDownInfos_.find(pointerId);
+        if (iter != touchItemDownInfos_.end()) {
+            touchItemDownInfos_.erase(iter);
+            MMI_HILOGD("Clear the touch info, action is up, pointerid:%{public}d", pointerId);
+        }
+    }
     return ERR_OK;
 }
 #endif // OHOS_BUILD_ENABLE_TOUCH
-- 
Gitee


From c734861590ba9f23b2d7f8a44ad4672f39564949 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Sat, 19 Nov 2022 03:10:11 +0000
Subject: [PATCH 161/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I811410712307912476bd42b909b21a0873ec7931
---
 .../include/input_windows_manager.h           |  2 +
 .../src/input_windows_manager.cpp             | 53 ++++++++++++++++---
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
index a4d992197a..c221b1044a 100644
--- a/service/window_manager/include/input_windows_manager.h
+++ b/service/window_manager/include/input_windows_manager.h
@@ -126,6 +126,7 @@ private:
     bool IsInsideDisplay(const DisplayInfo& displayInfo, int32_t physicalX, int32_t physicalY);
     void FindPhysicalDisplay(const DisplayInfo& displayInfo, int32_t& physicalX,
         int32_t& physicalY, int32_t& displayId);
+    void InitMouseDownInfo();
 #endif // OHOS_BUILD_ENABLE_POINTER
     void CheckFocusWindowChange(const DisplayGroupInfo &displayGroupInfo);
     void CheckZorderWindowChange(const DisplayGroupInfo &displayGroupInfo);
@@ -138,6 +139,7 @@ private:
     WindowInfo lastWindowInfo_;
     std::shared_ptr<PointerEvent> lastPointerEvent_ { nullptr };
     std::map<int32_t, std::map<int32_t, int32_t>> pointerStyle_;
+    WindowInfo mouseDownInfo_;
 #endif // OHOS_BUILD_ENABLE_POINTER
     DisplayGroupInfo displayGroupInfo_;
     MouseLocation mouseLocation_ = { -1, -1 };
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index ee9d243c90..d9a0f0d115 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -46,9 +46,20 @@ void InputWindowsManager::Init(UDSServer& udsServer)
     CHKPV(udsServer_);
 #ifdef OHOS_BUILD_ENABLE_POINTER
     udsServer_->AddSessionDeletedCallback(std::bind(&InputWindowsManager::OnSessionLost, this, std::placeholders::_1));
+    InitMouseDownInfo();
 #endif // OHOS_BUILD_ENABLE_POINTER
 }
 
+#ifdef OHOS_BUILD_ENABLE_POINTER
+void InputWindowsManager::InitMouseDownInfo()
+{
+    mouseDownInfo_.id = -1;
+    mouseDownInfo_.pid = -1;
+    mouseDownInfo_.defaultHotAreas.clear();
+    mouseDownInfo_.pointerHotAreas.clear();
+}
+#endif // OHOS_BUILD_ENABLE_POINTER
+
 int32_t InputWindowsManager::GetClientFd(std::shared_ptr<PointerEvent> pointerEvent)
 {
     CALL_DEBUG_ENTER;
@@ -69,11 +80,20 @@ int32_t InputWindowsManager::GetClientFd(std::shared_ptr<PointerEvent> pointerEv
         return udsServer_->GetClientFd(-1);
     }
     int32_t pid = -1;
-    auto iter = touchItemDownInfos_.find(pointerEvent->GetPointerId());
-    if (iter != touchItemDownInfos_.end()) {
-        pid = iter->second.pid;
-        touchItemDownInfos_.erase(iter);
+    if (pointerEvent->GetSourceType() == PointerEvent::SOURCE_TYPE_TOUCHSCREEN) {
+        auto iter = touchItemDownInfos_.find(pointerEvent->GetPointerId());
+        if (iter != touchItemDownInfos_.end()) {
+            pid = iter->second.pid;
+            touchItemDownInfos_.erase(iter);
+        }
     }
+    if (pointerEvent->GetSourceType() == PointerEvent::SOURCE_TYPE_MOUSE) {
+        if (mouseDownInfo_.pid != -1) {
+            pid = mouseDownInfo_.pid;
+            InitMouseDownInfo();
+        }
+    }
+    
     return udsServer_->GetClientFd(pid);
 }
 
@@ -376,12 +396,19 @@ void InputWindowsManager::NotifyPointerToWindow()
         lastWindowInfo_ = *windowInfo;
         return;
     }
+    bool isFindLastWindow = false;
     for (const auto &item : displayGroupInfo_.windowsInfo) {
         if (item.id == lastWindowInfo_.id) {
             DispatchPointer(PointerEvent::POINTER_ACTION_LEAVE_WINDOW);
+            isFindLastWindow = true;
             break;
         }
     }
+    if (!isFindLastWindow) {
+        if (udsServer_ != nullptr && udsServer_->GetClientFd(lastWindowInfo_.pid) != INVALID_FD) {
+            DispatchPointer(PointerEvent::POINTER_ACTION_LEAVE_WINDOW);
+        }
+    }
     lastWindowInfo_ = *windowInfo;
     DispatchPointer(PointerEvent::POINTER_ACTION_ENTER_WINDOW);
 }
@@ -845,8 +872,13 @@ int32_t InputWindowsManager::UpdateMouseTarget(std::shared_ptr<PointerEvent> poi
     }
     auto touchWindow = SelectWindowInfo(logicalX, logicalY, pointerEvent);
     if (!touchWindow) {
-        MMI_HILOGE("touchWindow is nullptr, targetWindow:%{public}d", pointerEvent->GetTargetWindowId());
-        return RET_ERR;
+        if (pointerEvent->GetPointerAction() == PointerEvent::POINTER_ACTION_BUTTON_DOWN || mouseDownInfo_.id == -1) {
+            MMI_HILOGE("touchWindow is nullptr, targetWindow:%{public}d", pointerEvent->GetTargetWindowId());
+            return RET_ERR;
+        }
+        touchWindow = std::make_optional(mouseDownInfo_);
+        pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_CANCEL);
+        MMI_HILOGD("mouse event send cancel, window:%{public}d", touchWindow->id);
     }
     int32_t mouseStyle = -1;
     int32_t ret = GetPointerStyle(touchWindow->pid, touchWindow->id, mouseStyle);
@@ -874,7 +906,14 @@ int32_t InputWindowsManager::UpdateMouseTarget(std::shared_ptr<PointerEvent> poi
 #ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
     UpdatePointerEvent(logicalX, logicalY, pointerEvent, *touchWindow);
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
-
+    int32_t action = pointerEvent->GetPointerAction();
+    if (action == PointerEvent::POINTER_ACTION_BUTTON_DOWN) {
+        mouseDownInfo_ = *touchWindow;
+    }
+    if (action == PointerEvent::POINTER_ACTION_BUTTON_UP) {
+        InitMouseDownInfo();
+        MMI_HILOGD("Mouse up, clear mouse down info");
+    }
     MMI_HILOGD("pid:%{public}d,id:%{public}d,agentWindowId:%{public}d,"
                "logicalX:%{public}d,logicalY:%{public}d,"
                "displayX:%{public}d,displayY:%{public}d,windowX:%{public}d,windowY:%{public}d",
-- 
Gitee


From 1a45e63bf3363535aa1f9213f20f8304e770412f Mon Sep 17 00:00:00 2001
From: zhouhaifeng <kutcher.zhou@huawei.com>
Date: Mon, 21 Nov 2022 12:05:16 +0800
Subject: [PATCH 162/360] replace HiSysEvent::Write with HiSysEventWrite

Signed-off-by: zhouhaifeng <kutcher.zhou@huawei.com>
---
 service/dfx/src/dfx_hisysevent.cpp | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/service/dfx/src/dfx_hisysevent.cpp b/service/dfx/src/dfx_hisysevent.cpp
index 5b6c7d160b..62ebb0d566 100644
--- a/service/dfx/src/dfx_hisysevent.cpp
+++ b/service/dfx/src/dfx_hisysevent.cpp
@@ -43,7 +43,7 @@ void DfxHisysevent::OnDeviceConnect(int32_t id, OHOS::HiviewDFX::HiSysEvent::Eve
         name = "INPUT_DEV_CONNECTION_SUCCESS";
     }
     if (id == INT32_MAX) {
-        int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+        int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             name,
             type,
@@ -52,7 +52,7 @@ void DfxHisysevent::OnDeviceConnect(int32_t id, OHOS::HiviewDFX::HiSysEvent::Eve
             MMI_HILOGE("HiviewDFX Write failed, ret:%{public}d", ret);
         }
     } else {
-        int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+        int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             name,
             type,
@@ -70,7 +70,7 @@ void DfxHisysevent::OnDeviceConnect(int32_t id, OHOS::HiviewDFX::HiSysEvent::Eve
 void DfxHisysevent::OnDeviceDisconnect(int32_t id, OHOS::HiviewDFX::HiSysEvent::EventType type)
 {
     if (id == INVALID_DEVICE_ID) {
-        int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+        int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             "INPUT_DEV_DISCONNECTION_FAILURE",
             type,
@@ -81,7 +81,7 @@ void DfxHisysevent::OnDeviceDisconnect(int32_t id, OHOS::HiviewDFX::HiSysEvent::
     } else {
         std::shared_ptr dev = InputDevMgr->GetInputDevice(id);
         CHKPV(dev);
-        int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+        int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             "INPUT_DEV_DISCONNECTION_SUCCESS",
             type,
@@ -99,7 +99,7 @@ void DfxHisysevent::OnDeviceDisconnect(int32_t id, OHOS::HiviewDFX::HiSysEvent::
 void DfxHisysevent::OnClientConnect(const ClientConnectData &data, OHOS::HiviewDFX::HiSysEvent::EventType type)
 {
     if (type == OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR) {
-        int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+        int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             "CLIENT_CONNECTION_SUCCESS",
             type,
@@ -113,7 +113,7 @@ void DfxHisysevent::OnClientConnect(const ClientConnectData &data, OHOS::HiviewD
             MMI_HILOGE("HiviewDFX Write failed, ret:%{public}d", ret);
         }
     } else {
-        int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+        int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             "CLIENT_CONNECTION_FAILURE",
             type,
@@ -133,7 +133,7 @@ void DfxHisysevent::OnClientDisconnect(const SessionPtr& secPtr, int32_t fd,
 {
     CHKPV(secPtr);
     if (type == OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR) {
-        int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+        int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             "CLIENT_DISCONNECTION_SUCCESS",
             type,
@@ -148,7 +148,7 @@ void DfxHisysevent::OnClientDisconnect(const SessionPtr& secPtr, int32_t fd,
         }
     } else {
         if (secPtr == nullptr) {
-            int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+            int32_t ret = HiSysEventWrite(
                 OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
                 "CLIENT_DISCONNECTION_FAILURE",
                 type,
@@ -157,7 +157,7 @@ void DfxHisysevent::OnClientDisconnect(const SessionPtr& secPtr, int32_t fd,
                 MMI_HILOGE("HiviewDFX Write failed, ret:%{public}d", ret);
             }
         } else {
-            int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+            int32_t ret = HiSysEventWrite(
                 OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
                 "CLIENT_DISCONNECTION_FAILURE",
                 type,
@@ -174,7 +174,7 @@ void DfxHisysevent::OnUpdateTargetPointer(std::shared_ptr<PointerEvent> pointer,
 {
     CHKPV(pointer);
     if (type == OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR) {
-        int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+        int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             "TARGET_POINTER_EVENT_SUCCESS",
             type,
@@ -188,7 +188,7 @@ void DfxHisysevent::OnUpdateTargetPointer(std::shared_ptr<PointerEvent> pointer,
             MMI_HILOGE("HiviewDFX Write failed, ret:%{public}d", ret);
         }
     } else {
-        int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+        int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             "TARGET_POINTER_EVENT_FAILURE",
             OHOS::HiviewDFX::HiSysEvent::EventType::FAULT,
@@ -205,7 +205,7 @@ void DfxHisysevent::OnUpdateTargetKey(std::shared_ptr<KeyEvent> key, int32_t fd,
 {
     CHKPV(key);
     if (type == OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR) {
-        int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+        int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             "TARGET_KEY_EVENT_SUCCESS",
             type,
@@ -225,7 +225,7 @@ void DfxHisysevent::OnUpdateTargetKey(std::shared_ptr<KeyEvent> key, int32_t fd,
             MMI_HILOGE("HiviewDFX Write failed, ret:%{public}d", ret);
         }
     } else {
-        int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+        int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             "TARGET_KEY_EVENT_FAILURE",
             type,
@@ -246,7 +246,7 @@ void DfxHisysevent::OnUpdateTargetKey(std::shared_ptr<KeyEvent> key, int32_t fd,
 void DfxHisysevent::OnFocusWindowChanged(int32_t oldFocusWindowId, int32_t newFocusWindowId,
     int32_t oldFocusWindowPid, int32_t newFocusWindowPid)
 {
-    int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+    int32_t ret = HiSysEventWrite(
         OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
         "FOCUS_WINDOW_CHANGE",
         OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR,
@@ -263,7 +263,7 @@ void DfxHisysevent::OnFocusWindowChanged(int32_t oldFocusWindowId, int32_t newFo
 void DfxHisysevent::OnZorderWindowChanged(int32_t oldZorderFirstWindowId, int32_t newZorderFirstWindowId,
     int32_t oldZorderFirstWindowPid, int32_t newZorderFirstWindowPid)
 {
-    int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+    int32_t ret = HiSysEventWrite(
         OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
         "Z_ORDER_WINDOW_CHANGE",
         OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR,
@@ -279,7 +279,7 @@ void DfxHisysevent::OnZorderWindowChanged(int32_t oldZorderFirstWindowId, int32_
 
 void DfxHisysevent::ApplicationBlockInput(const SessionPtr& sess)
 {
-    int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+    int32_t ret = HiSysEventWrite(
         OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
         "APPLICATION_BLOCK_INPUT",
         OHOS::HiviewDFX::HiSysEvent::EventType::FAULT,
@@ -332,7 +332,7 @@ void DfxHisysevent::CalcPointerDispTimes()
 void DfxHisysevent::ReportDispTimes()
 {
     if (dispCastTime_.totalTimes >= REPORT_DISPATCH_TIMES) {
-        int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+        int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             "INPUT_DISPATCH_TIME",
             OHOS::HiviewDFX::HiSysEvent::EventType::STATISTIC,
@@ -373,7 +373,7 @@ void DfxHisysevent::CalcComboStartTimes(const int32_t keyDownDuration)
 void DfxHisysevent::ReportComboStartTimes()
 {
     if (comboStartCastTime_.totalTimes >= REPORT_COMBO_START_TIMES) {
-        int32_t ret = OHOS::HiviewDFX::HiSysEvent::Write(
+        int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             "COMBO_START_TIME",
             OHOS::HiviewDFX::HiSysEvent::EventType::STATISTIC,
-- 
Gitee


From 8c7dc3caba2608968a7742bb4b6f1a75756d05c2 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 21 Nov 2022 17:57:39 +0800
Subject: [PATCH 163/360] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=B4=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Id725a149ad3fbd5ba02cbd358fdc71c4578fc0dd
---
 service/module_loader/src/mmi_service.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index ec4311c2ee..fd72a205da 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -593,6 +593,10 @@ int32_t MMIService::OnGetDevice(int32_t pid, int32_t userData, int32_t deviceId)
         << inputDevice->GetBus() << inputDevice->GetProduct() << inputDevice->GetVendor()
         << inputDevice->GetVersion() << inputDevice->GetPhys() << inputDevice->GetUniq()
         << inputDevice->GetAxisInfo().size();
+    for (auto &axis : inputDevice->GetAxisInfo()) {
+        pkt << axis.GetAxisType() << axis.GetMinimum() << axis.GetMaximum()
+            << axis.GetFuzz() << axis.GetFlat() << axis.GetResolution();
+    }
     if (pkt.ChkRWError()) {
         MMI_HILOGE("Packet write input device info failed");
         return RET_ERR;
-- 
Gitee


From 4072f2a0a217c994a23f68415014c0e2daa792fe Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 21 Nov 2022 19:32:17 +0800
Subject: [PATCH 164/360] =?UTF-8?q?=E5=A2=9E=E5=8A=A0sourcetype?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I15b51c50939b204a6f71b17a107342d4a70ed309
---
 frameworks/napi/input_device/src/js_util.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frameworks/napi/input_device/src/js_util.cpp b/frameworks/napi/input_device/src/js_util.cpp
index cad5926453..425d39aae1 100644
--- a/frameworks/napi/input_device/src/js_util.cpp
+++ b/frameworks/napi/input_device/src/js_util.cpp
@@ -119,6 +119,10 @@ bool JsUtil::GetDeviceAxisInfo(const std::unique_ptr<CallbackInfo> &cb, napi_val
             break;
         }
     }
+    if (sourceType == nullptr) {
+        MMI_HILOGD("SourceType not found");
+        return true;
+    }
     napi_value axisRanges = nullptr;
     CHKRF(napi_create_array(cb->env, &axisRanges), CREATE_ARRAY);
     napi_value axisRange = nullptr;
-- 
Gitee


From f6e0536a49a09de0d0fb7a273a02c03bec20a8fd Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Mon, 21 Nov 2022 12:43:54 +0000
Subject: [PATCH 165/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: Ide76be4e47a4e120a5adcf229a48031f3b051867
---
 util/socket/src/uds_session.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/util/socket/src/uds_session.cpp b/util/socket/src/uds_session.cpp
index e0bdeaa65f..1f6f749852 100644
--- a/util/socket/src/uds_session.cpp
+++ b/util/socket/src/uds_session.cpp
@@ -71,7 +71,6 @@ bool UDSSession::SendMsg(const char *buf, size_t size) const
         if (count < 0) {
             if (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK) {
                 MMI_HILOGW("Continue for errno EAGAIN|EINTR|EWOULDBLOCK, errno:%{public}d", errno);
-                usleep(SEND_RETRY_SLEEP_TIME);
                 continue;
             }
             MMI_HILOGE("Send return failed,error:%{public}d fd:%{public}d", errno, fd_);
-- 
Gitee


From 86ddd6a7e7515a2ad94dda8eb760043939581a45 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 22 Nov 2022 09:13:43 +0800
Subject: [PATCH 166/360] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I7f5a98afdd48c540184b40a8537b6b9e72ca1b1e
---
 BUILD.gn                                 |  1 -
 util/BUILD.gn                            | 43 -----------
 util/common/include/run_shell_util.h     | 43 -----------
 util/common/src/run_shell_util.cpp       | 90 ------------------------
 util/common/test/run_shell_util_test.cpp | 87 -----------------------
 5 files changed, 264 deletions(-)
 delete mode 100644 util/common/include/run_shell_util.h
 delete mode 100644 util/common/src/run_shell_util.cpp
 delete mode 100644 util/common/test/run_shell_util_test.cpp

diff --git a/BUILD.gn b/BUILD.gn
index c538301543..9c8e108b89 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -146,7 +146,6 @@ group("mmi_tests") {
     "service:ut-mmi-service-out",
     "test/fuzztest:test",
     "tools/inject_event:InjectEventTest",
-    "util:RunShellUtilTest",
     "util:ut-mmi-util-out",
   ]
 }
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 774ff0baee..ab23e0c249 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -104,46 +104,3 @@ ohos_unittest("ut-mmi-util-out") {
   ]
   external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
 }
-
-ohos_unittest("RunShellUtilTest") {
-  module_out_path = module_output_path
-  include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//third_party/googletest/googletest/include",
-    "//commonlibrary/c_utils/base/include",
-    "${mmi_path}/frameworks/proxy/event_handler",
-    "${mmi_path}/frameworks/proxy/event_handler/include",
-    "${mmi_path}/frameworks/proxy/module_loader",
-    "${mmi_path}/frameworks/proxy/module_loader/include",
-    "${mmi_path}/util/common",
-    "${mmi_path}/util/common/include",
-    "${mmi_path}/util/network",
-    "${mmi_path}/util/network/include",
-    "${mmi_path}/util/socket",
-    "${mmi_path}/util/socket/include",
-    "${mmi_path}/frameworks/proxy/event_handle",
-    "${mmi_path}/frameworks/proxy/event_handle/include",
-    "${mmi_path}/frameworks/proxy/module_loader",
-    "${mmi_path}/frameworks/proxy/module_loader/include",
-    "${mmi_path}/interfaces/native/innerkits/common/include",
-    "${mmi_path}/interfaces/native/innerkits/proxy/include",
-    "${mmi_path}/interfaces/native/innerkits/event/include",
-    "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
-    "$root_out_dir/diff_libinput_mmi/export_include",
-  ]
-
-  defines = input_default_defines
-
-  sources = [ "common/test/run_shell_util_test.cpp" ]
-
-  deps = [
-    "${mmi_path}/frameworks/proxy:libmmi-client",
-    "${mmi_path}/util:libmmi-util",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
-  ]
-  external_deps = [
-    "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
-  ]
-}
diff --git a/util/common/include/run_shell_util.h b/util/common/include/run_shell_util.h
deleted file mode 100644
index 84076f333b..0000000000
--- a/util/common/include/run_shell_util.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef RUN_SHELL_UTIL_H
-#define RUN_SHELL_UTIL_H
-
-#include <regex>
-#include <string>
-#include <vector>
-
-#include "nocopyable.h"
-
-namespace OHOS {
-namespace MMI {
-class RunShellUtil {
-public:
-    RunShellUtil();
-    DISALLOW_COPY_AND_MOVE(RunShellUtil);
-    ~RunShellUtil();
-    int32_t RunShellCommand(const std::string &command, std::vector<std::string> &vLog);
-    int32_t SetLogMaxSize(int32_t logSize);
-
-    static int32_t StringToVectorByRegex(const std::string &log, std::vector<std::string> &vLog, const std::regex &r);
-
-private:
-    FILE *fp_ { nullptr };
-    int32_t logMaxSize_ { 0 };
-};
-} // namespace MMI
-} // namespace OHOS
-#endif // RUN_SHELL_UTIL_H
\ No newline at end of file
diff --git a/util/common/src/run_shell_util.cpp b/util/common/src/run_shell_util.cpp
deleted file mode 100644
index 4f36d83d1c..0000000000
--- a/util/common/src/run_shell_util.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "run_shell_util.h"
-
-#include <cstdio>
-
-#include "define_multimodal.h"
-
-
-namespace OHOS {
-namespace MMI {
-namespace {
-const std::string HILOG_GREP = "hilog -x | grep ";
-constexpr int32_t MAXSIZE = 1000;
-const std::regex REGEX_LOG("\n");
-static inline constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "RUNSHELLUTILL" };
-} // namespace
-
-RunShellUtil::RunShellUtil(): logMaxSize_(100) {}
-
-RunShellUtil::~RunShellUtil() {}
-
-int32_t RunShellUtil::RunShellCommand(const std::string &command, std::vector<std::string> &vLog)
-{
-    CALL_DEBUG_ENTER;
-    vLog.clear();
-    const std::string command_ = HILOG_GREP + "'" + command + "'";
-
-    if ((fp_ = popen(command_.c_str(), "r")) == nullptr) {
-        MMI_HILOGE("Failed to open");
-        fp_ = nullptr;
-        return RET_ERR;
-    }
-    std::string retLog = "";
-    int32_t i = 0;
-    while (logMaxSize_ > i) {
-        char buf[MAXSIZE] = {0};
-        if (fgets(buf, sizeof(buf), fp_) == nullptr) {
-            MMI_HILOGE("Read fp end");
-            retLog.append(std::string(buf));
-            pclose(fp_);
-            fp_ = nullptr;
-            break;
-        }
-        retLog.append(std::string(buf));
-        i++;
-    }
-    if (fp_ != nullptr) {
-        pclose(fp_);
-        fp_ = nullptr;
-    }
-    if (retLog.length() == 0) {
-        MMI_HILOGD("The retLog is empty");
-        return RET_OK;
-    }
-    StringToVectorByRegex(retLog, vLog, REGEX_LOG);
-    return RET_OK;
-}
-
-int32_t RunShellUtil::SetLogMaxSize(int32_t logSize)
-{
-    if (logSize <= 0) {
-        return RET_ERR;
-    }
-    logMaxSize_ = logSize;
-    return RET_OK;
-}
-
-int32_t RunShellUtil::StringToVectorByRegex(const std::string &log, std::vector<std::string> &vLog, const std::regex &r)
-{
-    std::vector<std::string> v(std::sregex_token_iterator(log.begin(), log.end(), r, -1),
-        std::sregex_token_iterator());
-    vLog = v;
-    return RET_OK;
-}
-} // namespace MMI
-} // namespace OHOS
diff --git a/util/common/test/run_shell_util_test.cpp b/util/common/test/run_shell_util_test.cpp
deleted file mode 100644
index b94f5412ce..0000000000
--- a/util/common/test/run_shell_util_test.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <thread>
-#include <vector>
-
-#include <gtest/gtest.h>
-
-#include "define_multimodal.h"
-#include "run_shell_util.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-using namespace testing::ext;
-using namespace OHOS::MMI;
-using namespace OHOS;
-constexpr int32_t SLEEP = 1000;
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "RunShellUtilTest" };
-} // namespace
-
-class RunShellUtilTest : public testing::Test {
-public:
-    static void SetUpTestCase(void) {}
-    static void TearDownTestCase(void)
-    {
-        std::this_thread::sleep_for(std::chrono::milliseconds(SLEEP));
-    }
-    static inline RunShellUtil runCommand;
-};
-
-/**
- * @tc.name:RunShellUtilTest_RunShellCommand_001
- * @tc.desc:Verify run shell command
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(RunShellUtilTest, RunShellUtilTest_RunShellCommand_001, TestSize.Level1)
-{
-    std::string command = "test runshellutil";
-    std::vector<std::string> firstLog;
-    std::this_thread::sleep_for(std::chrono::milliseconds(SLEEP));
-    ASSERT_TRUE(runCommand.RunShellCommand(command, firstLog) == RET_OK);
-    std::this_thread::sleep_for(std::chrono::milliseconds(SLEEP));
-    MMI_HILOGD("Test runshellutilrqr2qrq2");
-    std::vector<std::string> vLog;
-    ASSERT_TRUE(runCommand.RunShellCommand(command, vLog) == RET_OK);
-}
-
-/**
- * @tc.name:RunShellUtilTest_RunShellCommand_002
- * @tc.desc:Verify run shell command
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(RunShellUtilTest, RunShellUtilTest_RunShellCommand_002, TestSize.Level1)
-{
-    std::string command = "test runshellutil";
-    {
-        std::vector<std::string> firstLog;
-        ASSERT_TRUE(runCommand.RunShellCommand(command, firstLog) == RET_OK);
-        std::this_thread::sleep_for(std::chrono::milliseconds(SLEEP));
-        MMI_HILOGD("Test runshellutilrqr2342342355qrq2");
-        std::vector<std::string> vLog;
-        ASSERT_TRUE(runCommand.RunShellCommand(command, vLog) == RET_OK);
-    }
-    std::vector<std::string> firstLog;
-    ASSERT_TRUE(runCommand.RunShellCommand(command, firstLog) == RET_OK);
-    std::this_thread::sleep_for(std::chrono::milliseconds(SLEEP));
-    MMI_HILOGD("Test runshellutilrqr21234www");
-    std::vector<std::string> vLog;
-    ASSERT_TRUE(runCommand.RunShellCommand(command, vLog) == RET_OK);
-}
-} // namespace MMI
-} // namespace OHOS
\ No newline at end of file
-- 
Gitee


From e057556f0ea7721554952a43a24835c841aaf060 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 22 Nov 2022 11:55:37 +0800
Subject: [PATCH 167/360] The help for mmi event injection and vuinput errors
 is needed to know the parameters and usage methods

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I41c8484db8bf6f1ca6808c4040da1bcbab60c162
---
 .../include/injection_event_dispatch.h        |   4 +-
 .../include/injection_tools_help_func.h       |  13 +-
 .../src/injection_event_dispatch.cpp          |  42 ++--
 .../src/injection_tools_help_func.cpp         | 183 +++++++++++++-
 .../src/mmi_event_simulate_main.cpp           |  22 +-
 tools/vuinput/include/virtual_device.h        |   8 +-
 tools/vuinput/include/virtual_device_config.h |   2 +
 tools/vuinput/src/mmi_virtual_device_main.cpp |  24 +-
 tools/vuinput/src/virtual_device.cpp          | 227 ++++++++++++++----
 9 files changed, 415 insertions(+), 110 deletions(-)

diff --git a/tools/event_inject/include/injection_event_dispatch.h b/tools/event_inject/include/injection_event_dispatch.h
index 6fb1eda6e7..9513dd70c8 100644
--- a/tools/event_inject/include/injection_event_dispatch.h
+++ b/tools/event_inject/include/injection_event_dispatch.h
@@ -44,8 +44,9 @@ public:
     int32_t GetDevTypeIndex(int32_t devIndex) const;
     int32_t GetDevIndexType(int32_t devType) const;
     int32_t GetDeviceIndex(const std::string &deviceNameText) const;
+    void SetArgvs(const std::vector<std::string> &injectArgvs);
     std::string GetFunId() const;
-    bool VerifyArgvs(const int32_t &argc, const std::vector<std::string> &argv);
+    bool VerifyArgvs();
     bool RegisterInjectEvent(InjectFunctionMap &msg)
     {
         auto it = injectFuns_.find(msg.id);
@@ -66,7 +67,6 @@ public:
     }
 private:
     std::string funId_ { "" };
-    int32_t argvNum_ { 0 };
     ManageInjectDevice manageInjectDevice_;
     std::vector<std::string> injectArgvs_;
     std::map<std::string, InjectFunction> injectFuns_;
diff --git a/tools/event_inject/include/injection_tools_help_func.h b/tools/event_inject/include/injection_tools_help_func.h
index 51544b93a0..a2087e3217 100644
--- a/tools/event_inject/include/injection_tools_help_func.h
+++ b/tools/event_inject/include/injection_tools_help_func.h
@@ -27,8 +27,19 @@ namespace MMI {
 class InjectionToolsHelpFunc {
 public:
     InjectionToolsHelpFunc() = default;
+    ~InjectionToolsHelpFunc() = default;
     DISALLOW_COPY_AND_MOVE(InjectionToolsHelpFunc);
-    std::string GetHelpText();
+    bool CheckInjectionCommand(int32_t argc, char **argv);
+    bool SelectOptions(int32_t argc, char **argv, int32_t &opt);
+    bool SendEventOption(int32_t argc, char **argv);
+    bool JsonOption(int32_t argc, char **argv);
+    bool HelpOption(int32_t argc, char **argv);
+    bool IsNumberic(const std::string &str);
+    void SetArgvs(int argc, char **argv, const std::string &str);
+    std::vector<std::string> GetArgvs() const;
+    void ShowUsage();
+private:
+    std::vector<std::string> injectArgvs_;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/tools/event_inject/src/injection_event_dispatch.cpp b/tools/event_inject/src/injection_event_dispatch.cpp
index a552961a59..17e9a38030 100644
--- a/tools/event_inject/src/injection_event_dispatch.cpp
+++ b/tools/event_inject/src/injection_event_dispatch.cpp
@@ -36,7 +36,7 @@ constexpr uint32_t SEND_EVENT_DEV_NODE_INDEX = 1;
 constexpr uint32_t SEND_EVENT_TYPE_INDEX = 2;
 constexpr uint32_t SEND_EVENT_CODE_INDEX = 3;
 constexpr uint32_t SEND_EVENT_VALUE_INDEX = 4;
-constexpr int32_t ARGVS_TARGET_INDEX = 1;
+constexpr int32_t ARGVS_TARGET_INDEX = 0;
 constexpr int32_t ARGVS_CODE_INDEX = 2;
 constexpr int32_t JSON_FILE_PATH_INDEX = 1;
 constexpr uint32_t INPUT_TYPE_LENGTH = 3;
@@ -52,6 +52,7 @@ void InjectionEventDispatch::Init()
 
 void InjectionEventDispatch::InitManageFunction()
 {
+    CALL_DEBUG_ENTER;
     InjectFunctionMap funs[] = {
         {"help", std::bind(&InjectionEventDispatch::OnHelp, this)},
         {"sendevent", std::bind(&InjectionEventDispatch::OnSendEvent, this)},
@@ -87,37 +88,31 @@ int32_t InjectionEventDispatch::OnJson()
     return manageInjectDevice_.TransformJsonData(DataInit(jsonBuf, logStatus));
 }
 
+void InjectionEventDispatch::SetArgvs(const std::vector<std::string> &injectArgvs)
+{
+    injectArgvs_ = injectArgvs;
+}
+
 std::string InjectionEventDispatch::GetFunId() const
 {
     return funId_;
 }
 
-bool InjectionEventDispatch::VerifyArgvs(const int32_t &argc, const std::vector<std::string> &argv)
+bool InjectionEventDispatch::VerifyArgvs()
 {
     CALL_DEBUG_ENTER;
-    if (argc < ARGV_VALID || argv.at(ARGVS_TARGET_INDEX).empty()) {
-        MMI_HILOGE("Invalid Input Para, Please Check the validity of the para. errCode:%{public}d", PARAM_INPUT_FAIL);
+    std::string temp = injectArgvs_.at(ARGVS_TARGET_INDEX);
+    if (temp.empty()) {
+        MMI_HILOGE("Invalid Input parameter");
         return false;
     }
-
-    bool result = false;
-    for (const auto &item : injectFuns_) {
-        std::string temp(argv.at(ARGVS_TARGET_INDEX));
-        if (temp == item.first) {
-            funId_ = temp;
-            result = true;
-            break;
-        }
-    }
-    if (result) {
-        injectArgvs_.clear();
-        for (uint64_t i = 1; i < static_cast<uint64_t>(argc); i++) {
-            injectArgvs_.push_back(argv[i]);
-        }
-        argvNum_ = argc - 1;
+    auto it = injectFuns_.find(temp);
+    if (it == injectFuns_.end()) {
+        MMI_HILOGE("Parameter bound function not found");
+        return false;
     }
-
-    return result;
+    funId_ = temp;
+    return true;
 }
 
 void InjectionEventDispatch::Run()
@@ -159,8 +154,7 @@ int32_t InjectionEventDispatch::ExecuteFunction(std::string funId)
 int32_t InjectionEventDispatch::OnHelp()
 {
     InjectionToolsHelpFunc helpFunc;
-    std::string ret = helpFunc.GetHelpText();
-    MMI_HILOGI("%{public}s", ret.c_str());
+    helpFunc.ShowUsage();
     return RET_OK;
 }
 
diff --git a/tools/event_inject/src/injection_tools_help_func.cpp b/tools/event_inject/src/injection_tools_help_func.cpp
index 178fe39eb6..363edb1434 100644
--- a/tools/event_inject/src/injection_tools_help_func.cpp
+++ b/tools/event_inject/src/injection_tools_help_func.cpp
@@ -15,15 +15,190 @@
 
 #include "injection_tools_help_func.h"
 
+#include <getopt.h>
+
+#include <algorithm>
+#include <iostream>
 #include <string>
 
+#include <unistd.h>
+
 namespace OHOS {
 namespace MMI {
-    
-std::string InjectionToolsHelpFunc::GetHelpText()
+namespace {
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InjectionToolsHelpFunc" };
+constexpr int32_t SEND_EVENT_ARGV_COUNTS = 6;
+constexpr int32_t JSON_ARGV_COUNTS = 3;
+constexpr int32_t HELP_ARGV_COUNTS = 2;
+constexpr int32_t SHORT_OPTION_LENGTH = 2;
+} // namespace
+
+bool InjectionToolsHelpFunc::CheckInjectionCommand(int32_t argc, char **argv)
+{
+    CALL_DEBUG_ENTER;
+    int32_t c = -1;
+    if (!SelectOptions(argc, argv, c)) {
+        MMI_HILOGE("Select option failed");
+        return false;
+    }
+    switch (c) {
+        case 'S': {
+            if (!SendEventOption(argc, argv)) {
+                MMI_HILOGE("SendEvent option failed");
+                return false;
+            }
+            break;
+        }
+        case 'J': {
+            if (!JsonOption(argc, argv)) {
+                MMI_HILOGE("Json option failed");
+                return false;
+            }
+            break;
+        }
+        case '?': {
+            if (!HelpOption(argc, argv)) {
+                MMI_HILOGE("Help option failed");
+                return false;
+            }
+            break;
+        }
+        default: {
+            std::cout << "invalid command" << std::endl;
+            return false;
+        }
+    }
+    return true;
+}
+
+bool InjectionToolsHelpFunc::SelectOptions(int32_t argc, char **argv, int32_t &opt)
+{
+    CALL_DEBUG_ENTER;
+    if (argc < SHORT_OPTION_LENGTH) {
+        std::cout << "Please enter options or parameters" << std::endl;
+        return false;
+    }
+    struct option longOptions[] = {
+        {"sendevent", no_argument, NULL, 'S'},
+        {"json", no_argument, NULL, 'J'},
+        {"help", no_argument, NULL, '?'},
+        {NULL, 0, NULL, 0}
+    };
+    std::string inputOptions = argv[optind];
+    if (inputOptions.find('-') == inputOptions.npos) {
+        for (uint32_t i = 0; i < sizeof(longOptions) / sizeof(struct option) - 1; ++i) {
+            if (longOptions[i].name == inputOptions) {
+                opt = longOptions[i].val;
+                optind++;
+                break;
+            }
+        }
+    } else if ((inputOptions.length() != SHORT_OPTION_LENGTH) && (inputOptions[inputOptions.find('-') + 1] != '-')) {
+        std::cout << "More than one short option is not supported" << std::endl;
+        return false;
+    } else {
+        int32_t optionIndex = 0;
+        opt = getopt_long(argc, argv, "SJ?", longOptions, &optionIndex);
+    }
+    if (opt == -1) {
+        std::cout << "Nonstandard input parameters" << std::endl;
+        return false;
+    } 
+    return true;
+}
+
+bool InjectionToolsHelpFunc::SendEventOption(int32_t argc, char **argv)
+{
+    CALL_DEBUG_ENTER;
+    if (argc != SEND_EVENT_ARGV_COUNTS) {
+        std::cout<< "Wrong number of input parameters" << std::endl;
+        return false;
+    }
+    std::string deviceNode = argv[optind];
+    if (deviceNode.empty()) {
+        std::cout << "Device node does not exist: " << deviceNode.c_str() << std::endl;
+        return false;
+    }
+    char realPath[PATH_MAX] = {};
+    if (realpath(deviceNode.c_str(), realPath) == nullptr) {
+        std::cout << "Device node path is error, path: " << deviceNode.c_str() << std::endl;
+        return false;
+    }
+    while (++optind < argc) {
+        std::string deviceInfo = argv[optind];
+        if (!IsNumberic(deviceInfo)) {
+            std::cout << "Parameter is error, element: " << deviceInfo.c_str() << std::endl;
+            return false;
+        }
+    }
+    SetArgvs(argc, argv, "sendevent");
+    return true;
+}
+
+bool InjectionToolsHelpFunc::JsonOption(int32_t argc, char **argv)
+{
+    CALL_DEBUG_ENTER;
+    if (argc < JSON_ARGV_COUNTS) {
+        std::cout<< "Wrong number of input parameters" << std::endl;
+        return false;
+    }
+    std::string jsonFile = argv[optind];
+    char realPath[PATH_MAX] = {};
+    if (realpath(jsonFile.c_str(), realPath) == nullptr) {
+        std::cout << "Json file path is error, path: " << jsonFile.c_str() << std::endl;
+        return false;
+    }
+    std::string jsonBuf = ReadJsonFile(jsonFile);
+    if (jsonBuf.empty()) {
+        return false;
+    }
+    SetArgvs(argc, argv, "json");
+    return true;
+}
+
+bool InjectionToolsHelpFunc::HelpOption(int32_t argc, char **argv)
+{
+    CALL_DEBUG_ENTER;
+    if (argc != HELP_ARGV_COUNTS) {
+        std::cout<< "Wrong number of input parameters" << std::endl;
+        return false;
+    }
+    SetArgvs(argc, argv, "help");
+    return true;
+}
+
+bool InjectionToolsHelpFunc::IsNumberic(const std::string &str)
+{
+    return !str.empty() && std::all_of(str.begin(), str.end(), ::isdigit);
+}
+
+void InjectionToolsHelpFunc::SetArgvs(int32_t argc, char **argv, const std::string &str)
+{
+    injectArgvs_.clear();
+    injectArgvs_.push_back(str);
+    for (int32_t i = SHORT_OPTION_LENGTH; i < argc; ++i) {
+        injectArgvs_.push_back(argv[i]);
+    }
+}
+
+std::vector<std::string> InjectionToolsHelpFunc::GetArgvs() const
+{
+    return injectArgvs_;
+}
+
+void InjectionToolsHelpFunc::ShowUsage()
 {
-    std::string ret = "\n                           Harmony device event injection ...\n\n";
-    return ret;
+    std::cout << "Usage: mmi-event-injection <option> <command> <arg>..." << std::endl;
+    std::cout << "The option are:                                       " << std::endl;
+    std::cout << "commands for sendevent:                               " << std::endl;
+    std::cout << "                                 -inject the original event to the device node" << std::endl;
+    std::cout << "-S <device_node> <type> <code> <value>                " << std::endl;
+    std::cout << "--sendevent <device_node> <type> <code> <value>       " << std::endl;
+    std::cout << "sendevent <device_node> <type> <code> <value>         " << std::endl;
+    std::cout << "commands for json:                                    " << std::endl;
+    std::cout << "  -Inject a json file that writes all action information to the virtual device" << std::endl;
+    std::cout << "-J <file_name>   --json <file_name>   josn <file_name>" << std::endl;
+    std::cout << "-?  --help  help                                      " << std::endl;
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/tools/event_inject/src/mmi_event_simulate_main.cpp b/tools/event_inject/src/mmi_event_simulate_main.cpp
index 209abba813..21280e35ad 100644
--- a/tools/event_inject/src/mmi_event_simulate_main.cpp
+++ b/tools/event_inject/src/mmi_event_simulate_main.cpp
@@ -21,27 +21,25 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, OHOS::MMI::MMI_LOG_DOMAIN, "MmiEventSimulateDemoMain" };
 } // namespace
 
-int32_t main(int32_t argc, const char* argv[])
+int32_t main(int32_t argc, char* argv[])
 {
     using namespace OHOS::MMI;
     do {
         SetThreadName("main");
-        if (argc < ARGV_VALID) {
-            MMI_HILOGI("Invalid Input Para, Please Check the validity of the para! errCode:%d", PARAM_INPUT_FAIL);
-            break;
-        }
-        std::vector<std::string> argvs;
-        for (int32_t i = 0; i < argc; i++) {
-            argvs.push_back(argv[i]);
+        InjectionToolsHelpFunc helpFunc;
+        if (!helpFunc.CheckInjectionCommand(argc, argv)) {
+            MMI_HILOGE("Invalid Input Para, Please Check the validity of the para! errCode:%d", PARAM_INPUT_FAIL);
+            std::cout << "Try './mmi-event-injection --help' for more information" << std::endl;
+            return RET_ERR;
         }
         InjectionEventDispatch injection;
+        injection.SetArgvs(helpFunc.GetArgvs());
         injection.Init();
-        if (!(injection.VerifyArgvs(argc, argvs))) {
-            MMI_HILOGI("Invalid Input Para, Please Check the validity of the para! errCode:%d", PARAM_INPUT_FAIL);
-            break;
+        if (!injection.VerifyArgvs()) {
+            MMI_HILOGE("Parameter and function validation failed");
+            return RET_ERR;
         }
         injection.Run();
     } while (0);
-
     return RET_OK;
 }
diff --git a/tools/vuinput/include/virtual_device.h b/tools/vuinput/include/virtual_device.h
index 4b2225d5c9..6662f42bbf 100644
--- a/tools/vuinput/include/virtual_device.h
+++ b/tools/vuinput/include/virtual_device.h
@@ -30,7 +30,13 @@ public:
     static bool CreateHandle(const std::string& deviceArgv);
     static bool AddDevice(const std::string& startDeviceName);
     static bool CloseDevice(const std::string& closeDeviceName, const std::vector<std::string>& deviceList);
-    static bool CommandBranch(std::vector<std::string>& argvList);
+    static bool CheckCommand(int32_t argc, char **argv);
+    static bool SelectOptions(int32_t argc, char **argv, int32_t &opt);
+    static bool ListOption(int32_t argc, char **argv);
+    static bool StartOption(int32_t argc, char **argv);
+    static bool CloseOption(int32_t argc, char **argv);
+    static bool HelpOption(int32_t argc, char **argv);
+    static void ShowUsage();
     VirtualDevice(const std::string& deviceName, uint16_t busType, uint16_t vendorId, uint16_t productId);
     DISALLOW_COPY_AND_MOVE(VirtualDevice);
     virtual ~VirtualDevice();
diff --git a/tools/vuinput/include/virtual_device_config.h b/tools/vuinput/include/virtual_device_config.h
index a05c703eeb..595a1348ad 100644
--- a/tools/vuinput/include/virtual_device_config.h
+++ b/tools/vuinput/include/virtual_device_config.h
@@ -18,7 +18,9 @@
 
 #include <cstdint>
 #include <functional>
+#include <getopt.h>
 #include <iostream>
+#include <string>
 #include <vector>
 #include <map>
 #include <unistd.h>
diff --git a/tools/vuinput/src/mmi_virtual_device_main.cpp b/tools/vuinput/src/mmi_virtual_device_main.cpp
index a2ca4338b7..1f4f094611 100644
--- a/tools/vuinput/src/mmi_virtual_device_main.cpp
+++ b/tools/vuinput/src/mmi_virtual_device_main.cpp
@@ -15,27 +15,11 @@
 
 #include "virtual_device.h"
 
-int32_t main(int32_t argc, const char *argv[])
+int32_t main(int32_t argc, char *argv[])
 {
-    if (argc == 1 || argc > PARAMETERS_NUMBER) {
-        std::cout << "Invalid Input Para, Please Check the validity of the para" << std::endl;
-        return 0;
+    if (!OHOS::MMI::VirtualDevice::CheckCommand(argc, argv)) {
+        std::cout << "Try './vuinput --help' for more information" << std::endl;
+        return -1;
     }
-    if (access(OHOS::MMI::g_folderPath.c_str(), F_OK) != 0) {
-        std::cout << "Directory " << OHOS::MMI::g_folderPath.c_str() << " did not exist, errno: " << errno << std::endl;
-        mkdir(OHOS::MMI::g_folderPath.c_str(), SYMBOL_FOLDER_PERMISSIONS);
-    }
-    std::vector<std::string> argvList;
-    for (uint16_t i = 0; i < argc; i++) {
-        argvList.push_back(argv[i]);
-    }
-    if (!OHOS::MMI::VirtualDevice::CommandBranch(argvList)) {
-        return 0;
-    }
-    static constexpr std::int32_t usleepTime = 1500000;
-    while (true) {
-        usleep(usleepTime);
-    }
-
     return 0;
 }
diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index b2a8d00c14..b361e3b0cf 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -49,6 +49,7 @@ namespace {
 constexpr int32_t FILE_SIZE_MAX = 0x5000;
 constexpr int32_t INVALID_FILE_SIZE = -1;
 constexpr int32_t FILE_POWER = 0777;
+constexpr int32_t SLEEP_TIME = 1500000;
 const std::string PROC_PATH = "/proc";
 const std::string VIRTUAL_DEVICE_NAME = "vuinput";
 const std::string g_pid = std::to_string(getpid());
@@ -120,7 +121,7 @@ static void RemoveDir(const std::string& filePath)
         }
         if (ptr->d_type == DT_REG) {
             std::string rmFile = filePath + ptr->d_name;
-            if (std::remove(rmFile.c_str()) != 0) {
+            if (remove(rmFile.c_str()) != 0) {
                 std::cout << "Remove file:" << rmFile << " failed" << std::endl;
             }
         } else if (ptr->d_type == DT_DIR) {
@@ -303,34 +304,42 @@ bool VirtualDevice::ClearFileResidues(const std::string& fileName)
     DIR *dir = nullptr;
     if (!CheckFileName(fileName)) {
         std::cout << "File name check error" << std::endl;
-        goto RELEASE_RES;
+        goto RELEASE_RES1;
     }
     if (pos == std::string::npos) {
         std::cout << "Failed to create file" << std::endl;
-        goto RELEASE_RES;
+        goto RELEASE_RES1;
+    }
+    if (!IsFileExists(processPath)) {
+        std::cout <<  processPath << " folder does not exist" << std::endl;
+        goto RELEASE_RES1;
     }
     dir = opendir(processPath.c_str());
     if (dir == nullptr) {
         std::cout << "Useless flag file:" << processPath << std::endl;
-        return false;
+        goto RELEASE_RES1;
     }
     temp = ReadUinputToolFile(filePath);
     if (temp.empty()) {
         std::cout << "Temp is empty" << std::endl;
-        goto RELEASE_RES;
+        goto RELEASE_RES2;
     }
     processName.append(temp);
-    if (processName.find(VIRTUAL_DEVICE_NAME.c_str()) != std::string::npos) {
-        if (closedir(dir) != 0) {
-            std::cout << "Close dir:" << processPath << " failed" << std::endl;
-        }
-        return true;
+    if (processName.find(VIRTUAL_DEVICE_NAME.c_str()) == std::string::npos) {
+        std::cout << "Process name is wrong" << std::endl;
+        goto RELEASE_RES2;
     }
-    RELEASE_RES:
+    return true;
+    RELEASE_RES1:
+    if (remove((g_folderPath + fileName).c_str()) != 0) {
+        std::cout << "Remove file failed" << std::endl;
+    }
+    return false;
+    RELEASE_RES2:
     if (closedir(dir) != 0) {
         std::cout << "Close dir failed" << std::endl;
     }
-    if (std::remove((g_folderPath + fileName).c_str()) != 0) {
+    if (remove((g_folderPath + fileName).c_str()) != 0) {
         std::cout << "Remove file failed" << std::endl;
     }
     return false;
@@ -557,9 +566,6 @@ bool VirtualDevice::AddDevice(const std::string& startDeviceName)
         std::cout << "Failed to start device: " << startDeviceName <<std::endl;
         return false;
     }
-    if (!IsFileExists(g_folderPath)) {
-        mkdir(g_folderPath.c_str(), FILE_POWER);
-    }
     std::string symbolFile;
     symbolFile.append(g_folderPath).append(g_pid).append("_").append(startDeviceName);
     std::ofstream flagFile;
@@ -593,8 +599,9 @@ bool VirtualDevice::CloseDevice(const std::string& closeDeviceName, const std::v
     for (const auto &it : deviceList) {
         if (it.find(closeDeviceName) == 0) {
             kill(std::stoi(it), SIGKILL);
-            if (BrowseDirectory(g_folderPath).size() == 0) {
-                RemoveDir(g_folderPath);
+            remove((g_folderPath + it).c_str());
+            if (BrowseDirectory(g_folderPath).empty()) {
+                    RemoveDir(g_folderPath);
             }
             return true;
         }
@@ -603,46 +610,147 @@ bool VirtualDevice::CloseDevice(const std::string& closeDeviceName, const std::v
     return false;
 }
 
-bool VirtualDevice::CommandBranch(std::vector<std::string>& argvList)
+bool VirtualDevice::CheckCommand(int32_t argc, char **argv)
 {
-    std::vector<std::string> deviceList = BrowseDirectory(g_folderPath);
-    if (argvList[1] == "start") {
-        if (argvList.size() != PARAMETERS_NUMBER) {
-            std::cout << "Invalid Input Para, Please Check the validity of the para" << std::endl;
-            return false;
+    int32_t c = -1;
+    if (!SelectOptions(argc, argv, c)) {
+        std::cout << "Select option failed" << std::endl;
+        return false;
+    }
+    if (!IsFileExists(g_folderPath)) {
+        mkdir(g_folderPath.c_str(), FILE_POWER);
+    }
+    switch (c) {
+        case 'L': {
+            if (!ListOption(argc, argv)) {
+                std::cout << "Device query failed" << std::endl;
+                return false;
+            }
+            break;
         }
-        if (!AddDevice(argvList.back())) {
-            std::cout << "Failed to create device" << std::endl;
-            return false;
+        case 'S': {
+            if (!StartOption(argc, argv)) {
+                std::cout << "Device start failed" << std::endl;
+                return false;
+            }
+            break;
         }
-        return true;
-    } else if (argvList[1] == "list") {
-        if (argvList.size() != PARAMETERS_QUERY_NUMBER) {
-            std::cout << "Invalid Input Para, Please Check the validity of the para" << std::endl;
-            return false;
+        case 'C': {
+            if (!CloseOption(argc, argv)) {
+                std::cout << "Device close failed" << std::endl;
+                return false;
+            }
+            break;
         }
-        std::string::size_type pos;
-        std::cout << "PID\tDEVICE" << std::endl;
-        for (const auto &item : deviceList) {
-            pos = item.find("_");
-            std::cout << item.substr(0, pos) << "\t" << item.substr(pos + 1, item.size() - pos - 1) << std::endl;
+        case '?': {
+            if (!HelpOption(argc, argv)) {
+                std::cout << "Failed to ask for help" << std::endl;
+                return false;
+            }
+            break;
         }
-        return false;
-    } else if (argvList[1] == "close") {
-        if (argvList.size() != PARAMETERS_NUMBER) {
-            std::cout << "Invalid Input Para, Please Check the validity of the para" << std::endl;
+        default: {
+            std::cout << "The command line format is incorrect" << std::endl;
             return false;
         }
-        if (!CloseDevice(argvList.back(), deviceList)) {
-            return false;
-        } else {
-            std::cout << "device closed successfully" << std::endl;
-            return false;
+    }
+    return true;
+}
+
+bool VirtualDevice::SelectOptions(int32_t argc, char **argv, int32_t &opt)
+{
+    if (argc < PARAMETERS_QUERY_NUMBER) {
+        std::cout << "Please enter options or parameters" << std::endl;
+        return false;
+    }
+    struct option longOptions[] = {
+        {"list", no_argument, NULL, 'L'},
+        {"start", no_argument, NULL, 'S'},
+        {"close", no_argument, NULL, 'C'},
+        {"help", no_argument, NULL, '?'},
+        {NULL, 0, NULL, 0}
+    };
+    std::string inputOptions = argv[optind];
+    if (inputOptions.find('-') == inputOptions.npos) {
+        for (uint32_t i = 0; i < sizeof(longOptions) / sizeof(struct option) - 1; ++i) {
+            if (longOptions[i].name == inputOptions) {
+                opt = longOptions[i].val;
+                optind++;
+                break;
+            }
         }
+    } else if ((inputOptions.length() != PARAMETERS_QUERY_NUMBER) &&
+               (inputOptions[inputOptions.find('-') + 1] != '-')) {
+        std::cout << "More than one short option is not supported" << std::endl;
+        return false;
     } else {
-        std::cout << "The command line format is incorrect" << std::endl;
+        int32_t optionIndex = 0;
+        opt = getopt_long(argc, argv, "LSC?", longOptions, &optionIndex);
+    }
+    if (opt == -1) {
+        std::cout << "Nonstandard input parameters" << std::endl;
         return false;
     }
+    return true;
+}
+
+bool VirtualDevice::ListOption(int32_t argc, char **argv)
+{
+    std::vector<std::string> deviceList = BrowseDirectory(g_folderPath);
+    if (argc != PARAMETERS_QUERY_NUMBER) {
+        std::cout << "Invalid Input Para, Please Check the validity of the para" << std::endl;
+        return false;
+    }
+    std::string::size_type pos;
+    std::cout << "PID\tDEVICE" << std::endl;
+    for (const auto &item : deviceList) {
+        pos = item.find("_");
+        if (pos != std::string::npos) {
+            std::cout << item.substr(0, pos) << "\t" << item.substr(pos + 1, item.size() - pos - 1) << std::endl;
+        }
+    }
+    return true;
+}
+
+bool VirtualDevice::StartOption(int32_t argc, char **argv)
+{
+    if (argc != PARAMETERS_NUMBER) {
+        std::cout << "Invalid Input Para, Please Check the validity of the para" << std::endl;
+        return false;
+    }
+    if (!AddDevice(argv[optind])) {
+        std::cout << "Failed to create device" << std::endl;
+        return false;
+    }
+    while (true) {
+        usleep(SLEEP_TIME);
+    }
+    return true;
+}
+
+bool VirtualDevice::CloseOption(int32_t argc, char **argv)
+{
+    std::vector<std::string> deviceList = BrowseDirectory(g_folderPath);
+    if (argc != PARAMETERS_NUMBER) {
+        std::cout << "Invalid Input Para, Please Check the validity of the para" << std::endl;
+        return false;
+    }
+    if (!CloseDevice(argv[optind], deviceList)) {
+        std::cout << "Failed to closed device" << std::endl;
+        return false;
+    }
+    std::cout << "device closed successfully" << std::endl;
+    return true;
+}
+
+bool VirtualDevice::HelpOption(int32_t argc, char **argv)
+{
+    if (argc != PARAMETERS_QUERY_NUMBER) {
+        std::cout << "Invalid Input Para, Please Check the validity of the para" << std::endl;
+        return false;
+    }
+    ShowUsage();
+    return true;
 }
 
 void VirtualDevice::SetResolution(const ResolutionInfo& resolutionInfo)
@@ -704,5 +812,32 @@ const std::vector<uint32_t>& VirtualDevice::GetSwitches() const
 {
     return switches_;
 }
+
+void VirtualDevice::ShowUsage()
+{
+    std::cout << "Usage: vuinput <option> <command> <arg>..."      << std::endl;
+    std::cout << "The option are:                                " << std::endl;
+    std::cout << "commands for list:                             " << std::endl;
+    std::cout << "-L      --list        list    -display virtual devices and pid information" << std::endl;
+    std::cout << "commands for start:                            " << std::endl;
+    std::cout << "-S <device> &   --start <device> &    start <device> &     -start a device" << std::endl;
+    std::cout << " -start supported <device>-" << std::endl;
+    std::cout << "  mouse"         << std::endl;
+    std::cout << "  keyboard"      << std::endl;
+    std::cout << "  joystick"      << std::endl;
+    std::cout << "  trackball"     << std::endl;
+    std::cout << "  remotecontrol" << std::endl;
+    std::cout << "  trackpad"      << std::endl;
+    std::cout << "  knob"          << std::endl;
+    std::cout << "  gamepad"       << std::endl;
+    std::cout << "  touchpad"      << std::endl;
+    std::cout << "  touchscreen"   << std::endl;
+    std::cout << "  pen"           << std::endl;
+    std::cout << "-S all &        --start all &        start all &           -start devices " << std::endl;
+    std::cout << "commands for close:                                                       " << std::endl;
+    std::cout << "-C <pid>        --close <pid>        close <pid>           -close a pid   " << std::endl;
+    std::cout << "-C all          --close all          close all             -close pids    " << std::endl;
+    std::cout << "-?  --help   help                                                         " << std::endl;
+}
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From 9d143b1b87bbd5b21ca78d18cea05655269d2725 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 22 Nov 2022 14:04:27 +0800
Subject: [PATCH 168/360] =?UTF-8?q?=E5=88=A0=E9=99=A4run=5Fshell=5Futil?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=97=A0=E7=94=A8=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I801e962e6bd95d3efad958a230bf5defb1f8baed
---
 frameworks/proxy/events/test/input_manager_manual_test.cpp | 1 -
 frameworks/proxy/events/test/key_event_test.cpp            | 1 -
 util/BUILD.gn                                              | 1 -
 3 files changed, 3 deletions(-)

diff --git a/frameworks/proxy/events/test/input_manager_manual_test.cpp b/frameworks/proxy/events/test/input_manager_manual_test.cpp
index a3bb1dad9c..047df8b1fe 100644
--- a/frameworks/proxy/events/test/input_manager_manual_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_manual_test.cpp
@@ -24,7 +24,6 @@
 #include "nativetoken_kit.h"
 #include "pointer_event.h"
 #include "proto.h"
-#include "run_shell_util.h"
 #include "token_setproc.h"
 
 namespace OHOS {
diff --git a/frameworks/proxy/events/test/key_event_test.cpp b/frameworks/proxy/events/test/key_event_test.cpp
index 627d7c903f..78bc3e1973 100755
--- a/frameworks/proxy/events/test/key_event_test.cpp
+++ b/frameworks/proxy/events/test/key_event_test.cpp
@@ -20,7 +20,6 @@
 #include "input_manager.h"
 #include "key_event.h"
 #include "proto.h"
-#include "run_shell_util.h"
 
 namespace OHOS {
 namespace MMI {
diff --git a/util/BUILD.gn b/util/BUILD.gn
index ab23e0c249..35702256a8 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -32,7 +32,6 @@ ohos_shared_library("libmmi-util") {
   sources = [
     "common/src/input_event_data_transformation.cpp",
     "common/src/klog.cpp",
-    "common/src/run_shell_util.cpp",
     "common/src/util.cpp",
     "common/src/util_napi.cpp",
     "common/src/util_napi_error.cpp",
-- 
Gitee


From b762f364e101fd6e47a571ce563168d650021982 Mon Sep 17 00:00:00 2001
From: baiwei <baiwei28@huawei.com>
Date: Thu, 17 Nov 2022 16:15:20 +0800
Subject: [PATCH 169/360] The interface GetKeyItem had been modified

Signed-off-by: baiwei <baiwei28@huawei.com>
Change-Id: I74ae6eff96b2d8e033d15e9572a0ff0a52041740
---
 .../input_consumer/src/js_register_module.cpp |  9 ++++++---
 frameworks/proxy/events/src/key_event.cpp     | 20 ++++++++++---------
 .../innerkits/event/include/key_event.h       | 10 ++++++----
 service/event_handler/src/key_auto_repeat.cpp |  6 +++---
 .../key_command/src/key_command_handler.cpp   |  7 +++++--
 .../src/key_event_normalize.cpp               | 10 +++++-----
 .../subscriber/src/key_subscriber_handler.cpp |  7 +++++--
 test/unittest/common/src/event_util_test.cpp  |  7 +++++--
 8 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/frameworks/napi/input_consumer/src/js_register_module.cpp b/frameworks/napi/input_consumer/src/js_register_module.cpp
index e9eec980f2..7fc9006990 100644
--- a/frameworks/napi/input_consumer/src/js_register_module.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_module.cpp
@@ -180,10 +180,13 @@ static bool MatchCombinationKeys(KeyEventMonitorInfo* monitorInfo, std::shared_p
         count++;
     }
     MMI_HILOGD("kevEventSize:%{public}d,infoSize:%{public}d", count, infoSize);
-    auto keyItem = keyEvent->GetKeyItem();
-    CHKPF(keyItem);
-    auto upTime = keyEvent->GetActionTime();
+    std::optional<KeyEvent::KeyItem> keyItem = keyEvent->GetKeyItem();
+    if (!keyItem) { 
+        MMI_HILOGE("The keyItem is nullopt");
+        return false;
+    }
     auto downTime = keyItem->GetDownTime();
+    auto upTime = keyEvent->GetActionTime();
     auto curDurationTime = keyOption->GetFinalKeyDownDuration();
     if (curDurationTime > 0 && (upTime - downTime >= (static_cast<int64_t>(curDurationTime) * 1000))) {
         MMI_HILOGE("Skip, upTime - downTime >= duration");
diff --git a/frameworks/proxy/events/src/key_event.cpp b/frameworks/proxy/events/src/key_event.cpp
index 2f9d309d8e..07dfc9ead5 100644
--- a/frameworks/proxy/events/src/key_event.cpp
+++ b/frameworks/proxy/events/src/key_event.cpp
@@ -964,29 +964,31 @@ void KeyEvent::AddPressedKeyItems(const KeyItem& keyItem)
 
 void KeyEvent::RemoveReleasedKeyItems(const KeyItem& keyItem)
 {
+    if (keyItem.IsPressed()) {
+        return;
+    }
     int32_t keyCode = keyItem.GetKeyCode();
-    std::vector<KeyItem> tempKeyItems = keys_;
-    keys_.clear();
-    for (const auto &item : tempKeyItems) {
-        if (item.GetKeyCode() != keyCode) {
-            keys_.push_back(item);
+    for (auto it = keys_.begin(); it != keys_.end(); ++it) {
+        if (it->GetKeyCode() == keyCode) {
+            keys_.erase(it);
+            return;
         }
     }
 }
 
-const KeyEvent::KeyItem* KeyEvent::GetKeyItem() const
+std::optional<KeyEvent::KeyItem> KeyEvent::GetKeyItem() const
 {
     return GetKeyItem(keyCode_);
 }
 
-const KeyEvent::KeyItem* KeyEvent::GetKeyItem(int32_t keyCode) const
+std::optional<KeyEvent::KeyItem> KeyEvent::GetKeyItem(int32_t keyCode) const
 {
     for (const auto &item : keys_) {
         if (item.GetKeyCode() == keyCode) {
-            return &item;
+            return std::make_optional(item);
         }
     }
-    return nullptr;
+    return std::nullopt;
 }
 
 const char* KeyEvent::ActionToString(int32_t action)
diff --git a/interfaces/native/innerkits/event/include/key_event.h b/interfaces/native/innerkits/event/include/key_event.h
index f661ea99d0..f3327edb8a 100644
--- a/interfaces/native/innerkits/event/include/key_event.h
+++ b/interfaces/native/innerkits/event/include/key_event.h
@@ -15,8 +15,10 @@
 #ifndef KEY_EVENT_H
 #define KEY_EVENT_H
 
+
 #include <memory>
 #include <vector>
+#include <set>
 
 #include "nocopyable.h"
 #include "parcel.h"
@@ -3079,18 +3081,18 @@ public:
 
     /**
      * @brief Obtains the key item of this key event.
-     * @return Returns the pointer to the key item.
+     * @return Returns the key item.
      * @since 9
      */
-    const KeyItem* GetKeyItem() const;
+    std::optional<KeyEvent::KeyItem> GetKeyItem() const;
 
     /**
      * @brief Obtains the key item based on a key code.
      * @param keyCode Indicates the key code.
-     * @return Returns the pointer to the key item.
+     * @return Returns the key item.
      * @since 9
      */
-    const KeyItem* GetKeyItem(int32_t keyCode) const;
+    std::optional<KeyEvent::KeyItem> GetKeyItem(int32_t keyCode) const;
 
     /**
      * @brief Checks whether this key event is valid.
diff --git a/service/event_handler/src/key_auto_repeat.cpp b/service/event_handler/src/key_auto_repeat.cpp
index 174407266e..7efeaaf542 100644
--- a/service/event_handler/src/key_auto_repeat.cpp
+++ b/service/event_handler/src/key_auto_repeat.cpp
@@ -85,11 +85,11 @@ void KeyAutoRepeat::SelectAutoRepeat(std::shared_ptr<KeyEvent>& keyEvent)
         timerId_ = -1;
         MMI_HILOGI("Stop kayboard autorepeat, keyCode:%{public}d", keyEvent_->GetKeyCode());
         if (repeatKeyCode_ != keyEvent_->GetKeyCode()) {
-            auto pressedKeyItem = keyEvent_->GetKeyItem(keyEvent_->GetKeyCode());
-            if (pressedKeyItem != nullptr) {
+            std::optional<KeyEvent::KeyItem> pressedKeyItem = keyEvent_->GetKeyItem(keyEvent_->GetKeyCode());
+            if (pressedKeyItem) {
                 keyEvent_->RemoveReleasedKeyItems(*pressedKeyItem);
             } else {
-                MMI_HILOGW("The pressedKeyItem is nullptr");
+                MMI_HILOGW("The pressedKeyItem is nullopt");
             }
             keyEvent_->SetKeyCode(repeatKeyCode_);
             keyEvent_->SetAction(KeyEvent::KEY_ACTION_DOWN);
diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index 93bfbe4ca5..8e6e5b23ac 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -875,8 +875,11 @@ bool KeyCommandHandler::HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent, c
         LaunchAbility(shortcutKey);
         return true;
     }
-    const KeyEvent::KeyItem* keyItem = keyEvent->GetKeyItem();
-    CHKPF(keyItem);
+    std::optional<KeyEvent::KeyItem> keyItem = keyEvent->GetKeyItem();
+    if (!keyItem) {
+        MMI_HILOGE("The keyItem is nullopt");
+        return false;
+    }
     auto upTime = keyEvent->GetActionTime();
     auto downTime = keyItem->GetDownTime();
     MMI_HILOGD("upTime:%{public}" PRId64 ",downTime:%{public}" PRId64 ",keyDownDuration:%{public}d",
diff --git a/service/key_event_normalize/src/key_event_normalize.cpp b/service/key_event_normalize/src/key_event_normalize.cpp
index e1d4cff876..cd746fb8bc 100644
--- a/service/key_event_normalize/src/key_event_normalize.cpp
+++ b/service/key_event_normalize/src/key_event_normalize.cpp
@@ -57,11 +57,11 @@ int32_t KeyEventNormalize::Normalize(struct libinput_event *event, std::shared_p
         (KeyEvent::KEY_ACTION_UP) : (KeyEvent::KEY_ACTION_DOWN);
     auto preAction = keyEvent->GetAction();
     if (preAction == KeyEvent::KEY_ACTION_UP) {
-        auto preUpKeyItem = keyEvent->GetKeyItem();
-        if (preUpKeyItem != nullptr) {
+        std::optional<KeyEvent::KeyItem> preUpKeyItem = keyEvent->GetKeyItem();
+        if (preUpKeyItem) {
             keyEvent->RemoveReleasedKeyItems(*preUpKeyItem);
         } else {
-            MMI_HILOGE("The preUpKeyItem is null");
+            MMI_HILOGE("The preUpKeyItem is nullopt");
         }
     }
     int64_t time = GetSysClockTime();
@@ -94,8 +94,8 @@ int32_t KeyEventNormalize::Normalize(struct libinput_event *event, std::shared_p
                            funcKey, keyEvent->GetFunctionKey(funcKey));
             }
         }
-        auto pressedKeyItem = keyEvent->GetKeyItem(keyCode);
-        if (pressedKeyItem != nullptr) {
+        std::optional<KeyEvent::KeyItem> pressedKeyItem = keyEvent->GetKeyItem(keyCode);
+        if (pressedKeyItem) {
             item.SetDownTime(pressedKeyItem->GetDownTime());
         } else {
             MMI_HILOGE("Find pressed key failed, keyCode:%{public}d", keyCode);
diff --git a/service/subscriber/src/key_subscriber_handler.cpp b/service/subscriber/src/key_subscriber_handler.cpp
index 58990b466d..ba27873e32 100644
--- a/service/subscriber/src/key_subscriber_handler.cpp
+++ b/service/subscriber/src/key_subscriber_handler.cpp
@@ -387,8 +387,11 @@ bool KeySubscriberHandler::HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent
             continue;
         }
 
-        const KeyEvent::KeyItem* keyItem = keyEvent->GetKeyItem();
-        CHKPF(keyItem);
+        std::optional<KeyEvent::KeyItem> keyItem = keyEvent->GetKeyItem();
+        if (!keyItem) {
+            MMI_HILOGE("The keyItem is nullopt");
+            return false;
+        }
         auto upTime = keyEvent->GetActionTime();
         auto downTime = keyItem->GetDownTime();
         if (upTime - downTime >= (static_cast<int64_t>(duration) * 1000)) {
diff --git a/test/unittest/common/src/event_util_test.cpp b/test/unittest/common/src/event_util_test.cpp
index 269da0b135..2f4b3913c4 100644
--- a/test/unittest/common/src/event_util_test.cpp
+++ b/test/unittest/common/src/event_util_test.cpp
@@ -196,8 +196,11 @@ std::string EventUtilTest::DumpInputEvent(const std::shared_ptr<KeyEvent>& keyEv
          << ", KeyAction:" << keyEvent->GetKeyAction();
     std::vector<int32_t> pressedKeys = keyEvent->GetPressedKeys();
     for (const int32_t &key : pressedKeys) {
-        auto keyItem = keyEvent->GetKeyItem(key);
-        CHKPS(keyItem);
+        std::optional<KeyEvent::KeyItem> keyItem = keyEvent->GetKeyItem(key);
+        if (!keyItem) {
+            MMI_HILOGE("keyItem is nullopt");
+            return "";
+        }
         keyItem->GetDeviceId();
     }
     return strm.str();
-- 
Gitee


From 73b8b456ca56abd824f1213f5516266228f12f33 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 22 Nov 2022 17:51:15 +0800
Subject: [PATCH 170/360] volumn down+power start capturing screen, conflict
 resolved

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I63e6f80c18f6bd2eafc819a611bbd33eb04d3c48
---
 service/key_command/src/key_command_handler.cpp     | 10 +++++-----
 service/subscriber/include/key_subscriber_handler.h |  8 ++------
 service/subscriber/src/key_subscriber_handler.cpp   |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index 7be75d7b5d..8aaecaf3f4 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -40,16 +40,16 @@ constexpr int64_t MAX_DELAY_TIME = 1000000;
 constexpr int64_t SECONDS_SYSTEM = 1000;
 constexpr int32_t SPECIAL_KEY_DOWN_DELAY = 150;
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeyCommandHandler" };
-const std::map<int32_t, SpecialType> SPECIAL_KEYS = {
-    { KeyEvent::KEYCODE_POWER, SpecialType::KEY_DOWN_ACTION },
-    { KeyEvent::KEYCODE_VOLUME_DOWN, SpecialType::SPECIAL_ALL },
-    { KeyEvent::KEYCODE_VOLUME_UP, SpecialType::SUBSCRIBER_BEFORE_DELAY }
-};
 enum SpecialType {
     SPECIAL_ALL = 0,
     SUBSCRIBER_BEFORE_DELAY = 1,
     KEY_DOWN_ACTION = 2
 };
+const std::map<int32_t, SpecialType> SPECIAL_KEYS = {
+    { KeyEvent::KEYCODE_POWER, SpecialType::KEY_DOWN_ACTION },
+    { KeyEvent::KEYCODE_VOLUME_DOWN, SpecialType::SPECIAL_ALL },
+    { KeyEvent::KEYCODE_VOLUME_UP, SpecialType::SUBSCRIBER_BEFORE_DELAY }
+};
 struct JsonParser {
     JsonParser() = default;
     ~JsonParser()
diff --git a/service/subscriber/include/key_subscriber_handler.h b/service/subscriber/include/key_subscriber_handler.h
index 0f87d54043..f583f56551 100644
--- a/service/subscriber/include/key_subscriber_handler.h
+++ b/service/subscriber/include/key_subscriber_handler.h
@@ -66,12 +66,9 @@ private:
     bool HandleKeyDown(const std::shared_ptr<KeyEvent> &keyEvent);
     bool HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent);
     bool HandleKeyCancel(const std::shared_ptr<KeyEvent> &keyEvent);
-
     bool IsPreKeysMatch(const std::set<int32_t> &preKeys, const std::vector<int32_t> &pressedKeys) const;
-
     void NotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
-                          const std::shared_ptr<Subscriber> &subscriber);
-
+        const std::shared_ptr<Subscriber> &subscriber);
     bool AddTimer(const std::shared_ptr<Subscriber> &subscriber, const std::shared_ptr<KeyEvent> &keyEvent);
     void ClearTimer(const std::shared_ptr<Subscriber> &subscriber);
     void OnTimer(const std::shared_ptr<Subscriber> subscriber);
@@ -81,8 +78,7 @@ private:
     void RemoveKeyCode(int32_t keyCode, std::vector<int32_t> &keyCodes);
     bool IsRepeatedKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
     bool IsNotifyPowerKeySubsciber(int32_t keyCode, const std::vector<int32_t> &keyCodes);
-    void HandleKeyUpWithDelay(std::shared_ptr<KeyEvent> keyEvent,
-                                    const std::shared_ptr<Subscriber> &subscriber);
+    void HandleKeyUpWithDelay(std::shared_ptr<KeyEvent> keyEvent, const std::shared_ptr<Subscriber> &subscriber);
     void PrintKeyUpLog(const std::shared_ptr<Subscriber> &subscriber);
 
 private:
diff --git a/service/subscriber/src/key_subscriber_handler.cpp b/service/subscriber/src/key_subscriber_handler.cpp
index 709359f9e8..4f6cf018fe 100644
--- a/service/subscriber/src/key_subscriber_handler.cpp
+++ b/service/subscriber/src/key_subscriber_handler.cpp
@@ -498,7 +498,7 @@ bool KeySubscriberHandler::IsNotifyPowerKeySubsciber(int32_t keyCode, const std:
 }
 
 void KeySubscriberHandler::HandleKeyUpWithDelay(std::shared_ptr<KeyEvent> keyEvent,
-                                                      const std::shared_ptr<Subscriber> &subscriber)
+    const std::shared_ptr<Subscriber> &subscriber)
 {
     auto keyUpDelay = subscriber->keyOption_->GetFinalKeyUpDelay();
     if (keyUpDelay <= 0) {
-- 
Gitee


From b7b86f5f2136384ed02364e457c191d4fe49ed31 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 23 Nov 2022 07:34:06 +0000
Subject: [PATCH 171/360] Test case branch and interface coverage modification

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Iee62baaac72123512ed331d0cf2471755e79e29e
---
 BUILD.gn                                      |   6 +-
 frameworks/proxy/BUILD.gn                     |   4 +
 .../events/test/input_manager_manual_test.cpp |   6 +-
 .../proxy/events/test/input_manager_test.cpp  | 216 +++++++++++++++++-
 .../proxy/events/test/key_event_test.cpp      |  25 +-
 .../proxy/events/test/pointer_event_test.cpp  | 111 ++++++---
 .../innerkits/event/include/input_event.h     |   7 -
 test/unittest/common/src/event_util_test.cpp  |  10 +-
 util/socket/test/uds_client_test.cpp          | 127 ++--------
 util/socket/test/uds_session_test.cpp         | 108 +++++++--
 util/socket/test/uds_socket_test.cpp          |  11 +-
 11 files changed, 441 insertions(+), 190 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index c538301543..f66388895f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -130,15 +130,13 @@ group("ut_mmi_debug_tools") {
 
 group("mmi_tests_manual") {
   testonly = true
-  deps = [
-    "frameworks/proxy:InputManagerManualTest",
-    "service:TransformPointTest",
-  ]
+  deps = [ "service:TransformPointTest" ]
 }
 
 group("mmi_tests") {
   testonly = true
   deps = [
+    "frameworks/proxy:InputManagerManualTest",
     "frameworks/proxy:InputManagerTest",
     "frameworks/proxy:KeyEventTest",
     "frameworks/proxy:PointerEventTest",
diff --git a/frameworks/proxy/BUILD.gn b/frameworks/proxy/BUILD.gn
index 342f90051f..abdd556ba0 100755
--- a/frameworks/proxy/BUILD.gn
+++ b/frameworks/proxy/BUILD.gn
@@ -204,6 +204,10 @@ ohos_unittest("InputManagerTest") {
 
   defines = input_default_defines
 
+  if (input_feature_input_cooperation) {
+    defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
+  }
+
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/system_info.cpp",
diff --git a/frameworks/proxy/events/test/input_manager_manual_test.cpp b/frameworks/proxy/events/test/input_manager_manual_test.cpp
index a3bb1dad9c..e936bf0462 100644
--- a/frameworks/proxy/events/test/input_manager_manual_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_manual_test.cpp
@@ -138,7 +138,7 @@ void InputManagerManualTest::AddInputEventFilter()
         if (x == 10 && y == 10) {
             MMI_HILOGI("The values of X and y are both 10, which meets the expectation and callbackRet is set to 1");
             callbackRet = 1;
-            return true;
+            return false;
         }
 
         MMI_HILOGI("The values of X and y are not 10, which meets the expectation and callbackRet is set to 2");
@@ -173,8 +173,8 @@ void InputManagerManualTest::SimulateInputEventHelper(int32_t physicalX, int32_t
 }
 
 /**
- * @tc.name:HandlePointerEventFilter_001
- * @tc.desc:Verify pointer event filter
+ * @tc.name: HandlePointerEventFilter_001
+ * @tc.desc: Verify pointer event filter
  * @tc.type: FUNC
  * @tc.require:
  */
diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 984c4369fc..3cafa7001b 100755
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -3366,7 +3366,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_TouchScreenHotArea_002, TestSize.Lev
 
 /**
  * @tc.name: InputManagerTest_MouseHotArea_001
- * @tc.desc: mouse event Search window by pointerHotAreas
+ * @tc.desc: Mouse event Search window by pointerHotAreas
  * @tc.type: FUNC
  * @tc.require: I5HMCB
  */
@@ -3381,7 +3381,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_MouseHotArea_001, TestSize.Level1)
 
 /**
  * @tc.name: InputManagerTest_MouseHotArea_002
- * @tc.desc: mouse event Search window by pointerHotAreas
+ * @tc.desc: Mouse event Search window by pointerHotAreas
  * @tc.type: FUNC
  * @tc.require: I5HMCB
  */
@@ -3393,6 +3393,218 @@ HWTEST_F(InputManagerTest, InputManagerTest_MouseHotArea_002, TestSize.Level1)
     ASSERT_EQ(pointerEvent->GetSourceType(), PointerEvent::SOURCE_TYPE_MOUSE);
 }
 
+/**
+ * @tc.name: InputManagerTest_UpdateDisplayInfo
+ * @tc.desc: Update window information
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_UpdateDisplayInfo, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    DisplayGroupInfo displayGroupInfo;
+    displayGroupInfo.focusWindowId = 0;
+    displayGroupInfo.width = 0;
+    displayGroupInfo.height = 0;
+    InputManager::GetInstance()->UpdateDisplayInfo(displayGroupInfo);
+    ASSERT_TRUE(displayGroupInfo.displaysInfo.empty());
+}
+
+/**
+ * @tc.name: InputManagerTest_RegisterCooperateListener
+ * @tc.desc: Register cooperate listener
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_RegisterCooperateListener, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    std::shared_ptr<IInputDeviceCooperateListener> consumer = nullptr;
+    int32_t ret = InputManager::GetInstance()->RegisterCooperateListener(consumer);
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+    ASSERT_EQ(ret, RET_ERR);
+#else
+    ASSERT_EQ(ret, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_COOPERATE
+}
+
+/**
+ * @tc.name: InputManagerTest_UnregisterCooperateListener
+ * @tc.desc: Unregister cooperate listener
+ * @tc.type: FUNC
+ * @tc.require: 
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_UnregisterCooperateListener, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    std::shared_ptr<IInputDeviceCooperateListener> consumer = nullptr;
+    int32_t ret = InputManager::GetInstance()->UnregisterCooperateListener(consumer);
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+    ASSERT_EQ(ret, RET_OK);
+#else
+    ASSERT_EQ(ret, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_COOPERATE
+}
+
+/**
+ * @tc.name: InputManagerTest_EnableInputDeviceCooperate
+ * @tc.desc: Enable input device cooperate
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_EnableInputDeviceCooperate, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    bool enabled = false;
+    auto fun = [](std::string listener, CooperationMessage cooperateMessages) {
+        MMI_HILOGD("Enable input device cooperate success");
+    };
+    int32_t ret = InputManager::GetInstance()->EnableInputDeviceCooperate(enabled, fun);
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+    ASSERT_EQ(ret, RET_OK);
+#else
+    ASSERT_EQ(ret, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_COOPERATE
+}
+
+/**
+ * @tc.name: InputManagerTest_StartInputDeviceCooperate
+ * @tc.desc: Start input device cooperate
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_StartInputDeviceCooperate, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    std::string sinkDeviceId("");
+    int32_t srcInputDeviceId = -1;
+    auto fun = [](std::string listener, CooperationMessage cooperateMessages) {
+        MMI_HILOGD("Start input device cooperate success");
+    };
+    int32_t ret = InputManager::GetInstance()->StartInputDeviceCooperate(sinkDeviceId, srcInputDeviceId, fun);
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+    ASSERT_NE(ret, RET_OK);
+#else
+    ASSERT_EQ(ret, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_COOPERATE
+}
+
+/**
+ * @tc.name: InputManagerTest_StopDeviceCooperate
+ * @tc.desc: Stop device cooperate
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_StopDeviceCooperate, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    auto fun = [](std::string listener, CooperationMessage cooperateMessages) {
+        MMI_HILOGD("Start input device cooperate success");
+    };
+    int32_t ret = InputManager::GetInstance()->StopDeviceCooperate(fun);
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+    ASSERT_NE(ret, ERROR_UNSUPPORT);
+#else
+    ASSERT_EQ(ret, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_COOPERATE
+}
+
+/**
+ * @tc.name: InputManagerTest_GetInputDeviceCooperateState
+ * @tc.desc: Get input device cooperate state
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_GetInputDeviceCooperateState, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    const std::string deviceId("");
+    auto fun = [](bool state) {
+        MMI_HILOGD("Get inputdevice state success");
+    };
+    int32_t ret = InputManager::GetInstance()->GetInputDeviceCooperateState(deviceId, fun);
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+    ASSERT_EQ(ret, RET_OK);
+#else
+    ASSERT_EQ(ret, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_COOPERATE
+}
+
+/**
+ * @tc.name: InputManagerTest_GetDevice_001
+ * @tc.desc: Verify the fetch device info
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_GetDevice_001, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    int32_t deviceId = 0;
+    auto callback = [](std::shared_ptr<InputDevice> inputDevice) {
+        MMI_HILOGD("Get device success");
+        ASSERT_TRUE(inputDevice != nullptr);
+    };
+    int32_t ret = InputManager::GetInstance()->GetDevice(deviceId, callback);
+    ASSERT_EQ(ret, RET_OK);
+}
+
+/**
+ * @tc.name: InputManagerTest_GetDevice_002
+ * @tc.desc: Verify the fetch device info
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_GetDevice_002, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    int32_t deviceId = -1;
+    auto callback = [](std::shared_ptr<InputDevice> inputDevice) {
+        MMI_HILOGD("Get device success");
+        ASSERT_TRUE(inputDevice != nullptr);
+    };
+    int32_t ret = InputManager::GetInstance()->GetDevice(deviceId, callback);
+    ASSERT_NE(ret, RET_OK);
+}
+
+/**
+ * @tc.name: InputManagerTest_GetDeviceIds
+ * @tc.desc: Verify the fetch device list
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_GetDeviceIds, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    auto callback = [](std::vector<int32_t> ids) {
+        MMI_HILOGD("Get device success");
+    };
+    int32_t ret = InputManager::GetInstance()->GetDeviceIds(callback);
+    ASSERT_EQ(ret, RET_OK);
+}
+
+/**
+ * @tc.name: InputManagerTest_SetAnrObserver
+ * @tc.desc: Verify the observer for events
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_SetAnrObserver, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    class IAnrObserverTest : public IAnrObserver {
+    public:
+        IAnrObserverTest() : IAnrObserver() {}
+        virtual ~IAnrObserverTest() {}
+        void OnAnr(int32_t pid) const override
+        {
+            MMI_HILOGD("Set anr success");
+        };
+    };
+
+    std::shared_ptr<IAnrObserverTest> observer = std::make_shared<IAnrObserverTest>();
+    InputManager::GetInstance()->SetAnrObserver(observer);
+}
+
 std::shared_ptr<PointerEvent> InputManagerTest::SetupTabletToolEvent001()
 {
     auto pointerEvent = PointerEvent::Create();
diff --git a/frameworks/proxy/events/test/key_event_test.cpp b/frameworks/proxy/events/test/key_event_test.cpp
index 627d7c903f..854572db0f 100755
--- a/frameworks/proxy/events/test/key_event_test.cpp
+++ b/frameworks/proxy/events/test/key_event_test.cpp
@@ -36,8 +36,8 @@ public:
 };
 
 /**
- * @tc.name:KeyEventTest_OnCheckKeyEvent_001
- * @tc.desc:Verify key event
+ * @tc.name: KeyEventTest_OnCheckKeyEvent_001
+ * @tc.desc: Verify key event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -59,8 +59,8 @@ HWTEST_F(KeyEventTest, KeyEventTest_OnCheckKeyEvent_001, TestSize.Level1)
 }
 
 /**
- * @tc.name:KeyEventTest_OnCheckKeyEvent_002
- * @tc.desc:Verify key event
+ * @tc.name: KeyEventTest_OnCheckKeyEvent_002
+ * @tc.desc: Verify key event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -88,8 +88,8 @@ HWTEST_F(KeyEventTest, KeyEventTest_OnCheckKeyEvent_002, TestSize.Level1)
 }
 
 /**
- * @tc.name:KeyEventTest_OnCheckKeyEvent_003
- * @tc.desc:Verify key event
+ * @tc.name: KeyEventTest_OnCheckKeyEvent_003
+ * @tc.desc: Verify key event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -120,8 +120,8 @@ HWTEST_F(KeyEventTest, KeyEventTest_OnCheckKeyEvent_003, TestSize.Level1)
 }
 
 /**
- * @tc.name:KeyEventTest_OnCheckKeyEvent_004
- * @tc.desc:Verify key event
+ * @tc.name: KeyEventTest_OnCheckKeyEvent_004
+ * @tc.desc: Verify key event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -153,8 +153,8 @@ HWTEST_F(KeyEventTest, KeyEventTest_OnCheckKeyEvent_004, TestSize.Level1)
 }
 
 /**
- * @tc.name:KeyEventTest_OnCheckKeyEvent_005
- * @tc.desc:Verify key event
+ * @tc.name: KeyEventTest_OnCheckKeyEvent_005
+ * @tc.desc: Verify key event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -190,8 +190,8 @@ HWTEST_F(KeyEventTest, KeyEventTest_OnCheckKeyEvent_005, TestSize.Level1)
 }
 
 /**
- * @tc.name:KeyEventTest_OnCheckKeyEvent_006
- * @tc.desc:Verify key event
+ * @tc.name: KeyEventTest_OnCheckKeyEvent_006
+ * @tc.desc: Verify key event
  * @tc.type: FUNC
  * @tc.require: I5QSN3
  */
@@ -216,6 +216,7 @@ HWTEST_F(KeyEventTest, KeyEventTest_OnCheckKeyEvent_006, TestSize.Level1)
     item.SetKeyCode(KeyEvent::KEYCODE_BACK);
     item.SetDownTime(100);
     item.SetPressed(true);
+    item.SetUnicode(0);
     keyEvent->AddKeyItem(item);
     ASSERT_TRUE(keyEvent->IsValid());
     std::vector<KeyEvent::KeyItem> items = keyEvent->GetKeyItems();
diff --git a/frameworks/proxy/events/test/pointer_event_test.cpp b/frameworks/proxy/events/test/pointer_event_test.cpp
index 2c0ffb52a2..666661dc1b 100755
--- a/frameworks/proxy/events/test/pointer_event_test.cpp
+++ b/frameworks/proxy/events/test/pointer_event_test.cpp
@@ -68,8 +68,8 @@ std::shared_ptr<PointerEvent> PointerEventTest::CreatePointEvent()
 }
 
 /**
- * @tc.name:PointerEventTest_keyEventAndPointerEvent_001
- * @tc.desc:Verify ctrl(left) + point event
+ * @tc.name: PointerEventTest_keyEventAndPointerEvent_001
+ * @tc.desc: Verify ctrl(left) + point event
  * @tc.type: FUNC
  * @tc.require: AR000GOACS
  * @tc.author: yangguang
@@ -84,8 +84,8 @@ HWTEST_F(PointerEventTest, PointerEventTest_keyEventAndPointerEvent_001, TestSiz
 }
 
 /**
- * @tc.name:PointerEventTest_keyEventAndPointerEvent_002
- * @tc.desc:Verify ctrl(right) + point event
+ * @tc.name: PointerEventTest_keyEventAndPointerEvent_002
+ * @tc.desc: Verify ctrl(right) + point event
  * @tc.type: FUNC
  * @tc.require: AR000GOACS
  * @tc.author: yangguang
@@ -100,8 +100,8 @@ HWTEST_F(PointerEventTest, PointerEventTest_keyEventAndPointerEvent_002, TestSiz
 }
 
 /**
- * @tc.name:PointerEventTest_keyEventAndPointerEvent_003
- * @tc.desc:Verify ctrl(left and right) + point event
+ * @tc.name: PointerEventTest_keyEventAndPointerEvent_003
+ * @tc.desc: Verify ctrl(left and right) + point event
  * @tc.type: FUNC
  * @tc.require: AR000GOACS
  * @tc.author: yangguang
@@ -117,8 +117,8 @@ HWTEST_F(PointerEventTest, PointerEventTest_keyEventAndPointerEvent_003, TestSiz
 #endif // OHOS_BUILD_ENABLE_POINTER
 
 /**
- * @tc.name:PointerEventTest_CheckMousePointEvent_001
- * @tc.desc:Verify mouse point event
+ * @tc.name: PointerEventTest_CheckMousePointEvent_001
+ * @tc.desc: Verify mouse point event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -169,8 +169,8 @@ HWTEST_F(PointerEventTest, PointerEventTest_CheckMousePointEvent_001, TestSize.L
 }
 
 /**
- * @tc.name:PointerEventTest_CheckMousePointEvent_002
- * @tc.desc:Verify mouse point event
+ * @tc.name: PointerEventTest_CheckMousePointEvent_002
+ * @tc.desc: Verify mouse point event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -209,8 +209,8 @@ HWTEST_F(PointerEventTest, PointerEventTest_CheckMousePointEvent_002, TestSize.L
 }
 
 /**
- * @tc.name:PointerEventTest_CheckMousePointEvent_003
- * @tc.desc:Verify mouse point event
+ * @tc.name: PointerEventTest_CheckMousePointEvent_003
+ * @tc.desc: Verify mouse point event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -241,8 +241,8 @@ HWTEST_F(PointerEventTest, PointerEventTest_CheckMousePointEvent_003, TestSize.L
 }
 
 /**
- * @tc.name:PointerEventTest_CheckMousePointEvent_004
- * @tc.desc:Verify mouse point event
+ * @tc.name: PointerEventTest_CheckMousePointEvent_004
+ * @tc.desc: Verify mouse point event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -287,8 +287,8 @@ HWTEST_F(PointerEventTest, PointerEventTest_CheckMousePointEvent_004, TestSize.L
 }
 
 /**
- * @tc.name:PointerEventTest_CheckMousePointEvent_005
- * @tc.desc:Verify mouse point event
+ * @tc.name: PointerEventTest_CheckMousePointEvent_005
+ * @tc.desc: Verify mouse point event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -310,8 +310,59 @@ HWTEST_F(PointerEventTest, PointerEventTest_CheckMousePointEvent_005, TestSize.L
 }
 
 /**
- * @tc.name:PointerEventTest_CheckTouchPointEvent_001
- * @tc.desc:Verify touch screen event
+ * @tc.name: PointerEventTest_CheckMousePointEvent_006
+ * @tc.desc: Verify mouse point event
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(PointerEventTest, PointerEventTest_CheckMousePointEvent_006, TestSize.Level1)
+{
+    auto inputEvent = InputEvent::Create();
+    ASSERT_NE(inputEvent, nullptr);
+    inputEvent->SetDeviceId(1);
+    inputEvent->SetTargetWindowId(1);
+    inputEvent->SetAgentWindowId(1);
+    auto event = PointerEvent::from(inputEvent);
+    ASSERT_EQ(event, nullptr);
+
+    auto pointerEvent = PointerEvent::Create();
+    ASSERT_NE(pointerEvent, nullptr);
+    pointerEvent->Reset();
+    pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
+    pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
+    pointerEvent->SetPointerId(0);
+    pointerEvent->SetDeviceId(inputEvent->GetDeviceId());
+    pointerEvent->SetTargetWindowId(inputEvent->GetTargetWindowId());
+    pointerEvent->SetAgentWindowId(inputEvent->GetAgentWindowId());
+    PointerEvent::PointerItem item1;
+    item1.SetPointerId(0);
+    item1.SetDownTime(0);
+    item1.SetPressed(true);
+    item1.SetWindowX(10);
+    item1.SetWindowY(10);
+    item1.SetDeviceId(inputEvent->GetDeviceId());
+    item1.SetRawDx(60);
+    item1.SetRawDy(60);
+    pointerEvent->AddPointerItem(item1);
+    PointerEvent::PointerItem item2;
+    item2.SetPointerId(1);
+    item2.SetDownTime(0);
+    item2.SetPressed(false);
+    item2.SetWindowX(item1.GetWindowX());
+    item2.SetWindowY(item1.GetWindowY());
+    item2.SetDeviceId(inputEvent->GetDeviceId());
+    item2.SetRawDx(100);
+    item2.SetRawDy(100);
+    pointerEvent->AddPointerItem(item2);
+    ASSERT_TRUE(pointerEvent != nullptr);
+#ifdef OHOS_BUILD_ENABLE_POINTER
+    TestSimulateInputEvent(pointerEvent);
+#endif // OHOS_BUILD_ENABLE_POINTER
+}
+
+/**
+ * @tc.name: PointerEventTest_CheckTouchPointEvent_001
+ * @tc.desc: Verify touch screen event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -345,8 +396,8 @@ HWTEST_F(PointerEventTest, PointerEventTest_CheckTouchPointEvent_001, TestSize.L
 }
 
 /**
- * @tc.name:PointerEventTest_CheckTouchPointEvent_002
- * @tc.desc:Verify touch screen event
+ * @tc.name: PointerEventTest_CheckTouchPointEvent_002
+ * @tc.desc: Verify touch screen event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -377,8 +428,8 @@ HWTEST_F(PointerEventTest, PointerEventTest_CheckTouchPointEvent_002, TestSize.L
 }
 
 /**
- * @tc.name:PointerEventTest_CheckTouchPointEvent_003
- * @tc.desc:Verify touch screen event
+ * @tc.name: PointerEventTest_CheckTouchPointEvent_003
+ * @tc.desc: Verify touch screen event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -417,8 +468,8 @@ HWTEST_F(PointerEventTest, PointerEventTest_CheckTouchPointEvent_003, TestSize.L
 }
 
 /**
- * @tc.name:PointerEventTest_CheckTouchPointEvent_004
- * @tc.desc:Verify touch screen event
+ * @tc.name: PointerEventTest_CheckTouchPointEvent_004
+ * @tc.desc: Verify touch screen event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -444,8 +495,8 @@ HWTEST_F(PointerEventTest, PointerEventTest_CheckTouchPointEvent_004, TestSize.L
 }
 
 /**
- * @tc.name:PointerEventTest_CheckTouchPointEvent_005
- * @tc.desc:Verify touch screen event
+ * @tc.name: PointerEventTest_CheckTouchPointEvent_005
+ * @tc.desc: Verify touch screen event
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -471,8 +522,8 @@ HWTEST_F(PointerEventTest, PointerEventTest_CheckTouchPointEvent_005, TestSize.L
 }
 
 /**
- * @tc.name:PointerEventTest_CheckTouchPointEvent_006
- * @tc.desc:Verify touch screen event
+ * @tc.name: PointerEventTest_CheckTouchPointEvent_006
+ * @tc.desc: Verify touch screen event
  * @tc.type: FUNC
  * @tc.require: I5QSN3
  */
@@ -509,8 +560,8 @@ HWTEST_F(PointerEventTest, PointerEventTest_CheckTouchPointEvent_006, TestSize.L
 }
 
 /**
- * @tc.name:PointerEventTest_CheckTouchInputEvent_001
- * @tc.desc:Verify touch screen event
+ * @tc.name: PointerEventTest_CheckTouchInputEvent_001
+ * @tc.desc: Verify touch screen event
  * @tc.type: FUNC
  * @tc.require: I5QSN3
  */
diff --git a/interfaces/native/innerkits/event/include/input_event.h b/interfaces/native/innerkits/event/include/input_event.h
index 4db8f5b29d..58eee47808 100644
--- a/interfaces/native/innerkits/event/include/input_event.h
+++ b/interfaces/native/innerkits/event/include/input_event.h
@@ -294,13 +294,6 @@ public:
      */
     void ClearFlag();
 
-    /**
-     * @brief Assigns a new ID for an input event.
-     * @return void
-     * @since 9
-     */
-    void AssignNewId();
-
     /**
      * @brief Marks an input event as completed.
      * This method can only be called once.
diff --git a/test/unittest/common/src/event_util_test.cpp b/test/unittest/common/src/event_util_test.cpp
index 269da0b135..4212c4c25e 100644
--- a/test/unittest/common/src/event_util_test.cpp
+++ b/test/unittest/common/src/event_util_test.cpp
@@ -158,6 +158,7 @@ std::string EventUtilTest::DumpInputEvent(const std::shared_ptr<PointerEvent>& p
          << ",PointerAction:" << pointerEvent->DumpPointerAction()
          << ",SourceType:" << pointerEvent->DumpSourceType()
          << ",ButtonId:" << pointerEvent->GetButtonId()
+         << ",DeviceId:" << pointerEvent->GetDeviceId()
          << ",VerticalAxisValue:" << std::fixed << std::setprecision(precision)
          << pointerEvent->GetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_VERTICAL)
          << ",HorizontalAxisValue:" << std::fixed << std::setprecision(precision)
@@ -179,7 +180,8 @@ std::string EventUtilTest::DumpInputEvent(const std::shared_ptr<PointerEvent>& p
             << ",ToolWidth:" << item.GetToolWidth() << ",ToolHeight:" << item.GetToolHeight()
             << ",Pressure:" << item.GetPressure() << ",ToolType:" << item.GetToolType()
             << ",LongAxis:" << item.GetLongAxis() << ",ShortAxis:" << item.GetShortAxis()
-            << ",DeviceId:" << item.GetDeviceId();
+            << ",DeviceId:" << item.GetDeviceId() << ",RawDx:" << item.GetRawDx()
+            << ",RawDy:" << item.GetRawDy();
     }
     return ostream.str();
 }
@@ -198,7 +200,9 @@ std::string EventUtilTest::DumpInputEvent(const std::shared_ptr<KeyEvent>& keyEv
     for (const int32_t &key : pressedKeys) {
         auto keyItem = keyEvent->GetKeyItem(key);
         CHKPS(keyItem);
-        keyItem->GetDeviceId();
+        strm << ", KeyCode:" << keyItem->GetKeyCode()
+            << ", DeviceId:" << keyItem->GetDeviceId()
+            << ", Unicode:" << keyItem->GetUnicode();
     }
     return strm.str();
 }
@@ -207,6 +211,7 @@ bool EventUtilTest::CompareDump(const std::shared_ptr<PointerEvent>& pointerEven
 {
     CALL_DEBUG_ENTER;
     std::string before = DumpInputEvent(pointerEvent);
+    MMI_HILOGD("before:%{public}s", before.c_str());
     InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
     std::string after = GetEventDump();
     MMI_HILOGD("after:%{public}s", after.c_str());
@@ -218,6 +223,7 @@ bool EventUtilTest::CompareDump(const std::shared_ptr<KeyEvent>& keyEvent)
 {
     CALL_DEBUG_ENTER;
     std::string before = DumpInputEvent(keyEvent);
+    MMI_HILOGD("before:%{public}s", before.c_str());
     InputManager::GetInstance()->SimulateInputEvent(keyEvent);
     std::string after = GetEventDump();
     MMI_HILOGD("after:%{public}s", after.c_str());
diff --git a/util/socket/test/uds_client_test.cpp b/util/socket/test/uds_client_test.cpp
index 80227684ea..0b497d6c03 100644
--- a/util/socket/test/uds_client_test.cpp
+++ b/util/socket/test/uds_client_test.cpp
@@ -24,7 +24,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class UDSClientTest : public testing::Test {
@@ -39,46 +38,25 @@ public:
     {
         fd_ = fd;
     }
-
-    bool StartClientTestUnitTest(MsgClientFunCallback fun)
+    int32_t Socket()
     {
-        auto retResult = StartClient(fun);
-        return retResult;
+        return fd_;
     }
 };
 
-#if BINDER_TODO
-HWTEST_F(UDSClientTest, ConnectTo_02, TestSize.Level1)
-{
-    int32_t retResult;
-    const char *path = "1234";
-    bool isBind = false;
-
-    UDSClient udsClient;
-    retResult = udsClient.ConnectTo(path, isBind);
-    ASSERT_EQ(-1, retResult);
-}
-
-HWTEST_F(UDSClientTest, ConnectTo_03, TestSize.Level1)
+HWTEST_F(UDSClientTest, ConnectTo_01, TestSize.Level1)
 {
-    int32_t retResult;
-    const char *path = "568*";
-    bool isBind = true;
-
-    UDSClient udsClient;
-    retResult = udsClient.ConnectTo(path, isBind);
-    ASSERT_EQ(-1, retResult);
+    UDSClientUnitTest udsClient;
+    int32_t retResult = udsClient.ConnectTo();
+    ASSERT_EQ(RET_ERR, retResult);
 }
 
-HWTEST_F(UDSClientTest, ConnectTo_04, TestSize.Level1)
+HWTEST_F(UDSClientTest, ConnectTo_02, TestSize.Level1)
 {
-    int32_t retResult;
-    const char *path = "./";
-    bool isBind = true;
-
-    UDSClient udsClient;
-    retResult = udsClient.ConnectTo(path, isBind);
-    ASSERT_EQ(-1, retResult);
+    UDSClientUnitTest udsClient;
+    udsClient.SetFd(0);
+    int32_t retResult = udsClient.ConnectTo();
+    ASSERT_EQ(RET_OK, retResult);
 }
 
 HWTEST_F(UDSClientTest, SendMsg_001, TestSize.Level1)
@@ -87,11 +65,8 @@ HWTEST_F(UDSClientTest, SendMsg_001, TestSize.Level1)
     size_t size = 0;
 
     UDSClientUnitTest udsClientUt;
-    udsClientUt.SetFd(0);
-
-    UDSClient udsClient;
-    auto retResult = udsClient.SendMsg(buf, size);
-    ASSERT_EQ(0, retResult);
+    auto retResult = udsClientUt.SendMsg(buf, size);
+    ASSERT_FALSE(retResult);
 }
 
 HWTEST_F(UDSClientTest, SendMsg_002, TestSize.Level1)
@@ -100,88 +75,32 @@ HWTEST_F(UDSClientTest, SendMsg_002, TestSize.Level1)
     size_t size = 5;
 
     UDSClientUnitTest udsClientUt;
-    udsClientUt.SetFd(0);
-
-    UDSClient udsClient;
-    auto retResult = udsClient.SendMsg(buf, size);
-    ASSERT_EQ(0, retResult);
-}
-
-HWTEST_F(UDSClientTest, SendMsg_003, TestSize.Level1)
-{
-    const char *buf = "1234";
-    size_t size = 4;
-
-    UDSClientUnitTest udsClientUt;
-    udsClientUt.SetFd(0);
-
-    UDSClient udsClient;
-    auto retResult = udsClient.SendMsg(buf, size);
-    ASSERT_EQ(0, retResult);
-}
-
-HWTEST_F(UDSClientTest, SendMsg_004, TestSize.Level1)
-{
-    const char *buf = "1234&";
-    size_t size = 5;
-
-    UDSClientUnitTest udsClientUt;
-    udsClientUt.SetFd(0);
-
-    UDSClient udsClient;
-    auto retResult = udsClient.SendMsg(buf, size);
-    ASSERT_EQ(0, retResult);
-}
-
-HWTEST_F(UDSClientTest, SendMsg_005, TestSize.Level1)
-{
-    const char *buf = "Arg_012,@#$";
-    size_t size = 11;
-
-    UDSClientUnitTest udsClientUt;
-    udsClientUt.SetFd(0);
-
-    UDSClient udsClient;
-    auto retResult = udsClient.SendMsg(buf, size);
-    ASSERT_EQ(0, retResult);
-}
-
-HWTEST_F(UDSClientTest, SendMsg_006, TestSize.Level1)
-{
-    const char *buf = "Arg_012,@#$435";
-    size_t size = 14;
-
-    UDSClientUnitTest udsClientUt;
-    udsClientUt.SetFd(0);
-
-    UDSClient udsClient;
-    auto retResult = udsClient.SendMsg(buf, size);
-    ASSERT_EQ(0, retResult);
+    auto retResult = udsClientUt.SendMsg(buf, size);
+    ASSERT_FALSE(retResult);
 }
 
 HWTEST_F(UDSClientTest, SendMsg_type2_001, TestSize.Level1)
 {
     NetPacket pkt(MmiMessageId::INVALID);
 
-    UDSClient udsClient;
-    auto retResult = udsClient.SendMsg(pkt);
-    EXPECT_EQ(0, retResult);
+    UDSClientUnitTest udsClientUt;
+    auto retResult = udsClientUt.SendMsg(pkt);
+    ASSERT_FALSE(retResult);
 }
 
 HWTEST_F(UDSClientTest, SendMsg_type2_002, TestSize.Level1)
 {
     NetPacket pkt(static_cast<MmiMessageId>(222));
 
-    UDSClient udsClient;
-    auto retResult = udsClient.SendMsg(pkt);
-    EXPECT_EQ(0, retResult);
+    UDSClientUnitTest udsClientUt;
+    auto retResult = udsClientUt.SendMsg(pkt);
+    ASSERT_FALSE(retResult);
 }
 
 HWTEST_F(UDSClientTest, Stop_001, TestSize.Level1)
 {
-    UDSClient udsClient;
-    udsClient.Stop();
+    UDSClientUnitTest udsClientUt;
+    udsClientUt.Stop();
 }
-#endif
 } // namespace MMI
 } // namespace OHOS
diff --git a/util/socket/test/uds_session_test.cpp b/util/socket/test/uds_session_test.cpp
index 50f35bdffd..5a670ec7f7 100644
--- a/util/socket/test/uds_session_test.cpp
+++ b/util/socket/test/uds_session_test.cpp
@@ -19,7 +19,6 @@
 #include "proto.h"
 #include "uds_session.h"
 
-
 namespace OHOS {
 namespace MMI {
 namespace {
@@ -59,8 +58,8 @@ void UDSSessionTest::TearDown()
 }
 
 /**
- * @tc.name:Construct
- * @tc.desc:Verify uds session function EventsIsEmpty
+ * @tc.name: Construct
+ * @tc.desc: Verify uds session function EventsIsEmpty
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -72,8 +71,8 @@ HWTEST_F(UDSSessionTest, Construct, TestSize.Level1)
 }
 
 /**
- * @tc.name:SendMsg_type1_001
- * @tc.desc:Verify uds session function sendMsg
+ * @tc.name: SendMsg_type1_001
+ * @tc.desc: Verify uds session function sendMsg
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -87,8 +86,8 @@ HWTEST_F(UDSSessionTest, SendMsg_type1_001, TestSize.Level1)
 }
 
 /**
- * @tc.name:SendMsg_type1_002
- * @tc.desc:Verify uds session function SendMsg
+ * @tc.name: SendMsg_type1_002
+ * @tc.desc: Verify uds session function SendMsg
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -103,8 +102,8 @@ HWTEST_F(UDSSessionTest, SendMsg_type1_002, TestSize.Level1)
 }
 
 /**
- * @tc.name:SendMsg_type1_003
- * @tc.desc:Verify uds session function SendMsg
+ * @tc.name: SendMsg_type1_003
+ * @tc.desc: Verify uds session function SendMsg
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -118,8 +117,8 @@ HWTEST_F(UDSSessionTest, SendMsg_type1_003, TestSize.Level1)
 }
 
 /**
- * @tc.name:SendMsg_type1_004
- * @tc.desc:Verify uds session function SendMsg
+ * @tc.name: SendMsg_type1_004
+ * @tc.desc: Verify uds session function SendMsg
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -134,8 +133,8 @@ HWTEST_F(UDSSessionTest, SendMsg_type1_004, TestSize.Level1)
 }
 
 /**
- * @tc.name:SendMsg_type1_005
- * @tc.desc:Verify uds session function SendMsg
+ * @tc.name: SendMsg_type1_005
+ * @tc.desc: Verify uds session function SendMsg
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -150,8 +149,8 @@ HWTEST_F(UDSSessionTest, SendMsg_type1_005, TestSize.Level1)
 }
 
 /**
- * @tc.name:SendMsg_type2_001
- * @tc.desc:Verify uds session function SendMsg
+ * @tc.name: SendMsg_type2_001
+ * @tc.desc: Verify uds session function SendMsg
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -166,8 +165,8 @@ HWTEST_F(UDSSessionTest, SendMsg_type2_001, TestSize.Level1)
 }
 
 /**
- * @tc.name:SendMsg_type2_002
- * @tc.desc:Verify uds session function SendMsg
+ * @tc.name: SendMsg_type2_002
+ * @tc.desc: Verify uds session function SendMsg
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -181,8 +180,8 @@ HWTEST_F(UDSSessionTest, SendMsg_type2_002, TestSize.Level1)
 }
 
 /**
- * @tc.name:SendMsg_type2_003
- * @tc.desc:Verify uds session function SendMsg
+ * @tc.name: SendMsg_type2_003
+ * @tc.desc: Verify uds session function SendMsg
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -195,5 +194,76 @@ HWTEST_F(UDSSessionTest, SendMsg_type2_003, TestSize.Level1)
     bool retResult = sesObj.SendMsg(pkt);
     EXPECT_FALSE(retResult);
 }
+
+/**
+ * @tc.name: GetTimerIds
+ * @tc.desc: Verify uds session function GetTimerIds
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(UDSSessionTest, GetTimerIds, TestSize.Level1)
+{
+    UDSSession sesObj(PROGRAM_NAME, moduleType_, writeFd_, UID_ROOT, pid_);
+
+    auto currentTime = GetSysClockTime();
+    int32_t type = ANR_DISPATCH;
+    int32_t timerId = 1;
+    sesObj.SaveANREvent(type, 1, currentTime, timerId);
+
+    std::vector<int32_t> ids = sesObj.GetTimerIds(type);
+    if (ids.empty()) {
+        ASSERT_FALSE(true);
+    }
+    EXPECT_EQ(ids[0], timerId);
+}
+
+/**
+ * @tc.name: DelEvents
+ * @tc.desc: Verify uds session function DelEvents
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(UDSSessionTest, DelEvents, TestSize.Level1)
+{
+    UDSSession sesObj(PROGRAM_NAME, moduleType_, writeFd_, UID_ROOT, pid_);
+
+    int32_t type = ANR_DISPATCH;
+    int32_t timerId = 0;
+    const int32_t idLen = 5;
+    int32_t i = 0;
+    for (; i < idLen; ++i) {
+        auto currentTime = GetSysClockTime();
+        sesObj.SaveANREvent(type, i, currentTime, timerId + i);
+    }
+
+    std::list<int32_t> timerIds = sesObj.DelEvents(type, i - 2);
+    EXPECT_EQ(timerIds.size(), idLen - 1);
+}
+
+/**
+ * @tc.name: GetEarliestEventTime
+ * @tc.desc: Verify uds session function GetEarliestEventTime
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(UDSSessionTest, GetEarliestEventTime, TestSize.Level1)
+{
+    UDSSession sesObj(PROGRAM_NAME, moduleType_, writeFd_, UID_ROOT, pid_);
+
+    int32_t type = ANR_DISPATCH;
+    int32_t timerId = 0;
+    const int32_t idLen = 5;
+    int64_t currentTime = GetSysClockTime();
+    int64_t earliestEventTime = currentTime;
+    sesObj.SaveANREvent(type, 0, currentTime, timerId);
+    for (int32_t i = 1; i < idLen; ++i) {
+        currentTime = GetSysClockTime();
+        sesObj.SaveANREvent(type, i, currentTime, timerId + i);
+    }
+
+    int64_t eventTime = sesObj.GetEarliestEventTime(type);
+    EXPECT_EQ(eventTime, earliestEventTime);
+}
+
 } // namespace MMI
 } // namespace OHOS
diff --git a/util/socket/test/uds_socket_test.cpp b/util/socket/test/uds_socket_test.cpp
index d9670120b7..287f1a7e0c 100644
--- a/util/socket/test/uds_socket_test.cpp
+++ b/util/socket/test/uds_socket_test.cpp
@@ -35,13 +35,11 @@ public:
     virtual ~UDSSocketUnitTest() {}
 };
 
-#if BINDER_TODO
-
 HWTEST_F(UDSSocketTest, Close, TestSize.Level1)
 {
     UDSSocketUnitTest socObj;
-    int32_t retResult = socObj.Close();
-    EXPECT_EQ(RET_OK, retResult);
+    socObj.Close();
+    EXPECT_EQ(-1, socObj.GetFd());
 }
 
 HWTEST_F(UDSSocketTest, EpollCreate_001, TestSize.Level1)
@@ -50,7 +48,7 @@ HWTEST_F(UDSSocketTest, EpollCreate_001, TestSize.Level1)
 
     UDSSocketUnitTest socObj;
     int32_t retResult = socObj.EpollCreate(size);
-    ASSERT_EQ(-1, retResult);
+    ASSERT_LE(retResult, 0);
 }
 
 HWTEST_F(UDSSocketTest, EpollCreate_002, TestSize.Level1)
@@ -59,7 +57,7 @@ HWTEST_F(UDSSocketTest, EpollCreate_002, TestSize.Level1)
 
     UDSSocketUnitTest socObj;
     int32_t retResult = socObj.EpollCreate(size);
-    ASSERT_EQ(-1, retResult);
+    ASSERT_LE(retResult, 0);
 }
 
 HWTEST_F(UDSSocketTest, EpollCtl_001, TestSize.Level1)
@@ -134,6 +132,5 @@ HWTEST_F(UDSSocketTest, EpollWait_004, TestSize.Level1)
     int32_t retResult = socObj.EpollWait(*events, MAX_EVENT_SIZE, timeout);
     ASSERT_EQ(-1, retResult);
 }
-#endif
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From aac964d1564d8a8f5ca9238cbee6767afb8133c3 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 23 Nov 2022 07:51:01 +0000
Subject: [PATCH 172/360] Test case branch and interface coverage modification

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I66249c8877cd17e92f1cb23252f1647961dcde53
---
 frameworks/proxy/BUILD.gn | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frameworks/proxy/BUILD.gn b/frameworks/proxy/BUILD.gn
index abdd556ba0..342f90051f 100755
--- a/frameworks/proxy/BUILD.gn
+++ b/frameworks/proxy/BUILD.gn
@@ -204,10 +204,6 @@ ohos_unittest("InputManagerTest") {
 
   defines = input_default_defines
 
-  if (input_feature_input_cooperation) {
-    defines += [ "OHOS_BUILD_ENABLE_COOPERATE" ]
-  }
-
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/system_info.cpp",
-- 
Gitee


From efce17205ddc43318a65e4562c66623713bda5a9 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 23 Nov 2022 08:17:54 +0000
Subject: [PATCH 173/360] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/key_command/src/key_command_handler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index 8aaecaf3f4..fa3f7b44f9 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -667,7 +667,7 @@ bool KeyCommandHandler::OnHandleEvent(const std::shared_ptr<KeyEvent> key)
     }
 
     bool isHandled = HandleShortKeys(key);
-    bool isHandled = HandleSequences(key) || isHandled;
+    isHandled = HandleSequences(key) || isHandled;
     if (isHandled) {
         return true;
     }
-- 
Gitee


From ec6b3674b6fffc7bca548f93c2a164ad61054d00 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 23 Nov 2022 08:43:53 +0000
Subject: [PATCH 174/360] Test case branch and interface coverage modification

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I5a6026bde1a02f669d1b21d016d3ece9af4e093c
Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 frameworks/proxy/events/test/input_manager_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 3cafa7001b..0cdbd372c2 100755
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -3432,7 +3432,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_RegisterCooperateListener, TestSize.
  * @tc.name: InputManagerTest_UnregisterCooperateListener
  * @tc.desc: Unregister cooperate listener
  * @tc.type: FUNC
- * @tc.require: 
+ * @tc.require:
  */
 HWTEST_F(InputManagerTest, InputManagerTest_UnregisterCooperateListener, TestSize.Level1)
 {
-- 
Gitee


From 0f580f76fab8f1cf147142d4f3ac4c7a3ef293c8 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 23 Nov 2022 17:15:27 +0800
Subject: [PATCH 175/360] =?UTF-8?q?inputdevice=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I61ea796a05afe706a94c323c9f8e32f5d91d42ac
---
 frameworks/napi/input_device/src/js_util.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frameworks/napi/input_device/src/js_util.cpp b/frameworks/napi/input_device/src/js_util.cpp
index 425d39aae1..5996e6e013 100644
--- a/frameworks/napi/input_device/src/js_util.cpp
+++ b/frameworks/napi/input_device/src/js_util.cpp
@@ -119,12 +119,13 @@ bool JsUtil::GetDeviceAxisInfo(const std::unique_ptr<CallbackInfo> &cb, napi_val
             break;
         }
     }
+    napi_value axisRanges = nullptr;
+    CHKRF(napi_create_array(cb->env, &axisRanges), CREATE_ARRAY);
     if (sourceType == nullptr) {
+        CHKRF(napi_set_named_property(cb->env, object, "axisRanges", axisRanges), SET_NAMED_PROPERTY);
         MMI_HILOGD("SourceType not found");
         return true;
     }
-    napi_value axisRanges = nullptr;
-    CHKRF(napi_create_array(cb->env, &axisRanges), CREATE_ARRAY);
     napi_value axisRange = nullptr;
     uint32_t i = 0;
     for (const auto &item : cb->data.device->GetAxisInfo()) {
-- 
Gitee


From 1f991909dcb9f2d6988a83b6c87bc12736f7c04a Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Thu, 24 Nov 2022 08:35:48 +0000
Subject: [PATCH 176/360] Touch screen move event container limit size

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: I340136c05e475df1d8a8773ebd380b86744f1d78
---
 service/monitor/src/event_monitor_handler.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/service/monitor/src/event_monitor_handler.cpp b/service/monitor/src/event_monitor_handler.cpp
index ed756757c3..738ff79f13 100644
--- a/service/monitor/src/event_monitor_handler.cpp
+++ b/service/monitor/src/event_monitor_handler.cpp
@@ -30,6 +30,7 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "EventMonitorHandler" };
+size_t MAX_EVENTIDS_SIZE = 1000;
 } // namespace
 
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
@@ -357,6 +358,10 @@ void EventMonitorHandler::MonitorCollection::UpdateConsumptionState(std::shared_
         sIter = tIter;
     }
     ConsumptionState &state = sIter->second;
+    if (state.eventIds_.size() >= MAX_EVENTIDS_SIZE) {
+        auto iter = state.eventIds_.begin();
+        state.eventIds_.erase(iter);
+    }
     auto [tIter, isOk] = state.eventIds_.emplace(pointerEvent->GetId());
     if (!isOk) {
         MMI_HILOGW("Failed to stash event");
-- 
Gitee


From da66a4f8378d70aefc1610e293b05632f25d19ba Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Fri, 25 Nov 2022 09:45:00 +0000
Subject: [PATCH 177/360] Touch screen move event container limit size

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: Ica6767e600b51e0e0c39fe1784e9da8ed62df795
---
 service/monitor/include/event_monitor_handler.h | 2 +-
 service/monitor/src/event_monitor_handler.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/monitor/include/event_monitor_handler.h b/service/monitor/include/event_monitor_handler.h
index 974affb788..007e03e7a5 100644
--- a/service/monitor/include/event_monitor_handler.h
+++ b/service/monitor/include/event_monitor_handler.h
@@ -99,7 +99,7 @@ private:
         void Dump(int32_t fd, const std::vector<std::string> &args);
 
     struct ConsumptionState {
-        std::unordered_set<int32_t> eventIds_;
+        std::set<int32_t> eventIds_;
         bool isMonitorConsumed_ { false };
         std::shared_ptr<PointerEvent> lastPointerEvent_ { nullptr };
     };
diff --git a/service/monitor/src/event_monitor_handler.cpp b/service/monitor/src/event_monitor_handler.cpp
index 738ff79f13..c64e278bd8 100644
--- a/service/monitor/src/event_monitor_handler.cpp
+++ b/service/monitor/src/event_monitor_handler.cpp
@@ -30,7 +30,7 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "EventMonitorHandler" };
-size_t MAX_EVENTIDS_SIZE = 1000;
+constexpr size_t MAX_EVENTIDS_SIZE = 1000;
 } // namespace
 
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
-- 
Gitee


From 74b0992478f03bd6db4b031833d4e377029b0348 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Fri, 25 Nov 2022 10:05:05 +0000
Subject: [PATCH 178/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: Ie15706c353d5ee74f9946e6457b6b544d810f00e
---
 util/socket/src/uds_session.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util/socket/src/uds_session.cpp b/util/socket/src/uds_session.cpp
index 1f6f749852..3c3dfd0554 100644
--- a/util/socket/src/uds_session.cpp
+++ b/util/socket/src/uds_session.cpp
@@ -70,6 +70,7 @@ bool UDSSession::SendMsg(const char *buf, size_t size) const
         auto count = send(fd_, &buf[idx], remSize, MSG_DONTWAIT | MSG_NOSIGNAL);
         if (count < 0) {
             if (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK) {
+                usleep(SEND_RETRY_SLEEP_TIME);
                 MMI_HILOGW("Continue for errno EAGAIN|EINTR|EWOULDBLOCK, errno:%{public}d", errno);
                 continue;
             }
-- 
Gitee


From eac0e2f67e3ef95136fcc064ee3daadc0bb9a78b Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Sat, 26 Nov 2022 12:27:31 +0800
Subject: [PATCH 179/360] huitui

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I0dd237b0c8b3e9da51bdac105a17b2a155c18369
---
 frameworks/proxy/events/src/key_option.cpp    |  16 +-
 .../innerkits/event/include/key_option.h      |  13 --
 .../include/input_event_handler.h             |   3 -
 .../event_handler/src/input_event_handler.cpp |  13 +-
 .../key_command/include/key_command_handler.h |   5 -
 .../key_command/src/key_command_handler.cpp   | 157 +++---------------
 .../include/key_subscriber_handler.h          |  13 +-
 .../subscriber/src/key_subscriber_handler.cpp | 123 ++++----------
 8 files changed, 68 insertions(+), 275 deletions(-)

diff --git a/frameworks/proxy/events/src/key_option.cpp b/frameworks/proxy/events/src/key_option.cpp
index 46fe96b6d6..52ca91429e 100644
--- a/frameworks/proxy/events/src/key_option.cpp
+++ b/frameworks/proxy/events/src/key_option.cpp
@@ -57,21 +57,11 @@ int32_t KeyOption::GetFinalKeyDownDuration() const
     return finalKeyDownDuration_;
 }
 
-int32_t KeyOption::GetFinalKeyUpDelay() const
-{
-    return finalKeyUpDelay_;
-}
-
 void KeyOption::SetFinalKeyDownDuration(int32_t duration)
 {
     finalKeyDownDuration_ = duration;
 }
 
-void KeyOption::SetFinalKeyUpDelay(int32_t delay)
-{
-    finalKeyUpDelay_ = delay;
-}
-
 bool KeyOption::ReadFromParcel(Parcel &in)
 {
     int32_t preKeysSize;
@@ -92,8 +82,7 @@ bool KeyOption::ReadFromParcel(Parcel &in)
     return (
         in.ReadInt32(finalKey_) &&
         in.ReadBool(isFinalKeyDown_) &&
-        in.ReadInt32(finalKeyDownDuration_) &&
-        in.ReadInt32(finalKeyUpDelay_)
+        in.ReadInt32(finalKeyDownDuration_)
     );
 }
 
@@ -112,8 +101,7 @@ bool KeyOption::WriteToParcel(Parcel &out) const
     return (
         out.WriteInt32(finalKey_) &&
         out.WriteBool(isFinalKeyDown_) &&
-        out.WriteInt32(finalKeyDownDuration_) &&
-        out.WriteInt32(finalKeyUpDelay_)
+        out.WriteInt32(finalKeyDownDuration_)
     );
 }
 } // namespace MMI
diff --git a/interfaces/native/innerkits/event/include/key_option.h b/interfaces/native/innerkits/event/include/key_option.h
index 14ce2267c6..34d8eb846a 100644
--- a/interfaces/native/innerkits/event/include/key_option.h
+++ b/interfaces/native/innerkits/event/include/key_option.h
@@ -87,12 +87,6 @@ public:
      */
     int32_t GetFinalKeyDownDuration() const;
 
-    /**
-     * @brief 获取最后一个按键抬起的延时时间，当最后一个按键抬起时，会延时触发订阅
-     * @return
-     */
-    int32_t GetFinalKeyUpDelay() const;
-
     /**
      * @brief Sets the duration when the final key is held down or the maximum duration between when
      * the key is pressed and when the key is released.
@@ -106,12 +100,6 @@ public:
      */
     void SetFinalKeyDownDuration(int32_t duration);
 
-    /**
-     * @brief 设置最后一个按键抬起后的延时时间
-     * @param delay
-     */
-    void SetFinalKeyUpDelay(int32_t delay);
-
 public:
     /**
      * @brief Writes data to a <b>Parcel</b> object.
@@ -134,7 +122,6 @@ private:
     int32_t finalKey_ { -1 };
     bool isFinalKeyDown_ { false };
     int32_t finalKeyDownDuration_ { 0 };
-    int32_t finalKeyUpDelay_ { 0 };
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/event_handler/include/input_event_handler.h b/service/event_handler/include/input_event_handler.h
index 10f0585bf5..4461d6d5b2 100644
--- a/service/event_handler/include/input_event_handler.h
+++ b/service/event_handler/include/input_event_handler.h
@@ -28,7 +28,6 @@
 #include "i_event_filter.h"
 #include "i_input_event_handler.h"
 #include "key_subscriber_handler.h"
-#include "key_command_handler.h"
 #include "mouse_event_normalize.h"
 
 namespace OHOS {
@@ -46,7 +45,6 @@ public:
     std::shared_ptr<EventNormalizeHandler> GetEventNormalizeHandler() const;
     std::shared_ptr<EventInterceptorHandler> GetInterceptorHandler() const;
     std::shared_ptr<KeySubscriberHandler> GetSubscriberHandler() const;
-    std::shared_ptr<KeyCommandHandler> GetKeyCommandHandler() const;
     std::shared_ptr<EventMonitorHandler> GetMonitorHandler() const;
     std::shared_ptr<EventFilterHandler> GetFilterHandler() const;
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
@@ -62,7 +60,6 @@ private:
     std::shared_ptr<EventFilterHandler> eventFilterHandler_ { nullptr };
     std::shared_ptr<EventInterceptorHandler> eventInterceptorHandler_ { nullptr };
     std::shared_ptr<KeySubscriberHandler> eventSubscriberHandler_ { nullptr };
-    std::shared_ptr<KeyCommandHandler> eventKeyCommandHandler_ { nullptr };
     std::shared_ptr<EventMonitorHandler> eventMonitorHandler_ { nullptr };
 
     uint64_t idSeed_ { 0 };
diff --git a/service/event_handler/src/input_event_handler.cpp b/service/event_handler/src/input_event_handler.cpp
index 894fb34f47..59f5b6a6c5 100644
--- a/service/event_handler/src/input_event_handler.cpp
+++ b/service/event_handler/src/input_event_handler.cpp
@@ -104,10 +104,10 @@ int32_t InputEventHandler::BuildInputHandlerChain()
 
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
 #ifdef OHOS_BUILD_ENABLE_COMBINATION_KEY
-    eventKeyCommandHandler_ = std::make_shared<KeyCommandHandler>();
-    CHKPR(eventKeyCommandHandler_, ERROR_NULL_POINTER);
-    handler->SetNext(eventKeyCommandHandler_);
-    handler = eventKeyCommandHandler_;
+    auto keyCommandHandler = std::make_shared<KeyCommandHandler>();
+    CHKPR(keyCommandHandler, ERROR_NULL_POINTER);
+    handler->SetNext(keyCommandHandler);
+    handler = keyCommandHandler;
 #endif // OHOS_BUILD_ENABLE_COMBINATION_KEY
     eventSubscriberHandler_ = std::make_shared<KeySubscriberHandler>();
     CHKPR(eventSubscriberHandler_, ERROR_NULL_POINTER);
@@ -146,11 +146,6 @@ std::shared_ptr<KeySubscriberHandler> InputEventHandler::GetSubscriberHandler()
     return eventSubscriberHandler_;
 }
 
-std::shared_ptr<KeyCommandHandler> InputEventHandler::GetKeyCommandHandler() const
-{
-    return eventKeyCommandHandler_;
-}
-
 std::shared_ptr<EventMonitorHandler> InputEventHandler::GetMonitorHandler() const
 {
     return eventMonitorHandler_;
diff --git a/service/key_command/include/key_command_handler.h b/service/key_command/include/key_command_handler.h
index d0bedb5d11..263cf98a4f 100755
--- a/service/key_command/include/key_command_handler.h
+++ b/service/key_command/include/key_command_handler.h
@@ -104,9 +104,6 @@ private:
     bool HandleSequences(const std::shared_ptr<KeyEvent> keyEvent);
     bool HandleShortKeys(const std::shared_ptr<KeyEvent> keyEvent);
     bool AddSequenceKey(const std::shared_ptr<KeyEvent> keyEvent);
-    void RemoveSubscribedTimer(int32_t keyCode);
-    void HandleSpecialKeys(int32_t keyCode, int32_t keyAction);
-    void InterruptTimers();
     void ResetLastMatchedKey()
     {
         lastMatchedKey_.preKeys.clear();
@@ -128,8 +125,6 @@ private:
     std::vector<Sequence> filterSequences_;
     std::vector<SequenceKey> keys_;
     bool isParseConfig_ { false };
-    std::map<int32_t, int32_t> specialKeys_;
-    std::map<int32_t, std::list<int32_t>> specialTimers_;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index fa3f7b44f9..93bfbe4ca5 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -17,39 +17,22 @@
 
 #include "dfx_hisysevent.h"
 #include "ability_manager_client.h"
-#include "bytrace_adapter.h"
 #include "cJSON.h"
 #include "config_policy_utils.h"
-#include "define_multimodal.h"
-#include "error_multimodal.h"
 #include "file_ex.h"
-#include "input_event_data_transformation.h"
-#include "input_event_handler.h"
+#include "bytrace_adapter.h"
+#include "error_multimodal.h"
 #include "mmi_log.h"
-#include "net_packet.h"
-#include "proto.h"
 #include "timer_manager.h"
-#include "util_ex.h"
 
 namespace OHOS {
 namespace MMI {
 namespace {
 constexpr int32_t MAX_PREKEYS_NUM = 4;
 constexpr int32_t MAX_SEQUENCEKEYS_NUM = 10;
-constexpr int64_t MAX_DELAY_TIME = 1000000;
+constexpr int64_t MAX_DELAY_TIME = 3000000;
 constexpr int64_t SECONDS_SYSTEM = 1000;
-constexpr int32_t SPECIAL_KEY_DOWN_DELAY = 150;
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeyCommandHandler" };
-enum SpecialType {
-    SPECIAL_ALL = 0,
-    SUBSCRIBER_BEFORE_DELAY = 1,
-    KEY_DOWN_ACTION = 2
-};
-const std::map<int32_t, SpecialType> SPECIAL_KEYS = {
-    { KeyEvent::KEYCODE_POWER, SpecialType::KEY_DOWN_ACTION },
-    { KeyEvent::KEYCODE_VOLUME_DOWN, SpecialType::SPECIAL_ALL },
-    { KeyEvent::KEYCODE_VOLUME_UP, SpecialType::SUBSCRIBER_BEFORE_DELAY }
-};
 struct JsonParser {
     JsonParser() = default;
     ~JsonParser()
@@ -65,15 +48,6 @@ struct JsonParser {
     cJSON *json_ { nullptr };
 };
 
-bool IsSpecialType(int32_t keyCode, SpecialType type)
-{
-    auto it = SPECIAL_KEYS.find(keyCode);
-    if (it == SPECIAL_KEYS.end()) {
-        return false;
-    }
-    return (it->second == SpecialType::SPECIAL_ALL || it->second == type);
-}
-
 bool GetPreKeys(const cJSON* jsonData, ShortcutKey &shortcutKey)
 {
     if (!cJSON_IsObject(jsonData)) {
@@ -610,9 +584,8 @@ bool KeyCommandHandler::ParseJson(const std::string &configFile)
         return false;
     }
 
-    bool isParseShortKeys = ParseShortcutKeys(parser, shortcutKeys_);
-    bool isParseSequences = ParseSequences(parser, sequences_);
-    if (!isParseShortKeys && !isParseSequences) {
+    if (!ParseShortcutKeys(parser, shortcutKeys_) &&
+        !ParseSequences(parser, sequences_)) {
         MMI_HILOGE("Parse configFile failed");
         return false;
     }
@@ -665,49 +638,12 @@ bool KeyCommandHandler::OnHandleEvent(const std::shared_ptr<KeyEvent> key)
         }
         isParseConfig_ = true;
     }
-
-    bool isHandled = HandleShortKeys(key);
-    isHandled = HandleSequences(key) || isHandled;
-    if (isHandled) {
-        return true;
-    }
-
-    if (!specialKeys_.empty() && specialKeys_.find(key->GetKeyCode()) != specialKeys_.end()) {
-        HandleSpecialKeys(key->GetKeyCode(), key->GetAction());
-        return true;
-    }
-
-    if (IsSpecialType(key->GetKeyCode(), SpecialType::SUBSCRIBER_BEFORE_DELAY)) {
-        int32_t timerId = TimerMgr->AddTimer(SPECIAL_KEY_DOWN_DELAY, 1, [this, key] () {
-            MMI_HILOGD("Timer callback");
-            auto it = specialTimers_.find(key->GetKeyCode());
-            if (it != specialTimers_.end() && !it->second.empty()) {
-                it->second.pop_front();
-            }
-            InputHandler->GetSubscriberHandler()->HandleKeyEvent(key);
-        });
-        if (timerId < 0) {
-            MMI_HILOGE("Add timer failed");
-            return false;
-        }
-
-        auto it = specialTimers_.find(key->GetKeyCode());
-        if (it == specialTimers_.end()) {
-            std::list<int32_t> timerIds;
-            timerIds.push_back(timerId);
-            auto it = specialTimers_.emplace(key->GetKeyCode(), timerIds);
-            if (!it.second) {
-                MMI_HILOGE("Keycode duplicated");
-                return false;
-            }
-        } else {
-            it->second.push_back(timerId);
-        }
-        MMI_HILOGD("Add timer success");
-        return true;
+    if (!HandleShortKeys(key) ||
+        !HandleSequences(key)) {
+        MMI_HILOGD("Shortkeys and Sequences is empty");
+        return false;
     }
-    
-    return false;
+    return true;
 }
 
 bool KeyCommandHandler::HandleShortKeys(const std::shared_ptr<KeyEvent> keyEvent)
@@ -787,16 +723,6 @@ bool KeyCommandHandler::HandleSequences(const std::shared_ptr<KeyEvent> keyEvent
         }
     }
 
-    if (isLaunchAbility) {
-        for (const auto& item : keys_) {
-            if (IsSpecialType(item.keyCode, SpecialType::KEY_DOWN_ACTION)) {
-                HandleSpecialKeys(item.keyCode, item.keyAction);
-            }
-            InputHandler->GetSubscriberHandler()->RemoveSubscriberKeyUpTimer(item.keyCode);
-            RemoveSubscribedTimer(item.keyCode);
-        }
-    }
-
     if (tempSeqs.empty()) {
         MMI_HILOGD("No matching sequence found");
     } else {
@@ -814,10 +740,6 @@ bool KeyCommandHandler::AddSequenceKey(const std::shared_ptr<KeyEvent> keyEvent)
     sequenceKey.keyAction = keyEvent->GetKeyAction();
     sequenceKey.actionTime = keyEvent->GetActionTime();
     size_t size = keys_.size();
-    if (size > MAX_SEQUENCEKEYS_NUM) {
-        MMI_HILOGD("The save key size more than the max size");
-        return false;
-    }
     if (size > 0) {
         if (keys_[size - 1].actionTime > sequenceKey.actionTime) {
             MMI_HILOGE("The current event time is greater than the last event time");
@@ -833,9 +755,20 @@ bool KeyCommandHandler::AddSequenceKey(const std::shared_ptr<KeyEvent> keyEvent)
                 return false;
             }
             keys_[size - 1].delay = sequenceKey.actionTime - keys_[size - 1].actionTime;
-            InterruptTimers();
+            for (Sequence& item : filterSequences_) {
+                if (item.timerId >= 0) {
+                    MMI_HILOGD("The key sequence change, close the timer");
+                    TimerMgr->RemoveTimer(item.timerId);
+                    item.timerId = -1;
+                }
+            }
         }
     }
+
+    if (size > MAX_SEQUENCEKEYS_NUM) {
+        MMI_HILOGD("The save key size more than the max size");
+        return false;
+    }
     keys_.push_back(sequenceKey);
     return true;
 }
@@ -1028,51 +961,5 @@ void ShortcutKey::Print() const
     MMI_HILOGD("Eventkey matched, finalKey:%{public}d, bundleName:%{public}s",
         finalKey, ability.bundleName.c_str());
 }
-
-void KeyCommandHandler::RemoveSubscribedTimer(int32_t keyCode)
-{
-    CALL_DEBUG_ENTER;
-    auto iter = specialTimers_.find(keyCode);
-    if (iter != specialTimers_.end()) {
-        for (auto& item : iter->second) {
-            TimerMgr->RemoveTimer(item);
-        }
-        specialTimers_.erase(keyCode);
-        MMI_HILOGD("Remove timer success");
-    }
-}
-
-void KeyCommandHandler::HandleSpecialKeys(int32_t keyCode, int32_t keyAction)
-{
-    CALL_DEBUG_ENTER;
-    auto iter = specialKeys_.find(keyCode);
-    if (keyAction == KeyEvent::KEY_ACTION_UP) {
-        if (iter != specialKeys_.end()) {
-            specialKeys_.erase(iter);
-            return;
-        }
-    }
-
-    if (keyAction == KeyEvent::KEY_ACTION_DOWN) {
-        if (iter == specialKeys_.end()) {
-            auto it = specialKeys_.emplace(keyCode, keyAction);
-            if (!it.second) {
-                MMI_HILOGD("KeyCode duplicated");
-                return;
-            }
-        }
-    }
-}
-
-void KeyCommandHandler::InterruptTimers()
-{
-    for (Sequence& item : filterSequences_) {
-        if (item.timerId >= 0) {
-            MMI_HILOGD("The key sequence change, close the timer");
-            TimerMgr->RemoveTimer(item.timerId);
-            item.timerId = -1;
-        }
-    }
-}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/service/subscriber/include/key_subscriber_handler.h b/service/subscriber/include/key_subscriber_handler.h
index f583f56551..c10a4eb227 100644
--- a/service/subscriber/include/key_subscriber_handler.h
+++ b/service/subscriber/include/key_subscriber_handler.h
@@ -47,7 +47,6 @@ public:
     int32_t SubscribeKeyEvent(SessionPtr sess, int32_t subscribeId,
             const std::shared_ptr<KeyOption> keyOption);
     int32_t UnsubscribeKeyEvent(SessionPtr sess, int32_t subscribeId);
-    void RemoveSubscriberKeyUpTimer(int32_t keyCode);
     void Dump(int32_t fd, const std::vector<std::string> &args);
 private:
     struct Subscriber {
@@ -62,13 +61,16 @@ private:
     void InsertSubScriber(std::shared_ptr<Subscriber> subs);
 
 private:
-    bool OnSubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
+    bool SubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
     bool HandleKeyDown(const std::shared_ptr<KeyEvent> &keyEvent);
     bool HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent);
     bool HandleKeyCancel(const std::shared_ptr<KeyEvent> &keyEvent);
+
     bool IsPreKeysMatch(const std::set<int32_t> &preKeys, const std::vector<int32_t> &pressedKeys) const;
+
     void NotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
-        const std::shared_ptr<Subscriber> &subscriber);
+            const std::shared_ptr<Subscriber> &subscriber);
+
     bool AddTimer(const std::shared_ptr<Subscriber> &subscriber, const std::shared_ptr<KeyEvent> &keyEvent);
     void ClearTimer(const std::shared_ptr<Subscriber> &subscriber);
     void OnTimer(const std::shared_ptr<Subscriber> subscriber);
@@ -77,14 +79,11 @@ private:
     bool CloneKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
     void RemoveKeyCode(int32_t keyCode, std::vector<int32_t> &keyCodes);
     bool IsRepeatedKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
-    bool IsNotifyPowerKeySubsciber(int32_t keyCode, const std::vector<int32_t> &keyCodes);
-    void HandleKeyUpWithDelay(std::shared_ptr<KeyEvent> keyEvent, const std::shared_ptr<Subscriber> &subscriber);
-    void PrintKeyUpLog(const std::shared_ptr<Subscriber> &subscriber);
 
 private:
     std::list<std::shared_ptr<Subscriber>> subscribers_ {};
     bool callbackInitialized_ { false };
-    bool hasEventExecuting_ { false };
+    bool hasEventExecuting { false };
     std::shared_ptr<KeyEvent> keyEvent_ { nullptr };
 };
 } // namespace MMI
diff --git a/service/subscriber/src/key_subscriber_handler.cpp b/service/subscriber/src/key_subscriber_handler.cpp
index 4f6cf018fe..58990b466d 100644
--- a/service/subscriber/src/key_subscriber_handler.cpp
+++ b/service/subscriber/src/key_subscriber_handler.cpp
@@ -36,7 +36,7 @@ constexpr uint32_t MAX_PRE_KEY_COUNT = 4;
 void KeySubscriberHandler::HandleKeyEvent(const std::shared_ptr<KeyEvent> keyEvent)
 {
     CHKPV(keyEvent);
-    if (OnSubscribeKeyEvent(keyEvent)) {
+    if (SubscribeKeyEvent(keyEvent)) {
         MMI_HILOGD("Subscribe keyEvent filter success. keyCode:%{public}d", keyEvent->GetKeyCode());
         BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::KEY_SUBSCRIBE_EVENT);
         return;
@@ -83,8 +83,8 @@ int32_t KeySubscriberHandler::SubscribeKeyEvent(
     for (const auto &keyCode : keyOption->GetPreKeys()) {
         MMI_HILOGD("keyOption->prekey:%{public}d", keyCode);
     }
-    MMI_HILOGD("subscribeId:%{public}d, keyOption->finalKey:%{public}d,"
-        "keyOption->isFinalKeyDown:%{public}s, keyOption->finalKeyDownDuration:%{public}d",
+    MMI_HILOGD("subscribeId:%{public}d,keyOption->finalKey:%{public}d,"
+        "keyOption->isFinalKeyDown:%{public}s,keyOption->finalKeyDownDuration:%{public}d",
         subscribeId, keyOption->GetFinalKey(), keyOption->IsFinalKeyDown() ? "true" : "false",
         keyOption->GetFinalKeyDownDuration());
     auto subscriber = std::make_shared<Subscriber>(subscribeId, sess, keyOption);
@@ -107,7 +107,7 @@ int32_t KeySubscriberHandler::UnsubscribeKeyEvent(SessionPtr sess, int32_t subsc
     return RET_ERR;
 }
 
-bool KeySubscriberHandler::OnSubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
+bool KeySubscriberHandler::SubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
 {
     CHKPF(keyEvent);
     if (IsRepeatedKeyEvent(keyEvent)) {
@@ -116,7 +116,7 @@ bool KeySubscriberHandler::OnSubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEven
     }
     keyEvent_ = KeyEvent::Clone(keyEvent);
     int32_t keyAction = keyEvent->GetKeyAction();
-    MMI_HILOGD("keyCode:%{public}d, keyAction:%{public}s", keyEvent->GetKeyCode(),
+    MMI_HILOGD("keyCode:%{public}d,keyAction:%{public}s", keyEvent->GetKeyCode(),
         KeyEvent::ActionToString(keyAction));
     for (const auto &keyCode : keyEvent->GetPressedKeys()) {
         MMI_HILOGD("Pressed KeyCode:%{public}d", keyCode);
@@ -125,10 +125,10 @@ bool KeySubscriberHandler::OnSubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEven
     if (keyAction == KeyEvent::KEY_ACTION_DOWN) {
         handled = HandleKeyDown(keyEvent);
     } else if (keyAction == KeyEvent::KEY_ACTION_UP) {
-        hasEventExecuting_ = false;
+        hasEventExecuting = false;
         handled = HandleKeyUp(keyEvent);
     } else if (keyAction == KeyEvent::KEY_ACTION_CANCEL) {
-        hasEventExecuting_ = false;
+        hasEventExecuting = false;
         handled = HandleKeyCancel(keyEvent);
     } else {
         MMI_HILOGW("keyAction exception");
@@ -164,13 +164,9 @@ void KeySubscriberHandler::OnSessionDelete(SessionPtr sess)
     }
 }
 
-bool KeySubscriberHandler::IsPreKeysMatch(const std::set<int32_t> &preKeys,
-                                          const std::vector<int32_t> &pressedKeys) const
+bool KeySubscriberHandler::IsPreKeysMatch(
+    const std::set<int32_t> &preKeys, const std::vector<int32_t> &pressedKeys) const
 {
-    if (preKeys.size() == 0) {
-        return true;
-    }
-
     if (preKeys.size() != pressedKeys.size()) {
         return false;
     }
@@ -186,7 +182,7 @@ bool KeySubscriberHandler::IsPreKeysMatch(const std::set<int32_t> &preKeys,
 }
 
 void KeySubscriberHandler::NotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
-                                            const std::shared_ptr<Subscriber> &subscriber)
+    const std::shared_ptr<Subscriber> &subscriber)
 {
     CALL_DEBUG_ENTER;
     CHKPV(keyEvent);
@@ -208,7 +204,7 @@ void KeySubscriberHandler::NotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
 }
 
 bool KeySubscriberHandler::AddTimer(const std::shared_ptr<Subscriber> &subscriber,
-                                    const std::shared_ptr<KeyEvent> &keyEvent)
+    const std::shared_ptr<KeyEvent> &keyEvent)
 {
     CALL_DEBUG_ENTER;
     CHKPF(keyEvent);
@@ -220,9 +216,7 @@ bool KeySubscriberHandler::AddTimer(const std::shared_ptr<Subscriber> &subscribe
     }
 
     auto &keyOption = subscriber->keyOption_;
-    bool isKeyDown = keyOption->IsFinalKeyDown();
-    int32_t duration = isKeyDown ? keyOption->GetFinalKeyDownDuration() : keyOption->GetFinalKeyUpDelay();
-    if (duration <= 0) {
+    if (keyOption->GetFinalKeyDownDuration() <= 0) {
         MMI_HILOGE("Leave, duration <= 0");
         return true;
     }
@@ -233,7 +227,7 @@ bool KeySubscriberHandler::AddTimer(const std::shared_ptr<Subscriber> &subscribe
     }
 
     std::weak_ptr<Subscriber> weakSubscriber = subscriber;
-    subscriber->timerId_ = TimerMgr->AddTimer(duration, 1, [this, weakSubscriber] () {
+    subscriber->timerId_ = TimerMgr->AddTimer(keyOption->GetFinalKeyDownDuration(), 1, [this, weakSubscriber] () {
         MMI_HILOGD("Timer callback");
         auto subscriber = weakSubscriber.lock();
         CHKPV(subscriber);
@@ -245,10 +239,10 @@ bool KeySubscriberHandler::AddTimer(const std::shared_ptr<Subscriber> &subscribe
         return false;
     }
     subscriber->keyEvent_ = keyEvent_;
-    hasEventExecuting_ = true;
+    hasEventExecuting = true;
     MMI_HILOGD("Leave, add timer success, subscribeId:%{public}d,"
-        "duration:%{public}d, timerId:%{public}d",
-        subscriber->id_, duration, subscriber->timerId_);
+        "duration:%{public}d,timerId:%{public}d",
+        subscriber->id_, keyOption->GetFinalKeyDownDuration(), subscriber->timerId_);
     return true;
 }
 
@@ -258,23 +252,22 @@ void KeySubscriberHandler::ClearTimer(const std::shared_ptr<Subscriber> &subscri
     CHKPV(subscriber);
 
     if (subscriber->timerId_ < 0) {
-        MMI_HILOGW("Leave, subscribeId:%{public}d, null timerId < 0", subscriber->id_);
+        MMI_HILOGW("Leave, subscribeId:%{public}d,null timerId < 0", subscriber->id_);
         return;
     }
 
-    TimerMgr->RemoveTimer(subscriber->timerId_);
     auto timerId = subscriber->timerId_;
     subscriber->keyEvent_.reset();
     subscriber->timerId_ = -1;
-    hasEventExecuting_ = false;
-    MMI_HILOGD("subscribeId:%{public}d, timerId:%{public}d", subscriber->id_, timerId);
+    TimerMgr->RemoveTimer(timerId);
+    hasEventExecuting = false;
+    MMI_HILOGD("subscribeId:%{public}d,timerId:%{public}d", subscriber->id_, timerId);
 }
 
 void KeySubscriberHandler::OnTimer(const std::shared_ptr<Subscriber> subscriber)
 {
     CALL_DEBUG_ENTER;
     CHKPV(subscriber);
-    hasEventExecuting_ = false;
     subscriber->timerId_ = -1;
     if (subscriber->keyEvent_ == nullptr) {
         MMI_HILOGE("Leave, subscriber->keyEvent is nullptr, subscribeId:%{public}d", subscriber->id_);
@@ -312,8 +305,8 @@ bool KeySubscriberHandler::HandleKeyDown(const std::shared_ptr<KeyEvent> &keyEve
     RemoveKeyCode(keyCode, pressedKeys);
     for (const auto &subscriber : subscribers_) {
         auto &keyOption = subscriber->keyOption_;
-        MMI_HILOGD("subscribeId:%{public}d, keyOption->finalKey:%{public}d,"
-            "keyOption->isFinalKeyDown:%{public}s, keyOption->finalKeyDownDuration:%{public}d",
+        MMI_HILOGD("subscribeId:%{public}d,keyOption->finalKey:%{public}d,"
+            "keyOption->isFinalKeyDown:%{public}s,keyOption->finalKeyDownDuration:%{public}d",
             subscriber->id_, keyOption->GetFinalKey(), keyOption->IsFinalKeyDown() ? "true" : "false",
             keyOption->GetFinalKeyDownDuration());
         for (const auto &keyCode : keyOption->GetPreKeys()) {
@@ -361,8 +354,15 @@ bool KeySubscriberHandler::HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent
     std::vector<int32_t> pressedKeys = keyEvent->GetPressedKeys();
     RemoveKeyCode(keyCode, pressedKeys);
     for (const auto &subscriber : subscribers_) {
-        PrintKeyUpLog(subscriber);
         auto &keyOption = subscriber->keyOption_;
+        MMI_HILOGD("subscribeId:%{public}d,keyOption->finalKey:%{public}d,"
+            "keyOption->isFinalKeyDown:%{public}s,keyOption->finalKeyDownDuration:%{public}d",
+            subscriber->id_, keyOption->GetFinalKey(), keyOption->IsFinalKeyDown() ? "true" : "false",
+            keyOption->GetFinalKeyDownDuration());
+        for (const auto &keyCode : keyOption->GetPreKeys()) {
+            MMI_HILOGD("keyOption->prekey:%{public}d", keyCode);
+        }
+
         if (keyOption->IsFinalKeyDown()) {
             ClearTimer(subscriber);
             MMI_HILOGD("keyOption->IsFinalKeyDown()");
@@ -379,15 +379,10 @@ bool KeySubscriberHandler::HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent
             continue;
         }
 
-        if (!IsNotifyPowerKeySubsciber(keyOption->GetFinalKey(), pressedKeys)) {
-            MMI_HILOGD("In special case, subscriber are not notified");
-            continue;
-        }
-
         auto duration = keyOption->GetFinalKeyDownDuration();
         if (duration <= 0) {
             MMI_HILOGD("duration <= 0");
-            HandleKeyUpWithDelay(keyEvent, subscriber);
+            NotifySubscriber(keyEvent, subscriber);
             handled = true;
             continue;
         }
@@ -401,7 +396,7 @@ bool KeySubscriberHandler::HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent
             continue;
         }
         MMI_HILOGD("upTime - downTime < duration");
-        HandleKeyUpWithDelay(keyEvent, subscriber);
+        NotifySubscriber(keyEvent, subscriber);
         handled = true;
     }
     MMI_HILOGD("%{public}s", handled ? "true" : "false");
@@ -422,7 +417,7 @@ bool KeySubscriberHandler::CloneKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
 {
     CHKPF(keyEvent);
     if (keyEvent_ == nullptr) {
-        MMI_HILOGW("keyEvent_ is nullptr");
+        MMI_HILOGW("The keyEvent_ is nullptr");
         keyEvent_ = KeyEvent::Clone(keyEvent);
     }
     CHKPF(keyEvent_);
@@ -442,7 +437,7 @@ void KeySubscriberHandler::RemoveKeyCode(int32_t keyCode, std::vector<int32_t> &
 bool KeySubscriberHandler::IsRepeatedKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
 {
     CHKPF(keyEvent);
-    if (!hasEventExecuting_) {
+    if (!hasEventExecuting) {
         return false;
     }
 
@@ -474,56 +469,6 @@ bool KeySubscriberHandler::IsRepeatedKeyEvent(std::shared_ptr<KeyEvent> keyEvent
     return true;
 }
 
-void KeySubscriberHandler::RemoveSubscriberKeyUpTimer(int32_t keyCode)
-{
-    for (const auto& item : subscribers_) {
-        if ((item->timerId_ >= 0) && (item->keyOption_->GetFinalKey() == keyCode)) {
-            ClearTimer(item);
-        }
-    }
-}
-
-bool KeySubscriberHandler::IsNotifyPowerKeySubsciber(int32_t keyCode, const std::vector<int32_t> &keyCodes)
-{
-    if (keyCode != KeyEvent::KEYCODE_POWER) {
-        return true;
-    }
-
-    for (const auto& pressedKey: keyCodes) {
-        if (pressedKey == KeyEvent::KEYCODE_VOLUME_DOWN || pressedKey == KeyEvent::KEYCODE_VOLUME_UP) {
-            return false;
-        }
-    }
-    return true;
-}
-
-void KeySubscriberHandler::HandleKeyUpWithDelay(std::shared_ptr<KeyEvent> keyEvent,
-    const std::shared_ptr<Subscriber> &subscriber)
-{
-    auto keyUpDelay = subscriber->keyOption_->GetFinalKeyUpDelay();
-    if (keyUpDelay <= 0) {
-        NotifySubscriber(keyEvent, subscriber);
-    } else {
-        if (!AddTimer(subscriber, keyEvent)) {
-            MMI_HILOGE("Leave, add timer failed");
-        }
-    }
-}
-
-void KeySubscriberHandler::PrintKeyUpLog(const std::shared_ptr<Subscriber> &subscriber)
-{
-    CHKPV(subscriber);
-    auto &keyOption = subscriber->keyOption_;
-    MMI_HILOGD("subscribeId:%{public}d, keyOption->finalKey:%{public}d,"
-        "keyOption->isFinalKeyDown:%{public}s, keyOption->finalKeyDownDuration:%{public}d,"
-        "keyOption->finalKeyUpDelay:%{public}d",
-        subscriber->id_, keyOption->GetFinalKey(), keyOption->IsFinalKeyDown() ? "true" : "false",
-        keyOption->GetFinalKeyDownDuration(), keyOption->GetFinalKeyUpDelay());
-    for (const auto &keyCode : keyOption->GetPreKeys()) {
-        MMI_HILOGD("keyOption->prekey:%{public}d", keyCode);
-    }
-}
-
 void KeySubscriberHandler::Dump(int32_t fd, const std::vector<std::string> &args)
 {
     CALL_DEBUG_ENTER;
-- 
Gitee


From 0dfd52c1986c59156055ab8959992c0520e9f519 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Sat, 26 Nov 2022 15:58:28 +0800
Subject: [PATCH 180/360] volumn down+power start capturing screen, conflict
 resolved

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I69baad62282a19c8787511662f13966642d0719e
---
 frameworks/proxy/events/src/key_option.cpp    |  16 +-
 .../innerkits/event/include/key_option.h      |  13 ++
 .../include/input_event_handler.h             |   3 +
 .../event_handler/src/input_event_handler.cpp |  13 +-
 .../key_command/include/key_command_handler.h |   5 +
 .../key_command/src/key_command_handler.cpp   | 158 +++++++++++++++---
 .../include/key_subscriber_handler.h          |  13 +-
 .../subscriber/src/key_subscriber_handler.cpp | 123 ++++++++++----
 8 files changed, 276 insertions(+), 68 deletions(-)

diff --git a/frameworks/proxy/events/src/key_option.cpp b/frameworks/proxy/events/src/key_option.cpp
index 52ca91429e..46fe96b6d6 100644
--- a/frameworks/proxy/events/src/key_option.cpp
+++ b/frameworks/proxy/events/src/key_option.cpp
@@ -57,11 +57,21 @@ int32_t KeyOption::GetFinalKeyDownDuration() const
     return finalKeyDownDuration_;
 }
 
+int32_t KeyOption::GetFinalKeyUpDelay() const
+{
+    return finalKeyUpDelay_;
+}
+
 void KeyOption::SetFinalKeyDownDuration(int32_t duration)
 {
     finalKeyDownDuration_ = duration;
 }
 
+void KeyOption::SetFinalKeyUpDelay(int32_t delay)
+{
+    finalKeyUpDelay_ = delay;
+}
+
 bool KeyOption::ReadFromParcel(Parcel &in)
 {
     int32_t preKeysSize;
@@ -82,7 +92,8 @@ bool KeyOption::ReadFromParcel(Parcel &in)
     return (
         in.ReadInt32(finalKey_) &&
         in.ReadBool(isFinalKeyDown_) &&
-        in.ReadInt32(finalKeyDownDuration_)
+        in.ReadInt32(finalKeyDownDuration_) &&
+        in.ReadInt32(finalKeyUpDelay_)
     );
 }
 
@@ -101,7 +112,8 @@ bool KeyOption::WriteToParcel(Parcel &out) const
     return (
         out.WriteInt32(finalKey_) &&
         out.WriteBool(isFinalKeyDown_) &&
-        out.WriteInt32(finalKeyDownDuration_)
+        out.WriteInt32(finalKeyDownDuration_) &&
+        out.WriteInt32(finalKeyUpDelay_)
     );
 }
 } // namespace MMI
diff --git a/interfaces/native/innerkits/event/include/key_option.h b/interfaces/native/innerkits/event/include/key_option.h
index 34d8eb846a..14ce2267c6 100644
--- a/interfaces/native/innerkits/event/include/key_option.h
+++ b/interfaces/native/innerkits/event/include/key_option.h
@@ -87,6 +87,12 @@ public:
      */
     int32_t GetFinalKeyDownDuration() const;
 
+    /**
+     * @brief 获取最后一个按键抬起的延时时间，当最后一个按键抬起时，会延时触发订阅
+     * @return
+     */
+    int32_t GetFinalKeyUpDelay() const;
+
     /**
      * @brief Sets the duration when the final key is held down or the maximum duration between when
      * the key is pressed and when the key is released.
@@ -100,6 +106,12 @@ public:
      */
     void SetFinalKeyDownDuration(int32_t duration);
 
+    /**
+     * @brief 设置最后一个按键抬起后的延时时间
+     * @param delay
+     */
+    void SetFinalKeyUpDelay(int32_t delay);
+
 public:
     /**
      * @brief Writes data to a <b>Parcel</b> object.
@@ -122,6 +134,7 @@ private:
     int32_t finalKey_ { -1 };
     bool isFinalKeyDown_ { false };
     int32_t finalKeyDownDuration_ { 0 };
+    int32_t finalKeyUpDelay_ { 0 };
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/event_handler/include/input_event_handler.h b/service/event_handler/include/input_event_handler.h
index 4461d6d5b2..10f0585bf5 100644
--- a/service/event_handler/include/input_event_handler.h
+++ b/service/event_handler/include/input_event_handler.h
@@ -28,6 +28,7 @@
 #include "i_event_filter.h"
 #include "i_input_event_handler.h"
 #include "key_subscriber_handler.h"
+#include "key_command_handler.h"
 #include "mouse_event_normalize.h"
 
 namespace OHOS {
@@ -45,6 +46,7 @@ public:
     std::shared_ptr<EventNormalizeHandler> GetEventNormalizeHandler() const;
     std::shared_ptr<EventInterceptorHandler> GetInterceptorHandler() const;
     std::shared_ptr<KeySubscriberHandler> GetSubscriberHandler() const;
+    std::shared_ptr<KeyCommandHandler> GetKeyCommandHandler() const;
     std::shared_ptr<EventMonitorHandler> GetMonitorHandler() const;
     std::shared_ptr<EventFilterHandler> GetFilterHandler() const;
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
@@ -60,6 +62,7 @@ private:
     std::shared_ptr<EventFilterHandler> eventFilterHandler_ { nullptr };
     std::shared_ptr<EventInterceptorHandler> eventInterceptorHandler_ { nullptr };
     std::shared_ptr<KeySubscriberHandler> eventSubscriberHandler_ { nullptr };
+    std::shared_ptr<KeyCommandHandler> eventKeyCommandHandler_ { nullptr };
     std::shared_ptr<EventMonitorHandler> eventMonitorHandler_ { nullptr };
 
     uint64_t idSeed_ { 0 };
diff --git a/service/event_handler/src/input_event_handler.cpp b/service/event_handler/src/input_event_handler.cpp
index 59f5b6a6c5..894fb34f47 100644
--- a/service/event_handler/src/input_event_handler.cpp
+++ b/service/event_handler/src/input_event_handler.cpp
@@ -104,10 +104,10 @@ int32_t InputEventHandler::BuildInputHandlerChain()
 
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
 #ifdef OHOS_BUILD_ENABLE_COMBINATION_KEY
-    auto keyCommandHandler = std::make_shared<KeyCommandHandler>();
-    CHKPR(keyCommandHandler, ERROR_NULL_POINTER);
-    handler->SetNext(keyCommandHandler);
-    handler = keyCommandHandler;
+    eventKeyCommandHandler_ = std::make_shared<KeyCommandHandler>();
+    CHKPR(eventKeyCommandHandler_, ERROR_NULL_POINTER);
+    handler->SetNext(eventKeyCommandHandler_);
+    handler = eventKeyCommandHandler_;
 #endif // OHOS_BUILD_ENABLE_COMBINATION_KEY
     eventSubscriberHandler_ = std::make_shared<KeySubscriberHandler>();
     CHKPR(eventSubscriberHandler_, ERROR_NULL_POINTER);
@@ -146,6 +146,11 @@ std::shared_ptr<KeySubscriberHandler> InputEventHandler::GetSubscriberHandler()
     return eventSubscriberHandler_;
 }
 
+std::shared_ptr<KeyCommandHandler> InputEventHandler::GetKeyCommandHandler() const
+{
+    return eventKeyCommandHandler_;
+}
+
 std::shared_ptr<EventMonitorHandler> InputEventHandler::GetMonitorHandler() const
 {
     return eventMonitorHandler_;
diff --git a/service/key_command/include/key_command_handler.h b/service/key_command/include/key_command_handler.h
index 263cf98a4f..d0bedb5d11 100755
--- a/service/key_command/include/key_command_handler.h
+++ b/service/key_command/include/key_command_handler.h
@@ -104,6 +104,9 @@ private:
     bool HandleSequences(const std::shared_ptr<KeyEvent> keyEvent);
     bool HandleShortKeys(const std::shared_ptr<KeyEvent> keyEvent);
     bool AddSequenceKey(const std::shared_ptr<KeyEvent> keyEvent);
+    void RemoveSubscribedTimer(int32_t keyCode);
+    void HandleSpecialKeys(int32_t keyCode, int32_t keyAction);
+    void InterruptTimers();
     void ResetLastMatchedKey()
     {
         lastMatchedKey_.preKeys.clear();
@@ -125,6 +128,8 @@ private:
     std::vector<Sequence> filterSequences_;
     std::vector<SequenceKey> keys_;
     bool isParseConfig_ { false };
+    std::map<int32_t, int32_t> specialKeys_;
+    std::map<int32_t, std::list<int32_t>> specialTimers_;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index 93bfbe4ca5..c41c7ea245 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -17,22 +17,39 @@
 
 #include "dfx_hisysevent.h"
 #include "ability_manager_client.h"
+#include "bytrace_adapter.h"
 #include "cJSON.h"
 #include "config_policy_utils.h"
-#include "file_ex.h"
-#include "bytrace_adapter.h"
+#include "define_multimodal.h"
 #include "error_multimodal.h"
+#include "file_ex.h"
+#include "input_event_data_transformation.h"
+#include "input_event_handler.h"
 #include "mmi_log.h"
+#include "net_packet.h"
+#include "proto.h"
 #include "timer_manager.h"
+#include "util_ex.h"
 
 namespace OHOS {
 namespace MMI {
 namespace {
 constexpr int32_t MAX_PREKEYS_NUM = 4;
 constexpr int32_t MAX_SEQUENCEKEYS_NUM = 10;
-constexpr int64_t MAX_DELAY_TIME = 3000000;
+constexpr int64_t MAX_DELAY_TIME = 1000000;
 constexpr int64_t SECONDS_SYSTEM = 1000;
+constexpr int32_t SPECIAL_KEY_DOWN_DELAY = 150;
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "KeyCommandHandler" };
+enum SpecialType {
+    SPECIAL_ALL = 0,
+    SUBSCRIBER_BEFORE_DELAY = 1,
+    KEY_DOWN_ACTION = 2
+};
+const std::map<int32_t, SpecialType> SPECIAL_KEYS = {
+    { KeyEvent::KEYCODE_POWER, SpecialType::KEY_DOWN_ACTION },
+    { KeyEvent::KEYCODE_VOLUME_DOWN, SpecialType::SPECIAL_ALL },
+    { KeyEvent::KEYCODE_VOLUME_UP, SpecialType::SUBSCRIBER_BEFORE_DELAY }
+};
 struct JsonParser {
     JsonParser() = default;
     ~JsonParser()
@@ -48,6 +65,15 @@ struct JsonParser {
     cJSON *json_ { nullptr };
 };
 
+bool IsSpecialType(int32_t keyCode, SpecialType type)
+{
+    auto it = SPECIAL_KEYS.find(keyCode);
+    if (it == SPECIAL_KEYS.end()) {
+        return false;
+    }
+    return (it->second == SpecialType::SPECIAL_ALL || it->second == type);
+}
+
 bool GetPreKeys(const cJSON* jsonData, ShortcutKey &shortcutKey)
 {
     if (!cJSON_IsObject(jsonData)) {
@@ -584,8 +610,9 @@ bool KeyCommandHandler::ParseJson(const std::string &configFile)
         return false;
     }
 
-    if (!ParseShortcutKeys(parser, shortcutKeys_) &&
-        !ParseSequences(parser, sequences_)) {
+    bool isParseShortKeys = ParseShortcutKeys(parser, shortcutKeys_);
+    bool isParseSequences = ParseSequences(parser, sequences_);
+    if (!isParseShortKeys && !isParseSequences) {
         MMI_HILOGE("Parse configFile failed");
         return false;
     }
@@ -638,12 +665,50 @@ bool KeyCommandHandler::OnHandleEvent(const std::shared_ptr<KeyEvent> key)
         }
         isParseConfig_ = true;
     }
-    if (!HandleShortKeys(key) ||
-        !HandleSequences(key)) {
-        MMI_HILOGD("Shortkeys and Sequences is empty");
-        return false;
+
+    bool isHandled = HandleShortKeys(key);
+    isHandled = HandleSequences(key) || isHandled;
+    if (isHandled) {
+        return true;
     }
-    return true;
+
+    if (!specialKeys_.empty() && specialKeys_.find(key->GetKeyCode()) != specialKeys_.end()) {
+        HandleSpecialKeys(key->GetKeyCode(), key->GetAction());
+        return true;
+    }
+
+    if (IsSpecialType(key->GetKeyCode(), SpecialType::SUBSCRIBER_BEFORE_DELAY)) {
+        auto tmpKey = KeyEvent::Clone(key);
+        int32_t timerId = TimerMgr->AddTimer(SPECIAL_KEY_DOWN_DELAY, 1, [this, tmpKey] () {
+            MMI_HILOGD("Timer callback");
+            auto it = specialTimers_.find(tmpKey->GetKeyCode());
+            if (it != specialTimers_.end() && !it->second.empty()) {
+                it->second.pop_front();
+            }
+            InputHandler->GetSubscriberHandler()->HandleKeyEvent(tmpKey);
+        });
+        if (timerId < 0) {
+            MMI_HILOGE("Add timer failed");
+            return false;
+        }
+
+        auto it = specialTimers_.find(key->GetKeyCode());
+        if (it == specialTimers_.end()) {
+            std::list<int32_t> timerIds;
+            timerIds.push_back(timerId);
+            auto it = specialTimers_.emplace(key->GetKeyCode(), timerIds);
+            if (!it.second) {
+                MMI_HILOGE("Keycode duplicated");
+                return false;
+            }
+        } else {
+            it->second.push_back(timerId);
+        }
+        MMI_HILOGD("Add timer success");
+        return true;
+    }
+    
+    return false;
 }
 
 bool KeyCommandHandler::HandleShortKeys(const std::shared_ptr<KeyEvent> keyEvent)
@@ -723,6 +788,16 @@ bool KeyCommandHandler::HandleSequences(const std::shared_ptr<KeyEvent> keyEvent
         }
     }
 
+    if (isLaunchAbility) {
+        for (const auto& item : keys_) {
+            if (IsSpecialType(item.keyCode, SpecialType::KEY_DOWN_ACTION)) {
+                HandleSpecialKeys(item.keyCode, item.keyAction);
+            }
+            InputHandler->GetSubscriberHandler()->RemoveSubscriberKeyUpTimer(item.keyCode);
+            RemoveSubscribedTimer(item.keyCode);
+        }
+    }
+
     if (tempSeqs.empty()) {
         MMI_HILOGD("No matching sequence found");
     } else {
@@ -740,6 +815,10 @@ bool KeyCommandHandler::AddSequenceKey(const std::shared_ptr<KeyEvent> keyEvent)
     sequenceKey.keyAction = keyEvent->GetKeyAction();
     sequenceKey.actionTime = keyEvent->GetActionTime();
     size_t size = keys_.size();
+    if (size > MAX_SEQUENCEKEYS_NUM) {
+        MMI_HILOGD("The save key size more than the max size");
+        return false;
+    }
     if (size > 0) {
         if (keys_[size - 1].actionTime > sequenceKey.actionTime) {
             MMI_HILOGE("The current event time is greater than the last event time");
@@ -755,20 +834,9 @@ bool KeyCommandHandler::AddSequenceKey(const std::shared_ptr<KeyEvent> keyEvent)
                 return false;
             }
             keys_[size - 1].delay = sequenceKey.actionTime - keys_[size - 1].actionTime;
-            for (Sequence& item : filterSequences_) {
-                if (item.timerId >= 0) {
-                    MMI_HILOGD("The key sequence change, close the timer");
-                    TimerMgr->RemoveTimer(item.timerId);
-                    item.timerId = -1;
-                }
-            }
+            InterruptTimers();
         }
     }
-
-    if (size > MAX_SEQUENCEKEYS_NUM) {
-        MMI_HILOGD("The save key size more than the max size");
-        return false;
-    }
     keys_.push_back(sequenceKey);
     return true;
 }
@@ -961,5 +1029,51 @@ void ShortcutKey::Print() const
     MMI_HILOGD("Eventkey matched, finalKey:%{public}d, bundleName:%{public}s",
         finalKey, ability.bundleName.c_str());
 }
+
+void KeyCommandHandler::RemoveSubscribedTimer(int32_t keyCode)
+{
+    CALL_DEBUG_ENTER;
+    auto iter = specialTimers_.find(keyCode);
+    if (iter != specialTimers_.end()) {
+        for (auto& item : iter->second) {
+            TimerMgr->RemoveTimer(item);
+        }
+        specialTimers_.erase(keyCode);
+        MMI_HILOGD("Remove timer success");
+    }
+}
+
+void KeyCommandHandler::HandleSpecialKeys(int32_t keyCode, int32_t keyAction)
+{
+    CALL_DEBUG_ENTER;
+    auto iter = specialKeys_.find(keyCode);
+    if (keyAction == KeyEvent::KEY_ACTION_UP) {
+        if (iter != specialKeys_.end()) {
+            specialKeys_.erase(iter);
+            return;
+        }
+    }
+
+    if (keyAction == KeyEvent::KEY_ACTION_DOWN) {
+        if (iter == specialKeys_.end()) {
+            auto it = specialKeys_.emplace(keyCode, keyAction);
+            if (!it.second) {
+                MMI_HILOGD("KeyCode duplicated");
+                return;
+            }
+        }
+    }
+}
+
+void KeyCommandHandler::InterruptTimers()
+{
+    for (Sequence& item : filterSequences_) {
+        if (item.timerId >= 0) {
+            MMI_HILOGD("The key sequence change, close the timer");
+            TimerMgr->RemoveTimer(item.timerId);
+            item.timerId = -1;
+        }
+    }
+}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/service/subscriber/include/key_subscriber_handler.h b/service/subscriber/include/key_subscriber_handler.h
index c10a4eb227..f583f56551 100644
--- a/service/subscriber/include/key_subscriber_handler.h
+++ b/service/subscriber/include/key_subscriber_handler.h
@@ -47,6 +47,7 @@ public:
     int32_t SubscribeKeyEvent(SessionPtr sess, int32_t subscribeId,
             const std::shared_ptr<KeyOption> keyOption);
     int32_t UnsubscribeKeyEvent(SessionPtr sess, int32_t subscribeId);
+    void RemoveSubscriberKeyUpTimer(int32_t keyCode);
     void Dump(int32_t fd, const std::vector<std::string> &args);
 private:
     struct Subscriber {
@@ -61,16 +62,13 @@ private:
     void InsertSubScriber(std::shared_ptr<Subscriber> subs);
 
 private:
-    bool SubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
+    bool OnSubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
     bool HandleKeyDown(const std::shared_ptr<KeyEvent> &keyEvent);
     bool HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent);
     bool HandleKeyCancel(const std::shared_ptr<KeyEvent> &keyEvent);
-
     bool IsPreKeysMatch(const std::set<int32_t> &preKeys, const std::vector<int32_t> &pressedKeys) const;
-
     void NotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
-            const std::shared_ptr<Subscriber> &subscriber);
-
+        const std::shared_ptr<Subscriber> &subscriber);
     bool AddTimer(const std::shared_ptr<Subscriber> &subscriber, const std::shared_ptr<KeyEvent> &keyEvent);
     void ClearTimer(const std::shared_ptr<Subscriber> &subscriber);
     void OnTimer(const std::shared_ptr<Subscriber> subscriber);
@@ -79,11 +77,14 @@ private:
     bool CloneKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
     void RemoveKeyCode(int32_t keyCode, std::vector<int32_t> &keyCodes);
     bool IsRepeatedKeyEvent(std::shared_ptr<KeyEvent> keyEvent);
+    bool IsNotifyPowerKeySubsciber(int32_t keyCode, const std::vector<int32_t> &keyCodes);
+    void HandleKeyUpWithDelay(std::shared_ptr<KeyEvent> keyEvent, const std::shared_ptr<Subscriber> &subscriber);
+    void PrintKeyUpLog(const std::shared_ptr<Subscriber> &subscriber);
 
 private:
     std::list<std::shared_ptr<Subscriber>> subscribers_ {};
     bool callbackInitialized_ { false };
-    bool hasEventExecuting { false };
+    bool hasEventExecuting_ { false };
     std::shared_ptr<KeyEvent> keyEvent_ { nullptr };
 };
 } // namespace MMI
diff --git a/service/subscriber/src/key_subscriber_handler.cpp b/service/subscriber/src/key_subscriber_handler.cpp
index 58990b466d..4f6cf018fe 100644
--- a/service/subscriber/src/key_subscriber_handler.cpp
+++ b/service/subscriber/src/key_subscriber_handler.cpp
@@ -36,7 +36,7 @@ constexpr uint32_t MAX_PRE_KEY_COUNT = 4;
 void KeySubscriberHandler::HandleKeyEvent(const std::shared_ptr<KeyEvent> keyEvent)
 {
     CHKPV(keyEvent);
-    if (SubscribeKeyEvent(keyEvent)) {
+    if (OnSubscribeKeyEvent(keyEvent)) {
         MMI_HILOGD("Subscribe keyEvent filter success. keyCode:%{public}d", keyEvent->GetKeyCode());
         BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::KEY_SUBSCRIBE_EVENT);
         return;
@@ -83,8 +83,8 @@ int32_t KeySubscriberHandler::SubscribeKeyEvent(
     for (const auto &keyCode : keyOption->GetPreKeys()) {
         MMI_HILOGD("keyOption->prekey:%{public}d", keyCode);
     }
-    MMI_HILOGD("subscribeId:%{public}d,keyOption->finalKey:%{public}d,"
-        "keyOption->isFinalKeyDown:%{public}s,keyOption->finalKeyDownDuration:%{public}d",
+    MMI_HILOGD("subscribeId:%{public}d, keyOption->finalKey:%{public}d,"
+        "keyOption->isFinalKeyDown:%{public}s, keyOption->finalKeyDownDuration:%{public}d",
         subscribeId, keyOption->GetFinalKey(), keyOption->IsFinalKeyDown() ? "true" : "false",
         keyOption->GetFinalKeyDownDuration());
     auto subscriber = std::make_shared<Subscriber>(subscribeId, sess, keyOption);
@@ -107,7 +107,7 @@ int32_t KeySubscriberHandler::UnsubscribeKeyEvent(SessionPtr sess, int32_t subsc
     return RET_ERR;
 }
 
-bool KeySubscriberHandler::SubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
+bool KeySubscriberHandler::OnSubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
 {
     CHKPF(keyEvent);
     if (IsRepeatedKeyEvent(keyEvent)) {
@@ -116,7 +116,7 @@ bool KeySubscriberHandler::SubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
     }
     keyEvent_ = KeyEvent::Clone(keyEvent);
     int32_t keyAction = keyEvent->GetKeyAction();
-    MMI_HILOGD("keyCode:%{public}d,keyAction:%{public}s", keyEvent->GetKeyCode(),
+    MMI_HILOGD("keyCode:%{public}d, keyAction:%{public}s", keyEvent->GetKeyCode(),
         KeyEvent::ActionToString(keyAction));
     for (const auto &keyCode : keyEvent->GetPressedKeys()) {
         MMI_HILOGD("Pressed KeyCode:%{public}d", keyCode);
@@ -125,10 +125,10 @@ bool KeySubscriberHandler::SubscribeKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
     if (keyAction == KeyEvent::KEY_ACTION_DOWN) {
         handled = HandleKeyDown(keyEvent);
     } else if (keyAction == KeyEvent::KEY_ACTION_UP) {
-        hasEventExecuting = false;
+        hasEventExecuting_ = false;
         handled = HandleKeyUp(keyEvent);
     } else if (keyAction == KeyEvent::KEY_ACTION_CANCEL) {
-        hasEventExecuting = false;
+        hasEventExecuting_ = false;
         handled = HandleKeyCancel(keyEvent);
     } else {
         MMI_HILOGW("keyAction exception");
@@ -164,9 +164,13 @@ void KeySubscriberHandler::OnSessionDelete(SessionPtr sess)
     }
 }
 
-bool KeySubscriberHandler::IsPreKeysMatch(
-    const std::set<int32_t> &preKeys, const std::vector<int32_t> &pressedKeys) const
+bool KeySubscriberHandler::IsPreKeysMatch(const std::set<int32_t> &preKeys,
+                                          const std::vector<int32_t> &pressedKeys) const
 {
+    if (preKeys.size() == 0) {
+        return true;
+    }
+
     if (preKeys.size() != pressedKeys.size()) {
         return false;
     }
@@ -182,7 +186,7 @@ bool KeySubscriberHandler::IsPreKeysMatch(
 }
 
 void KeySubscriberHandler::NotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
-    const std::shared_ptr<Subscriber> &subscriber)
+                                            const std::shared_ptr<Subscriber> &subscriber)
 {
     CALL_DEBUG_ENTER;
     CHKPV(keyEvent);
@@ -204,7 +208,7 @@ void KeySubscriberHandler::NotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
 }
 
 bool KeySubscriberHandler::AddTimer(const std::shared_ptr<Subscriber> &subscriber,
-    const std::shared_ptr<KeyEvent> &keyEvent)
+                                    const std::shared_ptr<KeyEvent> &keyEvent)
 {
     CALL_DEBUG_ENTER;
     CHKPF(keyEvent);
@@ -216,7 +220,9 @@ bool KeySubscriberHandler::AddTimer(const std::shared_ptr<Subscriber> &subscribe
     }
 
     auto &keyOption = subscriber->keyOption_;
-    if (keyOption->GetFinalKeyDownDuration() <= 0) {
+    bool isKeyDown = keyOption->IsFinalKeyDown();
+    int32_t duration = isKeyDown ? keyOption->GetFinalKeyDownDuration() : keyOption->GetFinalKeyUpDelay();
+    if (duration <= 0) {
         MMI_HILOGE("Leave, duration <= 0");
         return true;
     }
@@ -227,7 +233,7 @@ bool KeySubscriberHandler::AddTimer(const std::shared_ptr<Subscriber> &subscribe
     }
 
     std::weak_ptr<Subscriber> weakSubscriber = subscriber;
-    subscriber->timerId_ = TimerMgr->AddTimer(keyOption->GetFinalKeyDownDuration(), 1, [this, weakSubscriber] () {
+    subscriber->timerId_ = TimerMgr->AddTimer(duration, 1, [this, weakSubscriber] () {
         MMI_HILOGD("Timer callback");
         auto subscriber = weakSubscriber.lock();
         CHKPV(subscriber);
@@ -239,10 +245,10 @@ bool KeySubscriberHandler::AddTimer(const std::shared_ptr<Subscriber> &subscribe
         return false;
     }
     subscriber->keyEvent_ = keyEvent_;
-    hasEventExecuting = true;
+    hasEventExecuting_ = true;
     MMI_HILOGD("Leave, add timer success, subscribeId:%{public}d,"
-        "duration:%{public}d,timerId:%{public}d",
-        subscriber->id_, keyOption->GetFinalKeyDownDuration(), subscriber->timerId_);
+        "duration:%{public}d, timerId:%{public}d",
+        subscriber->id_, duration, subscriber->timerId_);
     return true;
 }
 
@@ -252,22 +258,23 @@ void KeySubscriberHandler::ClearTimer(const std::shared_ptr<Subscriber> &subscri
     CHKPV(subscriber);
 
     if (subscriber->timerId_ < 0) {
-        MMI_HILOGW("Leave, subscribeId:%{public}d,null timerId < 0", subscriber->id_);
+        MMI_HILOGW("Leave, subscribeId:%{public}d, null timerId < 0", subscriber->id_);
         return;
     }
 
+    TimerMgr->RemoveTimer(subscriber->timerId_);
     auto timerId = subscriber->timerId_;
     subscriber->keyEvent_.reset();
     subscriber->timerId_ = -1;
-    TimerMgr->RemoveTimer(timerId);
-    hasEventExecuting = false;
-    MMI_HILOGD("subscribeId:%{public}d,timerId:%{public}d", subscriber->id_, timerId);
+    hasEventExecuting_ = false;
+    MMI_HILOGD("subscribeId:%{public}d, timerId:%{public}d", subscriber->id_, timerId);
 }
 
 void KeySubscriberHandler::OnTimer(const std::shared_ptr<Subscriber> subscriber)
 {
     CALL_DEBUG_ENTER;
     CHKPV(subscriber);
+    hasEventExecuting_ = false;
     subscriber->timerId_ = -1;
     if (subscriber->keyEvent_ == nullptr) {
         MMI_HILOGE("Leave, subscriber->keyEvent is nullptr, subscribeId:%{public}d", subscriber->id_);
@@ -305,8 +312,8 @@ bool KeySubscriberHandler::HandleKeyDown(const std::shared_ptr<KeyEvent> &keyEve
     RemoveKeyCode(keyCode, pressedKeys);
     for (const auto &subscriber : subscribers_) {
         auto &keyOption = subscriber->keyOption_;
-        MMI_HILOGD("subscribeId:%{public}d,keyOption->finalKey:%{public}d,"
-            "keyOption->isFinalKeyDown:%{public}s,keyOption->finalKeyDownDuration:%{public}d",
+        MMI_HILOGD("subscribeId:%{public}d, keyOption->finalKey:%{public}d,"
+            "keyOption->isFinalKeyDown:%{public}s, keyOption->finalKeyDownDuration:%{public}d",
             subscriber->id_, keyOption->GetFinalKey(), keyOption->IsFinalKeyDown() ? "true" : "false",
             keyOption->GetFinalKeyDownDuration());
         for (const auto &keyCode : keyOption->GetPreKeys()) {
@@ -354,15 +361,8 @@ bool KeySubscriberHandler::HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent
     std::vector<int32_t> pressedKeys = keyEvent->GetPressedKeys();
     RemoveKeyCode(keyCode, pressedKeys);
     for (const auto &subscriber : subscribers_) {
+        PrintKeyUpLog(subscriber);
         auto &keyOption = subscriber->keyOption_;
-        MMI_HILOGD("subscribeId:%{public}d,keyOption->finalKey:%{public}d,"
-            "keyOption->isFinalKeyDown:%{public}s,keyOption->finalKeyDownDuration:%{public}d",
-            subscriber->id_, keyOption->GetFinalKey(), keyOption->IsFinalKeyDown() ? "true" : "false",
-            keyOption->GetFinalKeyDownDuration());
-        for (const auto &keyCode : keyOption->GetPreKeys()) {
-            MMI_HILOGD("keyOption->prekey:%{public}d", keyCode);
-        }
-
         if (keyOption->IsFinalKeyDown()) {
             ClearTimer(subscriber);
             MMI_HILOGD("keyOption->IsFinalKeyDown()");
@@ -379,10 +379,15 @@ bool KeySubscriberHandler::HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent
             continue;
         }
 
+        if (!IsNotifyPowerKeySubsciber(keyOption->GetFinalKey(), pressedKeys)) {
+            MMI_HILOGD("In special case, subscriber are not notified");
+            continue;
+        }
+
         auto duration = keyOption->GetFinalKeyDownDuration();
         if (duration <= 0) {
             MMI_HILOGD("duration <= 0");
-            NotifySubscriber(keyEvent, subscriber);
+            HandleKeyUpWithDelay(keyEvent, subscriber);
             handled = true;
             continue;
         }
@@ -396,7 +401,7 @@ bool KeySubscriberHandler::HandleKeyUp(const std::shared_ptr<KeyEvent> &keyEvent
             continue;
         }
         MMI_HILOGD("upTime - downTime < duration");
-        NotifySubscriber(keyEvent, subscriber);
+        HandleKeyUpWithDelay(keyEvent, subscriber);
         handled = true;
     }
     MMI_HILOGD("%{public}s", handled ? "true" : "false");
@@ -417,7 +422,7 @@ bool KeySubscriberHandler::CloneKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
 {
     CHKPF(keyEvent);
     if (keyEvent_ == nullptr) {
-        MMI_HILOGW("The keyEvent_ is nullptr");
+        MMI_HILOGW("keyEvent_ is nullptr");
         keyEvent_ = KeyEvent::Clone(keyEvent);
     }
     CHKPF(keyEvent_);
@@ -437,7 +442,7 @@ void KeySubscriberHandler::RemoveKeyCode(int32_t keyCode, std::vector<int32_t> &
 bool KeySubscriberHandler::IsRepeatedKeyEvent(std::shared_ptr<KeyEvent> keyEvent)
 {
     CHKPF(keyEvent);
-    if (!hasEventExecuting) {
+    if (!hasEventExecuting_) {
         return false;
     }
 
@@ -469,6 +474,56 @@ bool KeySubscriberHandler::IsRepeatedKeyEvent(std::shared_ptr<KeyEvent> keyEvent
     return true;
 }
 
+void KeySubscriberHandler::RemoveSubscriberKeyUpTimer(int32_t keyCode)
+{
+    for (const auto& item : subscribers_) {
+        if ((item->timerId_ >= 0) && (item->keyOption_->GetFinalKey() == keyCode)) {
+            ClearTimer(item);
+        }
+    }
+}
+
+bool KeySubscriberHandler::IsNotifyPowerKeySubsciber(int32_t keyCode, const std::vector<int32_t> &keyCodes)
+{
+    if (keyCode != KeyEvent::KEYCODE_POWER) {
+        return true;
+    }
+
+    for (const auto& pressedKey: keyCodes) {
+        if (pressedKey == KeyEvent::KEYCODE_VOLUME_DOWN || pressedKey == KeyEvent::KEYCODE_VOLUME_UP) {
+            return false;
+        }
+    }
+    return true;
+}
+
+void KeySubscriberHandler::HandleKeyUpWithDelay(std::shared_ptr<KeyEvent> keyEvent,
+    const std::shared_ptr<Subscriber> &subscriber)
+{
+    auto keyUpDelay = subscriber->keyOption_->GetFinalKeyUpDelay();
+    if (keyUpDelay <= 0) {
+        NotifySubscriber(keyEvent, subscriber);
+    } else {
+        if (!AddTimer(subscriber, keyEvent)) {
+            MMI_HILOGE("Leave, add timer failed");
+        }
+    }
+}
+
+void KeySubscriberHandler::PrintKeyUpLog(const std::shared_ptr<Subscriber> &subscriber)
+{
+    CHKPV(subscriber);
+    auto &keyOption = subscriber->keyOption_;
+    MMI_HILOGD("subscribeId:%{public}d, keyOption->finalKey:%{public}d,"
+        "keyOption->isFinalKeyDown:%{public}s, keyOption->finalKeyDownDuration:%{public}d,"
+        "keyOption->finalKeyUpDelay:%{public}d",
+        subscriber->id_, keyOption->GetFinalKey(), keyOption->IsFinalKeyDown() ? "true" : "false",
+        keyOption->GetFinalKeyDownDuration(), keyOption->GetFinalKeyUpDelay());
+    for (const auto &keyCode : keyOption->GetPreKeys()) {
+        MMI_HILOGD("keyOption->prekey:%{public}d", keyCode);
+    }
+}
+
 void KeySubscriberHandler::Dump(int32_t fd, const std::vector<std::string> &args)
 {
     CALL_DEBUG_ENTER;
-- 
Gitee


From 272615f00391431ca28e50ffe42c0f9e81383eab Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 28 Nov 2022 07:12:41 +0000
Subject: [PATCH 181/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../include/input_handler_manager.h           |  13 +-
 .../include/input_interceptor_manager.h       |   2 +
 .../include/input_manager_impl.h              |   6 +-
 .../src/input_handler_manager.cpp             | 141 ++++++++++++++----
 .../src/input_interceptor_manager.cpp         |  10 ++
 .../event_handler/src/input_manager_impl.cpp  |  10 +-
 frameworks/proxy/events/src/input_manager.cpp |  11 ++
 .../event/include/i_input_event_consumer.h    |   6 +
 .../innerkits/proxy/include/input_manager.h   |   2 +
 .../include/i_multimodal_input_connect.h      |   7 +-
 .../multimodal_input_connect_manager.h        |   4 +-
 .../include/multimodal_input_connect_proxy.h  |   6 +-
 .../src/multimodal_input_connect_manager.cpp  |  10 +-
 .../src/multimodal_input_connect_proxy.cpp    |   7 +-
 .../src/multimodal_input_connect_stub.cpp     |  10 +-
 .../include/event_interceptor_handler.h       |  20 +--
 .../src/event_interceptor_handler.cpp         |  79 +++++-----
 .../include/server_msg_handler.h              |   7 +-
 .../message_handle/src/server_msg_handler.cpp |   8 +-
 service/module_loader/include/mmi_service.h   |  12 +-
 service/module_loader/src/mmi_service.cpp     |  19 ++-
 21 files changed, 264 insertions(+), 126 deletions(-)
 mode change 100644 => 100755 frameworks/proxy/event_handler/include/input_interceptor_manager.h
 mode change 100644 => 100755 frameworks/proxy/event_handler/src/input_handler_manager.cpp
 mode change 100644 => 100755 frameworks/proxy/event_handler/src/input_interceptor_manager.cpp
 mode change 100644 => 100755 frameworks/proxy/events/src/input_manager.cpp
 mode change 100644 => 100755 interfaces/native/innerkits/event/include/i_input_event_consumer.h
 mode change 100644 => 100755 interfaces/native/innerkits/proxy/include/input_manager.h
 mode change 100644 => 100755 service/connect_manager/include/i_multimodal_input_connect.h
 mode change 100644 => 100755 service/connect_manager/include/multimodal_input_connect_manager.h
 mode change 100644 => 100755 service/connect_manager/include/multimodal_input_connect_proxy.h
 mode change 100644 => 100755 service/connect_manager/src/multimodal_input_connect_manager.cpp
 mode change 100644 => 100755 service/connect_manager/src/multimodal_input_connect_proxy.cpp
 mode change 100644 => 100755 service/connect_manager/src/multimodal_input_connect_stub.cpp
 mode change 100644 => 100755 service/interceptor/include/event_interceptor_handler.h
 mode change 100644 => 100755 service/interceptor/src/event_interceptor_handler.cpp
 mode change 100644 => 100755 service/message_handle/include/server_msg_handler.h
 mode change 100644 => 100755 service/message_handle/src/server_msg_handler.cpp
 mode change 100644 => 100755 service/module_loader/include/mmi_service.h
 mode change 100644 => 100755 service/module_loader/src/mmi_service.cpp

diff --git a/frameworks/proxy/event_handler/include/input_handler_manager.h b/frameworks/proxy/event_handler/include/input_handler_manager.h
index 0bedee5408..942a021478 100755
--- a/frameworks/proxy/event_handler/include/input_handler_manager.h
+++ b/frameworks/proxy/event_handler/include/input_handler_manager.h
@@ -45,27 +45,29 @@ public:
     bool HasHandler(int32_t handlerId);
     virtual InputHandlerType GetHandlerType() const = 0;
     HandleEventType GetEventType() const;
+    PriorityLevel GetPriorityLevel() const;
 
 protected:
     int32_t AddHandler(InputHandlerType handlerType, std::shared_ptr<IInputEventConsumer> consumer,
-        HandleEventType eventType = HANDLE_EVENT_TYPE_ALL);
-    void RemoveHandler(int32_t handlerId, InputHandlerType handlerType);
+        HandleEventType eventType = HANDLE_EVENT_TYPE_ALL, PriorityLevel priorityLevel = PriorityLevel::LOW_LEVEL);
+    void RemoveHandler(int32_t handlerId, InputHandlerType IsValidHandlerType);
 
 private:
     struct Handler {
         int32_t handlerId_ { 0 };
         InputHandlerType handlerType_ { NONE };
         HandleEventType eventType_ { HANDLE_EVENT_TYPE_ALL };
+        PriorityLevel priorityLevel_ { PriorityLevel::LOW_LEVEL };
         std::shared_ptr<IInputEventConsumer> consumer_ { nullptr };
     };
 
 private:
     int32_t GetNextId();
     int32_t AddLocal(int32_t handlerId, InputHandlerType handlerType,
-        HandleEventType eventType, std::shared_ptr<IInputEventConsumer> monitor);
-    int32_t AddToServer(InputHandlerType handlerType, HandleEventType eventType);
+        HandleEventType eventType, PriorityLevel priorityLevel, std::shared_ptr<IInputEventConsumer> monitor);
+    int32_t AddToServer(InputHandlerType handlerType, HandleEventType eventType, PriorityLevel priorityLevel);
     int32_t RemoveLocal(int32_t handlerId, InputHandlerType handlerType);
-    void RemoveFromServer(InputHandlerType handlerType, HandleEventType eventType);
+    void RemoveFromServer(InputHandlerType handlerType, HandleEventType eventType, PriorityLevel priorityLevel);
 
     std::shared_ptr<IInputEventConsumer> FindHandler(int32_t handlerId);
     void OnDispatchEventProcessed(int32_t eventId);
@@ -75,6 +77,7 @@ private:
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 
 private:
+    std::list<Handler> interHandlers_;
     std::map<int32_t, Handler> inputHandlers_;
     std::map<int32_t, int32_t> processedEvents_;
     std::set<int32_t> mouseEventIds_;
diff --git a/frameworks/proxy/event_handler/include/input_interceptor_manager.h b/frameworks/proxy/event_handler/include/input_interceptor_manager.h
old mode 100644
new mode 100755
index 862a9fed35..1993414015
--- a/frameworks/proxy/event_handler/include/input_interceptor_manager.h
+++ b/frameworks/proxy/event_handler/include/input_interceptor_manager.h
@@ -31,6 +31,8 @@ class InputInterceptorManager final : public InputHandlerManager {
 public:
     DISALLOW_COPY_AND_MOVE(InputInterceptorManager);
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, HandleEventType eventType);
+    int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, HandleEventType eventType,
+        PriorityLevel priorityLevel);
     void RemoveInterceptor(int32_t interceptorId);
     InputHandlerType GetHandlerType() const override;
 };
diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index a2d9f61f39..b62a5c7d54 100755
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -74,8 +74,10 @@ public:
     void MarkConsumed(int32_t monitorId, int32_t eventId);
     void MoveMouse(int32_t offsetX, int32_t offsetY);
 
-    int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor);
-    int32_t AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor);
+    int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor,
+        PriorityLevel priorityLevel = PriorityLevel::LOW_LEVEL);
+    int32_t AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor,
+        PriorityLevel priorityLevel = PriorityLevel::LOW_LEVEL);
     void RemoveInterceptor(int32_t interceptorId);
 
     void SimulateInputEvent(std::shared_ptr<KeyEvent> keyEvent);
diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
old mode 100644
new mode 100755
index 35d27e5228..12cbbc22f9
--- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp
+++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
@@ -37,8 +37,8 @@ InputHandlerManager::InputHandlerManager()
     monitorCallback_ = std::bind(&InputHandlerManager::OnDispatchEventProcessed, this, std::placeholders::_1);
 }
 
-int32_t InputHandlerManager::AddHandler(InputHandlerType handlerType,
-    std::shared_ptr<IInputEventConsumer> consumer, HandleEventType eventType)
+int32_t InputHandlerManager::AddHandler(InputHandlerType handlerType, std::shared_ptr<IInputEventConsumer> consumer,
+    HandleEventType eventType, PriorityLevel priorityLevel)
 {
     CALL_INFO_TRACE;
     CHKPR(consumer, INVALID_HANDLER_ID);
@@ -59,11 +59,11 @@ int32_t InputHandlerManager::AddHandler(InputHandlerType handlerType,
     }
     const HandleEventType currentType = GetEventType();
     MMI_HILOGD("Register new handler:%{public}d", handlerId);
-    if (RET_OK == AddLocal(handlerId, handlerType, eventType, consumer)) {
+    if (RET_OK == AddLocal(handlerId, handlerType, eventType, priorityLevel, consumer)) {
         MMI_HILOGD("New handler successfully registered, report to server");
         const HandleEventType newType = GetEventType();
         if (currentType != newType) {
-            int32_t ret = AddToServer(handlerType, newType);
+            int32_t ret = AddToServer(handlerType, newType, priorityLevel);
             if (ret != RET_OK) {
                 MMI_HILOGD("Handler:%{public}d permissions failed, remove the monitor", handlerId);
                 RemoveLocal(handlerId, handlerType);
@@ -85,19 +85,21 @@ void InputHandlerManager::RemoveHandler(int32_t handlerId, InputHandlerType hand
     if (RET_OK == RemoveLocal(handlerId, handlerType)) {
         MMI_HILOGD("Handler:%{public}d unregistered, report to server", handlerId);
         const HandleEventType newType = GetEventType();
+        const PriorityLevel newLevel = GetPriorityLevel();
         if (currentType != newType) {
-            RemoveFromServer(handlerType, newType);
+            RemoveFromServer(handlerType, newType, newLevel);
         }
     }
 }
 
 int32_t InputHandlerManager::AddLocal(int32_t handlerId, InputHandlerType handlerType,
-    HandleEventType eventType, std::shared_ptr<IInputEventConsumer> monitor)
+    HandleEventType eventType, PriorityLevel priorityLevel, std::shared_ptr<IInputEventConsumer> monitor)
 {
     InputHandlerManager::Handler handler {
         .handlerId_ = handlerId,
         .handlerType_ = handlerType,
         .eventType_ = eventType,
+        .priorityLevel_ = priorityLevel,
         .consumer_ = monitor,
     };
     auto ret = inputHandlers_.emplace(handler.handlerId_, handler);
@@ -105,12 +107,26 @@ int32_t InputHandlerManager::AddLocal(int32_t handlerId, InputHandlerType handle
         MMI_HILOGE("Duplicate handler:%{public}d", handler.handlerId_);
         return RET_ERR;
     }
+    if (handlerType == InputHandlerType::INTERCEPTOR) {
+        auto iterIndex = interHandlers_.begin();
+        for (; iterIndex != interHandlers_.end(); ++iterIndex) {
+            if (handler.priorityLevel_ > iterIndex->priorityLevel_) {
+                break;
+            }
+        }
+        auto iter = interHandlers_.emplace(iterIndex, handler);
+        if (iter == interHandlers_.end()) {
+            MMI_HILOGE("Add new handler failed");
+            return RET_ERR;
+        }
+    }
     return RET_OK;
 }
 
-int32_t InputHandlerManager::AddToServer(InputHandlerType handlerType, HandleEventType eventType)
+int32_t InputHandlerManager::AddToServer(InputHandlerType handlerType, HandleEventType eventType,
+    PriorityLevel priorityLevel)
 {
-    int32_t ret = MultimodalInputConnMgr->AddInputHandler(handlerType, eventType);
+    int32_t ret = MultimodalInputConnMgr->AddInputHandler(handlerType, eventType, priorityLevel);
     if (ret != RET_OK) {
         MMI_HILOGE("Send to server failed, ret:%{public}d", ret);
     }
@@ -130,12 +146,22 @@ int32_t InputHandlerManager::RemoveLocal(int32_t handlerId, InputHandlerType han
         return RET_ERR;
     }
     inputHandlers_.erase(tItr);
+
+    if (handlerType == InputHandlerType::INTERCEPTOR) {
+        for (auto it = interHandlers_.begin(); it != interHandlers_.end(); ++it) {
+            if (handlerId > it->handlerId_) {
+                interHandlers_.erase(it);
+                break;
+            }
+        }
+    }
     return RET_OK;
 }
 
-void InputHandlerManager::RemoveFromServer(InputHandlerType handlerType, HandleEventType eventType)
+void InputHandlerManager::RemoveFromServer(InputHandlerType handlerType, HandleEventType eventType,
+    PriorityLevel priorityLevel)
 {
-    int32_t ret = MultimodalInputConnMgr->RemoveInputHandler(handlerType, eventType);
+    int32_t ret = MultimodalInputConnMgr->RemoveInputHandler(handlerType, eventType, priorityLevel);
     if (ret != 0) {
         MMI_HILOGE("Send to server failed, ret:%{public}d", ret);
     }
@@ -166,15 +192,29 @@ void InputHandlerManager::OnInputEvent(std::shared_ptr<KeyEvent> keyEvent)
     CHKPV(keyEvent);
     std::lock_guard<std::mutex> guard(mtxHandlers_);
     BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::TRACE_STOP, BytraceAdapter::KEY_INTERCEPT_EVENT);
-    for (const auto &handler : inputHandlers_) {
-        if ((handler.second.eventType_ & HANDLE_EVENT_TYPE_KEY) != HANDLE_EVENT_TYPE_KEY) {
-            continue;
+    if (!interHandlers_.empty()) {
+        for (const auto &item : interHandlers_) {
+            if ((item.eventType_ & HANDLE_EVENT_TYPE_KEY) != HANDLE_EVENT_TYPE_KEY) {
+                continue;
+            }
+            int32_t handlerId = item.handlerId_;
+            auto consumer = item.consumer_;
+            CHKPV(consumer);
+            consumer->OnInputEvent(keyEvent);
+            MMI_HILOGD("Key event id:%{public}d keyCode:%{public}d", handlerId, keyEvent->GetKeyCode());
+            break;
+        }
+    } else {
+        for (const auto &item : inputHandlers_) {
+            if ((item.second.eventType_ & HANDLE_EVENT_TYPE_KEY) != HANDLE_EVENT_TYPE_KEY) {
+                continue;
+            }
+            int32_t handlerId = item.first;
+            auto consumer = item.second.consumer_;
+            CHKPV(consumer);
+            consumer->OnInputEvent(keyEvent);
+            MMI_HILOGD("Key event id:%{public}d keyCode:%{public}d", handlerId, keyEvent->GetKeyCode());
         }
-        int32_t handlerId = handler.first;
-        auto consumer = handler.second.consumer_;
-        CHKPV(consumer);
-        consumer->OnInputEvent(keyEvent);
-        MMI_HILOGD("Key event id:%{public}d keyCode:%{public}d", handlerId, keyEvent->GetKeyCode());
     }
 }
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
@@ -185,20 +225,39 @@ void InputHandlerManager::GetConsumerInfos(std::shared_ptr<PointerEvent> pointer
 {
     std::lock_guard<std::mutex> guard(mtxHandlers_);
     int32_t consumerCount = 0;
-    for (const auto &iter : inputHandlers_) {
-        if ((iter.second.eventType_ & HANDLE_EVENT_TYPE_POINTER) != HANDLE_EVENT_TYPE_POINTER) {
-            continue;
+    if (!interHandlers_.empty()) {
+        for (const auto &item : interHandlers_) {
+            if ((item.eventType_ & HANDLE_EVENT_TYPE_POINTER) != HANDLE_EVENT_TYPE_POINTER) {
+                continue;
+            }
+            int32_t handlerId = item.handlerId_;
+            auto consumer = item.consumer_;
+            CHKPV(consumer);
+            auto ret = consumerInfos.emplace(handlerId, consumer);
+            if (!ret.second) {
+                MMI_HILOGI("Duplicate handler:%{public}d", handlerId);
+                continue;
+            }
+            consumerCount++;
+            break;
         }
-        int32_t handlerId = iter.first;
-        auto consumer = iter.second.consumer_;
-        CHKPV(consumer);
-        auto ret = consumerInfos.emplace(handlerId, consumer);
-        if (!ret.second) {
-            MMI_HILOGI("Duplicate handler:%{public}d", handlerId);
-            continue;
+    } else {
+        for (const auto &item : inputHandlers_) {
+            if ((item.second.eventType_ & HANDLE_EVENT_TYPE_POINTER) != HANDLE_EVENT_TYPE_POINTER) {
+                continue;
+            }
+            int32_t handlerId = item.first;
+            auto consumer = item.second.consumer_;
+            CHKPV(consumer);
+            auto ret = consumerInfos.emplace(handlerId, consumer);
+            if (!ret.second) {
+                MMI_HILOGI("Duplicate handler:%{public}d", handlerId);
+                continue;
+            }
+            consumerCount++;
         }
-        consumerCount++;
     }
+
     if (consumerCount == 0) {
         MMI_HILOGE("All task post failed");
         return;
@@ -239,8 +298,9 @@ void InputHandlerManager::OnConnected()
 {
     CALL_DEBUG_ENTER;
     HandleEventType eventType = GetEventType();
+    PriorityLevel priorityLevel = GetPriorityLevel();
     if (eventType != HANDLE_EVENT_TYPE_NONE) {
-        AddToServer(GetHandlerType(), eventType);
+        AddToServer(GetHandlerType(), eventType, priorityLevel);
     }
 }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
@@ -259,12 +319,29 @@ HandleEventType InputHandlerManager::GetEventType() const
         return HANDLE_EVENT_TYPE_NONE;
     }
     HandleEventType eventType { HANDLE_EVENT_TYPE_NONE };
-    for (const auto &inputHandler : inputHandlers_) {
-        eventType |= inputHandler.second.eventType_;
+    if (!interHandlers_.empty()) {
+        eventType |= interHandlers_.front().eventType_;
+    } else {
+        for (const auto &inputHandler : inputHandlers_) {
+            eventType |= inputHandler.second.eventType_;
+        }
     }
     return eventType;
 }
 
+PriorityLevel InputHandlerManager::GetPriorityLevel() const
+{
+    if (inputHandlers_.empty()) {
+        MMI_HILOGD("InputHandlers is empty");
+        return PriorityLevel::LOW_LEVEL;
+    }
+    PriorityLevel priorityLevel { PriorityLevel::LOW_LEVEL };
+    if (!interHandlers_.empty()) {
+        priorityLevel = interHandlers_.front().priorityLevel_;
+    }
+    return priorityLevel;
+}
+
 void InputHandlerManager::OnDispatchEventProcessed(int32_t eventId)
 {
     CALL_DEBUG_ENTER;
diff --git a/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp b/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp
old mode 100644
new mode 100755
index da44746cd2..d7b291a218
--- a/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp
+++ b/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp
@@ -37,6 +37,16 @@ int32_t InputInterceptorManager::AddInterceptor(std::shared_ptr<IInputEventConsu
     return AddHandler(InputHandlerType::INTERCEPTOR, interceptor, eventType);
 }
 
+int32_t InputInterceptorManager::AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor,
+    HandleEventType eventType, PriorityLevel priorityLevel)
+{
+    if (interceptor == nullptr) {
+        MMI_HILOGE("No interceptor was specified.");
+        return INVALID_HANDLER_ID;
+    }
+    return AddHandler(InputHandlerType::INTERCEPTOR, interceptor, eventType, priorityLevel);
+}
+
 void InputInterceptorManager::RemoveInterceptor(int32_t interceptorId)
 {
     RemoveHandler(interceptorId, InputHandlerType::INTERCEPTOR);
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 4ae7f06f74..d482b6f0d6 100755
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -417,7 +417,8 @@ void InputManagerImpl::MoveMouse(int32_t offsetX, int32_t offsetY)
 #endif // OHOS_BUILD_ENABLE_POINTER && OHOS_BUILD_ENABLE_POINTER_DRAWING
 }
 
-int32_t InputManagerImpl::AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor)
+int32_t InputManagerImpl::AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor,
+    PriorityLevel priorityLevel)
 {
     CALL_INFO_TRACE;
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
@@ -427,14 +428,15 @@ int32_t InputManagerImpl::AddInterceptor(std::shared_ptr<IInputEventConsumer> in
         MMI_HILOGE("Client init failed");
         return RET_ERR;
     }
-    return InputInterMgr->AddInterceptor(interceptor, HANDLE_EVENT_TYPE_ALL);
+    return InputInterMgr->AddInterceptor(interceptor, HANDLE_EVENT_TYPE_ALL, priorityLevel);
 #else
     MMI_HILOGW("Interceptor function does not support");
     return ERROR_UNSUPPORT;
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
 }
 
-int32_t InputManagerImpl::AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor)
+int32_t InputManagerImpl::AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor,
+    PriorityLevel priorityLevel)
 {
     CALL_INFO_TRACE;
 #if defined(OHOS_BUILD_ENABLE_KEYBOARD) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
@@ -446,7 +448,7 @@ int32_t InputManagerImpl::AddInterceptor(std::function<void(std::shared_ptr<KeyE
         MMI_HILOGE("Client init failed");
         return RET_ERR;
     }
-    return InputInterMgr->AddInterceptor(consumer, HANDLE_EVENT_TYPE_KEY);
+    return InputInterMgr->AddInterceptor(consumer, HANDLE_EVENT_TYPE_KEY, priorityLevel);
 #else
     MMI_HILOGW("Keyboard device or interceptor function does not support");
     return ERROR_UNSUPPORT;
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
old mode 100644
new mode 100755
index 1e4afaee10..0a356048ef
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -105,6 +105,17 @@ int32_t InputManager::AddInterceptor(std::function<void(std::shared_ptr<KeyEvent
     return InputMgrImpl.AddInterceptor(interceptor);
 }
 
+int32_t InputManager::AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, PriorityLevel priorityLevel)
+{
+    return InputMgrImpl.AddInterceptor(interceptor, priorityLevel);
+}
+
+int32_t InputManager::AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor,
+    PriorityLevel priorityLevel)
+{
+    return InputMgrImpl.AddInterceptor(interceptor, priorityLevel);
+}
+
 void InputManager::RemoveInterceptor(int32_t interceptorId)
 {
     InputMgrImpl.RemoveInterceptor(interceptorId);
diff --git a/interfaces/native/innerkits/event/include/i_input_event_consumer.h b/interfaces/native/innerkits/event/include/i_input_event_consumer.h
old mode 100644
new mode 100755
index 2ef061a8f3..1ea204cdb9
--- a/interfaces/native/innerkits/event/include/i_input_event_consumer.h
+++ b/interfaces/native/innerkits/event/include/i_input_event_consumer.h
@@ -24,6 +24,12 @@
 
 namespace OHOS {
 namespace MMI {
+enum PriorityLevel : int32_t {
+    LOW_LEVEL,
+    MIDDLE_LEVEL,
+    HIGH_LEVEL
+};
+
 struct IInputEventConsumer {
 public:
     IInputEventConsumer() = default;
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
old mode 100644
new mode 100755
index 2c609e4fcd..f34cb79b93
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -177,6 +177,8 @@ public:
      */
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor);
     int32_t AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor);
+    int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, PriorityLevel priorityLevel);
+    int32_t AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor, PriorityLevel priorityLevel);
 
     /**
      * @brief Removes an interceptor.
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
old mode 100644
new mode 100755
index 603690721f..727d8956eb
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -19,6 +19,7 @@
 #include "iremote_broker.h"
 
 #include "i_event_filter.h"
+#include "i_input_event_consumer.h"
 #include "input_handler_type.h"
 #include "key_event.h"
 #include "key_option.h"
@@ -85,8 +86,10 @@ public:
     virtual int32_t RegisterDevListener() = 0;
     virtual int32_t UnregisterDevListener() = 0;
     virtual int32_t GetKeyboardType(int32_t userData, int32_t deviceId) = 0;
-    virtual int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType) = 0;
-    virtual int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType) = 0;
+    virtual int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
+        PriorityLevel priorityLevel) = 0;
+    virtual int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
+        PriorityLevel priorityLevel) = 0;
     virtual int32_t MarkEventConsumed(int32_t eventId) = 0;
     virtual int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY) = 0;
     virtual int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) = 0;
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
old mode 100644
new mode 100755
index c46e31c799..4079046968
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -50,8 +50,8 @@ public:
     int32_t RegisterDevListener();
     int32_t UnregisterDevListener();
     int32_t GetKeyboardType(int32_t userData, int32_t deviceId);
-    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType);
-    int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType);
+    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType, PriorityLevel priorityLevel);
+    int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType, PriorityLevel priorityLevel);
     int32_t MarkEventConsumed(int32_t eventId);
     int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY);
     int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent);
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
old mode 100644
new mode 100755
index 4a299a0b20..1467769f6e
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -45,8 +45,10 @@ public:
     int32_t RegisterDevListener() override;
     int32_t UnregisterDevListener() override;
     int32_t GetKeyboardType(int32_t userData, int32_t deviceId) override;
-    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType) override;
-    int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType) override;
+    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
+        PriorityLevel priorityLevel) override;
+    int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
+        PriorityLevel priorityLevel) override;
     int32_t MarkEventConsumed(int32_t eventId) override;
     int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY) override;
     int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
old mode 100644
new mode 100755
index 9893ab9b6c..d536b5b16f
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -155,16 +155,18 @@ int32_t MultimodalInputConnectManager::GetKeyboardType(int32_t userData, int32_t
     return multimodalInputConnectService_->GetKeyboardType(userData, deviceId);
 }
 
-int32_t MultimodalInputConnectManager::AddInputHandler(InputHandlerType handlerType, HandleEventType eventType)
+int32_t MultimodalInputConnectManager::AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
+    PriorityLevel priorityLevel)
 {
     CHKPR(multimodalInputConnectService_, INVALID_HANDLER_ID);
-    return multimodalInputConnectService_->AddInputHandler(handlerType, eventType);
+    return multimodalInputConnectService_->AddInputHandler(handlerType, eventType, priorityLevel);
 }
 
-int32_t MultimodalInputConnectManager::RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType)
+int32_t MultimodalInputConnectManager::RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
+    PriorityLevel priorityLevel)
 {
     CHKPR(multimodalInputConnectService_, INVALID_HANDLER_ID);
-    return multimodalInputConnectService_->RemoveInputHandler(handlerType, eventType);
+    return multimodalInputConnectService_->RemoveInputHandler(handlerType, eventType, priorityLevel);
 }
 
 int32_t MultimodalInputConnectManager::MarkEventConsumed(int32_t eventId)
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
old mode 100644
new mode 100755
index 2cd7a91e1b..9888c8f806
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -362,7 +362,7 @@ int32_t MultimodalInputConnectProxy::GetKeyboardType(int32_t userData, int32_t d
 }
 
 int32_t MultimodalInputConnectProxy::AddInputHandler(InputHandlerType handlerType,
-    HandleEventType eventType)
+    HandleEventType eventType, PriorityLevel priorityLevel)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -372,6 +372,7 @@ int32_t MultimodalInputConnectProxy::AddInputHandler(InputHandlerType handlerTyp
     }
     WRITEINT32(data, handlerType, ERR_INVALID_VALUE);
     WRITEUINT32(data, eventType, ERR_INVALID_VALUE);
+    WRITEINT32(data, priorityLevel, ERR_INVALID_VALUE);
     MessageParcel reply;
     MessageOption option;
     sptr<IRemoteObject> remote = Remote();
@@ -384,7 +385,8 @@ int32_t MultimodalInputConnectProxy::AddInputHandler(InputHandlerType handlerTyp
     return RET_OK;
 }
 
-int32_t MultimodalInputConnectProxy::RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType)
+int32_t MultimodalInputConnectProxy::RemoveInputHandler(InputHandlerType handlerType,
+    HandleEventType eventType, PriorityLevel priorityLevel)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -394,6 +396,7 @@ int32_t MultimodalInputConnectProxy::RemoveInputHandler(InputHandlerType handler
     }
     WRITEINT32(data, handlerType, ERR_INVALID_VALUE);
     WRITEUINT32(data, eventType, ERR_INVALID_VALUE);
+    WRITEINT32(data, priorityLevel, ERR_INVALID_VALUE);
     MessageParcel reply;
     MessageOption option;
     sptr<IRemoteObject> remote = Remote();
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
old mode 100644
new mode 100755
index 82e3082ee8..de348cd261
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -356,7 +356,10 @@ int32_t MultimodalInputConnectStub::StubAddInputHandler(MessageParcel& data, Mes
     }
     uint32_t eventType;
     READUINT32(data, eventType, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = AddInputHandler(static_cast<InputHandlerType>(handlerType), eventType);
+    int32_t priorityLevel;
+    READINT32(data, priorityLevel, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = AddInputHandler(static_cast<InputHandlerType>(handlerType), eventType,
+        static_cast<PriorityLevel>(priorityLevel));
     if (ret != RET_OK) {
         MMI_HILOGE("Call AddInputHandler failed ret:%{public}d", ret);
         return ret;
@@ -384,7 +387,10 @@ int32_t MultimodalInputConnectStub::StubRemoveInputHandler(MessageParcel& data,
     }
     uint32_t eventType;
     READUINT32(data, eventType, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = RemoveInputHandler(static_cast<InputHandlerType>(handlerType), eventType);
+    int32_t priorityLevel;
+    READINT32(data, priorityLevel, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = RemoveInputHandler(static_cast<InputHandlerType>(handlerType), eventType,
+        static_cast<PriorityLevel>(priorityLevel));
     if (ret != RET_OK) {
         MMI_HILOGE("Call RemoveInputHandler failed ret:%{public}d", ret);
         return ret;
diff --git a/service/interceptor/include/event_interceptor_handler.h b/service/interceptor/include/event_interceptor_handler.h
old mode 100644
new mode 100755
index e7e10cbeac..89fac9cc02
--- a/service/interceptor/include/event_interceptor_handler.h
+++ b/service/interceptor/include/event_interceptor_handler.h
@@ -20,6 +20,7 @@
 
 #include "i_input_event_handler.h"
 #include "i_input_event_collection_handler.h"
+#include "i_input_event_consumer.h"
 #include "input_handler_type.h"
 #include "nocopyable.h"
 #include "uds_session.h"
@@ -40,8 +41,10 @@ public:
 #ifdef OHOS_BUILD_ENABLE_TOUCH
     void HandleTouchEvent(const std::shared_ptr<PointerEvent> pointerEvent) override;
 #endif // OHOS_BUILD_ENABLE_TOUCH
-    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType, SessionPtr session);
-    void RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType, SessionPtr session);
+    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
+        PriorityLevel priorityLevel, SessionPtr session);
+    void RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
+        PriorityLevel priorityLevel, SessionPtr session);
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     bool OnHandleEvent(std::shared_ptr<KeyEvent> keyEvent);
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
@@ -55,17 +58,14 @@ private:
 private:
     class SessionHandler {
     public:
-        SessionHandler(InputHandlerType handlerType, HandleEventType eventType, SessionPtr session)
-            : handlerType_(handlerType), eventType_(eventType & HANDLE_EVENT_TYPE_ALL),
-              session_(session) {}
+        SessionHandler(InputHandlerType handlerType, HandleEventType eventType, PriorityLevel priorityLevel,
+            SessionPtr session) : handlerType_(handlerType), eventType_(eventType & HANDLE_EVENT_TYPE_ALL),
+            priorityLevel_(priorityLevel), session_(session) {}
         void SendToClient(std::shared_ptr<KeyEvent> keyEvent) const;
         void SendToClient(std::shared_ptr<PointerEvent> pointerEvent) const;
-        bool operator<(const SessionHandler& other) const
-        {
-            return (session_ < other.session_);
-        }
         InputHandlerType handlerType_;
         HandleEventType eventType_;
+        PriorityLevel priorityLevel_;
         SessionPtr session_ { nullptr };
     };
 
@@ -81,7 +81,7 @@ private:
         void RemoveInterceptor(const SessionHandler& interceptor);
         void OnSessionLost(SessionPtr session);
         void Dump(int32_t fd, const std::vector<std::string> &args);
-        std::set<SessionHandler> interceptors_;
+        std::list<SessionHandler> interceptors_;
     };
 
 private:
diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp
old mode 100644
new mode 100755
index 56d4363151..f4e9a47625
--- a/service/interceptor/src/event_interceptor_handler.cpp
+++ b/service/interceptor/src/event_interceptor_handler.cpp
@@ -84,7 +84,7 @@ void EventInterceptorHandler::HandleTouchEvent(const std::shared_ptr<PointerEven
 #endif // OHOS_BUILD_ENABLE_TOUCH
 
 int32_t EventInterceptorHandler::AddInputHandler(InputHandlerType handlerType,
-    HandleEventType eventType, SessionPtr session)
+    HandleEventType eventType, PriorityLevel priorityLevel, SessionPtr session)
 {
     CALL_INFO_TRACE;
     CHKPR(session, RET_ERR);
@@ -93,17 +93,17 @@ int32_t EventInterceptorHandler::AddInputHandler(InputHandlerType handlerType,
         return RET_ERR;
     }
     InitSessionLostCallback();
-    SessionHandler interceptor { handlerType, eventType, session };
+    SessionHandler interceptor { handlerType, eventType, priorityLevel, session };
     return interceptors_.AddInterceptor(interceptor);
 }
 
 void EventInterceptorHandler::RemoveInputHandler(InputHandlerType handlerType,
-    HandleEventType eventType, SessionPtr session)
+    HandleEventType eventType, PriorityLevel priorityLevel, SessionPtr session)
 {
     CALL_INFO_TRACE;
     CHKPV(session);
     if (handlerType == InputHandlerType::INTERCEPTOR) {
-        SessionHandler interceptor { handlerType, eventType, session };
+        SessionHandler interceptor { handlerType, eventType, priorityLevel, session };
         interceptors_.RemoveInterceptor(interceptor);
     }
 }
@@ -205,6 +205,7 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
             interceptor.SendToClient(keyEvent);
             MMI_HILOGD("Key event was intercepted");
             isInterceptor = true;
+            break;
         }
     }
     return isInterceptor;
@@ -226,6 +227,7 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
             interceptor.SendToClient(pointerEvent);
             MMI_HILOGD("Pointer event was intercepted");
             isInterceptor = true;
+            break;
         }
     }
     return isInterceptor;
@@ -234,57 +236,55 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
 
 int32_t EventInterceptorHandler::InterceptorCollection::AddInterceptor(const SessionHandler& interceptor)
 {
+    for (auto iter = interceptors_.begin(); iter != interceptors_.end(); ++iter) {
+        if (iter->session_ == interceptor.session_) {
+            interceptors_.erase(iter);
+            break;
+        }
+    }
+
     if (interceptors_.size() >= MAX_N_INPUT_INTERCEPTORS) {
         MMI_HILOGE("The number of interceptors exceeds limit");
         return RET_ERR;
     }
-    bool isFound = false;
-    auto iter = interceptors_.find(interceptor);
-    if (iter != interceptors_.end()) {
-        if (iter->eventType_ == interceptor.eventType_) {
-            MMI_HILOGD("Interceptor with event type (%{public}u) already exists", interceptor.eventType_);
-            return RET_OK;
-        }
-        isFound = true;
-        interceptors_.erase(iter);
-    }
 
-    auto [sIter, isOk] = interceptors_.insert(interceptor);
-    if (!isOk) {
-        if (isFound) {
-            MMI_HILOGE("Internal error: interceptor has been removed");
-        } else {
-            MMI_HILOGE("Failed to add interceptor");
+    auto iterIndex = interceptors_.cbegin();
+    for (; iterIndex != interceptors_.cend(); ++iterIndex) {
+        if (interceptor.priorityLevel_ > iterIndex->priorityLevel_) {
+            break;
         }
-        return RET_ERR;
     }
-
-    if (isFound) {
-        MMI_HILOGD("Event type is updated:%{public}u", interceptor.eventType_);
-    } else {
-        MMI_HILOGD("Service AddInterceptor Success");
+    auto sIter = interceptors_.emplace(iterIndex, interceptor);
+    if (sIter == interceptors_.end()) {
+        MMI_HILOGE("Failed to add interceptor");
+        RET_ERR;
     }
     return RET_OK;
 }
 
 void EventInterceptorHandler::InterceptorCollection::RemoveInterceptor(const SessionHandler& interceptor)
 {
-    std::set<SessionHandler>::const_iterator iter = interceptors_.find(interceptor);
-    if (iter == interceptors_.cend()) {
-        MMI_HILOGE("Interceptor does not exist");
-        return;
+    for (auto iter = interceptors_.begin(); iter != interceptors_.end(); ++iter) {
+        if (iter->session_ == interceptor.session_) {
+            interceptors_.erase(iter);
+            break;
+        }
     }
-
-    interceptors_.erase(iter);
     if (interceptor.eventType_ == HANDLE_EVENT_TYPE_NONE) {
         MMI_HILOGD("Unregister interceptor successfully");
         return;
     }
 
-    auto [sIter, isOk] = interceptors_.insert(interceptor);
-    if (!isOk) {
+    auto iterIndex = interceptors_.cbegin();
+    for (; iterIndex != interceptors_.cend(); ++iterIndex) {
+        if (interceptor.priorityLevel_ > iterIndex->priorityLevel_) {
+            break;
+        }
+    }
+    auto sIter = interceptors_.emplace(iterIndex, interceptor);
+    if (sIter == interceptors_.end()) {
         MMI_HILOGE("Internal error, interceptor has been removed");
-        return;
+        RET_ERR;
     }
     MMI_HILOGD("Event type is updated:%{public}u", interceptor.eventType_);
 }
@@ -292,12 +292,9 @@ void EventInterceptorHandler::InterceptorCollection::RemoveInterceptor(const Ses
 void EventInterceptorHandler::InterceptorCollection::OnSessionLost(SessionPtr session)
 {
     CALL_INFO_TRACE;
-    std::set<SessionHandler>::const_iterator cItr = interceptors_.cbegin();
-    while (cItr != interceptors_.cend()) {
-        if (cItr->session_ != session) {
-            ++cItr;
-        } else {
-            cItr = interceptors_.erase(cItr);
+    for (auto iter = interceptors_.begin(); iter != interceptors_.end(); ++iter) {
+        if (iter->session_ == session) {
+            interceptors_.erase(iter);
         }
     }
 }
diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
old mode 100644
new mode 100755
index 4d84640f65..0e8ebd6362
--- a/service/message_handle/include/server_msg_handler.h
+++ b/service/message_handle/include/server_msg_handler.h
@@ -20,6 +20,7 @@
 
 #include "event_dispatch_handler.h"
 #include "i_event_filter.h"
+#include "i_input_event_consumer.h"
 #include "input_handler_type.h"
 #include "key_option.h"
 #include "msg_handler.h"
@@ -36,8 +37,10 @@ public:
     void Init(UDSServer& udsServer);
     void OnMsgHandler(SessionPtr sess, NetPacket& pkt);
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
-    int32_t OnAddInputHandler(SessionPtr sess, InputHandlerType handlerType, HandleEventType eventType);
-    int32_t OnRemoveInputHandler(SessionPtr sess, InputHandlerType handlerType, HandleEventType eventType);
+    int32_t OnAddInputHandler(SessionPtr sess, InputHandlerType handlerType, HandleEventType eventType,
+        PriorityLevel priorityLevel);
+    int32_t OnRemoveInputHandler(SessionPtr sess, InputHandlerType handlerType, HandleEventType eventType,
+        PriorityLevel priorityLevel);
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
 #ifdef OHOS_BUILD_ENABLE_MONITOR
     int32_t OnMarkConsumed(SessionPtr sess, int32_t eventId);
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
old mode 100644
new mode 100755
index 223b7b0858..35f9cd11a1
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -248,7 +248,7 @@ int32_t ServerMsgHandler::OnDisplayInfo(SessionPtr sess, NetPacket &pkt)
 
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
 int32_t ServerMsgHandler::OnAddInputHandler(SessionPtr sess, InputHandlerType handlerType,
-    HandleEventType eventType)
+    HandleEventType eventType, PriorityLevel priorityLevel)
 {
     CHKPR(sess, ERROR_NULL_POINTER);
     MMI_HILOGD("handlerType:%{public}d", handlerType);
@@ -256,7 +256,7 @@ int32_t ServerMsgHandler::OnAddInputHandler(SessionPtr sess, InputHandlerType ha
     if (handlerType == InputHandlerType::INTERCEPTOR) {
         auto interceptorHandler = InputHandler->GetInterceptorHandler();
         CHKPR(interceptorHandler, ERROR_NULL_POINTER);
-        return interceptorHandler->AddInputHandler(handlerType, eventType, sess);
+        return interceptorHandler->AddInputHandler(handlerType, eventType, priorityLevel, sess);
     }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
 #ifdef OHOS_BUILD_ENABLE_MONITOR
@@ -270,7 +270,7 @@ int32_t ServerMsgHandler::OnAddInputHandler(SessionPtr sess, InputHandlerType ha
 }
 
 int32_t ServerMsgHandler::OnRemoveInputHandler(SessionPtr sess, InputHandlerType handlerType,
-                                               HandleEventType eventType)
+    HandleEventType eventType, PriorityLevel priorityLevel)
 {
     CHKPR(sess, ERROR_NULL_POINTER);
     MMI_HILOGD("OnRemoveInputHandler handlerType:%{public}d eventType:%{public}u", handlerType, eventType);
@@ -278,7 +278,7 @@ int32_t ServerMsgHandler::OnRemoveInputHandler(SessionPtr sess, InputHandlerType
     if (handlerType == InputHandlerType::INTERCEPTOR) {
         auto interceptorHandler = InputHandler->GetInterceptorHandler();
         CHKPR(interceptorHandler, ERROR_NULL_POINTER);
-        interceptorHandler->RemoveInputHandler(handlerType, eventType, sess);
+        interceptorHandler->RemoveInputHandler(handlerType, eventType, priorityLevel, sess);
     }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
 #ifdef OHOS_BUILD_ENABLE_MONITOR
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
old mode 100644
new mode 100755
index 7c1d3713d2..6b5a7965f7
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -59,8 +59,10 @@ public:
     int32_t RegisterDevListener() override;
     int32_t UnregisterDevListener() override;
     int32_t GetKeyboardType(int32_t userData, int32_t deviceId) override;
-    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType) override;
-    int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType) override;
+    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
+        PriorityLevel priorityLevel) override;
+    int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
+        PriorityLevel priorityLevel) override;
     int32_t MarkEventConsumed(int32_t eventId) override;
     int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY) override;
     int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
@@ -102,8 +104,10 @@ protected:
     int32_t OnSupportKeys(int32_t pid, int32_t userData, int32_t deviceId, std::vector<int32_t> &keys);
     int32_t OnGetKeyboardType(int32_t pid, int32_t userData, int32_t deviceId);
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
-    int32_t CheckAddInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType);
-    int32_t CheckRemoveInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType);
+    int32_t CheckAddInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType,
+        PriorityLevel priorityLevel);
+    int32_t CheckRemoveInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType,
+        PriorityLevel priorityLevel);
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
     int32_t CheckMarkConsumed(int32_t pid, int32_t eventId);
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
old mode 100644
new mode 100755
index fd72a205da..5d3db1a127
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -710,21 +710,22 @@ int32_t MMIService::GetKeyboardType(int32_t userData, int32_t deviceId)
 
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
 int32_t MMIService::CheckAddInput(int32_t pid, InputHandlerType handlerType,
-    HandleEventType eventType)
+    HandleEventType eventType, PriorityLevel priorityLevel)
 {
     auto sess = GetSessionByPid(pid);
     CHKPR(sess, ERROR_NULL_POINTER);
-    return sMsgHandler_.OnAddInputHandler(sess, handlerType, eventType);
+    return sMsgHandler_.OnAddInputHandler(sess, handlerType, eventType, priorityLevel);
 }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
 
-int32_t MMIService::AddInputHandler(InputHandlerType handlerType, HandleEventType eventType)
+int32_t MMIService::AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
+    PriorityLevel priorityLevel)
 {
     CALL_INFO_TRACE;
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
     int32_t pid = GetCallingPid();
     int32_t ret = delegateTasks_.PostSyncTask(
-        std::bind(&MMIService::CheckAddInput, this, pid, handlerType, eventType));
+        std::bind(&MMIService::CheckAddInput, this, pid, handlerType, eventType, priorityLevel));
     if (ret != RET_OK) {
         MMI_HILOGE("Add input handler failed, ret:%{public}d", ret);
         return RET_ERR;
@@ -734,21 +735,23 @@ int32_t MMIService::AddInputHandler(InputHandlerType handlerType, HandleEventTyp
 }
 
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
-int32_t MMIService::CheckRemoveInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType)
+int32_t MMIService::CheckRemoveInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType,
+    PriorityLevel priorityLevel)
 {
     auto sess = GetSessionByPid(pid);
     CHKPR(sess, ERROR_NULL_POINTER);
-    return sMsgHandler_.OnRemoveInputHandler(sess, handlerType, eventType);
+    return sMsgHandler_.OnRemoveInputHandler(sess, handlerType, eventType, priorityLevel);
 }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
 
-int32_t MMIService::RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType)
+int32_t MMIService::RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
+    PriorityLevel priorityLevel)
 {
     CALL_INFO_TRACE;
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
     int32_t pid = GetCallingPid();
     int32_t ret = delegateTasks_.PostSyncTask(
-        std::bind(&MMIService::CheckRemoveInput, this, pid, handlerType, eventType));
+        std::bind(&MMIService::CheckRemoveInput, this, pid, handlerType, eventType, priorityLevel));
     if (ret != RET_OK) {
         MMI_HILOGE("Remove input handler failed, ret:%{public}d", ret);
         return RET_ERR;
-- 
Gitee


From cd196c5a99216d2441943b789e86fdea872f6e93 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 28 Nov 2022 07:17:33 +0000
Subject: [PATCH 182/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../proxy/event_handler/include/input_interceptor_manager.h       | 0
 frameworks/proxy/event_handler/src/input_handler_manager.cpp      | 0
 frameworks/proxy/event_handler/src/input_interceptor_manager.cpp  | 0
 frameworks/proxy/events/src/input_manager.cpp                     | 0
 .../native/innerkits/event/include/i_input_event_consumer.h       | 0
 interfaces/native/innerkits/proxy/include/input_manager.h         | 0
 service/connect_manager/include/i_multimodal_input_connect.h      | 0
 .../connect_manager/include/multimodal_input_connect_manager.h    | 0
 service/connect_manager/include/multimodal_input_connect_proxy.h  | 0
 service/connect_manager/src/multimodal_input_connect_manager.cpp  | 0
 service/connect_manager/src/multimodal_input_connect_proxy.cpp    | 0
 service/connect_manager/src/multimodal_input_connect_stub.cpp     | 0
 service/interceptor/include/event_interceptor_handler.h           | 0
 service/interceptor/src/event_interceptor_handler.cpp             | 0
 service/message_handle/include/server_msg_handler.h               | 0
 service/message_handle/src/server_msg_handler.cpp                 | 0
 service/module_loader/include/mmi_service.h                       | 0
 service/module_loader/src/mmi_service.cpp                         | 0
 18 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 frameworks/proxy/event_handler/include/input_interceptor_manager.h
 mode change 100755 => 100644 frameworks/proxy/event_handler/src/input_handler_manager.cpp
 mode change 100755 => 100644 frameworks/proxy/event_handler/src/input_interceptor_manager.cpp
 mode change 100755 => 100644 frameworks/proxy/events/src/input_manager.cpp
 mode change 100755 => 100644 interfaces/native/innerkits/event/include/i_input_event_consumer.h
 mode change 100755 => 100644 interfaces/native/innerkits/proxy/include/input_manager.h
 mode change 100755 => 100644 service/connect_manager/include/i_multimodal_input_connect.h
 mode change 100755 => 100644 service/connect_manager/include/multimodal_input_connect_manager.h
 mode change 100755 => 100644 service/connect_manager/include/multimodal_input_connect_proxy.h
 mode change 100755 => 100644 service/connect_manager/src/multimodal_input_connect_manager.cpp
 mode change 100755 => 100644 service/connect_manager/src/multimodal_input_connect_proxy.cpp
 mode change 100755 => 100644 service/connect_manager/src/multimodal_input_connect_stub.cpp
 mode change 100755 => 100644 service/interceptor/include/event_interceptor_handler.h
 mode change 100755 => 100644 service/interceptor/src/event_interceptor_handler.cpp
 mode change 100755 => 100644 service/message_handle/include/server_msg_handler.h
 mode change 100755 => 100644 service/message_handle/src/server_msg_handler.cpp
 mode change 100755 => 100644 service/module_loader/include/mmi_service.h
 mode change 100755 => 100644 service/module_loader/src/mmi_service.cpp

diff --git a/frameworks/proxy/event_handler/include/input_interceptor_manager.h b/frameworks/proxy/event_handler/include/input_interceptor_manager.h
old mode 100755
new mode 100644
diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
old mode 100755
new mode 100644
diff --git a/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp b/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp
old mode 100755
new mode 100644
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
old mode 100755
new mode 100644
diff --git a/interfaces/native/innerkits/event/include/i_input_event_consumer.h b/interfaces/native/innerkits/event/include/i_input_event_consumer.h
old mode 100755
new mode 100644
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
old mode 100755
new mode 100644
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
old mode 100755
new mode 100644
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
old mode 100755
new mode 100644
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
old mode 100755
new mode 100644
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
old mode 100755
new mode 100644
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
old mode 100755
new mode 100644
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
old mode 100755
new mode 100644
diff --git a/service/interceptor/include/event_interceptor_handler.h b/service/interceptor/include/event_interceptor_handler.h
old mode 100755
new mode 100644
diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp
old mode 100755
new mode 100644
diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
old mode 100755
new mode 100644
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
old mode 100755
new mode 100644
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
old mode 100755
new mode 100644
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
old mode 100755
new mode 100644
-- 
Gitee


From 6e9abe90e95b5fe9b4e7c8d135f60921dd89d927 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Mon, 28 Nov 2022 01:20:05 +0000
Subject: [PATCH 183/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I14a062e9d27f9b8bdf9e2676bc6f193249170fb7
---
 .../src/input_windows_manager.cpp             | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index d9a0f0d115..66b8571baa 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -229,7 +229,13 @@ void InputWindowsManager::UpdateDisplayInfo(const DisplayGroupInfo &displayGroup
             CHKPV(displayInfo);
             int32_t logicX = mouseLocation.physicalX + displayInfo->x;
             int32_t logicY = mouseLocation.physicalY + displayInfo->y;
-            std::optional<WindowInfo> windowInfo = GetWindowInfo(logicX, logicY);
+            std::optional<WindowInfo> windowInfo;
+            if (lastPointerEvent_->GetPointerAction() == PointerEvent::POINTER_ACTION_MOVE &&
+                lastPointerEvent_->GetPressedButtons().empty()) {
+                windowInfo = GetWindowInfo(logicX, logicY);
+            } else {
+                windowInfo = SelectWindowInfo(logicX, logicY, lastPointerEvent_);
+            }
             if (!windowInfo) {
                 MMI_HILOGE("The windowInfo is nullptr");
                 return;
@@ -332,7 +338,13 @@ void InputWindowsManager::DispatchPointer(int32_t pointerAction)
         return;
     }
     if (pointerAction == PointerEvent::POINTER_ACTION_ENTER_WINDOW) {
-        auto windowInfo = GetWindowInfo(lastLogicX_, lastLogicY_);
+        std::optional<WindowInfo> windowInfo;
+        if (lastPointerEvent_->GetPointerAction() == PointerEvent::POINTER_ACTION_MOVE &&
+            lastPointerEvent_->GetPressedButtons().empty()) {
+            windowInfo = GetWindowInfo(lastLogicX_, lastLogicY_);
+        } else {
+            windowInfo = SelectWindowInfo(lastLogicX_, lastLogicY_, lastPointerEvent_);
+        }
         if (!windowInfo) {
             MMI_HILOGE("windowInfo is nullptr");
             return;
@@ -386,13 +398,19 @@ void InputWindowsManager::DispatchPointer(int32_t pointerAction)
 void InputWindowsManager::NotifyPointerToWindow()
 {
     CALL_INFO_TRACE;
-    auto windowInfo = GetWindowInfo(lastLogicX_, lastLogicY_);
+    std::optional<WindowInfo> windowInfo;
+    if (lastPointerEvent_->GetPointerAction() == PointerEvent::POINTER_ACTION_MOVE &&
+        lastPointerEvent_->GetPressedButtons().empty()) {
+        windowInfo = GetWindowInfo(lastLogicX_, lastLogicY_);
+    } else {
+        windowInfo = SelectWindowInfo(lastLogicX_, lastLogicY_, lastPointerEvent_);
+    }
     if (!windowInfo) {
-        MMI_HILOGE("windowInfo is nullptr");
+        MMI_HILOGE("The windowInfo is nullptr");
         return;
     }
     if (windowInfo->id == lastWindowInfo_.id) {
-        MMI_HILOGI("The mouse pointer does not leave the window");
+        MMI_HILOGI("The mouse pointer does not leave the window:%{public}d", lastWindowInfo_.id);
         lastWindowInfo_ = *windowInfo;
         return;
     }
@@ -826,6 +844,7 @@ void InputWindowsManager::UpdatePointerEvent(int32_t logicalX, int32_t logicalY,
     const std::shared_ptr<PointerEvent>& pointerEvent, const WindowInfo& touchWindow)
 {
     CHKPV(pointerEvent);
+    MMI_HILOGD("LastWindowInfo:%{public}d, touchWindow:%{public}d", lastWindowInfo_.id, touchWindow.id);
     if (lastWindowInfo_.id != touchWindow.id) {
         DispatchPointer(PointerEvent::POINTER_ACTION_LEAVE_WINDOW);
         lastLogicX_ = logicalX;
-- 
Gitee


From 0d499ffd7596310d92d590955f416a1f414a70be Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Mon, 28 Nov 2022 11:15:14 +0000
Subject: [PATCH 184/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I2d63c527bb396d33c0424923b1d2a1d39c53585b
---
 util/socket/src/uds_client.cpp  | 1 +
 util/socket/src/uds_session.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/socket/src/uds_client.cpp b/util/socket/src/uds_client.cpp
index 304ec7e0d3..5e5ad5fad1 100644
--- a/util/socket/src/uds_client.cpp
+++ b/util/socket/src/uds_client.cpp
@@ -73,6 +73,7 @@ bool UDSClient::SendMsg(const char *buf, size_t size) const
         idx += count;
         remSize -= count;
         if (remSize > 0) {
+            MMI_HILOGW("Remsize:%{public}d", remSize);
             usleep(SEND_RETRY_SLEEP_TIME);
         }
     }
diff --git a/util/socket/src/uds_session.cpp b/util/socket/src/uds_session.cpp
index 3c3dfd0554..7c5e4b9c4a 100644
--- a/util/socket/src/uds_session.cpp
+++ b/util/socket/src/uds_session.cpp
@@ -70,7 +70,6 @@ bool UDSSession::SendMsg(const char *buf, size_t size) const
         auto count = send(fd_, &buf[idx], remSize, MSG_DONTWAIT | MSG_NOSIGNAL);
         if (count < 0) {
             if (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK) {
-                usleep(SEND_RETRY_SLEEP_TIME);
                 MMI_HILOGW("Continue for errno EAGAIN|EINTR|EWOULDBLOCK, errno:%{public}d", errno);
                 continue;
             }
@@ -80,6 +79,7 @@ bool UDSSession::SendMsg(const char *buf, size_t size) const
         idx += count;
         remSize -= count;
         if (remSize > 0) {
+            MMI_HILOGW("Remsize:%{public}d", remSize);
             usleep(SEND_RETRY_SLEEP_TIME);
         }
     }
-- 
Gitee


From c240c6a3f07fe9e22506b2de10b7d49f9a10a46e Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 28 Nov 2022 19:32:01 +0800
Subject: [PATCH 185/360] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=89=E5=A4=AA?=
 =?UTF-8?q?=E5=BF=AB=E6=8B=89=E8=B5=B7=E5=BA=94=E7=94=A8=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I473a2f625705e645f8f97ad7c7a5010f90fc6e84
---
 service/key_command/src/key_command_handler.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index c41c7ea245..999d126e08 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -815,10 +815,6 @@ bool KeyCommandHandler::AddSequenceKey(const std::shared_ptr<KeyEvent> keyEvent)
     sequenceKey.keyAction = keyEvent->GetKeyAction();
     sequenceKey.actionTime = keyEvent->GetActionTime();
     size_t size = keys_.size();
-    if (size > MAX_SEQUENCEKEYS_NUM) {
-        MMI_HILOGD("The save key size more than the max size");
-        return false;
-    }
     if (size > 0) {
         if (keys_[size - 1].actionTime > sequenceKey.actionTime) {
             MMI_HILOGE("The current event time is greater than the last event time");
@@ -837,6 +833,11 @@ bool KeyCommandHandler::AddSequenceKey(const std::shared_ptr<KeyEvent> keyEvent)
             InterruptTimers();
         }
     }
+    if (size > MAX_SEQUENCEKEYS_NUM) {
+        MMI_HILOGD("The save key size more than the max size");
+        return false;
+    }
+
     keys_.push_back(sequenceKey);
     return true;
 }
@@ -1076,4 +1077,4 @@ void KeyCommandHandler::InterruptTimers()
     }
 }
 } // namespace MMI
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
-- 
Gitee


From 1cb80ea0bbf9f61363a2e4c4f843cb0b33a6356c Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 28 Nov 2022 19:36:57 +0800
Subject: [PATCH 186/360] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=89=E5=A4=AA?=
 =?UTF-8?q?=E5=BF=AB=E6=8B=89=E8=B5=B7=E5=BA=94=E7=94=A8=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ifbb386cbd79fdf7b7ba1af86363d2ddf8db3b85a
---
 service/key_command/src/key_command_handler.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index 999d126e08..f4eaa569da 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -837,7 +837,6 @@ bool KeyCommandHandler::AddSequenceKey(const std::shared_ptr<KeyEvent> keyEvent)
         MMI_HILOGD("The save key size more than the max size");
         return false;
     }
-
     keys_.push_back(sequenceKey);
     return true;
 }
-- 
Gitee


From 7463d43440ce194cce7251c316665feb872bb82e Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 28 Nov 2022 11:39:57 +0000
Subject: [PATCH 187/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../include/input_handler_manager.h           | 12 +++---
 .../include/input_handler_type.h              |  1 +
 .../include/input_interceptor_manager.h       |  2 +-
 .../include/input_manager_impl.h              |  4 +-
 .../src/input_handler_manager.cpp             | 38 +++++++++----------
 .../src/input_interceptor_manager.cpp         |  4 +-
 .../event_handler/src/input_manager_impl.cpp  |  8 ++--
 frameworks/proxy/events/src/input_manager.cpp |  8 ++--
 .../event/include/i_input_event_consumer.h    |  6 ---
 .../innerkits/proxy/include/input_manager.h   |  4 +-
 .../include/i_multimodal_input_connect.h      |  5 +--
 .../multimodal_input_connect_manager.h        |  4 +-
 .../include/multimodal_input_connect_proxy.h  |  4 +-
 .../src/multimodal_input_connect_manager.cpp  |  8 ++--
 .../src/multimodal_input_connect_proxy.cpp    |  8 ++--
 .../src/multimodal_input_connect_stub.cpp     | 14 +++----
 .../include/event_interceptor_handler.h       | 10 ++---
 .../src/event_interceptor_handler.cpp         | 12 +++---
 .../include/server_msg_handler.h              |  4 +-
 .../message_handle/src/server_msg_handler.cpp |  8 ++--
 service/module_loader/include/mmi_service.h   |  8 ++--
 service/module_loader/src/mmi_service.cpp     | 16 ++++----
 22 files changed, 90 insertions(+), 98 deletions(-)
 mode change 100755 => 100644 frameworks/proxy/event_handler/include/input_handler_manager.h
 mode change 100755 => 100644 frameworks/proxy/event_handler/include/input_manager_impl.h
 mode change 100755 => 100644 frameworks/proxy/event_handler/src/input_manager_impl.cpp

diff --git a/frameworks/proxy/event_handler/include/input_handler_manager.h b/frameworks/proxy/event_handler/include/input_handler_manager.h
old mode 100755
new mode 100644
index 942a021478..4d5b5bf145
--- a/frameworks/proxy/event_handler/include/input_handler_manager.h
+++ b/frameworks/proxy/event_handler/include/input_handler_manager.h
@@ -45,11 +45,11 @@ public:
     bool HasHandler(int32_t handlerId);
     virtual InputHandlerType GetHandlerType() const = 0;
     HandleEventType GetEventType() const;
-    PriorityLevel GetPriorityLevel() const;
+    int32_t GetPriority() const;
 
 protected:
     int32_t AddHandler(InputHandlerType handlerType, std::shared_ptr<IInputEventConsumer> consumer,
-        HandleEventType eventType = HANDLE_EVENT_TYPE_ALL, PriorityLevel priorityLevel = PriorityLevel::LOW_LEVEL);
+        HandleEventType eventType = HANDLE_EVENT_TYPE_ALL, int32_t priority = DEFUALT_INTERCEPTOR_PRIORITY);
     void RemoveHandler(int32_t handlerId, InputHandlerType IsValidHandlerType);
 
 private:
@@ -57,17 +57,17 @@ private:
         int32_t handlerId_ { 0 };
         InputHandlerType handlerType_ { NONE };
         HandleEventType eventType_ { HANDLE_EVENT_TYPE_ALL };
-        PriorityLevel priorityLevel_ { PriorityLevel::LOW_LEVEL };
+        int32_t priority_ { DEFUALT_INTERCEPTOR_PRIORITY };
         std::shared_ptr<IInputEventConsumer> consumer_ { nullptr };
     };
 
 private:
     int32_t GetNextId();
     int32_t AddLocal(int32_t handlerId, InputHandlerType handlerType,
-        HandleEventType eventType, PriorityLevel priorityLevel, std::shared_ptr<IInputEventConsumer> monitor);
-    int32_t AddToServer(InputHandlerType handlerType, HandleEventType eventType, PriorityLevel priorityLevel);
+        HandleEventType eventType, int32_t priority, std::shared_ptr<IInputEventConsumer> monitor);
+    int32_t AddToServer(InputHandlerType handlerType, HandleEventType eventType, int32_t priority);
     int32_t RemoveLocal(int32_t handlerId, InputHandlerType handlerType);
-    void RemoveFromServer(InputHandlerType handlerType, HandleEventType eventType, PriorityLevel priorityLevel);
+    void RemoveFromServer(InputHandlerType handlerType, HandleEventType eventType, int32_t priority);
 
     std::shared_ptr<IInputEventConsumer> FindHandler(int32_t handlerId);
     void OnDispatchEventProcessed(int32_t eventId);
diff --git a/frameworks/proxy/event_handler/include/input_handler_type.h b/frameworks/proxy/event_handler/include/input_handler_type.h
index c85d661169..e5812fbc29 100644
--- a/frameworks/proxy/event_handler/include/input_handler_type.h
+++ b/frameworks/proxy/event_handler/include/input_handler_type.h
@@ -24,6 +24,7 @@ inline constexpr size_t    MAX_N_INPUT_INTERCEPTORS { MAX_N_INPUT_HANDLERS };
 inline constexpr int32_t   MIN_HANDLER_ID { 1 };
 inline constexpr int32_t   INVALID_HANDLER_ID { -1 };
 inline constexpr int32_t   ERROR_EXCEED_MAX_COUNT { -4100001 };
+inline constexpr int32_t   DEFUALT_INTERCEPTOR_PRIORITY { 500 };
 
 enum InputHandlerType : int32_t {
     NONE,
diff --git a/frameworks/proxy/event_handler/include/input_interceptor_manager.h b/frameworks/proxy/event_handler/include/input_interceptor_manager.h
index 1993414015..17d7e1859d 100644
--- a/frameworks/proxy/event_handler/include/input_interceptor_manager.h
+++ b/frameworks/proxy/event_handler/include/input_interceptor_manager.h
@@ -32,7 +32,7 @@ public:
     DISALLOW_COPY_AND_MOVE(InputInterceptorManager);
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, HandleEventType eventType);
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, HandleEventType eventType,
-        PriorityLevel priorityLevel);
+        int32_t priority);
     void RemoveInterceptor(int32_t interceptorId);
     InputHandlerType GetHandlerType() const override;
 };
diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
old mode 100755
new mode 100644
index b62a5c7d54..93f76e81cb
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -75,9 +75,9 @@ public:
     void MoveMouse(int32_t offsetX, int32_t offsetY);
 
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor,
-        PriorityLevel priorityLevel = PriorityLevel::LOW_LEVEL);
+        int32_t priority = DEFUALT_INTERCEPTOR_PRIORITY);
     int32_t AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor,
-        PriorityLevel priorityLevel = PriorityLevel::LOW_LEVEL);
+        int32_t priority = DEFUALT_INTERCEPTOR_PRIORITY);
     void RemoveInterceptor(int32_t interceptorId);
 
     void SimulateInputEvent(std::shared_ptr<KeyEvent> keyEvent);
diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
index 12cbbc22f9..8a56649928 100644
--- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp
+++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
@@ -38,7 +38,7 @@ InputHandlerManager::InputHandlerManager()
 }
 
 int32_t InputHandlerManager::AddHandler(InputHandlerType handlerType, std::shared_ptr<IInputEventConsumer> consumer,
-    HandleEventType eventType, PriorityLevel priorityLevel)
+    HandleEventType eventType, int32_t priority)
 {
     CALL_INFO_TRACE;
     CHKPR(consumer, INVALID_HANDLER_ID);
@@ -59,11 +59,11 @@ int32_t InputHandlerManager::AddHandler(InputHandlerType handlerType, std::share
     }
     const HandleEventType currentType = GetEventType();
     MMI_HILOGD("Register new handler:%{public}d", handlerId);
-    if (RET_OK == AddLocal(handlerId, handlerType, eventType, priorityLevel, consumer)) {
+    if (RET_OK == AddLocal(handlerId, handlerType, eventType, priority, consumer)) {
         MMI_HILOGD("New handler successfully registered, report to server");
         const HandleEventType newType = GetEventType();
         if (currentType != newType) {
-            int32_t ret = AddToServer(handlerType, newType, priorityLevel);
+            int32_t ret = AddToServer(handlerType, newType, priority);
             if (ret != RET_OK) {
                 MMI_HILOGD("Handler:%{public}d permissions failed, remove the monitor", handlerId);
                 RemoveLocal(handlerId, handlerType);
@@ -85,7 +85,7 @@ void InputHandlerManager::RemoveHandler(int32_t handlerId, InputHandlerType hand
     if (RET_OK == RemoveLocal(handlerId, handlerType)) {
         MMI_HILOGD("Handler:%{public}d unregistered, report to server", handlerId);
         const HandleEventType newType = GetEventType();
-        const PriorityLevel newLevel = GetPriorityLevel();
+        const int32_t newLevel = GetPriority();
         if (currentType != newType) {
             RemoveFromServer(handlerType, newType, newLevel);
         }
@@ -93,13 +93,13 @@ void InputHandlerManager::RemoveHandler(int32_t handlerId, InputHandlerType hand
 }
 
 int32_t InputHandlerManager::AddLocal(int32_t handlerId, InputHandlerType handlerType,
-    HandleEventType eventType, PriorityLevel priorityLevel, std::shared_ptr<IInputEventConsumer> monitor)
+    HandleEventType eventType, int32_t priority, std::shared_ptr<IInputEventConsumer> monitor)
 {
     InputHandlerManager::Handler handler {
         .handlerId_ = handlerId,
         .handlerType_ = handlerType,
         .eventType_ = eventType,
-        .priorityLevel_ = priorityLevel,
+        .priority_ = priority,
         .consumer_ = monitor,
     };
     auto ret = inputHandlers_.emplace(handler.handlerId_, handler);
@@ -110,7 +110,7 @@ int32_t InputHandlerManager::AddLocal(int32_t handlerId, InputHandlerType handle
     if (handlerType == InputHandlerType::INTERCEPTOR) {
         auto iterIndex = interHandlers_.begin();
         for (; iterIndex != interHandlers_.end(); ++iterIndex) {
-            if (handler.priorityLevel_ > iterIndex->priorityLevel_) {
+            if (handler.priority_ < iterIndex->priority_) {
                 break;
             }
         }
@@ -124,9 +124,9 @@ int32_t InputHandlerManager::AddLocal(int32_t handlerId, InputHandlerType handle
 }
 
 int32_t InputHandlerManager::AddToServer(InputHandlerType handlerType, HandleEventType eventType,
-    PriorityLevel priorityLevel)
+    int32_t priority)
 {
-    int32_t ret = MultimodalInputConnMgr->AddInputHandler(handlerType, eventType, priorityLevel);
+    int32_t ret = MultimodalInputConnMgr->AddInputHandler(handlerType, eventType, priority);
     if (ret != RET_OK) {
         MMI_HILOGE("Send to server failed, ret:%{public}d", ret);
     }
@@ -149,7 +149,7 @@ int32_t InputHandlerManager::RemoveLocal(int32_t handlerId, InputHandlerType han
 
     if (handlerType == InputHandlerType::INTERCEPTOR) {
         for (auto it = interHandlers_.begin(); it != interHandlers_.end(); ++it) {
-            if (handlerId > it->handlerId_) {
+            if (handlerId < it->handlerId_) {
                 interHandlers_.erase(it);
                 break;
             }
@@ -159,9 +159,9 @@ int32_t InputHandlerManager::RemoveLocal(int32_t handlerId, InputHandlerType han
 }
 
 void InputHandlerManager::RemoveFromServer(InputHandlerType handlerType, HandleEventType eventType,
-    PriorityLevel priorityLevel)
+    int32_t priority)
 {
-    int32_t ret = MultimodalInputConnMgr->RemoveInputHandler(handlerType, eventType, priorityLevel);
+    int32_t ret = MultimodalInputConnMgr->RemoveInputHandler(handlerType, eventType, priority);
     if (ret != 0) {
         MMI_HILOGE("Send to server failed, ret:%{public}d", ret);
     }
@@ -298,9 +298,9 @@ void InputHandlerManager::OnConnected()
 {
     CALL_DEBUG_ENTER;
     HandleEventType eventType = GetEventType();
-    PriorityLevel priorityLevel = GetPriorityLevel();
+    int32_t priority = GetPriority();
     if (eventType != HANDLE_EVENT_TYPE_NONE) {
-        AddToServer(GetHandlerType(), eventType, priorityLevel);
+        AddToServer(GetHandlerType(), eventType, priority);
     }
 }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
@@ -329,17 +329,17 @@ HandleEventType InputHandlerManager::GetEventType() const
     return eventType;
 }
 
-PriorityLevel InputHandlerManager::GetPriorityLevel() const
+int32_t InputHandlerManager::GetPriority() const
 {
     if (inputHandlers_.empty()) {
         MMI_HILOGD("InputHandlers is empty");
-        return PriorityLevel::LOW_LEVEL;
+        return DEFUALT_INTERCEPTOR_PRIORITY;
     }
-    PriorityLevel priorityLevel { PriorityLevel::LOW_LEVEL };
+    int32_t priority { DEFUALT_INTERCEPTOR_PRIORITY };
     if (!interHandlers_.empty()) {
-        priorityLevel = interHandlers_.front().priorityLevel_;
+        priority = interHandlers_.front().priority_;
     }
-    return priorityLevel;
+    return priority;
 }
 
 void InputHandlerManager::OnDispatchEventProcessed(int32_t eventId)
diff --git a/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp b/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp
index d7b291a218..5ea852a4dd 100644
--- a/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp
+++ b/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp
@@ -38,13 +38,13 @@ int32_t InputInterceptorManager::AddInterceptor(std::shared_ptr<IInputEventConsu
 }
 
 int32_t InputInterceptorManager::AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor,
-    HandleEventType eventType, PriorityLevel priorityLevel)
+    HandleEventType eventType, int32_t priority)
 {
     if (interceptor == nullptr) {
         MMI_HILOGE("No interceptor was specified.");
         return INVALID_HANDLER_ID;
     }
-    return AddHandler(InputHandlerType::INTERCEPTOR, interceptor, eventType, priorityLevel);
+    return AddHandler(InputHandlerType::INTERCEPTOR, interceptor, eventType, priority);
 }
 
 void InputInterceptorManager::RemoveInterceptor(int32_t interceptorId)
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
old mode 100755
new mode 100644
index d482b6f0d6..a786a76725
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -418,7 +418,7 @@ void InputManagerImpl::MoveMouse(int32_t offsetX, int32_t offsetY)
 }
 
 int32_t InputManagerImpl::AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor,
-    PriorityLevel priorityLevel)
+    int32_t priority)
 {
     CALL_INFO_TRACE;
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
@@ -428,7 +428,7 @@ int32_t InputManagerImpl::AddInterceptor(std::shared_ptr<IInputEventConsumer> in
         MMI_HILOGE("Client init failed");
         return RET_ERR;
     }
-    return InputInterMgr->AddInterceptor(interceptor, HANDLE_EVENT_TYPE_ALL, priorityLevel);
+    return InputInterMgr->AddInterceptor(interceptor, HANDLE_EVENT_TYPE_ALL, priority);
 #else
     MMI_HILOGW("Interceptor function does not support");
     return ERROR_UNSUPPORT;
@@ -436,7 +436,7 @@ int32_t InputManagerImpl::AddInterceptor(std::shared_ptr<IInputEventConsumer> in
 }
 
 int32_t InputManagerImpl::AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor,
-    PriorityLevel priorityLevel)
+    int32_t priority)
 {
     CALL_INFO_TRACE;
 #if defined(OHOS_BUILD_ENABLE_KEYBOARD) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
@@ -448,7 +448,7 @@ int32_t InputManagerImpl::AddInterceptor(std::function<void(std::shared_ptr<KeyE
         MMI_HILOGE("Client init failed");
         return RET_ERR;
     }
-    return InputInterMgr->AddInterceptor(consumer, HANDLE_EVENT_TYPE_KEY, priorityLevel);
+    return InputInterMgr->AddInterceptor(consumer, HANDLE_EVENT_TYPE_KEY, priority);
 #else
     MMI_HILOGW("Keyboard device or interceptor function does not support");
     return ERROR_UNSUPPORT;
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index 0a356048ef..4d30ef68d1 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -105,15 +105,15 @@ int32_t InputManager::AddInterceptor(std::function<void(std::shared_ptr<KeyEvent
     return InputMgrImpl.AddInterceptor(interceptor);
 }
 
-int32_t InputManager::AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, PriorityLevel priorityLevel)
+int32_t InputManager::AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, int32_t priority)
 {
-    return InputMgrImpl.AddInterceptor(interceptor, priorityLevel);
+    return InputMgrImpl.AddInterceptor(interceptor, priority);
 }
 
 int32_t InputManager::AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor,
-    PriorityLevel priorityLevel)
+    int32_t priority)
 {
-    return InputMgrImpl.AddInterceptor(interceptor, priorityLevel);
+    return InputMgrImpl.AddInterceptor(interceptor, priority);
 }
 
 void InputManager::RemoveInterceptor(int32_t interceptorId)
diff --git a/interfaces/native/innerkits/event/include/i_input_event_consumer.h b/interfaces/native/innerkits/event/include/i_input_event_consumer.h
index 1ea204cdb9..2ef061a8f3 100644
--- a/interfaces/native/innerkits/event/include/i_input_event_consumer.h
+++ b/interfaces/native/innerkits/event/include/i_input_event_consumer.h
@@ -24,12 +24,6 @@
 
 namespace OHOS {
 namespace MMI {
-enum PriorityLevel : int32_t {
-    LOW_LEVEL,
-    MIDDLE_LEVEL,
-    HIGH_LEVEL
-};
-
 struct IInputEventConsumer {
 public:
     IInputEventConsumer() = default;
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index f34cb79b93..2ca240f607 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -177,8 +177,8 @@ public:
      */
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor);
     int32_t AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor);
-    int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, PriorityLevel priorityLevel);
-    int32_t AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor, PriorityLevel priorityLevel);
+    int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, int32_t priority);
+    int32_t AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor, int32_t priority);
 
     /**
      * @brief Removes an interceptor.
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
index 727d8956eb..c93db92831 100644
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -19,7 +19,6 @@
 #include "iremote_broker.h"
 
 #include "i_event_filter.h"
-#include "i_input_event_consumer.h"
 #include "input_handler_type.h"
 #include "key_event.h"
 #include "key_option.h"
@@ -87,9 +86,9 @@ public:
     virtual int32_t UnregisterDevListener() = 0;
     virtual int32_t GetKeyboardType(int32_t userData, int32_t deviceId) = 0;
     virtual int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        PriorityLevel priorityLevel) = 0;
+        int32_t priority) = 0;
     virtual int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        PriorityLevel priorityLevel) = 0;
+        int32_t priority) = 0;
     virtual int32_t MarkEventConsumed(int32_t eventId) = 0;
     virtual int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY) = 0;
     virtual int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) = 0;
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
index 4079046968..3466856b49 100644
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -50,8 +50,8 @@ public:
     int32_t RegisterDevListener();
     int32_t UnregisterDevListener();
     int32_t GetKeyboardType(int32_t userData, int32_t deviceId);
-    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType, PriorityLevel priorityLevel);
-    int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType, PriorityLevel priorityLevel);
+    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType, int32_t priority);
+    int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType, int32_t priority);
     int32_t MarkEventConsumed(int32_t eventId);
     int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY);
     int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent);
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
index 1467769f6e..96706c0b53 100644
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -46,9 +46,9 @@ public:
     int32_t UnregisterDevListener() override;
     int32_t GetKeyboardType(int32_t userData, int32_t deviceId) override;
     int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        PriorityLevel priorityLevel) override;
+        int32_t priority) override;
     int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        PriorityLevel priorityLevel) override;
+        int32_t priority) override;
     int32_t MarkEventConsumed(int32_t eventId) override;
     int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY) override;
     int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
index d536b5b16f..14b28a9657 100644
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -156,17 +156,17 @@ int32_t MultimodalInputConnectManager::GetKeyboardType(int32_t userData, int32_t
 }
 
 int32_t MultimodalInputConnectManager::AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-    PriorityLevel priorityLevel)
+    int32_t priority)
 {
     CHKPR(multimodalInputConnectService_, INVALID_HANDLER_ID);
-    return multimodalInputConnectService_->AddInputHandler(handlerType, eventType, priorityLevel);
+    return multimodalInputConnectService_->AddInputHandler(handlerType, eventType, priority);
 }
 
 int32_t MultimodalInputConnectManager::RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-    PriorityLevel priorityLevel)
+    int32_t priority)
 {
     CHKPR(multimodalInputConnectService_, INVALID_HANDLER_ID);
-    return multimodalInputConnectService_->RemoveInputHandler(handlerType, eventType, priorityLevel);
+    return multimodalInputConnectService_->RemoveInputHandler(handlerType, eventType, priority);
 }
 
 int32_t MultimodalInputConnectManager::MarkEventConsumed(int32_t eventId)
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index 9888c8f806..43952e5988 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -362,7 +362,7 @@ int32_t MultimodalInputConnectProxy::GetKeyboardType(int32_t userData, int32_t d
 }
 
 int32_t MultimodalInputConnectProxy::AddInputHandler(InputHandlerType handlerType,
-    HandleEventType eventType, PriorityLevel priorityLevel)
+    HandleEventType eventType, int32_t priority)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -372,7 +372,7 @@ int32_t MultimodalInputConnectProxy::AddInputHandler(InputHandlerType handlerTyp
     }
     WRITEINT32(data, handlerType, ERR_INVALID_VALUE);
     WRITEUINT32(data, eventType, ERR_INVALID_VALUE);
-    WRITEINT32(data, priorityLevel, ERR_INVALID_VALUE);
+    WRITEINT32(data, priority, ERR_INVALID_VALUE);
     MessageParcel reply;
     MessageOption option;
     sptr<IRemoteObject> remote = Remote();
@@ -386,7 +386,7 @@ int32_t MultimodalInputConnectProxy::AddInputHandler(InputHandlerType handlerTyp
 }
 
 int32_t MultimodalInputConnectProxy::RemoveInputHandler(InputHandlerType handlerType,
-    HandleEventType eventType, PriorityLevel priorityLevel)
+    HandleEventType eventType, int32_t priority)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -396,7 +396,7 @@ int32_t MultimodalInputConnectProxy::RemoveInputHandler(InputHandlerType handler
     }
     WRITEINT32(data, handlerType, ERR_INVALID_VALUE);
     WRITEUINT32(data, eventType, ERR_INVALID_VALUE);
-    WRITEINT32(data, priorityLevel, ERR_INVALID_VALUE);
+    WRITEINT32(data, priority, ERR_INVALID_VALUE);
     MessageParcel reply;
     MessageOption option;
     sptr<IRemoteObject> remote = Remote();
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index de348cd261..e9234f6d04 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -356,10 +356,9 @@ int32_t MultimodalInputConnectStub::StubAddInputHandler(MessageParcel& data, Mes
     }
     uint32_t eventType;
     READUINT32(data, eventType, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t priorityLevel;
-    READINT32(data, priorityLevel, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = AddInputHandler(static_cast<InputHandlerType>(handlerType), eventType,
-        static_cast<PriorityLevel>(priorityLevel));
+    int32_t priority;
+    READINT32(data, priority, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = AddInputHandler(static_cast<InputHandlerType>(handlerType), eventType, priority);
     if (ret != RET_OK) {
         MMI_HILOGE("Call AddInputHandler failed ret:%{public}d", ret);
         return ret;
@@ -387,10 +386,9 @@ int32_t MultimodalInputConnectStub::StubRemoveInputHandler(MessageParcel& data,
     }
     uint32_t eventType;
     READUINT32(data, eventType, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t priorityLevel;
-    READINT32(data, priorityLevel, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = RemoveInputHandler(static_cast<InputHandlerType>(handlerType), eventType,
-        static_cast<PriorityLevel>(priorityLevel));
+    int32_t priority;
+    READINT32(data, priority, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = RemoveInputHandler(static_cast<InputHandlerType>(handlerType), eventType, priority);
     if (ret != RET_OK) {
         MMI_HILOGE("Call RemoveInputHandler failed ret:%{public}d", ret);
         return ret;
diff --git a/service/interceptor/include/event_interceptor_handler.h b/service/interceptor/include/event_interceptor_handler.h
index 89fac9cc02..d8f52dd586 100644
--- a/service/interceptor/include/event_interceptor_handler.h
+++ b/service/interceptor/include/event_interceptor_handler.h
@@ -42,9 +42,9 @@ public:
     void HandleTouchEvent(const std::shared_ptr<PointerEvent> pointerEvent) override;
 #endif // OHOS_BUILD_ENABLE_TOUCH
     int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        PriorityLevel priorityLevel, SessionPtr session);
+        int32_t priority, SessionPtr session);
     void RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        PriorityLevel priorityLevel, SessionPtr session);
+        int32_t priority, SessionPtr session);
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     bool OnHandleEvent(std::shared_ptr<KeyEvent> keyEvent);
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
@@ -58,14 +58,14 @@ private:
 private:
     class SessionHandler {
     public:
-        SessionHandler(InputHandlerType handlerType, HandleEventType eventType, PriorityLevel priorityLevel,
+        SessionHandler(InputHandlerType handlerType, HandleEventType eventType, int32_t priority,
             SessionPtr session) : handlerType_(handlerType), eventType_(eventType & HANDLE_EVENT_TYPE_ALL),
-            priorityLevel_(priorityLevel), session_(session) {}
+            priority_(priority), session_(session) {}
         void SendToClient(std::shared_ptr<KeyEvent> keyEvent) const;
         void SendToClient(std::shared_ptr<PointerEvent> pointerEvent) const;
         InputHandlerType handlerType_;
         HandleEventType eventType_;
-        PriorityLevel priorityLevel_;
+        int32_t priority_;
         SessionPtr session_ { nullptr };
     };
 
diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp
index f4e9a47625..1f074be91d 100644
--- a/service/interceptor/src/event_interceptor_handler.cpp
+++ b/service/interceptor/src/event_interceptor_handler.cpp
@@ -84,7 +84,7 @@ void EventInterceptorHandler::HandleTouchEvent(const std::shared_ptr<PointerEven
 #endif // OHOS_BUILD_ENABLE_TOUCH
 
 int32_t EventInterceptorHandler::AddInputHandler(InputHandlerType handlerType,
-    HandleEventType eventType, PriorityLevel priorityLevel, SessionPtr session)
+    HandleEventType eventType, int32_t priority, SessionPtr session)
 {
     CALL_INFO_TRACE;
     CHKPR(session, RET_ERR);
@@ -93,17 +93,17 @@ int32_t EventInterceptorHandler::AddInputHandler(InputHandlerType handlerType,
         return RET_ERR;
     }
     InitSessionLostCallback();
-    SessionHandler interceptor { handlerType, eventType, priorityLevel, session };
+    SessionHandler interceptor { handlerType, eventType, priority, session };
     return interceptors_.AddInterceptor(interceptor);
 }
 
 void EventInterceptorHandler::RemoveInputHandler(InputHandlerType handlerType,
-    HandleEventType eventType, PriorityLevel priorityLevel, SessionPtr session)
+    HandleEventType eventType, int32_t priority, SessionPtr session)
 {
     CALL_INFO_TRACE;
     CHKPV(session);
     if (handlerType == InputHandlerType::INTERCEPTOR) {
-        SessionHandler interceptor { handlerType, eventType, priorityLevel, session };
+        SessionHandler interceptor { handlerType, eventType, priority, session };
         interceptors_.RemoveInterceptor(interceptor);
     }
 }
@@ -250,7 +250,7 @@ int32_t EventInterceptorHandler::InterceptorCollection::AddInterceptor(const Ses
 
     auto iterIndex = interceptors_.cbegin();
     for (; iterIndex != interceptors_.cend(); ++iterIndex) {
-        if (interceptor.priorityLevel_ > iterIndex->priorityLevel_) {
+        if (interceptor.priority_ < iterIndex->priority_) {
             break;
         }
     }
@@ -277,7 +277,7 @@ void EventInterceptorHandler::InterceptorCollection::RemoveInterceptor(const Ses
 
     auto iterIndex = interceptors_.cbegin();
     for (; iterIndex != interceptors_.cend(); ++iterIndex) {
-        if (interceptor.priorityLevel_ > iterIndex->priorityLevel_) {
+        if (interceptor.priority_ < iterIndex->priority_) {
             break;
         }
     }
diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
index 0e8ebd6362..583180e15f 100644
--- a/service/message_handle/include/server_msg_handler.h
+++ b/service/message_handle/include/server_msg_handler.h
@@ -38,9 +38,9 @@ public:
     void OnMsgHandler(SessionPtr sess, NetPacket& pkt);
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
     int32_t OnAddInputHandler(SessionPtr sess, InputHandlerType handlerType, HandleEventType eventType,
-        PriorityLevel priorityLevel);
+        int32_t priority);
     int32_t OnRemoveInputHandler(SessionPtr sess, InputHandlerType handlerType, HandleEventType eventType,
-        PriorityLevel priorityLevel);
+        int32_t priority);
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
 #ifdef OHOS_BUILD_ENABLE_MONITOR
     int32_t OnMarkConsumed(SessionPtr sess, int32_t eventId);
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index 35f9cd11a1..e04fb6b9c4 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -248,7 +248,7 @@ int32_t ServerMsgHandler::OnDisplayInfo(SessionPtr sess, NetPacket &pkt)
 
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
 int32_t ServerMsgHandler::OnAddInputHandler(SessionPtr sess, InputHandlerType handlerType,
-    HandleEventType eventType, PriorityLevel priorityLevel)
+    HandleEventType eventType, int32_t priority)
 {
     CHKPR(sess, ERROR_NULL_POINTER);
     MMI_HILOGD("handlerType:%{public}d", handlerType);
@@ -256,7 +256,7 @@ int32_t ServerMsgHandler::OnAddInputHandler(SessionPtr sess, InputHandlerType ha
     if (handlerType == InputHandlerType::INTERCEPTOR) {
         auto interceptorHandler = InputHandler->GetInterceptorHandler();
         CHKPR(interceptorHandler, ERROR_NULL_POINTER);
-        return interceptorHandler->AddInputHandler(handlerType, eventType, priorityLevel, sess);
+        return interceptorHandler->AddInputHandler(handlerType, eventType, priority, sess);
     }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
 #ifdef OHOS_BUILD_ENABLE_MONITOR
@@ -270,7 +270,7 @@ int32_t ServerMsgHandler::OnAddInputHandler(SessionPtr sess, InputHandlerType ha
 }
 
 int32_t ServerMsgHandler::OnRemoveInputHandler(SessionPtr sess, InputHandlerType handlerType,
-    HandleEventType eventType, PriorityLevel priorityLevel)
+    HandleEventType eventType, int32_t priority)
 {
     CHKPR(sess, ERROR_NULL_POINTER);
     MMI_HILOGD("OnRemoveInputHandler handlerType:%{public}d eventType:%{public}u", handlerType, eventType);
@@ -278,7 +278,7 @@ int32_t ServerMsgHandler::OnRemoveInputHandler(SessionPtr sess, InputHandlerType
     if (handlerType == InputHandlerType::INTERCEPTOR) {
         auto interceptorHandler = InputHandler->GetInterceptorHandler();
         CHKPR(interceptorHandler, ERROR_NULL_POINTER);
-        interceptorHandler->RemoveInputHandler(handlerType, eventType, priorityLevel, sess);
+        interceptorHandler->RemoveInputHandler(handlerType, eventType, priority, sess);
     }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
 #ifdef OHOS_BUILD_ENABLE_MONITOR
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index 6b5a7965f7..44e1e5e14d 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -60,9 +60,9 @@ public:
     int32_t UnregisterDevListener() override;
     int32_t GetKeyboardType(int32_t userData, int32_t deviceId) override;
     int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        PriorityLevel priorityLevel) override;
+        int32_t priority) override;
     int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        PriorityLevel priorityLevel) override;
+        int32_t priority) override;
     int32_t MarkEventConsumed(int32_t eventId) override;
     int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY) override;
     int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
@@ -105,9 +105,9 @@ protected:
     int32_t OnGetKeyboardType(int32_t pid, int32_t userData, int32_t deviceId);
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
     int32_t CheckAddInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType,
-        PriorityLevel priorityLevel);
+        int32_t priority);
     int32_t CheckRemoveInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType,
-        PriorityLevel priorityLevel);
+        int32_t priority);
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
     int32_t CheckMarkConsumed(int32_t pid, int32_t eventId);
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 5d3db1a127..933914134a 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -710,22 +710,22 @@ int32_t MMIService::GetKeyboardType(int32_t userData, int32_t deviceId)
 
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
 int32_t MMIService::CheckAddInput(int32_t pid, InputHandlerType handlerType,
-    HandleEventType eventType, PriorityLevel priorityLevel)
+    HandleEventType eventType, int32_t priority)
 {
     auto sess = GetSessionByPid(pid);
     CHKPR(sess, ERROR_NULL_POINTER);
-    return sMsgHandler_.OnAddInputHandler(sess, handlerType, eventType, priorityLevel);
+    return sMsgHandler_.OnAddInputHandler(sess, handlerType, eventType, priority);
 }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
 
 int32_t MMIService::AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-    PriorityLevel priorityLevel)
+    int32_t priority)
 {
     CALL_INFO_TRACE;
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
     int32_t pid = GetCallingPid();
     int32_t ret = delegateTasks_.PostSyncTask(
-        std::bind(&MMIService::CheckAddInput, this, pid, handlerType, eventType, priorityLevel));
+        std::bind(&MMIService::CheckAddInput, this, pid, handlerType, eventType, priority));
     if (ret != RET_OK) {
         MMI_HILOGE("Add input handler failed, ret:%{public}d", ret);
         return RET_ERR;
@@ -736,22 +736,22 @@ int32_t MMIService::AddInputHandler(InputHandlerType handlerType, HandleEventTyp
 
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
 int32_t MMIService::CheckRemoveInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType,
-    PriorityLevel priorityLevel)
+    int32_t priority)
 {
     auto sess = GetSessionByPid(pid);
     CHKPR(sess, ERROR_NULL_POINTER);
-    return sMsgHandler_.OnRemoveInputHandler(sess, handlerType, eventType, priorityLevel);
+    return sMsgHandler_.OnRemoveInputHandler(sess, handlerType, eventType, priority);
 }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
 
 int32_t MMIService::RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-    PriorityLevel priorityLevel)
+    int32_t priority)
 {
     CALL_INFO_TRACE;
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
     int32_t pid = GetCallingPid();
     int32_t ret = delegateTasks_.PostSyncTask(
-        std::bind(&MMIService::CheckRemoveInput, this, pid, handlerType, eventType, priorityLevel));
+        std::bind(&MMIService::CheckRemoveInput, this, pid, handlerType, eventType, priority));
     if (ret != RET_OK) {
         MMI_HILOGE("Remove input handler failed, ret:%{public}d", ret);
         return RET_ERR;
-- 
Gitee


From f04b809bc90003bde75151ea0f8f7abb7b328c16 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 28 Nov 2022 19:48:58 +0800
Subject: [PATCH 188/360] Test case branch and interface coverage modification

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Id6227ff53a3b87804e19ad0e06cc3a3e1c21a1de
---
 .../proxy/events/test/input_manager_test.cpp  | 118 +++++++++++++++++-
 .../proxy/events/test/key_event_test.cpp      |  65 ++++++++++
 .../multimodal_input_connect_def_parcel.h     |   9 --
 .../multimodal_input_connect_def_parcel.cpp   |  28 -----
 service/filter/BUILD.gn                       |   2 -
 service/filter/include/event_filter_parcel.h  |  38 ------
 service/filter/src/event_filter_parcel.cpp    |  63 ----------
 service/filter/src/event_filter_proxy.cpp     |   1 -
 service/filter/src/event_filter_stub.cpp      |   1 -
 9 files changed, 181 insertions(+), 144 deletions(-)
 delete mode 100644 service/filter/include/event_filter_parcel.h
 delete mode 100644 service/filter/src/event_filter_parcel.cpp

diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 0cdbd372c2..ee0ece2856 100755
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -758,6 +758,46 @@ void InputManagerTest::TestMarkConsumed(int32_t monitorId, int32_t eventId)
     InputManager::GetInstance()->MarkConsumed(monitorId, eventId);
 }
 
+/**
+ * @tc.name: InputManagerTest_AddMonitor_001
+ * @tc.desc: Verify pointerevent monitor
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_AddMonitor_001, TestSize.Level1)
+{
+    CALL_DEBUG_ENTER;
+    auto PointerEventFun = [](std::shared_ptr<PointerEvent> event) {
+        MMI_HILOGD("Add monitor success");
+    };
+    int32_t monitorId = InputManager::GetInstance()->AddMonitor(PointerEventFun);
+#if (defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)) && defined(OHOS_BUILD_ENABLE_MONITOR)
+    ASSERT_NE(monitorId, INVALID_HANDLER_ID);
+#else
+    ASSERT_EQ(monitorId, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_MONITOR ||  OHOS_BUILD_ENABLE_TOUCH && OHOS_BUILD_ENABLE_MONITOR
+}
+
+/**
+ * @tc.name: InputManagerTest_AddMonitor_002
+ * @tc.desc: Verify keyevent monitor
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_AddMonitor_002, TestSize.Level1)
+{
+    CALL_DEBUG_ENTER;
+    auto keyEventFun = [](std::shared_ptr<KeyEvent> event) {
+        MMI_HILOGD("Add monitor success");
+    };
+    int32_t monitorId = InputManager::GetInstance()->AddMonitor(keyEventFun);
+#if defined(OHOS_BUILD_ENABLE_KEYBOARD) && defined(OHOS_BUILD_ENABLE_MONITOR)
+    ASSERT_NE(monitorId, INVALID_HANDLER_ID);
+#else
+    ASSERT_EQ(monitorId, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_KEYBOARD || OHOS_BUILD_ENABLE_MONITOR
+}
+
 /**
  * @tc.name: MultimodalEventHandler_SimulateKeyEvent_001
  * @tc.desc: Verify simulate the back key is long pressed and lifted
@@ -2028,6 +2068,29 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_011, TestSize.Level1)
     }
 }
 
+/**
+ * @tc.name: TestInputEventInterceptor_012
+ * @tc.desc: Verify keyevent interceptor
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, TestInputEventInterceptor_012, TestSize.Level1)
+{
+    CALL_DEBUG_ENTER;
+    auto fun = [](std::shared_ptr<KeyEvent> keyEvent) {
+        MMI_HILOGD("Add interceptor success");
+    };
+    int32_t interceptorId = InputManager::GetInstance()->AddInterceptor(fun);
+#if defined(OHOS_BUILD_ENABLE_KEYBOARD) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
+    ASSERT_NE(interceptorId, INVALID_HANDLER_ID);
+#else
+    ASSERT_EQ(interceptorId, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_KEYBOARD && OHOS_BUILD_ENABLE_INTERCEPTOR
+    if (IsValidHandlerId(interceptorId)) {
+        InputManager::GetInstance()->RemoveInterceptor(interceptorId);
+    }
+}
+
 /**
  * @tc.name: InputManagerTest_OnAddScreenMonitor_001
  * @tc.desc: Verify touchscreen down event monitor
@@ -3411,12 +3474,31 @@ HWTEST_F(InputManagerTest, InputManagerTest_UpdateDisplayInfo, TestSize.Level1)
 }
 
 /**
- * @tc.name: InputManagerTest_RegisterCooperateListener
+ * @tc.name: InputManagerTest_SetInputDevice
+ * @tc.desc: Set input device
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_SetInputDevice, TestSize.Level1)
+{
+    CALL_DEBUG_ENTER;
+    std::string dhid("");
+    std::string screenId("");
+    int32_t ret = InputManager::GetInstance()->SetInputDevice(dhid, screenId);
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+    ASSERT_EQ(ret, RET_ERR);
+#else
+    ASSERT_EQ(ret, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_COOPERATE
+}
+
+/**
+ * @tc.name: InputManagerTest_RegisterCooperateListener_001
  * @tc.desc: Register cooperate listener
  * @tc.type: FUNC
  * @tc.require:
  */
-HWTEST_F(InputManagerTest, InputManagerTest_RegisterCooperateListener, TestSize.Level1)
+HWTEST_F(InputManagerTest, InputManagerTest_RegisterCooperateListener_001, TestSize.Level1)
 {
     CALL_TEST_DEBUG;
     std::shared_ptr<IInputDeviceCooperateListener> consumer = nullptr;
@@ -3428,6 +3510,38 @@ HWTEST_F(InputManagerTest, InputManagerTest_RegisterCooperateListener, TestSize.
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 }
 
+/**
+ * @tc.name: InputManagerTest_RegisterCooperateListener_002
+ * @tc.desc: Register cooperate listener
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_RegisterCooperateListener_002, TestSize.Level1)
+{
+    CALL_DEBUG_ENTER;
+    class InputDeviceCooperateListenerTest : public IInputDeviceCooperateListener {
+    public:
+        InputDeviceCooperateListenerTest() : IInputDeviceCooperateListener() {}
+        void OnCooperateMessage(const std::string &deviceId, CooperationMessage msg) override
+        {
+            MMI_HILOGD("RegisterCooperateListenerTest");
+        };
+    };
+    std::shared_ptr<InputDeviceCooperateListenerTest> consumer = std::make_shared<InputDeviceCooperateListenerTest>();
+    int32_t ret = InputManager::GetInstance()->RegisterCooperateListener(consumer);
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+    ASSERT_EQ(ret, RET_OK);
+#else
+    ASSERT_EQ(ret, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_COOPERATE
+    ret = InputManager::GetInstance()->UnregisterCooperateListener(consumer);
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+    ASSERT_EQ(ret, RET_OK);
+#else
+    ASSERT_EQ(ret, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_COOPERATE
+}
+
 /**
  * @tc.name: InputManagerTest_UnregisterCooperateListener
  * @tc.desc: Unregister cooperate listener
diff --git a/frameworks/proxy/events/test/key_event_test.cpp b/frameworks/proxy/events/test/key_event_test.cpp
index 75c8161e0d..169b27845e 100755
--- a/frameworks/proxy/events/test/key_event_test.cpp
+++ b/frameworks/proxy/events/test/key_event_test.cpp
@@ -367,5 +367,70 @@ HWTEST_F(KeyEventTest, KeyEventTest_TransitionFunctionKey_004, TestSize.Level1)
     int32_t lockCode = keyEvent->TransitionFunctionKey(KeyEvent::KEYCODE_A);
     ASSERT_EQ(lockCode, KeyEvent::UNKNOWN_FUNCTION_KEY);
 }
+
+/**
+ * @tc.name: KeyEventTest_ReadFromParcel_001
+ * @tc.desc: Read from parcel
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(KeyEventTest, KeyEventTest_ReadFromParcel_001, TestSize.Level1)
+{
+    std::shared_ptr<KeyEvent> keyEvent = KeyEvent::Create();
+    ASSERT_NE(keyEvent, nullptr);
+    keyEvent->SetKeyCode(KeyEvent::KEYCODE_HOME);
+    keyEvent->SetActionTime(100);
+    keyEvent->SetKeyAction(KeyEvent::KEY_ACTION_DOWN);
+    keyEvent->ActionToString(KeyEvent::KEY_ACTION_DOWN);
+    keyEvent->KeyCodeToString(KeyEvent::KEYCODE_HOME);
+    KeyEvent::KeyItem item;
+    item.SetKeyCode(KeyEvent::KEYCODE_HOME);
+    item.SetDownTime(100);
+    item.SetPressed(true);
+    keyEvent->AddKeyItem(item);
+    MessageParcel data;
+    bool ret = keyEvent->WriteToParcel(data);
+    ASSERT_TRUE(ret);
+    ret = keyEvent->ReadFromParcel(data);
+    ASSERT_TRUE(ret);
+}
+
+/**
+ * @tc.name: KeyEventTest_ReadFromParcel_002
+ * @tc.desc: Read from parcel
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(KeyEventTest, KeyEventTest_ReadFromParcel_002, TestSize.Level1)
+{
+    std::shared_ptr<KeyEvent> keyEvent = KeyEvent::Create();
+    ASSERT_NE(keyEvent, nullptr);
+    keyEvent->SetKeyCode(KeyEvent::KEYCODE_HOME);
+    keyEvent->SetActionTime(100);
+    keyEvent->SetKeyAction(KeyEvent::KEY_ACTION_DOWN);
+    keyEvent->ActionToString(KeyEvent::KEY_ACTION_DOWN);
+    keyEvent->KeyCodeToString(KeyEvent::KEYCODE_HOME);
+    KeyEvent::KeyItem item;
+    item.SetKeyCode(KeyEvent::KEYCODE_HOME);
+    item.SetDownTime(100);
+    item.SetPressed(true);
+    keyEvent->AddKeyItem(item);
+    MessageParcel data;
+    bool ret = keyEvent->WriteToParcel(data);
+    ASSERT_TRUE(ret);
+    std::shared_ptr<InputEvent> inputEvent = InputEvent::Create();
+    ret = inputEvent->ReadFromParcel(data);
+    ASSERT_TRUE(ret);
+    int32_t keyCode;
+    ret = data.ReadInt32(keyCode);
+    ASSERT_TRUE(ret);
+    const int32_t keysSize = data.ReadInt32();
+    ASSERT_FALSE(keysSize < 0);
+    for (int32_t i = 0; i < keysSize; ++i) {
+        KeyEvent::KeyItem keyItem = {};
+        ret = keyItem.ReadFromParcel(data);
+        ASSERT_TRUE(ret);
+    }
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/include/multimodal_input_connect_def_parcel.h b/service/connect_manager/include/multimodal_input_connect_def_parcel.h
index f9255fe0b2..725e247aa1 100644
--- a/service/connect_manager/include/multimodal_input_connect_def_parcel.h
+++ b/service/connect_manager/include/multimodal_input_connect_def_parcel.h
@@ -30,15 +30,6 @@ public:
     bool Marshalling(Parcel &out) const override;
     ConnectDefReq data;
 };
-
-class ConnectRespParcel final : public Parcelable {
-public:
-    static ConnectRespParcel *Unmarshalling(Parcel &in);
-    ConnectRespParcel() = default;
-    ~ConnectRespParcel() override = default;
-    bool Marshalling(Parcel &out) const override;
-    ConnectDefResp data;
-};
 } // namespace MMI
 } // namespace OHOS
 #endif // MULTIMODAL_INPUT_CONNECT_DEF_PARCEL_H
\ No newline at end of file
diff --git a/service/connect_manager/src/multimodal_input_connect_def_parcel.cpp b/service/connect_manager/src/multimodal_input_connect_def_parcel.cpp
index 192f2aaf0f..f3876ef976 100644
--- a/service/connect_manager/src/multimodal_input_connect_def_parcel.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_def_parcel.cpp
@@ -44,33 +44,5 @@ ConnectReqParcel *ConnectReqParcel::Unmarshalling(Parcel& in)
     request->data.clientName = in.ReadString();
     return request;
 }
-
-bool ConnectRespParcel::Marshalling(Parcel &out) const
-{
-    WRITEINT32(out, data.returnCode);
-    WRITEINT32(out, data.allocedSocketId);
-    return true;
-}
-
-ConnectRespParcel *ConnectRespParcel::Unmarshalling(Parcel &in)
-{
-    auto *response = new (std::nothrow) ConnectRespParcel();
-    if (response == nullptr) {
-        return nullptr;
-    }
-
-    if (!in.ReadInt32(response->data.returnCode)) {
-        delete response;
-        response = nullptr;
-        return nullptr;
-    }
-
-    if (!in.ReadInt32(response->data.allocedSocketId)) {
-        delete response;
-        response = nullptr;
-        return nullptr;
-    }
-    return response;
-}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/filter/BUILD.gn b/service/filter/BUILD.gn
index 4f24769561..d6300e9bce 100644
--- a/service/filter/BUILD.gn
+++ b/service/filter/BUILD.gn
@@ -29,7 +29,6 @@ ohos_source_set("mmi_event_filter_service") {
   part_name = "input"
   subsystem_name = "multimodalinput"
   sources = [
-    "${event_filter_path}/src/event_filter_parcel.cpp",
     "${event_filter_path}/src/event_filter_service.cpp",
     "${event_filter_path}/src/event_filter_stub.cpp",
   ]
@@ -49,7 +48,6 @@ ohos_source_set("mmi_event_filter_proxy") {
   sources = [
     "${event_filter_path}/src/event_filter_death_recipient.cpp",
     "${event_filter_path}/src/event_filter_handler.cpp",
-    "${event_filter_path}/src/event_filter_parcel.cpp",
     "${event_filter_path}/src/event_filter_proxy.cpp",
   ]
 
diff --git a/service/filter/include/event_filter_parcel.h b/service/filter/include/event_filter_parcel.h
deleted file mode 100644
index fafc24478b..0000000000
--- a/service/filter/include/event_filter_parcel.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef EVENT_FILTER_PARCEL_H
-#define EVENT_FILTER_PARCEL_H
-
-#include "nocopyable.h"
-#include "parcel.h"
-
-#include "pointer_event.h"
-
-namespace OHOS {
-namespace MMI {
-class PointerEventParcel final : public Parcelable {
-public:
-    PointerEventParcel() = default;
-    DISALLOW_COPY_AND_MOVE(PointerEventParcel);
-    ~PointerEventParcel() override = default;
-
-    bool Marshalling(Parcel& out) const override;
-    static PointerEventParcel *Unmarshalling(Parcel& in);
-    mutable std::shared_ptr<PointerEvent> data_ { nullptr };
-};
-} // namespace MMI
-} // namespace OHOS
-#endif // EVENT_FILTER_PARCEL_H
\ No newline at end of file
diff --git a/service/filter/src/event_filter_parcel.cpp b/service/filter/src/event_filter_parcel.cpp
deleted file mode 100644
index 7f7adbb9c5..0000000000
--- a/service/filter/src/event_filter_parcel.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2021-2022 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "event_filter_parcel.h"
-
-#include "define_multimodal.h"
-
-namespace OHOS {
-namespace MMI {
-namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "PointerEventParcel" };
-} // namespace
-
-bool PointerEventParcel::Marshalling(Parcel& out) const
-{
-    if (data_ == nullptr) {
-        data_ = PointerEvent::Create();
-    }
-    CHKPF(data_);
-    if (!data_->WriteToParcel(out)) {
-        data_ = nullptr;
-        return false;
-    }
-    return true;
-}
-
-PointerEventParcel *PointerEventParcel::Unmarshalling(Parcel& in)
-{
-    auto* request = new (std::nothrow) PointerEventParcel();
-    if (request == nullptr) {
-        return nullptr;
-    }
-
-    if (request->data_ == nullptr) {
-        request->data_ = PointerEvent::Create();
-    }
-
-    if (request->data_ == nullptr) {
-        delete request;
-        return nullptr;
-    }
-
-    if (!request->data_->ReadFromParcel(in)) {
-        request->data_ = nullptr;
-        delete request;
-        return nullptr;
-    }
-    return request;
-}
-} // namespace MMI
-} // namespace OHOS
diff --git a/service/filter/src/event_filter_proxy.cpp b/service/filter/src/event_filter_proxy.cpp
index 838f7cc2db..98231f5f25 100644
--- a/service/filter/src/event_filter_proxy.cpp
+++ b/service/filter/src/event_filter_proxy.cpp
@@ -18,7 +18,6 @@
 #include "message_option.h"
 #include "string_ex.h"
 
-#include "event_filter_parcel.h"
 #include "mmi_log.h"
 
 namespace OHOS {
diff --git a/service/filter/src/event_filter_stub.cpp b/service/filter/src/event_filter_stub.cpp
index 00caad0bf5..2664873aac 100644
--- a/service/filter/src/event_filter_stub.cpp
+++ b/service/filter/src/event_filter_stub.cpp
@@ -21,7 +21,6 @@
 #include "ipc_skeleton.h"
 #include "string_ex.h"
 
-#include "event_filter_parcel.h"
 #include "mmi_log.h"
 
 namespace OHOS {
-- 
Gitee


From a6da56e231496918d83cee6c9396294f3647b4cc Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Mon, 28 Nov 2022 13:44:10 +0000
Subject: [PATCH 189/360] Optimize the logic of UnPrepaerRemoteInput

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 .../src/input_device_cooperate_sm.cpp                      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index 9fb3c762bd..8f89c34dc6 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -115,6 +115,13 @@ void InputDeviceCooperateSM::OnCloseCooperation(const std::string &networkId, bo
     std::lock_guard<std::mutex> guard(mutex_);
     if (!preparedNetworkId_.first.empty() && !preparedNetworkId_.second.empty()) {
         if (networkId == preparedNetworkId_.first || networkId == preparedNetworkId_.second) {
+            if (cooperateState_ != CooperateState::STATE_FREE) {
+                auto  dhids = InputDevMgr->GetCooperateDhids(startDhid_);
+                DistributedAdapter->StopRemoteInput(preparedNetworkId_.first, preparedNetworkId_.second,
+                    dhids, [](bool isSuccess) {
+                    MMI_HILOGI("Failed to stop remote");
+                });
+            }
             DistributedAdapter->UnPrepareRemoteInput(preparedNetworkId_.first, preparedNetworkId_.second,
                 [](bool isSuccess) {});
         }
-- 
Gitee


From 5493a6a1b8e621e113ccf535a5bbf352e19b20e5 Mon Sep 17 00:00:00 2001
From: hhh2 <pengfei.hou@huawei.com>
Date: Tue, 29 Nov 2022 09:20:55 +0800
Subject: [PATCH 190/360] add device capability query interface

Signed-off-by: hhh2 <pengfei.hou@huawei.com>
Change-Id: Idea0f0c21008b5c7644bb3d1dd64f38604d3f480
---
 .../src/js_input_device_context.cpp           | 21 +++++----------
 frameworks/proxy/events/src/input_device.cpp  | 15 +++++++++++
 .../innerkits/event/include/input_device.h    | 26 +++++++++++++++++++
 .../src/input_device_manager.cpp              | 20 ++++++++++++--
 util/common/include/proto.h                   |  9 -------
 5 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/frameworks/napi/input_device/src/js_input_device_context.cpp b/frameworks/napi/input_device/src/js_input_device_context.cpp
index 24583f8674..4d9f324e6c 100644
--- a/frameworks/napi/input_device/src/js_input_device_context.cpp
+++ b/frameworks/napi/input_device/src/js_input_device_context.cpp
@@ -22,15 +22,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "JsInputDeviceContext" };
-
-enum KeyboardType {
-    NONE = 0,
-    UNKNOWN = 1,
-    ALPHABETIC_KEYBOARD = 2,
-    DIGITAL_KEYBOARD = 3,
-    HANDWRITING_PEN = 4,
-    REMOTE_CONTROL = 5,
-};
 constexpr uint32_t MIN_N_SIZE = 1;
 constexpr uint32_t MAX_N_SIZE = 5;
 } // namespace
@@ -437,17 +428,17 @@ napi_value JsInputDeviceContext::CreateEnumKeyboardType(napi_env env, napi_value
 {
     CALL_DEBUG_ENTER;
     napi_value none = nullptr;
-    CHKRP(napi_create_int32(env, KeyboardType::NONE, &none), CREATE_INT32);
+    CHKRP(napi_create_int32(env, KeyboardType::KEYBOARD_TYPE_NONE, &none), CREATE_INT32);
     napi_value unknown = nullptr;
-    CHKRP(napi_create_int32(env, KeyboardType::UNKNOWN, &unknown), CREATE_INT32);
+    CHKRP(napi_create_int32(env, KeyboardType::KEYBOARD_TYPE_UNKNOWN, &unknown), CREATE_INT32);
     napi_value alphabeticKeyboard = nullptr;
-    CHKRP(napi_create_int32(env, KeyboardType::ALPHABETIC_KEYBOARD, &alphabeticKeyboard), CREATE_INT32);
+    CHKRP(napi_create_int32(env, KeyboardType::KEYBOARD_TYPE_ALPHABETICKEYBOARD, &alphabeticKeyboard), CREATE_INT32);
     napi_value digitalKeyboard = nullptr;
-    CHKRP(napi_create_int32(env, KeyboardType::DIGITAL_KEYBOARD, &digitalKeyboard), CREATE_INT32);
+    CHKRP(napi_create_int32(env, KeyboardType::KEYBOARD_TYPE_DIGITALKEYBOARD, &digitalKeyboard), CREATE_INT32);
     napi_value handwritingPen = nullptr;
-    CHKRP(napi_create_int32(env, KeyboardType::HANDWRITING_PEN, &handwritingPen), CREATE_INT32);
+    CHKRP(napi_create_int32(env, KeyboardType::KEYBOARD_TYPE_HANDWRITINGPEN, &handwritingPen), CREATE_INT32);
     napi_value remoteControl = nullptr;
-    CHKRP(napi_create_int32(env, KeyboardType::REMOTE_CONTROL, &remoteControl), CREATE_INT32);
+    CHKRP(napi_create_int32(env, KeyboardType::KEYBOARD_TYPE_REMOTECONTROL, &remoteControl), CREATE_INT32);
     napi_property_descriptor desc[] = {
         DECLARE_NAPI_STATIC_PROPERTY("NONE", none),
         DECLARE_NAPI_STATIC_PROPERTY("UNKNOWN", unknown),
diff --git a/frameworks/proxy/events/src/input_device.cpp b/frameworks/proxy/events/src/input_device.cpp
index 8e2f254d38..51a9ae23ff 100644
--- a/frameworks/proxy/events/src/input_device.cpp
+++ b/frameworks/proxy/events/src/input_device.cpp
@@ -112,6 +112,21 @@ std::string InputDevice::GetUniq() const
     return uniq_;
 }
 
+void InputDevice::AddCapability(InputDeviceCapability cap)
+{
+    if (cap >= INPUT_DEV_CAP_KEYBOARD && cap < INPUT_DEV_CAP_MAX) {
+        capabilities_.set(cap);
+    }
+}
+
+bool InputDevice::HasCapability(InputDeviceCapability cap) const
+{
+    if (cap >= INPUT_DEV_CAP_KEYBOARD && cap < INPUT_DEV_CAP_MAX) {
+        return capabilities_.test(cap);
+    }
+    return false;
+}
+
 void InputDevice::AddAxisInfo(AxisInfo axis)
 {
     axis_.push_back(axis);
diff --git a/interfaces/native/innerkits/event/include/input_device.h b/interfaces/native/innerkits/event/include/input_device.h
index da843d7995..822f95d77a 100644
--- a/interfaces/native/innerkits/event/include/input_device.h
+++ b/interfaces/native/innerkits/event/include/input_device.h
@@ -16,6 +16,7 @@
 #ifndef INPUT_DEVICE_H
 #define INPUT_DEVICE_H
 
+#include <bitset>
 #include <string>
 #include <vector>
 
@@ -23,6 +24,28 @@
 
 namespace OHOS {
 namespace MMI {
+enum InputDeviceCapability {
+    INPUT_DEV_CAP_KEYBOARD,
+    INPUT_DEV_CAP_POINTER,
+    INPUT_DEV_CAP_TOUCH,
+    INPUT_DEV_CAP_TABLET_TOOL,
+    INPUT_DEV_CAP_TABLET_PAD,
+    INPUT_DEV_CAP_GESTURE,
+    INPUT_DEV_CAP_SWITCH,
+    INPUT_DEV_CAP_JOYSTICK,
+    INPUT_DEV_CAP_MAX
+};
+
+enum KeyboardType {
+    KEYBOARD_TYPE_NONE,
+    KEYBOARD_TYPE_UNKNOWN,
+    KEYBOARD_TYPE_ALPHABETICKEYBOARD,
+    KEYBOARD_TYPE_DIGITALKEYBOARD,
+    KEYBOARD_TYPE_HANDWRITINGPEN,
+    KEYBOARD_TYPE_REMOTECONTROL,
+    KEYBOARD_TYPE_MAX
+};
+
 class InputDevice {
 public:
     InputDevice() = default;
@@ -47,6 +70,8 @@ public:
     std::string GetPhys() const;
     void SetUniq(std::string uniq);
     std::string GetUniq() const;
+    void AddCapability(InputDeviceCapability cap);
+    bool HasCapability(InputDeviceCapability cap) const;
 
     class AxisInfo {
     public:
@@ -90,6 +115,7 @@ private:
     std::string uniq_ { "null" };
     std::vector<AxisInfo> axis_;
     std::vector<int32_t> deviceIdList_;
+    std::bitset<INPUT_DEV_CAP_MAX> capabilities_;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 1f4400c40d..6dc80eed29 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -49,7 +49,7 @@ const char *SPLIT_SYMBOL = "|";
 const std::string DH_ID_PREFIX = "Input_";
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 const std::string INPUT_VIRTUAL_DEVICE_NAME = "DistributedInput ";
-std::unordered_map<int32_t, std::string> axisType = {
+std::unordered_map<int32_t, std::string> axisType {
     {ABS_MT_TOUCH_MAJOR, "TOUCH_MAJOR"},
     {ABS_MT_TOUCH_MINOR, "TOUCH_MINOR"},
     {ABS_MT_ORIENTATION, "ORIENTATION"},
@@ -59,6 +59,17 @@ std::unordered_map<int32_t, std::string> axisType = {
     {ABS_MT_WIDTH_MAJOR, "WIDTH_MAJOR"},
     {ABS_MT_WIDTH_MINOR, "WIDTH_MINOR"}
 };
+
+std::vector<std::pair<enum libinput_device_capability, InputDeviceCapability>> devCapEnumMaps {
+    { LIBINPUT_DEVICE_CAP_KEYBOARD, InputDeviceCapability::INPUT_DEV_CAP_KEYBOARD },
+    { LIBINPUT_DEVICE_CAP_POINTER, InputDeviceCapability::INPUT_DEV_CAP_POINTER },
+    { LIBINPUT_DEVICE_CAP_TOUCH, InputDeviceCapability::INPUT_DEV_CAP_TOUCH },
+    { LIBINPUT_DEVICE_CAP_TABLET_TOOL, InputDeviceCapability::INPUT_DEV_CAP_TABLET_TOOL },
+    { LIBINPUT_DEVICE_CAP_TABLET_PAD, InputDeviceCapability::INPUT_DEV_CAP_TABLET_PAD },
+    { LIBINPUT_DEVICE_CAP_GESTURE, InputDeviceCapability::INPUT_DEV_CAP_GESTURE },
+    { LIBINPUT_DEVICE_CAP_SWITCH, InputDeviceCapability::INPUT_DEV_CAP_SWITCH },
+    { LIBINPUT_DEVICE_CAP_JOYSTICK, InputDeviceCapability::INPUT_DEV_CAP_JOYSTICK },
+};
 } // namespace
 
 InputDeviceManager::InputDeviceManager() {}
@@ -74,7 +85,6 @@ std::shared_ptr<InputDevice> InputDeviceManager::GetInputDevice(int32_t id) cons
     }
 
     std::shared_ptr<InputDevice> inputDevice = std::make_shared<InputDevice>();
-    CHKPP(inputDevice);
     inputDevice->SetId(iter->first);
     struct libinput_device *inputDeviceOrigin = iter->second.inputDeviceOrigin;
     inputDevice->SetType(static_cast<int32_t>(libinput_device_get_tags(inputDeviceOrigin)));
@@ -89,6 +99,12 @@ std::shared_ptr<InputDevice> InputDeviceManager::GetInputDevice(int32_t id) cons
     const char* uniq = libinput_device_get_uniq(inputDeviceOrigin);
     inputDevice->SetUniq((uniq == nullptr) ? ("null") : (uniq));
 
+    for (const auto &[first, second] : devCapEnumMaps) {
+        if (libinput_device_has_capability(inputDeviceOrigin, first)) {
+            inputDevice->AddCapability(second);
+        }
+    }
+
     InputDevice::AxisInfo axis;
     for (const auto &item : axisType) {
         int32_t min = libinput_device_get_axis_min(inputDeviceOrigin, item.first);
diff --git a/util/common/include/proto.h b/util/common/include/proto.h
index 5f45f23dcd..4883595673 100644
--- a/util/common/include/proto.h
+++ b/util/common/include/proto.h
@@ -41,15 +41,6 @@ enum class MmiMessageId : int32_t {
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 };
 
-enum KeyboardType {
-    KEYBOARD_TYPE_NONE,
-    KEYBOARD_TYPE_UNKNOWN,
-    KEYBOARD_TYPE_ALPHABETICKEYBOARD,
-    KEYBOARD_TYPE_DIGITALKEYBOARD,
-    KEYBOARD_TYPE_HANDWRITINGPEN,
-    KEYBOARD_TYPE_REMOTECONTROL,
-};
-
 enum TokenType : int32_t {
     TOKEN_INVALID = -1,
     TOKEN_HAP = 0,
-- 
Gitee


From e8d76126e910a5bbfa6ebb7a7fc44238194f8d69 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 29 Nov 2022 02:08:10 +0000
Subject: [PATCH 191/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/interceptor/include/event_interceptor_handler.h | 1 -
 service/message_handle/include/server_msg_handler.h     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/service/interceptor/include/event_interceptor_handler.h b/service/interceptor/include/event_interceptor_handler.h
index d8f52dd586..7ecaa426e0 100644
--- a/service/interceptor/include/event_interceptor_handler.h
+++ b/service/interceptor/include/event_interceptor_handler.h
@@ -20,7 +20,6 @@
 
 #include "i_input_event_handler.h"
 #include "i_input_event_collection_handler.h"
-#include "i_input_event_consumer.h"
 #include "input_handler_type.h"
 #include "nocopyable.h"
 #include "uds_session.h"
diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
index 583180e15f..4b343407d9 100644
--- a/service/message_handle/include/server_msg_handler.h
+++ b/service/message_handle/include/server_msg_handler.h
@@ -20,7 +20,6 @@
 
 #include "event_dispatch_handler.h"
 #include "i_event_filter.h"
-#include "i_input_event_consumer.h"
 #include "input_handler_type.h"
 #include "key_option.h"
 #include "msg_handler.h"
-- 
Gitee


From 1fa1d3458d96ff51908c6987c69fae82989186d7 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 29 Nov 2022 10:28:30 +0800
Subject: [PATCH 192/360] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I0062e4cd1b11b95136ebcc36d5ee4493419fe619
---
 .../native/innerkits/event/include/key_option.h      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/interfaces/native/innerkits/event/include/key_option.h b/interfaces/native/innerkits/event/include/key_option.h
index 14ce2267c6..310fb292bb 100644
--- a/interfaces/native/innerkits/event/include/key_option.h
+++ b/interfaces/native/innerkits/event/include/key_option.h
@@ -88,8 +88,10 @@ public:
     int32_t GetFinalKeyDownDuration() const;
 
     /**
-     * @brief 获取最后一个按键抬起的延时时间，当最后一个按键抬起时，会延时触发订阅
-     * @return
+     * @brief Get the delay time of lifting the last key. When the last key is lifted, the subscription
+     * will be delayed and triggered.
+     * @return Return to the delay time of lifting the last key.
+     * @since 9
      */
     int32_t GetFinalKeyUpDelay() const;
 
@@ -107,8 +109,10 @@ public:
     void SetFinalKeyDownDuration(int32_t duration);
 
     /**
-     * @brief 设置最后一个按键抬起后的延时时间
-     * @param delay
+     * @brief Set the delay time for lifting the last key.
+     * @param delay Delay time for lifting the last key.
+     * @return void
+     * @since 9
      */
     void SetFinalKeyUpDelay(int32_t delay);
 
-- 
Gitee


From f9f0e41200392434485fc1919bcd1b91ff878085 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 29 Nov 2022 04:49:23 +0000
Subject: [PATCH 193/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../include/input_interceptor_manager.h       |   1 -
 .../src/input_handler_manager.cpp             |   2 +-
 .../proxy/events/test/input_manager_test.cpp  | 280 +++++++++++++++++-
 .../unittest/common/include/event_util_test.h |  26 ++
 test/unittest/common/src/event_util_test.cpp  |  60 ++++
 5 files changed, 361 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 frameworks/proxy/events/test/input_manager_test.cpp

diff --git a/frameworks/proxy/event_handler/include/input_interceptor_manager.h b/frameworks/proxy/event_handler/include/input_interceptor_manager.h
index 17d7e1859d..62a29f591a 100644
--- a/frameworks/proxy/event_handler/include/input_interceptor_manager.h
+++ b/frameworks/proxy/event_handler/include/input_interceptor_manager.h
@@ -21,7 +21,6 @@
 #include "singleton.h"
 
 #include "input_handler_manager.h"
-#include "i_input_event_consumer.h"
 #include "input_handler_type.h"
 
 namespace OHOS {
diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
index 8a56649928..f742bd107c 100644
--- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp
+++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
@@ -149,7 +149,7 @@ int32_t InputHandlerManager::RemoveLocal(int32_t handlerId, InputHandlerType han
 
     if (handlerType == InputHandlerType::INTERCEPTOR) {
         for (auto it = interHandlers_.begin(); it != interHandlers_.end(); ++it) {
-            if (handlerId < it->handlerId_) {
+            if (handlerId == it->handlerId_) {
                 interHandlers_.erase(it);
                 break;
             }
diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
old mode 100755
new mode 100644
index 0cdbd372c2..5d670a0f0a
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -1698,16 +1698,20 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_004, TestSize.Level1)
 
     InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
 
-    for (const auto &id : ids) {
+    for (size_t i = 0; i < ids.size(); ++i) {
         std::string sPointerEs = InputManagerTest::GetEventDump();
         MMI_HILOGD("sPointerEs:%{public}s", sPointerEs.c_str());
 #if defined(OHOS_BUILD_ENABLE_POINTER) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
-        ASSERT_TRUE(!sPointerEs.empty());
+        if (i == 0) {
+            ASSERT_TRUE(!sPointerEs.empty());
+        } else {
+            ASSERT_TRUE(sPointerEs.empty());
+        }
 #else
         ASSERT_TRUE(sPointerEs.empty());
 #endif // OHOS_BUILD_ENABLE_POINTER && OHOS_BUILD_ENABLE_INTERCEPTOR
-        if (IsValidHandlerId(id)) {
-            InputManager::GetInstance()->RemoveInterceptor(id);
+        if (IsValidHandlerId(ids[i])) {
+            InputManager::GetInstance()->RemoveInterceptor(ids[i]);
         }
         std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
     }
@@ -2005,7 +2009,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_011, TestSize.Level1)
     injectDownEvent->AddPressedKeyItems(kitDown);
 
     auto interceptor = GetPtr<InputEventCallback>();
-    int32_t interceptorId { InputManager::GetInstance()->AddInterceptor(interceptor) };
+    int32_t interceptorId { InputManager::GetInstance()->AddInterceptor(interceptor, 400) };
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId));
 #else
@@ -2016,7 +2020,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_011, TestSize.Level1)
     InputManager::GetInstance()->SimulateInputEvent(injectDownEvent);
 
     std::string sPointerEs = InputManagerTest::GetEventDump();
-    MMI_HILOGD("sPointerEs:%{public}s", sPointerEs.c_str());
+    MMI_HILOGD("PriorityLevel Test:sPointerEs:%{public}s", sPointerEs.c_str());
 #if defined(OHOS_BUILD_ENABLE_KEYBOARD) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
     ASSERT_TRUE(!sPointerEs.empty());
 #else
@@ -2028,6 +2032,270 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_011, TestSize.Level1)
     }
 }
 
+/**
+ * @tc.name: TestInputEventInterceptor_012
+ * @tc.desc: Verify mouse interceptor
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, TestInputEventInterceptor_012, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
+    auto pointerEvent = PointerEvent::Create();
+    ASSERT_TRUE(pointerEvent != nullptr);
+    PointerEvent::PointerItem item;
+    item.SetPointerId(0);
+    item.SetDownTime(10010);
+    item.SetPressed(true);
+    item.SetDisplayX(523);
+    item.SetDisplayY(723);
+    item.SetDeviceId(1);
+    pointerEvent->AddPointerItem(item);
+    pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
+    pointerEvent->SetPointerId(0);
+    pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
+
+    auto interceptor = GetPtr<InputEventCallback>();
+    int32_t interceptorId = InputManager::GetInstance()->AddInterceptor(interceptor, 400);
+#ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
+    EXPECT_TRUE(IsValidHandlerId(interceptorId));
+#else
+    EXPECT_EQ(interceptorId, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_INTERCEPTOR
+    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+
+    InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
+
+    std::string sPointerEs = InputManagerTest::GetEventDump();
+    MMI_HILOGD("sPointerEs:%{public}s", sPointerEs.c_str());
+#if defined(OHOS_BUILD_ENABLE_POINTER) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
+    ASSERT_TRUE(!sPointerEs.empty());
+#else
+    ASSERT_TRUE(sPointerEs.empty());
+#endif // OHOS_BUILD_ENABLE_POINTER && OHOS_BUILD_ENABLE_INTERCEPTOR
+    if (IsValidHandlerId(interceptorId)) {
+        InputManager::GetInstance()->RemoveInterceptor(interceptorId);
+        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    }
+}
+
+/**
+ * @tc.name: TestInputEventInterceptor_013
+ * @tc.desc: Verify mouse interceptor
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, TestInputEventInterceptor_013, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
+    auto pointerEvent = PointerEvent::Create();
+    ASSERT_TRUE(pointerEvent != nullptr);
+    PointerEvent::PointerItem item;
+    item.SetPointerId(0);
+    item.SetDownTime(10010);
+    item.SetPressed(true);
+    item.SetDisplayX(523);
+    item.SetDisplayY(723);
+    item.SetDeviceId(1);
+    pointerEvent->AddPointerItem(item);
+    pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
+    pointerEvent->SetPointerId(0);
+    pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
+
+    std::string s1 = InputManagerTest::GetEventDump();
+    MMI_HILOGD("PriorityLevel Test1:sPointerEs:%{public}s", s1.c_str());
+    TestUtil->Reset();
+    std::string s2 = InputManagerTest::GetEventDump();
+    MMI_HILOGD("PriorityLevel Test2:sPointerEs:%{public}s", s2.c_str());
+    auto interceptor1 = GetPtr<PriorityHighCallback>();
+    auto interceptor2 = GetPtr<PriorityMiddleCallback>();
+    auto interceptor3 = GetPtr<PriorityLowCallback>();
+    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400) };
+    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500) };
+    int32_t interceptorId3 { InputManager::GetInstance()->AddInterceptor(interceptor3, 600) };
+#ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
+    EXPECT_TRUE(IsValidHandlerId(interceptorId1));
+    EXPECT_TRUE(IsValidHandlerId(interceptorId2));
+    EXPECT_TRUE(IsValidHandlerId(interceptorId3));
+#else
+    EXPECT_EQ(interceptorId1, ERROR_UNSUPPORT);
+    EXPECT_EQ(interceptorId2, ERROR_UNSUPPORT);
+    EXPECT_EQ(interceptorId3, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_INTERCEPTOR
+    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
+
+    for (size_t i = 0; i < 3; ++i) {
+        std::string sPointerEs = InputManagerTest::GetEventDump();
+        MMI_HILOGD("PriorityLevel Test:sPointerEs:%{public}s", sPointerEs.c_str());
+    #if defined(OHOS_BUILD_ENABLE_POINTER) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
+        if (i == 0) {
+            EXPECT_EQ(sPointerEs, "Call high interceptor");
+        } else {
+            ASSERT_TRUE(sPointerEs.empty());
+        }
+    #else
+        ASSERT_TRUE(sPointerEs.empty());
+    #endif // OHOS_BUILD_ENABLE_POINTER && OHOS_BUILD_ENABLE_INTERCEPTOR
+    }
+
+    if (IsValidHandlerId(interceptorId1)) {
+        InputManager::GetInstance()->RemoveInterceptor(interceptorId1);
+        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    }
+
+    if (IsValidHandlerId(interceptorId2)) {
+        InputManager::GetInstance()->RemoveInterceptor(interceptorId2);
+        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    }
+
+    if (IsValidHandlerId(interceptorId3)) {
+        InputManager::GetInstance()->RemoveInterceptor(interceptorId3);
+        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    }
+}
+
+/**
+ * @tc.name: TestInputEventInterceptor_014
+ * @tc.desc: Verify space key interceptor
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, TestInputEventInterceptor_014, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
+    std::shared_ptr<KeyEvent> injectDownEvent = KeyEvent::Create();
+    ASSERT_TRUE(injectDownEvent != nullptr);
+    int64_t downTime = GetNanoTime() / NANOSECOND_TO_MILLISECOND;
+    KeyEvent::KeyItem kitDown;
+    kitDown.SetKeyCode(KeyEvent::KEYCODE_VOLUME_DOWN);
+    kitDown.SetPressed(true);
+    kitDown.SetDownTime(downTime);
+    injectDownEvent->SetKeyCode(KeyEvent::KEYCODE_VOLUME_DOWN);
+    injectDownEvent->SetKeyAction(KeyEvent::KEY_ACTION_DOWN);
+    injectDownEvent->AddPressedKeyItems(kitDown);
+
+    TestUtil->Reset();
+    auto interceptor1 = GetPtr<PriorityHighCallback>();
+    auto interceptor2 = GetPtr<PriorityMiddleCallback>();
+    auto interceptor3 = GetPtr<PriorityLowCallback>();
+    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400) };
+    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500) };
+    int32_t interceptorId3 { InputManager::GetInstance()->AddInterceptor(interceptor3, 600) };
+#ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
+    EXPECT_TRUE(IsValidHandlerId(interceptorId1));
+    EXPECT_TRUE(IsValidHandlerId(interceptorId2));
+    EXPECT_TRUE(IsValidHandlerId(interceptorId3));
+#else
+    EXPECT_EQ(interceptorId1, ERROR_UNSUPPORT);
+    EXPECT_EQ(interceptorId2, ERROR_UNSUPPORT);
+    EXPECT_EQ(interceptorId3, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_INTERCEPTOR
+    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+
+    InputManager::GetInstance()->SimulateInputEvent(injectDownEvent);
+    for (size_t i = 0; i < 3; ++i) {
+        std::string sPointerEs = InputManagerTest::GetEventDump();
+        MMI_HILOGD("PriorityLevel Test:sPointerEs:%{public}s", sPointerEs.c_str());
+    #if defined(OHOS_BUILD_ENABLE_KEYBOARD) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
+        if (i == 0) {
+            EXPECT_EQ(sPointerEs, "Call high interceptor");
+        } else {
+            ASSERT_TRUE(sPointerEs.empty());
+        }
+    #else
+        ASSERT_TRUE(sPointerEs.empty());
+    #endif // OHOS_BUILD_ENABLE_KEYBOARD && OHOS_BUILD_ENABLE_INTERCEPTOR
+    }
+
+    if (IsValidHandlerId(interceptorId1)) {
+        InputManager::GetInstance()->RemoveInterceptor(interceptorId1);
+        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    }
+
+    if (IsValidHandlerId(interceptorId2)) {
+        InputManager::GetInstance()->RemoveInterceptor(interceptorId2);
+        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    }
+
+    if (IsValidHandlerId(interceptorId3)) {
+        InputManager::GetInstance()->RemoveInterceptor(interceptorId3);
+        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    }
+}
+
+/**
+ * @tc.name: TestInputEventInterceptor_015
+ * @tc.desc: Verify space key interceptor
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, TestInputEventInterceptor_015, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
+    std::shared_ptr<KeyEvent> injectDownEvent = KeyEvent::Create();
+    ASSERT_TRUE(injectDownEvent != nullptr);
+    int64_t downTime = GetNanoTime() / NANOSECOND_TO_MILLISECOND;
+    KeyEvent::KeyItem kitDown;
+    kitDown.SetKeyCode(KeyEvent::KEYCODE_VOLUME_DOWN);
+    kitDown.SetPressed(true);
+    kitDown.SetDownTime(downTime);
+    injectDownEvent->SetKeyCode(KeyEvent::KEYCODE_VOLUME_DOWN);
+    injectDownEvent->SetKeyAction(KeyEvent::KEY_ACTION_DOWN);
+    injectDownEvent->AddPressedKeyItems(kitDown);
+
+    TestUtil->Reset();
+    auto interceptor1 = GetPtr<PriorityHighCallback>();
+    auto interceptor2 = GetPtr<PriorityMiddleCallback>();
+    auto interceptor3 = GetPtr<PriorityLowCallback>();
+    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400) };
+    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500) };
+    int32_t interceptorId3 { InputManager::GetInstance()->AddInterceptor(interceptor3, 600) };
+#ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
+    EXPECT_TRUE(IsValidHandlerId(interceptorId1));
+    EXPECT_TRUE(IsValidHandlerId(interceptorId2));
+    EXPECT_TRUE(IsValidHandlerId(interceptorId3));
+#else
+    EXPECT_EQ(interceptorId1, ERROR_UNSUPPORT);
+    EXPECT_EQ(interceptorId2, ERROR_UNSUPPORT);
+    EXPECT_EQ(interceptorId3, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_INTERCEPTOR
+    if (IsValidHandlerId(interceptorId1)) {
+        InputManager::GetInstance()->RemoveInterceptor(interceptorId1);
+        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    }
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    InputManager::GetInstance()->SimulateInputEvent(injectDownEvent);
+    for (size_t i = 0; i < 3; ++i) {
+        std::string sPointerEs = InputManagerTest::GetEventDump();
+        MMI_HILOGD("PriorityLevel Test:sPointerEs:%{public}s", sPointerEs.c_str());
+    #if defined(OHOS_BUILD_ENABLE_KEYBOARD) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
+        if (i == 0) {
+            EXPECT_EQ(sPointerEs, "Call middle interceptor");
+        } else {
+            ASSERT_TRUE(sPointerEs.empty());
+        }
+    #else
+        ASSERT_TRUE(sPointerEs.empty());
+    #endif // OHOS_BUILD_ENABLE_KEYBOARD && OHOS_BUILD_ENABLE_INTERCEPTOR
+    }
+
+    if (IsValidHandlerId(interceptorId2)) {
+        InputManager::GetInstance()->RemoveInterceptor(interceptorId2);
+        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    }
+
+    if (IsValidHandlerId(interceptorId3)) {
+        InputManager::GetInstance()->RemoveInterceptor(interceptorId3);
+        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    }
+}
+
 /**
  * @tc.name: InputManagerTest_OnAddScreenMonitor_001
  * @tc.desc: Verify touchscreen down event monitor
diff --git a/test/unittest/common/include/event_util_test.h b/test/unittest/common/include/event_util_test.h
index 5e411a85d5..98f489ae7e 100644
--- a/test/unittest/common/include/event_util_test.h
+++ b/test/unittest/common/include/event_util_test.h
@@ -89,6 +89,11 @@ class EventUtilTest final {
 public:
     DISALLOW_COPY_AND_MOVE(EventUtilTest);
     bool Init();
+    void Reset() 
+    {
+        recvFlag_ = RECV_FLAG::RECV_FOCUS;
+        strEventDump_.clear();
+    }
     std::string GetEventDump();
     void AddEventDump(std::string eventDump);
     std::string DumpInputEvent(const std::shared_ptr<PointerEvent>& pointerEvent);
@@ -120,6 +125,27 @@ public:
     virtual void OnInputEvent(std::shared_ptr<AxisEvent> axisEvent) const override {};
 };
 
+class PriorityLowCallback : public IInputEventConsumer {
+public:
+    virtual void OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override;
+    virtual void OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override;
+    virtual void OnInputEvent(std::shared_ptr<AxisEvent> axisEvent) const override {};
+};
+
+class PriorityMiddleCallback : public IInputEventConsumer {
+public:
+    virtual void OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override;
+    virtual void OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override;
+    virtual void OnInputEvent(std::shared_ptr<AxisEvent> axisEvent) const override {};
+};
+
+class PriorityHighCallback : public IInputEventConsumer {
+public:
+    virtual void OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override;
+    virtual void OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override;
+    virtual void OnInputEvent(std::shared_ptr<AxisEvent> axisEvent) const override {};
+};
+
 class InputEventCallback : public IInputEventConsumer {
 public:
     virtual void OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override;
diff --git a/test/unittest/common/src/event_util_test.cpp b/test/unittest/common/src/event_util_test.cpp
index 4212c4c25e..263d99cf56 100644
--- a/test/unittest/common/src/event_util_test.cpp
+++ b/test/unittest/common/src/event_util_test.cpp
@@ -74,6 +74,66 @@ void InputEventCallback::OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const
     }
 }
 
+void PriorityLowCallback::OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const
+{
+    CALL_DEBUG_ENTER;
+    if (TestUtil->GetRecvFlag() != RECV_FLAG::RECV_MARK_CONSUMED) {
+        TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
+        ASSERT_TRUE(pointerEvent != nullptr);
+        TestUtil->AddEventDump("Call low interceptor");
+    }
+}
+
+void PriorityLowCallback::OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const
+{
+    CALL_DEBUG_ENTER;
+    if (TestUtil->GetRecvFlag() != RECV_FLAG::RECV_MARK_CONSUMED) {
+        TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
+        ASSERT_TRUE(keyEvent != nullptr);
+        TestUtil->AddEventDump("Call low interceptor");
+    }
+}
+
+void PriorityMiddleCallback::OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const
+{
+    CALL_DEBUG_ENTER;
+    if (TestUtil->GetRecvFlag() != RECV_FLAG::RECV_MARK_CONSUMED) {
+        TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
+        ASSERT_TRUE(pointerEvent != nullptr);
+        TestUtil->AddEventDump("Call middle interceptor");
+    }
+}
+
+void PriorityMiddleCallback::OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const
+{
+    CALL_DEBUG_ENTER;
+    if (TestUtil->GetRecvFlag() != RECV_FLAG::RECV_MARK_CONSUMED) {
+        TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
+        ASSERT_TRUE(keyEvent != nullptr);
+        TestUtil->AddEventDump("Call middle interceptor");
+    }
+}
+
+void PriorityHighCallback::OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const
+{
+    CALL_DEBUG_ENTER;
+    if (TestUtil->GetRecvFlag() != RECV_FLAG::RECV_MARK_CONSUMED) {
+        TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
+        ASSERT_TRUE(pointerEvent != nullptr);
+        TestUtil->AddEventDump("Call high interceptor");
+    }
+}
+
+void PriorityHighCallback::OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const
+{
+    CALL_DEBUG_ENTER;
+    if (TestUtil->GetRecvFlag() != RECV_FLAG::RECV_MARK_CONSUMED) {
+        TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
+        ASSERT_TRUE(keyEvent != nullptr);
+        TestUtil->AddEventDump("Call high interceptor");
+    }
+}
+
 void WindowEventConsumer::OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const
 {
     threadId_ = GetThisThreadId();
-- 
Gitee


From d6fcce0da87451354bfafa368b317fe093fde80e Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Tue, 29 Nov 2022 06:07:47 +0000
Subject: [PATCH 194/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: Ifcd45997e1c8e5df2fca064e21a5a8df08fd9932
---
 .../napi/input_consumer/src/js_register_module.cpp     | 10 ----------
 frameworks/napi/input_device/src/js_event_target.cpp   |  2 --
 .../napi/input_device/src/js_input_device_context.cpp  |  1 -
 .../input_device_cooperate/src/js_event_target.cpp     |  6 ------
 .../input_monitor/src/js_input_monitor_manager.cpp     |  1 -
 .../proxy/event_handler/src/input_device_impl.cpp      |  1 -
 .../proxy/event_handler/src/input_manager_impl.cpp     |  3 ---
 .../event_handler/src/multimodal_event_handler.cpp     |  1 -
 frameworks/proxy/module_loader/src/mmi_client.cpp      |  2 --
 .../src/multimodal_input_connect_stub.cpp              |  1 -
 service/delegate_task/src/delegate_tasks.cpp           |  5 -----
 service/event_handler/src/input_event_handler.cpp      |  6 ------
 .../src/i_input_device_cooperate_state.cpp             |  1 -
 .../src/input_device_cooperate_sm.cpp                  |  1 -
 .../src/input_device_cooperate_util.cpp                |  1 -
 service/monitor/src/event_monitor_handler.cpp          |  1 -
 test/unittest/common/src/event_util_test.cpp           |  1 -
 uinput/hdf_device_event_manager.cpp                    |  4 ----
 uinput/keyboard_inject.cpp                             |  4 ----
 19 files changed, 52 deletions(-)

diff --git a/frameworks/napi/input_consumer/src/js_register_module.cpp b/frameworks/napi/input_consumer/src/js_register_module.cpp
index 7f4f4e34d7..e0db601216 100644
--- a/frameworks/napi/input_consumer/src/js_register_module.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_module.cpp
@@ -246,11 +246,6 @@ static napi_value JsOn(napi_env env, napi_callback_info info)
     };
     CHKPP(event);
     auto keyOption = std::make_shared<KeyOption>();
-    if ((keyOption) == nullptr) {
-        delete event;
-        MMI_HILOGE("Check keyOption is null");
-        return nullptr;
-    }
     napi_valuetype valueType = napi_undefined;
     if (napi_typeof(env, argv[0], &valueType) != napi_ok) {
         delete event;
@@ -303,11 +298,6 @@ static napi_value JsOff(napi_env env, napi_callback_info info)
     };
     CHKPP(event);
     auto keyOption = std::make_shared<KeyOption>();
-    if (keyOption == nullptr) {
-        delete event;
-        MMI_HILOGE("Check keyOption is null");
-        return nullptr;
-    }
     napi_valuetype valueType = napi_undefined;
     if (napi_typeof(env, argv[0], &valueType) != napi_ok) {
         delete event;
diff --git a/frameworks/napi/input_device/src/js_event_target.cpp b/frameworks/napi/input_device/src/js_event_target.cpp
index 7aa871dc2a..835f4eae2b 100755
--- a/frameworks/napi/input_device/src/js_event_target.cpp
+++ b/frameworks/napi/input_device/src/js_event_target.cpp
@@ -933,7 +933,6 @@ void JsEventTarget::AddListener(napi_env env, const std::string &type, napi_valu
     napi_ref ref = nullptr;
     CHKRV(napi_create_reference(env, handle, 1, &ref), CREATE_REFERENCE);
     auto monitor = std::make_unique<JsUtil::CallbackInfo>();
-    CHKPV(monitor);
     monitor->env = env;
     monitor->ref = ref;
     iter->second.push_back(std::move(monitor));
@@ -980,7 +979,6 @@ napi_value JsEventTarget::CreateCallbackInfo(napi_env env, napi_value handle, co
     CALL_DEBUG_ENTER;
     std::lock_guard<std::mutex> guard(mutex_);
     auto cb = std::make_unique<JsUtil::CallbackInfo>();
-    CHKPP(cb);
     cb->env = env;
     cb->isApi9 = isApi9;
     napi_value promise = nullptr;
diff --git a/frameworks/napi/input_device/src/js_input_device_context.cpp b/frameworks/napi/input_device/src/js_input_device_context.cpp
index 4d9f324e6c..fb179877f1 100644
--- a/frameworks/napi/input_device/src/js_input_device_context.cpp
+++ b/frameworks/napi/input_device/src/js_input_device_context.cpp
@@ -29,7 +29,6 @@ constexpr uint32_t MAX_N_SIZE = 5;
 JsInputDeviceContext::JsInputDeviceContext()
 {
     mgr_ = std::make_shared<JsInputDeviceManager>();
-    CHKPL(mgr_);
 }
 
 JsInputDeviceContext::~JsInputDeviceContext()
diff --git a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
index 3ad1513617..21b3dde6d7 100755
--- a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
@@ -234,11 +234,6 @@ void JsEventTarget::AddListener(napi_env env, const std::string &type, napi_valu
     napi_ref ref = nullptr;
     CHKRV(napi_create_reference(env, handle, 1, &ref), CREATE_REFERENCE);
     auto monitor = std::make_unique<JsUtil::CallbackInfo>();
-    if (monitor == nullptr) {
-        napi_delete_reference(env, ref);
-        MMI_HILOGE("monitor is nullptr");
-        return;
-    }
     monitor->env = env;
     monitor->ref = ref;
     iter->second.push_back(std::move(monitor));
@@ -281,7 +276,6 @@ napi_value JsEventTarget::CreateCallbackInfo(napi_env env, napi_value handle, in
     CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(mutex_);
     auto cb = std::make_unique<JsUtil::CallbackInfo>();
-    CHKPP(cb);
     cb->env = env;
     napi_value promise = nullptr;
     if (handle == nullptr) {
diff --git a/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp b/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp
index 347aa3f7fc..6ac0390ebe 100644
--- a/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor_manager.cpp
@@ -47,7 +47,6 @@ void JsInputMonitorManager::AddMonitor(napi_env jsEnv, const std::string &typeNa
         }
     }
     auto monitor = std::make_shared<JsInputMonitor>(jsEnv, typeName, callback, nextId_++);
-    CHKPV(monitor);
     int32_t ret = monitor->Start();
     if (ret < 0) {
         MMI_HILOGE("js monitor startup failed");
diff --git a/frameworks/proxy/event_handler/src/input_device_impl.cpp b/frameworks/proxy/event_handler/src/input_device_impl.cpp
index 2001378d20..ecf30d906c 100755
--- a/frameworks/proxy/event_handler/src/input_device_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_device_impl.cpp
@@ -276,7 +276,6 @@ int32_t InputDeviceImpl::GetUserData()
 std::shared_ptr<InputDevice> InputDeviceImpl::DevDataUnmarshalling(NetPacket &pkt)
 {
     auto devData = std::make_shared<InputDevice>();
-    CHKPP(devData);
     int32_t deviceId;
     std::string name;
     int32_t deviceType;
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 4ae7f06f74..0c6a327002 100755
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -336,7 +336,6 @@ int32_t InputManagerImpl::AddMonitor(std::function<void(std::shared_ptr<KeyEvent
 #if defined(OHOS_BUILD_ENABLE_KEYBOARD) && defined(OHOS_BUILD_ENABLE_MONITOR)
     CHKPR(monitor, INVALID_HANDLER_ID);
     auto consumer = std::make_shared<MonitorEventConsumer>(monitor);
-    CHKPR(consumer, INVALID_HANDLER_ID);
     return AddMonitor(consumer);
 #else
     MMI_HILOGW("Keyboard device or monitor function does not support");
@@ -350,7 +349,6 @@ int32_t InputManagerImpl::AddMonitor(std::function<void(std::shared_ptr<PointerE
 #if (defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)) && defined(OHOS_BUILD_ENABLE_MONITOR)
     CHKPR(monitor, INVALID_HANDLER_ID);
     auto consumer = std::make_shared<MonitorEventConsumer>(monitor);
-    CHKPR(consumer, INVALID_HANDLER_ID);
     return AddMonitor(consumer);
 #else
     MMI_HILOGW("Pointer/touchscreen device or monitor function does not support");
@@ -441,7 +439,6 @@ int32_t InputManagerImpl::AddInterceptor(std::function<void(std::shared_ptr<KeyE
     CHKPR(interceptor, INVALID_HANDLER_ID);
     std::lock_guard<std::mutex> guard(mtx_);
     auto consumer = std::make_shared<MonitorEventConsumer>(interceptor);
-    CHKPR(consumer, INVALID_HANDLER_ID);
     if (!MMIEventHdl.InitClient()) {
         MMI_HILOGE("Client init failed");
         return RET_ERR;
diff --git a/frameworks/proxy/event_handler/src/multimodal_event_handler.cpp b/frameworks/proxy/event_handler/src/multimodal_event_handler.cpp
index a03f1a3b1d..00346be84d 100755
--- a/frameworks/proxy/event_handler/src/multimodal_event_handler.cpp
+++ b/frameworks/proxy/event_handler/src/multimodal_event_handler.cpp
@@ -91,7 +91,6 @@ bool MultimodalEventHandler::InitClient(EventHandlerPtr eventHandler)
         return true;
     }
     client_ = std::make_shared<MMIClient>();
-    CHKPF(client_);
     client_->SetEventHandler(eventHandler);
     client_->RegisterConnectedFunction(&OnConnected);
     if (!(client_->Start())) {
diff --git a/frameworks/proxy/module_loader/src/mmi_client.cpp b/frameworks/proxy/module_loader/src/mmi_client.cpp
index 18b8112c9c..9f294c74dc 100755
--- a/frameworks/proxy/module_loader/src/mmi_client.cpp
+++ b/frameworks/proxy/module_loader/src/mmi_client.cpp
@@ -105,7 +105,6 @@ bool MMIClient::StartEventRunner()
     if (eventHandler_ == nullptr) {
         auto runner = AppExecFwk::EventRunner::Create(THREAD_NAME);
         eventHandler_ = std::make_shared<AppExecFwk::EventHandler>(runner);
-        CHKPF(eventHandler_);
         MMI_HILOGI("Create event handler, thread name:%{public}s", runner->GetRunnerThreadName().c_str());
     }
 
@@ -136,7 +135,6 @@ bool MMIClient::AddFdListener(int32_t fd)
     }
     CHKPF(eventHandler_);
     auto fdListener = std::make_shared<MMIFdListener>(GetSharedPtr());
-    CHKPF(fdListener);
     auto errCode = eventHandler_->AddFileDescriptorListener(fd, FILE_DESCRIPTOR_INPUT_EVENT, fdListener);
     if (errCode != ERR_OK) {
         MMI_HILOGE("Add fd listener failed,fd:%{public}d code:%{public}u str:%{public}s", fd, errCode,
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 82e3082ee8..f91b642854 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -431,7 +431,6 @@ int32_t MultimodalInputConnectStub::StubSubscribeKeyEvent(MessageParcel& data, M
     READINT32(data, subscribeId, IPC_PROXY_DEAD_OBJECT_ERR);
 
     auto keyOption = std::make_shared<KeyOption>();
-    CHKPR(keyOption, IPC_STUB_WRITE_PARCEL_ERR);
     if (!keyOption->ReadFromParcel(data)) {
         MMI_HILOGE("Read keyOption failed");
         return IPC_PROXY_DEAD_OBJECT_ERR;
diff --git a/service/delegate_task/src/delegate_tasks.cpp b/service/delegate_task/src/delegate_tasks.cpp
index b84aef6da6..fd3688b3fb 100644
--- a/service/delegate_task/src/delegate_tasks.cpp
+++ b/service/delegate_task/src/delegate_tasks.cpp
@@ -167,11 +167,6 @@ DelegateTasks::TaskPtr DelegateTasks::PostTask(DTaskCallback callback, Promise *
         return nullptr;
     }
     TaskPtr task = std::make_shared<Task>(id, callback, promise);
-    if (task == nullptr) {
-        RecoveryId(id);
-        MMI_HILOGE("Make task failed");
-        return nullptr;
-    }
     tasks_.push(task);
     std::string taskType = ((promise == nullptr) ? "Async" : "Sync");
     MMI_HILOGD("Post %{public}s", taskType.c_str());
diff --git a/service/event_handler/src/input_event_handler.cpp b/service/event_handler/src/input_event_handler.cpp
index 894fb34f47..b54ddff053 100644
--- a/service/event_handler/src/input_event_handler.cpp
+++ b/service/event_handler/src/input_event_handler.cpp
@@ -82,7 +82,6 @@ void InputEventHandler::OnEvent(void *event)
 int32_t InputEventHandler::BuildInputHandlerChain()
 {
     eventNormalizeHandler_ = std::make_shared<EventNormalizeHandler>();
-    CHKPR(eventNormalizeHandler_, ERROR_NULL_POINTER);
 #if !defined(OHOS_BUILD_ENABLE_KEYBOARD) && !defined(OHOS_BUILD_ENABLE_POINTER) && !defined(OHOS_BUILD_ENABLE_TOUCH)
     return RET_OK;
 #endif // !OHOS_BUILD_ENABLE_KEYBOARD && !OHOS_BUILD_ENABLE_POINTER && !OHOS_BUILD_ENABLE_TOUCH
@@ -90,14 +89,12 @@ int32_t InputEventHandler::BuildInputHandlerChain()
     std::shared_ptr<IInputEventHandler> handler = eventNormalizeHandler_;
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
     eventFilterHandler_ = std::make_shared<EventFilterHandler>();
-    CHKPR(eventFilterHandler_, ERROR_NULL_POINTER);
     handler->SetNext(eventFilterHandler_);
     handler = eventFilterHandler_;
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     eventInterceptorHandler_  = std::make_shared<EventInterceptorHandler>();
-    CHKPR(eventInterceptorHandler_, ERROR_NULL_POINTER);
     handler->SetNext(eventInterceptorHandler_);
     handler = eventInterceptorHandler_;
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
@@ -110,18 +107,15 @@ int32_t InputEventHandler::BuildInputHandlerChain()
     handler = eventKeyCommandHandler_;
 #endif // OHOS_BUILD_ENABLE_COMBINATION_KEY
     eventSubscriberHandler_ = std::make_shared<KeySubscriberHandler>();
-    CHKPR(eventSubscriberHandler_, ERROR_NULL_POINTER);
     handler->SetNext(eventSubscriberHandler_);
     handler = eventSubscriberHandler_;
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
 #ifdef OHOS_BUILD_ENABLE_MONITOR
     eventMonitorHandler_ = std::make_shared<EventMonitorHandler>();
-    CHKPR(eventMonitorHandler_, ERROR_NULL_POINTER);
     handler->SetNext(eventMonitorHandler_);
     handler = eventMonitorHandler_;
 #endif // OHOS_BUILD_ENABLE_MONITOR
     auto dispatchHandler = std::make_shared<EventDispatchHandler>();
-    CHKPR(dispatchHandler, ERROR_NULL_POINTER);
     handler->SetNext(dispatchHandler);
     return RET_OK;
 }
diff --git a/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp b/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp
index 2192bad8c6..a29607ea9f 100755
--- a/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp
+++ b/service/input_device_cooperate/src/i_input_device_cooperate_state.cpp
@@ -32,7 +32,6 @@ IInputDeviceCooperateState::IInputDeviceCooperateState()
     runner_ = AppExecFwk::EventRunner::Create(true);
     CHKPL(runner_);
     eventHandler_ = std::make_shared<CooperateEventHandler>(runner_);
-    CHKPL(eventHandler_);
 }
 
 int32_t IInputDeviceCooperateState::PrepareAndStart(const std::string &srcNetworkId, int32_t startInputDeviceId)
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index 8f89c34dc6..f714c84ba7 100755
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -550,7 +550,6 @@ bool InputDeviceCooperateSM::InitDeviceManager()
 {
     CALL_DEBUG_ENTER;
     initCallback_ = std::make_shared<DeviceInitCallBack>();
-    CHKPR(initCallback_, false);
     int32_t ret = DisHardware.InitDeviceManager(MMI_DINPUT_PKG_NAME, initCallback_);
     if (ret != 0) {
         MMI_HILOGE("Init device manager failed, ret:%{public}d", ret);
diff --git a/service/input_device_cooperate/src/input_device_cooperate_util.cpp b/service/input_device_cooperate/src/input_device_cooperate_util.cpp
index 3a388735fe..9b5a68bd40 100644
--- a/service/input_device_cooperate/src/input_device_cooperate_util.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_util.cpp
@@ -27,7 +27,6 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Input
 std::string GetLocalDeviceId()
 {
     auto localNode = std::make_unique<NodeBasicInfo>();
-    CHKPS(localNode);
     int32_t ret = GetLocalNodeDeviceInfo(MMI_DINPUT_PKG_NAME, localNode.get());
     if (ret != RET_OK) {
         MMI_HILOGE("GetLocalNodeDeviceInfo ret:%{public}d", ret);
diff --git a/service/monitor/src/event_monitor_handler.cpp b/service/monitor/src/event_monitor_handler.cpp
index ed756757c3..0709922223 100644
--- a/service/monitor/src/event_monitor_handler.cpp
+++ b/service/monitor/src/event_monitor_handler.cpp
@@ -291,7 +291,6 @@ void EventMonitorHandler::MonitorCollection::MarkConsumed(int32_t eventId, Sessi
 #ifdef OHOS_BUILD_ENABLE_TOUCH
     MMI_HILOGD("Cancel operation");
     auto pointerEvent = std::make_shared<PointerEvent>(*state.lastPointerEvent_);
-    CHKPV(pointerEvent);
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_CANCEL);
     pointerEvent->SetActionTime(GetSysClockTime());
     pointerEvent->UpdateId();
diff --git a/test/unittest/common/src/event_util_test.cpp b/test/unittest/common/src/event_util_test.cpp
index 4212c4c25e..b444714efc 100644
--- a/test/unittest/common/src/event_util_test.cpp
+++ b/test/unittest/common/src/event_util_test.cpp
@@ -139,7 +139,6 @@ bool EventUtilTest::Init()
     auto runner = AppExecFwk::EventRunner::Create(threadTest);
     CHKPF(runner);
     auto eventHandler = std::make_shared<AppExecFwk::EventHandler>(runner);
-    CHKPF(eventHandler);
     MMI::InputManager::GetInstance()->SetWindowInputEventConsumer(listener_, eventHandler);
     return true;
 }
diff --git a/uinput/hdf_device_event_manager.cpp b/uinput/hdf_device_event_manager.cpp
index 699e21d0fb..b3d16f15d2 100644
--- a/uinput/hdf_device_event_manager.cpp
+++ b/uinput/hdf_device_event_manager.cpp
@@ -54,10 +54,6 @@ void HdfDeviceEventManager::ConnectHDFInit()
         }
         std::unique_ptr<HdfDeviceEventDispatch> hdf = std::make_unique<HdfDeviceEventDispatch>(\
             iDevInfo_->attrSet.axisInfo[ABS_MT_POSITION_X].max, iDevInfo_->attrSet.axisInfo[ABS_MT_POSITION_Y].max);
-        if (hdf == nullptr) {
-            MMI_HILOGE("The hdf is nullptr");
-            return;
-        }
         callback_.EventPkgCallback = hdf->GetEventCallbackDispatch;
         ret = inputInterface_->iInputReporter->RegisterReportCallback(TOUCH_DEV_ID, &callback_);
         MMI_HILOGD("RegisterReportCallback ret:%{public}d", ret);
diff --git a/uinput/keyboard_inject.cpp b/uinput/keyboard_inject.cpp
index 144b058021..02120c0fd2 100644
--- a/uinput/keyboard_inject.cpp
+++ b/uinput/keyboard_inject.cpp
@@ -40,10 +40,6 @@ KeyboardInject::KeyboardInject()
         MMI_HILOGD("ret.second:%{public}d", ret.second);
     }
     injectThread_ = std::make_unique<InjectThread>();
-    if (injectThread_ == nullptr) {
-        MMI_HILOGE("The injectThread_ is null");
-        return;
-    }
     g_pKeyboard = std::make_unique<VirtualKeyboard>();
     g_pKeyboard->SetUp();
 }
-- 
Gitee


From b5d033ad973ccf53bacf41860a90be9d48fb3b71 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 29 Nov 2022 06:33:52 +0000
Subject: [PATCH 195/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../proxy/events/test/input_manager_test.cpp  | 44 +++----------------
 .../unittest/common/include/event_util_test.h | 12 -----
 test/unittest/common/src/event_util_test.cpp  | 20 ---------
 3 files changed, 5 insertions(+), 71 deletions(-)
 mode change 100755 => 100644 frameworks/proxy/events/test/input_manager_test.cpp

diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
old mode 100755
new mode 100644
index adefff7b59..77dbcab496
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -2144,32 +2144,23 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_013, TestSize.Level1)
     pointerEvent->SetPointerId(0);
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
 
-    std::string s1 = InputManagerTest::GetEventDump();
-    MMI_HILOGD("PriorityLevel Test1:sPointerEs:%{public}s", s1.c_str());
-    TestUtil->Reset();
-    std::string s2 = InputManagerTest::GetEventDump();
-    MMI_HILOGD("PriorityLevel Test2:sPointerEs:%{public}s", s2.c_str());
     auto interceptor1 = GetPtr<PriorityHighCallback>();
     auto interceptor2 = GetPtr<PriorityMiddleCallback>();
-    auto interceptor3 = GetPtr<PriorityLowCallback>();
     int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400) };
     int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500) };
-    int32_t interceptorId3 { InputManager::GetInstance()->AddInterceptor(interceptor3, 600) };
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId1));
     EXPECT_TRUE(IsValidHandlerId(interceptorId2));
-    EXPECT_TRUE(IsValidHandlerId(interceptorId3));
 #else
     EXPECT_EQ(interceptorId1, ERROR_UNSUPPORT);
     EXPECT_EQ(interceptorId2, ERROR_UNSUPPORT);
-    EXPECT_EQ(interceptorId3, ERROR_UNSUPPORT);
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
     std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
     InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
 
-    for (size_t i = 0; i < 3; ++i) {
+    for (size_t i = 0; i < 2; ++i) {
         std::string sPointerEs = InputManagerTest::GetEventDump();
-        MMI_HILOGD("PriorityLevel Test:sPointerEs:%{public}s", sPointerEs.c_str());
+        MMI_HILOGD("sPointerEs:%{public}s", sPointerEs.c_str());
     #if defined(OHOS_BUILD_ENABLE_POINTER) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
         if (i == 0) {
             EXPECT_EQ(sPointerEs, "Call high interceptor");
@@ -2190,11 +2181,6 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_013, TestSize.Level1)
         InputManager::GetInstance()->RemoveInterceptor(interceptorId2);
         std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
     }
-
-    if (IsValidHandlerId(interceptorId3)) {
-        InputManager::GetInstance()->RemoveInterceptor(interceptorId3);
-        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
-    }
 }
 
 /**
@@ -2218,26 +2204,21 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_014, TestSize.Level1)
     injectDownEvent->SetKeyAction(KeyEvent::KEY_ACTION_DOWN);
     injectDownEvent->AddPressedKeyItems(kitDown);
 
-    TestUtil->Reset();
     auto interceptor1 = GetPtr<PriorityHighCallback>();
     auto interceptor2 = GetPtr<PriorityMiddleCallback>();
-    auto interceptor3 = GetPtr<PriorityLowCallback>();
-    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400) };
-    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500) };
-    int32_t interceptorId3 { InputManager::GetInstance()->AddInterceptor(interceptor3, 600) };
+    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500) };
+    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor3, 600) };
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId1));
     EXPECT_TRUE(IsValidHandlerId(interceptorId2));
-    EXPECT_TRUE(IsValidHandlerId(interceptorId3));
 #else
     EXPECT_EQ(interceptorId1, ERROR_UNSUPPORT);
     EXPECT_EQ(interceptorId2, ERROR_UNSUPPORT);
-    EXPECT_EQ(interceptorId3, ERROR_UNSUPPORT);
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
     std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
 
     InputManager::GetInstance()->SimulateInputEvent(injectDownEvent);
-    for (size_t i = 0; i < 3; ++i) {
+    for (size_t i = 0; i < 2; ++i) {
         std::string sPointerEs = InputManagerTest::GetEventDump();
         MMI_HILOGD("PriorityLevel Test:sPointerEs:%{public}s", sPointerEs.c_str());
     #if defined(OHOS_BUILD_ENABLE_KEYBOARD) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
@@ -2260,11 +2241,6 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_014, TestSize.Level1)
         InputManager::GetInstance()->RemoveInterceptor(interceptorId2);
         std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
     }
-
-    if (IsValidHandlerId(interceptorId3)) {
-        InputManager::GetInstance()->RemoveInterceptor(interceptorId3);
-        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
-    }
 }
 
 /**
@@ -2288,21 +2264,16 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_015, TestSize.Level1)
     injectDownEvent->SetKeyAction(KeyEvent::KEY_ACTION_DOWN);
     injectDownEvent->AddPressedKeyItems(kitDown);
 
-    TestUtil->Reset();
     auto interceptor1 = GetPtr<PriorityHighCallback>();
     auto interceptor2 = GetPtr<PriorityMiddleCallback>();
-    auto interceptor3 = GetPtr<PriorityLowCallback>();
     int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400) };
     int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500) };
-    int32_t interceptorId3 { InputManager::GetInstance()->AddInterceptor(interceptor3, 600) };
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId1));
     EXPECT_TRUE(IsValidHandlerId(interceptorId2));
-    EXPECT_TRUE(IsValidHandlerId(interceptorId3));
 #else
     EXPECT_EQ(interceptorId1, ERROR_UNSUPPORT);
     EXPECT_EQ(interceptorId2, ERROR_UNSUPPORT);
-    EXPECT_EQ(interceptorId3, ERROR_UNSUPPORT);
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
     if (IsValidHandlerId(interceptorId1)) {
         InputManager::GetInstance()->RemoveInterceptor(interceptorId1);
@@ -2329,11 +2300,6 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_015, TestSize.Level1)
         InputManager::GetInstance()->RemoveInterceptor(interceptorId2);
         std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
     }
-
-    if (IsValidHandlerId(interceptorId3)) {
-        InputManager::GetInstance()->RemoveInterceptor(interceptorId3);
-        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
-    }
 }
 
 /**
diff --git a/test/unittest/common/include/event_util_test.h b/test/unittest/common/include/event_util_test.h
index 98f489ae7e..8cd66da141 100644
--- a/test/unittest/common/include/event_util_test.h
+++ b/test/unittest/common/include/event_util_test.h
@@ -89,11 +89,6 @@ class EventUtilTest final {
 public:
     DISALLOW_COPY_AND_MOVE(EventUtilTest);
     bool Init();
-    void Reset() 
-    {
-        recvFlag_ = RECV_FLAG::RECV_FOCUS;
-        strEventDump_.clear();
-    }
     std::string GetEventDump();
     void AddEventDump(std::string eventDump);
     std::string DumpInputEvent(const std::shared_ptr<PointerEvent>& pointerEvent);
@@ -125,13 +120,6 @@ public:
     virtual void OnInputEvent(std::shared_ptr<AxisEvent> axisEvent) const override {};
 };
 
-class PriorityLowCallback : public IInputEventConsumer {
-public:
-    virtual void OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override;
-    virtual void OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override;
-    virtual void OnInputEvent(std::shared_ptr<AxisEvent> axisEvent) const override {};
-};
-
 class PriorityMiddleCallback : public IInputEventConsumer {
 public:
     virtual void OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override;
diff --git a/test/unittest/common/src/event_util_test.cpp b/test/unittest/common/src/event_util_test.cpp
index 263d99cf56..7f90bbeadd 100644
--- a/test/unittest/common/src/event_util_test.cpp
+++ b/test/unittest/common/src/event_util_test.cpp
@@ -74,26 +74,6 @@ void InputEventCallback::OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const
     }
 }
 
-void PriorityLowCallback::OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const
-{
-    CALL_DEBUG_ENTER;
-    if (TestUtil->GetRecvFlag() != RECV_FLAG::RECV_MARK_CONSUMED) {
-        TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
-        ASSERT_TRUE(pointerEvent != nullptr);
-        TestUtil->AddEventDump("Call low interceptor");
-    }
-}
-
-void PriorityLowCallback::OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const
-{
-    CALL_DEBUG_ENTER;
-    if (TestUtil->GetRecvFlag() != RECV_FLAG::RECV_MARK_CONSUMED) {
-        TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
-        ASSERT_TRUE(keyEvent != nullptr);
-        TestUtil->AddEventDump("Call low interceptor");
-    }
-}
-
 void PriorityMiddleCallback::OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const
 {
     CALL_DEBUG_ENTER;
-- 
Gitee


From 1bb61b853285cec684a6151c0165aba8ae8060a8 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 29 Nov 2022 07:46:36 +0000
Subject: [PATCH 196/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 frameworks/proxy/events/test/input_manager_test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 77dbcab496..2c3cb11ab3 100644
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -2206,8 +2206,8 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_014, TestSize.Level1)
 
     auto interceptor1 = GetPtr<PriorityHighCallback>();
     auto interceptor2 = GetPtr<PriorityMiddleCallback>();
-    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500) };
-    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor3, 600) };
+    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400) };
+    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500) };
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId1));
     EXPECT_TRUE(IsValidHandlerId(interceptorId2));
-- 
Gitee


From 3ed2041f30e3737dfcbc6bfc2cbf66fa760a3dff Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 29 Nov 2022 10:03:16 +0000
Subject: [PATCH 197/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 frameworks/proxy/events/src/input_manager.cpp             | 6 ------
 interfaces/native/innerkits/proxy/include/input_manager.h | 1 -
 2 files changed, 7 deletions(-)

diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index 4d30ef68d1..f7426da733 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -110,12 +110,6 @@ int32_t InputManager::AddInterceptor(std::shared_ptr<IInputEventConsumer> interc
     return InputMgrImpl.AddInterceptor(interceptor, priority);
 }
 
-int32_t InputManager::AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor,
-    int32_t priority)
-{
-    return InputMgrImpl.AddInterceptor(interceptor, priority);
-}
-
 void InputManager::RemoveInterceptor(int32_t interceptorId)
 {
     InputMgrImpl.RemoveInterceptor(interceptorId);
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index 2ca240f607..c6bc050eef 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -178,7 +178,6 @@ public:
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor);
     int32_t AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor);
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, int32_t priority);
-    int32_t AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor, int32_t priority);
 
     /**
      * @brief Removes an interceptor.
-- 
Gitee


From d07487101dea29f919420dfe09f82f42243e3655 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Tue, 29 Nov 2022 11:27:55 +0000
Subject: [PATCH 198/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: Ie72b64f90a082edacb447ff1d2210e773e7f0a3b
---
 frameworks/proxy/event_handler/src/input_handler_manager.cpp | 1 -
 service/event_handler/src/input_event_handler.cpp            | 1 -
 2 files changed, 2 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
index 35d27e5228..a47c606384 100644
--- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp
+++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
@@ -224,7 +224,6 @@ void InputHandlerManager::OnInputEvent(std::shared_ptr<PointerEvent> pointerEven
     GetConsumerInfos(pointerEvent, consumerInfos);
     for (const auto &iter : consumerInfos) {
         auto tempEvent = std::make_shared<PointerEvent>(*pointerEvent);
-        CHKPV(tempEvent);
         tempEvent->SetProcessedCallback(monitorCallback_);
         CHKPV(iter.second);
         auto consumer = iter.second;
diff --git a/service/event_handler/src/input_event_handler.cpp b/service/event_handler/src/input_event_handler.cpp
index b54ddff053..d91a07d9fe 100644
--- a/service/event_handler/src/input_event_handler.cpp
+++ b/service/event_handler/src/input_event_handler.cpp
@@ -102,7 +102,6 @@ int32_t InputEventHandler::BuildInputHandlerChain()
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
 #ifdef OHOS_BUILD_ENABLE_COMBINATION_KEY
     eventKeyCommandHandler_ = std::make_shared<KeyCommandHandler>();
-    CHKPR(eventKeyCommandHandler_, ERROR_NULL_POINTER);
     handler->SetNext(eventKeyCommandHandler_);
     handler = eventKeyCommandHandler_;
 #endif // OHOS_BUILD_ENABLE_COMBINATION_KEY
-- 
Gitee


From 469a1913ef5d794dafa51d6ad29fd0fb2322b496 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 29 Nov 2022 12:40:19 +0000
Subject: [PATCH 199/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/interceptor/include/event_interceptor_handler.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 service/interceptor/include/event_interceptor_handler.h

diff --git a/service/interceptor/include/event_interceptor_handler.h b/service/interceptor/include/event_interceptor_handler.h
old mode 100644
new mode 100755
index 7ecaa426e0..4a551bf850
--- a/service/interceptor/include/event_interceptor_handler.h
+++ b/service/interceptor/include/event_interceptor_handler.h
@@ -62,9 +62,9 @@ private:
             priority_(priority), session_(session) {}
         void SendToClient(std::shared_ptr<KeyEvent> keyEvent) const;
         void SendToClient(std::shared_ptr<PointerEvent> pointerEvent) const;
-        InputHandlerType handlerType_;
-        HandleEventType eventType_;
-        int32_t priority_;
+        InputHandlerType handlerType_ { NONE };
+        HandleEventType eventType_ { HANDLE_EVENT_TYPE_ALL };
+        int32_t priority_ { DEFUALT_INTERCEPTOR_PRIORITY } ;
         SessionPtr session_ { nullptr };
     };
 
-- 
Gitee


From 692cf0f9f28ef38414346ece5fd2530a0b307649 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Wed, 30 Nov 2022 07:39:10 +0000
Subject: [PATCH 200/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I1c650c2af2180875c53b242c51d0312f0d43645f
---
 service/window_manager/src/input_windows_manager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 66b8571baa..58d85b2e65 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -212,6 +212,7 @@ void InputWindowsManager::UpdateDisplayInfo(const DisplayGroupInfo &displayGroup
     CheckFocusWindowChange(displayGroupInfo);
     CheckZorderWindowChange(displayGroupInfo);
     displayGroupInfo_ = displayGroupInfo;
+    PrintDisplayInfo();
 #ifdef OHOS_BUILD_ENABLE_POINTER
     UpdatePointerStyle();
 #endif // OHOS_BUILD_ENABLE_POINTER
@@ -230,6 +231,7 @@ void InputWindowsManager::UpdateDisplayInfo(const DisplayGroupInfo &displayGroup
             int32_t logicX = mouseLocation.physicalX + displayInfo->x;
             int32_t logicY = mouseLocation.physicalY + displayInfo->y;
             std::optional<WindowInfo> windowInfo;
+            CHKPV(lastPointerEvent_);
             if (lastPointerEvent_->GetPointerAction() == PointerEvent::POINTER_ACTION_MOVE &&
                 lastPointerEvent_->GetPressedButtons().empty()) {
                 windowInfo = GetWindowInfo(logicX, logicY);
@@ -254,7 +256,6 @@ void InputWindowsManager::UpdateDisplayInfo(const DisplayGroupInfo &displayGroup
 #endif // OHOS_BUILD_ENABLE_POINTER
     }
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
-    PrintDisplayInfo();
 }
 
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -399,6 +400,7 @@ void InputWindowsManager::NotifyPointerToWindow()
 {
     CALL_INFO_TRACE;
     std::optional<WindowInfo> windowInfo;
+    CHKPV(lastPointerEvent_);
     if (lastPointerEvent_->GetPointerAction() == PointerEvent::POINTER_ACTION_MOVE &&
         lastPointerEvent_->GetPressedButtons().empty()) {
         windowInfo = GetWindowInfo(lastLogicX_, lastLogicY_);
-- 
Gitee


From ff49e9ce05b7128892ef1769f1389b7eec560131 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 1 Dec 2022 08:54:21 +0000
Subject: [PATCH 201/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../include/input_handler_manager.h           | 21 +++---
 .../include/input_handler_type.h              |  1 +
 .../include/input_interceptor_manager.h       |  2 +-
 .../include/input_manager_impl.h              |  7 +-
 .../event_handler/src/client_msg_handler.cpp  | 14 ++--
 .../src/input_handler_manager.cpp             | 53 ++++++++++-----
 .../src/input_interceptor_manager.cpp         |  4 +-
 .../event_handler/src/input_manager_impl.cpp  | 11 ++--
 frameworks/proxy/events/src/input_manager.cpp |  5 +-
 .../proxy/events/test/input_manager_test.cpp  | 65 ++++++++++++++++---
 .../include/i_multimodal_input_connect.h      |  4 +-
 .../multimodal_input_connect_manager.h        |  6 +-
 .../include/multimodal_input_connect_proxy.h  |  4 +-
 .../src/multimodal_input_connect_manager.cpp  |  8 +--
 .../src/multimodal_input_connect_proxy.cpp    |  6 +-
 .../src/multimodal_input_connect_stub.cpp     | 11 +++-
 .../include/event_interceptor_handler.h       | 12 ++--
 .../src/event_interceptor_handler.cpp         | 23 +++++--
 .../include/server_msg_handler.h              |  4 +-
 .../message_handle/src/server_msg_handler.cpp |  8 +--
 service/module_loader/include/mmi_service.h   |  8 +--
 service/module_loader/src/mmi_service.cpp     | 16 ++---
 22 files changed, 194 insertions(+), 99 deletions(-)
 mode change 100755 => 100644 service/interceptor/include/event_interceptor_handler.h

diff --git a/frameworks/proxy/event_handler/include/input_handler_manager.h b/frameworks/proxy/event_handler/include/input_handler_manager.h
index 4d5b5bf145..be4b23c611 100644
--- a/frameworks/proxy/event_handler/include/input_handler_manager.h
+++ b/frameworks/proxy/event_handler/include/input_handler_manager.h
@@ -34,10 +34,10 @@ public:
 
 public:
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
-    void OnInputEvent(std::shared_ptr<KeyEvent> keyEvent);
+    void OnInputEvent(std::shared_ptr<KeyEvent> keyEvent, uint32_t deviceTags);
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
-    void OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent);
+    void OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent, uint32_t deviceTags);
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
     void OnConnected();
@@ -46,10 +46,12 @@ public:
     virtual InputHandlerType GetHandlerType() const = 0;
     HandleEventType GetEventType() const;
     int32_t GetPriority() const;
+    uint32_t GetDeviceTags() const;
 
 protected:
     int32_t AddHandler(InputHandlerType handlerType, std::shared_ptr<IInputEventConsumer> consumer,
-        HandleEventType eventType = HANDLE_EVENT_TYPE_ALL, int32_t priority = DEFUALT_INTERCEPTOR_PRIORITY);
+        HandleEventType eventType = HANDLE_EVENT_TYPE_ALL, int32_t priority = DEFUALT_INTERCEPTOR_PRIORITY,
+        uint32_t deviceTags = EVDEV_UDEV_TAG_INPUT);
     void RemoveHandler(int32_t handlerId, InputHandlerType IsValidHandlerType);
 
 private:
@@ -58,21 +60,24 @@ private:
         InputHandlerType handlerType_ { NONE };
         HandleEventType eventType_ { HANDLE_EVENT_TYPE_ALL };
         int32_t priority_ { DEFUALT_INTERCEPTOR_PRIORITY };
+        uint32_t deviceTags_ { EVDEV_UDEV_TAG_INPUT };
         std::shared_ptr<IInputEventConsumer> consumer_ { nullptr };
     };
 
 private:
     int32_t GetNextId();
-    int32_t AddLocal(int32_t handlerId, InputHandlerType handlerType,
-        HandleEventType eventType, int32_t priority, std::shared_ptr<IInputEventConsumer> monitor);
-    int32_t AddToServer(InputHandlerType handlerType, HandleEventType eventType, int32_t priority);
+    int32_t AddLocal(int32_t handlerId, InputHandlerType handlerType, HandleEventType eventType,
+        int32_t priority, uint32_t deviceTags, std::shared_ptr<IInputEventConsumer> monitor);
+    int32_t AddToServer(InputHandlerType handlerType, HandleEventType eventType, int32_t priority,
+        uint32_t deviceTags);
     int32_t RemoveLocal(int32_t handlerId, InputHandlerType handlerType);
-    void RemoveFromServer(InputHandlerType handlerType, HandleEventType eventType, int32_t priority);
+    void RemoveFromServer(InputHandlerType handlerType, HandleEventType eventType, int32_t priority,
+        uint32_t deviceTags);
 
     std::shared_ptr<IInputEventConsumer> FindHandler(int32_t handlerId);
     void OnDispatchEventProcessed(int32_t eventId);
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
-    void GetConsumerInfos(std::shared_ptr<PointerEvent> pointerEvent,
+    void GetConsumerInfos(std::shared_ptr<PointerEvent> pointerEvent, uint32_t deviceTags,
         std::map<int32_t, std::shared_ptr<IInputEventConsumer>> &consumerInfos);
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 
diff --git a/frameworks/proxy/event_handler/include/input_handler_type.h b/frameworks/proxy/event_handler/include/input_handler_type.h
index e5812fbc29..1027777442 100644
--- a/frameworks/proxy/event_handler/include/input_handler_type.h
+++ b/frameworks/proxy/event_handler/include/input_handler_type.h
@@ -25,6 +25,7 @@ inline constexpr int32_t   MIN_HANDLER_ID { 1 };
 inline constexpr int32_t   INVALID_HANDLER_ID { -1 };
 inline constexpr int32_t   ERROR_EXCEED_MAX_COUNT { -4100001 };
 inline constexpr int32_t   DEFUALT_INTERCEPTOR_PRIORITY { 500 };
+inline constexpr uint32_t  EVDEV_UDEV_TAG_INPUT = 1 << 0;
 
 enum InputHandlerType : int32_t {
     NONE,
diff --git a/frameworks/proxy/event_handler/include/input_interceptor_manager.h b/frameworks/proxy/event_handler/include/input_interceptor_manager.h
index 62a29f591a..a7b64cb8e5 100644
--- a/frameworks/proxy/event_handler/include/input_interceptor_manager.h
+++ b/frameworks/proxy/event_handler/include/input_interceptor_manager.h
@@ -31,7 +31,7 @@ public:
     DISALLOW_COPY_AND_MOVE(InputInterceptorManager);
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, HandleEventType eventType);
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, HandleEventType eventType,
-        int32_t priority);
+        int32_t priority, uint32_t deviceTags);
     void RemoveInterceptor(int32_t interceptorId);
     InputHandlerType GetHandlerType() const override;
 };
diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index 93f76e81cb..0124abd09d 100644
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -35,7 +35,6 @@
 #include "input_monitor_manager.h"
 #endif // OHOS_BUILD_ENABLE_MONITOR
 #include "i_anr_observer.h"
-#include "i_input_event_consumer.h"
 #include "key_option.h"
 #include "pointer_event.h"
 
@@ -75,9 +74,11 @@ public:
     void MoveMouse(int32_t offsetX, int32_t offsetY);
 
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor,
-        int32_t priority = DEFUALT_INTERCEPTOR_PRIORITY);
+        int32_t priority = DEFUALT_INTERCEPTOR_PRIORITY,
+        uint32_t deviceTags = EVDEV_UDEV_TAG_INPUT);
     int32_t AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor,
-        int32_t priority = DEFUALT_INTERCEPTOR_PRIORITY);
+        int32_t priority = DEFUALT_INTERCEPTOR_PRIORITY,
+        uint32_t deviceTags = EVDEV_UDEV_TAG_INPUT);
     void RemoveInterceptor(int32_t interceptorId);
 
     void SimulateInputEvent(std::shared_ptr<KeyEvent> keyEvent);
diff --git a/frameworks/proxy/event_handler/src/client_msg_handler.cpp b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
index 5c63cf3e8a..013b7b168a 100644
--- a/frameworks/proxy/event_handler/src/client_msg_handler.cpp
+++ b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
@@ -286,7 +286,8 @@ int32_t ClientMsgHandler::ReportKeyEvent(const UDSClient& client, NetPacket& pkt
 {
     CALL_DEBUG_ENTER;
     InputHandlerType handlerType;
-    pkt >> handlerType;
+    uint32_t deviceTags;
+    pkt >> handlerType >> deviceTags;
     if (pkt.ChkRWError()) {
         MMI_HILOGE("Packet read handler failed");
         return RET_ERR;
@@ -301,13 +302,13 @@ int32_t ClientMsgHandler::ReportKeyEvent(const UDSClient& client, NetPacket& pkt
     switch (handlerType) {
         case INTERCEPTOR: {
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
-            InputInterMgr->OnInputEvent(keyEvent);
+            InputInterMgr->OnInputEvent(keyEvent, deviceTags);
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
             break;
         }
         case MONITOR: {
 #ifdef OHOS_BUILD_ENABLE_MONITOR
-            IMonitorMgr->OnInputEvent(keyEvent);
+            IMonitorMgr->OnInputEvent(keyEvent, deviceTags);
 #endif // OHOS_BUILD_ENABLE_MONITOR
             break;
         }
@@ -326,7 +327,8 @@ int32_t ClientMsgHandler::ReportPointerEvent(const UDSClient& client, NetPacket&
 {
     CALL_DEBUG_ENTER;
     InputHandlerType handlerType;
-    pkt >> handlerType;
+    uint32_t deviceTags;
+    pkt >> handlerType >> deviceTags;
     if (pkt.ChkRWError()) {
         MMI_HILOGE("Packet read Pointer data failed");
         return RET_ERR;
@@ -342,13 +344,13 @@ int32_t ClientMsgHandler::ReportPointerEvent(const UDSClient& client, NetPacket&
     switch (handlerType) {
         case INTERCEPTOR: {
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
-            InputInterMgr->OnInputEvent(pointerEvent);
+            InputInterMgr->OnInputEvent(pointerEvent, deviceTags);
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
             break;
         }
         case MONITOR: {
 #ifdef OHOS_BUILD_ENABLE_MONITOR
-            IMonitorMgr->OnInputEvent(pointerEvent);
+            IMonitorMgr->OnInputEvent(pointerEvent, deviceTags);
 #endif // OHOS_BUILD_ENABLE_MONITOR
             break;
         }
diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
index f742bd107c..1a39272444 100644
--- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp
+++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
@@ -38,7 +38,7 @@ InputHandlerManager::InputHandlerManager()
 }
 
 int32_t InputHandlerManager::AddHandler(InputHandlerType handlerType, std::shared_ptr<IInputEventConsumer> consumer,
-    HandleEventType eventType, int32_t priority)
+    HandleEventType eventType, int32_t priority, uint32_t deviceTags)
 {
     CALL_INFO_TRACE;
     CHKPR(consumer, INVALID_HANDLER_ID);
@@ -59,11 +59,11 @@ int32_t InputHandlerManager::AddHandler(InputHandlerType handlerType, std::share
     }
     const HandleEventType currentType = GetEventType();
     MMI_HILOGD("Register new handler:%{public}d", handlerId);
-    if (RET_OK == AddLocal(handlerId, handlerType, eventType, priority, consumer)) {
+    if (RET_OK == AddLocal(handlerId, handlerType, eventType, priority, deviceTags, consumer)) {
         MMI_HILOGD("New handler successfully registered, report to server");
         const HandleEventType newType = GetEventType();
         if (currentType != newType) {
-            int32_t ret = AddToServer(handlerType, newType, priority);
+            int32_t ret = AddToServer(handlerType, newType, priority, deviceTags);
             if (ret != RET_OK) {
                 MMI_HILOGD("Handler:%{public}d permissions failed, remove the monitor", handlerId);
                 RemoveLocal(handlerId, handlerType);
@@ -86,20 +86,22 @@ void InputHandlerManager::RemoveHandler(int32_t handlerId, InputHandlerType hand
         MMI_HILOGD("Handler:%{public}d unregistered, report to server", handlerId);
         const HandleEventType newType = GetEventType();
         const int32_t newLevel = GetPriority();
+        const uint64_t newTags = GetDeviceTags();
         if (currentType != newType) {
-            RemoveFromServer(handlerType, newType, newLevel);
+            RemoveFromServer(handlerType, newType, newLevel, newTags);
         }
     }
 }
 
-int32_t InputHandlerManager::AddLocal(int32_t handlerId, InputHandlerType handlerType,
-    HandleEventType eventType, int32_t priority, std::shared_ptr<IInputEventConsumer> monitor)
+int32_t InputHandlerManager::AddLocal(int32_t handlerId, InputHandlerType handlerType, HandleEventType eventType,
+    int32_t priority, uint32_t deviceTags, std::shared_ptr<IInputEventConsumer> monitor)
 {
     InputHandlerManager::Handler handler {
         .handlerId_ = handlerId,
         .handlerType_ = handlerType,
         .eventType_ = eventType,
         .priority_ = priority,
+        .deviceTags_ = deviceTags,
         .consumer_ = monitor,
     };
     auto ret = inputHandlers_.emplace(handler.handlerId_, handler);
@@ -124,9 +126,9 @@ int32_t InputHandlerManager::AddLocal(int32_t handlerId, InputHandlerType handle
 }
 
 int32_t InputHandlerManager::AddToServer(InputHandlerType handlerType, HandleEventType eventType,
-    int32_t priority)
+    int32_t priority, uint32_t deviceTags)
 {
-    int32_t ret = MultimodalInputConnMgr->AddInputHandler(handlerType, eventType, priority);
+    int32_t ret = MultimodalInputConnMgr->AddInputHandler(handlerType, eventType, priority, deviceTags);
     if (ret != RET_OK) {
         MMI_HILOGE("Send to server failed, ret:%{public}d", ret);
     }
@@ -159,9 +161,9 @@ int32_t InputHandlerManager::RemoveLocal(int32_t handlerId, InputHandlerType han
 }
 
 void InputHandlerManager::RemoveFromServer(InputHandlerType handlerType, HandleEventType eventType,
-    int32_t priority)
+    int32_t priority, uint32_t deviceTags)
 {
-    int32_t ret = MultimodalInputConnMgr->RemoveInputHandler(handlerType, eventType, priority);
+    int32_t ret = MultimodalInputConnMgr->RemoveInputHandler(handlerType, eventType, priority, deviceTags);
     if (ret != 0) {
         MMI_HILOGE("Send to server failed, ret:%{public}d", ret);
     }
@@ -186,7 +188,7 @@ std::shared_ptr<IInputEventConsumer> InputHandlerManager::FindHandler(int32_t ha
 }
 
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
-void InputHandlerManager::OnInputEvent(std::shared_ptr<KeyEvent> keyEvent)
+void InputHandlerManager::OnInputEvent(std::shared_ptr<KeyEvent> keyEvent, uint32_t deviceTags)
 {
     CHK_PID_AND_TID();
     CHKPV(keyEvent);
@@ -194,7 +196,8 @@ void InputHandlerManager::OnInputEvent(std::shared_ptr<KeyEvent> keyEvent)
     BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::TRACE_STOP, BytraceAdapter::KEY_INTERCEPT_EVENT);
     if (!interHandlers_.empty()) {
         for (const auto &item : interHandlers_) {
-            if ((item.eventType_ & HANDLE_EVENT_TYPE_KEY) != HANDLE_EVENT_TYPE_KEY) {
+            if ((item.deviceTags_ !=  deviceTags) &&
+                ((item.eventType_ & HANDLE_EVENT_TYPE_KEY) != HANDLE_EVENT_TYPE_KEY)) {
                 continue;
             }
             int32_t handlerId = item.handlerId_;
@@ -220,14 +223,15 @@ void InputHandlerManager::OnInputEvent(std::shared_ptr<KeyEvent> keyEvent)
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
 
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
-void InputHandlerManager::GetConsumerInfos(std::shared_ptr<PointerEvent> pointerEvent,
+void InputHandlerManager::GetConsumerInfos(std::shared_ptr<PointerEvent> pointerEvent, uint32_t deviceTags,
     std::map<int32_t, std::shared_ptr<IInputEventConsumer>> &consumerInfos)
 {
     std::lock_guard<std::mutex> guard(mtxHandlers_);
     int32_t consumerCount = 0;
     if (!interHandlers_.empty()) {
         for (const auto &item : interHandlers_) {
-            if ((item.eventType_ & HANDLE_EVENT_TYPE_POINTER) != HANDLE_EVENT_TYPE_POINTER) {
+            if ((item.deviceTags_ !=  deviceTags) &&
+                ((item.eventType_ & HANDLE_EVENT_TYPE_POINTER) != HANDLE_EVENT_TYPE_POINTER)) {
                 continue;
             }
             int32_t handlerId = item.handlerId_;
@@ -274,16 +278,15 @@ void InputHandlerManager::GetConsumerInfos(std::shared_ptr<PointerEvent> pointer
     }
 }
 
-void InputHandlerManager::OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent)
+void InputHandlerManager::OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent, uint32_t deviceTags)
 {
     CHK_PID_AND_TID();
     CHKPV(pointerEvent);
     BytraceAdapter::StartBytrace(pointerEvent, BytraceAdapter::TRACE_STOP, BytraceAdapter::POINT_INTERCEPT_EVENT);
     std::map<int32_t, std::shared_ptr<IInputEventConsumer>> consumerInfos;
-    GetConsumerInfos(pointerEvent, consumerInfos);
+    GetConsumerInfos(pointerEvent, deviceTags, consumerInfos);
     for (const auto &iter : consumerInfos) {
         auto tempEvent = std::make_shared<PointerEvent>(*pointerEvent);
-        CHKPV(tempEvent);
         tempEvent->SetProcessedCallback(monitorCallback_);
         CHKPV(iter.second);
         auto consumer = iter.second;
@@ -299,8 +302,9 @@ void InputHandlerManager::OnConnected()
     CALL_DEBUG_ENTER;
     HandleEventType eventType = GetEventType();
     int32_t priority = GetPriority();
+    uint32_t deviceTags = GetDeviceTags();
     if (eventType != HANDLE_EVENT_TYPE_NONE) {
-        AddToServer(GetHandlerType(), eventType, priority);
+        AddToServer(GetHandlerType(), eventType, priority, deviceTags);
     }
 }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
@@ -342,6 +346,19 @@ int32_t InputHandlerManager::GetPriority() const
     return priority;
 }
 
+uint32_t InputHandlerManager::GetDeviceTags() const
+{
+    if (inputHandlers_.empty()) {
+        MMI_HILOGD("InputHandlers is empty");
+        return DEFUALT_INTERCEPTOR_PRIORITY;
+    }
+    uint32_t deviceTags { EVDEV_UDEV_TAG_INPUT };
+    if (!interHandlers_.empty()) {
+        deviceTags = interHandlers_.front().deviceTags_;
+    }
+    return deviceTags;
+}
+
 void InputHandlerManager::OnDispatchEventProcessed(int32_t eventId)
 {
     CALL_DEBUG_ENTER;
diff --git a/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp b/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp
index 5ea852a4dd..2d2965b02f 100644
--- a/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp
+++ b/frameworks/proxy/event_handler/src/input_interceptor_manager.cpp
@@ -38,13 +38,13 @@ int32_t InputInterceptorManager::AddInterceptor(std::shared_ptr<IInputEventConsu
 }
 
 int32_t InputInterceptorManager::AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor,
-    HandleEventType eventType, int32_t priority)
+    HandleEventType eventType, int32_t priority, uint32_t deviceTags)
 {
     if (interceptor == nullptr) {
         MMI_HILOGE("No interceptor was specified.");
         return INVALID_HANDLER_ID;
     }
-    return AddHandler(InputHandlerType::INTERCEPTOR, interceptor, eventType, priority);
+    return AddHandler(InputHandlerType::INTERCEPTOR, interceptor, eventType, priority, deviceTags);
 }
 
 void InputInterceptorManager::RemoveInterceptor(int32_t interceptorId)
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index a786a76725..023b3bf866 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -336,7 +336,6 @@ int32_t InputManagerImpl::AddMonitor(std::function<void(std::shared_ptr<KeyEvent
 #if defined(OHOS_BUILD_ENABLE_KEYBOARD) && defined(OHOS_BUILD_ENABLE_MONITOR)
     CHKPR(monitor, INVALID_HANDLER_ID);
     auto consumer = std::make_shared<MonitorEventConsumer>(monitor);
-    CHKPR(consumer, INVALID_HANDLER_ID);
     return AddMonitor(consumer);
 #else
     MMI_HILOGW("Keyboard device or monitor function does not support");
@@ -350,7 +349,6 @@ int32_t InputManagerImpl::AddMonitor(std::function<void(std::shared_ptr<PointerE
 #if (defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)) && defined(OHOS_BUILD_ENABLE_MONITOR)
     CHKPR(monitor, INVALID_HANDLER_ID);
     auto consumer = std::make_shared<MonitorEventConsumer>(monitor);
-    CHKPR(consumer, INVALID_HANDLER_ID);
     return AddMonitor(consumer);
 #else
     MMI_HILOGW("Pointer/touchscreen device or monitor function does not support");
@@ -418,7 +416,7 @@ void InputManagerImpl::MoveMouse(int32_t offsetX, int32_t offsetY)
 }
 
 int32_t InputManagerImpl::AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor,
-    int32_t priority)
+    int32_t priority, uint32_t deviceTags)
 {
     CALL_INFO_TRACE;
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
@@ -428,7 +426,7 @@ int32_t InputManagerImpl::AddInterceptor(std::shared_ptr<IInputEventConsumer> in
         MMI_HILOGE("Client init failed");
         return RET_ERR;
     }
-    return InputInterMgr->AddInterceptor(interceptor, HANDLE_EVENT_TYPE_ALL, priority);
+    return InputInterMgr->AddInterceptor(interceptor, HANDLE_EVENT_TYPE_ALL, priority, deviceTags);
 #else
     MMI_HILOGW("Interceptor function does not support");
     return ERROR_UNSUPPORT;
@@ -436,19 +434,18 @@ int32_t InputManagerImpl::AddInterceptor(std::shared_ptr<IInputEventConsumer> in
 }
 
 int32_t InputManagerImpl::AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor,
-    int32_t priority)
+    int32_t priority, uint32_t deviceTags)
 {
     CALL_INFO_TRACE;
 #if defined(OHOS_BUILD_ENABLE_KEYBOARD) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
     CHKPR(interceptor, INVALID_HANDLER_ID);
     std::lock_guard<std::mutex> guard(mtx_);
     auto consumer = std::make_shared<MonitorEventConsumer>(interceptor);
-    CHKPR(consumer, INVALID_HANDLER_ID);
     if (!MMIEventHdl.InitClient()) {
         MMI_HILOGE("Client init failed");
         return RET_ERR;
     }
-    return InputInterMgr->AddInterceptor(consumer, HANDLE_EVENT_TYPE_KEY, priority);
+    return InputInterMgr->AddInterceptor(consumer, HANDLE_EVENT_TYPE_KEY, priority, deviceTags);
 #else
     MMI_HILOGW("Keyboard device or interceptor function does not support");
     return ERROR_UNSUPPORT;
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index f7426da733..9dd7142db6 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -105,9 +105,10 @@ int32_t InputManager::AddInterceptor(std::function<void(std::shared_ptr<KeyEvent
     return InputMgrImpl.AddInterceptor(interceptor);
 }
 
-int32_t InputManager::AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, int32_t priority)
+int32_t InputManager::AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, int32_t priority,
+    uint32_t deviceTags)
 {
-    return InputMgrImpl.AddInterceptor(interceptor, priority);
+    return InputMgrImpl.AddInterceptor(interceptor, priority, deviceTags);
 }
 
 void InputManager::RemoveInterceptor(int32_t interceptorId)
diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 2c3cb11ab3..a060a9ab81 100644
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -2049,7 +2049,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_011, TestSize.Level1)
     injectDownEvent->AddPressedKeyItems(kitDown);
 
     auto interceptor = GetPtr<InputEventCallback>();
-    int32_t interceptorId { InputManager::GetInstance()->AddInterceptor(interceptor, 400) };
+    int32_t interceptorId { InputManager::GetInstance()->AddInterceptor(interceptor, 400, 1) };
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId));
 #else
@@ -2097,7 +2097,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_012, TestSize.Level1)
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
 
     auto interceptor = GetPtr<InputEventCallback>();
-    int32_t interceptorId = InputManager::GetInstance()->AddInterceptor(interceptor, 400);
+    int32_t interceptorId = InputManager::GetInstance()->AddInterceptor(interceptor, 400, 1);
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId));
 #else
@@ -2146,8 +2146,8 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_013, TestSize.Level1)
 
     auto interceptor1 = GetPtr<PriorityHighCallback>();
     auto interceptor2 = GetPtr<PriorityMiddleCallback>();
-    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400) };
-    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500) };
+    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400, 1) };
+    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500, 1) };
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId1));
     EXPECT_TRUE(IsValidHandlerId(interceptorId2));
@@ -2206,8 +2206,8 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_014, TestSize.Level1)
 
     auto interceptor1 = GetPtr<PriorityHighCallback>();
     auto interceptor2 = GetPtr<PriorityMiddleCallback>();
-    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400) };
-    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500) };
+    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400, 1) };
+    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500, 1) };
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId1));
     EXPECT_TRUE(IsValidHandlerId(interceptorId2));
@@ -2266,8 +2266,8 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_015, TestSize.Level1)
 
     auto interceptor1 = GetPtr<PriorityHighCallback>();
     auto interceptor2 = GetPtr<PriorityMiddleCallback>();
-    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400) };
-    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500) };
+    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400, 1) };
+    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500, 1) };
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId1));
     EXPECT_TRUE(IsValidHandlerId(interceptorId2));
@@ -2325,6 +2325,55 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_016, TestSize.Level1)
     }
 }
 
+/**
+ * @tc.name: TestInputEventInterceptor_017
+ * @tc.desc: Verify mouse interceptor
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, TestInputEventInterceptor_017, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
+    auto pointerEvent = PointerEvent::Create();
+    ASSERT_TRUE(pointerEvent != nullptr);
+    PointerEvent::PointerItem item;
+    item.SetPointerId(0);
+    item.SetDownTime(10010);
+    item.SetPressed(true);
+    item.SetDisplayX(523);
+    item.SetDisplayY(723);
+    item.SetDeviceId(1);
+    pointerEvent->AddPointerItem(item);
+    pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
+    pointerEvent->SetPointerId(0);
+    pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
+
+    auto interceptor = GetPtr<InputEventCallback>();
+    uint32_t touchTags = 1 << 2;
+    int32_t interceptorId { InputManager::GetInstance()->AddInterceptor(interceptor, 400, touchTags) };
+#ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
+    EXPECT_TRUE(IsValidHandlerId(interceptorId));
+#else
+    EXPECT_EQ(interceptorId, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_INTERCEPTOR
+    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
+
+    std::string sPointerEs = InputManagerTest::GetEventDump();
+    MMI_HILOGD("sPointerEs:%{public}s", sPointerEs.c_str());
+#if defined(OHOS_BUILD_ENABLE_POINTER) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
+    ASSERT_TRUE(sPointerEs.empty());
+#else
+    ASSERT_TRUE(sPointerEs.empty());
+#endif // OHOS_BUILD_ENABLE_POINTER && OHOS_BUILD_ENABLE_INTERCEPTOR
+
+    if (IsValidHandlerId(interceptorId)) {
+        InputManager::GetInstance()->RemoveInterceptor(interceptorId);
+        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    }
+}
+
 /**
  * @tc.name: InputManagerTest_OnAddScreenMonitor_001
  * @tc.desc: Verify touchscreen down event monitor
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
index c93db92831..75471ca727 100644
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -86,9 +86,9 @@ public:
     virtual int32_t UnregisterDevListener() = 0;
     virtual int32_t GetKeyboardType(int32_t userData, int32_t deviceId) = 0;
     virtual int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        int32_t priority) = 0;
+        int32_t priority, uint32_t deviceTags) = 0;
     virtual int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        int32_t priority) = 0;
+        int32_t priority, uint32_t deviceTags) = 0;
     virtual int32_t MarkEventConsumed(int32_t eventId) = 0;
     virtual int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY) = 0;
     virtual int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) = 0;
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
index 3466856b49..70526ccd50 100644
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -50,8 +50,10 @@ public:
     int32_t RegisterDevListener();
     int32_t UnregisterDevListener();
     int32_t GetKeyboardType(int32_t userData, int32_t deviceId);
-    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType, int32_t priority);
-    int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType, int32_t priority);
+    int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType, int32_t priority,
+        uint32_t deviceTags);
+    int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType, int32_t priority,
+        uint32_t deviceTags);
     int32_t MarkEventConsumed(int32_t eventId);
     int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY);
     int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent);
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
index 96706c0b53..213a8f2072 100644
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -46,9 +46,9 @@ public:
     int32_t UnregisterDevListener() override;
     int32_t GetKeyboardType(int32_t userData, int32_t deviceId) override;
     int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        int32_t priority) override;
+        int32_t priority, uint32_t deviceTags) override;
     int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        int32_t priority) override;
+        int32_t priority, uint32_t deviceTags) override;
     int32_t MarkEventConsumed(int32_t eventId) override;
     int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY) override;
     int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
index 14b28a9657..6459036506 100644
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -156,17 +156,17 @@ int32_t MultimodalInputConnectManager::GetKeyboardType(int32_t userData, int32_t
 }
 
 int32_t MultimodalInputConnectManager::AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-    int32_t priority)
+    int32_t priority, uint32_t deviceTags)
 {
     CHKPR(multimodalInputConnectService_, INVALID_HANDLER_ID);
-    return multimodalInputConnectService_->AddInputHandler(handlerType, eventType, priority);
+    return multimodalInputConnectService_->AddInputHandler(handlerType, eventType, priority, deviceTags);
 }
 
 int32_t MultimodalInputConnectManager::RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-    int32_t priority)
+    int32_t priority, uint32_t deviceTags)
 {
     CHKPR(multimodalInputConnectService_, INVALID_HANDLER_ID);
-    return multimodalInputConnectService_->RemoveInputHandler(handlerType, eventType, priority);
+    return multimodalInputConnectService_->RemoveInputHandler(handlerType, eventType, priority, deviceTags);
 }
 
 int32_t MultimodalInputConnectManager::MarkEventConsumed(int32_t eventId)
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index 43952e5988..e5d1c64d5e 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -362,7 +362,7 @@ int32_t MultimodalInputConnectProxy::GetKeyboardType(int32_t userData, int32_t d
 }
 
 int32_t MultimodalInputConnectProxy::AddInputHandler(InputHandlerType handlerType,
-    HandleEventType eventType, int32_t priority)
+    HandleEventType eventType, int32_t priority, uint32_t deviceTags)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -373,6 +373,7 @@ int32_t MultimodalInputConnectProxy::AddInputHandler(InputHandlerType handlerTyp
     WRITEINT32(data, handlerType, ERR_INVALID_VALUE);
     WRITEUINT32(data, eventType, ERR_INVALID_VALUE);
     WRITEINT32(data, priority, ERR_INVALID_VALUE);
+    WRITEUINT32(data, deviceTags, ERR_INVALID_VALUE);
     MessageParcel reply;
     MessageOption option;
     sptr<IRemoteObject> remote = Remote();
@@ -386,7 +387,7 @@ int32_t MultimodalInputConnectProxy::AddInputHandler(InputHandlerType handlerTyp
 }
 
 int32_t MultimodalInputConnectProxy::RemoveInputHandler(InputHandlerType handlerType,
-    HandleEventType eventType, int32_t priority)
+    HandleEventType eventType, int32_t priority, uint32_t deviceTags)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -397,6 +398,7 @@ int32_t MultimodalInputConnectProxy::RemoveInputHandler(InputHandlerType handler
     WRITEINT32(data, handlerType, ERR_INVALID_VALUE);
     WRITEUINT32(data, eventType, ERR_INVALID_VALUE);
     WRITEINT32(data, priority, ERR_INVALID_VALUE);
+    WRITEUINT32(data, eventType, ERR_INVALID_VALUE);
     MessageParcel reply;
     MessageOption option;
     sptr<IRemoteObject> remote = Remote();
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index e9234f6d04..0004537ba4 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -358,7 +358,10 @@ int32_t MultimodalInputConnectStub::StubAddInputHandler(MessageParcel& data, Mes
     READUINT32(data, eventType, IPC_PROXY_DEAD_OBJECT_ERR);
     int32_t priority;
     READINT32(data, priority, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = AddInputHandler(static_cast<InputHandlerType>(handlerType), eventType, priority);
+    int32_t deviceTags;
+    READINT32(data, deviceTags, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = AddInputHandler(static_cast<InputHandlerType>(handlerType), eventType, priority,
+        deviceTags);
     if (ret != RET_OK) {
         MMI_HILOGE("Call AddInputHandler failed ret:%{public}d", ret);
         return ret;
@@ -388,7 +391,10 @@ int32_t MultimodalInputConnectStub::StubRemoveInputHandler(MessageParcel& data,
     READUINT32(data, eventType, IPC_PROXY_DEAD_OBJECT_ERR);
     int32_t priority;
     READINT32(data, priority, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = RemoveInputHandler(static_cast<InputHandlerType>(handlerType), eventType, priority);
+    int32_t deviceTags;
+    READINT32(data, deviceTags, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = RemoveInputHandler(static_cast<InputHandlerType>(handlerType), eventType, priority,
+        deviceTags);
     if (ret != RET_OK) {
         MMI_HILOGE("Call RemoveInputHandler failed ret:%{public}d", ret);
         return ret;
@@ -435,7 +441,6 @@ int32_t MultimodalInputConnectStub::StubSubscribeKeyEvent(MessageParcel& data, M
     READINT32(data, subscribeId, IPC_PROXY_DEAD_OBJECT_ERR);
 
     auto keyOption = std::make_shared<KeyOption>();
-    CHKPR(keyOption, IPC_STUB_WRITE_PARCEL_ERR);
     if (!keyOption->ReadFromParcel(data)) {
         MMI_HILOGE("Read keyOption failed");
         return IPC_PROXY_DEAD_OBJECT_ERR;
diff --git a/service/interceptor/include/event_interceptor_handler.h b/service/interceptor/include/event_interceptor_handler.h
old mode 100755
new mode 100644
index 4a551bf850..02e5b971c5
--- a/service/interceptor/include/event_interceptor_handler.h
+++ b/service/interceptor/include/event_interceptor_handler.h
@@ -41,9 +41,9 @@ public:
     void HandleTouchEvent(const std::shared_ptr<PointerEvent> pointerEvent) override;
 #endif // OHOS_BUILD_ENABLE_TOUCH
     int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        int32_t priority, SessionPtr session);
+        int32_t priority, uint32_t deviceTags, SessionPtr session);
     void RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        int32_t priority, SessionPtr session);
+        int32_t priority, uint32_t deviceTags, SessionPtr session);
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     bool OnHandleEvent(std::shared_ptr<KeyEvent> keyEvent);
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
@@ -58,13 +58,15 @@ private:
     class SessionHandler {
     public:
         SessionHandler(InputHandlerType handlerType, HandleEventType eventType, int32_t priority,
-            SessionPtr session) : handlerType_(handlerType), eventType_(eventType & HANDLE_EVENT_TYPE_ALL),
-            priority_(priority), session_(session) {}
+            uint32_t deviceTags, SessionPtr session) : handlerType_(handlerType),
+            eventType_(eventType & HANDLE_EVENT_TYPE_ALL), priority_(priority), deviceTags_(deviceTags),
+            session_(session) {}
         void SendToClient(std::shared_ptr<KeyEvent> keyEvent) const;
         void SendToClient(std::shared_ptr<PointerEvent> pointerEvent) const;
         InputHandlerType handlerType_ { NONE };
         HandleEventType eventType_ { HANDLE_EVENT_TYPE_ALL };
-        int32_t priority_ { DEFUALT_INTERCEPTOR_PRIORITY } ;
+        int32_t priority_ { DEFUALT_INTERCEPTOR_PRIORITY };
+        uint32_t deviceTags_ { EVDEV_UDEV_TAG_INPUT };
         SessionPtr session_ { nullptr };
     };
 
diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp
index 1f074be91d..58ddb8ff8e 100644
--- a/service/interceptor/src/event_interceptor_handler.cpp
+++ b/service/interceptor/src/event_interceptor_handler.cpp
@@ -18,6 +18,7 @@
 #include "bytrace_adapter.h"
 #include "define_multimodal.h"
 #include "event_dispatch_handler.h"
+#include "input_device_manager.h"
 #include "input_event_data_transformation.h"
 #include "input_event_handler.h"
 #include "mmi_log.h"
@@ -84,7 +85,7 @@ void EventInterceptorHandler::HandleTouchEvent(const std::shared_ptr<PointerEven
 #endif // OHOS_BUILD_ENABLE_TOUCH
 
 int32_t EventInterceptorHandler::AddInputHandler(InputHandlerType handlerType,
-    HandleEventType eventType, int32_t priority, SessionPtr session)
+    HandleEventType eventType, int32_t priority, uint32_t deviceTags, SessionPtr session)
 {
     CALL_INFO_TRACE;
     CHKPR(session, RET_ERR);
@@ -93,17 +94,17 @@ int32_t EventInterceptorHandler::AddInputHandler(InputHandlerType handlerType,
         return RET_ERR;
     }
     InitSessionLostCallback();
-    SessionHandler interceptor { handlerType, eventType, priority, session };
+    SessionHandler interceptor { handlerType, eventType, priority, deviceTags, session };
     return interceptors_.AddInterceptor(interceptor);
 }
 
 void EventInterceptorHandler::RemoveInputHandler(InputHandlerType handlerType,
-    HandleEventType eventType, int32_t priority, SessionPtr session)
+    HandleEventType eventType, int32_t priority, uint32_t deviceTags, SessionPtr session)
 {
     CALL_INFO_TRACE;
     CHKPV(session);
     if (handlerType == InputHandlerType::INTERCEPTOR) {
-        SessionHandler interceptor { handlerType, eventType, priority, session };
+        SessionHandler interceptor { handlerType, eventType, priority, deviceTags, session };
         interceptors_.RemoveInterceptor(interceptor);
     }
 }
@@ -155,7 +156,7 @@ void EventInterceptorHandler::SessionHandler::SendToClient(std::shared_ptr<KeyEv
 {
     CHKPV(keyEvent);
     NetPacket pkt(MmiMessageId::REPORT_KEY_EVENT);
-    pkt << handlerType_;
+    pkt << handlerType_ << deviceTags_;
     if (pkt.ChkRWError()) {
         MMI_HILOGE("Packet write key event failed");
         return;
@@ -175,7 +176,7 @@ void EventInterceptorHandler::SessionHandler::SendToClient(std::shared_ptr<Point
     CHKPV(pointerEvent);
     NetPacket pkt(MmiMessageId::REPORT_POINTER_EVENT);
     MMI_HILOGD("Service send to client InputHandlerType:%{public}d", handlerType_);
-    pkt << handlerType_;
+    pkt << handlerType_ << deviceTags_;
     if (pkt.ChkRWError()) {
         MMI_HILOGE("Packet write pointer event failed");
         return;
@@ -200,7 +201,12 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
     }
     MMI_HILOGD("There are currently:%{public}zu interceptors", interceptors_.size());
     bool isInterceptor = false;
+    std::shared_ptr<InputDevice> inputDevice = InputDevMgr->GetInputDevice(keyEvent->GetDeviceId());
     for (const auto &interceptor : interceptors_) {
+        if ((interceptor.deviceTags_ != 1) &&
+            (interceptor.deviceTags_ & inputDevice->GetType()) == 0) {
+            continue;
+        }
         if ((interceptor.eventType_ & HANDLE_EVENT_TYPE_KEY) == HANDLE_EVENT_TYPE_KEY) {
             interceptor.SendToClient(keyEvent);
             MMI_HILOGD("Key event was intercepted");
@@ -222,7 +228,12 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
     }
     MMI_HILOGD("There are currently:%{public}zu interceptors", interceptors_.size());
     bool isInterceptor = false;
+    std::shared_ptr<InputDevice> inputDevice = InputDevMgr->GetInputDevice(pointerEvent->GetDeviceId());
     for (const auto &interceptor : interceptors_) {
+        if ((interceptor.deviceTags_ != 1) &&
+            (interceptor.deviceTags_ & inputDevice->GetType()) == 0) {
+            continue;
+        }
         if ((interceptor.eventType_ & HANDLE_EVENT_TYPE_POINTER) == HANDLE_EVENT_TYPE_POINTER) {
             interceptor.SendToClient(pointerEvent);
             MMI_HILOGD("Pointer event was intercepted");
diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
index 4b343407d9..c28a5207f5 100644
--- a/service/message_handle/include/server_msg_handler.h
+++ b/service/message_handle/include/server_msg_handler.h
@@ -37,9 +37,9 @@ public:
     void OnMsgHandler(SessionPtr sess, NetPacket& pkt);
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
     int32_t OnAddInputHandler(SessionPtr sess, InputHandlerType handlerType, HandleEventType eventType,
-        int32_t priority);
+        int32_t priority, uint32_t deviceTags);
     int32_t OnRemoveInputHandler(SessionPtr sess, InputHandlerType handlerType, HandleEventType eventType,
-        int32_t priority);
+        int32_t priority, uint32_t deviceTags);
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
 #ifdef OHOS_BUILD_ENABLE_MONITOR
     int32_t OnMarkConsumed(SessionPtr sess, int32_t eventId);
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index e04fb6b9c4..00d4078170 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -248,7 +248,7 @@ int32_t ServerMsgHandler::OnDisplayInfo(SessionPtr sess, NetPacket &pkt)
 
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
 int32_t ServerMsgHandler::OnAddInputHandler(SessionPtr sess, InputHandlerType handlerType,
-    HandleEventType eventType, int32_t priority)
+    HandleEventType eventType, int32_t priority, uint32_t deviceTags)
 {
     CHKPR(sess, ERROR_NULL_POINTER);
     MMI_HILOGD("handlerType:%{public}d", handlerType);
@@ -256,7 +256,7 @@ int32_t ServerMsgHandler::OnAddInputHandler(SessionPtr sess, InputHandlerType ha
     if (handlerType == InputHandlerType::INTERCEPTOR) {
         auto interceptorHandler = InputHandler->GetInterceptorHandler();
         CHKPR(interceptorHandler, ERROR_NULL_POINTER);
-        return interceptorHandler->AddInputHandler(handlerType, eventType, priority, sess);
+        return interceptorHandler->AddInputHandler(handlerType, eventType, priority, deviceTags, sess);
     }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
 #ifdef OHOS_BUILD_ENABLE_MONITOR
@@ -270,7 +270,7 @@ int32_t ServerMsgHandler::OnAddInputHandler(SessionPtr sess, InputHandlerType ha
 }
 
 int32_t ServerMsgHandler::OnRemoveInputHandler(SessionPtr sess, InputHandlerType handlerType,
-    HandleEventType eventType, int32_t priority)
+    HandleEventType eventType, int32_t priority, uint32_t deviceTags)
 {
     CHKPR(sess, ERROR_NULL_POINTER);
     MMI_HILOGD("OnRemoveInputHandler handlerType:%{public}d eventType:%{public}u", handlerType, eventType);
@@ -278,7 +278,7 @@ int32_t ServerMsgHandler::OnRemoveInputHandler(SessionPtr sess, InputHandlerType
     if (handlerType == InputHandlerType::INTERCEPTOR) {
         auto interceptorHandler = InputHandler->GetInterceptorHandler();
         CHKPR(interceptorHandler, ERROR_NULL_POINTER);
-        interceptorHandler->RemoveInputHandler(handlerType, eventType, priority, sess);
+        interceptorHandler->RemoveInputHandler(handlerType, eventType, priority, deviceTags, sess);
     }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
 #ifdef OHOS_BUILD_ENABLE_MONITOR
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index 44e1e5e14d..e814351d2e 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -60,9 +60,9 @@ public:
     int32_t UnregisterDevListener() override;
     int32_t GetKeyboardType(int32_t userData, int32_t deviceId) override;
     int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        int32_t priority) override;
+        int32_t priority, uint32_t deviceTags) override;
     int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-        int32_t priority) override;
+        int32_t priority, uint32_t deviceTags) override;
     int32_t MarkEventConsumed(int32_t eventId) override;
     int32_t MoveMouseEvent(int32_t offsetX, int32_t offsetY) override;
     int32_t InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent) override;
@@ -105,9 +105,9 @@ protected:
     int32_t OnGetKeyboardType(int32_t pid, int32_t userData, int32_t deviceId);
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
     int32_t CheckAddInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType,
-        int32_t priority);
+        int32_t priority, uint32_t deviceTags);
     int32_t CheckRemoveInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType,
-        int32_t priority);
+        int32_t priority, uint32_t deviceTags);
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
     int32_t CheckMarkConsumed(int32_t pid, int32_t eventId);
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 933914134a..5a96453448 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -710,22 +710,22 @@ int32_t MMIService::GetKeyboardType(int32_t userData, int32_t deviceId)
 
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
 int32_t MMIService::CheckAddInput(int32_t pid, InputHandlerType handlerType,
-    HandleEventType eventType, int32_t priority)
+    HandleEventType eventType, int32_t priority, uint32_t deviceTags)
 {
     auto sess = GetSessionByPid(pid);
     CHKPR(sess, ERROR_NULL_POINTER);
-    return sMsgHandler_.OnAddInputHandler(sess, handlerType, eventType, priority);
+    return sMsgHandler_.OnAddInputHandler(sess, handlerType, eventType, priority, deviceTags);
 }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
 
 int32_t MMIService::AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-    int32_t priority)
+    int32_t priority, uint32_t deviceTags)
 {
     CALL_INFO_TRACE;
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
     int32_t pid = GetCallingPid();
     int32_t ret = delegateTasks_.PostSyncTask(
-        std::bind(&MMIService::CheckAddInput, this, pid, handlerType, eventType, priority));
+        std::bind(&MMIService::CheckAddInput, this, pid, handlerType, eventType, priority, deviceTags));
     if (ret != RET_OK) {
         MMI_HILOGE("Add input handler failed, ret:%{public}d", ret);
         return RET_ERR;
@@ -736,22 +736,22 @@ int32_t MMIService::AddInputHandler(InputHandlerType handlerType, HandleEventTyp
 
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
 int32_t MMIService::CheckRemoveInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType,
-    int32_t priority)
+    int32_t priority, uint32_t deviceTags)
 {
     auto sess = GetSessionByPid(pid);
     CHKPR(sess, ERROR_NULL_POINTER);
-    return sMsgHandler_.OnRemoveInputHandler(sess, handlerType, eventType, priority);
+    return sMsgHandler_.OnRemoveInputHandler(sess, handlerType, eventType, priority, deviceTags);
 }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR || OHOS_BUILD_ENABLE_MONITOR
 
 int32_t MMIService::RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
-    int32_t priority)
+    int32_t priority, uint32_t deviceTags)
 {
     CALL_INFO_TRACE;
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
     int32_t pid = GetCallingPid();
     int32_t ret = delegateTasks_.PostSyncTask(
-        std::bind(&MMIService::CheckRemoveInput, this, pid, handlerType, eventType, priority));
+        std::bind(&MMIService::CheckRemoveInput, this, pid, handlerType, eventType, priority, deviceTags));
     if (ret != RET_OK) {
         MMI_HILOGE("Remove input handler failed, ret:%{public}d", ret);
         return RET_ERR;
-- 
Gitee


From 04e49e0a9514645530fe275a493bfa0a0e208cfa Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 1 Dec 2022 13:03:45 +0000
Subject: [PATCH 202/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../include/input_handler_manager.h           |  5 +-
 .../include/input_handler_type.h              |  1 -
 .../include/input_manager_impl.h              |  4 +-
 .../src/input_handler_manager.cpp             |  2 +-
 frameworks/proxy/events/src/input_device.cpp  | 16 ++++
 .../proxy/events/test/input_manager_test.cpp  | 73 +++++++++++++++++++
 .../innerkits/event/include/input_device.h    |  8 +-
 .../innerkits/proxy/include/input_manager.h   |  2 +-
 .../include/event_interceptor_handler.h       |  3 +-
 .../src/event_interceptor_handler.cpp         |  6 +-
 10 files changed, 107 insertions(+), 13 deletions(-)

diff --git a/frameworks/proxy/event_handler/include/input_handler_manager.h b/frameworks/proxy/event_handler/include/input_handler_manager.h
index be4b23c611..07b189bb24 100644
--- a/frameworks/proxy/event_handler/include/input_handler_manager.h
+++ b/frameworks/proxy/event_handler/include/input_handler_manager.h
@@ -20,6 +20,7 @@
 #include <map>
 #include <mutex>
 
+#include "input_device.h"
 #include "input_handler_type.h"
 #include "i_input_event_consumer.h"
 #include "pointer_event.h"
@@ -51,7 +52,7 @@ public:
 protected:
     int32_t AddHandler(InputHandlerType handlerType, std::shared_ptr<IInputEventConsumer> consumer,
         HandleEventType eventType = HANDLE_EVENT_TYPE_ALL, int32_t priority = DEFUALT_INTERCEPTOR_PRIORITY,
-        uint32_t deviceTags = EVDEV_UDEV_TAG_INPUT);
+        uint32_t deviceTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX));
     void RemoveHandler(int32_t handlerId, InputHandlerType IsValidHandlerType);
 
 private:
@@ -60,7 +61,7 @@ private:
         InputHandlerType handlerType_ { NONE };
         HandleEventType eventType_ { HANDLE_EVENT_TYPE_ALL };
         int32_t priority_ { DEFUALT_INTERCEPTOR_PRIORITY };
-        uint32_t deviceTags_ { EVDEV_UDEV_TAG_INPUT };
+        uint32_t deviceTags_ { CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX) };
         std::shared_ptr<IInputEventConsumer> consumer_ { nullptr };
     };
 
diff --git a/frameworks/proxy/event_handler/include/input_handler_type.h b/frameworks/proxy/event_handler/include/input_handler_type.h
index 1027777442..e5812fbc29 100644
--- a/frameworks/proxy/event_handler/include/input_handler_type.h
+++ b/frameworks/proxy/event_handler/include/input_handler_type.h
@@ -25,7 +25,6 @@ inline constexpr int32_t   MIN_HANDLER_ID { 1 };
 inline constexpr int32_t   INVALID_HANDLER_ID { -1 };
 inline constexpr int32_t   ERROR_EXCEED_MAX_COUNT { -4100001 };
 inline constexpr int32_t   DEFUALT_INTERCEPTOR_PRIORITY { 500 };
-inline constexpr uint32_t  EVDEV_UDEV_TAG_INPUT = 1 << 0;
 
 enum InputHandlerType : int32_t {
     NONE,
diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index 0124abd09d..88c324e09e 100644
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -75,10 +75,10 @@ public:
 
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor,
         int32_t priority = DEFUALT_INTERCEPTOR_PRIORITY,
-        uint32_t deviceTags = EVDEV_UDEV_TAG_INPUT);
+        uint32_t deviceTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX));
     int32_t AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor,
         int32_t priority = DEFUALT_INTERCEPTOR_PRIORITY,
-        uint32_t deviceTags = EVDEV_UDEV_TAG_INPUT);
+        uint32_t deviceTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX));
     void RemoveInterceptor(int32_t interceptorId);
 
     void SimulateInputEvent(std::shared_ptr<KeyEvent> keyEvent);
diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
index 1a39272444..f291389894 100644
--- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp
+++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
@@ -352,7 +352,7 @@ uint32_t InputHandlerManager::GetDeviceTags() const
         MMI_HILOGD("InputHandlers is empty");
         return DEFUALT_INTERCEPTOR_PRIORITY;
     }
-    uint32_t deviceTags { EVDEV_UDEV_TAG_INPUT };
+    uint32_t deviceTags { CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX) };
     if (!interHandlers_.empty()) {
         deviceTags = interHandlers_.front().deviceTags_;
     }
diff --git a/frameworks/proxy/events/src/input_device.cpp b/frameworks/proxy/events/src/input_device.cpp
index 51a9ae23ff..e6705c2f37 100644
--- a/frameworks/proxy/events/src/input_device.cpp
+++ b/frameworks/proxy/events/src/input_device.cpp
@@ -127,6 +127,22 @@ bool InputDevice::HasCapability(InputDeviceCapability cap) const
     return false;
 }
 
+bool InputDevice::HasCapability(uint32_t deviceTags) const
+{
+    int32_t min = static_cast<int32_t>(INPUT_DEV_CAP_KEYBOARD);
+    int32_t max = static_cast<int32_t>(INPUT_DEV_CAP_MAX);
+    for (int32_t cap = min; cap < max; ++cap) {
+        if (!capabilities_.test(static_cast<InputDeviceCapability>(cap))) {
+            continue;
+        }
+        uint32_t tags = CapabilityToTags(static_cast<InputDeviceCapability>(cap));
+        if ((tags & deviceTags) == tags) {
+            return true;
+        }
+    }
+    return false;
+}
+
 void InputDevice::AddAxisInfo(AxisInfo axis)
 {
     axis_.push_back(axis);
diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index a060a9ab81..24a6dc8cd3 100644
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -2374,6 +2374,79 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_017, TestSize.Level1)
     }
 }
 
+/**
+ * @tc.name: TestInputEventInterceptor_018
+ * @tc.desc: Verify mouse interceptor
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, TestInputEventInterceptor_018, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
+    std::vector<int32_t> deviceIds;
+    InputManager::GetInstance()->GetDeviceIds([&deviceIds] (std::vector<int32_t> ids) {
+        deviceIds = ids;
+    });
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+
+    uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_POINTER);
+    int32_t deviceId = 0;
+    for (const auto &id : deviceIds) {
+        InputManager::GetInstance()->GetDevice(id, [&deviceId] (std::shared_ptr<InputDevice> device) {
+            if (device->HasCapability(touchTags)) {
+                deviceId = device->GetId();
+            }
+
+            std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+
+            if (deviceId > 0) {
+                break;
+            }
+        })
+    }
+
+    auto pointerEvent = PointerEvent::Create();
+    ASSERT_TRUE(pointerEvent != nullptr);
+    PointerEvent::PointerItem item;
+    item.SetDeviceId(deviceId);
+    item.SetPointerId(0);
+    item.SetDownTime(10010);
+    item.SetPressed(true);
+    item.SetDisplayX(523);
+    item.SetDisplayY(723);
+    item.SetDeviceId(1);
+    pointerEvent->AddPointerItem(item);
+    pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
+    pointerEvent->SetPointerId(0);
+    pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
+
+    auto interceptor = GetPtr<InputEventCallback>();
+    
+    int32_t interceptorId { InputManager::GetInstance()->AddInterceptor(interceptor, 400, touchTags) };
+#ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
+    EXPECT_TRUE(IsValidHandlerId(interceptorId));
+#else
+    EXPECT_EQ(interceptorId, ERROR_UNSUPPORT);
+#endif // OHOS_BUILD_ENABLE_INTERCEPTOR
+    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
+
+    std::string sPointerEs = InputManagerTest::GetEventDump();
+    MMI_HILOGD("sPointerEs:%{public}s", sPointerEs.c_str());
+#if defined(OHOS_BUILD_ENABLE_POINTER) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
+    ASSERT_TRUE(sPointerEs.empty());
+#else
+    ASSERT_TRUE(sPointerEs.empty());
+#endif // OHOS_BUILD_ENABLE_POINTER && OHOS_BUILD_ENABLE_INTERCEPTOR
+
+    if (IsValidHandlerId(interceptorId)) {
+        InputManager::GetInstance()->RemoveInterceptor(interceptorId);
+        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    }
+}
+
 /**
  * @tc.name: InputManagerTest_OnAddScreenMonitor_001
  * @tc.desc: Verify touchscreen down event monitor
diff --git a/interfaces/native/innerkits/event/include/input_device.h b/interfaces/native/innerkits/event/include/input_device.h
index 822f95d77a..a84df83903 100644
--- a/interfaces/native/innerkits/event/include/input_device.h
+++ b/interfaces/native/innerkits/event/include/input_device.h
@@ -36,6 +36,11 @@ enum InputDeviceCapability {
     INPUT_DEV_CAP_MAX
 };
 
+inline constexpr uint32_t CapabilityToTags(InputDeviceCapability capability)
+{
+    return static_cast<uint32_t>((1 << capability) - (capability / INPUT_DEV_CAP_MAX));
+}
+
 enum KeyboardType {
     KEYBOARD_TYPE_NONE,
     KEYBOARD_TYPE_UNKNOWN,
@@ -72,6 +77,8 @@ public:
     std::string GetUniq() const;
     void AddCapability(InputDeviceCapability cap);
     bool HasCapability(InputDeviceCapability cap) const;
+    bool HasCapability(uint32_t deviceTags) const;
+
 
     class AxisInfo {
     public:
@@ -114,7 +121,6 @@ private:
     std::string phys_ { "null" };
     std::string uniq_ { "null" };
     std::vector<AxisInfo> axis_;
-    std::vector<int32_t> deviceIdList_;
     std::bitset<INPUT_DEV_CAP_MAX> capabilities_;
 };
 } // namespace MMI
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index c6bc050eef..6c79506feb 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -177,7 +177,7 @@ public:
      */
     int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor);
     int32_t AddInterceptor(std::function<void(std::shared_ptr<KeyEvent>)> interceptor);
-    int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, int32_t priority);
+    int32_t AddInterceptor(std::shared_ptr<IInputEventConsumer> interceptor, int32_t priority, uint32_t deviceTags);
 
     /**
      * @brief Removes an interceptor.
diff --git a/service/interceptor/include/event_interceptor_handler.h b/service/interceptor/include/event_interceptor_handler.h
index 02e5b971c5..963b8f874d 100644
--- a/service/interceptor/include/event_interceptor_handler.h
+++ b/service/interceptor/include/event_interceptor_handler.h
@@ -20,6 +20,7 @@
 
 #include "i_input_event_handler.h"
 #include "i_input_event_collection_handler.h"
+#include "input_device.h"
 #include "input_handler_type.h"
 #include "nocopyable.h"
 #include "uds_session.h"
@@ -66,7 +67,7 @@ private:
         InputHandlerType handlerType_ { NONE };
         HandleEventType eventType_ { HANDLE_EVENT_TYPE_ALL };
         int32_t priority_ { DEFUALT_INTERCEPTOR_PRIORITY };
-        uint32_t deviceTags_ { EVDEV_UDEV_TAG_INPUT };
+        uint32_t deviceTags_ { CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX) };
         SessionPtr session_ { nullptr };
     };
 
diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp
index 58ddb8ff8e..a397af0765 100644
--- a/service/interceptor/src/event_interceptor_handler.cpp
+++ b/service/interceptor/src/event_interceptor_handler.cpp
@@ -203,8 +203,7 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
     bool isInterceptor = false;
     std::shared_ptr<InputDevice> inputDevice = InputDevMgr->GetInputDevice(keyEvent->GetDeviceId());
     for (const auto &interceptor : interceptors_) {
-        if ((interceptor.deviceTags_ != 1) &&
-            (interceptor.deviceTags_ & inputDevice->GetType()) == 0) {
+        if (!inputDevice->HasCapability(interceptor.deviceTags_)) {
             continue;
         }
         if ((interceptor.eventType_ & HANDLE_EVENT_TYPE_KEY) == HANDLE_EVENT_TYPE_KEY) {
@@ -230,8 +229,7 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
     bool isInterceptor = false;
     std::shared_ptr<InputDevice> inputDevice = InputDevMgr->GetInputDevice(pointerEvent->GetDeviceId());
     for (const auto &interceptor : interceptors_) {
-        if ((interceptor.deviceTags_ != 1) &&
-            (interceptor.deviceTags_ & inputDevice->GetType()) == 0) {
+       if (!inputDevice->HasCapability(interceptor.deviceTags_)) {
             continue;
         }
         if ((interceptor.eventType_ & HANDLE_EVENT_TYPE_POINTER) == HANDLE_EVENT_TYPE_POINTER) {
-- 
Gitee


From fce55a867c19093bf990cbdc80e4ea990747b1cf Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 2 Dec 2022 03:59:59 +0000
Subject: [PATCH 203/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../proxy/events/test/input_manager_test.cpp  | 145 ++----------------
 .../src/event_interceptor_handler.cpp         |  27 +++-
 service/monitor/src/event_monitor_handler.cpp |   4 +-
 3 files changed, 41 insertions(+), 135 deletions(-)

diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 24a6dc8cd3..795bcfe5dd 100644
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -2049,7 +2049,8 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_011, TestSize.Level1)
     injectDownEvent->AddPressedKeyItems(kitDown);
 
     auto interceptor = GetPtr<InputEventCallback>();
-    int32_t interceptorId { InputManager::GetInstance()->AddInterceptor(interceptor, 400, 1) };
+    uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX);
+    int32_t interceptorId { InputManager::GetInstance()->AddInterceptor(interceptor, 400, touchTags) };
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId));
 #else
@@ -2097,7 +2098,8 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_012, TestSize.Level1)
     pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
 
     auto interceptor = GetPtr<InputEventCallback>();
-    int32_t interceptorId = InputManager::GetInstance()->AddInterceptor(interceptor, 400, 1);
+    uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX);
+    int32_t interceptorId = InputManager::GetInstance()->AddInterceptor(interceptor, 400, touchTags);
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId));
 #else
@@ -2146,8 +2148,9 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_013, TestSize.Level1)
 
     auto interceptor1 = GetPtr<PriorityHighCallback>();
     auto interceptor2 = GetPtr<PriorityMiddleCallback>();
-    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400, 1) };
-    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500, 1) };
+    uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX);
+    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400, touchTags) };
+    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500, touchTags) };
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId1));
     EXPECT_TRUE(IsValidHandlerId(interceptorId2));
@@ -2200,14 +2203,16 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_014, TestSize.Level1)
     kitDown.SetKeyCode(KeyEvent::KEYCODE_VOLUME_DOWN);
     kitDown.SetPressed(true);
     kitDown.SetDownTime(downTime);
+    kitDown.SetDeviceId(1);
     injectDownEvent->SetKeyCode(KeyEvent::KEYCODE_VOLUME_DOWN);
     injectDownEvent->SetKeyAction(KeyEvent::KEY_ACTION_DOWN);
     injectDownEvent->AddPressedKeyItems(kitDown);
 
     auto interceptor1 = GetPtr<PriorityHighCallback>();
     auto interceptor2 = GetPtr<PriorityMiddleCallback>();
-    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400, 1) };
-    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500, 1) };
+    uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX);
+    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400, touchTags) };
+    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500, touchTags) };
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId1));
     EXPECT_TRUE(IsValidHandlerId(interceptorId2));
@@ -2260,14 +2265,16 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_015, TestSize.Level1)
     kitDown.SetKeyCode(KeyEvent::KEYCODE_VOLUME_DOWN);
     kitDown.SetPressed(true);
     kitDown.SetDownTime(downTime);
+    kitDown.SetDeviceId(1);
     injectDownEvent->SetKeyCode(KeyEvent::KEYCODE_VOLUME_DOWN);
     injectDownEvent->SetKeyAction(KeyEvent::KEY_ACTION_DOWN);
     injectDownEvent->AddPressedKeyItems(kitDown);
 
     auto interceptor1 = GetPtr<PriorityHighCallback>();
     auto interceptor2 = GetPtr<PriorityMiddleCallback>();
-    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400, 1) };
-    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500, 1) };
+    uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX);
+    int32_t interceptorId1 { InputManager::GetInstance()->AddInterceptor(interceptor1, 400, touchTags) };
+    int32_t interceptorId2 { InputManager::GetInstance()->AddInterceptor(interceptor2, 500, touchTags) };
 #ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
     EXPECT_TRUE(IsValidHandlerId(interceptorId1));
     EXPECT_TRUE(IsValidHandlerId(interceptorId2));
@@ -2325,128 +2332,6 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_016, TestSize.Level1)
     }
 }
 
-/**
- * @tc.name: TestInputEventInterceptor_017
- * @tc.desc: Verify mouse interceptor
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(InputManagerTest, TestInputEventInterceptor_017, TestSize.Level1)
-{
-    CALL_TEST_DEBUG;
-    TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
-    auto pointerEvent = PointerEvent::Create();
-    ASSERT_TRUE(pointerEvent != nullptr);
-    PointerEvent::PointerItem item;
-    item.SetPointerId(0);
-    item.SetDownTime(10010);
-    item.SetPressed(true);
-    item.SetDisplayX(523);
-    item.SetDisplayY(723);
-    item.SetDeviceId(1);
-    pointerEvent->AddPointerItem(item);
-    pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
-    pointerEvent->SetPointerId(0);
-    pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
-
-    auto interceptor = GetPtr<InputEventCallback>();
-    uint32_t touchTags = 1 << 2;
-    int32_t interceptorId { InputManager::GetInstance()->AddInterceptor(interceptor, 400, touchTags) };
-#ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
-    EXPECT_TRUE(IsValidHandlerId(interceptorId));
-#else
-    EXPECT_EQ(interceptorId, ERROR_UNSUPPORT);
-#endif // OHOS_BUILD_ENABLE_INTERCEPTOR
-    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
-    InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
-
-    std::string sPointerEs = InputManagerTest::GetEventDump();
-    MMI_HILOGD("sPointerEs:%{public}s", sPointerEs.c_str());
-#if defined(OHOS_BUILD_ENABLE_POINTER) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
-    ASSERT_TRUE(sPointerEs.empty());
-#else
-    ASSERT_TRUE(sPointerEs.empty());
-#endif // OHOS_BUILD_ENABLE_POINTER && OHOS_BUILD_ENABLE_INTERCEPTOR
-
-    if (IsValidHandlerId(interceptorId)) {
-        InputManager::GetInstance()->RemoveInterceptor(interceptorId);
-        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
-    }
-}
-
-/**
- * @tc.name: TestInputEventInterceptor_018
- * @tc.desc: Verify mouse interceptor
- * @tc.type: FUNC
- * @tc.require:
- */
-HWTEST_F(InputManagerTest, TestInputEventInterceptor_018, TestSize.Level1)
-{
-    CALL_TEST_DEBUG;
-    TestUtil->SetRecvFlag(RECV_FLAG::RECV_INTERCEPT);
-    std::vector<int32_t> deviceIds;
-    InputManager::GetInstance()->GetDeviceIds([&deviceIds] (std::vector<int32_t> ids) {
-        deviceIds = ids;
-    });
-
-    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
-
-    uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_POINTER);
-    int32_t deviceId = 0;
-    for (const auto &id : deviceIds) {
-        InputManager::GetInstance()->GetDevice(id, [&deviceId] (std::shared_ptr<InputDevice> device) {
-            if (device->HasCapability(touchTags)) {
-                deviceId = device->GetId();
-            }
-
-            std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
-
-            if (deviceId > 0) {
-                break;
-            }
-        })
-    }
-
-    auto pointerEvent = PointerEvent::Create();
-    ASSERT_TRUE(pointerEvent != nullptr);
-    PointerEvent::PointerItem item;
-    item.SetDeviceId(deviceId);
-    item.SetPointerId(0);
-    item.SetDownTime(10010);
-    item.SetPressed(true);
-    item.SetDisplayX(523);
-    item.SetDisplayY(723);
-    item.SetDeviceId(1);
-    pointerEvent->AddPointerItem(item);
-    pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
-    pointerEvent->SetPointerId(0);
-    pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
-
-    auto interceptor = GetPtr<InputEventCallback>();
-    
-    int32_t interceptorId { InputManager::GetInstance()->AddInterceptor(interceptor, 400, touchTags) };
-#ifdef OHOS_BUILD_ENABLE_INTERCEPTOR
-    EXPECT_TRUE(IsValidHandlerId(interceptorId));
-#else
-    EXPECT_EQ(interceptorId, ERROR_UNSUPPORT);
-#endif // OHOS_BUILD_ENABLE_INTERCEPTOR
-    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
-    InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
-
-    std::string sPointerEs = InputManagerTest::GetEventDump();
-    MMI_HILOGD("sPointerEs:%{public}s", sPointerEs.c_str());
-#if defined(OHOS_BUILD_ENABLE_POINTER) && defined(OHOS_BUILD_ENABLE_INTERCEPTOR)
-    ASSERT_TRUE(sPointerEs.empty());
-#else
-    ASSERT_TRUE(sPointerEs.empty());
-#endif // OHOS_BUILD_ENABLE_POINTER && OHOS_BUILD_ENABLE_INTERCEPTOR
-
-    if (IsValidHandlerId(interceptorId)) {
-        InputManager::GetInstance()->RemoveInterceptor(interceptorId);
-        std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
-    }
-}
-
 /**
  * @tc.name: InputManagerTest_OnAddScreenMonitor_001
  * @tc.desc: Verify touchscreen down event monitor
diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp
index a397af0765..3e5c866c8b 100644
--- a/service/interceptor/src/event_interceptor_handler.cpp
+++ b/service/interceptor/src/event_interceptor_handler.cpp
@@ -201,7 +201,17 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
     }
     MMI_HILOGD("There are currently:%{public}zu interceptors", interceptors_.size());
     bool isInterceptor = false;
-    std::shared_ptr<InputDevice> inputDevice = InputDevMgr->GetInputDevice(keyEvent->GetDeviceId());
+    std::vector<int32_t> ids = InputDevMgr->GetInputDeviceIds();
+    for (const auto &id : ids) {
+        MMI_HILOGD("id:%{public}d", id);
+    }
+    std::vector<KeyEvent::KeyItem> keyItems = keyEvent->GetKeyItems();
+    if (keyItems.empty()) {
+        MMI_HILOGE("keyItems is empty");
+        return false;
+    }
+    std::shared_ptr<InputDevice> inputDevice = InputDevMgr->GetInputDevice(items.front().GetDeviceId());
+    CHKPF(inputDevice);
     for (const auto &interceptor : interceptors_) {
         if (!inputDevice->HasCapability(interceptor.deviceTags_)) {
             continue;
@@ -227,9 +237,20 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
     }
     MMI_HILOGD("There are currently:%{public}zu interceptors", interceptors_.size());
     bool isInterceptor = false;
-    std::shared_ptr<InputDevice> inputDevice = InputDevMgr->GetInputDevice(pointerEvent->GetDeviceId());
+    std::vector<int32_t> ids = InputDevMgr->GetInputDeviceIds();
+    for (const auto &id : ids) {
+        MMI_HILOGD("id:%{public}d", id);
+    }
+    PointerEvent::PointerItem pointerItem;
+    int32_t pointerId = pointerEvent->GetPointerId();
+    if (!pointerEvent->GetPointerItem(pointerId, pointerItem)) {
+        MMI_HILOGE("GetPointerItem:%{public}d fail", pointerId);
+        return false;
+    }
+    std::shared_ptr<InputDevice> inputDevice = InputDevMgr->GetInputDevice(pointerItem.GetDeviceId());
+    CHKPF(inputDevice);
     for (const auto &interceptor : interceptors_) {
-       if (!inputDevice->HasCapability(interceptor.deviceTags_)) {
+        if (!inputDevice->HasCapability(interceptor.deviceTags_)) {
             continue;
         }
         if ((interceptor.eventType_ & HANDLE_EVENT_TYPE_POINTER) == HANDLE_EVENT_TYPE_POINTER) {
diff --git a/service/monitor/src/event_monitor_handler.cpp b/service/monitor/src/event_monitor_handler.cpp
index ed756757c3..fc036dd0b2 100644
--- a/service/monitor/src/event_monitor_handler.cpp
+++ b/service/monitor/src/event_monitor_handler.cpp
@@ -155,7 +155,7 @@ void EventMonitorHandler::SessionHandler::SendToClient(std::shared_ptr<KeyEvent>
 {
     CHKPV(keyEvent);
     NetPacket pkt(MmiMessageId::REPORT_KEY_EVENT);
-    pkt << handlerType_;
+    pkt << handlerType_ << evdev_device_udev_tags::EVDEV_UDEV_TAG_INPUT;
     if (pkt.ChkRWError()) {
         MMI_HILOGE("Packet write key event failed");
         return;
@@ -184,7 +184,7 @@ void EventMonitorHandler::SessionHandler::SendToClient(std::shared_ptr<PointerEv
             return;
         }
     }
-    pkt << handlerType_;
+    pkt << handlerType_ << evdev_device_udev_tags::EVDEV_UDEV_TAG_INPUT;
     if (pkt.ChkRWError()) {
         MMI_HILOGE("Packet write pointer event failed");
         return;
-- 
Gitee


From 9616fac55625f1afe1e448156a732dde17989dd4 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 2 Dec 2022 06:06:22 +0000
Subject: [PATCH 204/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/interceptor/src/event_interceptor_handler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp
index 3e5c866c8b..81861b6d5a 100644
--- a/service/interceptor/src/event_interceptor_handler.cpp
+++ b/service/interceptor/src/event_interceptor_handler.cpp
@@ -210,7 +210,7 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
         MMI_HILOGE("keyItems is empty");
         return false;
     }
-    std::shared_ptr<InputDevice> inputDevice = InputDevMgr->GetInputDevice(items.front().GetDeviceId());
+    std::shared_ptr<InputDevice> inputDevice = InputDevMgr->GetInputDevice(keyItems.front().GetDeviceId());
     CHKPF(inputDevice);
     for (const auto &interceptor : interceptors_) {
         if (!inputDevice->HasCapability(interceptor.deviceTags_)) {
-- 
Gitee


From 7efa1874e54d9772ef49789744cf4ff49bbcf8ac Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 2 Dec 2022 06:39:32 +0000
Subject: [PATCH 205/360] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/interceptor/src/event_interceptor_handler.cpp | 8 --------
 service/monitor/src/event_monitor_handler.cpp         | 5 ++---
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp
index 81861b6d5a..2032d88214 100644
--- a/service/interceptor/src/event_interceptor_handler.cpp
+++ b/service/interceptor/src/event_interceptor_handler.cpp
@@ -201,10 +201,6 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
     }
     MMI_HILOGD("There are currently:%{public}zu interceptors", interceptors_.size());
     bool isInterceptor = false;
-    std::vector<int32_t> ids = InputDevMgr->GetInputDeviceIds();
-    for (const auto &id : ids) {
-        MMI_HILOGD("id:%{public}d", id);
-    }
     std::vector<KeyEvent::KeyItem> keyItems = keyEvent->GetKeyItems();
     if (keyItems.empty()) {
         MMI_HILOGE("keyItems is empty");
@@ -237,10 +233,6 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
     }
     MMI_HILOGD("There are currently:%{public}zu interceptors", interceptors_.size());
     bool isInterceptor = false;
-    std::vector<int32_t> ids = InputDevMgr->GetInputDeviceIds();
-    for (const auto &id : ids) {
-        MMI_HILOGD("id:%{public}d", id);
-    }
     PointerEvent::PointerItem pointerItem;
     int32_t pointerId = pointerEvent->GetPointerId();
     if (!pointerEvent->GetPointerItem(pointerId, pointerItem)) {
diff --git a/service/monitor/src/event_monitor_handler.cpp b/service/monitor/src/event_monitor_handler.cpp
index fc036dd0b2..f643de9b4d 100644
--- a/service/monitor/src/event_monitor_handler.cpp
+++ b/service/monitor/src/event_monitor_handler.cpp
@@ -155,7 +155,7 @@ void EventMonitorHandler::SessionHandler::SendToClient(std::shared_ptr<KeyEvent>
 {
     CHKPV(keyEvent);
     NetPacket pkt(MmiMessageId::REPORT_KEY_EVENT);
-    pkt << handlerType_ << evdev_device_udev_tags::EVDEV_UDEV_TAG_INPUT;
+    pkt << handlerType_ << static_cast<uint32_t>(evdev_device_udev_tags::EVDEV_UDEV_TAG_INPUT);
     if (pkt.ChkRWError()) {
         MMI_HILOGE("Packet write key event failed");
         return;
@@ -184,7 +184,7 @@ void EventMonitorHandler::SessionHandler::SendToClient(std::shared_ptr<PointerEv
             return;
         }
     }
-    pkt << handlerType_ << evdev_device_udev_tags::EVDEV_UDEV_TAG_INPUT;
+    pkt << handlerType_ << static_cast<uint32_t>(evdev_device_udev_tags::EVDEV_UDEV_TAG_INPUT);
     if (pkt.ChkRWError()) {
         MMI_HILOGE("Packet write pointer event failed");
         return;
@@ -291,7 +291,6 @@ void EventMonitorHandler::MonitorCollection::MarkConsumed(int32_t eventId, Sessi
 #ifdef OHOS_BUILD_ENABLE_TOUCH
     MMI_HILOGD("Cancel operation");
     auto pointerEvent = std::make_shared<PointerEvent>(*state.lastPointerEvent_);
-    CHKPV(pointerEvent);
     pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_CANCEL);
     pointerEvent->SetActionTime(GetSysClockTime());
     pointerEvent->UpdateId();
-- 
Gitee


From 05bee776b947ed777a79178d060a2d059fd73ad7 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Fri, 2 Dec 2022 08:14:23 +0000
Subject: [PATCH 206/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I223925a8ec4e46652b24498a8704fb94d6263c86
---
 .../touch_event_normalize/src/tablet_tool_tranform_processor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/service/touch_event_normalize/src/tablet_tool_tranform_processor.cpp b/service/touch_event_normalize/src/tablet_tool_tranform_processor.cpp
index 3b6919b517..8455a4077d 100644
--- a/service/touch_event_normalize/src/tablet_tool_tranform_processor.cpp
+++ b/service/touch_event_normalize/src/tablet_tool_tranform_processor.cpp
@@ -168,6 +168,7 @@ bool TabletToolTransformProcessor::OnTipDown(struct libinput_event_tablet_tool*
     item.SetTiltY(tiltY);
     item.SetPressure(pressure);
     item.SetToolType(toolType);
+    item.SetTargetWindowId(-1);
 
     pointerEvent_->SetDeviceId(deviceId_);
     pointerEvent_->AddPointerItem(item);
-- 
Gitee


From 3edfc5580c78c1daa315aee4a82b98a315200ce2 Mon Sep 17 00:00:00 2001
From: yajunstrong <wangyajun29@huawei.com>
Date: Sat, 3 Dec 2022 19:08:32 +0800
Subject: [PATCH 207/360] Fixed keyboard and mouse traversal not being able to
 retrieve rawDeltaX

Signed-off-by: yajunstrong <wangyajun29@huawei.com>
Change-Id: I207ecca45eab775a32638b58c7862a04ea87662a
---
 frameworks/napi/input_monitor/src/js_input_monitor.cpp        | 2 --
 service/mouse_event_normalize/include/mouse_event_normalize.h | 2 --
 service/mouse_event_normalize/src/mouse_event_normalize.cpp   | 4 +---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/frameworks/napi/input_monitor/src/js_input_monitor.cpp b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
index ea5d71a581..6fc36d1082 100644
--- a/frameworks/napi/input_monitor/src/js_input_monitor.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
@@ -353,10 +353,8 @@ MapFun JsInputMonitor::GetFuns(const std::shared_ptr<PointerEvent> pointerEvent,
     mapFun["windowY"] = std::bind(&PointerEvent::PointerItem::GetDisplayY, item);
     mapFun["screenX"] = std::bind(&PointerEvent::PointerItem::GetWindowX, item);
     mapFun["screenY"] = std::bind(&PointerEvent::PointerItem::GetWindowY, item);
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
     mapFun["rawDeltaX"] = std::bind(&PointerEvent::PointerItem::GetRawDx, item);
     mapFun["rawDeltaY"] = std::bind(&PointerEvent::PointerItem::GetRawDy, item);
-#endif // OHOS_BUILD_ENABLE_COOPERATE
     return mapFun;
 }
 
diff --git a/service/mouse_event_normalize/include/mouse_event_normalize.h b/service/mouse_event_normalize/include/mouse_event_normalize.h
index 3b188fd543..b3f9767d69 100644
--- a/service/mouse_event_normalize/include/mouse_event_normalize.h
+++ b/service/mouse_event_normalize/include/mouse_event_normalize.h
@@ -67,9 +67,7 @@ private:
     bool GetSpeedGain(double vin, double &gain) const;
     void DumpInner();
     void InitAbsolution();
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
     void SetDxDyForDInput(PointerEvent::PointerItem& pointerItem, libinput_event_pointer* data);
-#endif // OHOS_BUILD_ENABLE_COOPERATE
 
 private:
     std::shared_ptr<PointerEvent> pointerEvent_ { nullptr };
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index 945d1cdf6d..18a935e884 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -268,9 +268,7 @@ void MouseEventNormalize::HandlePostInner(struct libinput_event_pointer* data, i
     pointerItem.SetPressure(0);
     pointerItem.SetToolType(PointerEvent::TOOL_TYPE_FINGER);
     pointerItem.SetDeviceId(deviceId);
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
     SetDxDyForDInput(pointerItem, data);
-#endif // OHOS_BUILD_ENABLE_COOPERATE
     pointerEvent_->UpdateId();
     pointerEvent_->UpdatePointerItem(pointerEvent_->GetPointerId(), pointerItem);
     pointerEvent_->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
@@ -437,7 +435,6 @@ int32_t MouseEventNormalize::GetPointerSpeed() const
     return speed_;
 }
 
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
 void MouseEventNormalize::SetDxDyForDInput(PointerEvent::PointerItem& pointerItem, libinput_event_pointer* data)
 {
     double dx = libinput_event_pointer_get_dx(data);
@@ -449,6 +446,7 @@ void MouseEventNormalize::SetDxDyForDInput(PointerEvent::PointerItem& pointerIte
     MMI_HILOGD("MouseEventNormalize SetDxDyForDInput, dx:%{public}d, dy:%{public}d", rawDx, rawDy);
 }
 
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
 void MouseEventNormalize::SetAbsolutionLocation(double xPercent, double yPercent)
 {
     MMI_HILOGI("Cross screen location, xPercent:%{public}lf, yPercent:%{public}lf",
-- 
Gitee


From 8d23f165aac1957b8ddda8e922f43a946c544076 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 5 Dec 2022 09:42:51 +0800
Subject: [PATCH 208/360] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=BC=A0=E6=A0=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Icebde2b61e7cdff1bdac1d0457168f62d91f4157
---
 service/window_manager/src/input_windows_manager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 58d85b2e65..394b130045 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -673,7 +673,8 @@ int32_t InputWindowsManager::GetPointerStyle(int32_t pid, int32_t windowId, int3
     
     auto iter = it->second.find(windowId);
     if (iter == it->second.end()) {
-        MMI_HILOGE("The window id is Invalid");
+        MMI_HILOGW("The window id is invalid");
+        pointerStyle = DEFAULT_POINTER_STYLE;
         return COMMON_PARAMETER_ERROR ;
     }
     
-- 
Gitee


From e46f837d9d16d3dbbe42b9efecd20b0bb905ffb0 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 5 Dec 2022 15:34:16 +0800
Subject: [PATCH 209/360] time modify

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Iee0de0b1631e2b089390a6e431cb92afeb98b476
---
 service/key_command/src/key_command_handler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index f4eaa569da..74bd60d602 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -870,7 +870,7 @@ bool KeyCommandHandler::HandleSequence(Sequence &sequence, bool &isLaunchAbility
             isLaunchAbility = true;
             return true;
         }
-        sequence.timerId = TimerMgr->AddTimer(sequence.abilityStartDelay, 1, [this, sequence] () {
+        sequence.timerId = TimerMgr->AddTimer(sequence.abilityStartDelay/1000, 1, [this, sequence] () {
             MMI_HILOGD("Timer callback");
             LaunchAbility(sequence);
         });
-- 
Gitee


From 9f4b64268dbcd64a74fe694f71a0a73b7341c061 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 5 Dec 2022 15:35:38 +0800
Subject: [PATCH 210/360] time modify

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I83bc4f41d338ce00a55a809ebe12145beb624c72
---
 service/key_command/src/key_command_handler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index 74bd60d602..3ad2e28338 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -870,7 +870,7 @@ bool KeyCommandHandler::HandleSequence(Sequence &sequence, bool &isLaunchAbility
             isLaunchAbility = true;
             return true;
         }
-        sequence.timerId = TimerMgr->AddTimer(sequence.abilityStartDelay/1000, 1, [this, sequence] () {
+        sequence.timerId = TimerMgr->AddTimer(sequence.abilityStartDelay/SECONDS_SYSTEM, 1, [this, sequence] () {
             MMI_HILOGD("Timer callback");
             LaunchAbility(sequence);
         });
-- 
Gitee


From 4e59cca77121ff2c2be45d001fe72c395dccdd02 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 5 Dec 2022 19:34:55 +0800
Subject: [PATCH 211/360] =?UTF-8?q?=E7=BB=84=E5=90=88=E9=94=AE=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=EF=BC=8C=E9=9F=B3=E9=87=8F=E9=94=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?SPECIAL=5FALL=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ibf69edbaf171e0863a3eddaee07dd5ef6044d69e
---
 service/key_command/src/key_command_handler.cpp      | 2 +-
 service/window_manager/src/input_windows_manager.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index 3ad2e28338..1b7d9169b0 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -48,7 +48,7 @@ enum SpecialType {
 const std::map<int32_t, SpecialType> SPECIAL_KEYS = {
     { KeyEvent::KEYCODE_POWER, SpecialType::KEY_DOWN_ACTION },
     { KeyEvent::KEYCODE_VOLUME_DOWN, SpecialType::SPECIAL_ALL },
-    { KeyEvent::KEYCODE_VOLUME_UP, SpecialType::SUBSCRIBER_BEFORE_DELAY }
+    { KeyEvent::KEYCODE_VOLUME_UP, SpecialType::SPECIAL_ALL }
 };
 struct JsonParser {
     JsonParser() = default;
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 394b130045..9889c12236 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -675,7 +675,7 @@ int32_t InputWindowsManager::GetPointerStyle(int32_t pid, int32_t windowId, int3
     if (iter == it->second.end()) {
         MMI_HILOGW("The window id is invalid");
         pointerStyle = DEFAULT_POINTER_STYLE;
-        return COMMON_PARAMETER_ERROR ;
+        return RET_OK;
     }
     
     MMI_HILOGD("Window type:%{public}d get pointer style:%{public}d success", windowId, iter->second);
@@ -1240,4 +1240,4 @@ void InputWindowsManager::Dump(int32_t fd, const std::vector<std::string> &args)
     }
 }
 } // namespace MMI
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
-- 
Gitee


From 092f8907366e682d61700b79d00bc67780402352 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 6 Dec 2022 01:46:04 +0000
Subject: [PATCH 212/360] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8B=A6=E6=88=AAUT?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 frameworks/proxy/events/test/input_manager_test.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 795bcfe5dd..9669dd9576 100644
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -1999,6 +1999,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_010, TestSize.Level1)
     kitDown.SetKeyCode(KeyEvent::KEYCODE_VOLUME_DOWN);
     kitDown.SetPressed(true);
     kitDown.SetDownTime(downTime);
+    kitDown.SetDeviceId(1);
     injectDownEvent->SetKeyCode(KeyEvent::KEYCODE_VOLUME_DOWN);
     injectDownEvent->SetKeyAction(KeyEvent::KEY_ACTION_DOWN);
     injectDownEvent->AddPressedKeyItems(kitDown);
@@ -2044,6 +2045,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_011, TestSize.Level1)
     kitDown.SetKeyCode(KeyEvent::KEYCODE_SPACE);
     kitDown.SetPressed(true);
     kitDown.SetDownTime(downTime);
+    kitDown.SetDeviceId(1);
     injectDownEvent->SetKeyCode(KeyEvent::KEYCODE_SPACE);
     injectDownEvent->SetKeyAction(KeyEvent::KEY_ACTION_DOWN);
     injectDownEvent->AddPressedKeyItems(kitDown);
-- 
Gitee


From 3cb31cd07dea9af5b71e20964b9e902941e0fd32 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 6 Dec 2022 14:17:24 +0800
Subject: [PATCH 213/360] debug device info serialization problem

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ia6edb707da5bce18260b601f582a17af9d2acc00
---
 .../event_handler/src/input_device_impl.cpp   | 23 ++++++++++++-------
 .../proxy/module_loader/src/mmi_client.cpp    |  2 +-
 .../innerkits/event/include/input_device.h    | 14 +++++++++++
 service/module_loader/src/mmi_service.cpp     |  2 +-
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_device_impl.cpp b/frameworks/proxy/event_handler/src/input_device_impl.cpp
index ecf30d906c..4e9c150e41 100755
--- a/frameworks/proxy/event_handler/src/input_device_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_device_impl.cpp
@@ -15,6 +15,8 @@
 
 #include "input_device_impl.h"
 
+#include <algorithm>
+
 #include "mmi_log.h"
 #include "multimodal_event_handler.h"
 #include "multimodal_input_connect_manager.h"
@@ -46,14 +48,17 @@ int32_t InputDeviceImpl::RegisterDevListener(const std::string &type, InputDevLi
         MMI_HILOGE("Find change failed");
         return RET_ERR;
     }
-    for (const auto &item : iter->second) {
-        if (item == listener) {
-            MMI_HILOGW("The listener already exists");
-            return RET_ERR;
-        }
+    auto &listeners = iter->second;
+
+    if (std::all_of(listeners.cbegin(), listeners.cend(),
+                    [listener](InputDevListenerPtr tListener) {
+                        return (tListener != listener);
+                    })) {
+        MMI_HILOGI("Add device listener");
+        listeners.push_back(listener);
+    } else {
+        MMI_HILOGW("The listener already exists");
     }
-    auto monitor = listener;
-    iter->second.push_back(monitor);
     if (!isListeningProcess_) {
         MMI_HILOGI("Start monitoring");
         isListeningProcess_ = true;
@@ -285,7 +290,8 @@ std::shared_ptr<InputDevice> InputDeviceImpl::DevDataUnmarshalling(NetPacket &pk
     int32_t version;
     std::string phys;
     std::string uniq;
-    pkt >> deviceId >> name >> deviceType >> bus >> product >> vendor >> version >> phys >> uniq;
+    unsigned long caps;
+    pkt >> deviceId >> name >> deviceType >> bus >> product >> vendor >> version >> phys >> uniq >> caps;
     devData->SetId(deviceId);
     devData->SetName(name);
     devData->SetType(deviceType);
@@ -295,6 +301,7 @@ std::shared_ptr<InputDevice> InputDeviceImpl::DevDataUnmarshalling(NetPacket &pk
     devData->SetVersion(version);
     devData->SetPhys(phys);
     devData->SetUniq(uniq);
+    devData->SetCapabilities(caps);
 
     size_t size;
     pkt >> size;
diff --git a/frameworks/proxy/module_loader/src/mmi_client.cpp b/frameworks/proxy/module_loader/src/mmi_client.cpp
index 9f294c74dc..2dc5098825 100755
--- a/frameworks/proxy/module_loader/src/mmi_client.cpp
+++ b/frameworks/proxy/module_loader/src/mmi_client.cpp
@@ -261,7 +261,7 @@ int32_t MMIClient::Socket()
     int32_t ret = MultimodalInputConnMgr->AllocSocketPair(IMultimodalInputConnect::CONNECT_MODULE_TYPE_MMI_CLIENT);
     if (ret != RET_OK) {
         MMI_HILOGE("Call AllocSocketPair return %{public}d", ret);
-        return RET_ERR;
+        return IMultimodalInputConnect::INVALID_SOCKET_FD;
     }
     fd_ = MultimodalInputConnMgr->GetClientSocketFdOfAllocedSocketPair();
     if (fd_ == IMultimodalInputConnect::INVALID_SOCKET_FD) {
diff --git a/interfaces/native/innerkits/event/include/input_device.h b/interfaces/native/innerkits/event/include/input_device.h
index a84df83903..06f526e264 100644
--- a/interfaces/native/innerkits/event/include/input_device.h
+++ b/interfaces/native/innerkits/event/include/input_device.h
@@ -79,6 +79,8 @@ public:
     bool HasCapability(InputDeviceCapability cap) const;
     bool HasCapability(uint32_t deviceTags) const;
 
+    unsigned long GetCapabilities() const;
+    void SetCapabilities(unsigned long caps);
 
     class AxisInfo {
     public:
@@ -106,10 +108,12 @@ public:
         int32_t flat_ { 0 };
         int32_t resolution_ { 0 };
     };
+
     void AddAxisInfo(AxisInfo axis);
     std::vector<AxisInfo> GetAxisInfo();
     InputDevice(int32_t id, std::string name, int32_t deviceType, int32_t bus, int32_t version, int32_t product,
                 int32_t vendor, std::string phys, std::string uniq, std::vector<AxisInfo> axis);
+
 private:
     int32_t id_ { -1 };
     std::string name_ { "null" };
@@ -123,6 +127,16 @@ private:
     std::vector<AxisInfo> axis_;
     std::bitset<INPUT_DEV_CAP_MAX> capabilities_;
 };
+
+inline unsigned long InputDevice::GetCapabilities() const
+{
+    return capabilities_.to_ulong();
+}
+
+inline void InputDevice::SetCapabilities(unsigned long caps)
+{
+    capabilities_ = std::bitset<INPUT_DEV_CAP_MAX>(caps % (1 << INPUT_DEV_CAP_MAX));
+}
 } // namespace MMI
 } // namespace OHOS
 #endif // INPUT_DEVICE_H
\ No newline at end of file
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 5a96453448..0d371ce786 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -592,7 +592,7 @@ int32_t MMIService::OnGetDevice(int32_t pid, int32_t userData, int32_t deviceId)
     pkt << userData << inputDevice->GetId() << inputDevice->GetName() << inputDevice->GetType()
         << inputDevice->GetBus() << inputDevice->GetProduct() << inputDevice->GetVendor()
         << inputDevice->GetVersion() << inputDevice->GetPhys() << inputDevice->GetUniq()
-        << inputDevice->GetAxisInfo().size();
+        << inputDevice->GetCapabilities() << inputDevice->GetAxisInfo().size();
     for (auto &axis : inputDevice->GetAxisInfo()) {
         pkt << axis.GetAxisType() << axis.GetMinimum() << axis.GetMaximum()
             << axis.GetFuzz() << axis.GetFlat() << axis.GetResolution();
-- 
Gitee


From f530e19a382d8ed2dff074e32c0a875ff1e6980f Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 6 Dec 2022 19:31:11 +0800
Subject: [PATCH 214/360] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=81=E6=80=A7=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I845bcd567ded866582da3dac7fcc9c69df773b1b
---
 .../src/multimodal_input_connect_stub.cpp              | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 0004537ba4..fca9eabac5 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -152,11 +152,6 @@ int32_t MultimodalInputConnectStub::StubAddInputEventFilter(MessageParcel& data,
 int32_t MultimodalInputConnectStub::StubSetPointerVisible(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
-    if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
-        MMI_HILOGE("Permission check failed");
-        return CHECK_PERMISSION_FAIL;
-    }
-
     bool visible = false;
     READBOOL(data, visible, IPC_PROXY_DEAD_OBJECT_ERR);
     int32_t ret = SetPointerVisible(visible);
@@ -171,11 +166,6 @@ int32_t MultimodalInputConnectStub::StubSetPointerVisible(MessageParcel& data, M
 int32_t MultimodalInputConnectStub::StubIsPointerVisible(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
-    if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
-        MMI_HILOGE("Permission check failed");
-        return CHECK_PERMISSION_FAIL;
-    }
-
     bool visible = false;
     int32_t ret = IsPointerVisible(visible);
     if (ret != RET_OK) {
-- 
Gitee


From 7e5f7d6da2067668abcdfb5a24217bf370fdd3e4 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 7 Dec 2022 10:49:40 +0800
Subject: [PATCH 215/360] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E5=B8=83?=
 =?UTF-8?q?=E5=BC=8F=E7=A1=AC=E4=BB=B6=E5=AD=90=E7=B3=BB=E7=BB=9FDM?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=9A=84=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ifcd059241aca746f0ea5ac9941f41b6399761b47
---
 multimodalinput.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/multimodalinput.cfg b/multimodalinput.cfg
index 75181d7c16..53d4bd8b7e 100644
--- a/multimodalinput.cfg
+++ b/multimodalinput.cfg
@@ -25,7 +25,7 @@
             "path" : ["/system/bin/sa_main", "/system/profile/multimodalinput.xml"],
             "uid" : "input",
             "gid" : ["input"],
-            "permission" : ["ohos.permission.DISTRIBUTED_DATASYNC"],
+            "permission" : ["ohos.permission.DISTRIBUTED_DATASYNC", "ohos.permission.ACCESS_SERVICE_DM"],
             "start-mode" : "condition",
             "secon" : "u:r:multimodalinput:s0"
         }, {
-- 
Gitee


From edb92b430a02049f0e76feb65c46836b984e92ef Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Wed, 7 Dec 2022 07:44:52 +0000
Subject: [PATCH 216/360] Signed-off-by: mayunteng_1 <mayunteng@huawei.com>

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: I999e36d312ed2dcc08d9aff6c7347cf68fde4175
---
 .../src/injection_tools_help_func.cpp          |  7 +------
 tools/vuinput/src/virtual_device.cpp           | 18 +++++++++---------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/tools/event_inject/src/injection_tools_help_func.cpp b/tools/event_inject/src/injection_tools_help_func.cpp
index 363edb1434..dcdb9ed84e 100644
--- a/tools/event_inject/src/injection_tools_help_func.cpp
+++ b/tools/event_inject/src/injection_tools_help_func.cpp
@@ -142,12 +142,7 @@ bool InjectionToolsHelpFunc::JsonOption(int32_t argc, char **argv)
         std::cout<< "Wrong number of input parameters" << std::endl;
         return false;
     }
-    std::string jsonFile = argv[optind];
-    char realPath[PATH_MAX] = {};
-    if (realpath(jsonFile.c_str(), realPath) == nullptr) {
-        std::cout << "Json file path is error, path: " << jsonFile.c_str() << std::endl;
-        return false;
-    }
+    const std::string jsonFile = argv[optind];
     std::string jsonBuf = ReadJsonFile(jsonFile);
     if (jsonBuf.empty()) {
         return false;
diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index b361e3b0cf..266bafe007 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -580,10 +580,6 @@ bool VirtualDevice::AddDevice(const std::string& startDeviceName)
 
 bool VirtualDevice::CloseDevice(const std::string& closeDeviceName, const std::vector<std::string>& deviceList)
 {
-    if (BrowseDirectory(g_folderPath).size() == 0) {
-        std::cout << "No device to off" <<std::endl;
-        return false;
-    }
     if (deviceList.empty()) {
         RemoveDir(g_folderPath);
         std::cout << "No start device" <<std::endl;
@@ -696,11 +692,15 @@ bool VirtualDevice::SelectOptions(int32_t argc, char **argv, int32_t &opt)
 
 bool VirtualDevice::ListOption(int32_t argc, char **argv)
 {
-    std::vector<std::string> deviceList = BrowseDirectory(g_folderPath);
     if (argc != PARAMETERS_QUERY_NUMBER) {
-        std::cout << "Invalid Input Para, Please Check the validity of the para" << std::endl;
+        std::cout << "Invalid Input Param, Please Check the validity of the para" << std::endl;
         return false;
     }
+    std::vector<std::string> deviceList = BrowseDirectory(g_folderPath);
+    if (deviceList.empty()) {
+        std::cout << "No device information to query" << std::endl;
+        return true;
+    }
     std::string::size_type pos;
     std::cout << "PID\tDEVICE" << std::endl;
     for (const auto &item : deviceList) {
@@ -715,7 +715,7 @@ bool VirtualDevice::ListOption(int32_t argc, char **argv)
 bool VirtualDevice::StartOption(int32_t argc, char **argv)
 {
     if (argc != PARAMETERS_NUMBER) {
-        std::cout << "Invalid Input Para, Please Check the validity of the para" << std::endl;
+        std::cout << "Invalid Input Param, Please Check the validity of the para" << std::endl;
         return false;
     }
     if (!AddDevice(argv[optind])) {
@@ -732,7 +732,7 @@ bool VirtualDevice::CloseOption(int32_t argc, char **argv)
 {
     std::vector<std::string> deviceList = BrowseDirectory(g_folderPath);
     if (argc != PARAMETERS_NUMBER) {
-        std::cout << "Invalid Input Para, Please Check the validity of the para" << std::endl;
+        std::cout << "Invalid Input Param, Please Check the validity of the para" << std::endl;
         return false;
     }
     if (!CloseDevice(argv[optind], deviceList)) {
@@ -746,7 +746,7 @@ bool VirtualDevice::CloseOption(int32_t argc, char **argv)
 bool VirtualDevice::HelpOption(int32_t argc, char **argv)
 {
     if (argc != PARAMETERS_QUERY_NUMBER) {
-        std::cout << "Invalid Input Para, Please Check the validity of the para" << std::endl;
+        std::cout << "Invalid Input Param, Please Check the validity of the para" << std::endl;
         return false;
     }
     ShowUsage();
-- 
Gitee


From efe67fa36387e9ee4698928697134df89fee9682 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 8 Dec 2022 11:29:42 +0800
Subject: [PATCH 217/360] filter with priority

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 BUILD.gn                                      |   5 +-
 frameworks/proxy/BUILD.gn                     |  30 +-
 .../include/input_manager_impl.h              |   9 +-
 .../event_handler/src/input_manager_impl.cpp  |  82 ++-
 frameworks/proxy/events/src/input_manager.cpp |   9 +-
 .../test/input_manager_filter_manual_test.cpp | 595 ++++++++++++++++++
 .../events/test/input_manager_manual_test.cpp | 115 +---
 .../event/include/i_input_event_filter.h      |  36 ++
 .../innerkits/proxy/include/input_manager.h   |  14 +-
 .../include/i_multimodal_input_connect.h      |   5 +-
 .../multimodal_input_connect_manager.h        |   3 +-
 .../include/multimodal_input_connect_proxy.h  |   3 +-
 .../include/multimodal_input_connect_stub.h   |   1 +
 .../src/multimodal_input_connect_manager.cpp  |  14 +-
 .../src/multimodal_input_connect_proxy.cpp    |  27 +-
 .../src/multimodal_input_connect_stub.cpp     |  26 +-
 service/event_dump/src/event_dump.cpp         |  10 +-
 service/filter/include/event_filter_handler.h |  24 +-
 service/filter/include/event_filter_proxy.h   |   1 +
 service/filter/include/event_filter_service.h |  13 +-
 service/filter/include/event_filter_stub.h    |   1 +
 service/filter/include/i_event_filter.h       |   7 +-
 service/filter/src/event_filter_handler.cpp   | 123 +++-
 service/filter/src/event_filter_proxy.cpp     |  31 +
 service/filter/src/event_filter_service.cpp   |  23 +-
 service/filter/src/event_filter_stub.cpp      |  22 +
 .../include/server_msg_handler.h              |   3 +-
 .../message_handle/src/server_msg_handler.cpp |  13 +-
 service/module_loader/include/mmi_service.h   |   3 +-
 service/module_loader/src/mmi_service.cpp     |  28 +-
 service/module_loader/src/uds_server.cpp      |   1 +
 .../addinputeventfilter_fuzzer.cpp            |  34 +-
 util/common/include/error_multimodal.h        |   6 +-
 33 files changed, 1135 insertions(+), 182 deletions(-)
 create mode 100644 frameworks/proxy/events/test/input_manager_filter_manual_test.cpp
 create mode 100644 interfaces/native/innerkits/event/include/i_input_event_filter.h

diff --git a/BUILD.gn b/BUILD.gn
index 4c55b12668..1a3a23dde2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -130,7 +130,10 @@ group("ut_mmi_debug_tools") {
 
 group("mmi_tests_manual") {
   testonly = true
-  deps = [ "service:TransformPointTest" ]
+  deps = [
+    "frameworks/proxy:InputManagerFilterManualTest",
+    "service:TransformPointTest",
+  ]
 }
 
 group("mmi_tests") {
diff --git a/frameworks/proxy/BUILD.gn b/frameworks/proxy/BUILD.gn
index 342f90051f..0df900e2c6 100755
--- a/frameworks/proxy/BUILD.gn
+++ b/frameworks/proxy/BUILD.gn
@@ -233,10 +233,7 @@ ohos_unittest("InputManagerTest") {
 
 ohos_unittest("InputManagerManualTest") {
   module_out_path = module_output_path
-  include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "$root_out_dir/diff_libinput_mmi/export_include",
-  ]
+  include_dirs = [ "//commonlibrary/c_utils/base/include" ]
 
   defines = input_default_defines
 
@@ -259,6 +256,31 @@ ohos_unittest("InputManagerManualTest") {
   ]
 }
 
+ohos_unittest("InputManagerFilterManualTest") {
+  module_out_path = module_output_path
+  include_dirs = [ "//commonlibrary/c_utils/base/include" ]
+
+  defines = input_default_defines
+
+  sources = [ "events/test/input_manager_filter_manual_test.cpp" ]
+
+  configs = [ ":libmmi_test_util" ]
+
+  deps = [
+    "${mmi_path}/frameworks/proxy:libmmi-client",
+    "${mmi_path}/util:libmmi-util",
+    "//third_party/googletest:gmock_main",
+    "//third_party/googletest:gtest_main",
+  ]
+  external_deps = [
+    "access_token:libaccesstoken_sdk",
+    "access_token:libnativetoken",
+    "access_token:libtoken_setproc",
+    "hiviewdfx_hilog_native:libhilog",
+    "ipc:ipc_core",
+  ]
+}
+
 ohos_unittest("PointerEventTest") {
   module_out_path = module_output_path
   include_dirs = [ "$root_out_dir/diff_libinput_mmi/export_include" ]
diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index 88c324e09e..dd4534e588 100644
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -16,6 +16,7 @@
 #ifndef INPUT_MANAGER_IMPL_H
 #define INPUT_MANAGER_IMPL_H
 
+#include <list>
 #include <vector>
 
 #include "singleton.h"
@@ -52,7 +53,8 @@ public:
         std::function<void(std::shared_ptr<KeyEvent>)> callback
     );
     void UnsubscribeKeyEvent(int32_t subscriberId);
-    int32_t AddInputEventFilter(std::function<bool(std::shared_ptr<PointerEvent>)> filter);
+    int32_t AddInputEventFilter(std::shared_ptr<IInputEventFilter> filter, int32_t priority);
+    int32_t RemoveInputEventFilter(int32_t filterId);
 
     void SetWindowInputEventConsumer(std::shared_ptr<IInputEventConsumer> inputEventConsumer,
         std::shared_ptr<AppExecFwk::EventHandler> eventHandler);
@@ -120,6 +122,7 @@ private:
     int32_t PackDisplayInfo(NetPacket &pkt);
     void PrintDisplayInfo();
     void SendDisplayInfo();
+    void ReAddInputEventFilter();
 
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     void OnKeyEventTask(std::shared_ptr<IInputEventConsumer> consumer,
@@ -130,7 +133,7 @@ private:
         std::shared_ptr<PointerEvent> pointerEvent);
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 private:
-    sptr<EventFilterService> eventFilterService_ { nullptr };
+    std::map<int32_t, std::tuple<sptr<IEventFilter>, int32_t>> eventFilterServices_;
     std::shared_ptr<IInputEventConsumer> consumer_ { nullptr };
     std::vector<std::shared_ptr<IAnrObserver>> anrObservers_;
 
@@ -145,4 +148,4 @@ private:
 #define InputMgrImpl ::OHOS::Singleton<InputManagerImpl>::GetInstance()
 } // namespace MMI
 } // namespace OHOS
-#endif // INPUT_MANAGER_IMPL_H
\ No newline at end of file
+#endif // INPUT_MANAGER_IMPL_H
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 023b3bf866..8de8f60a44 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -31,6 +31,7 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputManagerImpl" };
+constexpr size_t MAX_FILTER_NUM = 4;
 } // namespace
 
 struct MonitorEventConsumer : public IInputEventConsumer {
@@ -97,33 +98,59 @@ void InputManagerImpl::UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInf
     PrintDisplayInfo();
 }
 
-int32_t InputManagerImpl::AddInputEventFilter(std::function<bool(std::shared_ptr<PointerEvent>)> filter)
+int32_t InputManagerImpl::AddInputEventFilter(std::shared_ptr<IInputEventFilter> filter, int32_t priority)
 {
     CALL_INFO_TRACE;
-#if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
     std::lock_guard<std::mutex> guard(mtx_);
-    bool hasSendToMmiServer = true;
-    if (eventFilterService_ == nullptr) {
-        hasSendToMmiServer = false;
-        eventFilterService_ = new (std::nothrow) EventFilterService();
-        CHKPR(eventFilterService_, RET_ERR);
+    CHKPR(filter, RET_ERR);
+    if (eventFilterServices_.size() >= MAX_FILTER_NUM) {
+        MMI_HILOGE("Too many filters, size:%{public}u", eventFilterServices_.size());
+        return RET_ERR;
+    }
+    sptr<IEventFilter> service = new (std::nothrow) EventFilterService(filter);
+    CHKPR(service, RET_ERR);
+    const int32_t filterId = EventFilterService::GetNextId();
+    int32_t ret = MultimodalInputConnMgr->AddInputEventFilter(service, filterId, priority);
+    if (ret != RET_OK) {
+        MMI_HILOGE("AddInputEventFilter has send to server failed, priority:%{public}d, ret:%{public}d", priority, ret);
+        service = nullptr;
+        return RET_ERR;
+    }
+    auto it =  eventFilterServices_.emplace(filterId, std::make_tuple(service, priority));
+    if (!it.second) {
+        MMI_HILOGW("Filter id duplicate");
     }
+    return filterId;
+}
 
-    eventFilterService_->SetPointerEventPtr(filter);
-    if (!hasSendToMmiServer) {
-        int32_t ret = MultimodalInputConnMgr->AddInputEventFilter(eventFilterService_);
-        if (ret != RET_OK) {
-            MMI_HILOGE("AddInputEventFilter has send to server failed, ret:%{public}d", ret);
-            eventFilterService_ = nullptr;
-            return RET_ERR;
-        }
+int32_t InputManagerImpl::RemoveInputEventFilter(int32_t filterId)
+{
+    CALL_INFO_TRACE;
+    std::lock_guard<std::mutex> guard(mtx_);
+    if (eventFilterServices_.empty()) {
+        MMI_HILOGE("Filters is empty, size:%{public}u", eventFilterServices_.size());
         return RET_OK;
     }
+    std::map<int32_t, std::tuple<sptr<IEventFilter>, int32_t>>::iterator it;
+    if (filterId != -1) {
+        it = eventFilterServices_.find(filterId);
+        if (it == eventFilterServices_.end()) {
+            MMI_HILOGE("Filter not found");
+            return RET_OK;
+        }
+    }
+    int32_t ret = MultimodalInputConnMgr->RemoveInputEventFilter(filterId);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Remove filter failed, filter id:%{public}d, ret:%{public}d", filterId, ret);
+        return RET_ERR;
+    }
+    if (filterId != -1) {
+        eventFilterServices_.erase(it);
+    } else {
+        eventFilterServices_.clear();
+    }
+    MMI_HILOGI("Filter remove success");
     return RET_OK;
-#else
-    MMI_HILOGW("Pointer and touchscreen device does not support");
-    return ERROR_UNSUPPORT;
-#endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 }
 
 void InputManagerImpl::SetWindowInputEventConsumer(std::shared_ptr<IInputEventConsumer> inputEventConsumer,
@@ -610,6 +637,7 @@ int32_t InputManagerImpl::GetPointerStyle(int32_t windowId, int32_t &pointerStyl
 void InputManagerImpl::OnConnected()
 {
     CALL_DEBUG_ENTER;
+    ReAddInputEventFilter();
     if (displayGroupInfo_.windowsInfo.empty() || displayGroupInfo_.displaysInfo.empty()) {
         MMI_HILOGI("The windows info or display info is empty");
         return;
@@ -639,6 +667,22 @@ void InputManagerImpl::SendDisplayInfo()
     }
 }
 
+void InputManagerImpl::ReAddInputEventFilter()
+{
+    CALL_INFO_TRACE;
+    if (eventFilterServices_.size() > MAX_FILTER_NUM) {
+        MMI_HILOGE("Too many filters, size:%{public}u", eventFilterServices_.size());
+        return;
+    }
+    for (const auto &[filterId, t] : eventFilterServices_) {
+        const auto &[service, priority] = t;
+        int32_t ret = MultimodalInputConnMgr->AddInputEventFilter(service, filterId, priority);
+        if (ret != RET_OK) {
+            MMI_HILOGE("AddInputEventFilter has send to server failed, filterId:%{public}d, priority:%{public}d, ret:%{public}d", filterId, priority, ret);
+        }
+    }
+}
+
 int32_t InputManagerImpl::RegisterDevListener(std::string type, std::shared_ptr<IInputDeviceListener> listener)
 {
     std::lock_guard<std::mutex> guard(mtx_);
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index 9dd7142db6..ee76bec563 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -37,9 +37,14 @@ void InputManager::UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo)
     InputMgrImpl.UpdateDisplayInfo(displayGroupInfo);
 }
 
-int32_t InputManager::AddInputEventFilter(std::function<bool(std::shared_ptr<PointerEvent>)> filter)
+int32_t InputManager::AddInputEventFilter(std::shared_ptr<IInputEventFilter> filter, int32_t priority)
 {
-    return InputMgrImpl.AddInputEventFilter(filter);
+    return InputMgrImpl.AddInputEventFilter(filter, priority);
+}
+
+int32_t InputManager::RemoveInputEventFilter(int32_t filterId)
+{
+    return InputMgrImpl.RemoveInputEventFilter(filterId);
 }
 
 void InputManager::SetWindowInputEventConsumer(std::shared_ptr<IInputEventConsumer> inputEventConsumer)
diff --git a/frameworks/proxy/events/test/input_manager_filter_manual_test.cpp b/frameworks/proxy/events/test/input_manager_filter_manual_test.cpp
new file mode 100644
index 0000000000..4023438616
--- /dev/null
+++ b/frameworks/proxy/events/test/input_manager_filter_manual_test.cpp
@@ -0,0 +1,595 @@
+/*
+ * Copyright (c) 2021-2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <csignal>
+#include <cstdio>
+#include <gtest/gtest.h>
+#include <iostream>
+#include <regex>
+#include <semaphore.h>
+#include <sstream>
+#include <sys/types.h>
+
+#include <cstdio>
+#include <set>
+#include <sstream>
+#include <iostream>
+#include <regex>
+
+#include "accesstoken_kit.h"
+#include "define_multimodal.h"
+#include "error_multimodal.h"
+#include "input_handler_manager.h"
+#include "input_manager.h"
+#include "multimodal_event_handler.h"
+#include "multimodal_event_handler.h"
+#include "nativetoken_kit.h"
+#include "pointer_event.h"
+#include "proto.h"
+#include "token_setproc.h"
+
+namespace OHOS {
+namespace MMI {
+using namespace Security::AccessToken;
+using Security::AccessToken::AccessTokenID;
+namespace {
+using namespace testing::ext;
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputManagerFilterManualTest" };
+static const int SIG_KILL = 9;
+
+HapInfoParams infoManagerTestInfoParms = {
+    .userID = 1,
+    .bundleName = "accesstoken_test",
+    .instIndex = 0,
+    .appIDDesc = "test"
+};
+
+PermissionDef infoManagerTestPermDef = {
+    .permissionName = "ohos.permission.test",
+    .bundleName = "accesstoken_test",
+    .grantMode = 1,
+    .availableLevel = APL_SYSTEM_CORE,
+    .label = "label",
+    .labelId = 1,
+    .description = "test filter",
+    .descriptionId = 1,
+};
+
+PermissionStateFull infoManagerTestState = {
+    .permissionName = "ohos.permission.test",
+    .isGeneral = true,
+    .resDeviceID = {"local"},
+    .grantStatus = {PermissionState::PERMISSION_GRANTED},
+    .grantFlags = {1},
+};
+
+HapPolicyParams infoManagerTestPolicyPrams = {
+    .apl = APL_SYSTEM_CORE,
+    .domain = "test.domain",
+    .permList = {infoManagerTestPermDef},
+    .permStateList = {infoManagerTestState}
+};
+} // namespace
+
+class AccessToken {
+public:
+    AccessToken()
+    {
+        currentID_ = GetSelfTokenID();
+        AccessTokenIDEx tokenIdEx = AccessTokenKit::AllocHapToken(infoManagerTestInfoParms, infoManagerTestPolicyPrams);
+        accessID_ = tokenIdEx.tokenIdExStruct.tokenID;
+        SetSelfTokenID(accessID_);
+    }
+    ~AccessToken()
+    {
+        AccessTokenKit::DeleteToken(accessID_);
+        SetSelfTokenID(currentID_);
+    }
+private:
+    AccessTokenID currentID_ = 0;
+    AccessTokenID accessID_ = 0;
+};
+
+class InputManagerFilterManualTest : public testing::Test {
+public:
+    static void SetUpTestCase(void) {}
+    static void TearDownTestCase(void) {}
+
+    void SetUp() {}
+    void TearDown() {}
+    pid_t GetMmiServerPid() const
+    {
+        const std::string mmiServerProcessName = "multimodalinput";
+        return GetProcessPidByName(mmiServerProcessName.c_str());
+    }
+    int32_t StopExecutable(pid_t pid) const
+    {
+        if (pid != INVALID_PID) {
+            MMI_HILOGI("Kill pid = %{public}d, before", pid);
+            kill(pid, SIG_KILL);
+            MMI_HILOGI("Kill pid = %{public}d, finished", pid);
+        }
+        return RET_OK;
+    }
+    pid_t GetProcessPidByName(const char* proc_name) const
+    {
+        FILE *fp;
+        char buf[100];
+        char cmd[200] = {'\0'};
+        pid_t pid = -1;
+        sprintf(cmd, "pidof %s", proc_name);
+        MMI_HILOGI("cmd:%{public}s", cmd);
+        if ((fp = popen(cmd, "r")) != NULL) {
+            if (fgets(buf, 255, fp) != NULL) {
+                pid = atoi(buf);
+            }
+        }
+        pclose(fp);
+        return pid;
+    }
+    int32_t GetSelfHidumperFilterNum() const
+    {
+        std::set<std::pair<std::string, std::string>> info;
+        auto ret = GetSelfHidumperFilter(info);
+        if (ret != RET_OK) {
+            return 0;
+        }
+        return info.size();
+    }
+    int32_t GetSelfHidumperFilter(std::set<std::pair<std::string, std::string>> &info) const
+    {
+        const char *cmd = "hidumper -s 3101 -a -f";
+        FILE *fp = popen(cmd, "r");
+        if (fp == NULL) {
+            MMI_HILOGE("Call popen fail, cmd:%{public}s", cmd);
+            return RET_ERR;
+        }
+        pid_t pid = getpid();
+        std::string strPid = std::to_string(pid);
+        MMI_HILOGE("Self pid:%{public}s", strPid.c_str());
+        std::regex itemRegex("priority:(\\d+) \\| filterId:(\\d+) \\| Pid:(\\d+)\r?\n?");
+        char *buf = NULL;
+        size_t bufLen = 0;
+        ssize_t nRead = 0;
+        while ((nRead = getline(&buf, &bufLen, fp)) != -1) {
+            std::string line(buf);
+            std::smatch match;
+            if (!std::regex_match(line, match, itemRegex)) {
+                MMI_HILOGI("Not match line:%{public}s", line.c_str());
+                continue;
+            }
+            MMI_HILOGI("Line match: %{public}s", line.c_str());
+            if (match.size() != 4) {
+                MMI_HILOGI("Check itemRegex,it is error");
+                continue;
+            }
+            std::string priority = match[1].str();
+            std::string filterId = match[2].str();
+            std::string pid = match[3].str();
+            if (pid != strPid) {
+                continue;
+            }
+            auto ret = info.emplace(std::make_pair(priority, filterId));
+            if (!ret.second) {
+                MMI_HILOGE("Duplicate priority:%{public}s,filterId:%{public}s,",
+                    priority.c_str(), filterId.c_str());
+            }
+            info.insert(std::make_pair(priority, filterId));
+        };
+        if (buf != nullptr) {
+            free(buf);
+            buf = nullptr;
+        }
+        if (fp != nullptr) {
+            pclose(fp);
+            fp = nullptr;
+        }
+        return RET_OK;
+    }
+};
+
+#if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
+/**
+ * @tc.name: HandlePointerEventFilter_001
+ * @tc.desc: Verify pointer event filter
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerFilterManualTest, HandlePointerEventFilter_001, TestSize.Level1)
+{
+    CALL_DEBUG_ENTER;
+    MMI_HILOGI("enter HandlePointerEventFilter_001");
+    struct PointerFilter : public IInputEventFilter {
+        const int32_t exceptX_;
+        const int32_t exceptY_;
+        sem_t &sem_;
+        bool &result_;
+        PointerFilter(int32_t exceptX, int32_t exceptY, sem_t &sem, bool &result)
+            : exceptX_(exceptX), exceptY_(exceptY), sem_(sem), result_(result) {}
+        virtual bool OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override { return false; }
+        bool OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override
+        {
+            MMI_HILOGD("Callback enter");
+            result_ = false;
+            do {
+                CHKPB(pointerEvent);
+                const std::vector<int32_t> ids = pointerEvent->GetPointerIds();
+                if (ids.empty()) {
+                    MMI_HILOGE("The ids is empty");
+                    break;
+                }
+                const int32_t firstPointerId = ids[0];
+                PointerEvent::PointerItem item;
+                if (!pointerEvent->GetPointerItem(firstPointerId, item)) {
+                    MMI_HILOGE("GetPointerItem:%{public}d fail", firstPointerId);
+                    break;
+                }
+                const int32_t x = item.GetDisplayX();
+                const int32_t y = item.GetDisplayY();
+                if (x == exceptX_ && y == exceptY_) {
+                    MMI_HILOGI("The values of X and y are both 10, which meets the expectation and callbackRet is set to 1");
+                    result_ = true;
+                    break;
+                }
+                MMI_HILOGI("The values of X and y are not 10, which meets the expectation and callbackRet is set to 2");
+            } while (0);
+            int ret = sem_post(&sem_);
+            EXPECT_EQ(ret, 0);
+            return result_;
+        }
+    };
+    AccessToken accessToken;
+    sem_t sem;
+    int ret = sem_init(&sem, 0, 0);
+    ASSERT_EQ(ret, 0);
+    bool result = false;
+    auto filter = std::make_shared<PointerFilter>(10, 10, sem, result);
+    const int32_t priority = 201;
+    const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, priority);
+    ASSERT_NE(filterId, -1);
+    ASSERT_EQ(GetSelfHidumperFilterNum(), 1);
+
+    auto simulate  = [](int32_t x, int32_t y) {
+        //MMI_HILOGI("SimulateInputEvent prepare, x:%{public}d, y:{public}d", x, y);
+        const int32_t pointerId = 0;
+        PointerEvent::PointerItem item;
+        item.SetPointerId(pointerId);
+        item.SetDisplayX(x);
+        item.SetDisplayY(y);
+        auto pointerEvent = PointerEvent::Create();
+        ASSERT_NE(pointerEvent, nullptr);
+        pointerEvent->AddPointerItem(item);
+        pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
+        pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
+        pointerEvent->SetPointerId(pointerId);
+        MMI_HILOGI("SimulateInputEvent begin");
+        InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
+        MMI_HILOGI("SimulateInputEvent finished");
+    };
+
+    auto waitEnd = [&sem]() {
+        struct timespec ts;
+        int ret = clock_gettime(CLOCK_REALTIME, &ts);
+        ASSERT_NE(ret, -1);
+        int32_t waitForSeconds = 3;
+        ts.tv_sec += waitForSeconds;
+        ret = sem_timedwait(&sem, &ts);
+        ASSERT_EQ(ret, 0);
+    };
+    // set physical x and physical y are 10, will expect value is 1
+    simulate(10, 10);
+    waitEnd();
+    ASSERT_EQ(result, true);
+    // set physical x and physical y are not 10, will expect value is 2
+    simulate(0, 0);
+    waitEnd();
+    ASSERT_EQ(result, false);
+    auto retCode = InputManager::GetInstance()->RemoveInputEventFilter(filterId);
+    ASSERT_EQ(retCode, RET_OK);
+    ASSERT_EQ(GetSelfHidumperFilterNum(), 0);
+}
+#endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
+
+#ifdef OHOS_BUILD_ENABLE_KEYBOARD
+/**
+ * @tc.name: HandlePointerEventFilter_002
+ * @tc.desc: Verify key event filter
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerFilterManualTest, HandleKeyEventFilter_002, TestSize.Level1)
+{
+    CALL_DEBUG_ENTER;
+    MMI_HILOGI("enter HandlePointerEventFilter_002");
+    struct KeyFilter : public IInputEventFilter {
+        const int32_t exceptKeyCode_;
+        sem_t &sem_;
+        bool &result_;
+        KeyFilter(int32_t exceptKeyCode, sem_t &sem, bool &result)
+            : exceptKeyCode_(exceptKeyCode), sem_(sem), result_(result) {}
+        bool OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override
+        {
+            MMI_HILOGI("KeyFilter::OnInputEvent enter, pid: %{public}d, exceptKeyCode:%{public}d", getpid(), exceptKeyCode_);
+            do {
+                result_ = false;
+                CHKPB(keyEvent);
+                auto keyCode = keyEvent->GetKeyCode();
+                MMI_HILOGI("KeyFilter::OnInputEvent receive keyCode: %{public}d return true", keyCode);
+                if (keyCode == exceptKeyCode_) {
+                    result_ = true;
+                    break;
+                }
+            } while(0);
+            int ret = sem_post(&sem_);
+            EXPECT_EQ(ret, 0);
+            return result_;
+        }
+        bool OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override { return false; }
+    };
+    AccessToken accessToken;
+    ASSERT_EQ(GetSelfHidumperFilterNum(), 0);
+
+    sem_t semA;
+    int ret = sem_init(&semA, 0, 0);
+    ASSERT_EQ(ret, 0);
+    bool resultA = false;
+    auto filterA = std::make_shared<KeyFilter>(KeyEvent::KEYCODE_A, semA, resultA);
+    const int32_t filterIdA = InputManager::GetInstance()->AddInputEventFilter(filterA, 220);
+    ASSERT_NE(filterIdA, RET_ERR);
+
+    sem_t semB;
+    ret = sem_init(&semB, 0, 0);
+    ASSERT_EQ(ret, 0);
+    bool resultB = false;
+    auto filterB = std::make_shared<KeyFilter>(KeyEvent::KEYCODE_B, semB, resultB);
+    const int32_t filterIdB = InputManager::GetInstance()->AddInputEventFilter(filterB, 210);
+    ASSERT_NE(filterIdB, RET_ERR);
+    ASSERT_EQ(GetSelfHidumperFilterNum(), 2);
+
+    auto waitEnd = [](sem_t &sem) {
+        struct timespec ts;
+        int ret = clock_gettime(CLOCK_REALTIME, &ts);
+        ASSERT_NE(ret, -1);
+        int32_t waitForSeconds = 5;
+        ts.tv_sec += waitForSeconds;
+        ret = sem_timedwait(&sem, &ts);
+        ASSERT_EQ(ret, 0);
+    };
+
+    resultA = false;
+    resultB = false;
+    auto keyAEvent = KeyEvent::Create();
+    ASSERT_NE(keyAEvent, nullptr);
+    keyAEvent->SetKeyCode(KeyEvent::KEYCODE_A);
+    MMI_HILOGI("SimulateInputEvent key event KEYCODE_A(2017)");
+    InputManager::GetInstance()->SimulateInputEvent(keyAEvent);
+    waitEnd(semA);
+    ASSERT_EQ(resultA, true);
+    ASSERT_EQ(resultB, false);
+
+    resultA = false;
+    resultB = false;
+    auto keyBEvent = KeyEvent::Create();
+    ASSERT_NE(keyAEvent, nullptr);
+    keyBEvent->SetKeyCode(KeyEvent::KEYCODE_B);
+    MMI_HILOGI("SimulateInputEvent key event KEYCODE_B(2018)");
+    InputManager::GetInstance()->SimulateInputEvent(keyBEvent);
+    waitEnd(semB);
+    ASSERT_EQ(resultA, false);
+    ASSERT_EQ(resultB, true);
+
+    auto retCode = InputManager::GetInstance()->RemoveInputEventFilter(filterIdA);
+    ASSERT_EQ(retCode, RET_OK);
+    ASSERT_EQ(GetSelfHidumperFilterNum(), 1);
+    retCode = InputManager::GetInstance()->RemoveInputEventFilter(filterIdB);
+    ASSERT_EQ(retCode, RET_OK);
+    ASSERT_EQ(GetSelfHidumperFilterNum(), 0);
+}
+
+/**
+ * @tc.name: HandlePointerEventFilter_002
+ * @tc.desc: Max filter number check
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerFilterManualTest, HandleKeyEventFilter_003, TestSize.Level1)
+{
+    CALL_DEBUG_ENTER;
+    MMI_HILOGI("enter HandlePointerEventFilter_003");
+    struct KeyFilter : public IInputEventFilter {
+        bool OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override
+        {
+            MMI_HILOGI("KeyFilter::OnInputEvent enter,pid: %{public}d", getpid());
+            return false;
+        }
+        bool OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override { return false; }
+    };
+    AccessToken accessToken;
+    auto addFilter = []() -> int32_t {
+        auto filter = std::make_shared<KeyFilter>();
+        const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220);
+        return filterId;
+    };
+    ASSERT_EQ(GetSelfHidumperFilterNum(), 0);
+    const size_t testMaxNum = 10;
+    const size_t singleClientSuportMaxNum = 4;
+    std::vector<int32_t> filterIds;
+    for (size_t i = 0; i < testMaxNum; ++i) {
+        const int32_t filterId = addFilter();
+        if (i < singleClientSuportMaxNum) {
+            ASSERT_NE(filterId, RET_ERR);
+            filterIds.push_back(filterId);
+        } else {
+            ASSERT_EQ(filterId, RET_ERR);
+        }
+    }
+    ASSERT_EQ(filterIds.size(), singleClientSuportMaxNum);
+    ASSERT_EQ(GetSelfHidumperFilterNum(), singleClientSuportMaxNum);
+
+    int32_t cnt = singleClientSuportMaxNum;
+    for (auto &filterId : filterIds) {
+        auto retCode = InputManager::GetInstance()->RemoveInputEventFilter(filterId);
+        ASSERT_EQ(retCode, RET_OK);
+        --cnt;
+        ASSERT_EQ(GetSelfHidumperFilterNum(), cnt);
+    }
+    ASSERT_EQ(GetSelfHidumperFilterNum(), 0);
+}
+
+/**
+ * @tc.name: HandlePointerEventFilter_004
+ * @tc.desc: Add filter but not remove filter, depend on process dead auto kill
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerFilterManualTest, DISABLED_HandleKeyEventFilter_004, TestSize.Level1)
+{
+    CALL_DEBUG_ENTER;
+    MMI_HILOGI("enter DISABLED_HandleKeyEventFilter_004");
+    struct KeyFilter : public IInputEventFilter {
+        bool OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override
+        {
+            MMI_HILOGI("KeyFilter::OnInputEvent enter,pid: %{public}d", getpid());
+            return false;
+        }
+        bool OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override { return false; }
+    };
+    AccessToken accessToken;
+    auto addFilter = []() -> int32_t {
+        auto filter = std::make_shared<KeyFilter>();
+        const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220);
+        return filterId;
+    };
+    const size_t singleClientSuportMaxNum = 4;
+    for (size_t i = 0; i < singleClientSuportMaxNum; ++i) {
+        const int32_t filterId = addFilter();
+        ASSERT_NE(filterId, RET_ERR);
+    }
+    ASSERT_EQ(GetSelfHidumperFilterNum(), singleClientSuportMaxNum);
+}
+
+/**
+ * @tc.name: HandlePointerEventFilter_005
+ * @tc.desc: Delete all filter of this process
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerFilterManualTest, HandleKeyEventFilter_005, TestSize.Level1)
+{
+    CALL_DEBUG_ENTER;
+    MMI_HILOGI("enter HandleKeyEventFilter_005");
+    struct KeyFilter : public IInputEventFilter {
+        bool OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override
+        {
+            MMI_HILOGI("KeyFilter::OnInputEvent enter,pid: %{public}d", getpid());
+            return false;
+        }
+        bool OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override { return false; }
+    };
+    AccessToken accessToken;
+    auto addFilter = []() -> int32_t {
+        auto filter = std::make_shared<KeyFilter>();
+        const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220);
+        return filterId;
+    };
+    ASSERT_EQ(GetSelfHidumperFilterNum(), 0);
+    const size_t singleClientSuportMaxNum = 4;
+    for (size_t i = 0; i < singleClientSuportMaxNum; ++i) {
+        const int32_t filterId = addFilter();
+        ASSERT_NE(filterId, RET_ERR);
+    }
+    ASSERT_EQ(GetSelfHidumperFilterNum(), singleClientSuportMaxNum);
+    auto ret = InputManager::GetInstance()->RemoveInputEventFilter(-1);
+    ASSERT_EQ(ret, RET_OK);
+    ASSERT_EQ(GetSelfHidumperFilterNum(), 0);
+}
+
+/**
+ * @tc.name: HandlePointerEventFilter_006
+ * @tc.desc: After add the filter, the mmi client does not exit the reset mmi server
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerFilterManualTest, HandleKeyEventFilter_006, TestSize.Level1)
+{
+    CALL_DEBUG_ENTER;
+    MMI_HILOGI("enter HandleKeyEventFilter_006");
+    struct KeyFilter : public IInputEventFilter {
+        bool OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override
+        {
+            MMI_HILOGI("KeyFilter::OnInputEvent enter,pid: %{public}d", getpid());
+            return false;
+        }
+        bool OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override { return false; }
+    };
+    AccessToken accessToken;
+    auto addFilter = []() -> int32_t {
+        auto filter = std::make_shared<KeyFilter>();
+        const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220);
+        return filterId;
+    };
+    const size_t singleClientSuportMaxNum = 4;
+    for (size_t i = 0; i < singleClientSuportMaxNum; ++i) {
+        const int32_t filterId = addFilter();
+        ASSERT_NE(filterId, RET_ERR);
+    }
+    pid_t serverPid1 = GetMmiServerPid();
+    ASSERT_NE(serverPid1, -1);
+    MMI_HILOGI("Origin serverPid1:%{public}d", serverPid1);
+    std::set<std::pair<std::string, std::string>> filterInfo1;
+    auto ret = GetSelfHidumperFilter(filterInfo1);
+    ASSERT_EQ(ret, RET_OK);
+    ret = StopExecutable(serverPid1);
+    ASSERT_EQ(ret, RET_OK);
+    pid_t serverPid2 = -1;
+    int32_t cnt = 20;
+    do {
+        MMI_HILOGI("Sleep 1s, wait mmi server started, cnt:%{public}d", cnt--);
+        sleep(1);
+        serverPid2 = GetMmiServerPid();
+        MMI_HILOGI("ServerPid2:%{public}d", serverPid2);
+    } while (serverPid2 == -1);
+    ASSERT_NE(serverPid2, -1);
+    sleep(1);
+    cnt = 20;
+    bool retInitClient = false;
+    do {
+        MMI_HILOGI("Sleep 1s, wait init client success cnt:%{public}d", cnt--);
+        sleep(1);
+        --cnt;
+        retInitClient = MMIEventHdl.InitClient();
+    } while (cnt > 0 && !retInitClient);
+    ASSERT_EQ(retInitClient, true);
+    std::set<std::pair<std::string, std::string>> filterInfo2;
+    cnt = 20;
+    do {
+        MMI_HILOGI("Sleep 1s, wait add filter finished, cnt:%{public}d", cnt--);
+        sleep(1);
+        filterInfo2.clear();
+        GetSelfHidumperFilter(filterInfo2);
+    } while (cnt > 0 && filterInfo1.size() != filterInfo2.size());
+    auto printFilter = [](const std::string title, const std::set<std::pair<std::string, std::string>> &s) {
+        MMI_HILOGI("title:%{public}s, size:%{public}u", title.c_str(), s.size());
+        for (const auto &[priority, filterId] : s) {
+            MMI_HILOGI("priority:%{public}s,filterId:%{pulbic}s", priority.c_str(), filterId.c_str());
+        }
+    };
+    printFilter("filterInfo1", filterInfo1);
+    printFilter("filterInfo2", filterInfo2);
+    ASSERT_TRUE(filterInfo1 == filterInfo2);
+}
+#endif // OHOS_BUILD_ENABLE_KEYBOARD
+} // namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/frameworks/proxy/events/test/input_manager_manual_test.cpp b/frameworks/proxy/events/test/input_manager_manual_test.cpp
index e2a86144ba..3363932772 100644
--- a/frameworks/proxy/events/test/input_manager_manual_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_manual_test.cpp
@@ -14,6 +14,7 @@
  */
 
 #include <gtest/gtest.h>
+#include <semaphore.h>
 
 #include "accesstoken_kit.h"
 #include "define_multimodal.h"
@@ -33,13 +34,12 @@ using Security::AccessToken::AccessTokenID;
 namespace {
 using namespace testing::ext;
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
-constexpr int32_t TIME_WAIT_FOR_OP = 500;
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputManagerManualTest" };
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 
 HapInfoParams infoManagerTestInfoParms = {
-    .bundleName = "accesstoken_test",
     .userID = 1,
+    .bundleName = "accesstoken_test",
     .instIndex = 0,
     .appIDDesc = "test"
 };
@@ -48,19 +48,19 @@ PermissionDef infoManagerTestPermDef = {
     .permissionName = "ohos.permission.test",
     .bundleName = "accesstoken_test",
     .grantMode = 1,
+    .availableLevel = APL_SYSTEM_CORE,
     .label = "label",
     .labelId = 1,
     .description = "test input event filter",
     .descriptionId = 1,
-    .availableLevel = APL_SYSTEM_CORE
 };
 
 PermissionStateFull infoManagerTestState = {
-    .grantFlags = {1},
-    .grantStatus = {PermissionState::PERMISSION_GRANTED},
-    .isGeneral = true,
     .permissionName = "ohos.permission.test",
-    .resDeviceID = {"local"}
+    .isGeneral = true,
+    .resDeviceID = {"local"},
+    .grantStatus = {PermissionState::PERMISSION_GRANTED},
+    .grantFlags = {1},
 };
 
 HapPolicyParams infoManagerTestPolicyPrams = {
@@ -95,97 +95,34 @@ public:
     static void SetUpTestCase(void) {}
     static void TearDownTestCase(void) {}
 
-    void SetUp();
+    void SetUp() {}
     void TearDown() {}
-
-protected:
-#if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
-    void AddInputEventFilter();
-    void SimulateInputEventHelper(int32_t physicalX, int32_t physicalY, int32_t expectVal);
-#endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
-private:
-    int32_t callbackRet = 0;
 };
 
-void InputManagerManualTest::SetUp()
-{
-    callbackRet = 0;
-}
-
-#if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
-void InputManagerManualTest::AddInputEventFilter()
-{
-    CALL_DEBUG_ENTER;
-    auto callback = [this](std::shared_ptr<PointerEvent> pointer) -> bool {
-        MMI_HILOGD("Callback enter");
-        CHKPF(pointer);
-        const std::vector<int32_t> ids = pointer->GetPointerIds();
-        if (ids.empty()) {
-            MMI_HILOGE("The ids is empty");
-            return false;
-        }
-
-        const int32_t firstPointerId = ids[0];
-        PointerEvent::PointerItem item;
-        if (!pointer->GetPointerItem(firstPointerId, item)) {
-            MMI_HILOGE("GetPointerItem:%{public}d fail", firstPointerId);
-            return false;
-        }
-
-        const int32_t x = item.GetDisplayX();
-        const int32_t y = item.GetDisplayY();
-        if (x == 10 && y == 10) {
-            MMI_HILOGI("The values of X and y are both 10, which meets the expectation and callbackRet is set to 1");
-            callbackRet = 1;
-            return false;
-        }
-
-        MMI_HILOGI("The values of X and y are not 10, which meets the expectation and callbackRet is set to 2");
-        callbackRet = 2;
-        return false;
-    };
-    AccessToken accessToken;
-    int32_t ret = InputManager::GetInstance()->AddInputEventFilter(callback);
-    ASSERT_EQ(ret, RET_OK);
-}
-
-void InputManagerManualTest::SimulateInputEventHelper(int32_t physicalX, int32_t physicalY, int32_t expectVal)
-{
-    CALL_DEBUG_ENTER;
-    const int32_t pointerId = 0;
-    PointerEvent::PointerItem item;
-    item.SetPointerId(pointerId);
-    item.SetDisplayX(physicalX);
-    item.SetDisplayY(physicalY);
-
-    auto pointerEvent = PointerEvent::Create();
-    ASSERT_NE(pointerEvent, nullptr);
-    pointerEvent->AddPointerItem(item);
-    pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_DOWN);
-    pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
-    pointerEvent->SetPointerId(pointerId);
-
-    MMI_HILOGI("Call InputManager::SimulateInputEvent");
-    InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
-    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
-    EXPECT_EQ(callbackRet, expectVal);
-}
-
+#ifdef OHOS_BUILD_ENABLE_KEYBOARD
 /**
- * @tc.name: HandlePointerEventFilter_001
- * @tc.desc: Verify pointer event filter
+ * @tc.name: HandlePointerEventFilter_002
+ * @tc.desc: Max filter number check
  * @tc.type: FUNC
  * @tc.require:
  */
-HWTEST_F(InputManagerManualTest, HandlePointerEventFilter_001, TestSize.Level1)
+HWTEST_F(InputManagerManualTest, HandleKeyEventFilter_003, TestSize.Level1)
 {
     CALL_DEBUG_ENTER;
-    AddInputEventFilter();
-    // set physical x and physical y are 10, will expect value is 1
-    SimulateInputEventHelper(10, 10, 1);
-    // set physical x and physical y are not 10, will expect value is 2
-    SimulateInputEventHelper(0, 0, 2);
+    struct KeyFilter : public IInputEventFilter {
+        bool OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override
+        {
+            MMI_HILOGI("KeyFilter::OnInputEvent enter,pid: %{public}d", getpid());
+            return false;
+        }
+        bool OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override { return false; }
+    };
+    AccessToken accessToken;auto filter = std::make_shared<KeyFilter>();
+    const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220);
+    ASSERT_NE(filterId, RET_ERR);
+    auto retCode = InputManager::GetInstance()->RemoveInputEventFilter(filterId);
+    ASSERT_EQ(retCode, RET_OK);
 }
-#endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
+#endif // OHOS_BUILD_ENABLE_KEYBOARD
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/interfaces/native/innerkits/event/include/i_input_event_filter.h b/interfaces/native/innerkits/event/include/i_input_event_filter.h
new file mode 100644
index 0000000000..fb00fc227f
--- /dev/null
+++ b/interfaces/native/innerkits/event/include/i_input_event_filter.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021-2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef I_INPUT_EVENT_FILTER_H
+#define I_INPUT_EVENT_FILTER_H
+
+#include <memory>
+
+#include "axis_event.h"
+#include "key_event.h"
+#include "pointer_event.h"
+
+namespace OHOS {
+namespace MMI {
+struct IInputEventFilter {
+public:
+    IInputEventFilter() = default;
+    virtual ~IInputEventFilter() = default;
+    virtual bool OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const = 0;
+    virtual bool OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const = 0;
+};
+} // namespace MMI
+} // namespace OHOS
+#endif // I_INPUT_EVENT_FILTER_H
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index 6c79506feb..3c3bc81c02 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -30,6 +30,7 @@
 #include "i_input_device_listener.h"
 #include "i_input_device_cooperate_listener.h"
 #include "i_input_event_consumer.h"
+#include "i_input_event_filter.h"
 #include "input_device.h"
 #include "key_option.h"
 
@@ -52,17 +53,8 @@ public:
      */
     void UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo);
 
-    /**
-     * @brief Sets a globally unique input event filter.
-     * @param filter Indicates the input event filter to set. When an input event occurs, this filter is
-     * called and returns a value indicating whether to continue processing the input event.If the filter
-     * returns <b>true</b>, the processing of the input event ends. If the filter returns <b>false</b>,
-     * the processing of the input event continues.
-     * @return return Returns a value greater than or equal to <b>0</b> if the input event filter is added
-     * successfully; returns a value less than <b>0</b> otherwise.
-     * @since 9
-     */
-    int32_t AddInputEventFilter(std::function<bool(std::shared_ptr<PointerEvent>)> filter);
+    int32_t AddInputEventFilter(std::shared_ptr<IInputEventFilter> filter, int32_t priority);
+    int32_t RemoveInputEventFilter(int32_t filterId);
 
     /**
      * @brief Sets a consumer for the window input event of the current process.
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
index 75471ca727..cc8cf37fe0 100644
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -19,6 +19,7 @@
 #include "iremote_broker.h"
 
 #include "i_event_filter.h"
+#include "i_input_event_filter.h"
 #include "input_handler_type.h"
 #include "key_event.h"
 #include "key_option.h"
@@ -54,6 +55,7 @@ public:
         GET_POINTER_STYLE = 24,
         SET_FUNCTION_KEY_STATE = 25,
         GET_FUNCTION_KEY_STATE = 26,
+        RMV_INPUT_EVENT_FILTER = 27,
         REGISTER_COOPERATE_MONITOR = 30,
         UNREGISTER_COOPERATE_MONITOR = 31,
         ENABLE_INPUT_DEVICE_COOPERATE = 32,
@@ -72,7 +74,8 @@ public:
 
     virtual int32_t AllocSocketFd(const std::string &programName, const int32_t moduleType,
         int32_t &socketFd, int32_t &tokenType) = 0;
-    virtual int32_t AddInputEventFilter(sptr<IEventFilter> filter) = 0;
+    virtual int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority) = 0;
+    virtual int32_t RemoveInputEventFilter(int32_t filterId) = 0;
     virtual int32_t SetPointerVisible(bool visible) = 0;
     virtual int32_t IsPointerVisible(bool &visible) = 0;
     virtual int32_t SetPointerSpeed(int32_t speed) = 0;
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
index 70526ccd50..ffc03f5837 100644
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -37,7 +37,8 @@ public:
     {
         return tokenType_;
     }
-    int32_t AddInputEventFilter(sptr<IEventFilter> filter);
+    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority);
+    int32_t RemoveInputEventFilter(int32_t filterId);
     int32_t SetPointerVisible(bool visible);
     int32_t IsPointerVisible(bool &visible);
     int32_t SetPointerSpeed(int32_t speed);
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
index 213a8f2072..c84b7923a4 100644
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -32,7 +32,8 @@ public:
     ~MultimodalInputConnectProxy() override = default;
     int32_t AllocSocketFd(const std::string &programName, const int32_t moduleType,
         int32_t &socketFd, int32_t &tokenType) override;
-    int32_t AddInputEventFilter(sptr<IEventFilter> filter) override;
+    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority) override;
+    int32_t RemoveInputEventFilter(int32_t filterId) override;
     int32_t SetPointerVisible(bool visible) override;
     int32_t IsPointerVisible(bool &visible) override;
     int32_t SetPointerSpeed(int32_t speed) override;
diff --git a/service/connect_manager/include/multimodal_input_connect_stub.h b/service/connect_manager/include/multimodal_input_connect_stub.h
index 3c09974f97..d796cfbda1 100644
--- a/service/connect_manager/include/multimodal_input_connect_stub.h
+++ b/service/connect_manager/include/multimodal_input_connect_stub.h
@@ -39,6 +39,7 @@ public:
 protected:
     int32_t StubHandleAllocSocketFd(MessageParcel &data, MessageParcel &reply);
     int32_t StubAddInputEventFilter(MessageParcel& data, MessageParcel& reply);
+    int32_t StubRemoveInputEventFilter(MessageParcel& data, MessageParcel& reply);
     int32_t StubSetPointerVisible(MessageParcel& data, MessageParcel& reply);
     int32_t StubSetPointerStyle(MessageParcel& data, MessageParcel& reply);
     int32_t StubGetPointerStyle(MessageParcel& data, MessageParcel& reply);
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
index 6459036506..0fc88aa29b 100644
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -73,14 +73,24 @@ int32_t MultimodalInputConnectManager::GetClientSocketFdOfAllocedSocketPair() co
     return socketFd_;
 }
 
-int32_t MultimodalInputConnectManager::AddInputEventFilter(sptr<IEventFilter> filter)
+int32_t MultimodalInputConnectManager::AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority)
 {
     std::lock_guard<std::mutex> guard(lock_);
     if (multimodalInputConnectService_ == nullptr) {
         MMI_HILOGE("The multimodalInputConnectService_ is nullptr");
         return RET_ERR;
     }
-    return multimodalInputConnectService_->AddInputEventFilter(filter);
+    return multimodalInputConnectService_->AddInputEventFilter(filter, filterId, priority);
+}
+
+int32_t MultimodalInputConnectManager::RemoveInputEventFilter(int32_t filterId)
+{
+    std::lock_guard<std::mutex> guard(lock_);
+    if (multimodalInputConnectService_ == nullptr) {
+        MMI_HILOGE("The multimodalInputConnectService_ is nullptr");
+        return RET_ERR;
+    }
+    return multimodalInputConnectService_->RemoveInputEventFilter(filterId);    
 }
 
 int32_t MultimodalInputConnectManager::SetPointerVisible(bool visible)
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index e5d1c64d5e..4d4cac6067 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -70,7 +70,7 @@ int32_t MultimodalInputConnectProxy::AllocSocketFd(const std::string &programNam
     return RET_OK;
 }
 
-int32_t MultimodalInputConnectProxy::AddInputEventFilter(sptr<IEventFilter> filter)
+int32_t MultimodalInputConnectProxy::AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -78,12 +78,12 @@ int32_t MultimodalInputConnectProxy::AddInputEventFilter(sptr<IEventFilter> filt
         MMI_HILOGE("Failed to write descriptor");
         return ERR_INVALID_VALUE;
     }
-
     if (!data.WriteRemoteObject(filter->AsObject().GetRefPtr())) {
         MMI_HILOGE("Failed to write filter");
         return ERR_INVALID_VALUE;
     }
-
+    WRITEINT32(data, filterId, ERR_INVALID_VALUE);
+    WRITEINT32(data, priority, ERR_INVALID_VALUE);
     MessageParcel reply;
     MessageOption option;
     sptr<IRemoteObject> remote = Remote();
@@ -96,6 +96,27 @@ int32_t MultimodalInputConnectProxy::AddInputEventFilter(sptr<IEventFilter> filt
     return RET_OK;
 }
 
+int32_t MultimodalInputConnectProxy::RemoveInputEventFilter(int32_t filterId)
+{
+    CALL_DEBUG_ENTER;
+    MessageParcel data;
+    if (!data.WriteInterfaceToken(MultimodalInputConnectProxy::GetDescriptor())) {
+        MMI_HILOGE("Failed to write descriptor");
+        return ERR_INVALID_VALUE;
+    }
+    WRITEINT32(data, filterId, ERR_INVALID_VALUE);
+    MessageParcel reply;
+    MessageOption option;
+    sptr<IRemoteObject> remote = Remote();
+    CHKPR(remote, RET_ERR);
+    int32_t ret = remote->SendRequest(RMV_INPUT_EVENT_FILTER, data, reply, option);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Send request message failed, ret:%{public}d", ret);
+        return ret;
+    }
+    return RET_OK;
+}
+
 int32_t MultimodalInputConnectProxy::SetPointerVisible(bool visible)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index fca9eabac5..2c1f77f2be 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -49,6 +49,7 @@ int32_t MultimodalInputConnectStub::OnRemoteRequest(uint32_t code, MessageParcel
     const static std::map<int32_t, ConnFunc> mapConnFunc = {
         {IMultimodalInputConnect::ALLOC_SOCKET_FD, &MultimodalInputConnectStub::StubHandleAllocSocketFd},
         {IMultimodalInputConnect::ADD_INPUT_EVENT_FILTER, &MultimodalInputConnectStub::StubAddInputEventFilter},
+        {IMultimodalInputConnect::RMV_INPUT_EVENT_FILTER, &MultimodalInputConnectStub::StubRemoveInputEventFilter},
         {IMultimodalInputConnect::SET_POINTER_VISIBLE, &MultimodalInputConnectStub::StubSetPointerVisible},
         {IMultimodalInputConnect::SET_POINTER_STYLE, &MultimodalInputConnectStub::StubSetPointerStyle},
         {IMultimodalInputConnect::GET_POINTER_STYLE, &MultimodalInputConnectStub::StubGetPointerStyle},
@@ -139,8 +140,11 @@ int32_t MultimodalInputConnectStub::StubAddInputEventFilter(MessageParcel& data,
     CHKPR(client, ERR_INVALID_VALUE);
     sptr<IEventFilter> filter = iface_cast<IEventFilter>(client);
     CHKPR(filter, ERROR_NULL_POINTER);
-
-    int32_t ret = AddInputEventFilter(filter);
+    int32_t filterId = -1;
+    READINT32(data, filterId, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t priority = 0;
+    READINT32(data, priority, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = AddInputEventFilter(filter, filterId, priority);
     if (ret != RET_OK) {
         MMI_HILOGE("Call AddInputEventFilter failed ret:%{public}d", ret);
         return ret;
@@ -149,6 +153,24 @@ int32_t MultimodalInputConnectStub::StubAddInputEventFilter(MessageParcel& data,
     return RET_OK;
 }
 
+int32_t MultimodalInputConnectStub::StubRemoveInputEventFilter(MessageParcel& data, MessageParcel& reply)
+{
+    CALL_DEBUG_ENTER;
+    if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_CORE)) {
+        MMI_HILOGE("Permission check failed");
+        return CHECK_PERMISSION_FAIL;
+    }
+    int32_t filterId = -1;
+    READINT32(data, filterId, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = RemoveInputEventFilter(filterId);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Call RemoveInputEventFilter failed ret:%{public}d", ret);
+        return ret;
+    }
+    MMI_HILOGD("Success pid:%{public}d", GetCallingPid());
+    return RET_OK;
+}
+
 int32_t MultimodalInputConnectStub::StubSetPointerVisible(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/event_dump/src/event_dump.cpp b/service/event_dump/src/event_dump.cpp
index b6fb50e3c9..92f50e60a0 100644
--- a/service/event_dump/src/event_dump.cpp
+++ b/service/event_dump/src/event_dump.cpp
@@ -86,6 +86,7 @@ void EventDump::ParseCommand(int32_t fd, const std::vector<std::string> &args)
         {"subscriber", no_argument, 0, 's'},
         {"monitor", no_argument, 0, 'o'},
         {"interceptor", no_argument, 0, 'i'},
+        {"filter", no_argument, 0, 'f'},
         {"mouse", no_argument, 0, 'm'},
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
         {"inputdevcoosm", no_argument, 0, 'k'},
@@ -116,7 +117,7 @@ void EventDump::ParseCommand(int32_t fd, const std::vector<std::string> &args)
     }
     optind = 1;
     int32_t c;
-    while ((c = getopt_long (args.size(), argv, "hdlwusoimc", dumpOptions, &optionIndex)) != -1) {
+    while ((c = getopt_long (args.size(), argv, "hdlwusoifmc", dumpOptions, &optionIndex)) != -1) {
         switch (c) {
             case 'h': {
                 DumpEventHelp(fd, args);
@@ -178,6 +179,12 @@ void EventDump::ParseCommand(int32_t fd, const std::vector<std::string> &args)
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
                 break;
             }
+            case 'f': {
+                auto filterHandler = InputHandler->GetFilterHandler();
+                CHKPV(filterHandler);
+                filterHandler->Dump(fd, args);
+                break;
+            }
             case 'm': {
 #ifdef OHOS_BUILD_ENABLE_POINTER
                 MouseEventHdr->Dump(fd, args);
@@ -218,6 +225,7 @@ void EventDump::DumpHelp(int32_t fd)
     mprintf(fd, "      -o, --monitor: dump the monitor information\t");
     mprintf(fd, "      -s, --subscriber: dump the subscriber information\t");
     mprintf(fd, "      -i, --interceptor: dump the interceptor information\t");
+    mprintf(fd, "      -f, --filter: dump the filter information\t");
     mprintf(fd, "      -m, --mouse: dump the mouse information\t");
     mprintf(fd, "      -c, --dump Keyboard and mouse crossing information\t");
 }
diff --git a/service/filter/include/event_filter_handler.h b/service/filter/include/event_filter_handler.h
index db607470f3..b2ee27a7d2 100644
--- a/service/filter/include/event_filter_handler.h
+++ b/service/filter/include/event_filter_handler.h
@@ -16,15 +16,19 @@
 #ifndef EVENT_FILTER_HANDLER_H
 #define EVENT_FILTER_HANDLER_H
 
+#include <memory>
 #include <mutex>
+#include <queue>
+
 #include "nocopyable.h"
 
+#include "event_filter_death_recipient.h"
 #include "i_event_filter.h"
 #include "i_input_event_handler.h"
 
 namespace OHOS {
 namespace MMI {
-class EventFilterHandler final : public IInputEventHandler {
+class EventFilterHandler final : public IInputEventHandler, public std::enable_shared_from_this<EventFilterHandler> {
 public:
     EventFilterHandler() = default;
     DISALLOW_COPY_AND_MOVE(EventFilterHandler);
@@ -38,11 +42,23 @@ public:
 #ifdef OHOS_BUILD_ENABLE_TOUCH
     void HandleTouchEvent(const std::shared_ptr<PointerEvent> pointerEvent) override;
 #endif // OHOS_BUILD_ENABLE_TOUCH
-    int32_t AddInputEventFilter(sptr<IEventFilter> filter);
-    bool HandlePointerEventFilter(std::shared_ptr<PointerEvent> point);
+    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority, int32_t clientPid);
+    int32_t RemoveInputEventFilter(int32_t filterId, int32_t clientPid);
+    void Dump(int32_t fd, const std::vector<std::string> &args);
+    bool HandleKeyEventFilter(std::shared_ptr<KeyEvent> event);
+    bool HandlePointerEventFilter(std::shared_ptr<PointerEvent> event);
 private:
     std::mutex lockFilter_;
-    sptr<IEventFilter> filter_ {nullptr};
+    struct FilterInfo
+    {
+        const sptr<IEventFilter> filter;
+        sptr<IRemoteObject::DeathRecipient> deathRecipient { nullptr };
+        const int32_t filterId;
+        const int32_t priority;
+        const int32_t clientPid;
+        bool IsSameClient(int32_t id, int32_t pid) const { return ((filterId == id) && (clientPid == pid)); }
+    };
+    std::list<FilterInfo> filters_;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/filter/include/event_filter_proxy.h b/service/filter/include/event_filter_proxy.h
index 095d4d891b..c76504f10a 100644
--- a/service/filter/include/event_filter_proxy.h
+++ b/service/filter/include/event_filter_proxy.h
@@ -29,6 +29,7 @@ public:
     explicit EventFilterProxy(const sptr<IRemoteObject> &impl);
     DISALLOW_COPY_AND_MOVE(EventFilterProxy);
     ~EventFilterProxy() override = default;
+    bool HandleKeyEvent(const std::shared_ptr<KeyEvent> event) override;
     bool HandlePointerEvent(const std::shared_ptr<PointerEvent> event) override;
 private:
     static inline BrokerDelegator<EventFilterProxy> delegator_;
diff --git a/service/filter/include/event_filter_service.h b/service/filter/include/event_filter_service.h
index 974a53685f..3afad86219 100644
--- a/service/filter/include/event_filter_service.h
+++ b/service/filter/include/event_filter_service.h
@@ -16,25 +16,28 @@
 #ifndef EVENT_FILTER_SERVICE_H
 #define EVENT_FILTER_SERVICE_H
 
+#include <list>
+
 #include "iremote_object.h"
 #include "nocopyable.h"
 
+#include "i_input_event_filter.h"
 #include "event_filter_stub.h"
 
-
 namespace OHOS {
 namespace MMI {
 enum class ServiceRunningState { STATE_NOT_START, STATE_RUNNING };
 class EventFilterService final : public EventFilterStub {
 public:
-    EventFilterService() = default;
+    static int32_t GetNextId();
+    EventFilterService(std::shared_ptr<IInputEventFilter> filter) : filter_(filter) {}
     DISALLOW_COPY_AND_MOVE(EventFilterService);
     ~EventFilterService() override = default;
+    bool HandleKeyEvent(const std::shared_ptr<KeyEvent> event) override;
     bool HandlePointerEvent(const std::shared_ptr<PointerEvent> event) override;
-    void SetPointerEventPtr(std::function<bool(std::shared_ptr<PointerEvent>)> pointerFilter);
-
 private:
-    std::function<bool(std::shared_ptr<PointerEvent>)> pointerFilter_ { nullptr };
+    const std::shared_ptr<IInputEventFilter> filter_;
+    static inline int32_t filterIdSeed_ = 0;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/filter/include/event_filter_stub.h b/service/filter/include/event_filter_stub.h
index b75f436bb4..4ed4584953 100644
--- a/service/filter/include/event_filter_stub.h
+++ b/service/filter/include/event_filter_stub.h
@@ -32,6 +32,7 @@ public:
     virtual ~EventFilterStub() = default;
     int32_t OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& options) override;
 protected:
+    int32_t StubHandleKeyEvent(MessageParcel& data, MessageParcel& reply);
     int32_t StubHandlePointerEvent(MessageParcel& data, MessageParcel& reply);
 };
 } // namespace MMI
diff --git a/service/filter/include/i_event_filter.h b/service/filter/include/i_event_filter.h
index 123c66cc5b..306f82f377 100644
--- a/service/filter/include/i_event_filter.h
+++ b/service/filter/include/i_event_filter.h
@@ -18,6 +18,8 @@
 
 #include "iremote_broker.h"
 
+#include "i_input_event_filter.h"
+#include "key_event.h"
 #include "pointer_event.h"
 
 namespace OHOS {
@@ -25,10 +27,11 @@ namespace MMI {
 class IEventFilter : public IRemoteBroker {
 public:
     DECLARE_INTERFACE_DESCRIPTOR(u"ohos.multimodalinput.IEventFilter");
+    virtual bool HandleKeyEvent(const std::shared_ptr<KeyEvent> event) = 0;
     virtual bool HandlePointerEvent(const std::shared_ptr<PointerEvent> event) = 0;
-
     enum class OPERATOR_TYPE {
-        HANDLE_POINTER_EVENT = 0,
+        HANDLE_KEY_EVENT = 0,
+        HANDLE_POINTER_EVENT = 1,
     };
 };
 } // namespace MMI
diff --git a/service/filter/src/event_filter_handler.cpp b/service/filter/src/event_filter_handler.cpp
index 7348b084a5..8ef91517fb 100644
--- a/service/filter/src/event_filter_handler.cpp
+++ b/service/filter/src/event_filter_handler.cpp
@@ -29,6 +29,10 @@ void EventFilterHandler::HandleKeyEvent(const std::shared_ptr<KeyEvent> keyEvent
 {
     CALL_DEBUG_ENTER;
     CHKPV(keyEvent);
+    if (HandleKeyEventFilter(keyEvent)) {
+        MMI_HILOGD("Key event is filtered");
+        return;
+    }
     CHKPV(nextHandler_);
     nextHandler_->HandleKeyEvent(keyEvent);
 }
@@ -39,7 +43,7 @@ void EventFilterHandler::HandlePointerEvent(const std::shared_ptr<PointerEvent>
 {
     CHKPV(pointerEvent);
     if (HandlePointerEventFilter(pointerEvent)) {
-        MMI_HILOGI("Pointer event Filter succeeded");
+        MMI_HILOGD("Pointer event is filtered");
         return;
     }
     CHKPV(nextHandler_);
@@ -52,7 +56,7 @@ void EventFilterHandler::HandleTouchEvent(const std::shared_ptr<PointerEvent> po
 {
     CHKPV(pointerEvent);
     if (HandlePointerEventFilter(pointerEvent)) {
-        MMI_HILOGI("Pointer event Filter succeeded");
+        MMI_HILOGD("Touch event is filtered");
         return;
     }
     CHKPV(nextHandler_);
@@ -60,26 +64,123 @@ void EventFilterHandler::HandleTouchEvent(const std::shared_ptr<PointerEvent> po
 }
 #endif // OHOS_BUILD_ENABLE_TOUCH
 
-int32_t EventFilterHandler::AddInputEventFilter(sptr<IEventFilter> filter)
+int32_t EventFilterHandler::AddInputEventFilter(sptr<IEventFilter> filter,
+    int32_t filterId, int32_t priority, int32_t clientPid)
+{
+    CALL_INFO_TRACE;
+    std::lock_guard<std::mutex> guard(lockFilter_);
+    CHKPR(filter, ERROR_NULL_POINTER);
+    MMI_HILOGI("Add filter,filterId:%{public}d,priority:%{public}d,clientPid:%{public}d,filters_ size:%{public}u",
+        filterId, priority, clientPid, filters_.size());
+    
+    std::weak_ptr<EventFilterHandler> weakPtr = shared_from_this();
+    auto deathCallback = [weakPtr, filterId, clientPid](const wptr<IRemoteObject> &object) {
+        auto sharedPtr = weakPtr.lock();
+        if (sharedPtr != nullptr) {
+            auto ret = sharedPtr->RemoveInputEventFilter(filterId, clientPid);
+            if (ret != RET_OK) {
+                MMI_HILOGW("Remove filter on dead return:%{public}d, filterId:%{public}d,clientPid:%{public}d",
+                    ret, filterId, clientPid);
+            } else {
+                MMI_HILOGW("Remove filter on dead success, filterId:%{public}d,clientPid:%{public}d",
+                    filterId, clientPid);
+            }
+        }
+    };
+    sptr<IRemoteObject::DeathRecipient> deathRecipient = new (std::nothrow) EventFilterDeathRecipient(deathCallback);
+    CHKPR(deathRecipient, RET_ERR);
+    filter->AsObject()->AddDeathRecipient(deathRecipient);
+    
+    FilterInfo info { .filter = filter, .deathRecipient = deathRecipient,
+        .filterId = filterId, .priority = priority, .clientPid = clientPid };
+    auto it = filters_.cbegin();
+    for (; it != filters_.cend(); ++it) {
+        if (info.priority < it->priority) {
+            break;
+        }
+    }
+    auto it2 = filters_.emplace(it, std::move(info));
+    if (it2 == filters_.end()) {
+        MMI_HILOGE("Fail to add filter");
+        return ERROR_FILTER_ADD_FAIL;
+    }
+    return RET_OK;
+}
+
+int32_t EventFilterHandler::RemoveInputEventFilter(int32_t filterId, int32_t clientPid)
 {
     CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(lockFilter_);
-    filter_ = filter;
+    if (filters_.empty()) {
+        MMI_HILOGI("Filter is empty");
+        return RET_OK;
+    }
+    for (auto it = filters_.begin(); it != filters_.end();) {
+        if (filterId == -1) {
+            if (it->clientPid == clientPid) {
+                auto id = it->filterId;
+                filters_.erase(it++);
+                MMI_HILOGI("Filter remove success, filterId:%{public}d,clientPid:%{public}d", id, clientPid);
+                continue;
+            }
+            ++it;
+            continue;
+        }
+        if (it->IsSameClient(filterId, clientPid)) {
+            filters_.erase(it++);
+            MMI_HILOGI("Filter remove success, filterId:%{public}d,clientPid:%{public}d", filterId, clientPid);
+            return RET_OK;
+        }
+        ++it;
+    }
+    if (filterId == -1) {
+        return RET_OK;
+    }
+    MMI_HILOGI("Filter not found, filterId:%{public}d,clientPid:%{public}d", filterId, clientPid);
     return RET_OK;
 }
 
-bool EventFilterHandler::HandlePointerEventFilter(std::shared_ptr<PointerEvent> point)
+void EventFilterHandler::Dump(int32_t fd, const std::vector<std::string> &args)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(lockFilter_);
+    dprintf(fd, "Filter information:\n");
+    dprintf(fd, "Filters: count=%d\n", filters_.size());
+    for (const auto &item : filters_) {
+        dprintf(fd, "priority:%d | filterId:%d | Pid:%d\n", item.priority, item.filterId, item.clientPid);
+    }    
+}
+
+bool EventFilterHandler::HandleKeyEventFilter(std::shared_ptr<KeyEvent> event)
+{
+    CALL_DEBUG_ENTER;
+    CHKPF(event);
+    std::lock_guard<std::mutex> guard(lockFilter_);
+    if (filters_.empty()) {
+        return false;
+    }
+    for (auto &i: filters_) {
+        if (i.filter->HandleKeyEvent(event)) {
+            MMI_HILOGD("Call HandleKeyEventFilter return true");
+            return true;
+        }
+    }
+    return false;
+}
+
+bool EventFilterHandler::HandlePointerEventFilter(std::shared_ptr<PointerEvent> event)
 {
     CALL_DEBUG_ENTER;
-    CHKPF(point);
+    CHKPF(event);
     std::lock_guard<std::mutex> guard(lockFilter_);
-    if (filter_ == nullptr) {
-        MMI_HILOGD("The filter is not set");
+    if (filters_.empty()) {
         return false;
     }
-    if (filter_->HandlePointerEvent(point)) {
-        MMI_HILOGD("Call HandlePointerEvent return true");
-        return true;
+    for (auto &i: filters_) {
+        if (i.filter->HandlePointerEvent(event)) {
+            MMI_HILOGD("Call HandlePointerEvent return true");
+            return true;
+        }
     }
     return false;
 }
diff --git a/service/filter/src/event_filter_proxy.cpp b/service/filter/src/event_filter_proxy.cpp
index 98231f5f25..415f54dfd4 100644
--- a/service/filter/src/event_filter_proxy.cpp
+++ b/service/filter/src/event_filter_proxy.cpp
@@ -31,6 +31,37 @@ EventFilterProxy::EventFilterProxy(const sptr<IRemoteObject> &impl) : IRemotePro
     MMI_HILOGI("EventFilterProxy()");
 }
 
+bool EventFilterProxy::HandleKeyEvent(const std::shared_ptr<KeyEvent> event)
+{
+    CALL_DEBUG_ENTER;
+    CHKPF(event);
+    MessageParcel data;
+    MessageParcel reply;
+    MessageOption option;
+    if (!data.WriteInterfaceToken(EventFilterProxy::GetDescriptor())) {
+        MMI_HILOGE("Failed to write descriptor");
+        return false;
+    }
+
+    if (!event->WriteToParcel(data)) {
+        MMI_HILOGE("Failed to write event to req");
+        return false;
+    }
+
+    sptr<IRemoteObject> remote = Remote();
+    CHKPF(remote);
+    const uint32_t code = static_cast<uint32_t>(OPERATOR_TYPE::HANDLE_KEY_EVENT);
+    int32_t ret = remote->SendRequest(code, data, reply, option);
+    if (ret != NO_ERROR) {
+        MMI_HILOGE("Send request failed, ret:%{public}d", ret);
+        return false;
+    }
+
+    bool result = false;
+    READBOOL(reply, result);
+    return result;
+}
+
 bool EventFilterProxy::HandlePointerEvent(const std::shared_ptr<PointerEvent> event)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/filter/src/event_filter_service.cpp b/service/filter/src/event_filter_service.cpp
index a97b954de7..7aa6cfb531 100644
--- a/service/filter/src/event_filter_service.cpp
+++ b/service/filter/src/event_filter_service.cpp
@@ -30,15 +30,30 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "EventFilterService" };
 } // namespace
 
-void EventFilterService::SetPointerEventPtr(std::function<bool(std::shared_ptr<PointerEvent>)> pointerFilter)
+int32_t EventFilterService::GetNextId()
 {
-    pointerFilter_ = pointerFilter;
+    if (filterIdSeed_ == std::numeric_limits<int32_t>::max()) {
+        filterIdSeed_ = 0;
+    }    
+    return filterIdSeed_++;
+}
+
+bool EventFilterService::HandleKeyEvent(const std::shared_ptr<KeyEvent> event)
+{
+    if (filter_ == nullptr) {
+        MMI_HILOGE("Filter is nullptr");
+        return false;
+    }
+    return filter_->OnInputEvent(event);
 }
 
 bool EventFilterService::HandlePointerEvent(const std::shared_ptr<PointerEvent> event)
 {
-    CHKPF(pointerFilter_);
-    return pointerFilter_(event);
+    if (filter_ == nullptr) {
+        MMI_HILOGE("Filter is nullptr");
+        return false;
+    }
+    return filter_->OnInputEvent(event);
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/filter/src/event_filter_stub.cpp b/service/filter/src/event_filter_stub.cpp
index 2664873aac..1a958282eb 100644
--- a/service/filter/src/event_filter_stub.cpp
+++ b/service/filter/src/event_filter_stub.cpp
@@ -42,6 +42,9 @@ int32_t EventFilterStub::OnRemoteRequest(
     }
 
     switch (code) {
+        case static_cast<uint32_t>(IEventFilter::OPERATOR_TYPE::HANDLE_KEY_EVENT): {
+            return StubHandleKeyEvent(data, reply);
+        }
         case static_cast<uint32_t>(IEventFilter::OPERATOR_TYPE::HANDLE_POINTER_EVENT): {
             return StubHandlePointerEvent(data, reply);
         }
@@ -52,6 +55,25 @@ int32_t EventFilterStub::OnRemoteRequest(
     }
 }
 
+int32_t EventFilterStub::StubHandleKeyEvent(MessageParcel& data, MessageParcel& reply)
+{
+    CALL_DEBUG_ENTER;
+    std::shared_ptr<KeyEvent> event = KeyEvent::Create();
+    if (event == nullptr) {
+        MMI_HILOGE("The event is nullptr");
+        return RET_ERR;
+    }
+
+    if (!event->ReadFromParcel(data)) {
+        MMI_HILOGE("Read data error");
+        return RET_ERR;
+    }
+
+    bool ret = HandleKeyEvent(event);
+    WRITEBOOL(reply, ret, RET_ERR);
+    return RET_OK;
+}
+
 int32_t EventFilterStub::StubHandlePointerEvent(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
index c28a5207f5..ef35a15c97 100644
--- a/service/message_handle/include/server_msg_handler.h
+++ b/service/message_handle/include/server_msg_handler.h
@@ -61,7 +61,8 @@ public:
     int32_t OnInjectPointerEvent(const std::shared_ptr<PointerEvent> pointerEvent);
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
-    int32_t AddInputEventFilter(sptr<IEventFilter> filter);
+    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority, int32_t clientPid);
+    int32_t RemoveInputEventFilter(int32_t clientPid, int32_t filterId);
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 protected:
     int32_t MarkProcessed(SessionPtr sess, NetPacket& pkt);
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index 00d4078170..487ce89297 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -345,12 +345,19 @@ int32_t ServerMsgHandler::OnUnsubscribeKeyEvent(IUdsServer *server, int32_t pid,
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
 
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
-int32_t ServerMsgHandler::AddInputEventFilter(sptr<IEventFilter> filter)
+int32_t ServerMsgHandler::AddInputEventFilter(sptr<IEventFilter> filter,
+    int32_t filterId, int32_t priority, int32_t clientPid)
 {
     auto filterHandler = InputHandler->GetFilterHandler();
     CHKPR(filterHandler, ERROR_NULL_POINTER);
-    filterHandler->AddInputEventFilter(filter);
-    return RET_OK;
+    return filterHandler->AddInputEventFilter(filter, filterId, priority, clientPid);
+}
+
+int32_t ServerMsgHandler::RemoveInputEventFilter(int32_t clientPid, int32_t filterId)
+{
+    auto filterHandler = InputHandler->GetFilterHandler();
+    CHKPR(filterHandler, ERROR_NULL_POINTER);
+    return filterHandler->RemoveInputEventFilter(clientPid, filterId);   
 }
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 } // namespace MMI
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index e814351d2e..573dfbd938 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -46,7 +46,8 @@ public:
     int32_t Dump(int32_t fd, const std::vector<std::u16string> &args) override;
     int32_t AllocSocketFd(const std::string &programName, const int32_t moduleType,
         int32_t &toReturnClientFd, int32_t &tokenType) override;
-    int32_t AddInputEventFilter(sptr<IEventFilter> filter) override;
+    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority) override;
+    int32_t RemoveInputEventFilter(int32_t filterId) override;
     int32_t SetPointerVisible(bool visible) override;
     int32_t IsPointerVisible(bool &visible) override;
     int32_t SetPointerSpeed(int32_t speed) override;
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 0d371ce786..9bd72b5b4f 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -368,18 +368,34 @@ int32_t MMIService::AllocSocketFd(const std::string &programName, const int32_t
     return RET_OK;
 }
 
-int32_t MMIService::AddInputEventFilter(sptr<IEventFilter> filter)
+int32_t MMIService::AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority)
 {
     CALL_INFO_TRACE;
-#if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
+#if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH) || defined(OHOS_BUILD_ENABLE_KEYBOARD)
     CHKPR(filter, ERROR_NULL_POINTER);
+    int32_t clientPid = GetCallingPid();
     int32_t ret = delegateTasks_.PostSyncTask(std::bind(&ServerMsgHandler::AddInputEventFilter,
-        &sMsgHandler_, filter));
+        &sMsgHandler_, filter, filterId, priority, clientPid));
     if (ret != RET_OK) {
         MMI_HILOGE("Add event filter failed,return %{public}d", ret);
         return ret;
     }
-#endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
+#endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH || OHOS_BUILD_ENABLE_KEYBOARD
+    return RET_OK;
+}
+
+int32_t MMIService::RemoveInputEventFilter(int32_t filterId)
+{
+    CALL_INFO_TRACE;
+#if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH) || defined(OHOS_BUILD_ENABLE_KEYBOARD)
+    int32_t clientPid = GetCallingPid();
+    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&ServerMsgHandler::RemoveInputEventFilter,
+        &sMsgHandler_, filterId, clientPid));
+    if (ret != RET_OK) {
+        MMI_HILOGE("Remove event filter failed,return %{public}d", ret);
+        return ret;
+    }
+#endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH || OHOS_BUILD_ENABLE_KEYBOARD
     return RET_OK;
 }
 
@@ -393,6 +409,10 @@ void MMIService::OnDisconnected(SessionPtr s)
 {
     CHKPV(s);
     MMI_HILOGW("Enter, session desc:%{public}s, fd:%{public}d", s->GetDescript().c_str(), s->GetFd());
+    auto ret = RemoveInputEventFilter(-1);
+    if (ret != RET_OK) {
+        MMI_HILOGF("Remove all filter failed, ret:%{public}d", ret);
+    }
 #ifdef OHOS_BUILD_ENABLE_POINTER
     IPointerDrawingManager::GetInstance()->DeletePointerVisible(s->GetPid());
 #endif // OHOS_BUILD_ENABLE_POINTER
diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp
index 223d749375..aeb825ce46 100644
--- a/service/module_loader/src/uds_server.cpp
+++ b/service/module_loader/src/uds_server.cpp
@@ -204,6 +204,7 @@ void UDSServer::SetRecvFun(MsgServerFunCallback fun)
 
 void UDSServer::ReleaseSession(int32_t fd, epoll_event& ev)
 {
+    CALL_INFO_TRACE;
     auto secPtr = GetSession(fd);
     if (secPtr != nullptr) {
         OnDisconnected(secPtr);
diff --git a/test/fuzztest/addinputeventfilter_fuzzer/addinputeventfilter_fuzzer.cpp b/test/fuzztest/addinputeventfilter_fuzzer/addinputeventfilter_fuzzer.cpp
index 18ed15b577..dc6246b860 100644
--- a/test/fuzztest/addinputeventfilter_fuzzer/addinputeventfilter_fuzzer.cpp
+++ b/test/fuzztest/addinputeventfilter_fuzzer/addinputeventfilter_fuzzer.cpp
@@ -25,13 +25,37 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "AddInputEventFilterFuzzTest" };
 } // namespace
 
-void AddInputEventFilterFuzzTest(const uint8_t* data, size_t /* size */)
+void AddInputEventFilterFuzzTest(const uint8_t* data, size_t size)
 {
-    auto fun = [](std::shared_ptr<PointerEvent> event) ->bool {
-        MMI_HILOGD("Add inputevent filter success");
-        return false;
+    struct TestFilter : public IInputEventFilter {
+        virtual bool OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override {
+            CHKPR(keyEvent, false);
+            MMI_HILOGI("Fuzz test in TestFilter::OnInputEvent,key code:%{public}d", keyEvent->GetKeyCode());
+            return false;
+        }
+        bool OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override
+        {
+            CHKPR(pointerEvent, false);
+            MMI_HILOGI("Fuzz test in TestFilter::OnInputEvent,pointer id:%{public}d", pointerEvent->GetPointerId());
+            return false;
+        }
     };
-    InputManager::GetInstance()->AddInputEventFilter(fun);
+    auto filter = std::make_shared<TestFilter>();
+    const auto priority = 200 + (size % 100);
+    const auto filterId = InputManager::GetInstance()->AddInputEventFilter(filter, priority);
+    if (filterId == -1) {
+        MMI_HILOGE("Add filter,ret:%{public}d", filterId);
+        return;
+    } else {
+        MMI_HILOGE("Add filter success,filterId:%{public}d", filterId);
+    }
+    auto ret = InputManager::GetInstance()->RemoveInputEventFilter(filterId);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Remove filter,ret:%{public}d", ret);
+        return;
+    } else {
+        MMI_HILOGE("Remove filter,success,filterId:%{public}d", filterId);
+    }
 }
 } // MMI
 } // OHOS
diff --git a/util/common/include/error_multimodal.h b/util/common/include/error_multimodal.h
index 70e31bb61a..7bf15af755 100644
--- a/util/common/include/error_multimodal.h
+++ b/util/common/include/error_multimodal.h
@@ -49,7 +49,7 @@ enum {
 
 enum {
     // 发送消息失败
-    MSG_SEND_FAIL = ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_SERVER),
+    MSG_SEND_FAIL = 0x3E20000, //ErrCodeOffset(SUBSYS_MULTIMODAINPUT, MODULE_SERVER),
     // 未知的事件
     UNKNOWN_EVENT,
     // 空指针
@@ -93,7 +93,9 @@ enum {
     // 生成异步任务失败
     ETASKS_POST_ASYNCTASK_FAIL,
     // DUMP参数错误
-    DUMP_PARAM_ERR
+    DUMP_PARAM_ERR,
+    // 过滤器增加失败
+    ERROR_FILTER_ADD_FAIL,
 };
 
 enum {
-- 
Gitee


From ec7e5e0f09c6552a4adb480990c91fe8417953c3 Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Thu, 8 Dec 2022 07:20:46 +0000
Subject: [PATCH 218/360] Signed-off-by: mayunteng_1 <mayunteng@huawei.com>

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: I3006ae5213df1c67d10392dfaf8b11ca487d890e
---
 bundle.json                                   |  2 +-
 examples/mmi/src/mmi_service_main.cpp         |  3 +--
 .../include/input_manager_impl.h              |  2 +-
 .../proxy/events/test/key_event_test.cpp      |  1 -
 .../module_loader/test/mmi_client_test.cpp    |  1 -
 .../innerkits/event/include/pointer_event.h   |  1 -
 .../innerkits/proxy/include/input_manager.h   |  2 +-
 .../include/{display_info.h => window_info.h} |  8 ++++----
 .../test/event_dispatch_test.cpp              |  1 -
 service/module_loader/src/mmi_service.cpp     |  3 +--
 .../module_loader/test/uds_server_test.cpp    |  1 -
 .../test/transform_point_test.cpp             |  1 -
 .../include/i_pointer_drawing_manager.h       |  2 +-
 .../include/input_windows_manager.h           |  2 +-
 .../src/input_windows_manager.cpp             | 20 +++++++++----------
 .../src/pointer_drawing_manager.cpp           |  2 +-
 .../test/input_windows_manager_test.cpp       |  1 -
 .../src/mmi_event_simulate_main.cpp           |  3 +--
 tools/event_inject/test/device_base_test.cpp  |  1 -
 .../test/get_device_node_test.cpp             |  1 -
 .../test/get_device_object_test.cpp           |  1 -
 .../test/injection_event_dispatch_test.cpp    |  1 -
 .../test/injection_tools_help_func_test.cpp   |  1 -
 .../test/manage_inject_device_test.cpp        |  1 -
 .../test/processing_finger_device_test.cpp    |  1 -
 .../test/processing_game_pad_device_test.cpp  |  1 -
 .../test/processing_joystick_device_test.cpp  |  1 -
 .../test/processing_keyboard_device_test.cpp  |  1 -
 .../test/processing_mouse_device_test.cpp     |  1 -
 .../test/processing_pad_device_test.cpp       |  1 -
 .../test/processing_pen_device_test.cpp       |  1 -
 .../processing_touch_screen_device_test.cpp   |  1 -
 tools/inject_event/test/inject_event_test.cpp |  1 -
 tools/vuinput/test/virtual_device_test.cpp    |  1 -
 util/common/test/util_ex_test.cpp             |  1 -
 util/network/test/net_packet_test.cpp         |  1 -
 util/socket/test/stream_buffer_test.cpp       |  1 -
 util/socket/test/uds_socket_test.cpp          |  1 -
 38 files changed, 23 insertions(+), 53 deletions(-)
 mode change 100644 => 100755 bundle.json
 mode change 100644 => 100755 examples/mmi/src/mmi_service_main.cpp
 mode change 100644 => 100755 frameworks/proxy/event_handler/include/input_manager_impl.h
 mode change 100644 => 100755 frameworks/proxy/module_loader/test/mmi_client_test.cpp
 mode change 100644 => 100755 interfaces/native/innerkits/event/include/pointer_event.h
 mode change 100644 => 100755 interfaces/native/innerkits/proxy/include/input_manager.h
 rename interfaces/native/innerkits/proxy/include/{display_info.h => window_info.h} (98%)
 mode change 100644 => 100755
 mode change 100644 => 100755 service/event_dispatch/test/event_dispatch_test.cpp
 mode change 100644 => 100755 service/module_loader/src/mmi_service.cpp
 mode change 100644 => 100755 service/module_loader/test/uds_server_test.cpp
 mode change 100644 => 100755 service/touch_event_normalize/test/transform_point_test.cpp
 mode change 100644 => 100755 service/window_manager/include/i_pointer_drawing_manager.h
 mode change 100644 => 100755 service/window_manager/include/input_windows_manager.h
 mode change 100644 => 100755 service/window_manager/src/input_windows_manager.cpp
 mode change 100644 => 100755 service/window_manager/src/pointer_drawing_manager.cpp
 mode change 100644 => 100755 service/window_manager/test/input_windows_manager_test.cpp
 mode change 100644 => 100755 tools/event_inject/src/mmi_event_simulate_main.cpp
 mode change 100644 => 100755 tools/event_inject/test/device_base_test.cpp
 mode change 100644 => 100755 tools/event_inject/test/get_device_node_test.cpp
 mode change 100644 => 100755 tools/event_inject/test/get_device_object_test.cpp
 mode change 100644 => 100755 tools/event_inject/test/injection_event_dispatch_test.cpp
 mode change 100644 => 100755 tools/event_inject/test/injection_tools_help_func_test.cpp
 mode change 100644 => 100755 tools/event_inject/test/manage_inject_device_test.cpp
 mode change 100644 => 100755 tools/event_inject/test/processing_finger_device_test.cpp
 mode change 100644 => 100755 tools/event_inject/test/processing_game_pad_device_test.cpp
 mode change 100644 => 100755 tools/event_inject/test/processing_joystick_device_test.cpp
 mode change 100644 => 100755 tools/event_inject/test/processing_keyboard_device_test.cpp
 mode change 100644 => 100755 tools/event_inject/test/processing_mouse_device_test.cpp
 mode change 100644 => 100755 tools/event_inject/test/processing_pad_device_test.cpp
 mode change 100644 => 100755 tools/event_inject/test/processing_pen_device_test.cpp
 mode change 100644 => 100755 tools/event_inject/test/processing_touch_screen_device_test.cpp
 mode change 100644 => 100755 tools/inject_event/test/inject_event_test.cpp
 mode change 100644 => 100755 tools/vuinput/test/virtual_device_test.cpp
 mode change 100644 => 100755 util/common/test/util_ex_test.cpp
 mode change 100644 => 100755 util/network/test/net_packet_test.cpp
 mode change 100644 => 100755 util/socket/test/stream_buffer_test.cpp
 mode change 100644 => 100755 util/socket/test/uds_socket_test.cpp

diff --git a/bundle.json b/bundle.json
old mode 100644
new mode 100755
index cda255e45a..3b314ac886
--- a/bundle.json
+++ b/bundle.json
@@ -99,7 +99,7 @@
           "name": "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
           "header": {
             "header_files": [
-              "proxy/include/display_info.h",
+              "proxy/include/window_info.h",
               "proxy/include/input_manager.h",
               "event/include/key_event.h",
               "event/include/pointer_event.h",
diff --git a/examples/mmi/src/mmi_service_main.cpp b/examples/mmi/src/mmi_service_main.cpp
old mode 100644
new mode 100755
index 48e2387488..95e60ac119
--- a/examples/mmi/src/mmi_service_main.cpp
+++ b/examples/mmi/src/mmi_service_main.cpp
@@ -25,8 +25,7 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MmiSe
 
 int32_t main(int32_t argc, const char *argv[])
 {
-    using namespace OHOS::MMI;
-    auto service = OHOS::DelayedSingleton<MMIService>::GetInstance();
+        auto service = OHOS::DelayedSingleton<MMIService>::GetInstance();
     service->OnStart();
     constexpr int32_t sleepTime = 10 * 60;
     while (1) {
diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
old mode 100644
new mode 100755
index 88c324e09e..ee37389f5f
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -22,7 +22,7 @@
 
 #include "net_packet.h"
 
-#include "display_info.h"
+#include "window_info.h"
 #include "event_filter_service.h"
 #include "event_handler.h"
 #include "if_mmi_client.h"
diff --git a/frameworks/proxy/events/test/key_event_test.cpp b/frameworks/proxy/events/test/key_event_test.cpp
index 169b27845e..5b568926d0 100755
--- a/frameworks/proxy/events/test/key_event_test.cpp
+++ b/frameworks/proxy/events/test/key_event_test.cpp
@@ -25,7 +25,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class KeyEventTest : public testing::Test {
diff --git a/frameworks/proxy/module_loader/test/mmi_client_test.cpp b/frameworks/proxy/module_loader/test/mmi_client_test.cpp
old mode 100644
new mode 100755
index ac0d410775..2f4ee7462f
--- a/frameworks/proxy/module_loader/test/mmi_client_test.cpp
+++ b/frameworks/proxy/module_loader/test/mmi_client_test.cpp
@@ -21,7 +21,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class MMIClientTest : public testing::Test {
diff --git a/interfaces/native/innerkits/event/include/pointer_event.h b/interfaces/native/innerkits/event/include/pointer_event.h
old mode 100644
new mode 100755
index 03a63b0e95..fbb3fff144
--- a/interfaces/native/innerkits/event/include/pointer_event.h
+++ b/interfaces/native/innerkits/event/include/pointer_event.h
@@ -19,7 +19,6 @@
 #include <array>
 #include <list>
 #include <memory>
-#include <ostream>
 #include <set>
 #include <vector>
 
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
old mode 100644
new mode 100755
index 6c79506feb..19cc814e75
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -25,7 +25,7 @@
 
 #include "cooperation_message.h"
 #include "i_anr_observer.h"
-#include "display_info.h"
+#include "window_info.h"
 #include "error_multimodal.h"
 #include "i_input_device_listener.h"
 #include "i_input_device_cooperate_listener.h"
diff --git a/interfaces/native/innerkits/proxy/include/display_info.h b/interfaces/native/innerkits/proxy/include/window_info.h
old mode 100644
new mode 100755
similarity index 98%
rename from interfaces/native/innerkits/proxy/include/display_info.h
rename to interfaces/native/innerkits/proxy/include/window_info.h
index 339223e742..61da0095a9
--- a/interfaces/native/innerkits/proxy/include/display_info.h
+++ b/interfaces/native/innerkits/proxy/include/window_info.h
@@ -27,28 +27,28 @@ enum Direction {
      *
      * @since 9
      */
-    Direction0,
+    DIRECTION0,
 
     /**
      * Rotating the display clockwise by 90 degrees
      *
      * @since 9
      */
-    Direction90,
+    DIRECTION90,
 
     /**
      * Rotating the display clockwise by 180 degrees
      *
      * @since 9
      */
-    Direction180,
+    DIRECTION180,
 
     /**
      * Rotating the display clockwise by 270 degrees
      *
      * @since 9
      */
-    Direction270
+    DIRECTION270
 };
 
 struct Rect {
diff --git a/service/event_dispatch/test/event_dispatch_test.cpp b/service/event_dispatch/test/event_dispatch_test.cpp
old mode 100644
new mode 100755
index a0a1f9e942..5eb94e26bd
--- a/service/event_dispatch/test/event_dispatch_test.cpp
+++ b/service/event_dispatch/test/event_dispatch_test.cpp
@@ -22,7 +22,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class EventDispatchTest : public testing::Test {
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
old mode 100644
new mode 100755
index 0d371ce786..5350bc413c
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -72,8 +72,7 @@ struct mmi_epoll_event {
 template<class ...Ts>
 void CheckDefineOutput(const char* fmt, Ts... args)
 {
-    using namespace OHOS::MMI;
-    CHKPV(fmt);
+        CHKPV(fmt);
     char buf[MAX_PACKET_BUF_SIZE] = {};
     int32_t ret = snprintf_s(buf, MAX_PACKET_BUF_SIZE, MAX_PACKET_BUF_SIZE - 1, fmt, args...);
     if (ret == -1) {
diff --git a/service/module_loader/test/uds_server_test.cpp b/service/module_loader/test/uds_server_test.cpp
old mode 100644
new mode 100755
index 17eaf0659a..5d52297dd9
--- a/service/module_loader/test/uds_server_test.cpp
+++ b/service/module_loader/test/uds_server_test.cpp
@@ -22,7 +22,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class UDSServerTest : public testing::Test {
diff --git a/service/touch_event_normalize/test/transform_point_test.cpp b/service/touch_event_normalize/test/transform_point_test.cpp
old mode 100644
new mode 100755
index ee23a2bc8e..e1e434bf82
--- a/service/touch_event_normalize/test/transform_point_test.cpp
+++ b/service/touch_event_normalize/test/transform_point_test.cpp
@@ -22,7 +22,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL { LOG_CORE, MMI_LOG_DOMAIN, "TransformPointTest" };
 constexpr int32_t WAIT_TIME_FOR_INPUT { 1000 };
 constexpr int32_t WAIT_TIME_FOR_EVENTS { 10 };
diff --git a/service/window_manager/include/i_pointer_drawing_manager.h b/service/window_manager/include/i_pointer_drawing_manager.h
old mode 100644
new mode 100755
index 26ccb861fc..2799c8fb9d
--- a/service/window_manager/include/i_pointer_drawing_manager.h
+++ b/service/window_manager/include/i_pointer_drawing_manager.h
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "display_info.h"
+#include "window_info.h"
 #include "struct_multimodal.h"
 
 namespace OHOS {
diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
old mode 100644
new mode 100755
index c221b1044a..4b30bb7c9f
--- a/service/window_manager/include/input_windows_manager.h
+++ b/service/window_manager/include/input_windows_manager.h
@@ -21,7 +21,7 @@
 #include "nocopyable.h"
 #include "singleton.h"
 
-#include "display_info.h"
+#include "window_info.h"
 #include "input_event.h"
 #include "input_event_data_transformation.h"
 #include "pointer_event.h"
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
old mode 100644
new mode 100755
index 9889c12236..b5414865aa
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -496,27 +496,27 @@ void InputWindowsManager::RotateTouchScreen(DisplayInfo info, LogicalCoordinate&
 {
     const Direction direction = info.direction;
 
-    if (direction == Direction0) {
-        MMI_HILOGD("direction is Direction0");
+    if (direction == DIRECTION0) {
+        MMI_HILOGD("direction is DIRECTION0");
         return;
     }
-    if (direction == Direction90) {
-        MMI_HILOGD("direction is Direction90");
+    if (direction == DIRECTION90) {
+        MMI_HILOGD("direction is DIRECTION90");
         int32_t temp = coord.x;
         coord.x = info.height - coord.y;
         coord.y = temp;
         MMI_HILOGD("physicalX:%{public}d, physicalY:%{public}d", coord.x, coord.y);
         return;
     }
-    if (direction == Direction180) {
-        MMI_HILOGD("direction is Direction180");
+    if (direction == DIRECTION180) {
+        MMI_HILOGD("direction is DIRECTION180");
         coord.x = info.width - coord.x;
         coord.y = info.height - coord.y;
         MMI_HILOGD("physicalX:%{public}d, physicalY:%{public}d", coord.x, coord.y);
         return;
     }
-    if (direction == Direction270) {
-        MMI_HILOGD("direction is Direction270");
+    if (direction == DIRECTION270) {
+        MMI_HILOGD("direction is DIRECTION270");
         int32_t temp = coord.y;
         coord.y = info.width - coord.x;
         coord.x = temp;
@@ -745,7 +745,7 @@ void InputWindowsManager::AdjustDisplayCoordinate(
 {
     int32_t width = 0;
     int32_t height = 0;
-    if (displayInfo.direction == Direction0 || displayInfo.direction == Direction180) {
+    if (displayInfo.direction == DIRECTION0 || displayInfo.direction == DIRECTION180) {
         width = displayInfo.width;
         height = displayInfo.height;
     } else {
@@ -1166,7 +1166,7 @@ void InputWindowsManager::UpdateAndAdjustMouseLocation(int32_t& displayId, doubl
     }
     int32_t width = 0;
     int32_t height = 0;
-    if (displayInfo->direction == Direction0 || displayInfo->direction == Direction180) {
+    if (displayInfo->direction == DIRECTION0 || displayInfo->direction == DIRECTION180) {
         width = displayInfo->width;
         height = displayInfo->height;
     } else {
diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
old mode 100644
new mode 100755
index 8795fd537f..663e3bdc66
--- a/service/window_manager/src/pointer_drawing_manager.cpp
+++ b/service/window_manager/src/pointer_drawing_manager.cpp
@@ -177,7 +177,7 @@ void PointerDrawingManager::FixCursorPosition(int32_t &physicalX, int32_t &physi
         physicalY = 0;
     }
     const int32_t cursorUnit = 16;
-    if (displayInfo_.direction == Direction0 || displayInfo_.direction == Direction180) {
+    if (displayInfo_.direction == DIRECTION0 || displayInfo_.direction == DIRECTION180) {
         if (physicalX > (displayInfo_.width - imageWidth_ / cursorUnit)) {
             physicalX = displayInfo_.width - imageWidth_ / cursorUnit;
         }
diff --git a/service/window_manager/test/input_windows_manager_test.cpp b/service/window_manager/test/input_windows_manager_test.cpp
old mode 100644
new mode 100755
index 766ff93e2f..2ebb5e54c4
--- a/service/window_manager/test/input_windows_manager_test.cpp
+++ b/service/window_manager/test/input_windows_manager_test.cpp
@@ -21,7 +21,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class InputWindowsManagerTest : public testing::Test {
diff --git a/tools/event_inject/src/mmi_event_simulate_main.cpp b/tools/event_inject/src/mmi_event_simulate_main.cpp
old mode 100644
new mode 100755
index 21280e35ad..6f7a30dd8b
--- a/tools/event_inject/src/mmi_event_simulate_main.cpp
+++ b/tools/event_inject/src/mmi_event_simulate_main.cpp
@@ -23,8 +23,7 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, OHOS::MMI::MMI_LOG_DOM
 
 int32_t main(int32_t argc, char* argv[])
 {
-    using namespace OHOS::MMI;
-    do {
+        do {
         SetThreadName("main");
         InjectionToolsHelpFunc helpFunc;
         if (!helpFunc.CheckInjectionCommand(argc, argv)) {
diff --git a/tools/event_inject/test/device_base_test.cpp b/tools/event_inject/test/device_base_test.cpp
old mode 100644
new mode 100755
index 63124a3a0c..2802685d4c
--- a/tools/event_inject/test/device_base_test.cpp
+++ b/tools/event_inject/test/device_base_test.cpp
@@ -23,7 +23,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class DeviceBaseTest : public testing::Test {
diff --git a/tools/event_inject/test/get_device_node_test.cpp b/tools/event_inject/test/get_device_node_test.cpp
old mode 100644
new mode 100755
index ddcdd840f5..7d28aca4a4
--- a/tools/event_inject/test/get_device_node_test.cpp
+++ b/tools/event_inject/test/get_device_node_test.cpp
@@ -25,7 +25,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class GetDeviceNodeTest : public testing::Test {
diff --git a/tools/event_inject/test/get_device_object_test.cpp b/tools/event_inject/test/get_device_object_test.cpp
old mode 100644
new mode 100755
index 94a1829f87..21aa6eee90
--- a/tools/event_inject/test/get_device_object_test.cpp
+++ b/tools/event_inject/test/get_device_object_test.cpp
@@ -25,7 +25,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class GetDeviceObjectTest : public testing::Test {
diff --git a/tools/event_inject/test/injection_event_dispatch_test.cpp b/tools/event_inject/test/injection_event_dispatch_test.cpp
old mode 100644
new mode 100755
index f0840dcf79..32524f661e
--- a/tools/event_inject/test/injection_event_dispatch_test.cpp
+++ b/tools/event_inject/test/injection_event_dispatch_test.cpp
@@ -22,7 +22,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class InjectionEventDispatchTest : public testing::Test {
diff --git a/tools/event_inject/test/injection_tools_help_func_test.cpp b/tools/event_inject/test/injection_tools_help_func_test.cpp
old mode 100644
new mode 100755
index cc849e48ab..6b0157c6ae
--- a/tools/event_inject/test/injection_tools_help_func_test.cpp
+++ b/tools/event_inject/test/injection_tools_help_func_test.cpp
@@ -23,7 +23,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class InjectionToolsHelpFuncTest : public testing::Test {
diff --git a/tools/event_inject/test/manage_inject_device_test.cpp b/tools/event_inject/test/manage_inject_device_test.cpp
old mode 100644
new mode 100755
index c3c4323d33..02f0aff40a
--- a/tools/event_inject/test/manage_inject_device_test.cpp
+++ b/tools/event_inject/test/manage_inject_device_test.cpp
@@ -25,7 +25,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 class ManageInjectDeviceTest : public testing::Test {
 public:
diff --git a/tools/event_inject/test/processing_finger_device_test.cpp b/tools/event_inject/test/processing_finger_device_test.cpp
old mode 100644
new mode 100755
index 7052e8e3a0..296c9b6187
--- a/tools/event_inject/test/processing_finger_device_test.cpp
+++ b/tools/event_inject/test/processing_finger_device_test.cpp
@@ -24,7 +24,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class ProcessingFingerDeviceTest : public testing::Test {
diff --git a/tools/event_inject/test/processing_game_pad_device_test.cpp b/tools/event_inject/test/processing_game_pad_device_test.cpp
old mode 100644
new mode 100755
index df7df92b84..6773049e3a
--- a/tools/event_inject/test/processing_game_pad_device_test.cpp
+++ b/tools/event_inject/test/processing_game_pad_device_test.cpp
@@ -25,7 +25,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 class ProcessingGamePadDeviceTest : public testing::Test {
 public:
diff --git a/tools/event_inject/test/processing_joystick_device_test.cpp b/tools/event_inject/test/processing_joystick_device_test.cpp
old mode 100644
new mode 100755
index 50f1f047f9..d2b7e4f2ad
--- a/tools/event_inject/test/processing_joystick_device_test.cpp
+++ b/tools/event_inject/test/processing_joystick_device_test.cpp
@@ -24,7 +24,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class ProcessingJoyStickDeviceTest : public testing::Test {
diff --git a/tools/event_inject/test/processing_keyboard_device_test.cpp b/tools/event_inject/test/processing_keyboard_device_test.cpp
old mode 100644
new mode 100755
index b5fb42530a..fad5a858ff
--- a/tools/event_inject/test/processing_keyboard_device_test.cpp
+++ b/tools/event_inject/test/processing_keyboard_device_test.cpp
@@ -24,7 +24,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class ProcessingKeyboardDeviceTest : public testing::Test {
diff --git a/tools/event_inject/test/processing_mouse_device_test.cpp b/tools/event_inject/test/processing_mouse_device_test.cpp
old mode 100644
new mode 100755
index 5d6db8be93..dec16f9b5b
--- a/tools/event_inject/test/processing_mouse_device_test.cpp
+++ b/tools/event_inject/test/processing_mouse_device_test.cpp
@@ -24,7 +24,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class ProcessingMouseDeviceTest : public testing::Test {
diff --git a/tools/event_inject/test/processing_pad_device_test.cpp b/tools/event_inject/test/processing_pad_device_test.cpp
old mode 100644
new mode 100755
index ac3249b445..553a3dfd81
--- a/tools/event_inject/test/processing_pad_device_test.cpp
+++ b/tools/event_inject/test/processing_pad_device_test.cpp
@@ -25,7 +25,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 class ProcessingPadDeviceTest : public testing::Test {
 public:
diff --git a/tools/event_inject/test/processing_pen_device_test.cpp b/tools/event_inject/test/processing_pen_device_test.cpp
old mode 100644
new mode 100755
index 142cfa0f20..ace3a298ad
--- a/tools/event_inject/test/processing_pen_device_test.cpp
+++ b/tools/event_inject/test/processing_pen_device_test.cpp
@@ -24,7 +24,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class ProcessingPenDeviceTest : public testing::Test {
diff --git a/tools/event_inject/test/processing_touch_screen_device_test.cpp b/tools/event_inject/test/processing_touch_screen_device_test.cpp
old mode 100644
new mode 100755
index 718cda41a2..7e3611c27e
--- a/tools/event_inject/test/processing_touch_screen_device_test.cpp
+++ b/tools/event_inject/test/processing_touch_screen_device_test.cpp
@@ -24,7 +24,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class ProcessingTouchScreenDeviceTest : public testing::Test {
diff --git a/tools/inject_event/test/inject_event_test.cpp b/tools/inject_event/test/inject_event_test.cpp
old mode 100644
new mode 100755
index 3fd3570dba..a3e8de03e2
--- a/tools/inject_event/test/inject_event_test.cpp
+++ b/tools/inject_event/test/inject_event_test.cpp
@@ -21,7 +21,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 class InjectEventTest : public testing::Test {
 public:
diff --git a/tools/vuinput/test/virtual_device_test.cpp b/tools/vuinput/test/virtual_device_test.cpp
old mode 100644
new mode 100755
index b58dcc7633..609a3d82cf
--- a/tools/vuinput/test/virtual_device_test.cpp
+++ b/tools/vuinput/test/virtual_device_test.cpp
@@ -19,7 +19,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class VirtualDeviceTest : public testing::Test {
diff --git a/util/common/test/util_ex_test.cpp b/util/common/test/util_ex_test.cpp
old mode 100644
new mode 100755
index 30adb2f895..07ba334c5b
--- a/util/common/test/util_ex_test.cpp
+++ b/util/common/test/util_ex_test.cpp
@@ -23,7 +23,6 @@ namespace MMI {
 namespace {
 using namespace testing::ext;
 using namespace OHOS;
-using namespace OHOS::MMI;
 } // namespace
 class UtilExTest : public testing::Test {
 public:
diff --git a/util/network/test/net_packet_test.cpp b/util/network/test/net_packet_test.cpp
old mode 100644
new mode 100755
index aecdf18550..9a634dcd1c
--- a/util/network/test/net_packet_test.cpp
+++ b/util/network/test/net_packet_test.cpp
@@ -21,7 +21,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 class NetPacketTest : public testing::Test {
 public:
diff --git a/util/socket/test/stream_buffer_test.cpp b/util/socket/test/stream_buffer_test.cpp
old mode 100644
new mode 100755
index bcf4521669..55091cfb82
--- a/util/socket/test/stream_buffer_test.cpp
+++ b/util/socket/test/stream_buffer_test.cpp
@@ -22,7 +22,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class StreamBufferTest : public testing::Test {
diff --git a/util/socket/test/uds_socket_test.cpp b/util/socket/test/uds_socket_test.cpp
old mode 100644
new mode 100755
index 287f1a7e0c..5985712db5
--- a/util/socket/test/uds_socket_test.cpp
+++ b/util/socket/test/uds_socket_test.cpp
@@ -20,7 +20,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 using namespace testing::ext;
-using namespace OHOS::MMI;
 } // namespace
 
 class UDSSocketTest : public testing::Test {
-- 
Gitee


From 704c7d007cfc736b676d171e9910e8b674434766 Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Thu, 8 Dec 2022 07:32:10 +0000
Subject: [PATCH 219/360] Signed-off-by: mayunteng_1 <mayunteng@huawei.com>

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: I4f2708ca27fb07e942ce33e888777b121fd9403b
---
 bundle.json                                                     | 0
 examples/mmi/src/mmi_service_main.cpp                           | 0
 frameworks/proxy/event_handler/include/input_manager_impl.h     | 0
 frameworks/proxy/module_loader/test/mmi_client_test.cpp         | 0
 interfaces/native/innerkits/event/include/pointer_event.h       | 0
 interfaces/native/innerkits/proxy/include/input_manager.h       | 0
 interfaces/native/innerkits/proxy/include/window_info.h         | 0
 service/event_dispatch/test/event_dispatch_test.cpp             | 0
 service/module_loader/src/mmi_service.cpp                       | 0
 service/module_loader/test/uds_server_test.cpp                  | 0
 service/touch_event_normalize/test/transform_point_test.cpp     | 0
 service/window_manager/include/i_pointer_drawing_manager.h      | 0
 service/window_manager/include/input_windows_manager.h          | 0
 service/window_manager/src/input_windows_manager.cpp            | 0
 service/window_manager/src/pointer_drawing_manager.cpp          | 0
 service/window_manager/test/input_windows_manager_test.cpp      | 0
 tools/event_inject/src/mmi_event_simulate_main.cpp              | 0
 tools/event_inject/test/device_base_test.cpp                    | 0
 tools/event_inject/test/get_device_node_test.cpp                | 0
 tools/event_inject/test/get_device_object_test.cpp              | 0
 tools/event_inject/test/injection_event_dispatch_test.cpp       | 0
 tools/event_inject/test/injection_tools_help_func_test.cpp      | 0
 tools/event_inject/test/manage_inject_device_test.cpp           | 0
 tools/event_inject/test/processing_finger_device_test.cpp       | 0
 tools/event_inject/test/processing_game_pad_device_test.cpp     | 0
 tools/event_inject/test/processing_joystick_device_test.cpp     | 0
 tools/event_inject/test/processing_keyboard_device_test.cpp     | 0
 tools/event_inject/test/processing_mouse_device_test.cpp        | 0
 tools/event_inject/test/processing_pad_device_test.cpp          | 0
 tools/event_inject/test/processing_pen_device_test.cpp          | 0
 tools/event_inject/test/processing_touch_screen_device_test.cpp | 0
 tools/inject_event/test/inject_event_test.cpp                   | 0
 tools/vuinput/test/virtual_device_test.cpp                      | 0
 util/common/test/util_ex_test.cpp                               | 0
 util/network/test/net_packet_test.cpp                           | 0
 util/socket/test/stream_buffer_test.cpp                         | 0
 util/socket/test/uds_socket_test.cpp                            | 0
 37 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 bundle.json
 mode change 100755 => 100644 examples/mmi/src/mmi_service_main.cpp
 mode change 100755 => 100644 frameworks/proxy/event_handler/include/input_manager_impl.h
 mode change 100755 => 100644 frameworks/proxy/module_loader/test/mmi_client_test.cpp
 mode change 100755 => 100644 interfaces/native/innerkits/event/include/pointer_event.h
 mode change 100755 => 100644 interfaces/native/innerkits/proxy/include/input_manager.h
 mode change 100755 => 100644 interfaces/native/innerkits/proxy/include/window_info.h
 mode change 100755 => 100644 service/event_dispatch/test/event_dispatch_test.cpp
 mode change 100755 => 100644 service/module_loader/src/mmi_service.cpp
 mode change 100755 => 100644 service/module_loader/test/uds_server_test.cpp
 mode change 100755 => 100644 service/touch_event_normalize/test/transform_point_test.cpp
 mode change 100755 => 100644 service/window_manager/include/i_pointer_drawing_manager.h
 mode change 100755 => 100644 service/window_manager/include/input_windows_manager.h
 mode change 100755 => 100644 service/window_manager/src/input_windows_manager.cpp
 mode change 100755 => 100644 service/window_manager/src/pointer_drawing_manager.cpp
 mode change 100755 => 100644 service/window_manager/test/input_windows_manager_test.cpp
 mode change 100755 => 100644 tools/event_inject/src/mmi_event_simulate_main.cpp
 mode change 100755 => 100644 tools/event_inject/test/device_base_test.cpp
 mode change 100755 => 100644 tools/event_inject/test/get_device_node_test.cpp
 mode change 100755 => 100644 tools/event_inject/test/get_device_object_test.cpp
 mode change 100755 => 100644 tools/event_inject/test/injection_event_dispatch_test.cpp
 mode change 100755 => 100644 tools/event_inject/test/injection_tools_help_func_test.cpp
 mode change 100755 => 100644 tools/event_inject/test/manage_inject_device_test.cpp
 mode change 100755 => 100644 tools/event_inject/test/processing_finger_device_test.cpp
 mode change 100755 => 100644 tools/event_inject/test/processing_game_pad_device_test.cpp
 mode change 100755 => 100644 tools/event_inject/test/processing_joystick_device_test.cpp
 mode change 100755 => 100644 tools/event_inject/test/processing_keyboard_device_test.cpp
 mode change 100755 => 100644 tools/event_inject/test/processing_mouse_device_test.cpp
 mode change 100755 => 100644 tools/event_inject/test/processing_pad_device_test.cpp
 mode change 100755 => 100644 tools/event_inject/test/processing_pen_device_test.cpp
 mode change 100755 => 100644 tools/event_inject/test/processing_touch_screen_device_test.cpp
 mode change 100755 => 100644 tools/inject_event/test/inject_event_test.cpp
 mode change 100755 => 100644 tools/vuinput/test/virtual_device_test.cpp
 mode change 100755 => 100644 util/common/test/util_ex_test.cpp
 mode change 100755 => 100644 util/network/test/net_packet_test.cpp
 mode change 100755 => 100644 util/socket/test/stream_buffer_test.cpp
 mode change 100755 => 100644 util/socket/test/uds_socket_test.cpp

diff --git a/bundle.json b/bundle.json
old mode 100755
new mode 100644
diff --git a/examples/mmi/src/mmi_service_main.cpp b/examples/mmi/src/mmi_service_main.cpp
old mode 100755
new mode 100644
diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
old mode 100755
new mode 100644
diff --git a/frameworks/proxy/module_loader/test/mmi_client_test.cpp b/frameworks/proxy/module_loader/test/mmi_client_test.cpp
old mode 100755
new mode 100644
diff --git a/interfaces/native/innerkits/event/include/pointer_event.h b/interfaces/native/innerkits/event/include/pointer_event.h
old mode 100755
new mode 100644
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
old mode 100755
new mode 100644
diff --git a/interfaces/native/innerkits/proxy/include/window_info.h b/interfaces/native/innerkits/proxy/include/window_info.h
old mode 100755
new mode 100644
diff --git a/service/event_dispatch/test/event_dispatch_test.cpp b/service/event_dispatch/test/event_dispatch_test.cpp
old mode 100755
new mode 100644
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
old mode 100755
new mode 100644
diff --git a/service/module_loader/test/uds_server_test.cpp b/service/module_loader/test/uds_server_test.cpp
old mode 100755
new mode 100644
diff --git a/service/touch_event_normalize/test/transform_point_test.cpp b/service/touch_event_normalize/test/transform_point_test.cpp
old mode 100755
new mode 100644
diff --git a/service/window_manager/include/i_pointer_drawing_manager.h b/service/window_manager/include/i_pointer_drawing_manager.h
old mode 100755
new mode 100644
diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
old mode 100755
new mode 100644
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
old mode 100755
new mode 100644
diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
old mode 100755
new mode 100644
diff --git a/service/window_manager/test/input_windows_manager_test.cpp b/service/window_manager/test/input_windows_manager_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/src/mmi_event_simulate_main.cpp b/tools/event_inject/src/mmi_event_simulate_main.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/device_base_test.cpp b/tools/event_inject/test/device_base_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/get_device_node_test.cpp b/tools/event_inject/test/get_device_node_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/get_device_object_test.cpp b/tools/event_inject/test/get_device_object_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/injection_event_dispatch_test.cpp b/tools/event_inject/test/injection_event_dispatch_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/injection_tools_help_func_test.cpp b/tools/event_inject/test/injection_tools_help_func_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/manage_inject_device_test.cpp b/tools/event_inject/test/manage_inject_device_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/processing_finger_device_test.cpp b/tools/event_inject/test/processing_finger_device_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/processing_game_pad_device_test.cpp b/tools/event_inject/test/processing_game_pad_device_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/processing_joystick_device_test.cpp b/tools/event_inject/test/processing_joystick_device_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/processing_keyboard_device_test.cpp b/tools/event_inject/test/processing_keyboard_device_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/processing_mouse_device_test.cpp b/tools/event_inject/test/processing_mouse_device_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/processing_pad_device_test.cpp b/tools/event_inject/test/processing_pad_device_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/processing_pen_device_test.cpp b/tools/event_inject/test/processing_pen_device_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/event_inject/test/processing_touch_screen_device_test.cpp b/tools/event_inject/test/processing_touch_screen_device_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/inject_event/test/inject_event_test.cpp b/tools/inject_event/test/inject_event_test.cpp
old mode 100755
new mode 100644
diff --git a/tools/vuinput/test/virtual_device_test.cpp b/tools/vuinput/test/virtual_device_test.cpp
old mode 100755
new mode 100644
diff --git a/util/common/test/util_ex_test.cpp b/util/common/test/util_ex_test.cpp
old mode 100755
new mode 100644
diff --git a/util/network/test/net_packet_test.cpp b/util/network/test/net_packet_test.cpp
old mode 100755
new mode 100644
diff --git a/util/socket/test/stream_buffer_test.cpp b/util/socket/test/stream_buffer_test.cpp
old mode 100755
new mode 100644
diff --git a/util/socket/test/uds_socket_test.cpp b/util/socket/test/uds_socket_test.cpp
old mode 100755
new mode 100644
-- 
Gitee


From 4526955638ef0d0f46a4e3fbab8fd1cca1f4e346 Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Thu, 8 Dec 2022 07:41:18 +0000
Subject: [PATCH 220/360] Signed-off-by: mayunteng_1 <mayunteng@huawei.com>

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: Ibfda280fc82cc195796a59530bd9bc2e1ccc02ee
---
 examples/mmi/src/mmi_service_main.cpp              | 2 +-
 service/module_loader/src/mmi_service.cpp          | 2 +-
 tools/event_inject/src/mmi_event_simulate_main.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/mmi/src/mmi_service_main.cpp b/examples/mmi/src/mmi_service_main.cpp
index 95e60ac119..319144323e 100644
--- a/examples/mmi/src/mmi_service_main.cpp
+++ b/examples/mmi/src/mmi_service_main.cpp
@@ -25,7 +25,7 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MmiSe
 
 int32_t main(int32_t argc, const char *argv[])
 {
-        auto service = OHOS::DelayedSingleton<MMIService>::GetInstance();
+    auto service = OHOS::DelayedSingleton<MMIService>::GetInstance();
     service->OnStart();
     constexpr int32_t sleepTime = 10 * 60;
     while (1) {
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 5350bc413c..86043cc272 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -72,7 +72,7 @@ struct mmi_epoll_event {
 template<class ...Ts>
 void CheckDefineOutput(const char* fmt, Ts... args)
 {
-        CHKPV(fmt);
+    CHKPV(fmt);
     char buf[MAX_PACKET_BUF_SIZE] = {};
     int32_t ret = snprintf_s(buf, MAX_PACKET_BUF_SIZE, MAX_PACKET_BUF_SIZE - 1, fmt, args...);
     if (ret == -1) {
diff --git a/tools/event_inject/src/mmi_event_simulate_main.cpp b/tools/event_inject/src/mmi_event_simulate_main.cpp
index 6f7a30dd8b..c05ac5baee 100644
--- a/tools/event_inject/src/mmi_event_simulate_main.cpp
+++ b/tools/event_inject/src/mmi_event_simulate_main.cpp
@@ -23,7 +23,7 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, OHOS::MMI::MMI_LOG_DOM
 
 int32_t main(int32_t argc, char* argv[])
 {
-        do {
+    do {
         SetThreadName("main");
         InjectionToolsHelpFunc helpFunc;
         if (!helpFunc.CheckInjectionCommand(argc, argv)) {
-- 
Gitee


From 6d876def82dfd3e53dc4dc9e39c7edbafa86c87c Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 8 Dec 2022 18:09:12 +0800
Subject: [PATCH 221/360] add SetPointerLocation interface

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Icf80cd9a0e07ea4bad53143266a299ac6505b31b
---
 .../include/input_manager_impl.h              |  1 +
 .../event_handler/src/input_manager_impl.cpp  |  9 +++++++
 frameworks/proxy/events/src/input_manager.cpp |  5 ++++
 .../innerkits/proxy/include/input_manager.h   |  8 ++++++
 .../include/i_multimodal_input_connect.h      |  2 ++
 .../multimodal_input_connect_manager.h        |  1 +
 .../include/multimodal_input_connect_proxy.h  |  1 +
 .../include/multimodal_input_connect_stub.h   |  1 +
 .../src/multimodal_input_connect_manager.cpp  |  6 +++++
 .../src/multimodal_input_connect_proxy.cpp    | 21 +++++++++++++++
 .../src/multimodal_input_connect_stub.cpp     | 26 +++++++++++++++++-
 service/module_loader/include/mmi_service.h   |  1 +
 service/module_loader/src/mmi_service.cpp     | 13 +++++++++
 .../include/mouse_event_normalize.h           |  2 +-
 .../src/mouse_event_normalize.cpp             | 27 +++++++++++++++++++
 15 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index 88c324e09e..2099297345 100644
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -114,6 +114,7 @@ public:
     int32_t SetInputDevice(const std::string& dhid, const std::string& screenId);
     bool GetFunctionKeyState(int32_t funcKey);
     int32_t SetFunctionKeyState(int32_t funcKey, bool enable);
+    void SetPointerLocation(int32_t x, int32_t y);
 
 private:
     int32_t PackWindowInfo(NetPacket &pkt);
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 023b3bf866..e0fcd54489 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -896,5 +896,14 @@ int32_t InputManagerImpl::SetFunctionKeyState(int32_t funcKey, bool enable)
     return ERROR_UNSUPPORT;
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
 }
+
+void InputManagerImpl::SetPointerLocation(int32_t x, int32_t y)
+{
+    CALL_DEBUG_ENTER;
+    int32_t ret = MultimodalInputConnMgr->SetPointerLocation(x, y);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Set Pointer Location failed, ret:%{public}d", ret);
+    }
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index 9dd7142db6..0c29ff128a 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -239,5 +239,10 @@ int32_t InputManager::SetFunctionKeyState(int32_t funcKey, bool enable)
 {
     return InputMgrImpl.SetFunctionKeyState(funcKey, enable);
 }
+
+void InputManager::SetPointerLocation(int32_t x, int32_t y)
+{
+    InputMgrImpl.SetPointerLocation(x, y);
+}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index 6c79506feb..2098a95184 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -402,6 +402,14 @@ public:
      */
     int32_t SetFunctionKeyState(int32_t funcKey, bool enable);
 
+    /**
+     * @brief 设置鼠标绝对坐标
+     * @param x 指定设置鼠标的x坐标
+     * @param y 指定设置鼠标的y坐标
+     * @return void
+     */
+    void SetPointerLocation(int32_t x, int32_t y);
+
 private:
     InputManager() = default;
     DISALLOW_COPY_AND_MOVE(InputManager);
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
index 75471ca727..b0fd3de019 100644
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -61,6 +61,7 @@ public:
         STOP_DEVICE_COOPERATE = 34,
         GET_INPUT_DEVICE_COOPERATE_STATE = 35,
         SET_INPUT_DEVICE_TO_SCREEN = 50,
+        SET_POINTER_LOCATION = 51,
     };
 
     enum {
@@ -106,6 +107,7 @@ public:
     virtual int32_t SetInputDevice(const std::string& dhid, const std::string& screenId) = 0;
     virtual int32_t GetFunctionKeyState(int32_t funckey, bool &state) = 0;
     virtual int32_t SetFunctionKeyState(int32_t funcKey, bool enable) = 0;
+    virtual int32_t SetPointerLocation(int32_t x, int32_t y) = 0;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
index 70526ccd50..da5e50206f 100644
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -70,6 +70,7 @@ public:
     int32_t SetInputDevice(const std::string& dhid, const std::string& screenId);
     int32_t GetFunctionKeyState(int32_t funcKey, bool &state);
     int32_t SetFunctionKeyState(int32_t funcKey, bool enable);
+    int32_t SetPointerLocation(int32_t x, int32_t y);
 
 private:
     MultimodalInputConnectManager() = default;
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
index 213a8f2072..2063ae0801 100644
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -66,6 +66,7 @@ public:
     int32_t SetInputDevice(const std::string& dhid, const std::string& screenId) override;
     int32_t GetFunctionKeyState(int32_t funcKey, bool &state) override;
     int32_t SetFunctionKeyState(int32_t funcKey, bool enable) override;
+    int32_t SetPointerLocation(int32_t x, int32_t y) override;
 
 private:
     static inline BrokerDelegator<MultimodalInputConnectProxy> delegator_;
diff --git a/service/connect_manager/include/multimodal_input_connect_stub.h b/service/connect_manager/include/multimodal_input_connect_stub.h
index 3c09974f97..98ad7487ad 100644
--- a/service/connect_manager/include/multimodal_input_connect_stub.h
+++ b/service/connect_manager/include/multimodal_input_connect_stub.h
@@ -69,6 +69,7 @@ protected:
     int32_t StubSetInputDevice(MessageParcel& data, MessageParcel& reply);
     int32_t StubGetFunctionKeyState(MessageParcel &data, MessageParcel &reply);
     int32_t StubSetFunctionKeyState(MessageParcel &data, MessageParcel &reply);
+    int32_t StubSetPointerLocation(MessageParcel &data, MessageParcel &reply);
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
index 6459036506..5aa1942707 100644
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -266,6 +266,12 @@ int32_t MultimodalInputConnectManager::SetFunctionKeyState(int32_t funcKey, bool
     return multimodalInputConnectService_->SetFunctionKeyState(funcKey, enable);
 }
 
+int32_t MultimodalInputConnectManager::SetPointerLocation(int32_t x, int32_t y)
+{
+    CHKPR(multimodalInputConnectService_, INVALID_HANDLER_ID);
+    return multimodalInputConnectService_->SetPointerLocation(x, y);
+}
+
 bool MultimodalInputConnectManager::ConnectMultimodalInputService()
 {
     CALL_DEBUG_ENTER;
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index e5d1c64d5e..12a8dc5274 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -764,5 +764,26 @@ int32_t MultimodalInputConnectProxy::SetFunctionKeyState(int32_t funcKey, bool e
     }
     return ret;
 }
+
+int32_t MultimodalInputConnectProxy::SetPointerLocation(int32_t x, int32_t y)
+{
+    CALL_DEBUG_ENTER;
+    MessageParcel data;
+    if (!data.WriteInterfaceToken(MultimodalInputConnectProxy::GetDescriptor())) {
+        MMI_HILOGE("Failed to write descriptor");
+        return ERR_INVALID_VALUE;
+    }
+    MessageParcel reply;
+    MessageOption option;
+    WRITEINT32(data, x, ERR_INVALID_VALUE);
+    WRITEINT32(data, y, ERR_INVALID_VALUE);
+    sptr<IRemoteObject> remote = Remote();
+    CHKPR(remote, RET_ERR);
+    int32_t ret = remote->SendRequest(SET_POINTER_LOCATION, data, reply, option);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Send request failed, ret:%{public}d", ret);
+    }
+    return ret;
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index fca9eabac5..80efe4858e 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -84,7 +84,8 @@ int32_t MultimodalInputConnectStub::OnRemoteRequest(uint32_t code, MessageParcel
             &MultimodalInputConnectStub::StubGetInputDeviceCooperateState},
         {IMultimodalInputConnect::SET_INPUT_DEVICE_TO_SCREEN, &MultimodalInputConnectStub::StubSetInputDevice},
         {IMultimodalInputConnect::GET_FUNCTION_KEY_STATE, &MultimodalInputConnectStub::StubGetFunctionKeyState},
-        {IMultimodalInputConnect::SET_FUNCTION_KEY_STATE, &MultimodalInputConnectStub::StubSetFunctionKeyState}
+        {IMultimodalInputConnect::SET_FUNCTION_KEY_STATE, &MultimodalInputConnectStub::StubSetFunctionKeyState},
+        {IMultimodalInputConnect::SET_POINTER_LOCATION, &MultimodalInputConnectStub::StubSetPointerLocation}
     };
     auto it = mapConnFunc.find(code);
     if (it != mapConnFunc.end()) {
@@ -754,5 +755,28 @@ int32_t MultimodalInputConnectStub::StubSetFunctionKeyState(MessageParcel &data,
     }
     return ret;
 }
+
+int32_t MultimodalInputConnectStub::StubSetPointerLocation(MessageParcel &data, MessageParcel &reply)
+{
+    CALL_DEBUG_ENTER;
+    if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
+        MMI_HILOGE("Permission check failed");
+        return CHECK_PERMISSION_FAIL;
+    }
+    if (!IsRunning()) {
+        MMI_HILOGE("Service is not running");
+        return MMISERVICE_NOT_RUNNING;
+    }
+
+    int32_t x = 0;
+    int32_t y = 0;
+    READINT32(data, x, IPC_PROXY_DEAD_OBJECT_ERR);
+    READINT32(data, y, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = SetPointerLocation(x, y);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Call SetFunctionKeyState failed ret:%{public}d", ret);
+    }
+    return ret;
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index e814351d2e..166b0a2acd 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -80,6 +80,7 @@ public:
     int32_t SetInputDevice(const std::string& dhid, const std::string& screenId) override;
     int32_t GetFunctionKeyState(int32_t funcKey, bool &state) override;
     int32_t SetFunctionKeyState(int32_t funcKey, bool enable) override;
+    int32_t SetPointerLocation(int32_t x, int32_t y) override;
 
 #ifdef OHOS_RSS_CLIENT
     void OnAddSystemAbility(int32_t systemAbilityId, const std::string& deviceId) override;
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 0d371ce786..23e745ae0e 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -934,6 +934,19 @@ int32_t MMIService::SetFunctionKeyState(int32_t funcKey, bool enable)
     return RET_OK;
 }
 
+int32_t MMIService::SetPointerLocation(int32_t x, int32_t y)
+{
+        CALL_DEBUG_ENTER;
+#ifdef OHOS_BUILD_ENABLE_POINTER
+    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MouseEventNormalize::SetPointerLocation,
+        MouseEventHdr, x, y));
+    if (ret != RET_OK) {
+        MMI_HILOGE("Set pointer speed failed,return %{public}d", ret);
+        return RET_ERR;
+    }
+#endif // OHOS_BUILD_ENABLE_POINTER
+    return RET_OK;
+}
 void MMIService::OnDelegateTask(epoll_event& ev)
 {
     if ((ev.events & EPOLLIN) == 0) {
diff --git a/service/mouse_event_normalize/include/mouse_event_normalize.h b/service/mouse_event_normalize/include/mouse_event_normalize.h
index b3f9767d69..f353dbe4da 100644
--- a/service/mouse_event_normalize/include/mouse_event_normalize.h
+++ b/service/mouse_event_normalize/include/mouse_event_normalize.h
@@ -52,7 +52,7 @@ public:
     int32_t GetPointerSpeed() const;
     void OnDisplayLost(int32_t displayId);
     int32_t GetDisplayId() const;
-
+    int32_t SetPointerLocation(int32_t x, int32_t y);
 private:
     int32_t HandleMotionInner(struct libinput_event_pointer* data);
     int32_t HandleButtonInner(struct libinput_event_pointer* data);
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index 18a935e884..85103d81a7 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -474,5 +474,32 @@ void MouseEventNormalize::SetAbsolutionLocation(double xPercent, double yPercent
     IPointerDrawingManager::GetInstance()->SetPointerLocation(getpid(), physicalX, physicalY);
 }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
+
+int32_t MouseEventNormalize::SetPointerLocation(int32_t x, int32_t y)
+{
+    MMI_HILOGI("Cross screen location, x:%{public}d, yPercent:%{public}d",x, y);
+    auto displayGroupInfo = WinMgr->GetDisplayGroupInfo();
+    if (currentDisplayId_ == -1) {
+        if (displayGroupInfo.displaysInfo.empty()) {
+            MMI_HILOGI("The displayInfo is empty");
+            return RET_ERR;
+        }
+        currentDisplayId_ = displayGroupInfo.displaysInfo[0].id;
+    }
+    struct DisplayInfo display;
+    for (auto &it : displayGroupInfo.displaysInfo) {
+        if (it.id == currentDisplayId_) {
+            display = it;
+            break;
+        }
+    }
+    absolutionX_ = static_cast<double>(x);
+    absolutionY_ = static_cast<double>(y);
+    WinMgr->UpdateAndAdjustMouseLocation(currentDisplayId_, absolutionX_, absolutionY_);
+    int32_t physicalX = WinMgr->GetMouseInfo().physicalX;
+    int32_t physicalY = WinMgr->GetMouseInfo().physicalY;
+    IPointerDrawingManager::GetInstance()->SetPointerLocation(getpid(), physicalX, physicalY);
+    return RET_OK;
+}
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From 08e7510aeb4562933424870d6dd98b509a8488f1 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 8 Dec 2022 13:30:53 +0000
Subject: [PATCH 222/360] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 frameworks/proxy/event_handler/src/input_manager_impl.cpp     | 4 ++++
 service/module_loader/src/mmi_service.cpp                     | 4 ++--
 service/mouse_event_normalize/include/mouse_event_normalize.h | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index e0fcd54489..477cdc5063 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -900,10 +900,14 @@ int32_t InputManagerImpl::SetFunctionKeyState(int32_t funcKey, bool enable)
 void InputManagerImpl::SetPointerLocation(int32_t x, int32_t y)
 {
     CALL_DEBUG_ENTER;
+#if defined(OHOS_BUILD_ENABLE_POINTER) && defined(OHOS_BUILD_ENABLE_POINTER_DRAWING)
     int32_t ret = MultimodalInputConnMgr->SetPointerLocation(x, y);
     if (ret != RET_OK) {
         MMI_HILOGE("Set Pointer Location failed, ret:%{public}d", ret);
     }
+#else
+    MMI_HILOGW("Pointer device or pointer drawing module does not support");
+#endif
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 23e745ae0e..ee4b1041f7 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -937,14 +937,14 @@ int32_t MMIService::SetFunctionKeyState(int32_t funcKey, bool enable)
 int32_t MMIService::SetPointerLocation(int32_t x, int32_t y)
 {
         CALL_DEBUG_ENTER;
-#ifdef OHOS_BUILD_ENABLE_POINTER
+#if defined(OHOS_BUILD_ENABLE_POINTER) && defined(OHOS_BUILD_ENABLE_POINTER_DRAWING)
     int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MouseEventNormalize::SetPointerLocation,
         MouseEventHdr, x, y));
     if (ret != RET_OK) {
         MMI_HILOGE("Set pointer speed failed,return %{public}d", ret);
         return RET_ERR;
     }
-#endif // OHOS_BUILD_ENABLE_POINTER
+#endif // OHOS_BUILD_ENABLE_POINTER && OHOS_BUILD_ENABLE_POINTER_DRAWING
     return RET_OK;
 }
 void MMIService::OnDelegateTask(epoll_event& ev)
diff --git a/service/mouse_event_normalize/include/mouse_event_normalize.h b/service/mouse_event_normalize/include/mouse_event_normalize.h
index f353dbe4da..35d9128a54 100644
--- a/service/mouse_event_normalize/include/mouse_event_normalize.h
+++ b/service/mouse_event_normalize/include/mouse_event_normalize.h
@@ -51,7 +51,7 @@ public:
     int32_t SetPointerSpeed(int32_t speed);
     int32_t GetPointerSpeed() const;
     void OnDisplayLost(int32_t displayId);
-    int32_t GetDisplayId() const;
+    int32_t GetDisplayId() const;  
     int32_t SetPointerLocation(int32_t x, int32_t y);
 private:
     int32_t HandleMotionInner(struct libinput_event_pointer* data);
-- 
Gitee


From 43d08831da473fcdbbbf1882eadceaddf6041e7b Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 8 Dec 2022 13:32:59 +0000
Subject: [PATCH 223/360] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/mouse_event_normalize/include/mouse_event_normalize.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/mouse_event_normalize/include/mouse_event_normalize.h b/service/mouse_event_normalize/include/mouse_event_normalize.h
index 35d9128a54..f353dbe4da 100644
--- a/service/mouse_event_normalize/include/mouse_event_normalize.h
+++ b/service/mouse_event_normalize/include/mouse_event_normalize.h
@@ -51,7 +51,7 @@ public:
     int32_t SetPointerSpeed(int32_t speed);
     int32_t GetPointerSpeed() const;
     void OnDisplayLost(int32_t displayId);
-    int32_t GetDisplayId() const;  
+    int32_t GetDisplayId() const;
     int32_t SetPointerLocation(int32_t x, int32_t y);
 private:
     int32_t HandleMotionInner(struct libinput_event_pointer* data);
-- 
Gitee


From df99863c4983aaa95d5b2a125db06d1ff75b859c Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 8 Dec 2022 13:37:24 +0000
Subject: [PATCH 224/360] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 frameworks/proxy/event_handler/src/input_manager_impl.cpp   | 2 +-
 service/module_loader/src/mmi_service.cpp                   | 2 +-
 service/mouse_event_normalize/src/mouse_event_normalize.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 477cdc5063..5c0b606952 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -907,7 +907,7 @@ void InputManagerImpl::SetPointerLocation(int32_t x, int32_t y)
     }
 #else
     MMI_HILOGW("Pointer device or pointer drawing module does not support");
-#endif
+#endif // OHOS_BUILD_ENABLE_POINTER && OHOS_BUILD_ENABLE_POINTER_DRAWING
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index ee4b1041f7..c81c0898f4 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -941,7 +941,7 @@ int32_t MMIService::SetPointerLocation(int32_t x, int32_t y)
     int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MouseEventNormalize::SetPointerLocation,
         MouseEventHdr, x, y));
     if (ret != RET_OK) {
-        MMI_HILOGE("Set pointer speed failed,return %{public}d", ret);
+        MMI_HILOGE("Set pointer location failed,ret %{public}d", ret);
         return RET_ERR;
     }
 #endif // OHOS_BUILD_ENABLE_POINTER && OHOS_BUILD_ENABLE_POINTER_DRAWING
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index 85103d81a7..e5b45cecb3 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -477,7 +477,7 @@ void MouseEventNormalize::SetAbsolutionLocation(double xPercent, double yPercent
 
 int32_t MouseEventNormalize::SetPointerLocation(int32_t x, int32_t y)
 {
-    MMI_HILOGI("Cross screen location, x:%{public}d, yPercent:%{public}d",x, y);
+    MMI_HILOGI("Location, x:%{public}d, y:%{public}d",x, y);
     auto displayGroupInfo = WinMgr->GetDisplayGroupInfo();
     if (currentDisplayId_ == -1) {
         if (displayGroupInfo.displaysInfo.empty()) {
-- 
Gitee


From 60cd49b326914b10a2b9d87b54b70d113d3a3bca Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Sat, 10 Dec 2022 11:41:09 +0800
Subject: [PATCH 225/360] =?UTF-8?q?=E5=AE=8F=E5=BC=80=E5=85=B3=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E7=9A=84=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/device_manager/src/input_device_manager.cpp  | 2 ++
 service/monitor/src/event_monitor_handler.cpp        | 2 ++
 service/window_manager/src/input_windows_manager.cpp | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 6dc80eed29..6fd3832bf7 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -328,9 +328,11 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     if (info.isPointerDevice) {
         bool visible = !info.isRemote || hasLocalPointer;
+#ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
         if (HasTouchDevice()) {
             IPointerDrawingManager::GetInstance()->SetMouseDisplayState(false);
         }
+#endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
         NotifyPointerDevice(true, visible);
         OHOS::system::SetParameter(INPUT_POINTER_DEVICE, "true");
         MMI_HILOGI("Set para input.pointer.device true");
diff --git a/service/monitor/src/event_monitor_handler.cpp b/service/monitor/src/event_monitor_handler.cpp
index ad04da4f6b..41042d7d0f 100644
--- a/service/monitor/src/event_monitor_handler.cpp
+++ b/service/monitor/src/event_monitor_handler.cpp
@@ -30,7 +30,9 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "EventMonitorHandler" };
+#ifdef OHOS_BUILD_ENABLE_TOUCH
 constexpr size_t MAX_EVENTIDS_SIZE = 1000;
+#endif // OHOS_BUILD_ENABLE_TOUCH
 } // namespace
 
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index b5414865aa..55b67fd2cd 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -87,13 +87,14 @@ int32_t InputWindowsManager::GetClientFd(std::shared_ptr<PointerEvent> pointerEv
             touchItemDownInfos_.erase(iter);
         }
     }
+#ifdef OHOS_BUILD_ENABLE_POINTER
     if (pointerEvent->GetSourceType() == PointerEvent::SOURCE_TYPE_MOUSE) {
         if (mouseDownInfo_.pid != -1) {
             pid = mouseDownInfo_.pid;
             InitMouseDownInfo();
         }
     }
-    
+#endif // OHOS_BUILD_ENABLE_POINTER
     return udsServer_->GetClientFd(pid);
 }
 
-- 
Gitee


From 32702929ca4d6994de0d021b21c0a1f0319ee249 Mon Sep 17 00:00:00 2001
From: "zhangyafei.echo" <zhangyafei12@huawei.com>
Date: Sat, 10 Dec 2022 17:44:41 +0800
Subject: [PATCH 226/360] IssueNo:#I65M0O Description:Change the dependency on
 cjson_static to cjson in standard system. Sig:SIG_ApplicationFramework
 Feature or BugFix: Feature Binary Source: No

Signed-off-by: zhangyafei.echo <zhangyafei12@huawei.com>
Change-Id: Ia3aa2d44fd09ea967b1add51b3fbd61bac2356d7
---
 service/BUILD.gn            | 2 +-
 tools/event_inject/BUILD.gn | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/service/BUILD.gn b/service/BUILD.gn
index ddc05b23e7..6365b37225 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -176,7 +176,7 @@ ohos_shared_library("libmmi-server") {
     "//foundation/multimodalinput/input/service/connect_manager:mmi_connect_manager_service",
     "//foundation/multimodalinput/input/service/filter:mmi_event_filter_proxy",
     "//foundation/multimodalinput/input/util:libmmi-util",
-    "//third_party/cJSON:cjson_static",
+    "//third_party/cJSON:cjson",
   ]
 
   if (resource_schedule_service_enabled) {
diff --git a/tools/event_inject/BUILD.gn b/tools/event_inject/BUILD.gn
index 318594ca6f..38b43e63e8 100644
--- a/tools/event_inject/BUILD.gn
+++ b/tools/event_inject/BUILD.gn
@@ -66,7 +66,7 @@ ohos_source_set("event-injection") {
     "//foundation/multimodalinput/input/service/connect_manager:mmi_connect_manager_proxy",
     "//foundation/multimodalinput/input/service/filter:mmi_event_filter_service",
     "//foundation/multimodalinput/input/util:libmmi-util",
-    "//third_party/cJSON:cjson_static",
+    "//third_party/cJSON:cjson",
   ]
 
   external_deps = [ "ipc:ipc_core" ]
@@ -134,7 +134,7 @@ ohos_unittest("ut-event-injection-out") {
     "${mmi_path}/tools/event_inject:event-injection",
     "${mmi_path}/util:libmmi-util",
     "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
-    "//third_party/cJSON:cjson_static",
+    "//third_party/cJSON:cjson",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]
-- 
Gitee


From 6d1068581b28a9f55ed869886c8007acd2f1327e Mon Sep 17 00:00:00 2001
From: wangdengjia <wangdengjia@huawei.com>
Date: Sat, 10 Dec 2022 22:07:07 +0800
Subject: [PATCH 227/360] IssueNo:https:#I65MO1 Description:nomalize
 multimodal_input service id. Sig:time_time_service Feature or Bugfix:Bugfix
 Binary Source:No Signed-off-by: wangdengjia <wangdengjia@huawei.com>

---
 service/connect_manager/include/i_multimodal_input_connect.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
index fb3420d42e..045a45fffa 100644
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -24,6 +24,7 @@
 #include "key_event.h"
 #include "key_option.h"
 #include "pointer_event.h"
+#include "system_ability_definition.h"
 
 namespace OHOS {
 namespace MMI {
@@ -70,7 +71,7 @@ public:
         CONNECT_MODULE_TYPE_MMI_CLIENT = 0,
     };
     static constexpr int32_t INVALID_SOCKET_FD = -1;
-    static constexpr int32_t MULTIMODAL_INPUT_CONNECT_SERVICE_ID = 3101;
+    static constexpr int32_t MULTIMODAL_INPUT_CONNECT_SERVICE_ID = MULTIMODAL_INPUT_SERVICE_ID;
     DECLARE_INTERFACE_DESCRIPTOR(u"ohos.multimodalinput.IConnectManager");
 
     virtual int32_t AllocSocketFd(const std::string &programName, const int32_t moduleType,
-- 
Gitee


From 77c0cffecaa11a05b69ec5828acd84dcc4a0827f Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 12 Dec 2022 10:44:19 +0800
Subject: [PATCH 228/360] =?UTF-8?q?64=E4=BD=8D=E7=BC=96=E8=AF=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/filter/src/event_filter_handler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/filter/src/event_filter_handler.cpp b/service/filter/src/event_filter_handler.cpp
index 8ef91517fb..394115beeb 100644
--- a/service/filter/src/event_filter_handler.cpp
+++ b/service/filter/src/event_filter_handler.cpp
@@ -70,7 +70,7 @@ int32_t EventFilterHandler::AddInputEventFilter(sptr<IEventFilter> filter,
     CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(lockFilter_);
     CHKPR(filter, ERROR_NULL_POINTER);
-    MMI_HILOGI("Add filter,filterId:%{public}d,priority:%{public}d,clientPid:%{public}d,filters_ size:%{public}u",
+    MMI_HILOGI("Add filter,filterId:%{public}d,priority:%{public}d,clientPid:%{public}d,filters_ size:%{public}zu",
         filterId, priority, clientPid, filters_.size());
     
     std::weak_ptr<EventFilterHandler> weakPtr = shared_from_this();
-- 
Gitee


From da9072883f45917c118c6a17f07f0ef76fefed55 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 12 Dec 2022 14:42:49 +0800
Subject: [PATCH 229/360] =?UTF-8?q?64=E4=BD=8D=E7=BC=96=E8=AF=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 frameworks/proxy/event_handler/src/input_manager_impl.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index d8ada45eb6..b098274d55 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -104,7 +104,7 @@ int32_t InputManagerImpl::AddInputEventFilter(std::shared_ptr<IInputEventFilter>
     std::lock_guard<std::mutex> guard(mtx_);
     CHKPR(filter, RET_ERR);
     if (eventFilterServices_.size() >= MAX_FILTER_NUM) {
-        MMI_HILOGE("Too many filters, size:%{public}u", eventFilterServices_.size());
+        MMI_HILOGE("Too many filters, size:%{public}zu", eventFilterServices_.size());
         return RET_ERR;
     }
     sptr<IEventFilter> service = new (std::nothrow) EventFilterService(filter);
@@ -128,7 +128,7 @@ int32_t InputManagerImpl::RemoveInputEventFilter(int32_t filterId)
     CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(mtx_);
     if (eventFilterServices_.empty()) {
-        MMI_HILOGE("Filters is empty, size:%{public}u", eventFilterServices_.size());
+        MMI_HILOGE("Filters is empty, size:%{public}zu", eventFilterServices_.size());
         return RET_OK;
     }
     std::map<int32_t, std::tuple<sptr<IEventFilter>, int32_t>>::iterator it;
@@ -671,7 +671,7 @@ void InputManagerImpl::ReAddInputEventFilter()
 {
     CALL_INFO_TRACE;
     if (eventFilterServices_.size() > MAX_FILTER_NUM) {
-        MMI_HILOGE("Too many filters, size:%{public}u", eventFilterServices_.size());
+        MMI_HILOGE("Too many filters, size:%{public}zu", eventFilterServices_.size());
         return;
     }
     for (const auto &[filterId, t] : eventFilterServices_) {
-- 
Gitee


From bd60bf18e27d7ce2016b0f96bb23d0e2e6b542a4 Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Mon, 12 Dec 2022 16:17:31 +0800
Subject: [PATCH 230/360] Modify napi singleton and binder communication

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
Change-Id: I81415810ce0febf8c5dbb14780fdcc507d62e296
---
 .../input_consumer/src/js_register_util.cpp   |   2 +-
 .../input_device/include/js_event_target.h    |  13 +-
 .../napi/input_device/include/js_util.h       |   9 +-
 .../napi/input_device/src/js_event_target.cpp | 269 ++++++-----------
 .../src/js_input_device_manager.cpp           |  62 ++--
 frameworks/napi/input_device/src/js_util.cpp  |   6 +-
 .../include/js_event_target.h                 |  14 +-
 .../input_device_cooperate/include/js_util.h  |  12 +-
 .../src/js_event_target.cpp                   | 275 +++++++-----------
 .../src/js_input_device_cooperate_manager.cpp |  52 ++--
 .../input_device_cooperate/src/js_util.cpp    |   8 +-
 .../include/input_device_cooperate_impl.h     |   4 +-
 .../event_handler/include/input_device_impl.h |  16 +-
 .../event_handler/src/client_msg_handler.cpp  |  75 -----
 .../src/input_device_cooperate_impl.cpp       |   4 +-
 .../event_handler/src/input_device_impl.cpp   | 160 ++--------
 .../event_handler/src/input_manager_impl.cpp  |   4 +-
 .../include/i_multimodal_input_connect.h      |   9 +-
 .../multimodal_input_connect_manager.h        |   8 +-
 .../include/multimodal_input_connect_proxy.h  |   8 +-
 .../src/multimodal_input_connect_manager.cpp  |  17 +-
 .../src/multimodal_input_connect_proxy.cpp    |  76 ++++-
 .../src/multimodal_input_connect_stub.cpp     |  53 +++-
 service/module_loader/include/mmi_service.h   |  16 +-
 service/module_loader/src/mmi_service.cpp     | 100 +------
 util/common/include/proto.h                   |   4 -
 26 files changed, 459 insertions(+), 817 deletions(-)
 mode change 100755 => 100644 frameworks/napi/input_device/src/js_event_target.cpp
 mode change 100755 => 100644 frameworks/napi/input_device_cooperate/include/js_util.h
 mode change 100755 => 100644 frameworks/napi/input_device_cooperate/src/js_event_target.cpp
 mode change 100755 => 100644 frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp
 mode change 100755 => 100644 frameworks/napi/input_device_cooperate/src/js_util.cpp
 mode change 100755 => 100644 frameworks/proxy/event_handler/include/input_device_impl.h
 mode change 100755 => 100644 frameworks/proxy/event_handler/src/input_device_impl.cpp

diff --git a/frameworks/napi/input_consumer/src/js_register_util.cpp b/frameworks/napi/input_consumer/src/js_register_util.cpp
index 84cbbd64bb..2d0bf8c3fd 100644
--- a/frameworks/napi/input_consumer/src/js_register_util.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_util.cpp
@@ -278,7 +278,7 @@ void UvQueueWorkAsyncCallback(uv_work_t *work, int32_t status)
     CALL_DEBUG_ENTER;
     CHKPV(work);
     if (work->data == nullptr) {
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         delete work;
         work = nullptr;
         return;
diff --git a/frameworks/napi/input_device/include/js_event_target.h b/frameworks/napi/input_device/include/js_event_target.h
index abd0a3cc08..ade0fe8b44 100644
--- a/frameworks/napi/input_device/include/js_event_target.h
+++ b/frameworks/napi/input_device/include/js_event_target.h
@@ -34,14 +34,13 @@ public:
     JsEventTarget();
     virtual ~JsEventTarget() = default;
     DISALLOW_COPY_AND_MOVE(JsEventTarget);
-    static void EmitJsIds(int32_t userData, std::vector<int32_t> &ids);
-    static void EmitJsDev(int32_t userData, std::shared_ptr<InputDevice> device);
-    static void EmitSupportKeys(int32_t userData, std::vector<bool> &keystrokeAbility);
-    static void EmitJsKeyboardType(int32_t userData, int32_t keyboardType);
+    static void EmitJsIds(sptr<JsUtil::CallbackInfo> cb, std::vector<int32_t> &ids);
+    static void EmitJsDev(sptr<JsUtil::CallbackInfo> cb, std::shared_ptr<InputDevice> device);
+    static void EmitSupportKeys(sptr<JsUtil::CallbackInfo> cb, std::vector<bool> &keystrokeAbility);
+    static void EmitJsKeyboardType(sptr<JsUtil::CallbackInfo> cb, int32_t keyboardType);
     void AddListener(napi_env env, const std::string &type, napi_value handle);
     void RemoveListener(napi_env env, const std::string &type, napi_value handle);
-    void RemoveCallbackInfo(napi_env env, napi_value handle, int32_t userData);
-    napi_value CreateCallbackInfo(napi_env env, napi_value handle, const int32_t userData, bool isApi9 = false);
+    napi_value CreateCallbackInfo(napi_env, napi_value handle, sptr<JsUtil::CallbackInfo> cb);
     void ResetEnv();
     void OnDeviceAdded(int32_t deviceId, const std::string &type) override;
     void OnDeviceRemoved(int32_t deviceId, const std::string &type) override;
@@ -61,10 +60,8 @@ private:
     static void CallDevInfoPromiseWork(uv_work_t *work, int32_t status);
     static void EmitAddedDeviceEvent(uv_work_t *work, int32_t status);
     static void EmitRemoveDeviceEvent(uv_work_t *work, int32_t status);
-    static std::unique_ptr<JsUtil::CallbackInfo> GetCallbackInfo(uv_work_t *work);
     static napi_value GreateBusinessError(napi_env env, int32_t errCode, std::string errMessage);
 private:
-    inline static std::map<int32_t, std::unique_ptr<JsUtil::CallbackInfo>> callback_ {};
     inline static std::map<std::string, std::vector<std::unique_ptr<JsUtil::CallbackInfo>>> devListener_ {};
     bool isListeningProcess_ { false };
 };
diff --git a/frameworks/napi/input_device/include/js_util.h b/frameworks/napi/input_device/include/js_util.h
index 6cabb8afbb..ad2e2cb463 100644
--- a/frameworks/napi/input_device/include/js_util.h
+++ b/frameworks/napi/input_device/include/js_util.h
@@ -21,6 +21,7 @@
 #include "input_device.h"
 #include "napi/native_api.h"
 #include "napi/native_node_api.h"
+#include "refbase.h"
 
 namespace OHOS {
 namespace MMI {
@@ -39,7 +40,7 @@ public:
         int32_t deviceId { 0 };
         int32_t keyboardType { 0 };
     };
-    struct CallbackInfo {
+    struct CallbackInfo : RefBase {
         napi_env env { nullptr };
         napi_ref ref { nullptr };
         napi_deferred deferred { nullptr };
@@ -54,9 +55,9 @@ public:
     };
 
     static bool IsSameHandle(napi_env env, napi_value handle, napi_ref ref);
-    static napi_value GetDeviceInfo(const std::unique_ptr<CallbackInfo> &cb);
-    static bool GetDeviceAxisInfo(const std::unique_ptr<CallbackInfo> &cb, napi_value &object);
-    static bool GetDeviceSourceType(const std::unique_ptr<CallbackInfo> &cb, napi_value &object);
+    static napi_value GetDeviceInfo(sptr<CallbackInfo> cb);
+    static bool GetDeviceAxisInfo(sptr<CallbackInfo> cb, napi_value &object);
+    static bool GetDeviceSourceType(sptr<CallbackInfo> cb, napi_value &object);
     static bool TypeOf(napi_env env, napi_value value, napi_valuetype type);
     static void DeleteCallbackInfo(std::unique_ptr<CallbackInfo> callback);
     template <typename T>
diff --git a/frameworks/napi/input_device/src/js_event_target.cpp b/frameworks/napi/input_device/src/js_event_target.cpp
old mode 100755
new mode 100644
index 835f4eae2b..2847c1d212
--- a/frameworks/napi/input_device/src/js_event_target.cpp
+++ b/frameworks/napi/input_device/src/js_event_target.cpp
@@ -203,10 +203,10 @@ void JsEventTarget::CallIdsAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
-
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
     if (scope == nullptr) {
@@ -240,10 +240,10 @@ void JsEventTarget::CallIdsPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
-
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
     if (scope == nullptr) {
@@ -263,44 +263,28 @@ void JsEventTarget::CallIdsPromiseWork(uv_work_t *work, int32_t status)
     napi_close_handle_scope(cb->env, scope);
 }
 
-void JsEventTarget::EmitJsIds(int32_t userData, std::vector<int32_t> &ids)
+void JsEventTarget::EmitJsIds(sptr<JsUtil::CallbackInfo> cb, std::vector<int32_t> &ids)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Failed to search for userData");
-        return;
-    }
-    CHKPV(iter->second);
-    if (iter->second->env == nullptr) {
-        callback_.erase(iter);
-        MMI_HILOGE("The env is nullptr");
-        return;
-    }
-
-    iter->second->data.ids = ids;
-    iter->second->errCode = RET_OK;
+    CHKPV(cb);
+    CHKPV(cb->env);
+    cb->data.ids = ids;
+    cb->errCode = RET_OK;
     uv_loop_s *loop = nullptr;
-    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
+    CHKRV(napi_get_uv_event_loop(cb->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
-    int32_t *uData = new (std::nothrow) int32_t(userData);
-    if (uData == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check uData is nullptr");
-        return;
-    }
-    work->data = static_cast<void*>(uData);
+    cb->IncStrongRef(nullptr);
+    work->data = cb.GetRefPtr();
     int32_t ret;
-    if (iter->second->isApi9) {
-        if (iter->second->ref == nullptr) {
+    if (cb->isApi9) {
+        if (cb->ref == nullptr) {
             ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevListPromiseWork);
         } else {
             ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevListAsyncWork);
         }
     } else {
-        if (iter->second->ref == nullptr) {
+        if (cb->ref == nullptr) {
             ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallIdsPromiseWork);
         } else {
             ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallIdsAsyncWork);
@@ -309,7 +293,6 @@ void JsEventTarget::EmitJsIds(int32_t userData, std::vector<int32_t> &ids)
     if (ret != 0) {
         MMI_HILOGE("uv_queue_work failed");
         JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeletePtr<int32_t*>(uData);
     }
 }
 
@@ -322,8 +305,9 @@ void JsEventTarget::CallDevAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -351,8 +335,9 @@ void JsEventTarget::CallDevPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -370,45 +355,29 @@ void JsEventTarget::CallDevPromiseWork(uv_work_t *work, int32_t status)
     napi_close_handle_scope(cb->env, scope);
 }
 
-void JsEventTarget::EmitJsDev(int32_t userData, std::shared_ptr<InputDevice> device)
+void JsEventTarget::EmitJsDev(sptr<JsUtil::CallbackInfo> cb, std::shared_ptr<InputDevice> device)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
     CHKPV(device);
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Failed to search for userData");
-        return;
-    }
-    CHKPV(iter->second);
-    if (iter->second->env == nullptr) {
-        callback_.erase(iter);
-        MMI_HILOGE("The env is nullptr");
-        return;
-    }
-
-    iter->second->data.device = device;
-    iter->second->errCode = RET_OK;
+    CHKPV(cb);
+    CHKPV(cb->env);
+    cb->data.device = device;
+    cb->errCode = RET_OK;
     uv_loop_s *loop = nullptr;
-    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
+    CHKRV(napi_get_uv_event_loop(cb->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
-    int32_t *uData = new (std::nothrow) int32_t(userData);
-    if (uData == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check uData is nullptr");
-        return;
-    }
-    work->data = static_cast<void*>(uData);
+    cb->IncStrongRef(nullptr);
+    work->data = cb.GetRefPtr();
     int32_t ret;
-    if (iter->second->isApi9) {
-        if (iter->second->ref == nullptr) {
+    if (cb->isApi9) {
+        if (cb->ref == nullptr) {
             ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevInfoPromiseWork);
         } else {
             ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevInfoAsyncWork);
         }
     } else {
-        if (iter->second->ref == nullptr) {
+        if (cb->ref == nullptr) {
             ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevPromiseWork);
         } else {
             ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallDevAsyncWork);
@@ -417,8 +386,6 @@ void JsEventTarget::EmitJsDev(int32_t userData, std::shared_ptr<InputDevice> dev
     if (ret != 0) {
         MMI_HILOGE("uv_queue_work failed");
         JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeletePtr<int32_t*>(uData);
-        return;
     }
 }
 
@@ -431,10 +398,10 @@ void JsEventTarget::CallKeystrokeAbilityPromise(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
-
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
     CHKPV(scope);
@@ -483,10 +450,10 @@ void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
-
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
     CHKPV(scope);
@@ -531,37 +498,21 @@ void JsEventTarget::CallKeystrokeAbilityAsync(uv_work_t *work, int32_t status)
     napi_close_handle_scope(cb->env, scope);
 }
 
-void JsEventTarget::EmitSupportKeys(int32_t userData, std::vector<bool> &keystrokeAbility)
+void JsEventTarget::EmitSupportKeys(sptr<JsUtil::CallbackInfo> cb, std::vector<bool> &keystrokeAbility)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Failed to search for userData");
-        return;
-    }
-    CHKPV(iter->second);
-    if (iter->second->env == nullptr) {
-        callback_.erase(iter);
-        MMI_HILOGE("The env is nullptr");
-        return;
-    }
-
-    iter->second->data.keystrokeAbility = keystrokeAbility;
-    iter->second->errCode = RET_OK;
+    CHKPV(cb);
+    CHKPV(cb->env);
+    cb->data.keystrokeAbility = keystrokeAbility;
+    cb->errCode = RET_OK;
     uv_loop_s *loop = nullptr;
-    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
+    CHKRV(napi_get_uv_event_loop(cb->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
-    int32_t *uData = new (std::nothrow) int32_t(userData);
-    if (uData == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is nullptr");
-        return;
-    }
-    work->data = static_cast<void*>(uData);
+    cb->IncStrongRef(nullptr);
+    work->data = cb.GetRefPtr();
     int32_t ret;
-    if (iter->second->ref == nullptr) {
+    if (cb->ref == nullptr) {
         ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallKeystrokeAbilityPromise);
     } else {
         ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallKeystrokeAbilityAsync);
@@ -569,42 +520,25 @@ void JsEventTarget::EmitSupportKeys(int32_t userData, std::vector<bool> &keystro
     if (ret != 0) {
         MMI_HILOGE("uv_queue_work failed");
         JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeletePtr<int32_t*>(uData);
-        return;
     }
 }
 
-void JsEventTarget::EmitJsKeyboardType(int32_t userData, int32_t keyboardType)
+void JsEventTarget::EmitJsKeyboardType(sptr<JsUtil::CallbackInfo> cb, int32_t keyboardType)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Failed to search for userData");
-        return;
-    }
-    CHKPV(iter->second);
-    if (iter->second->env == nullptr) {
-        callback_.erase(iter);
-        MMI_HILOGE("The env is nullptr");
-        return;
-    }
-    iter->second->data.keyboardType = keyboardType;
-    iter->second->errCode = RET_OK;
+    CHKPV(cb);
+    CHKPV(cb->env);
+    cb->data.keyboardType = keyboardType;
+    cb->errCode = RET_OK;
     uv_loop_s *loop = nullptr;
-    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
+    CHKRV(napi_get_uv_event_loop(cb->env, &loop), GET_UV_EVENT_LOOP);
 
     uv_work_t *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
-    int32_t *uData = new (std::nothrow) int32_t(userData);
-    if (uData == nullptr) {
-        JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check uDdata is nullptr");
-        return;
-    }
-    work->data = static_cast<void*>(uData);
-    int32_t ret = 0;
-    if (iter->second->ref == nullptr) {
+    cb->IncStrongRef(nullptr);
+    work->data = cb.GetRefPtr();
+    int32_t ret;
+    if (cb->ref == nullptr) {
         ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallKeyboardTypePromise);
     } else {
         ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallKeyboardTypeAsync);
@@ -612,8 +546,6 @@ void JsEventTarget::EmitJsKeyboardType(int32_t userData, int32_t keyboardType)
     if (ret != 0) {
         MMI_HILOGE("uv_queue_work failed");
         JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeletePtr<int32_t*>(uData);
-        return;
     }
 }
 
@@ -626,8 +558,9 @@ void JsEventTarget::CallKeyboardTypeAsync(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
 
     napi_handle_scope scope = nullptr;
@@ -675,8 +608,9 @@ void JsEventTarget::CallKeyboardTypePromise(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
 
     napi_handle_scope scope = nullptr;
@@ -719,8 +653,9 @@ void JsEventTarget::CallDevListAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -773,8 +708,9 @@ void JsEventTarget::CallDevListPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -822,8 +758,9 @@ void JsEventTarget::CallDevInfoPromiseWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -872,8 +809,9 @@ void JsEventTarget::CallDevInfoAsyncWork(uv_work_t *work, int32_t status)
         MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
@@ -974,23 +912,6 @@ monitorLabel:
     }
 }
 
-napi_value JsEventTarget::CreateCallbackInfo(napi_env env, napi_value handle, const int32_t userData, bool isApi9)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto cb = std::make_unique<JsUtil::CallbackInfo>();
-    cb->env = env;
-    cb->isApi9 = isApi9;
-    napi_value promise = nullptr;
-    if (handle == nullptr) {
-        CHKRP(napi_create_promise(env, &cb->deferred, &promise), CREATE_PROMISE);
-    } else {
-        CHKRP(napi_create_reference(env, handle, 1, &cb->ref), CREATE_REFERENCE);
-    }
-    callback_.emplace(userData, std::move(cb));
-    return promise;
-}
-
 napi_value JsEventTarget::GreateBusinessError(napi_env env, int32_t errCode, std::string errMessage)
 {
     CALL_DEBUG_ENTER;
@@ -1004,40 +925,24 @@ napi_value JsEventTarget::GreateBusinessError(napi_env env, int32_t errCode, std
     return result;
 }
 
-std::unique_ptr<JsUtil::CallbackInfo> JsEventTarget::GetCallbackInfo(uv_work_t *work)
-{
-    std::lock_guard<std::mutex> guard(mutex_);
-    int32_t *uData = static_cast<int32_t*>(work->data);
-    int32_t userData = *uData;
-    JsUtil::DeletePtr<uv_work_t*>(work);
-    JsUtil::DeletePtr<int32_t*>(uData);
-
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Find userData failed");
-        return nullptr;
-    }
-    auto cb = std::move(iter->second);
-    callback_.erase(iter);
-    return cb;
-}
-
-void JsEventTarget::RemoveCallbackInfo(napi_env env, napi_value handle, int32_t userData)
+napi_value JsEventTarget::CreateCallbackInfo(napi_env env, napi_value handle, sptr<JsUtil::CallbackInfo> cb)
 {
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = callback_.find(userData);
-    if (iter != callback_.end()) {
-        auto cb = std::move(iter->second);
-        callback_.erase(iter);
+    CALL_INFO_TRACE;
+    CHKPP(cb);
+    cb->env = env;
+    napi_value promise = nullptr;
+    if (handle == nullptr) {
+        CHKRP(napi_create_promise(env, &cb->deferred, &promise), CREATE_PROMISE);
+    } else {
+        CHKRP(napi_create_reference(env, handle, 1, &cb->ref), CREATE_REFERENCE);
     }
+    return promise;
 }
 
 void JsEventTarget::ResetEnv()
 {
     CALL_DEBUG_ENTER;
     std::lock_guard<std::mutex> guard(mutex_);
-    callback_.clear();
     devListener_.clear();
     InputMgr->UnregisterDevListener("change", shared_from_this());
 }
diff --git a/frameworks/napi/input_device/src/js_input_device_manager.cpp b/frameworks/napi/input_device/src/js_input_device_manager.cpp
index 6de4913eb8..18f795db7a 100644
--- a/frameworks/napi/input_device/src/js_input_device_manager.cpp
+++ b/frameworks/napi/input_device/src/js_input_device_manager.cpp
@@ -39,10 +39,10 @@ void JsInputDeviceManager::UnregisterDevListener(napi_env env, const std::string
 napi_value JsInputDeviceManager::GetDeviceIds(napi_env env, napi_value handle)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    int32_t userData = InputDevImpl.GetUserData();
-    napi_value ret = CreateCallbackInfo(env, handle, userData);
-    auto callback = std::bind(EmitJsIds, userData, std::placeholders::_1);
+    sptr<JsUtil::CallbackInfo> cb = new (std::nothrow) JsUtil::CallbackInfo();
+    CHKPP(cb);
+    napi_value ret = CreateCallbackInfo(env, handle, cb);
+    auto callback = std::bind(EmitJsIds, cb, std::placeholders::_1);
     InputMgr->GetDeviceIds(callback);
     return ret;
 }
@@ -50,10 +50,10 @@ napi_value JsInputDeviceManager::GetDeviceIds(napi_env env, napi_value handle)
 napi_value JsInputDeviceManager::GetDevice(napi_env env, int32_t id, napi_value handle)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    int32_t userData = InputDevImpl.GetUserData();
-    napi_value ret = CreateCallbackInfo(env, handle, userData);
-    auto callback = std::bind(EmitJsDev, userData, std::placeholders::_1);
+    sptr<JsUtil::CallbackInfo> cb = new (std::nothrow) JsUtil::CallbackInfo();
+    CHKPP(cb);
+    napi_value ret = CreateCallbackInfo(env, handle, cb);
+    auto callback = std::bind(EmitJsDev, cb, std::placeholders::_1);
     InputMgr->GetDevice(id, callback);
     return ret;
 }
@@ -62,65 +62,53 @@ napi_value JsInputDeviceManager::SupportKeys(napi_env env, int32_t id, std::vect
     napi_value handle)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    int32_t userData = InputDevImpl.GetUserData();
-    napi_value ret = CreateCallbackInfo(env, handle, userData);
-    auto callback = std::bind(EmitSupportKeys, userData, std::placeholders::_1);
+    sptr<JsUtil::CallbackInfo> cb = new (std::nothrow) JsUtil::CallbackInfo();
+    CHKPP(cb);
+    napi_value ret = CreateCallbackInfo(env, handle, cb);
+    auto callback = std::bind(EmitSupportKeys, cb, std::placeholders::_1);
     int32_t napiCode = InputMgr->SupportKeys(id, keyCodes, callback);
     if (napiCode != OTHER_ERROR && napiCode != RET_OK) {
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Invalid input device id");
     }
-    if (napiCode != RET_OK) {
-        JsEventTarget::RemoveCallbackInfo(env, handle, userData);
-    }
     return ret;
 }
 
 napi_value JsInputDeviceManager::GetKeyboardType(napi_env env, int32_t id, napi_value handle)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    int32_t userData = InputDevImpl.GetUserData();
-    napi_value ret = CreateCallbackInfo(env, handle, userData);
-    auto callback = std::bind(EmitJsKeyboardType, userData, std::placeholders::_1);
+    sptr<JsUtil::CallbackInfo> cb = new (std::nothrow) JsUtil::CallbackInfo();
+    CHKPP(cb);
+    napi_value ret = CreateCallbackInfo(env, handle, cb);
+    auto callback = std::bind(EmitJsKeyboardType, cb, std::placeholders::_1);
     int32_t napiCode = InputMgr->GetKeyboardType(id, callback);
     if (napiCode != OTHER_ERROR && napiCode != RET_OK) {
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Invalid input device id");
     }
-    if (napiCode != RET_OK) {
-        JsEventTarget::RemoveCallbackInfo(env, handle, userData);
-    }
     return ret;
 }
 
 napi_value JsInputDeviceManager::GetDeviceList(napi_env env, napi_value handle)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    int32_t userData = InputDevImpl.GetUserData();
-    napi_value ret = CreateCallbackInfo(env, handle, userData, true);
-    auto callback = std::bind(EmitJsIds, userData, std::placeholders::_1);
-    int32_t napiCode = InputMgr->GetDeviceIds(callback);
-    if (napiCode != RET_OK) {
-        JsEventTarget::RemoveCallbackInfo(env, handle, userData);
-    }
+    sptr<JsUtil::CallbackInfo> cb = new (std::nothrow) JsUtil::CallbackInfo();
+    CHKPP(cb);
+    napi_value ret = CreateCallbackInfo(env, handle, cb);
+    auto callback = std::bind(EmitJsIds, cb, std::placeholders::_1);
+    InputMgr->GetDeviceIds(callback);
     return ret;
 }
 
 napi_value JsInputDeviceManager::GetDeviceInfo(napi_env env, int32_t id, napi_value handle)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    int32_t userData = InputDevImpl.GetUserData();
-    napi_value ret = CreateCallbackInfo(env, handle, userData, true);
-    auto callback = std::bind(EmitJsDev, userData, std::placeholders::_1);
+    sptr<JsUtil::CallbackInfo> cb = new (std::nothrow) JsUtil::CallbackInfo();
+    CHKPP(cb);
+    napi_value ret = CreateCallbackInfo(env, handle, cb);
+    auto callback = std::bind(EmitJsDev, cb, std::placeholders::_1);
     int32_t napiCode = InputMgr->GetDevice(id, callback);
     if (napiCode != OTHER_ERROR && napiCode != RET_OK) {
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "Invalid input device id");
     }
-    if (napiCode != RET_OK) {
-        JsEventTarget::RemoveCallbackInfo(env, handle, userData);
-    }
     return ret;
 }
 
diff --git a/frameworks/napi/input_device/src/js_util.cpp b/frameworks/napi/input_device/src/js_util.cpp
index 5996e6e013..9061665655 100644
--- a/frameworks/napi/input_device/src/js_util.cpp
+++ b/frameworks/napi/input_device/src/js_util.cpp
@@ -59,7 +59,7 @@ bool JsUtil::IsSameHandle(napi_env env, napi_value handle, napi_ref ref)
     return isEqual;
 }
 
-napi_value JsUtil::GetDeviceInfo(const std::unique_ptr<CallbackInfo> &cb)
+napi_value JsUtil::GetDeviceInfo(sptr<CallbackInfo> cb)
 {
     CHKPP(cb);
     CHKPP(cb->env);
@@ -105,7 +105,7 @@ napi_value JsUtil::GetDeviceInfo(const std::unique_ptr<CallbackInfo> &cb)
     return object;
 }
 
-bool JsUtil::GetDeviceAxisInfo(const std::unique_ptr<CallbackInfo> &cb, napi_value &object)
+bool JsUtil::GetDeviceAxisInfo(sptr<CallbackInfo> cb, napi_value &object)
 {
     CHKPF(cb);
     CHKPF(cb->env);
@@ -162,7 +162,7 @@ bool JsUtil::GetDeviceAxisInfo(const std::unique_ptr<CallbackInfo> &cb, napi_val
     return true;
 }
 
-bool JsUtil::GetDeviceSourceType(const std::unique_ptr<CallbackInfo> &cb, napi_value &object)
+bool JsUtil::GetDeviceSourceType(sptr<CallbackInfo> cb, napi_value &object)
 {
     CHKPF(cb);
     CHKPF(cb->env);
diff --git a/frameworks/napi/input_device_cooperate/include/js_event_target.h b/frameworks/napi/input_device_cooperate/include/js_event_target.h
index a71e787c18..dcc55efe56 100755
--- a/frameworks/napi/input_device_cooperate/include/js_event_target.h
+++ b/frameworks/napi/input_device_cooperate/include/js_event_target.h
@@ -39,15 +39,14 @@ public:
     virtual ~JsEventTarget() = default;
     DISALLOW_COPY_AND_MOVE(JsEventTarget);
 
-    static void EmitJsEnable(int32_t userData, std::string deviceId, CooperationMessage msg);
-    static void EmitJsStart(int32_t userData, std::string, CooperationMessage msg);
-    static void EmitJsStop(int32_t userData, std::string, CooperationMessage msg);
-    static void EmitJsGetState(int32_t userData, bool state);
+    static void EmitJsEnable(sptr<JsUtil::CallbackInfo> cb, const std::string &deviceId, const CooperationMessage &msg);
+    static void EmitJsStart(sptr<JsUtil::CallbackInfo> cb, const std::string &deviceId, const CooperationMessage &msg);
+    static void EmitJsStop(sptr<JsUtil::CallbackInfo> cb, const std::string &deviceId, const CooperationMessage &msg);
+    static void EmitJsGetState(sptr<JsUtil::CallbackInfo> cb, bool state);
 
     void AddListener(napi_env env, const std::string &type, napi_value handle);
     void RemoveListener(napi_env env, const std::string &type, napi_value handle);
-    napi_value CreateCallbackInfo(napi_env, napi_value handle, int32_t userData);
-    void RemoveCallbackInfo(int32_t userData);
+    napi_value CreateCallbackInfo(napi_env, napi_value handle, sptr<JsUtil::CallbackInfo> cb);
     void HandleExecuteResult(napi_env env, int32_t errCode);
     void ResetEnv();
 
@@ -56,7 +55,6 @@ public:
 private:
     inline static std::map<std::string_view, std::vector<std::unique_ptr<JsUtil::CallbackInfo>>>
         cooperateListener_ {};
-    inline static std::map<int32_t, std::unique_ptr<JsUtil::CallbackInfo>> callback_ {};
     bool isListeningProcess_ { false };
 
     static void CallEnablePromiseWork(uv_work_t *work, int32_t status);
@@ -68,8 +66,6 @@ private:
     static void CallGetStatePromiseWork(uv_work_t *work, int32_t status);
     static void CallGetStateAsyncWork(uv_work_t *work, int32_t status);
     static void EmitCooperateMessageEvent(uv_work_t *work, int32_t status);
-
-    static std::unique_ptr<JsUtil::CallbackInfo> GetCallbackInfo(uv_work_t *work);
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/napi/input_device_cooperate/include/js_util.h b/frameworks/napi/input_device_cooperate/include/js_util.h
old mode 100755
new mode 100644
index 1332885d80..9eca76ade6
--- a/frameworks/napi/input_device_cooperate/include/js_util.h
+++ b/frameworks/napi/input_device_cooperate/include/js_util.h
@@ -25,6 +25,8 @@
 
 #include "cooperation_message.h"
 
+#include "refbase.h"
+
 namespace OHOS {
 namespace MMI {
 class JsUtil {
@@ -46,7 +48,7 @@ public:
         CooperationMessage msg = CooperationMessage::OPEN_SUCCESS;
     };
 
-    struct CallbackInfo {
+    struct CallbackInfo : RefBase {
         CallbackInfo() = default;
         ~CallbackInfo();
         napi_env env { nullptr };
@@ -57,10 +59,10 @@ public:
         UserData uData;
     };
 
-    static napi_value GetEnableInfo(const std::unique_ptr<CallbackInfo> &cb);
-    static napi_value GetStartInfo(const std::unique_ptr<CallbackInfo> &cb);
-    static napi_value GetStopInfo(const std::unique_ptr<CallbackInfo> &cb);
-    static napi_value GetStateInfo(const std::unique_ptr<CallbackInfo> &cb);
+    static napi_value GetEnableInfo(sptr<CallbackInfo> cb);
+    static napi_value GetStartInfo(sptr<CallbackInfo> cb);
+    static napi_value GetStopInfo(sptr<CallbackInfo> cb);
+    static napi_value GetStateInfo(sptr<CallbackInfo> cb);
     static napi_value GetStateResult(napi_env env, bool result);
     static napi_value GetResult(napi_env env, bool result, int32_t errCode);
     static bool IsSameHandle(napi_env env, napi_value handle, napi_ref ref);
diff --git a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
old mode 100755
new mode 100644
index 21b3dde6d7..72843f8f24
--- a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
@@ -42,38 +42,21 @@ JsEventTarget::JsEventTarget()
     CK(ret.second, VAL_NOT_EXP);
 }
 
-void JsEventTarget::EmitJsEnable(int32_t userData, std::string deviceId, CooperationMessage msg)
+void JsEventTarget::EmitJsEnable(sptr<JsUtil::CallbackInfo> cb, const std::string &deviceId, const CooperationMessage &msg)
 {
     CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Failed to search for userData");
-        return;
-    }
-    CHKPV(iter->second);
-    if (iter->second->env == nullptr) {
-        callback_.erase(iter);
-        MMI_HILOGE("The env is nullptr");
-        return;
-    }
-    iter->second->data.enableResult =
-        (msg == CooperationMessage::OPEN_SUCCESS || msg == CooperationMessage::CLOSE_SUCCESS) ? true : false;
-    iter->second->data.errCode = static_cast<int32_t>(msg);
+    CHKPV(cb);
+    CHKPV(cb->env);
+    cb->data.enableResult = (msg == CooperationMessage::OPEN_SUCCESS || msg == CooperationMessage::CLOSE_SUCCESS);
+    cb->data.errCode = static_cast<int32_t>(msg);
     uv_loop_s *loop = nullptr;
-    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
+    CHKRV(napi_get_uv_event_loop(cb->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_s *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
-    int32_t *uData = new (std::nothrow) int32_t(userData);
-    if (uData == nullptr) {
-        MMI_HILOGE("uData is nullptr");
-        delete work;
-        work = nullptr;
-        return;
-    }
-    work->data = static_cast<void*>(uData);
+    cb->IncStrongRef(nullptr);
+    work->data = cb.GetRefPtr();
     int32_t result;
-    if (iter->second->ref == nullptr) {
+    if (cb->ref == nullptr) {
         result = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallEnablePromiseWork);
     } else {
         result = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallEnableAsyncWork);
@@ -82,41 +65,24 @@ void JsEventTarget::EmitJsEnable(int32_t userData, std::string deviceId, Coopera
     if (result != 0) {
         MMI_HILOGE("uv_queue_work failed");
         JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeletePtr<int32_t*>(uData);
     }
 }
 
-void JsEventTarget::EmitJsStart(int32_t userData, std::string deviceId, CooperationMessage msg)
+void JsEventTarget::EmitJsStart(sptr<JsUtil::CallbackInfo> cb, const std::string &deviceId, const CooperationMessage &msg)
 {
     CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Failed to search for userData");
-        return;
-    }
-    CHKPV(iter->second);
-    if (iter->second->env == nullptr) {
-        callback_.erase(iter);
-        MMI_HILOGE("The env is nullptr");
-        return;
-    }
-    iter->second->data.startResult = (msg == CooperationMessage::INFO_SUCCESS ? true : false);
-    iter->second->data.errCode = static_cast<int32_t>(msg);
+    CHKPV(cb);
+    CHKPV(cb->env);
+    cb->data.startResult = (msg == CooperationMessage::INFO_SUCCESS);
+    cb->data.errCode = static_cast<int32_t>(msg);
     uv_loop_s *loop = nullptr;
-    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
+    CHKRV(napi_get_uv_event_loop(cb->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_s *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
-    int32_t *uData = new (std::nothrow) int32_t(userData);
-    if (uData == nullptr) {
-        MMI_HILOGE("uData is nullptr");
-        delete work;
-        work = nullptr;
-        return;
-    }
-    work->data = static_cast<void*>(uData);
+    cb->IncStrongRef(nullptr);
+    work->data = cb.GetRefPtr();
     int32_t result;
-    if (iter->second->ref == nullptr) {
+    if (cb->ref == nullptr) {
         result = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallStartPromiseWork);
     } else {
         result = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallStartAsyncWork);
@@ -125,41 +91,24 @@ void JsEventTarget::EmitJsStart(int32_t userData, std::string deviceId, Cooperat
     if (result != 0) {
         MMI_HILOGE("uv_queue_work failed");
         JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeletePtr<int32_t*>(uData);
     }
 }
 
-void JsEventTarget::EmitJsStop(int32_t userData, std::string deviceId, CooperationMessage msg)
+void JsEventTarget::EmitJsStop(sptr<JsUtil::CallbackInfo> cb, const std::string &deviceId, const CooperationMessage &msg)
 {
     CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Failed to search for userData");
-        return;
-    }
-    CHKPV(iter->second);
-    if (iter->second->env == nullptr) {
-        callback_.erase(iter);
-        MMI_HILOGE("The env is nullptr");
-        return;
-    }
-    iter->second->data.stopResult = (msg == CooperationMessage::STOP_SUCCESS ? true : false);
-    iter->second->data.errCode = static_cast<int32_t>(msg);
+    CHKPV(cb);
+    CHKPV(cb->env);
+    cb->data.stopResult = (msg == CooperationMessage::STOP_SUCCESS);
+    cb->data.errCode = static_cast<int32_t>(msg);
     uv_loop_s *loop = nullptr;
-    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
+    CHKRV(napi_get_uv_event_loop(cb->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_s *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
-    int32_t *uData = new (std::nothrow) int32_t(userData);
-    if (uData == nullptr) {
-        MMI_HILOGE("uData is nullptr");
-        delete work;
-        work = nullptr;
-        return;
-    }
-    work->data = static_cast<void*>(uData);
+    cb->IncStrongRef(nullptr);
+    work->data = cb.GetRefPtr();
     int32_t result;
-    if (iter->second->ref == nullptr) {
+    if (cb->ref == nullptr) {
         result = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallStopPromiseWork);
     } else {
         result = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallStopAsyncWork);
@@ -168,40 +117,23 @@ void JsEventTarget::EmitJsStop(int32_t userData, std::string deviceId, Cooperati
     if (result != 0) {
         MMI_HILOGE("uv_queue_work failed");
         JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeletePtr<int32_t*>(uData);
     }
 }
 
-void JsEventTarget::EmitJsGetState(int32_t userData, bool state)
+void JsEventTarget::EmitJsGetState(sptr<JsUtil::CallbackInfo> cb, bool state)
 {
     CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Failed to search for userData");
-        return;
-    }
-    CHKPV(iter->second);
-    if (iter->second->env == nullptr) {
-        callback_.erase(iter);
-        MMI_HILOGE("The env is nullptr");
-        return;
-    }
-    iter->second->data.cooperateOpened = state;
+    CHKPV(cb);
+    CHKPV(cb->env);
+    cb->data.cooperateOpened = state;
     uv_loop_s *loop = nullptr;
-    CHKRV(napi_get_uv_event_loop(iter->second->env, &loop), GET_UV_EVENT_LOOP);
+    CHKRV(napi_get_uv_event_loop(cb->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_s *work = new (std::nothrow) uv_work_t;
     CHKPV(work);
-    int32_t *uData = new (std::nothrow) int32_t(userData);
-    if (uData == nullptr) {
-        MMI_HILOGE("uData is null");
-        delete work;
-        work = nullptr;
-        return;
-    }
-    work->data = static_cast<void*>(uData);
+    cb->IncStrongRef(nullptr);
+    work->data = cb.GetRefPtr();
     int32_t result;
-    if (iter->second->ref == nullptr) {
+    if (cb->ref == nullptr) {
         result = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallGetStatePromiseWork);
     } else {
         result = uv_queue_work(loop, work, [](uv_work_t *work) {}, CallGetStateAsyncWork);
@@ -210,7 +142,6 @@ void JsEventTarget::EmitJsGetState(int32_t userData, bool state)
     if (result != 0) {
         MMI_HILOGE("uv_queue_work failed");
         JsUtil::DeletePtr<uv_work_t*>(work);
-        JsUtil::DeletePtr<int32_t*>(uData);
     }
 }
 
@@ -271,11 +202,10 @@ monitorLabel:
     }
 }
 
-napi_value JsEventTarget::CreateCallbackInfo(napi_env env, napi_value handle, int32_t userData)
+napi_value JsEventTarget::CreateCallbackInfo(napi_env env, napi_value handle, sptr<JsUtil::CallbackInfo> cb)
 {
     CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto cb = std::make_unique<JsUtil::CallbackInfo>();
+    CHKPP(cb);
     cb->env = env;
     napi_value promise = nullptr;
     if (handle == nullptr) {
@@ -283,25 +213,13 @@ napi_value JsEventTarget::CreateCallbackInfo(napi_env env, napi_value handle, in
     } else {
         CHKRP(napi_create_reference(env, handle, 1, &cb->ref), CREATE_REFERENCE);
     }
-    callback_.emplace(userData, std::move(cb));
     return promise;
 }
 
-void JsEventTarget::RemoveCallbackInfo(int32_t userData)
-{
-    CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mutex_);
-    auto iter = callback_.find(userData);
-    if (iter != callback_.end()) {
-        callback_.erase(iter);
-    }
-}
-
 void JsEventTarget::ResetEnv()
 {
     CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(mutex_);
-    callback_.clear();
     cooperateListener_.clear();
     InputMgr->UnregisterCooperateListener(shared_from_this());
 }
@@ -340,15 +258,19 @@ void JsEventTarget::CallEnablePromiseWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
-
+    if (scope == nullptr) {
+        MMI_HILOGE("scope is nullptr");
+        return;
+    }
     napi_value object = JsUtil::GetEnableInfo(cb);
     if (object == nullptr) {
         MMI_HILOGE("object is nullptr");
@@ -375,14 +297,19 @@ void JsEventTarget::CallEnableAsyncWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
+    CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
-
+    if (scope == nullptr) {
+        MMI_HILOGE("scope is nullptr");
+        return;
+    }
     napi_value object = JsUtil::GetEnableInfo(cb);
     if (object == nullptr) {
         MMI_HILOGE("object is nullptr");
@@ -402,15 +329,19 @@ void JsEventTarget::CallStartPromiseWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
-
+    if (scope == nullptr) {
+        MMI_HILOGE("scope is nullptr");
+        return;
+    }
     napi_value object = JsUtil::GetStartInfo(cb);
     if (object == nullptr) {
         MMI_HILOGE("object is nullptr");
@@ -437,14 +368,19 @@ void JsEventTarget::CallStartAsyncWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
+    CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
-
+    if (scope == nullptr) {
+        MMI_HILOGE("scope is nullptr");
+        return;
+    }
     napi_value object = JsUtil::GetStartInfo(cb);
     if (object == nullptr) {
         MMI_HILOGE("object is nullptr");
@@ -464,15 +400,19 @@ void JsEventTarget::CallStopPromiseWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
-
+    if (scope == nullptr) {
+        MMI_HILOGE("scope is nullptr");
+        return;
+    }
     napi_value object = JsUtil::GetStopInfo(cb);
     if (object == nullptr) {
         MMI_HILOGE("object is nullptr");
@@ -500,14 +440,19 @@ void JsEventTarget::CallStopAsyncWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
+    CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
-
+    if (scope == nullptr) {
+        MMI_HILOGE("scope is nullptr");
+        return;
+    }
     napi_value object = JsUtil::GetStopInfo(cb);
     if (object == nullptr) {
         MMI_HILOGE("object is nullptr");
@@ -527,14 +472,19 @@ void JsEventTarget::CallGetStatePromiseWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
     CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
+    if (scope == nullptr) {
+        MMI_HILOGE("scope is nullptr");
+        return;
+    }
     napi_value object = JsUtil::GetStateInfo(cb);
     if (object == nullptr) {
         MMI_HILOGE("object is nullptr");
@@ -551,13 +501,19 @@ void JsEventTarget::CallGetStateAsyncWork(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
-    std::unique_ptr<JsUtil::CallbackInfo> cb = GetCallbackInfo(work);
-    CHKPV(cb);
+    sptr<JsUtil::CallbackInfo> cb(static_cast<JsUtil::CallbackInfo *>(work->data));
+    JsUtil::DeletePtr<uv_work_t*>(work);
+    cb->DecStrongRef(nullptr);
+    CHKPV(cb->env);
     napi_handle_scope scope = nullptr;
     napi_open_handle_scope(cb->env, &scope);
+    if (scope == nullptr) {
+        MMI_HILOGE("scope is nullptr");
+        return;
+    }
     napi_value resultObj[2];
     CHKRV_SCOPE(cb->env, napi_get_undefined(cb->env, &resultObj[0]), GET_UNDEFINED, scope);
     resultObj[1] = JsUtil::GetStateInfo(cb);
@@ -579,7 +535,7 @@ void JsEventTarget::EmitCooperateMessageEvent(uv_work_t *work, int32_t status)
     CHKPV(work);
     if (work->data == nullptr) {
         JsUtil::DeletePtr<uv_work_t*>(work);
-        MMI_HILOGE("Check data is null");
+        MMI_HILOGE("Check data is nullptr");
         return;
     }
 
@@ -620,25 +576,6 @@ void JsEventTarget::EmitCooperateMessageEvent(uv_work_t *work, int32_t status)
     }
 }
 
-std::unique_ptr<JsUtil::CallbackInfo> JsEventTarget::GetCallbackInfo(uv_work_t *work)
-{
-    CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mutex_);
-    int32_t *uData = static_cast<int32_t*>(work->data);
-    int32_t userData = *uData;
-    JsUtil::DeletePtr<uv_work_t*>(work);
-    JsUtil::DeletePtr<int32_t*>(uData);
-
-    auto iter = callback_.find(userData);
-    if (iter == callback_.end()) {
-        MMI_HILOGE("Find userData failed");
-        return nullptr;
-    }
-    auto cb = std::move(iter->second);
-    callback_.erase(iter);
-    return cb;
-}
-
 void JsEventTarget::HandleExecuteResult(napi_env env, int32_t errCode)
 {
     if (errCode != OTHER_ERROR && errCode != RET_OK) {
diff --git a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp
old mode 100755
new mode 100644
index e725929cbe..a941ffd07a
--- a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp
@@ -33,62 +33,50 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "JsInp
 napi_value JsInputDeviceCooperateManager::Enable(napi_env env, bool enable, napi_value handle)
 {
     CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mutex_);
-    int32_t userData = InputDevCooperateImpl.GetUserData();
-    napi_value result = CreateCallbackInfo(env, handle, userData);
-    auto callback = std::bind(EmitJsEnable, userData, std::placeholders::_1, std::placeholders::_2);
+    sptr<JsUtil::CallbackInfo> cb = new (std::nothrow) JsUtil::CallbackInfo();
+    CHKPP(cb);
+    napi_value ret = CreateCallbackInfo(env, handle, cb);
+    auto callback = std::bind(EmitJsEnable, cb, std::placeholders::_1, std::placeholders::_2);
     int32_t errCode = InputMgr->EnableInputDeviceCooperate(enable, callback);
     HandleExecuteResult(env, errCode);
-    if (errCode != RET_OK) {
-        RemoveCallbackInfo(userData);
-    }
-    return result;
+    return ret;
 }
 
 napi_value JsInputDeviceCooperateManager::Start(napi_env env, const std::string &sinkDeviceDescriptor,
     int32_t srcInputDeviceId, napi_value handle)
 {
     CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mutex_);
-    int32_t userData = InputDevCooperateImpl.GetUserData();
-    napi_value result = CreateCallbackInfo(env, handle, userData);
-    auto callback = std::bind(EmitJsStart, userData, std::placeholders::_1, std::placeholders::_2);
+    sptr<JsUtil::CallbackInfo> cb = new (std::nothrow) JsUtil::CallbackInfo();
+    CHKPP(cb);
+    napi_value ret = CreateCallbackInfo(env, handle, cb);
+    auto callback = std::bind(EmitJsStart, cb, std::placeholders::_1, std::placeholders::_2);
     int32_t errCode = InputMgr->StartInputDeviceCooperate(sinkDeviceDescriptor, srcInputDeviceId, callback);
     HandleExecuteResult(env, errCode);
-    if (errCode != RET_OK) {
-        RemoveCallbackInfo(userData);
-    }
-    return result;
+    return ret;
 }
 
 napi_value JsInputDeviceCooperateManager::Stop(napi_env env, napi_value handle)
 {
     CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mutex_);
-    int32_t userData = InputDevCooperateImpl.GetUserData();
-    napi_value result = CreateCallbackInfo(env, handle, userData);
-    auto callback = std::bind(EmitJsStop, userData, std::placeholders::_1, std::placeholders::_2);
+    sptr<JsUtil::CallbackInfo> cb = new (std::nothrow) JsUtil::CallbackInfo();
+    CHKPP(cb);
+    napi_value ret = CreateCallbackInfo(env, handle, cb);
+    auto callback = std::bind(EmitJsStop, cb, std::placeholders::_1, std::placeholders::_2);
     int32_t errCode = InputMgr->StopDeviceCooperate(callback);
     HandleExecuteResult(env, errCode);
-    if (errCode != RET_OK) {
-        RemoveCallbackInfo(userData);
-    }
-    return result;
+    return ret;
 }
 
 napi_value JsInputDeviceCooperateManager::GetState(napi_env env, const std::string &deviceDescriptor, napi_value handle)
 {
     CALL_INFO_TRACE;
-    std::lock_guard<std::mutex> guard(mutex_);
-    int32_t userData = InputDevCooperateImpl.GetUserData();
-    napi_value result = CreateCallbackInfo(env, handle, userData);
-    auto callback = std::bind(EmitJsGetState, userData, std::placeholders::_1);
+    sptr<JsUtil::CallbackInfo> cb = new (std::nothrow) JsUtil::CallbackInfo();
+    CHKPP(cb);
+    napi_value ret = CreateCallbackInfo(env, handle, cb);
+    auto callback = std::bind(EmitJsGetState, cb, std::placeholders::_1);
     int32_t errCode = InputMgr->GetInputDeviceCooperateState(deviceDescriptor, callback);
     HandleExecuteResult(env, errCode);
-    if (errCode != RET_OK) {
-        RemoveCallbackInfo(userData);
-    }
-    return result;
+    return ret;
 }
 
 void JsInputDeviceCooperateManager::RegisterListener(napi_env env, const std::string &type, napi_value handle)
diff --git a/frameworks/napi/input_device_cooperate/src/js_util.cpp b/frameworks/napi/input_device_cooperate/src/js_util.cpp
old mode 100755
new mode 100644
index b0d3aa3986..b466106252
--- a/frameworks/napi/input_device_cooperate/src/js_util.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_util.cpp
@@ -35,28 +35,28 @@ JsUtil::CallbackInfo::~CallbackInfo()
     }
 }
 
-napi_value JsUtil::GetEnableInfo(const std::unique_ptr<CallbackInfo> &cb)
+napi_value JsUtil::GetEnableInfo(sptr<CallbackInfo> cb)
 {
     CHKPP(cb);
     CHKPP(cb->env);
     return GetResult(cb->env, cb->data.enableResult, cb->data.errCode);
 }
 
-napi_value JsUtil::GetStartInfo(const std::unique_ptr<CallbackInfo> &cb)
+napi_value JsUtil::GetStartInfo(sptr<CallbackInfo> cb)
 {
     CHKPP(cb);
     CHKPP(cb->env);
     return GetResult(cb->env, cb->data.startResult, cb->data.errCode);
 }
 
-napi_value JsUtil::GetStopInfo(const std::unique_ptr<CallbackInfo> &cb)
+napi_value JsUtil::GetStopInfo(sptr<CallbackInfo> cb)
 {
     CHKPP(cb);
     CHKPP(cb->env);
     return GetResult(cb->env, cb->data.stopResult, cb->data.errCode);
 }
 
-napi_value JsUtil::GetStateInfo(const std::unique_ptr<CallbackInfo> &cb)
+napi_value JsUtil::GetStateInfo(sptr<CallbackInfo> cb)
 {
     CHKPP(cb);
     CHKPP(cb->env);
diff --git a/frameworks/proxy/event_handler/include/input_device_cooperate_impl.h b/frameworks/proxy/event_handler/include/input_device_cooperate_impl.h
index 09b6967f60..0383f2710c 100755
--- a/frameworks/proxy/event_handler/include/input_device_cooperate_impl.h
+++ b/frameworks/proxy/event_handler/include/input_device_cooperate_impl.h
@@ -53,8 +53,8 @@ public:
         FuncCooperationMessage callback);
     int32_t StopDeviceCooperate(FuncCooperationMessage callback);
     int32_t GetInputDeviceCooperateState(const std::string &deviceId, FuncCooperationState callback);
-    void OnDevCooperateListener(const std::string deviceId, CooperationMessage msg);
-    void OnCooperationMessage(int32_t userData, const std::string deviceId, CooperationMessage msg);
+    void OnDevCooperateListener(const std::string &deviceId, const CooperationMessage &msg);
+    void OnCooperationMessage(int32_t userData, const std::string &deviceId, const CooperationMessage &msg);
     void OnCooperationState(int32_t userData, bool state);
     int32_t GetUserData();
 
diff --git a/frameworks/proxy/event_handler/include/input_device_impl.h b/frameworks/proxy/event_handler/include/input_device_impl.h
old mode 100755
new mode 100644
index 3b8463b46e..7c730b6a66
--- a/frameworks/proxy/event_handler/include/input_device_impl.h
+++ b/frameworks/proxy/event_handler/include/input_device_impl.h
@@ -39,18 +39,12 @@ public:
     using FunInputDevIds = std::function<void(std::vector<int32_t>&)>;
     using FunInputDevKeys = std::function<void(std::vector<bool>&)>;
     using FunKeyboardTypes = std::function<void(int32_t)>;
-    struct InputDeviceData {
-        FunInputDevInfo inputDevice;
-        FunInputDevIds ids;
-        FunInputDevKeys keys;
-        FunKeyboardTypes kbTypes;
-    };
     using InputDevListenerPtr = std::shared_ptr<IInputDeviceListener>;
 
     int32_t RegisterDevListener(const std::string &type, InputDevListenerPtr listener);
     int32_t UnregisterDevListener(const std::string &type, InputDevListenerPtr listener = nullptr);
-    int32_t GetInputDeviceIdsAsync(FunInputDevIds callback);
-    int32_t GetInputDeviceAsync(int32_t deviceId, FunInputDevInfo callback);
+    int32_t GetInputDeviceIds(FunInputDevIds callback);
+    int32_t GetInputDevice(int32_t deviceId, FunInputDevInfo callback);
     int32_t SupportKeys(int32_t deviceId, std::vector<int32_t> keyCodes, FunInputDevKeys callback);
     int32_t GetKeyboardType(int32_t deviceId, FunKeyboardTypes callback);
     void OnInputDevice(int32_t userData, std::shared_ptr<InputDevice> devData);
@@ -61,14 +55,8 @@ public:
     int32_t GetUserData();
     std::shared_ptr<InputDevice> DevDataUnmarshalling(NetPacket &pkt);
 
-private:
-    const FunInputDevInfo* GetDeviceInfo(int32_t) const;
-    const FunInputDevIds* GetDeviceIds(int32_t) const;
-    const FunInputDevKeys* GetDeviceKeys(int32_t) const;
-    const FunKeyboardTypes* GetKeyboardTypes(int32_t) const;
 private:
     InputDeviceImpl() = default;
-    std::map<int32_t, InputDeviceData> inputDevices_;
     std::map<std::string, std::list<InputDevListenerPtr>> devListener_ = { { "change", {} } };
     int32_t userData_ { 0 };
     bool isListeningProcess_ { false };
diff --git a/frameworks/proxy/event_handler/src/client_msg_handler.cpp b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
index 013b7b168a..f8016c84ae 100644
--- a/frameworks/proxy/event_handler/src/client_msg_handler.cpp
+++ b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
@@ -58,10 +58,6 @@ void ClientMsgHandler::Init()
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
         {MmiMessageId::ON_POINTER_EVENT, MsgCallbackBind2(&ClientMsgHandler::OnPointerEvent, this)},
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
-        {MmiMessageId::INPUT_DEVICE, MsgCallbackBind2(&ClientMsgHandler::OnInputDevice, this)},
-        {MmiMessageId::INPUT_DEVICE_IDS, MsgCallbackBind2(&ClientMsgHandler::OnInputDeviceIds, this)},
-        {MmiMessageId::INPUT_DEVICE_SUPPORT_KEYS, MsgCallbackBind2(&ClientMsgHandler::OnSupportKeys, this)},
-        {MmiMessageId::INPUT_DEVICE_KEYBOARD_TYPE, MsgCallbackBind2(&ClientMsgHandler::OnInputKeyboardType, this)},
         {MmiMessageId::ADD_INPUT_DEVICE_LISTENER, MsgCallbackBind2(&ClientMsgHandler::OnDevListener, this)},
         {MmiMessageId::NOTICE_ANR, MsgCallbackBind2(&ClientMsgHandler::OnAnr, this)},
 #if defined(OHOS_BUILD_ENABLE_KEYBOARD) && (defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || \
@@ -195,77 +191,6 @@ int32_t ClientMsgHandler::OnSubscribeKeyEventCallback(const UDSClient &client, N
 }
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
 
-int32_t ClientMsgHandler::OnInputDeviceIds(const UDSClient& client, NetPacket& pkt)
-{
-    CALL_DEBUG_ENTER;
-    int32_t userData;
-    std::vector<int32_t> inputDeviceIds;
-    pkt >> userData >> inputDeviceIds;
-    if (inputDeviceIds.size() > MAX_INPUT_DEVICE) {
-        MMI_HILOGE("Device exceeds the max range");
-        return RET_ERR;
-    }
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet read cooperate msg failed");
-        return RET_ERR;
-    }
-    InputDevImpl.OnInputDeviceIds(userData, inputDeviceIds);
-    return RET_OK;
-}
-
-int32_t ClientMsgHandler::OnInputDevice(const UDSClient& client, NetPacket& pkt)
-{
-    CALL_DEBUG_ENTER;
-    int32_t userData;
-    pkt >> userData;
-    std::shared_ptr<InputDevice> devData = InputDevImpl.DevDataUnmarshalling(pkt);
-    CHKPR(devData, RET_ERR);
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet read cooperate msg failed");
-        return RET_ERR;
-    }
-    InputDevImpl.OnInputDevice(userData, devData);
-    return RET_OK;
-}
-
-int32_t ClientMsgHandler::OnSupportKeys(const UDSClient& client, NetPacket& pkt)
-{
-    CALL_DEBUG_ENTER;
-    int32_t userData;
-    size_t size;
-    pkt >> userData >> size;
-    if (size > MAX_SUPPORT_KEY) {
-        MMI_HILOGE("Keys exceeds the max range");
-        return RET_ERR;
-    }
-    std::vector<bool> abilityRet;
-    bool ret;
-    for (size_t i = 0; i < size; ++i) {
-        pkt >> ret;
-        abilityRet.push_back(ret);
-    }
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet read key Data failed");
-        return RET_ERR;
-    }
-    InputDevImpl.OnSupportKeys(userData, abilityRet);
-    return RET_OK;
-}
-
-int32_t ClientMsgHandler::OnInputKeyboardType(const UDSClient& client, NetPacket& pkt)
-{
-    CALL_DEBUG_ENTER;
-    int32_t userData;
-    int32_t KeyboardType;
-    pkt >> userData >> KeyboardType;
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet read failed");
-        return PACKET_WRITE_FAIL;
-    }
-    InputDevImpl.OnKeyboardType(userData, KeyboardType);
-    return RET_OK;
-}
-
 int32_t ClientMsgHandler::OnDevListener(const UDSClient& client, NetPacket& pkt)
 {
     CALL_DEBUG_ENTER;
diff --git a/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp b/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp
index fe572e3ce5..caa7fcac17 100755
--- a/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_device_cooperate_impl.cpp
@@ -132,7 +132,7 @@ int32_t InputDeviceCooperateImpl::GetInputDeviceCooperateState(
     return MultimodalInputConnMgr->GetInputDeviceCooperateState(userData_++, deviceId);
 }
 
-void InputDeviceCooperateImpl::OnDevCooperateListener(const std::string deviceId, CooperationMessage msg)
+void InputDeviceCooperateImpl::OnDevCooperateListener(const std::string &deviceId, const CooperationMessage &msg)
 {
     CALL_DEBUG_ENTER;
     std::lock_guard<std::mutex> guard(mtx_);
@@ -141,7 +141,7 @@ void InputDeviceCooperateImpl::OnDevCooperateListener(const std::string deviceId
     }
 }
 
-void InputDeviceCooperateImpl::OnCooperationMessage(int32_t userData, const std::string deviceId, CooperationMessage msg)
+void InputDeviceCooperateImpl::OnCooperationMessage(int32_t userData, const std::string &deviceId, const CooperationMessage &msg)
 {
     CALL_DEBUG_ENTER;
     CHK_PID_AND_TID();
diff --git a/frameworks/proxy/event_handler/src/input_device_impl.cpp b/frameworks/proxy/event_handler/src/input_device_impl.cpp
old mode 100755
new mode 100644
index 4e9c150e41..4ac7e4e5c8
--- a/frameworks/proxy/event_handler/src/input_device_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_device_impl.cpp
@@ -117,160 +117,60 @@ void InputDeviceImpl::OnDevListener(int32_t deviceId, const std::string &type)
     }
 }
 
-int32_t InputDeviceImpl::GetInputDeviceIdsAsync(FunInputDevIds callback)
+int32_t InputDeviceImpl::GetInputDeviceIds(FunInputDevIds callback)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mtx_);
-    InputDeviceData data;
-    data.ids = callback;
-    if (userData_ == INT32_MAX) {
-        MMI_HILOGE("userData exceeds the maximum");
+    CHKPR(callback, RET_ERR);
+    std::vector<int32_t> ids;
+    int32_t ret = MultimodalInputConnMgr->GetDeviceIds(ids);
+    if (ret != RET_OK) {
+        MMI_HILOGE("GetInputDeviceIds failed");
         return RET_ERR;
     }
-    inputDevices_[userData_] = data;
-    return MultimodalInputConnMgr->GetDeviceIds(userData_++);
+    callback(ids);
+    return ret;
 }
 
-int32_t InputDeviceImpl::GetInputDeviceAsync(int32_t deviceId, FunInputDevInfo callback)
+int32_t InputDeviceImpl::GetInputDevice(int32_t deviceId, FunInputDevInfo callback)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mtx_);
-    InputDeviceData data;
-    data.inputDevice = callback;
-    if (userData_ == INT32_MAX) {
-        MMI_HILOGE("UserData exceeds the maximum");
+    CHKPR(callback, RET_ERR);
+    std::shared_ptr<InputDevice> inputDevice = std::make_shared<InputDevice>();
+    int32_t ret = MultimodalInputConnMgr->GetDevice(deviceId, inputDevice);
+    if (ret != RET_OK) {
+        MMI_HILOGE("GetDevice failed");
         return RET_ERR;
     }
-    inputDevices_[userData_] = data;
-    return MultimodalInputConnMgr->GetDevice(userData_++, deviceId);
+    callback(inputDevice);
+    return RET_OK;
 }
 
 int32_t InputDeviceImpl::SupportKeys(int32_t deviceId, std::vector<int32_t> keyCodes, FunInputDevKeys callback)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mtx_);
-    if (keyCodes.size() > MAX_SUPPORT_KEY) {
-        MMI_HILOGE("Keys exceeds the max range");
+    CHKPR(callback, RET_ERR);
+    std::vector<bool> keystroke;
+    int32_t ret = MultimodalInputConnMgr->SupportKeys(deviceId, keyCodes, keystroke);
+    if (ret != RET_OK) {
+        MMI_HILOGE("SupportKeys failed");
         return RET_ERR;
     }
-    InputDeviceData data;
-    data.keys = callback;
-    if (userData_ == INT32_MAX) {
-        MMI_HILOGE("UserData exceeds the maximum");
-        return RET_ERR;
-    }
-    inputDevices_[userData_] = data;
-    return MultimodalInputConnMgr->SupportKeys(userData_++, deviceId, keyCodes);
+    callback(keystroke);
+    return RET_OK;
 }
 
 int32_t InputDeviceImpl::GetKeyboardType(int32_t deviceId, FunKeyboardTypes callback)
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mtx_);
-    InputDeviceData data;
-    data.kbTypes = callback;
-    if (userData_ == INT32_MAX) {
-        MMI_HILOGE("UserData exceeds the maximum");
+    CHKPR(callback, RET_ERR);
+    int32_t keyboardType = 0;
+    int32_t ret = MultimodalInputConnMgr->GetKeyboardType(deviceId, keyboardType);
+    if (ret != RET_OK) {
+        MMI_HILOGE("GetKeyboardType failed");
         return RET_ERR;
     }
-    inputDevices_[userData_] = data;
-    return MultimodalInputConnMgr->GetKeyboardType(userData_++, deviceId);
-}
-
-void InputDeviceImpl::OnInputDevice(int32_t userData, std::shared_ptr<InputDevice> devData)
-{
-    CALL_DEBUG_ENTER;
-    CHK_PID_AND_TID();
-    std::lock_guard<std::mutex> guard(mtx_);
-    auto iter = inputDevices_.find(userData);
-    if (iter == inputDevices_.end()) {
-        MMI_HILOGI("Find userData failed");
-        return;
-    }
-    auto devInfo = GetDeviceInfo(userData);
-    CHKPV(devInfo);
-    CHKPV(devData);
-    (*devInfo)(devData);
-    MMI_HILOGD("Report device info, userData:%{public}d name:%{public}s type:%{public}d",
-        userData, devData->GetName().c_str(), devData->GetType());
-}
-
-void InputDeviceImpl::OnInputDeviceIds(int32_t userData, std::vector<int32_t> &ids)
-{
-    CHK_PID_AND_TID();
-    std::lock_guard<std::mutex> guard(mtx_);
-    auto iter = inputDevices_.find(userData);
-    if (iter == inputDevices_.end()) {
-        MMI_HILOGI("Find userData failed");
-        return;
-    }
-    auto devIds = GetDeviceIds(userData);
-    CHKPV(devIds);
-    (*devIds)(ids);
-    MMI_HILOGD("Report all device, userData:%{public}d device:(%{public}s)",
-        userData, IdsListToString(ids).c_str());
-}
-
-void InputDeviceImpl::OnSupportKeys(int32_t userData, std::vector<bool> &keystrokeAbility)
-{
-    CHK_PID_AND_TID();
-    std::lock_guard<std::mutex> guard(mtx_);
-    auto iter = inputDevices_.find(userData);
-    if (iter == inputDevices_.end()) {
-        MMI_HILOGI("Find userData failed");
-        return;
-    }
-    auto devKeys = GetDeviceKeys(userData);
-    CHKPV(devKeys);
-    (*devKeys)(keystrokeAbility);
-}
-
-void InputDeviceImpl::OnKeyboardType(int32_t userData, int32_t keyboardType)
-{
-    CHK_PID_AND_TID();
-    std::lock_guard<std::mutex> guard(mtx_);
-    if (auto iter = inputDevices_.find(userData); iter == inputDevices_.end()) {
-        MMI_HILOGI("Find userData failed");
-        return;
-    }
-    auto devKbTypes = GetKeyboardTypes(userData);
-    CHKPV(devKbTypes);
-    (*devKbTypes)(keyboardType);
-    MMI_HILOGD("Keyboard type event userData:%{public}d keyboardType:%{public}d",
-        userData, keyboardType);
-}
-
-const InputDeviceImpl::FunInputDevInfo* InputDeviceImpl::GetDeviceInfo(int32_t userData) const
-{
-    auto iter = inputDevices_.find(userData);
-    if (iter == inputDevices_.end()) {
-        return nullptr;
-    }
-    return &iter->second.inputDevice;
-}
-
-const InputDeviceImpl::FunInputDevIds* InputDeviceImpl::GetDeviceIds(int32_t userData) const
-{
-    auto iter = inputDevices_.find(userData);
-    if (iter == inputDevices_.end()) {
-        return nullptr;
-    }
-    return &iter->second.ids;
-}
-
-const InputDeviceImpl::FunInputDevKeys* InputDeviceImpl::GetDeviceKeys(int32_t userData) const
-{
-    auto iter = inputDevices_.find(userData);
-    if (iter == inputDevices_.end()) {
-        return nullptr;
-    }
-    return &iter->second.keys;
-}
-
-const InputDeviceImpl::FunKeyboardTypes* InputDeviceImpl::GetKeyboardTypes(int32_t userData) const
-{
-    auto iter = inputDevices_.find(userData);
-    return iter == inputDevices_.end()? nullptr : &iter->second.kbTypes;
+    callback(keyboardType);
+    return RET_OK;
 }
 
 int32_t InputDeviceImpl::GetUserData()
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index d8ada45eb6..f6ba62ed20 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -711,7 +711,7 @@ int32_t InputManagerImpl::GetDeviceIds(std::function<void(std::vector<int32_t>&)
         MMI_HILOGE("Client init failed");
         return RET_ERR;
     }
-    return InputDevImpl.GetInputDeviceIdsAsync(callback);
+    return InputDevImpl.GetInputDeviceIds(callback);
 }
 
 int32_t InputManagerImpl::GetDevice(int32_t deviceId,
@@ -722,7 +722,7 @@ int32_t InputManagerImpl::GetDevice(int32_t deviceId,
         MMI_HILOGE("Client init failed");
         return RET_ERR;
     }
-    return InputDevImpl.GetInputDeviceAsync(deviceId, callback);
+    return InputDevImpl.GetInputDevice(deviceId, callback);
 }
 
 int32_t InputManagerImpl::SupportKeys(int32_t deviceId, std::vector<int32_t> &keyCodes,
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
index fb3420d42e..cb6b2c3673 100644
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -19,6 +19,7 @@
 #include "iremote_broker.h"
 
 #include "i_event_filter.h"
+#include "input_device.h"
 #include "i_input_event_filter.h"
 #include "input_handler_type.h"
 #include "key_event.h"
@@ -83,12 +84,12 @@ public:
     virtual int32_t GetPointerSpeed(int32_t &speed) = 0;
     virtual int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle) = 0;
     virtual int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle) = 0;
-    virtual int32_t SupportKeys(int32_t userData, int32_t deviceId, std::vector<int32_t> &keys) = 0;
-    virtual int32_t GetDeviceIds(int32_t userData) = 0;
-    virtual int32_t GetDevice(int32_t userData, int32_t id) = 0;
+    virtual int32_t SupportKeys(int32_t deviceId, std::vector<int32_t> &keys, std::vector<bool> &keystroke) = 0;
+    virtual int32_t GetDeviceIds(std::vector<int32_t> &ids) = 0;
+    virtual int32_t GetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice) = 0;
     virtual int32_t RegisterDevListener() = 0;
     virtual int32_t UnregisterDevListener() = 0;
-    virtual int32_t GetKeyboardType(int32_t userData, int32_t deviceId) = 0;
+    virtual int32_t GetKeyboardType(int32_t deviceId, int32_t &keyboardType) = 0;
     virtual int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
         int32_t priority, uint32_t deviceTags) = 0;
     virtual int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
index 002c20fd91..231d77cda6 100644
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -45,12 +45,12 @@ public:
     int32_t GetPointerSpeed(int32_t &speed);
     int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle);
     int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle);
-    int32_t SupportKeys(int32_t userData, int32_t deviceId, std::vector<int32_t> &keys);
-    int32_t GetDeviceIds(int32_t userData);
-    int32_t GetDevice(int32_t userData, int32_t id);
+    int32_t SupportKeys(int32_t deviceId, std::vector<int32_t> &keys, std::vector<bool> &keystroke);
+    int32_t GetDeviceIds(std::vector<int32_t> &ids);
+    int32_t GetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice);
     int32_t RegisterDevListener();
     int32_t UnregisterDevListener();
-    int32_t GetKeyboardType(int32_t userData, int32_t deviceId);
+    int32_t GetKeyboardType(int32_t deviceId, int32_t &keyboardType);
     int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType, int32_t priority,
         uint32_t deviceTags);
     int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType, int32_t priority,
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
index 45e6724b47..5ab35c0ef9 100644
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -40,12 +40,12 @@ public:
     int32_t GetPointerSpeed(int32_t &speed) override;
     int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle) override;
     int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle) override;
-    int32_t SupportKeys(int32_t userData, int32_t deviceId, std::vector<int32_t> &keys) override;
-    int32_t GetDeviceIds(int32_t userData) override;
-    int32_t GetDevice(int32_t userData, int32_t deviceId) override;
+    int32_t SupportKeys(int32_t deviceId, std::vector<int32_t> &keys, std::vector<bool> &keystroke) override;
+    int32_t GetDeviceIds(std::vector<int32_t> &ids) override;
+    int32_t GetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice) override;
     int32_t RegisterDevListener() override;
     int32_t UnregisterDevListener() override;
-    int32_t GetKeyboardType(int32_t userData, int32_t deviceId) override;
+    int32_t GetKeyboardType(int32_t deviceId, int32_t &keyboardType) override;
     int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
         int32_t priority, uint32_t deviceTags) override;
     int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
index 728839f22a..3bf042979d 100644
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -141,28 +141,29 @@ int32_t MultimodalInputConnectManager::UnregisterDevListener()
     return multimodalInputConnectService_->UnregisterDevListener();
 }
 
-int32_t MultimodalInputConnectManager::SupportKeys(int32_t userData, int32_t deviceId, std::vector<int32_t> &keys)
+int32_t MultimodalInputConnectManager::SupportKeys(int32_t deviceId, std::vector<int32_t> &keys,
+    std::vector<bool> &keystroke)
 {
     CHKPR(multimodalInputConnectService_, RET_ERR);
-    return multimodalInputConnectService_->SupportKeys(userData, deviceId, keys);
+    return multimodalInputConnectService_->SupportKeys(deviceId, keys, keystroke);
 }
 
-int32_t MultimodalInputConnectManager::GetDeviceIds(int32_t userData)
+int32_t MultimodalInputConnectManager::GetDeviceIds(std::vector<int32_t> &ids)
 {
     CHKPR(multimodalInputConnectService_, RET_ERR);
-    return multimodalInputConnectService_->GetDeviceIds(userData);
+    return multimodalInputConnectService_->GetDeviceIds(ids);
 }
 
-int32_t MultimodalInputConnectManager::GetDevice(int32_t userData, int32_t id)
+int32_t MultimodalInputConnectManager::GetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice)
 {
     CHKPR(multimodalInputConnectService_, RET_ERR);
-    return multimodalInputConnectService_->GetDevice(userData, id);
+    return multimodalInputConnectService_->GetDevice(deviceId, inputDevice);
 }
 
-int32_t MultimodalInputConnectManager::GetKeyboardType(int32_t userData, int32_t deviceId)
+int32_t MultimodalInputConnectManager::GetKeyboardType(int32_t deviceId, int32_t &keyboardType)
 {
     CHKPR(multimodalInputConnectService_, RET_ERR);
-    return multimodalInputConnectService_->GetKeyboardType(userData, deviceId);
+    return multimodalInputConnectService_->GetKeyboardType(deviceId, keyboardType);
 }
 
 int32_t MultimodalInputConnectManager::AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index 0333fa3844..650c625915 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -25,6 +25,53 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MultimodalInputConnectProxy" };
+
+int32_t ParseInputDevice(MessageParcel &reply, std::shared_ptr<InputDevice> &inputDevice)
+{
+    int32_t value;
+    READINT32(reply, value, IPC_PROXY_DEAD_OBJECT_ERR);
+    inputDevice->SetId(value);
+    READINT32(reply, value, IPC_PROXY_DEAD_OBJECT_ERR);
+    inputDevice->SetType(value);
+    std::string name;
+    READSTRING(reply, name, IPC_PROXY_DEAD_OBJECT_ERR);
+    inputDevice->SetName(name);
+    READINT32(reply, value, IPC_PROXY_DEAD_OBJECT_ERR);
+    inputDevice->SetBus(value);
+    READINT32(reply, value, IPC_PROXY_DEAD_OBJECT_ERR);
+    inputDevice->SetVersion(value);
+    READINT32(reply, value, IPC_PROXY_DEAD_OBJECT_ERR);
+    inputDevice->SetProduct(value);
+    READINT32(reply, value, IPC_PROXY_DEAD_OBJECT_ERR);
+    inputDevice->SetVendor(value);
+    std::string phys;
+    READSTRING(reply, phys, IPC_PROXY_DEAD_OBJECT_ERR);
+    inputDevice->SetPhys(phys);
+    std::string uniq;
+    READSTRING(reply, uniq, IPC_PROXY_DEAD_OBJECT_ERR);
+    inputDevice->SetUniq(uniq);
+
+    uint32_t size;
+    READUINT32(reply, size, IPC_PROXY_DEAD_OBJECT_ERR);
+    InputDevice::AxisInfo axis;
+    for (uint32_t i = 0; i < size; ++i) {
+        int32_t val;
+        READINT32(reply, val, IPC_PROXY_DEAD_OBJECT_ERR);
+        axis.SetMinimum(val);
+        READINT32(reply, val, IPC_PROXY_DEAD_OBJECT_ERR);
+        axis.SetMaximum(val);
+        READINT32(reply, val, IPC_PROXY_DEAD_OBJECT_ERR);
+        axis.SetAxisType(val);
+        READINT32(reply, val, IPC_PROXY_DEAD_OBJECT_ERR);
+        axis.SetFuzz(val);
+        READINT32(reply, val, IPC_PROXY_DEAD_OBJECT_ERR);
+        axis.SetFlat(val);
+        READINT32(reply, val, IPC_PROXY_DEAD_OBJECT_ERR);
+        axis.SetResolution(val);
+        inputDevice->AddAxisInfo(axis);
+    }
+    return RET_OK;
+}
 } // namespace
 
 MultimodalInputConnectProxy::MultimodalInputConnectProxy(const sptr<IRemoteObject> &impl)
@@ -290,7 +337,8 @@ int32_t MultimodalInputConnectProxy::UnregisterDevListener()
     return RET_OK;
 }
 
-int32_t MultimodalInputConnectProxy::SupportKeys(int32_t userData, int32_t deviceId, std::vector<int32_t> &keys)
+int32_t MultimodalInputConnectProxy::SupportKeys(int32_t deviceId, std::vector<int32_t> &keys,
+    std::vector<bool> &keystroke)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -298,7 +346,6 @@ int32_t MultimodalInputConnectProxy::SupportKeys(int32_t userData, int32_t devic
         MMI_HILOGE("Failed to write descriptor");
         return RET_ERR;
     }
-    WRITEINT32(data, userData);
     WRITEINT32(data, deviceId);
     WRITEINT32(data, static_cast<int32_t>(keys.size()));
     for (const auto &item : keys) {
@@ -314,10 +361,15 @@ int32_t MultimodalInputConnectProxy::SupportKeys(int32_t userData, int32_t devic
         MMI_HILOGE("Send request failed, ret:%{public}d", ret);
         return ret;
     }
+    if (!reply.ReadBoolVector(&keystroke)) {
+        MMI_HILOGE("Read ids failed");
+        return RET_ERR;
+    }
+    MMI_HILOGE("keystroke size:%{public}zu", keystroke.size());
     return RET_OK;
 }
 
-int32_t MultimodalInputConnectProxy::GetDeviceIds(int32_t userData)
+int32_t MultimodalInputConnectProxy::GetDeviceIds(std::vector<int32_t> &ids)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -325,7 +377,6 @@ int32_t MultimodalInputConnectProxy::GetDeviceIds(int32_t userData)
         MMI_HILOGE("Failed to write descriptor");
         return RET_ERR;
     }
-    WRITEINT32(data, userData);
     MessageParcel reply;
     MessageOption option;
     sptr<IRemoteObject> remote = Remote();
@@ -335,10 +386,15 @@ int32_t MultimodalInputConnectProxy::GetDeviceIds(int32_t userData)
         MMI_HILOGE("Send request failed, ret:%{public}d", ret);
         return ret;
     }
+    if (!reply.ReadInt32Vector(&ids)) {
+        MMI_HILOGE("Read vector failed");
+        return RET_ERR;
+    }
+    MMI_HILOGE("ids size:%{public}zu", ids.size());
     return RET_OK;
 }
 
-int32_t MultimodalInputConnectProxy::GetDevice(int32_t userData, int32_t deviceId)
+int32_t MultimodalInputConnectProxy::GetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -346,7 +402,6 @@ int32_t MultimodalInputConnectProxy::GetDevice(int32_t userData, int32_t deviceI
         MMI_HILOGE("Failed to write descriptor");
         return RET_ERR;
     }
-    WRITEINT32(data, userData);
     WRITEINT32(data, deviceId);
     MessageParcel reply;
     MessageOption option;
@@ -357,10 +412,15 @@ int32_t MultimodalInputConnectProxy::GetDevice(int32_t userData, int32_t deviceI
         MMI_HILOGE("Send request failed, ret:%{public}d", ret);
         return ret;
     }
+    ret = ParseInputDevice(reply, inputDevice);
+    if (ret != RET_OK) {
+        MMI_HILOGE("ParseInputDevice failed");
+        return RET_ERR;
+    }
     return RET_OK;
 }
 
-int32_t MultimodalInputConnectProxy::GetKeyboardType(int32_t userData, int32_t deviceId)
+int32_t MultimodalInputConnectProxy::GetKeyboardType(int32_t deviceId, int32_t &keyboardType)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -368,7 +428,6 @@ int32_t MultimodalInputConnectProxy::GetKeyboardType(int32_t userData, int32_t d
         MMI_HILOGE("Failed to write descriptor");
         return RET_ERR;
     }
-    WRITEINT32(data, userData);
     WRITEINT32(data, deviceId);
     MessageParcel reply;
     MessageOption option;
@@ -379,6 +438,7 @@ int32_t MultimodalInputConnectProxy::GetKeyboardType(int32_t userData, int32_t d
         MMI_HILOGE("Send request failed, ret:%{public}d", ret);
         return ret;
     }
+    READINT32(reply, keyboardType, IPC_PROXY_DEAD_OBJECT_ERR);
     return RET_OK;
 }
 
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 00323943c5..243e185165 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -270,8 +270,6 @@ int32_t MultimodalInputConnectStub::StubGetPointerStyle(MessageParcel& data, Mes
 int32_t MultimodalInputConnectStub::StubSupportKeys(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
-    int32_t userData = 0;
-    READINT32(data, userData, IPC_PROXY_DEAD_OBJECT_ERR);
     int32_t deviceId = -1;
     READINT32(data, deviceId, IPC_PROXY_DEAD_OBJECT_ERR);
     int32_t size = 0;
@@ -282,9 +280,15 @@ int32_t MultimodalInputConnectStub::StubSupportKeys(MessageParcel& data, Message
         READINT32(data, key, IPC_PROXY_DEAD_OBJECT_ERR);
         keys.push_back(key);
     }
-    int32_t ret = SupportKeys(userData, deviceId, keys);
+    std::vector<bool> keystroke;
+    int32_t ret = SupportKeys(deviceId, keys, keystroke);
     if (ret != RET_OK) {
         MMI_HILOGE("Call SupportKeys failed ret:%{public}d", ret);
+        return RET_ERR;
+    }
+    if (!reply.WriteBoolVector(keystroke)) {
+        MMI_HILOGE("Write keyStroke failed");
+        return RET_ERR;
     }
     return ret;
 }
@@ -292,11 +296,15 @@ int32_t MultimodalInputConnectStub::StubSupportKeys(MessageParcel& data, Message
 int32_t MultimodalInputConnectStub::StubGetDeviceIds(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
-    int32_t userData = 0;
-    READINT32(data, userData, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = GetDeviceIds(userData);
+    std::vector<int32_t> ids;
+    int32_t ret = GetDeviceIds(ids);
     if (ret != RET_OK) {
         MMI_HILOGE("Call GetDeviceIds failed ret:%{public}d", ret);
+        return RET_ERR;
+    }
+    if (!reply.WriteInt32Vector(ids)) {
+        MMI_HILOGE("Write ids failed");
+        return RET_ERR;
     }
     return ret;
 }
@@ -304,15 +312,33 @@ int32_t MultimodalInputConnectStub::StubGetDeviceIds(MessageParcel& data, Messag
 int32_t MultimodalInputConnectStub::StubGetDevice(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
-    int32_t userData = 0;
-    READINT32(data, userData, IPC_PROXY_DEAD_OBJECT_ERR);
     int32_t deviceId = -1;
     READINT32(data, deviceId, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = GetDevice(userData, deviceId);
+    std::shared_ptr<InputDevice> inputDevice = std::make_shared<InputDevice>();
+    int32_t ret = GetDevice(deviceId, inputDevice);
     if (ret != RET_OK) {
         MMI_HILOGE("Call GetDevice failed ret:%{public}d", ret);
+        return RET_ERR;
     }
-    return ret;
+    WRITEINT32(reply, inputDevice->GetId(), IPC_STUB_WRITE_PARCEL_ERR);
+    WRITEINT32(reply, inputDevice->GetType(), IPC_STUB_WRITE_PARCEL_ERR);
+    WRITESTRING(reply, inputDevice->GetName(), IPC_STUB_WRITE_PARCEL_ERR);
+    WRITEINT32(reply, inputDevice->GetBus(), IPC_STUB_WRITE_PARCEL_ERR);
+    WRITEINT32(reply, inputDevice->GetVersion(), IPC_STUB_WRITE_PARCEL_ERR);
+    WRITEINT32(reply, inputDevice->GetProduct(), IPC_STUB_WRITE_PARCEL_ERR);
+    WRITEINT32(reply, inputDevice->GetVendor(), IPC_STUB_WRITE_PARCEL_ERR);
+    WRITESTRING(reply, inputDevice->GetPhys(), IPC_STUB_WRITE_PARCEL_ERR);
+    WRITESTRING(reply, inputDevice->GetUniq(), IPC_STUB_WRITE_PARCEL_ERR);
+    WRITEUINT32(reply, static_cast<uint32_t>(inputDevice->GetAxisInfo().size()), IPC_STUB_WRITE_PARCEL_ERR);
+    for (const auto &item : inputDevice->GetAxisInfo()) {
+        WRITEINT32(reply, item.GetMinimum(), IPC_STUB_WRITE_PARCEL_ERR);
+        WRITEINT32(reply, item.GetMaximum(), IPC_STUB_WRITE_PARCEL_ERR);
+        WRITEINT32(reply, item.GetAxisType(), IPC_STUB_WRITE_PARCEL_ERR);
+        WRITEINT32(reply, item.GetFuzz(), IPC_STUB_WRITE_PARCEL_ERR);
+        WRITEINT32(reply, item.GetFlat(), IPC_STUB_WRITE_PARCEL_ERR);
+        WRITEINT32(reply, item.GetResolution(), IPC_STUB_WRITE_PARCEL_ERR);
+    }
+    return RET_OK;
 }
 
 int32_t MultimodalInputConnectStub::StubRegisterInputDeviceMonitor(MessageParcel& data, MessageParcel& reply)
@@ -338,14 +364,15 @@ int32_t MultimodalInputConnectStub::StubUnregisterInputDeviceMonitor(MessageParc
 int32_t MultimodalInputConnectStub::StubGetKeyboardType(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
-    int32_t userData = 0;
-    READINT32(data, userData, IPC_PROXY_DEAD_OBJECT_ERR);
     int32_t deviceId = -1;
     READINT32(data, deviceId, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = GetKeyboardType(userData, deviceId);
+    int32_t keyboardType = 0;
+    int32_t ret = GetKeyboardType(deviceId, keyboardType);
     if (ret != RET_OK) {
         MMI_HILOGE("Call GetKeyboardType failed ret:%{public}d", ret);
+        return RET_ERR;
     }
+    WRITEINT32(reply, keyboardType, IPC_STUB_WRITE_PARCEL_ERR);
     return ret;
 }
 
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index 14a4bd7507..5b9a1c54c2 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -54,12 +54,12 @@ public:
     int32_t GetPointerSpeed(int32_t &speed) override;
     int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle) override;
     int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle) override;
-    int32_t SupportKeys(int32_t userData, int32_t deviceId, std::vector<int32_t> &keys) override;
-    int32_t GetDeviceIds(int32_t userData) override;
-    int32_t GetDevice(int32_t userData, int32_t deviceId) override;
+    int32_t SupportKeys(int32_t deviceId, std::vector<int32_t> &keys, std::vector<bool> &keystroke) override;
+    int32_t GetDeviceIds(std::vector<int32_t> &ids) override;
+    int32_t GetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice) override;
     int32_t RegisterDevListener() override;
     int32_t UnregisterDevListener() override;
-    int32_t GetKeyboardType(int32_t userData, int32_t deviceId) override;
+    int32_t GetKeyboardType(int32_t deviceId, int32_t &keyboardType) override;
     int32_t AddInputHandler(InputHandlerType handlerType, HandleEventType eventType,
         int32_t priority, uint32_t deviceTags) override;
     int32_t RemoveInputHandler(InputHandlerType handlerType, HandleEventType eventType,
@@ -101,10 +101,10 @@ protected:
 #endif // OHOS_BUILD_ENABLE_POINTER
     int32_t OnRegisterDevListener(int32_t pid);
     int32_t OnUnregisterDevListener(int32_t pid);
-    int32_t OnGetDeviceIds(int32_t pid, int32_t userData);
-    int32_t OnGetDevice(int32_t pid, int32_t userData, int32_t deviceId);
-    int32_t OnSupportKeys(int32_t pid, int32_t userData, int32_t deviceId, std::vector<int32_t> &keys);
-    int32_t OnGetKeyboardType(int32_t pid, int32_t userData, int32_t deviceId);
+    int32_t OnGetDeviceIds(std::vector<int32_t> &ids);
+    int32_t OnGetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice);
+    int32_t OnSupportKeys(int32_t deviceId, std::vector<int32_t> &keys, std::vector<bool> &keystroke);
+    int32_t OnGetKeyboardType(int32_t deviceId, int32_t &keyboardType);
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
     int32_t CheckAddInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType,
         int32_t priority, uint32_t deviceTags);
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index debf26a3c1..35ca5ceeae 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -515,12 +515,9 @@ int32_t MMIService::GetPointerStyle(int32_t windowId, int32_t &pointerStyle)
     return RET_OK;
 }
 
-int32_t MMIService::OnSupportKeys(int32_t pid, int32_t userData, int32_t deviceId, std::vector<int32_t> &keys)
+int32_t MMIService::OnSupportKeys(int32_t deviceId, std::vector<int32_t> &keys, std::vector<bool> &keystroke)
 {
     CALL_DEBUG_ENTER;
-    auto sess = GetSession(GetClientFd(pid));
-    CHKPR(sess, RET_ERR);
-    std::vector<bool> keystroke;
     int32_t ret = InputDevMgr->SupportKeys(deviceId, keys, keystroke);
     if (keystroke.size() > MAX_SUPPORT_KEY) {
         MMI_HILOGE("Device exceeds the max range");
@@ -530,30 +527,14 @@ int32_t MMIService::OnSupportKeys(int32_t pid, int32_t userData, int32_t deviceI
         MMI_HILOGE("Device id not support");
         return ret;
     }
-
-    NetPacket pkt(MmiMessageId::INPUT_DEVICE_SUPPORT_KEYS);
-    pkt << userData << keystroke.size();
-    for (const bool &item : keystroke) {
-        pkt << item;
-    }
-
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet write support keys info failed");
-        return RET_ERR;
-    }
-    if (!sess->SendMsg(pkt)) {
-        MMI_HILOGE("Sending failed");
-        return MSG_SEND_FAIL;
-    }
     return RET_OK;
 }
 
-int32_t MMIService::SupportKeys(int32_t userData, int32_t deviceId, std::vector<int32_t> &keys)
+int32_t MMIService::SupportKeys(int32_t deviceId, std::vector<int32_t> &keys, std::vector<bool> &keystroke)
 {
     CALL_DEBUG_ENTER;
-    int32_t pid = GetCallingPid();
     int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MMIService::OnSupportKeys, this,
-        pid, userData, deviceId, keys));
+        deviceId, keys, std::ref(keystroke)));
     if (ret != RET_OK) {
         MMI_HILOGE("Support keys info process failed, ret:%{public}d", ret);
         return ret;
@@ -561,34 +542,17 @@ int32_t MMIService::SupportKeys(int32_t userData, int32_t deviceId, std::vector<
     return RET_OK;
 }
 
-int32_t MMIService::OnGetDeviceIds(int32_t pid, int32_t userData)
+int32_t MMIService::OnGetDeviceIds(std::vector<int32_t> &ids)
 {
     CALL_DEBUG_ENTER;
-    auto sess = GetSession(GetClientFd(pid));
-    CHKPR(sess, RET_ERR);
-    std::vector<int32_t> ids = InputDevMgr->GetInputDeviceIds();
-    if (ids.size() > MAX_INPUT_DEVICE) {
-        MMI_HILOGE("Device exceeds the max range");
-        return RET_ERR;
-    }
-    NetPacket pkt(MmiMessageId::INPUT_DEVICE_IDS);
-    pkt << userData << ids;
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet write data failed");
-        return RET_ERR;
-    }
-    if (!sess->SendMsg(pkt)) {
-        MMI_HILOGE("Sending failed");
-        return MSG_SEND_FAIL;
-    }
+    ids = InputDevMgr->GetInputDeviceIds();
     return RET_OK;
 }
 
-int32_t MMIService::GetDeviceIds(int32_t userData)
+int32_t MMIService::GetDeviceIds(std::vector<int32_t> &ids)
 {
     CALL_DEBUG_ENTER;
-    int32_t pid = GetCallingPid();
-    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MMIService::OnGetDeviceIds, this, pid, userData));
+    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MMIService::OnGetDeviceIds, this, std::ref(ids)));
     if (ret != RET_OK) {
         MMI_HILOGE("Get deviceids failed, ret:%{public}d", ret);
         return RET_ERR;
@@ -596,42 +560,22 @@ int32_t MMIService::GetDeviceIds(int32_t userData)
     return RET_OK;
 }
 
-int32_t MMIService::OnGetDevice(int32_t pid, int32_t userData, int32_t deviceId)
+int32_t MMIService::OnGetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice)
 {
     CALL_DEBUG_ENTER;
-    auto sess = GetSession(GetClientFd(pid));
-    CHKPR(sess, RET_ERR);
-    std::shared_ptr<InputDevice> inputDevice = std::make_shared<InputDevice>();
     if (InputDevMgr->GetInputDevice(deviceId) == nullptr) {
         MMI_HILOGE("Input device not found");
         return COMMON_PARAMETER_ERROR;
     }
     inputDevice = InputDevMgr->GetInputDevice(deviceId);
-    NetPacket pkt(MmiMessageId::INPUT_DEVICE);
-    pkt << userData << inputDevice->GetId() << inputDevice->GetName() << inputDevice->GetType()
-        << inputDevice->GetBus() << inputDevice->GetProduct() << inputDevice->GetVendor()
-        << inputDevice->GetVersion() << inputDevice->GetPhys() << inputDevice->GetUniq()
-        << inputDevice->GetCapabilities() << inputDevice->GetAxisInfo().size();
-    for (auto &axis : inputDevice->GetAxisInfo()) {
-        pkt << axis.GetAxisType() << axis.GetMinimum() << axis.GetMaximum()
-            << axis.GetFuzz() << axis.GetFlat() << axis.GetResolution();
-    }
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet write input device info failed");
-        return RET_ERR;
-    }
-    if (!sess->SendMsg(pkt)) {
-        MMI_HILOGE("Sending failed");
-        return MSG_SEND_FAIL;
-    }
     return RET_OK;
 }
 
-int32_t MMIService::GetDevice(int32_t userData, int32_t deviceId)
+int32_t MMIService::GetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice)
 {
     CALL_DEBUG_ENTER;
-    int32_t pid = GetCallingPid();
-    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MMIService::OnGetDevice, this, pid, userData, deviceId));
+    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MMIService::OnGetDevice, this,
+        deviceId, std::ref(inputDevice)));
     if (ret != RET_OK) {
         MMI_HILOGE("Get input device info failed, ret:%{public}d", ret);
         return ret;
@@ -691,40 +635,26 @@ int32_t MMIService::UnregisterDevListener()
     return RET_OK;
 }
 
-int32_t MMIService::OnGetKeyboardType(int32_t pid, int32_t userData, int32_t deviceId)
+int32_t MMIService::OnGetKeyboardType(int32_t deviceId, int32_t &keyboardType)
 {
-    auto sess = GetSession(GetClientFd(pid));
-    CHKPR(sess, RET_ERR);
-    int32_t keyboardType = 0;
     int32_t ret = InputDevMgr->GetKeyboardType(deviceId, keyboardType);
     if (ret != RET_OK) {
         MMI_HILOGE("GetKeyboardType call failed");
         return ret;
     }
-    NetPacket pkt(MmiMessageId::INPUT_DEVICE_KEYBOARD_TYPE);
-    pkt << userData << keyboardType;
-    if (pkt.ChkRWError()) {
-        MMI_HILOGE("Packet write keyboard type failed");
-        return RET_ERR;
-    }
-    if (!sess->SendMsg(pkt)) {
-        MMI_HILOGE("Failed to send the keyboard package");
-        return MSG_SEND_FAIL;
-    }
     return RET_OK;
 }
 
-int32_t MMIService::GetKeyboardType(int32_t userData, int32_t deviceId)
+int32_t MMIService::GetKeyboardType(int32_t deviceId, int32_t &keyboardType)
 {
     CALL_DEBUG_ENTER;
-    int32_t pid = GetCallingPid();
     int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MMIService::OnGetKeyboardType, this,
-        pid, userData, deviceId));
+        deviceId, std::ref(keyboardType)));
     if (ret != RET_OK) {
         MMI_HILOGE("Get keyboard type failed, ret:%{public}d", ret);
         return ret;
     }
-    return RET_OK;
+    return ret;
 }
 
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
diff --git a/util/common/include/proto.h b/util/common/include/proto.h
index 4883595673..51a4f8a230 100644
--- a/util/common/include/proto.h
+++ b/util/common/include/proto.h
@@ -18,11 +18,7 @@
 
 enum class MmiMessageId : int32_t {
     INVALID,
-    INPUT_DEVICE,
-    INPUT_DEVICE_IDS,
-    INPUT_DEVICE_SUPPORT_KEYS,
     ADD_INPUT_DEVICE_LISTENER,
-    INPUT_DEVICE_KEYBOARD_TYPE,
     DISPLAY_INFO,
     NOTICE_ANR,
     MARK_PROCESS,
-- 
Gitee


From a068b2d7979e6413ace4f6a33078bf1815c8373e Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 12 Dec 2022 19:55:18 +0800
Subject: [PATCH 231/360] tochpad modify& uinput touch move event modify

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I3c121591749abca6395f22cfb67f4438df4b4e57
---
 patch/diff_libinput_mmi/libinput/libinput_0000.diff | 11 ++++++++++-
 tools/inject_event/src/input_manager_command.cpp    |  6 +++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/patch/diff_libinput_mmi/libinput/libinput_0000.diff b/patch/diff_libinput_mmi/libinput/libinput_0000.diff
index 2721ca128c..d595f88b3e 100644
--- a/patch/diff_libinput_mmi/libinput/libinput_0000.diff
+++ b/patch/diff_libinput_mmi/libinput/libinput_0000.diff
@@ -2890,7 +2890,7 @@ diff -Naur old/src/evdev-mt-touchpad-gestures.c new/src/evdev-mt-touchpad-gestur
  	return GESTURE_STATE_SWIPE;
 diff -Naur old/src/evdev-mt-touchpad-tap.c new/src/evdev-mt-touchpad-tap.c
 --- old/src/evdev-mt-touchpad-tap.c	2021-01-01 00:00:00.000000000 +0800
-+++ new/src/evdev-mt-touchpad-tap.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-mt-touchpad-tap.c	2022-12-12 19:49:27.376953599 +0800
 @@ -72,6 +72,7 @@
  	CASE_RETURN_STRING(TAP_STATE_DRAGGING_OR_TAP);
  	CASE_RETURN_STRING(TAP_STATE_DRAGGING_2);
@@ -2993,6 +2993,15 @@ diff -Naur old/src/evdev-mt-touchpad-tap.c new/src/evdev-mt-touchpad-tap.c
  	}
  
  	if (tp->tap.state == TAP_STATE_IDLE || tp->tap.state == TAP_STATE_DEAD)
+@@ -1154,7 +1212,7 @@
+ static inline enum libinput_config_drag_state
+ tp_drag_default(struct evdev_device *device)
+ {
+-	return LIBINPUT_CONFIG_DRAG_ENABLED;
++	return LIBINPUT_CONFIG_DRAG_DISABLED;
+ }
+ 
+ static enum libinput_config_drag_state
 @@ -1295,3 +1353,63 @@
  		return false;
  	}
diff --git a/tools/inject_event/src/input_manager_command.cpp b/tools/inject_event/src/input_manager_command.cpp
index 17ae4ee598..27005399a0 100644
--- a/tools/inject_event/src/input_manager_command.cpp
+++ b/tools/inject_event/src/input_manager_command.cpp
@@ -818,7 +818,7 @@ int32_t InputManagerCommand::ParseCommand(int32_t argc, char *argv[])
                             while (currentTimeMs < endTimeMs) {
                                 item.SetDisplayX(NextPos(startTimeMs, currentTimeMs, totalTimeMs, px1, px2));
                                 item.SetDisplayY(NextPos(startTimeMs, currentTimeMs, totalTimeMs, py1, py2));
-                                pointerEvent->SetActionTime(currentTimeMs);
+                                pointerEvent->SetActionTime(currentTimeMs * 1000);
                                 pointerEvent->UpdatePointerItem(0, item);
                                 pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_MOVE);
                                 InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
@@ -831,7 +831,7 @@ int32_t InputManagerCommand::ParseCommand(int32_t argc, char *argv[])
 
                             item.SetDisplayX(px2);
                             item.SetDisplayY(py2);
-                            pointerEvent->SetActionTime(endTimeMs);
+                            pointerEvent->SetActionTime(endTimeMs * 1000);
                             pointerEvent->UpdatePointerItem(0, item);
                             pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_MOVE);
                             InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
@@ -839,7 +839,7 @@ int32_t InputManagerCommand::ParseCommand(int32_t argc, char *argv[])
 
                             item.SetDisplayX(px2);
                             item.SetDisplayY(py2);
-                            pointerEvent->SetActionTime(endTimeMs + BLOCK_TIME_MS);
+                            pointerEvent->SetActionTime((endTimeMs + BLOCK_TIME_MS) * 1000);
                             pointerEvent->UpdatePointerItem(0, item);
                             pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_UP);
                             InputManager::GetInstance()->SimulateInputEvent(pointerEvent);
-- 
Gitee


From e38ca26c09a39badd41a65c7fbfac5e7bfa2bd35 Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Tue, 13 Dec 2022 02:58:34 +0000
Subject: [PATCH 232/360] Header file order optimization

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: I2660de043ab000880c842c579ef9b028bf5ae413
---
 .../include/js_register_module.h              |   3 +-
 .../input_consumer/include/js_register_util.h |   1 +
 .../input_consumer/src/js_register_module.cpp |   4 +-
 .../input_consumer/src/js_register_util.cpp   |   2 +-
 .../src/js_input_device_context.cpp           |   7 +-
 frameworks/napi/input_device/src/js_util.cpp  |  28 ++---
 .../input_device_cooperate/src/js_util.cpp    |   2 +-
 .../src/native_register_module.cpp            |   2 +-
 .../include/js_register_module.h              |   1 +
 .../include/js_register_util.h                |   1 +
 .../src/js_register_util.cpp                  |   2 +-
 .../src/js_input_monitor_module.cpp           |   2 +-
 frameworks/napi/key_code/src/js_key_code.cpp  |   2 +-
 .../napi/key_event/src/js_key_event.cpp       |   2 +-
 .../napi/mouse_event/src/js_mouse_event.cpp   |   2 +-
 .../napi/pointer/include/js_pointer_manager.h |   4 +-
 .../napi/touch_event/src/js_touch_event.cpp   |   2 +-
 .../event_handler/include/bytrace_adapter.h   |   1 +
 .../include/client_msg_handler.h              |   1 +
 .../event_handler/include/input_device_impl.h |   1 +
 .../include/input_monitor_manager.h           |   2 +-
 .../event_handler/src/client_msg_handler.cpp  |  30 ++---
 .../event_handler/src/input_device_impl.cpp   |   2 +-
 .../src/input_monitor_manager.cpp             |   1 +
 .../events/test/input_manager_manual_test.cpp |  10 +-
 .../proxy/events/test/input_manager_test.cpp  |   2 +-
 .../proxy/module_loader/include/mmi_client.h  |   2 +
 .../module_loader/include/mmi_fd_listener.h   |   2 +
 .../innerkits/event/include/key_event.h       |  39 ++++---
 .../innerkits/event/include/pointer_event.h   |  94 +++++++--------
 .../innerkits/proxy/include/input_manager.h   | 108 +++++++++---------
 .../innerkits/proxy/include/window_info.h     |   4 +-
 .../src/multimodal_input_connect_stub.cpp     |   4 +-
 .../delegate_task/include/delegate_tasks.h    |   2 +
 service/delegate_task/src/delegate_tasks.cpp  |   5 +-
 .../include/input_device_manager.h            |   2 +-
 .../src/input_device_manager.cpp              |  18 +--
 service/dfx/include/dfx_hisysevent.h          |   1 +
 service/dfx/src/dfx_hisysevent.cpp            |   1 +
 .../include/event_dispatch_handler.h          |   1 +
 .../test/event_dispatch_test.cpp              |   2 +-
 service/event_dump/src/event_dump.cpp         |  24 ++--
 .../include/input_event_handler.h             |   2 +-
 .../event_handler/include/key_auto_repeat.h   |   2 +-
 .../src/event_normalize_handler.cpp           |   2 +-
 .../event_handler/src/input_event_handler.cpp |   2 +-
 service/filter/include/event_filter_proxy.h   |   2 +-
 .../src/input_device_cooperate_sm.cpp         |   5 +-
 .../key_command/src/key_command_handler.cpp   |   2 +-
 .../libinput_adapter/src/libinput_adapter.cpp |   4 +-
 .../message_handle/src/server_msg_handler.cpp |   4 +-
 service/module_loader/include/mmi_service.h   |   2 +-
 service/module_loader/src/mmi_service.cpp     |  16 +--
 .../monitor/include/event_monitor_handler.h   |   2 +-
 .../include/mouse_device_state.h              |  17 +--
 .../src/mouse_device_state.cpp                |   2 +-
 .../src/permission_helper.cpp                 |   3 +-
 .../include/key_subscriber_handler.h          |   1 +
 .../include/gesture_transform_processor.h     |   1 +
 .../include/joystick_transform_processor.h    |  54 ++++-----
 .../include/touchpad_transform_processor.h    |   2 +
 .../include/transform_processor.h             |   3 +
 .../test/transform_point_test.cpp             |   2 +
 .../src/input_windows_manager.cpp             |   6 +-
 .../setanrobserver_fuzzer.cpp                 |   2 +-
 .../unittest/common/include/event_util_test.h |  10 +-
 tools/event_inject/src/get_device_object.cpp  |   2 +-
 .../src/injection_event_dispatch.cpp          |   2 +-
 tools/event_inject/src/input_parse.cpp        |   4 +-
 .../src/mmi_event_simulate_main.cpp           |   2 +-
 tools/vuinput/include/virtual_device_config.h |  25 ++--
 tools/vuinput/src/virtual_device.cpp          |  74 ++++++------
 tools/vuinput/src/virtual_finger.cpp          |  42 +++----
 tools/vuinput/src/virtual_gamepad.cpp         |  20 ++--
 tools/vuinput/src/virtual_joystick.cpp        |  12 +-
 tools/vuinput/src/virtual_knob.cpp            |   2 +-
 tools/vuinput/src/virtual_pen.cpp             |  16 +--
 tools/vuinput/src/virtual_remote_control.cpp  |   4 +-
 tools/vuinput/src/virtual_single_finger.cpp   |   6 +-
 tools/vuinput/src/virtual_stylus.cpp          |  22 ++--
 tools/vuinput/src/virtual_touchpad.cpp        |  12 +-
 tools/vuinput/src/virtual_touchscreen.cpp     |  32 +++---
 tools/vuinput/test/virtual_device_test.cpp    |   2 +
 uinput/hdf_device_event_dispatch.cpp          |   2 +-
 uinput/hdf_device_event_dispatch.h            |   2 +-
 uinput/keyboard_inject.cpp                    |   4 +-
 uinput/virtual_keyboard.h                     |   2 +-
 .../include/input_event_data_transformation.h |   2 +
 util/common/include/proto.h                   |   2 +
 util/common/include/util_napi_error.h         |  14 +--
 util/common/src/klog.cpp                      |   7 +-
 util/common/src/util.cpp                      |   2 +-
 util/network/include/circle_stream_buffer.h   |   2 +
 util/network/src/net_packet.cpp               |   2 +-
 util/network/src/stream_buffer.cpp            |   6 +-
 util/network/test/net_packet_test.cpp         |   2 +-
 util/socket/test/stream_buffer_test.cpp       |   1 -
 util/socket/test/uds_client_test.cpp          |   1 -
 98 files changed, 470 insertions(+), 434 deletions(-)
 mode change 100755 => 100644 frameworks/napi/input_device_cooperate/src/js_util.cpp
 mode change 100755 => 100644 frameworks/napi/input_device_cooperate/src/native_register_module.cpp
 mode change 100755 => 100644 frameworks/proxy/event_handler/include/input_device_impl.h
 mode change 100755 => 100644 frameworks/proxy/event_handler/src/input_device_impl.cpp
 mode change 100755 => 100644 frameworks/proxy/module_loader/include/mmi_client.h
 mode change 100755 => 100644 service/input_device_cooperate/src/input_device_cooperate_sm.cpp
 mode change 100755 => 100644 test/fuzztest/setanrobserver_fuzzer/setanrobserver_fuzzer.cpp

diff --git a/frameworks/napi/input_consumer/include/js_register_module.h b/frameworks/napi/input_consumer/include/js_register_module.h
index c6da2a7c20..147dab007f 100644
--- a/frameworks/napi/input_consumer/include/js_register_module.h
+++ b/frameworks/napi/input_consumer/include/js_register_module.h
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef JS_REGISTER_MODULE_H
 #define JS_REGISTER_MODULE_H
 
@@ -25,9 +26,9 @@
 #include "napi/native_node_api.h"
 #include "utils/log.h"
 
+#include "define_multimodal.h"
 #include "key_event.h"
 #include "key_option.h"
-#include "define_multimodal.h"
 
 #define SUCCESS_CODE 0
 #define ERROR_CODE (-1)
diff --git a/frameworks/napi/input_consumer/include/js_register_util.h b/frameworks/napi/input_consumer/include/js_register_util.h
index 129221f014..f808b49ef2 100644
--- a/frameworks/napi/input_consumer/include/js_register_util.h
+++ b/frameworks/napi/input_consumer/include/js_register_util.h
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef JS_REGISTER_UTIL_H
 #define JS_REGISTER_UTIL_H
 
diff --git a/frameworks/napi/input_consumer/src/js_register_module.cpp b/frameworks/napi/input_consumer/src/js_register_module.cpp
index e0db601216..fe3df5f6a7 100644
--- a/frameworks/napi/input_consumer/src/js_register_module.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_module.cpp
@@ -21,8 +21,8 @@
 #include "input_manager.h"
 #include "js_register_util.h"
 #include "napi_constants.h"
-#include "util_napi_error.h"
 #include "util_napi.h"
+#include "util_napi_error.h"
 
 namespace OHOS {
 namespace MMI {
@@ -111,7 +111,7 @@ napi_value GetEventInfoAPI9(napi_env env, napi_callback_info info, KeyEventMonit
     subKeyNames += ",";
     keyOption->SetFinalKeyDown(isFinalKeyDown);
     MMI_HILOGD("IsFinalKeyDown:%{public}d,map_key:%{public}s",
-        (isFinalKeyDown == true?1:0), subKeyNames.c_str());
+        (isFinalKeyDown == true ? 1 : 0), subKeyNames.c_str());
     std::optional<int32_t> tempKeyDownDuration = GetNamedPropertyInt32(env, argv[1], "finalKeyDownDuration");
     if (!tempKeyDownDuration) {
         MMI_HILOGE("GetNamedPropertyInt32 failed");
diff --git a/frameworks/napi/input_consumer/src/js_register_util.cpp b/frameworks/napi/input_consumer/src/js_register_util.cpp
index 84cbbd64bb..604e3ec9b7 100644
--- a/frameworks/napi/input_consumer/src/js_register_util.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_util.cpp
@@ -21,8 +21,8 @@
 
 #include "error_multimodal.h"
 #include "napi_constants.h"
-#include "util_napi_error.h"
 #include "util_napi.h"
+#include "util_napi_error.h"
 
 namespace OHOS {
 namespace MMI {
diff --git a/frameworks/napi/input_device/src/js_input_device_context.cpp b/frameworks/napi/input_device/src/js_input_device_context.cpp
index fb179877f1..9501daa057 100644
--- a/frameworks/napi/input_device/src/js_input_device_context.cpp
+++ b/frameworks/napi/input_device/src/js_input_device_context.cpp
@@ -14,6 +14,7 @@
  */
 
 #include "js_input_device_context.h"
+
 #include "mmi_log.h"
 #include "napi_constants.h"
 #include "util_napi_error.h"
@@ -145,7 +146,7 @@ napi_value JsInputDeviceContext::On(napi_env env, napi_callback_info info)
         return nullptr;
     }
 
-    char eventType[MAX_STRING_LEN] = {0};
+    char eventType[MAX_STRING_LEN] = { 0 };
     size_t ret = 0;
     CHKRP(napi_get_value_string_utf8(env, argv[0], eventType, MAX_STRING_LEN - 1, &ret), GET_VALUE_STRING_UTF8);
     std::string type = eventType;
@@ -184,7 +185,7 @@ napi_value JsInputDeviceContext::Off(napi_env env, napi_callback_info info)
         return nullptr;
     }
 
-    char eventType[MAX_STRING_LEN] = {0};
+    char eventType[MAX_STRING_LEN] = { 0 };
     size_t ret = 0;
     CHKRP(napi_get_value_string_utf8(env, argv[0], eventType, MAX_STRING_LEN - 1, &ret), GET_VALUE_STRING_UTF8);
     std::string type = eventType;
@@ -416,7 +417,7 @@ napi_value JsInputDeviceContext::EnumClassConstructor(napi_env env, napi_callbac
 {
     CALL_DEBUG_ENTER;
     size_t argc = 0;
-    napi_value args[1] = {0};
+    napi_value args[1] = { 0 };
     napi_value ret = nullptr;
     void *data = nullptr;
     CHKRP(napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
diff --git a/frameworks/napi/input_device/src/js_util.cpp b/frameworks/napi/input_device/src/js_util.cpp
index 5996e6e013..a1420c3923 100644
--- a/frameworks/napi/input_device/src/js_util.cpp
+++ b/frameworks/napi/input_device/src/js_util.cpp
@@ -27,14 +27,14 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "JsUtil" };
 
 std::map<int32_t, std::string> axisType = {
-    {ABS_MT_TOUCH_MAJOR, "touchMajor"},
-    {ABS_MT_TOUCH_MINOR, "touchMinor"},
-    {ABS_MT_ORIENTATION, "orientation"},
-    {ABS_MT_POSITION_X, "x"},
-    {ABS_MT_POSITION_Y, "y"},
-    {ABS_MT_PRESSURE, "pressure"},
-    {ABS_MT_WIDTH_MAJOR, "toolMajor"},
-    {ABS_MT_WIDTH_MINOR, "toolMinor"},
+    { ABS_MT_TOUCH_MAJOR, "touchMajor" },
+    { ABS_MT_TOUCH_MINOR, "touchMinor" },
+    { ABS_MT_ORIENTATION, "orientation" },
+    { ABS_MT_POSITION_X, "x" },
+    { ABS_MT_POSITION_Y, "y" },
+    { ABS_MT_PRESSURE, "pressure" },
+    { ABS_MT_WIDTH_MAJOR, "toolMajor" },
+    { ABS_MT_WIDTH_MINOR, "toolMinor" },
 };
 
 constexpr uint32_t EVDEV_UDEV_TAG_TOUCHSCREEN = (1 << 4);
@@ -42,12 +42,12 @@ constexpr uint32_t EVDEV_UDEV_TAG_JOYSTICK = (1 << 6);
 constexpr uint32_t EVDEV_UDEV_TAG_TRACKBALL = (1 << 10);
 
 JsUtil::DeviceType g_deviceType[] = {
-    {"keyboard", EVDEV_UDEV_TAG_KEYBOARD},
-    {"mouse", EVDEV_UDEV_TAG_MOUSE},
-    {"touchpad", EVDEV_UDEV_TAG_TOUCHPAD},
-    {"touchscreen", EVDEV_UDEV_TAG_TOUCHSCREEN},
-    {"joystick", EVDEV_UDEV_TAG_JOYSTICK},
-    {"trackball", EVDEV_UDEV_TAG_TRACKBALL},
+    { "keyboard", EVDEV_UDEV_TAG_KEYBOARD },
+    { "mouse", EVDEV_UDEV_TAG_MOUSE },
+    { "touchpad", EVDEV_UDEV_TAG_TOUCHPAD },
+    { "touchscreen", EVDEV_UDEV_TAG_TOUCHSCREEN },
+    { "joystick", EVDEV_UDEV_TAG_JOYSTICK },
+    { "trackball", EVDEV_UDEV_TAG_TRACKBALL },
 };
 } // namespace
 bool JsUtil::IsSameHandle(napi_env env, napi_value handle, napi_ref ref)
diff --git a/frameworks/napi/input_device_cooperate/src/js_util.cpp b/frameworks/napi/input_device_cooperate/src/js_util.cpp
old mode 100755
new mode 100644
index b0d3aa3986..4bade2cae5
--- a/frameworks/napi/input_device_cooperate/src/js_util.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_util.cpp
@@ -17,8 +17,8 @@
 
 #include "mmi_log.h"
 #include "napi_constants.h"
-#include "util_napi_error.h"
 #include "util_napi.h"
+#include "util_napi_error.h"
 
 namespace OHOS {
 namespace MMI {
diff --git a/frameworks/napi/input_device_cooperate/src/native_register_module.cpp b/frameworks/napi/input_device_cooperate/src/native_register_module.cpp
old mode 100755
new mode 100644
index ee60084e71..10ba0342d2
--- a/frameworks/napi/input_device_cooperate/src/native_register_module.cpp
+++ b/frameworks/napi/input_device_cooperate/src/native_register_module.cpp
@@ -26,7 +26,7 @@ static napi_module mmiInputDeviceCooperateModule = {
     .nm_register_func = JsInputDeviceCooperateContext::Export,
     .nm_modname = "multimodalInput.inputDeviceCooperate",
     .nm_priv = ((void *)0),
-    .reserved = {0},
+    .reserved = { 0 },
 };
 
 extern "C" __attribute__((constructor)) void RegisterModule(void)
diff --git a/frameworks/napi/input_event_client/include/js_register_module.h b/frameworks/napi/input_event_client/include/js_register_module.h
index dc32413b65..bc5551a3d2 100644
--- a/frameworks/napi/input_event_client/include/js_register_module.h
+++ b/frameworks/napi/input_event_client/include/js_register_module.h
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef JS_REGISTER_MODULE_H
 #define JS_REGISTER_MODULE_H
 
diff --git a/frameworks/napi/input_event_client/include/js_register_util.h b/frameworks/napi/input_event_client/include/js_register_util.h
index cda9719765..079284042e 100644
--- a/frameworks/napi/input_event_client/include/js_register_util.h
+++ b/frameworks/napi/input_event_client/include/js_register_util.h
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef JS_REGISTER_UTIL_H
 #define JS_REGISTER_UTIL_H
 
diff --git a/frameworks/napi/input_event_client/src/js_register_util.cpp b/frameworks/napi/input_event_client/src/js_register_util.cpp
index e949cca7a0..6426d245df 100644
--- a/frameworks/napi/input_event_client/src/js_register_util.cpp
+++ b/frameworks/napi/input_event_client/src/js_register_util.cpp
@@ -17,10 +17,10 @@
 
 #include <cinttypes>
 
+#include "js_register_module.h"
 #include "napi_constants.h"
 #include "util_napi.h"
 #include "util_napi_error.h"
-#include "js_register_module.h"
 
 namespace OHOS {
 namespace MMI {
diff --git a/frameworks/napi/input_monitor/src/js_input_monitor_module.cpp b/frameworks/napi/input_monitor/src/js_input_monitor_module.cpp
index 5e20284484..75e6f0b4c0 100644
--- a/frameworks/napi/input_monitor/src/js_input_monitor_module.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor_module.cpp
@@ -20,8 +20,8 @@
 #include <uv.h>
 
 #include "define_multimodal.h"
-#include "napi_constants.h"
 #include "js_input_monitor_manager.h"
+#include "napi_constants.h"
 #include "proto.h"
 #include "util_napi_error.h"
 
diff --git a/frameworks/napi/key_code/src/js_key_code.cpp b/frameworks/napi/key_code/src/js_key_code.cpp
index c029129c24..b2576134cb 100644
--- a/frameworks/napi/key_code/src/js_key_code.cpp
+++ b/frameworks/napi/key_code/src/js_key_code.cpp
@@ -38,7 +38,7 @@ napi_value JsKeyCode::EnumClassConstructor(napi_env env, napi_callback_info info
 {
     CALL_DEBUG_ENTER;
     size_t argc = 0;
-    napi_value args[1] = {0};
+    napi_value args[1] = { 0 };
     napi_value ret = nullptr;
     void *data = nullptr;
     CHKRP(napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
diff --git a/frameworks/napi/key_event/src/js_key_event.cpp b/frameworks/napi/key_event/src/js_key_event.cpp
index 1145306d92..e9c8101f5a 100644
--- a/frameworks/napi/key_event/src/js_key_event.cpp
+++ b/frameworks/napi/key_event/src/js_key_event.cpp
@@ -43,7 +43,7 @@ napi_value JsKeyEvent::EnumClassConstructor(napi_env env, napi_callback_info inf
 {
     CALL_DEBUG_ENTER;
     size_t argc = 0;
-    napi_value args[1] = {0};
+    napi_value args[1] = { 0 };
     napi_value ret = nullptr;
     void *data = nullptr;
     CHKRP(napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
diff --git a/frameworks/napi/mouse_event/src/js_mouse_event.cpp b/frameworks/napi/mouse_event/src/js_mouse_event.cpp
index 341e748261..cc81b9229a 100644
--- a/frameworks/napi/mouse_event/src/js_mouse_event.cpp
+++ b/frameworks/napi/mouse_event/src/js_mouse_event.cpp
@@ -64,7 +64,7 @@ napi_value JsMouseEvent::EnumClassConstructor(napi_env env, napi_callback_info i
 {
     CALL_DEBUG_ENTER;
     size_t argc = 0;
-    napi_value args[1] = {0};
+    napi_value args[1] = { 0 };
     napi_value ret = nullptr;
     void *data = nullptr;
     CHKRP(napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
diff --git a/frameworks/napi/pointer/include/js_pointer_manager.h b/frameworks/napi/pointer/include/js_pointer_manager.h
index cddb9fbe96..c10c1c6828 100644
--- a/frameworks/napi/pointer/include/js_pointer_manager.h
+++ b/frameworks/napi/pointer/include/js_pointer_manager.h
@@ -21,13 +21,13 @@
 #include "napi/native_api.h"
 #include "napi/native_node_api.h"
 #include "napi_constants.h"
-#include "utils/log.h"
 #include "refbase.h"
+#include "utils/log.h"
 
-#include "stream_buffer.h"
 #include "define_multimodal.h"
 #include "error_multimodal.h"
 #include "input_manager.h"
+#include "stream_buffer.h"
 #include "util_napi.h"
 #include "util_napi_error.h"
 
diff --git a/frameworks/napi/touch_event/src/js_touch_event.cpp b/frameworks/napi/touch_event/src/js_touch_event.cpp
index f68599e9a7..18a8f2a70e 100644
--- a/frameworks/napi/touch_event/src/js_touch_event.cpp
+++ b/frameworks/napi/touch_event/src/js_touch_event.cpp
@@ -61,7 +61,7 @@ napi_value JsTouchEvent::EnumClassConstructor(napi_env env, napi_callback_info i
 {
     CALL_DEBUG_ENTER;
     size_t argc = 0;
-    napi_value args[1] = {0};
+    napi_value args[1] = { 0 };
     napi_value ret = nullptr;
     void *data = nullptr;
     CHKRP(napi_get_cb_info(env, info, &argc, args, &ret, &data), GET_CB_INFO);
diff --git a/frameworks/proxy/event_handler/include/bytrace_adapter.h b/frameworks/proxy/event_handler/include/bytrace_adapter.h
index 36782c7a4d..d6bb08c633 100644
--- a/frameworks/proxy/event_handler/include/bytrace_adapter.h
+++ b/frameworks/proxy/event_handler/include/bytrace_adapter.h
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef BYTRACE_ADAPTER_H
 #define BYTRACE_ADAPTER_H
 
diff --git a/frameworks/proxy/event_handler/include/client_msg_handler.h b/frameworks/proxy/event_handler/include/client_msg_handler.h
index 46c0a2e384..64be289f92 100644
--- a/frameworks/proxy/event_handler/include/client_msg_handler.h
+++ b/frameworks/proxy/event_handler/include/client_msg_handler.h
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef CLIENT_MSG_HANDLER_H
 #define CLIENT_MSG_HANDLER_H
 
diff --git a/frameworks/proxy/event_handler/include/input_device_impl.h b/frameworks/proxy/event_handler/include/input_device_impl.h
old mode 100755
new mode 100644
index 3b8463b46e..449943be24
--- a/frameworks/proxy/event_handler/include/input_device_impl.h
+++ b/frameworks/proxy/event_handler/include/input_device_impl.h
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef OHOS_INPUT_DEVICE_EVENT_H
 #define OHOS_INPUT_DEVICE_EVENT_H
 
diff --git a/frameworks/proxy/event_handler/include/input_monitor_manager.h b/frameworks/proxy/event_handler/include/input_monitor_manager.h
index 4bc2a205be..c9cbb71a0c 100644
--- a/frameworks/proxy/event_handler/include/input_monitor_manager.h
+++ b/frameworks/proxy/event_handler/include/input_monitor_manager.h
@@ -21,8 +21,8 @@
 #include "singleton.h"
 
 #include "input_handler_manager.h"
-#include "i_input_event_consumer.h"
 #include "input_handler_type.h"
+#include "i_input_event_consumer.h"
 
 namespace OHOS {
 namespace MMI {
diff --git a/frameworks/proxy/event_handler/src/client_msg_handler.cpp b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
index 013b7b168a..86b5478f5e 100644
--- a/frameworks/proxy/event_handler/src/client_msg_handler.cpp
+++ b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
@@ -51,31 +51,31 @@ void ClientMsgHandler::Init()
 {
     MsgCallback funs[] = {
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
-        {MmiMessageId::ON_KEY_EVENT, MsgCallbackBind2(&ClientMsgHandler::OnKeyEvent, this)},
-        {MmiMessageId::ON_SUBSCRIBE_KEY, std::bind(&ClientMsgHandler::OnSubscribeKeyEventCallback,
-                                                   this, std::placeholders::_1, std::placeholders::_2)},
+        { MmiMessageId::ON_KEY_EVENT, MsgCallbackBind2(&ClientMsgHandler::OnKeyEvent, this) },
+        { MmiMessageId::ON_SUBSCRIBE_KEY, std::bind(&ClientMsgHandler::OnSubscribeKeyEventCallback,
+                                                   this, std::placeholders::_1, std::placeholders::_2) },
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
-        {MmiMessageId::ON_POINTER_EVENT, MsgCallbackBind2(&ClientMsgHandler::OnPointerEvent, this)},
+        { MmiMessageId::ON_POINTER_EVENT, MsgCallbackBind2(&ClientMsgHandler::OnPointerEvent, this) },
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
-        {MmiMessageId::INPUT_DEVICE, MsgCallbackBind2(&ClientMsgHandler::OnInputDevice, this)},
-        {MmiMessageId::INPUT_DEVICE_IDS, MsgCallbackBind2(&ClientMsgHandler::OnInputDeviceIds, this)},
-        {MmiMessageId::INPUT_DEVICE_SUPPORT_KEYS, MsgCallbackBind2(&ClientMsgHandler::OnSupportKeys, this)},
-        {MmiMessageId::INPUT_DEVICE_KEYBOARD_TYPE, MsgCallbackBind2(&ClientMsgHandler::OnInputKeyboardType, this)},
-        {MmiMessageId::ADD_INPUT_DEVICE_LISTENER, MsgCallbackBind2(&ClientMsgHandler::OnDevListener, this)},
-        {MmiMessageId::NOTICE_ANR, MsgCallbackBind2(&ClientMsgHandler::OnAnr, this)},
+        { MmiMessageId::INPUT_DEVICE, MsgCallbackBind2(&ClientMsgHandler::OnInputDevice, this) },
+        { MmiMessageId::INPUT_DEVICE_IDS, MsgCallbackBind2(&ClientMsgHandler::OnInputDeviceIds, this) },
+        { MmiMessageId::INPUT_DEVICE_SUPPORT_KEYS, MsgCallbackBind2(&ClientMsgHandler::OnSupportKeys, this) },
+        { MmiMessageId::INPUT_DEVICE_KEYBOARD_TYPE, MsgCallbackBind2(&ClientMsgHandler::OnInputKeyboardType, this) },
+        { MmiMessageId::ADD_INPUT_DEVICE_LISTENER, MsgCallbackBind2(&ClientMsgHandler::OnDevListener, this) },
+        { MmiMessageId::NOTICE_ANR, MsgCallbackBind2(&ClientMsgHandler::OnAnr, this) },
 #if defined(OHOS_BUILD_ENABLE_KEYBOARD) && (defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || \
     defined(OHOS_BUILD_ENABLE_MONITOR))
-        {MmiMessageId::REPORT_KEY_EVENT, MsgCallbackBind2(&ClientMsgHandler::ReportKeyEvent, this)},
+        { MmiMessageId::REPORT_KEY_EVENT, MsgCallbackBind2(&ClientMsgHandler::ReportKeyEvent, this) },
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
 #if (defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)) && \
     (defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR))
-        {MmiMessageId::REPORT_POINTER_EVENT, MsgCallbackBind2(&ClientMsgHandler::ReportPointerEvent, this)},
+        { MmiMessageId::REPORT_POINTER_EVENT, MsgCallbackBind2(&ClientMsgHandler::ReportPointerEvent, this) },
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-        {MmiMessageId::COOPERATION_ADD_LISTENER, MsgCallbackBind2(&ClientMsgHandler::OnCooperationListener, this)},
-        {MmiMessageId::COOPERATION_MESSAGE, MsgCallbackBind2(&ClientMsgHandler::OnCooperationMessage, this)},
-        {MmiMessageId::COOPERATION_GET_STATE, MsgCallbackBind2(&ClientMsgHandler::OnCooperationState, this)},
+        { MmiMessageId::COOPERATION_ADD_LISTENER, MsgCallbackBind2(&ClientMsgHandler::OnCooperationListener, this) },
+        { MmiMessageId::COOPERATION_MESSAGE, MsgCallbackBind2(&ClientMsgHandler::OnCooperationMessage, this) },
+        { MmiMessageId::COOPERATION_GET_STATE, MsgCallbackBind2(&ClientMsgHandler::OnCooperationState, this) },
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     };
     for (auto &it : funs) {
diff --git a/frameworks/proxy/event_handler/src/input_device_impl.cpp b/frameworks/proxy/event_handler/src/input_device_impl.cpp
old mode 100755
new mode 100644
index 4e9c150e41..1103db3d03
--- a/frameworks/proxy/event_handler/src/input_device_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_device_impl.cpp
@@ -270,7 +270,7 @@ const InputDeviceImpl::FunInputDevKeys* InputDeviceImpl::GetDeviceKeys(int32_t u
 const InputDeviceImpl::FunKeyboardTypes* InputDeviceImpl::GetKeyboardTypes(int32_t userData) const
 {
     auto iter = inputDevices_.find(userData);
-    return iter == inputDevices_.end()? nullptr : &iter->second.kbTypes;
+    return iter == inputDevices_.end() ? nullptr : &iter->second.kbTypes;
 }
 
 int32_t InputDeviceImpl::GetUserData()
diff --git a/frameworks/proxy/event_handler/src/input_monitor_manager.cpp b/frameworks/proxy/event_handler/src/input_monitor_manager.cpp
index 24d87e207d..4e267e27db 100644
--- a/frameworks/proxy/event_handler/src/input_monitor_manager.cpp
+++ b/frameworks/proxy/event_handler/src/input_monitor_manager.cpp
@@ -14,6 +14,7 @@
  */
 
 #include "input_monitor_manager.h"
+
 #include "multimodal_input_connect_manager.h"
 #include "util.h"
 
diff --git a/frameworks/proxy/events/test/input_manager_manual_test.cpp b/frameworks/proxy/events/test/input_manager_manual_test.cpp
index 3363932772..ea841f4a9f 100644
--- a/frameworks/proxy/events/test/input_manager_manual_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_manual_test.cpp
@@ -58,16 +58,16 @@ PermissionDef infoManagerTestPermDef = {
 PermissionStateFull infoManagerTestState = {
     .permissionName = "ohos.permission.test",
     .isGeneral = true,
-    .resDeviceID = {"local"},
-    .grantStatus = {PermissionState::PERMISSION_GRANTED},
-    .grantFlags = {1},
+    .resDeviceID = { "local" },
+    .grantStatus = { PermissionState::PERMISSION_GRANTED },
+    .grantFlags = { 1 },
 };
 
 HapPolicyParams infoManagerTestPolicyPrams = {
     .apl = APL_SYSTEM_CORE,
     .domain = "test.domain",
-    .permList = {infoManagerTestPermDef},
-    .permStateList = {infoManagerTestState}
+    .permList = { infoManagerTestPermDef },
+    .permStateList = { infoManagerTestState }
 };
 } // namespace
 
diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 9669dd9576..4ebde66c0c 100644
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -1565,7 +1565,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_SubscribeKeyEvent_03, TestSize.Level
 HWTEST_F(InputManagerTest, TestGetKeystrokeAbility_001, TestSize.Level1)
 {
     CALL_TEST_DEBUG;
-    std::vector<int32_t> keyCodes = {17, 22, 2055};
+    std::vector<int32_t> keyCodes = { 17, 22, 2055 };
     InputManager::GetInstance()->SupportKeys(0, keyCodes, [](std::vector<bool> keystrokeAbility) {
         MMI_HILOGD("TestGetKeystrokeAbility_001 callback ok");
     });
diff --git a/frameworks/proxy/module_loader/include/mmi_client.h b/frameworks/proxy/module_loader/include/mmi_client.h
old mode 100755
new mode 100644
index 6f5d1ad2ee..a2ba101d24
--- a/frameworks/proxy/module_loader/include/mmi_client.h
+++ b/frameworks/proxy/module_loader/include/mmi_client.h
@@ -12,8 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef MMI_CLIENT_H
 #define MMI_CLIENT_H
+
 #include "nocopyable.h"
 
 #include "if_mmi_client.h"
diff --git a/frameworks/proxy/module_loader/include/mmi_fd_listener.h b/frameworks/proxy/module_loader/include/mmi_fd_listener.h
index 03193d5ff0..d3fbbec64f 100644
--- a/frameworks/proxy/module_loader/include/mmi_fd_listener.h
+++ b/frameworks/proxy/module_loader/include/mmi_fd_listener.h
@@ -12,8 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef MMI_FD_LISTENER_H
 #define MMI_FD_LISTENER_H
+
 #include "file_descriptor_listener.h"
 
 #include "if_mmi_client.h"
diff --git a/interfaces/native/innerkits/event/include/key_event.h b/interfaces/native/innerkits/event/include/key_event.h
index f4fad15698..96cc478eb0 100644
--- a/interfaces/native/innerkits/event/include/key_event.h
+++ b/interfaces/native/innerkits/event/include/key_event.h
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef KEY_EVENT_H
 #define KEY_EVENT_H
 
@@ -28,28 +29,28 @@ namespace MMI {
 class KeyEvent : public InputEvent {
 public:
     /**
-     * 未知的功能按键
+     * Unknown function key
      *
      * @since 9
      */
     static const int32_t UNKNOWN_FUNCTION_KEY;
 
     /**
-     * Num Lock功能按键
+     * Num Lock key
      *
      * @since 9
      */
     static const int32_t NUM_LOCK_FUNCTION_KEY;
 
     /**
-     * Caps Lock功能按键
+     * Caps Lock key
      *
      * @since 9
      */
     static const int32_t CAPS_LOCK_FUNCTION_KEY;
 
     /**
-     * Scroll Lock功能按键
+     * Scroll Lock key
      *
      * @since 9
      */
@@ -2927,16 +2928,16 @@ public:
         void SetPressed(bool pressed);
 
         /**
-         * @brief 设置当前按键对应的unicode值
-         * @param unicode 指定的unicode值
-         * @return 空
+         * @brief Sets the Unicode value corresponding to the current key.
+         * @param unicode Unicode value.
+         * @return Null
          * @since 9
          */
         void SetUnicode(uint32_t unicode);
 
         /**
-         * @brief 获取当前按键的unicode值
-         * @return 返回unicode值
+         * @brief Obtains the Unicode value of the current key.
+         * @return Returns the Unicode value.
          * @since 9
          */
         uint32_t GetUnicode() const;
@@ -3100,26 +3101,26 @@ public:
     bool IsValid() const;
 
     /**
-     * @brief 把指定的按键转换为功能按键。
-     * @param keyCode 待转换的键值。
-     * @return 返回转换后的功能按键。
+     * @brief Converts a specific key to a function key.
+     * @param keyCode Indicates the keycode of the key to convert.
+     * @return Returns the converted function key.
      * @since 9
      */
     int32_t TransitionFunctionKey(int32_t keyCode);
 
     /**
-     * @brief 给指定的功能按键设置使能状态。
-     * @param funcKey 指定的功能按键。
-     * @param value 待设置的功能按键状态。
-     * @return 返回是否设置成功。
+     * @brief Sets the enable status of the specified function key.
+     * @param funcKey Indicates the function key.
+     * @param value Indicates the enable status of the function key.
+     * @return Returns the result indicating whether the setting is successful.
      * @since 9
      */
     int32_t SetFunctionKey(int32_t funcKey, int32_t value);
 
     /**
-     * @brief 获取指定功能按键的使能状态。
-     * @param funcKey 指定的功能按键。
-     * @return 返回指定功能按键的使能状态。
+     * @brief Obtains the enable status of the specified function key.
+     * @param funcKey Indicates the function key.
+     * @return Returns the enable status of the function key.
      * @since 9
      */
     bool GetFunctionKey(int32_t funcKey) const;
diff --git a/interfaces/native/innerkits/event/include/pointer_event.h b/interfaces/native/innerkits/event/include/pointer_event.h
index fbb3fff144..5a46114d6d 100644
--- a/interfaces/native/innerkits/event/include/pointer_event.h
+++ b/interfaces/native/innerkits/event/include/pointer_event.h
@@ -148,63 +148,63 @@ public:
         AXIS_TYPE_PINCH,
 
         /**
-         * 表示x轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，x轴状态改变。
+         * Indicates the x axis. The status of the x axis changes when you operate the joystick.
          *
          * @since 9
          */
         AXIS_TYPE_ABS_X,
 
         /**
-         * 表示y轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，y轴状态改变。
+         * Indicates the y axis. The status of the y axis changes when you operate the joystick.
          *
          * @since 9
          */
         AXIS_TYPE_ABS_Y,
 
         /**
-         * 表示z轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，z轴状态改变。
+         * Indicates the z axis. The status of the z axis changes when you operate the joystick.
          *
          * @since 9
          */
         AXIS_TYPE_ABS_Z,
 
         /**
-         * 表示rz轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，rz轴状态改变。
+         * Indicates the rz axis. The status of the rz axis changes when you operate the joystick.
          *
          * @since 9
          */
         AXIS_TYPE_ABS_RZ,
 
         /**
-         * 表示gas轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，gas轴状态改变。
+         * Indicates the gas axis. The status of the gas axis changes when you operate the joystick.
          *
          * @since 9
          */
         AXIS_TYPE_ABS_GAS,
 
         /**
-         * 表示brake轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，brake轴状态改变。
+         * Indicates the brake axis. The status of the brake axis changes when you operate the joystick.
          *
          * @since 9
          */
         AXIS_TYPE_ABS_BRAKE,
 
         /**
-         * 表示hat0x轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，hat0x轴状态改变。
+         * Indicates the hat0x axis. The status of the hat0x axis changes when you operate the joystick.
          *
          * @since 9
          */
         AXIS_TYPE_ABS_HAT0X,
 
         /**
-         * 表示hat0y轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，hat0y轴状态改变。
+         * Indicates the hat0y axis. The status of the hat0y axis changes when you operate the joystick.
          *
          * @since 9
          */
         AXIS_TYPE_ABS_HAT0Y,
 
         /**
-         * 表示throttle轴，当你操作手柄上的操纵杆或摇杆上的操纵杆时，throttle轴状态改变。
+         * Indicates the throttle axis. The status of the throttle axis changes when you operate the joystick.
          *
          * @since 9
          */
@@ -248,7 +248,7 @@ public:
     static constexpr int32_t SOURCE_TYPE_TOUCHPAD = 3;
 
     /**
-     * 表明输入源产生类似于操纵杆的事件，包含按钮按下、按钮抬起、滚轮滚动。
+     * Indicates joystick-like events generated by the input source, such as button pressing, button lifting, and wheel scrolling.
      *
      * @since 9
      */
@@ -374,203 +374,203 @@ public:
     static constexpr int32_t TOOL_TYPE_LENS = 7;
 
     /**
-     * 表示手柄的TL2按键。
+     * Indicates the TL2 key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_TL2 = 0;
 
     /**
-     * 表示手柄的TR2按键。
+     * Indicates the TR2 key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_TR2 = 1;
 
     /**
-     * 表示手柄的TL按键。
+     * Indicates the TL key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_TL = 2;
 
     /**
-     * 表示手柄的TR按键。
+     * Indicates the TR key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_TR = 3;
 
     /**
-     * 表示手柄的WEST按键。
+     * Indicates the WEST key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_WEST = 4;
 
     /**
-     * 表示手柄的SOUTH按键。
+     * Indicates the SOUTH key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_SOUTH = 5;
 
     /**
-     * 表示手柄的NORTH按键。
+     * Indicates the NORTH key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_NORTH = 6;
 
     /**
-     * 表示手柄的EAST按键。
+     * Indicates the EAST key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_EAST = 7;
 
     /**
-     * 表示手柄的START按键。
+     * Indicates the START key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_START = 8;
 
     /**
-     * 表示手柄的SELECT按键。
+     * Indicates the SELECT key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_SELECT = 9;
 
     /**
-     * 表示手柄的HOMEPAGE按键。
+     * Indicates the HOMEPAGE key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_HOMEPAGE = 10;
 
     /**
-     * 表示手柄的THUMBL按键。
+     * Indicates the THUMBL key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_THUMBL = 11;
 
     /**
-     * 表示手柄的THUMBR按键。
+     * Indicates the THUMBR key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_THUMBR = 12;
 
     /**
-     * 表示操纵杆的TRIGGER按键。
+     * Indicates the TRIGGER key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_TRIGGER = 13;
 
     /**
-     * 表示操纵杆的THUMB按键。
+     * Indicates the THUMB key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_THUMB = 14;
 
     /**
-     * 表示操纵杆的THUMB2按键。
+     * Indicates the THUMB2 key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_THUMB2 = 15;
 
     /**
-     * 表示操纵杆的TOP按键。
+     * Indicates the TOP key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_TOP = 16;
 
     /**
-     * 表示操纵杆的TOP2按键。
+     * Indicates the TOP2 key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_TOP2 = 17;
 
     /**
-     * 表示操纵杆的PINKIE按键。
+     * Indicates the PINKIE key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_PINKIE = 18;
 
     /**
-     * 表示操纵杆的BASE按键。
+     * Indicates the BASE key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_BASE = 19;
 
     /**
-     * 表示操纵杆的BASE2按键。
+     * Indicates the BASE2 key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_BASE2 = 20;
 
     /**
-     * 表示操纵杆的BASE3按键。
+     * Indicates the BASE3 key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_BASE3 = 21;
 
     /**
-     * 表示操纵杆的BASE4按键。
+     * Indicates the BASE4 key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_BASE4 = 22;
 
     /**
-     * 表示操纵杆的BASE5按键。
+     * Indicates the BASE5 key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_BASE5 = 23;
 
     /**
-     * 表示操纵杆的BASE6按键。
+     * Indicates the BASE6 key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_BASE6 = 24;
 
     /**
-     * 表示操纵杆的DEAD按键。
+     * Indicates the DEAD key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_DEAD = 25;
 
     /**
-     * 表示操纵杆的C按键。
+     * Indicates the C key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_C = 26;
 
     /**
-     * 表示操纵杆的Z按键。
+     * Indicates the Z key on the joystick.
      *
      * @since 9
      */
     static constexpr int32_t JOYSTICK_BUTTON_Z = 27;
 
     /**
-     *表示操纵杆的MODE按键。
+     * Indicates the MODE key on the joystick.
      *
      * @since 9
      */
@@ -962,29 +962,29 @@ public:
         bool ReadFromParcel(Parcel &in);
 		
         /**
-         * @brief 获取原始X坐标数值.
-         * @return  返回原始X坐标值.
+         * @brief Obtains the raw X coordinate.
+         * @return Returns the raw X coordinate.
          * @since 9
          */
         int32_t GetRawDx() const;
 		
         /**
-         * @brief 设置原始X坐标值.
-         * @param rawDx 待设置的原始X坐标值.
+         * @brief Sets the raw X coordinate.
+         * @param rawDx Indicates the raw X coordinate to set.
          * @return void
          * @since 9
          */
         void SetRawDx(int32_t rawDx);
         /**
-         * @brief 获取原始Y坐标数值.
-         * @return  返回原始Y坐标值.
+         * @brief Obtains the raw Y coordinate.
+         * @return Returns the raw Y coordinate.
          * @since 9
          */
         int32_t GetRawDy() const;
 		
         /**
-         * @brief 设置原始Y坐标值.
-         * @param rawDy 待设置的原始Y坐标值.
+         * @brief Sets the raw Y coordinate.
+         * @param rawDy Indicates the raw Y coordinate to set.
          * @return void
          * @since 9
          */
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index 8c14cef488..5787089d36 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -16,23 +16,23 @@
 #ifndef INPUT_MANAGER_H
 #define INPUT_MANAGER_H
 
+#include <list>
 #include <map>
 #include <memory>
-#include <list>
 
 #include "event_handler.h"
 #include "nocopyable.h"
 
 #include "cooperation_message.h"
-#include "i_anr_observer.h"
-#include "window_info.h"
 #include "error_multimodal.h"
-#include "i_input_device_listener.h"
+#include "i_anr_observer.h"
 #include "i_input_device_cooperate_listener.h"
+#include "i_input_device_listener.h"
 #include "i_input_event_consumer.h"
 #include "i_input_event_filter.h"
 #include "input_device.h"
 #include "key_option.h"
+#include "window_info.h"
 
 namespace OHOS {
 namespace MMI {
@@ -237,7 +237,7 @@ public:
      * @brief Checks whether the specified key codes of an input device are supported.
      * @param deviceId Indicates the ID of the input device.
      * @param keyCodes Indicates the key codes of the input device.
-     * @param callback Callback function, receive reported data.
+     * @param callback Indicates the callback used to receive the reported data.
      * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
      * @since 9
      */
@@ -246,7 +246,7 @@ public:
 
     /**
      * @brief Sets whether the pointer icon is visible.
-     * @param visible Whether the pointer icon is visible. The value <b>true</b> indicates that
+     * @param visible Indicates whether the pointer icon is visible. The value <b>true</b> indicates that
      * the pointer icon is visible, and the value <b>false</b> indicates the opposite.
      * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
      * @since 9
@@ -261,19 +261,19 @@ public:
     bool IsPointerVisible();
 
     /**
-     * @brief 设置鼠标指针样式
-     * @param windowId 指定要更改鼠标指针样式的窗口ID
-     * @param pointerStyle 指定要更改的鼠标指针样式ID
-     * @return 成功返回0，否则返回失败
+     * @brief Sets the mouse pointer style.
+     * @param windowId Indicates the ID of the window for which the mouse pointer style is set.
+     * @param pointerStyle Indicates the ID of the mouse pointer style.
+     * @return Returns <b>0</b> if the operation is successful; returns an error code otherwise.
      * @since 9
      */
     int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle);
 
     /**
-     * @brief 获取鼠标指针样式
-     * @param windowId 指定要获取鼠标指针样式的窗口ID
-     * @param pointerStyle 返回获取的鼠标指针样式ID
-     * @return 成功返回0，否则返回失败
+     * @brief Obtains the mouse pointer style.
+     * @param windowId Indicates the ID of the window for which the mouse pointer style is obtained.
+     * @param pointerStyle Indicates the ID of the mouse pointer style.
+     * @return Returns <b>0</b> if the operation is successful; returns an error code otherwise.
      * @since 9
      */
     int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle);
@@ -312,92 +312,92 @@ public:
     void SetAnrObserver(std::shared_ptr<IAnrObserver> observer);
 
     /**
-     * @brief 设置指定输入设备对应的屏幕ID
-     * @param dhid 输入设备唯一ID
-     * @param screenId 输入设备对应的屏幕ID
-     * @return 0表示返回成功，否则表示返回失败
+     * @brief Sets the screen ID corresponding to the specified input device.
+     * @param dhid Indicates the ID of the input device.
+     * @param screenId Indicates the screen ID corresponding to the input device.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
      */
-    int32_t SetInputDevice(const std::string& dhid, const std::string& screenId);
+    int32_t SetInputDevice(const std::string &dhid, const std::string &screenId);
 
     /**
-     * @brief 注册键鼠穿越管理事件监听。
-     * @param listener 穿越管理事件监听回调。
-     * @return 返回值如果是0表示接口调用成功，返回其他值表示接口调用失败。
+     * @brief Registers a listener for screen hopping events of the mouse pointer.
+     * @param listener Indicates the listener for screen hopping events of the mouse pointer.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
      * @since 9
      */
     int32_t RegisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener);
 
     /**
-     * @brief 注销键鼠穿越管理事件监听。
-     * @param listener 事件监听回调.
-     * @return 返回值如果是0表示接口调用成功，返回其他值表示接口调用失败。
+     * @brief Unregisters the listener for screen hopping events of the mouse pointer.
+     * @param listener Indicates the listener for screen hopping events of the mouse pointer.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
      * @since 9
      */
     int32_t UnregisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener = nullptr);
 
     /**
-     * @brief 开启/关闭键鼠穿越管理接口。
-     * @param enabled 开启/关闭。
-     * @param callback 开启/关闭键鼠穿越，此回调被调用
-     * @return 返回值如果是0表示接口调用成功，返回其他值表示接口调用失败。
+     * @brief Enables or disables screen hopping for the mouse pointer.
+     * @param enabled Indicates whether to enable or disable screen hopping for the mouse pointer.
+     * @param callback Indicates the callback used to receive the result of enabling or disabling screen hopping.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
      * @since 9
      */
     int32_t EnableInputDeviceCooperate(bool enabled, std::function<void(std::string, CooperationMessage)> callback);
 
     /**
-     * @brief 启动跨设备键鼠穿越。
-     * @param sinkDeviceId 键鼠穿越目标设备描述符（networkID）
-     * @param srcInputDeviceId 键鼠穿越待穿越输入外设标识符（设备ID句柄）
-     * @param callback 启动跨设备键鼠穿越，此回调被调用
-     * @return 返回值如果是0表示接口调用成功，返回其他值表示接口调用失败。
+     * @brief Starts screen hopping for the mouse pointer.
+     * @param sinkDeviceId Indicates the descriptor of the target input device (network ID) for screen hopping.
+     * @param srcInputDeviceId Indicates the ID of the source input device (device ID handle) for screen hopping.
+     * @param callback Indicates the callback used to receive the result of starting screen hopping.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
      * @since 9
      */
     int32_t StartInputDeviceCooperate(const std::string &sinkDeviceId, int32_t srcInputDeviceId,
         std::function<void(std::string, CooperationMessage)> callback);
 
     /**
-     * @brief 停止跨设备键鼠穿越。
-     * @param callback 停止跨设备键鼠穿越，此回调被调用
-     * @return 返回值如果是0表示接口调用成功，返回其他值表示接口调用失败。
+     * @brief Stops screen hopping for the mouse pointer.
+     * @param callback Indicates the callback used to receive the result of stopping screen hopping.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
      * @since 9
      */
     int32_t StopDeviceCooperate(std::function<void(std::string, CooperationMessage)> callback);
 
     /**
-     * @brief 获取指定设备键鼠穿越状态。
-     * @param deviceId 指定设备描述符。
-     * @param callback 获取穿越管理设备状态，此回调被调用
-     * @return 返回值如果是0表示接口调用成功，返回其他值表示接口调用失败。
+     * @brief Obtains the screen hopping status of a mouse pointer.
+     * @param deviceId Indicates the descriptor of the input device.
+     * @param callback Indicates the callback used to receive the screen hopping status.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
      * @since 9
      */
     int32_t GetInputDeviceCooperateState(const std::string &deviceId, std::function<void(bool)> callback);
 
     /**
-     * @brief 获取键盘设备指定功能按键的使能状态。
-     * @param funcKey 指定的功能按键，当前支持的功能按键有：
+     * @brief Obtains the enablement status of the specified function key on the keyboard.
+     * @param funcKey Indicates the function key. Currently, the following function keys are supported:
      * NUM_LOCK_FUNCTION_KEY
      * CAPS_LOCK_FUNCTION_KEY
-     * SCROLL_LOCK_FUNCTION_KEY。
-     * @return 返回功能按键的使能状态，true表示功能按键使能，
-     * false表示功能按键未使能。
+     * SCROLL_LOCK_FUNCTION_KEY
+     * @return Returns <b>true</b> if the function key is enabled;
+     * returns <b>false</b> otherwise.
      */
     bool GetFunctionKeyState(int32_t funcKey);
 
     /**
-     * @brief 设置键盘设备指定功能按键的使能状态。
-     * @param funcKey 指定的功能按键，当前支持的功能按键有：
+     * @brief Sets the enablement status of the specified function key on the keyboard.
+     * @param funcKey Indicates the function key. Currently, the following function keys are supported:
      * NUM_LOCK_FUNCTION_KEY
      * CAPS_LOCK_FUNCTION_KEY
-     * SCROLL_LOCK_FUNCTION_KEY。
-     * @param isEnable 待设置的使能状态。
-     * @return 0 表示设置成功，其他值表示设置失败。
+     * SCROLL_LOCK_FUNCTION_KEY
+     * @param isEnable Indicates the enablement status to set.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
      */
     int32_t SetFunctionKeyState(int32_t funcKey, bool enable);
 
     /**
-     * @brief 设置鼠标绝对坐标
-     * @param x 指定设置鼠标的x坐标
-     * @param y 指定设置鼠标的y坐标
+     * @brief Sets the absolute coordinate of mouse.
+     * @param x Specifies the x coordinate of the mouse to be set.
+     * @param y Specifies the y coordinate of the mouse to be set.
      * @return void
      */
     void SetPointerLocation(int32_t x, int32_t y);
diff --git a/interfaces/native/innerkits/proxy/include/window_info.h b/interfaces/native/innerkits/proxy/include/window_info.h
index 61da0095a9..6a2cbb4299 100644
--- a/interfaces/native/innerkits/proxy/include/window_info.h
+++ b/interfaces/native/innerkits/proxy/include/window_info.h
@@ -16,8 +16,8 @@
 #ifndef DISPLAY_INFO_H
 #define DISPLAY_INFO_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace OHOS {
 namespace MMI {
@@ -200,7 +200,7 @@ struct DisplayInfo {
     int32_t height;
 
     /**
-     * 像素密度，表示一英寸包含的像素点数。
+     * Pixel density, which indicates the number of pixels in an inch
      *
      * @since 10
      */
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 00323943c5..5451a84e3e 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -15,16 +15,16 @@
 
 #include "multimodal_input_connect_stub.h"
 
-#include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <unistd.h>
 
 #include "string_ex.h"
 
 #include "error_multimodal.h"
 #include "multimodal_input_connect_def_parcel.h"
-#include "time_cost_chk.h"
 #include "permission_helper.h"
+#include "time_cost_chk.h"
 
 namespace OHOS {
 namespace MMI {
diff --git a/service/delegate_task/include/delegate_tasks.h b/service/delegate_task/include/delegate_tasks.h
index c5d2a98547..a4a898b54e 100644
--- a/service/delegate_task/include/delegate_tasks.h
+++ b/service/delegate_task/include/delegate_tasks.h
@@ -12,8 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef DELEGATE_TASKS_H
 #define DELEGATE_TASKS_H
+
 #include <cinttypes>
 #include <functional>
 #include <future>
diff --git a/service/delegate_task/src/delegate_tasks.cpp b/service/delegate_task/src/delegate_tasks.cpp
index fd3688b3fb..61c8d41373 100644
--- a/service/delegate_task/src/delegate_tasks.cpp
+++ b/service/delegate_task/src/delegate_tasks.cpp
@@ -12,10 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include "delegate_tasks.h"
 
-#include <sys/syscall.h>
 #include <fcntl.h>
+#include <sys/syscall.h>
 #include <unistd.h>
 
 #include "error_multimodal.h"
@@ -159,7 +160,7 @@ DelegateTasks::TaskPtr DelegateTasks::PostTask(DTaskCallback callback, Promise *
         return nullptr;
     }
     int32_t id = GenerateId();
-    TaskData data = {GetThisThreadId(), id};
+    TaskData data = { GetThisThreadId(), id };
     auto res = write(fds_[1], &data, sizeof(data));
     if (res == -1) {
         RecoveryId(id);
diff --git a/service/device_manager/include/input_device_manager.h b/service/device_manager/include/input_device_manager.h
index 7691d9a603..eac3fb24cb 100644
--- a/service/device_manager/include/input_device_manager.h
+++ b/service/device_manager/include/input_device_manager.h
@@ -21,9 +21,9 @@
 
 #include "device_observer.h"
 #include "event_dispatch_handler.h"
-#include "key_event_normalize.h"
 #include "input_device.h"
 #include "key_auto_repeat.h"
+#include "key_event_normalize.h"
 #include "key_map_manager.h"
 #include "msg_handler.h"
 #include "nocopyable.h"
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 6fd3832bf7..08223e11ff 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -50,14 +50,14 @@ const std::string DH_ID_PREFIX = "Input_";
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 const std::string INPUT_VIRTUAL_DEVICE_NAME = "DistributedInput ";
 std::unordered_map<int32_t, std::string> axisType {
-    {ABS_MT_TOUCH_MAJOR, "TOUCH_MAJOR"},
-    {ABS_MT_TOUCH_MINOR, "TOUCH_MINOR"},
-    {ABS_MT_ORIENTATION, "ORIENTATION"},
-    {ABS_MT_POSITION_X, "POSITION_X"},
-    {ABS_MT_POSITION_Y, "POSITION_Y"},
-    {ABS_MT_PRESSURE, "PRESSURE"},
-    {ABS_MT_WIDTH_MAJOR, "WIDTH_MAJOR"},
-    {ABS_MT_WIDTH_MINOR, "WIDTH_MINOR"}
+    { ABS_MT_TOUCH_MAJOR, "TOUCH_MAJOR" },
+    { ABS_MT_TOUCH_MINOR, "TOUCH_MINOR" },
+    { ABS_MT_ORIENTATION, "ORIENTATION" },
+    { ABS_MT_POSITION_X, "POSITION_X" },
+    { ABS_MT_POSITION_Y, "POSITION_Y" },
+    { ABS_MT_PRESSURE, "PRESSURE" },
+    { ABS_MT_WIDTH_MAJOR, "WIDTH_MAJOR" },
+    { ABS_MT_WIDTH_MINOR, "WIDTH_MINOR" }
 };
 
 std::vector<std::pair<enum libinput_device_capability, InputDeviceCapability>> devCapEnumMaps {
@@ -684,7 +684,7 @@ std::string InputDeviceManager::MakeNetworkId(const char *phys) const
 
 std::string InputDeviceManager::Sha256(const std::string &in) const
 {
-    unsigned char out[SHA256_DIGEST_LENGTH * 2 + 1] = {0};
+    unsigned char out[SHA256_DIGEST_LENGTH * 2 + 1] = { 0 };
     SHA256_CTX ctx;
     SHA256_Init(&ctx);
     SHA256_Update(&ctx, in.data(), in.size());
diff --git a/service/dfx/include/dfx_hisysevent.h b/service/dfx/include/dfx_hisysevent.h
index 2b762ccae4..019c1bea27 100644
--- a/service/dfx/include/dfx_hisysevent.h
+++ b/service/dfx/include/dfx_hisysevent.h
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef DFX_HISYSEVENT_H
 #define DFX_HISYSEVENT_H
 
diff --git a/service/dfx/src/dfx_hisysevent.cpp b/service/dfx/src/dfx_hisysevent.cpp
index 62ebb0d566..5c119a8114 100644
--- a/service/dfx/src/dfx_hisysevent.cpp
+++ b/service/dfx/src/dfx_hisysevent.cpp
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include "dfx_hisysevent.h"
 
 namespace OHOS {
diff --git a/service/event_dispatch/include/event_dispatch_handler.h b/service/event_dispatch/include/event_dispatch_handler.h
index bf8007522a..c79ad2ab2d 100644
--- a/service/event_dispatch/include/event_dispatch_handler.h
+++ b/service/event_dispatch/include/event_dispatch_handler.h
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef EVENT_DISPATCH_HANDLER_H
 #define EVENT_DISPATCH_HANDLER_H
 
diff --git a/service/event_dispatch/test/event_dispatch_test.cpp b/service/event_dispatch/test/event_dispatch_test.cpp
index 5eb94e26bd..05a52f53b0 100644
--- a/service/event_dispatch/test/event_dispatch_test.cpp
+++ b/service/event_dispatch/test/event_dispatch_test.cpp
@@ -15,8 +15,8 @@
 
 #include <gtest/gtest.h>
 
-#include "event_dispatch_handler.h"
 #include "define_multimodal.h"
+#include "event_dispatch_handler.h"
 
 namespace OHOS {
 namespace MMI {
diff --git a/service/event_dump/src/event_dump.cpp b/service/event_dump/src/event_dump.cpp
index 92f50e60a0..e01e59abda 100644
--- a/service/event_dump/src/event_dump.cpp
+++ b/service/event_dump/src/event_dump.cpp
@@ -78,20 +78,20 @@ void EventDump::ParseCommand(int32_t fd, const std::vector<std::string> &args)
     }
     int32_t optionIndex = 0;
     struct option dumpOptions[] = {
-        {"help", no_argument, 0, 'h'},
-        {"device", no_argument, 0, 'd'},
-        {"devicelist", no_argument, 0, 'l'},
-        {"windows", no_argument, 0, 'w'},
-        {"udsserver", no_argument, 0, 'u'},
-        {"subscriber", no_argument, 0, 's'},
-        {"monitor", no_argument, 0, 'o'},
-        {"interceptor", no_argument, 0, 'i'},
-        {"filter", no_argument, 0, 'f'},
-        {"mouse", no_argument, 0, 'm'},
+        { "help", no_argument, 0, 'h' },
+        { "device", no_argument, 0, 'd' },
+        { "devicelist", no_argument, 0, 'l' },
+        { "windows", no_argument, 0, 'w' },
+        { "udsserver", no_argument, 0, 'u' },
+        { "subscriber", no_argument, 0, 's' },
+        { "monitor", no_argument, 0, 'o' },
+        { "interceptor", no_argument, 0, 'i' },
+        { "filter", no_argument, 0, 'f' },
+        { "mouse", no_argument, 0, 'm' },
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-        {"inputdevcoosm", no_argument, 0, 'k'},
+        { "inputdevcoosm", no_argument, 0, 'k' },
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-        {NULL, 0, 0, 0}
+        { NULL, 0, 0, 0 }
     };
     if (args.empty()) {
         MMI_HILOGE("size of args can't be zero");
diff --git a/service/event_handler/include/input_event_handler.h b/service/event_handler/include/input_event_handler.h
index 10f0585bf5..f8cf962038 100644
--- a/service/event_handler/include/input_event_handler.h
+++ b/service/event_handler/include/input_event_handler.h
@@ -27,8 +27,8 @@
 #include "event_normalize_handler.h"
 #include "i_event_filter.h"
 #include "i_input_event_handler.h"
-#include "key_subscriber_handler.h"
 #include "key_command_handler.h"
+#include "key_subscriber_handler.h"
 #include "mouse_event_normalize.h"
 
 namespace OHOS {
diff --git a/service/event_handler/include/key_auto_repeat.h b/service/event_handler/include/key_auto_repeat.h
index 71f0cc3673..ac18da1a95 100644
--- a/service/event_handler/include/key_auto_repeat.h
+++ b/service/event_handler/include/key_auto_repeat.h
@@ -20,8 +20,8 @@
 #include <string>
 
 #include "event_dispatch_handler.h"
-#include "key_map_manager.h"
 #include "key_event.h"
+#include "key_map_manager.h"
 #include "libinput.h"
 #include "singleton.h"
 #include "util.h"
diff --git a/service/event_handler/src/event_normalize_handler.cpp b/service/event_handler/src/event_normalize_handler.cpp
index 674093b40c..24107b2c29 100644
--- a/service/event_handler/src/event_normalize_handler.cpp
+++ b/service/event_handler/src/event_normalize_handler.cpp
@@ -15,9 +15,9 @@
 
 #include "event_normalize_handler.h"
 
-#include "dfx_hisysevent.h"
 #include "bytrace_adapter.h"
 #include "define_multimodal.h"
+#include "dfx_hisysevent.h"
 #include "error_multimodal.h"
 #include "event_log_helper.h"
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
diff --git a/service/event_handler/src/input_event_handler.cpp b/service/event_handler/src/input_event_handler.cpp
index d91a07d9fe..3ccec66910 100644
--- a/service/event_handler/src/input_event_handler.cpp
+++ b/service/event_handler/src/input_event_handler.cpp
@@ -15,11 +15,11 @@
 
 #include "input_event_handler.h"
 
+#include <cinttypes>
 #include <cstdio>
 #include <cstring>
 #include <functional>
 #include <vector>
-#include <cinttypes>
 
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/service/filter/include/event_filter_proxy.h b/service/filter/include/event_filter_proxy.h
index c76504f10a..0f4308ae56 100644
--- a/service/filter/include/event_filter_proxy.h
+++ b/service/filter/include/event_filter_proxy.h
@@ -16,8 +16,8 @@
 #ifndef EVENT_FILTER_PROXY_H
 #define EVENT_FILTER_PROXY_H
 
-#include "iremote_proxy.h"
 #include "iremote_object.h"
+#include "iremote_proxy.h"
 #include "nocopyable.h"
 
 #include "i_event_filter.h"
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
old mode 100755
new mode 100644
index f714c84ba7..7c095a7613
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include "input_device_cooperate_sm.h"
 
 #include <cstdio>
@@ -22,8 +23,8 @@
 #include "bytrace_adapter.h"
 #include "cooperate_event_manager.h"
 #include "cooperation_message.h"
-#include "device_cooperate_softbus_adapter.h"
 #include "define_multimodal.h"
+#include "device_cooperate_softbus_adapter.h"
 #include "device_profile_adapter.h"
 #include "i_pointer_drawing_manager.h"
 #include "input_device_cooperate_state_free.h"
@@ -38,7 +39,7 @@
 namespace OHOS {
 namespace MMI {
 namespace {
-constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateSM"};
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceCooperateSM" };
 constexpr int32_t INTERVAL_MS = 2000;
 constexpr int32_t MOUSE_ABS_LOCATION = 100;
 constexpr int32_t MOUSE_ABS_LOCATION_X = 50;
diff --git a/service/key_command/src/key_command_handler.cpp b/service/key_command/src/key_command_handler.cpp
index 1b7d9169b0..7b69752084 100644
--- a/service/key_command/src/key_command_handler.cpp
+++ b/service/key_command/src/key_command_handler.cpp
@@ -15,12 +15,12 @@
 
 #include "key_command_handler.h"
 
-#include "dfx_hisysevent.h"
 #include "ability_manager_client.h"
 #include "bytrace_adapter.h"
 #include "cJSON.h"
 #include "config_policy_utils.h"
 #include "define_multimodal.h"
+#include "dfx_hisysevent.h"
 #include "error_multimodal.h"
 #include "file_ex.h"
 #include "input_event_data_transformation.h"
diff --git a/service/libinput_adapter/src/libinput_adapter.cpp b/service/libinput_adapter/src/libinput_adapter.cpp
index d4f0db06f6..49a0d3b487 100644
--- a/service/libinput_adapter/src/libinput_adapter.cpp
+++ b/service/libinput_adapter/src/libinput_adapter.cpp
@@ -14,8 +14,9 @@
  */
 
 #include "libinput_adapter.h"
-#include <climits>
+
 #include <cinttypes>
+#include <climits>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/epoll.h>
@@ -25,7 +26,6 @@
 #include "input_windows_manager.h"
 #include "util.h"
 
-
 namespace OHOS {
 namespace MMI {
 namespace {
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index 487ce89297..0f6dd57f4c 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -23,12 +23,12 @@
 #include "event_monitor_handler.h"
 #include "hos_key_event.h"
 #include "input_device_manager.h"
+#include "input_event.h"
 #include "input_event_data_transformation.h"
 #include "input_event_handler.h"
-#include "input_event.h"
 #include "input_windows_manager.h"
-#include "key_event_normalize.h"
 #include "i_pointer_drawing_manager.h"
+#include "key_event_normalize.h"
 #include "key_subscriber_handler.h"
 #include "libinput_adapter.h"
 #include "mmi_func_callback.h"
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index 14a4bd7507..b094030f1e 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -26,8 +26,8 @@
 
 #include "delegate_tasks.h"
 #include "input_event_handler.h"
-#include "multimodal_input_connect_stub.h"
 #include "libinput_adapter.h"
+#include "multimodal_input_connect_stub.h"
 #include "server_msg_handler.h"
 #include "uds_server.h"
 
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index debf26a3c1..52e92bdb32 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -19,7 +19,6 @@
 #include <csignal>
 #include <parameters.h>
 #include <sys/signalfd.h>
-#include "dfx_hisysevent.h"
 #ifdef OHOS_RSS_CLIENT
 #include <unordered_map>
 #endif
@@ -28,6 +27,7 @@
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
 #include "cooperate_event_manager.h"
 #endif // OHOS_BUILD_ENABLE_COOPERATE
+#include "dfx_hisysevent.h"
 #include "event_dump.h"
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
 #include "input_device_cooperate_sm.h"
@@ -36,20 +36,20 @@
 #include "input_windows_manager.h"
 #include "i_pointer_drawing_manager.h"
 #include "key_map_manager.h"
-#include "mmi_log.h"
-#include "string_ex.h"
-#include "util_ex.h"
-#include "util_napi_error.h"
 #include "multimodal_input_connect_def_parcel.h"
+#include "permission_helper.h"
+#include "string_ex.h"
 #ifdef OHOS_RSS_CLIENT
 #include "res_sched_client.h"
 #include "res_type.h"
 #include "system_ability_definition.h"
 #endif
-#include "permission_helper.h"
+
+#include "mmi_log.h"
 #include "timer_manager.h"
-#include "input_device_manager.h"
 #include "util.h"
+#include "util_ex.h"
+#include "util_napi_error.h"
 #include "xcollie/watchdog.h"
 
 namespace OHOS {
@@ -1024,7 +1024,7 @@ void MMIService::OnThread()
 bool MMIService::InitSignalHandler()
 {
     CALL_DEBUG_ENTER;
-    sigset_t mask = {0};
+    sigset_t mask = { 0 };
     int32_t retCode = sigfillset(&mask);
     if (retCode < 0) {
         MMI_HILOGE("Fill signal set failed:%{public}d", errno);
diff --git a/service/monitor/include/event_monitor_handler.h b/service/monitor/include/event_monitor_handler.h
index 007e03e7a5..8c0e9a571c 100644
--- a/service/monitor/include/event_monitor_handler.h
+++ b/service/monitor/include/event_monitor_handler.h
@@ -23,8 +23,8 @@
 
 #include "nocopyable.h"
 
-#include "i_input_event_handler.h"
 #include "i_input_event_collection_handler.h"
+#include "i_input_event_handler.h"
 #include "input_handler_type.h"
 #include "uds_session.h"
 
diff --git a/service/mouse_event_normalize/include/mouse_device_state.h b/service/mouse_event_normalize/include/mouse_device_state.h
index 7102901506..337401bda4 100644
--- a/service/mouse_event_normalize/include/mouse_device_state.h
+++ b/service/mouse_event_normalize/include/mouse_device_state.h
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef MOUSE_DEVICE_STATE_H
 #define MOUSE_DEVICE_STATE_H
 
@@ -45,14 +46,14 @@ public:
         int32_t physicalY { 0 };
     };
     const std::map<uint32_t, int32_t> mapLibinputChangeToPointer = {
-        {LIBINPUT_LEFT_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_LEFT},
-        {LIBINPUT_RIGHT_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_RIGHT},
-        {LIBINPUT_MIDDLE_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_MIDDLE},
-        {LIBINPUT_SIDE_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_SIDE},
-        {LIBINPUT_EXTRA_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_EXTRA},
-        {LIBINPUT_FORWARD_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_FORWARD},
-        {LIBINPUT_BACK_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_BACK},
-        {LIBINPUT_TASK_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_TASK},
+        { LIBINPUT_LEFT_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_LEFT },
+        { LIBINPUT_RIGHT_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_RIGHT },
+        { LIBINPUT_MIDDLE_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_MIDDLE },
+        { LIBINPUT_SIDE_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_SIDE },
+        { LIBINPUT_EXTRA_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_EXTRA },
+        { LIBINPUT_FORWARD_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_FORWARD },
+        { LIBINPUT_BACK_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_BACK },
+        { LIBINPUT_TASK_BUTTON_CODE, PointerEvent::MOUSE_BUTTON_TASK },
     };
 public:
     DISALLOW_COPY_AND_MOVE(MouseDeviceState);
diff --git a/service/mouse_event_normalize/src/mouse_device_state.cpp b/service/mouse_event_normalize/src/mouse_device_state.cpp
index 75f1bd6a41..57c81eb58b 100644
--- a/service/mouse_event_normalize/src/mouse_device_state.cpp
+++ b/service/mouse_event_normalize/src/mouse_device_state.cpp
@@ -25,7 +25,7 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Mouse
 
 MouseDeviceState::MouseDeviceState()
 {
-    mouseCoord_ = {0, 0};
+    mouseCoord_ = { 0, 0 };
 }
 
 MouseDeviceState::~MouseDeviceState() {}
diff --git a/service/permission_helper/src/permission_helper.cpp b/service/permission_helper/src/permission_helper.cpp
index 6e50aefb88..d0c5a4a3dd 100644
--- a/service/permission_helper/src/permission_helper.cpp
+++ b/service/permission_helper/src/permission_helper.cpp
@@ -13,9 +13,10 @@
  * limitations under the License.
  */
 
+#include "ipc_skeleton.h"
 #include "permission_helper.h"
 #include "proto.h"
-#include "ipc_skeleton.h"
+
 #include "mmi_log.h"
 
 namespace OHOS {
diff --git a/service/subscriber/include/key_subscriber_handler.h b/service/subscriber/include/key_subscriber_handler.h
index f583f56551..68dd4b83c5 100644
--- a/service/subscriber/include/key_subscriber_handler.h
+++ b/service/subscriber/include/key_subscriber_handler.h
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef KEY_SUBSCRIBER_HANDLER_H
 #define KEY_SUBSCRIBER_HANDLER_H
 
diff --git a/service/touch_event_normalize/include/gesture_transform_processor.h b/service/touch_event_normalize/include/gesture_transform_processor.h
index 465bf8dea1..f81b35b332 100644
--- a/service/touch_event_normalize/include/gesture_transform_processor.h
+++ b/service/touch_event_normalize/include/gesture_transform_processor.h
@@ -15,6 +15,7 @@
 
 #ifndef GESTURE_TRANSFORM_PROCESSOR_H
 #define GESTURE_TRANSFORM_PROCESSOR_H
+
 #include "nocopyable.h"
 #include "transform_processor.h"
 
diff --git a/service/touch_event_normalize/include/joystick_transform_processor.h b/service/touch_event_normalize/include/joystick_transform_processor.h
index 72592303f9..4d86cacb79 100644
--- a/service/touch_event_normalize/include/joystick_transform_processor.h
+++ b/service/touch_event_normalize/include/joystick_transform_processor.h
@@ -54,33 +54,33 @@ class JoystickTransformProcessor final : public TransformProcessor {
         LIBINPUT_THUMBR_BUTTON_CODE = 318
     };
     const std::map<uint32_t, int32_t> LibinputChangeToPointer = {
-        {LIBINPUT_TL2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TL2},
-        {LIBINPUT_TR2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TR2},
-        {LIBINPUT_TL_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TL},
-        {LIBINPUT_TR_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TR},
-        {LIBINPUT_SOUTH_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_SOUTH},
-        {LIBINPUT_NORTH_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_NORTH},
-        {LIBINPUT_WEST_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_WEST},
-        {LIBINPUT_EAST_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_EAST},
-        {LIBINPUT_SELECT_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_SELECT},
-        {LIBINPUT_HOMEPAGE_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_HOMEPAGE},
-        {LIBINPUT_THUMBL_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_THUMBL},
-        {LIBINPUT_THUMBR_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_THUMBR},
-        {LIBINPUT_THUMB2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_THUMB2},
-        {LIBINPUT_THUMB_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_THUMB},
-        {LIBINPUT_TOP_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TOP},
-        {LIBINPUT_TOP2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TOP2},
-        {LIBINPUT_PINKIE_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_PINKIE},
-        {LIBINPUT_BASE_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE},
-        {LIBINPUT_BASE2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE2},
-        {LIBINPUT_BASE3_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE3},
-        {LIBINPUT_BASE4_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE4},
-        {LIBINPUT_BASE5_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE5},
-        {LIBINPUT_BASE6_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE6},
-        {LIBINPUT_DEAD_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_DEAD},
-        {LIBINPUT_C_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_C},
-        {LIBINPUT_Z_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_Z},
-        {LIBINPUT_MODE_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_MODE}
+        { LIBINPUT_TL2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TL2 },
+        { LIBINPUT_TR2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TR2 },
+        { LIBINPUT_TL_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TL },
+        { LIBINPUT_TR_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TR },
+        { LIBINPUT_SOUTH_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_SOUTH },
+        { LIBINPUT_NORTH_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_NORTH },
+        { LIBINPUT_WEST_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_WEST },
+        { LIBINPUT_EAST_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_EAST },
+        { LIBINPUT_SELECT_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_SELECT },
+        { LIBINPUT_HOMEPAGE_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_HOMEPAGE },
+        { LIBINPUT_THUMBL_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_THUMBL },
+        { LIBINPUT_THUMBR_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_THUMBR },
+        { LIBINPUT_THUMB2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_THUMB2 },
+        { LIBINPUT_THUMB_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_THUMB },
+        { LIBINPUT_TOP_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TOP },
+        { LIBINPUT_TOP2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_TOP2 },
+        { LIBINPUT_PINKIE_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_PINKIE },
+        { LIBINPUT_BASE_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE },
+        { LIBINPUT_BASE2_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE2 },
+        { LIBINPUT_BASE3_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE3 },
+        { LIBINPUT_BASE4_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE4 },
+        { LIBINPUT_BASE5_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE5 },
+        { LIBINPUT_BASE6_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_BASE6 },
+        { LIBINPUT_DEAD_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_DEAD },
+        { LIBINPUT_C_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_C },
+        { LIBINPUT_Z_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_Z },
+        { LIBINPUT_MODE_BUTTON_CODE, PointerEvent::JOYSTICK_BUTTON_MODE }
     };
 
 public:
diff --git a/service/touch_event_normalize/include/touchpad_transform_processor.h b/service/touch_event_normalize/include/touchpad_transform_processor.h
index 53555abf9b..ed5e0002eb 100644
--- a/service/touch_event_normalize/include/touchpad_transform_processor.h
+++ b/service/touch_event_normalize/include/touchpad_transform_processor.h
@@ -12,8 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef TOUCHPAD_TRANSFORM_PROCESSOR_H
 #define TOUCHPAD_TRANSFORM_PROCESSOR_H
+
 #include "nocopyable.h"
 #include "transform_processor.h"
 
diff --git a/service/touch_event_normalize/include/transform_processor.h b/service/touch_event_normalize/include/transform_processor.h
index e1f3e4f86b..f278564e29 100644
--- a/service/touch_event_normalize/include/transform_processor.h
+++ b/service/touch_event_normalize/include/transform_processor.h
@@ -12,10 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef TRANSFORM_PROCESSOR_H
 #define TRANSFORM_PROCESSOR_H
+
 #include <libinput.h>
 #include <memory>
+
 #include "pointer_event.h"
 
 namespace OHOS {
diff --git a/service/touch_event_normalize/test/transform_point_test.cpp b/service/touch_event_normalize/test/transform_point_test.cpp
index e1e434bf82..aec51108ff 100644
--- a/service/touch_event_normalize/test/transform_point_test.cpp
+++ b/service/touch_event_normalize/test/transform_point_test.cpp
@@ -12,9 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <cctype>
 #include <gtest/gtest.h>
 #include <thread>
+
 #include "mmi_log.h"
 #include "virtual_pen.h"
 
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 55b67fd2cd..1c47c6d7d6 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -19,13 +19,13 @@
 #include <cstdio>
 
 #include "dfx_hisysevent.h"
-#include "i_pointer_drawing_manager.h"
 #include "input_device_manager.h"
+#include "i_pointer_drawing_manager.h"
 #include "mouse_event_normalize.h"
 #include "pointer_drawing_manager.h"
+#include "util.h"
 #include "util_ex.h"
 #include "util_napi_error.h"
-#include "util.h"
 
 namespace OHOS {
 namespace MMI {
@@ -691,7 +691,7 @@ void InputWindowsManager::UpdatePointerStyle()
         int32_t pid = windowItem.pid;
         auto it = pointerStyle_.find(pid);
         if (it == pointerStyle_.end()) {
-            std::map<int32_t, int32_t> tmpPointerStyle = {{windowItem.id, DEFAULT_POINTER_STYLE}};
+            std::map<int32_t, int32_t> tmpPointerStyle = { { windowItem.id, DEFAULT_POINTER_STYLE } };
             auto iter = pointerStyle_.insert(std::make_pair(pid, tmpPointerStyle));
             if (!iter.second) {
                 MMI_HILOGW("The pd is duplicated");
diff --git a/test/fuzztest/setanrobserver_fuzzer/setanrobserver_fuzzer.cpp b/test/fuzztest/setanrobserver_fuzzer/setanrobserver_fuzzer.cpp
old mode 100755
new mode 100644
index 1d0cf81dc5..d68c38bd41
--- a/test/fuzztest/setanrobserver_fuzzer/setanrobserver_fuzzer.cpp
+++ b/test/fuzztest/setanrobserver_fuzzer/setanrobserver_fuzzer.cpp
@@ -16,8 +16,8 @@
 #include "setanrobserver_fuzzer.h"
 
 #include "input_manager.h"
-#include "mmi_log.h"
 #include "i_anr_observer.h"
+#include "mmi_log.h"
 
 namespace OHOS {
 namespace MMI {
diff --git a/test/unittest/common/include/event_util_test.h b/test/unittest/common/include/event_util_test.h
index 8cd66da141..86aa32e9ef 100644
--- a/test/unittest/common/include/event_util_test.h
+++ b/test/unittest/common/include/event_util_test.h
@@ -51,18 +51,18 @@ PermissionDef infoManagerTestPermDef_ = {
 };
 
 PermissionStateFull infoManagerTestState_ = {
-    .grantFlags = {1},
-    .grantStatus = {PermissionState::PERMISSION_GRANTED},
+    .grantFlags = { 1 },
+    .grantStatus = { PermissionState::PERMISSION_GRANTED },
     .isGeneral = true,
     .permissionName = "ohos.permission.INPUT_MONITORING",
-    .resDeviceID = {"local"}
+    .resDeviceID = { "local" }
 };
 
 HapPolicyParams infoManagerTestPolicyPrams_ = {
     .apl = APL_NORMAL,
     .domain = "test.domain",
-    .permList = {infoManagerTestPermDef_},
-    .permStateList = {infoManagerTestState_}
+    .permList = { infoManagerTestPermDef_ },
+    .permStateList = { infoManagerTestState_ }
 };
 
 HapInfoParams infoManagerTestInfoParms_ = {
diff --git a/tools/event_inject/src/get_device_object.cpp b/tools/event_inject/src/get_device_object.cpp
index 97cae843f9..43eadd8995 100644
--- a/tools/event_inject/src/get_device_object.cpp
+++ b/tools/event_inject/src/get_device_object.cpp
@@ -16,8 +16,8 @@
 #include "get_device_object.h"
 
 #include <chrono>
+#include <regex>
 #include <thread>
-#include<regex>
 
 namespace OHOS {
 namespace MMI {
diff --git a/tools/event_inject/src/injection_event_dispatch.cpp b/tools/event_inject/src/injection_event_dispatch.cpp
index 17e9a38030..c912b7043e 100644
--- a/tools/event_inject/src/injection_event_dispatch.cpp
+++ b/tools/event_inject/src/injection_event_dispatch.cpp
@@ -23,9 +23,9 @@
 #include <typeinfo>
 
 #include "error_multimodal.h"
+#include "input_parse.h"
 #include "proto.h"
 #include "util.h"
-#include "input_parse.h"
 
 namespace OHOS {
 namespace MMI {
diff --git a/tools/event_inject/src/input_parse.cpp b/tools/event_inject/src/input_parse.cpp
index 8239436abf..4ac38c9691 100644
--- a/tools/event_inject/src/input_parse.cpp
+++ b/tools/event_inject/src/input_parse.cpp
@@ -15,9 +15,9 @@
 
 #include "input_parse.h"
 
-#include "cJSON.h"
-
 #include <sstream>
+
+#include "cJSON.h"
 #include "define_multimodal.h"
 
 namespace OHOS {
diff --git a/tools/event_inject/src/mmi_event_simulate_main.cpp b/tools/event_inject/src/mmi_event_simulate_main.cpp
index c05ac5baee..9e2c6e2b3a 100644
--- a/tools/event_inject/src/mmi_event_simulate_main.cpp
+++ b/tools/event_inject/src/mmi_event_simulate_main.cpp
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#include "injection_event_dispatch.h"
 #include "error_multimodal.h"
+#include "injection_event_dispatch.h"
 #include "mmi_log.h"
 
 namespace {
diff --git a/tools/vuinput/include/virtual_device_config.h b/tools/vuinput/include/virtual_device_config.h
index 595a1348ad..3763820292 100644
--- a/tools/vuinput/include/virtual_device_config.h
+++ b/tools/vuinput/include/virtual_device_config.h
@@ -16,27 +16,26 @@
 #ifndef VIRTUAL_DEVICE_CONFIG_H
 #define VIRTUAL_DEVICE_CONFIG_H
 
+#include <cerrno>
+#include <cinttypes>
+#include <csignal>
 #include <cstdint>
-#include <functional>
-#include <getopt.h>
-#include <iostream>
-#include <string>
-#include <vector>
-#include <map>
-#include <unistd.h>
 #include <cstring>
-#include <sys/stat.h>
 #include <dirent.h>
-#include <csignal>
+#include <fcntl.h>
 #include <fstream>
+#include <functional>
+#include <iostream>
+#include <map>
 #include <memory>
-#include <cinttypes>
-#include <cerrno>
-#include <fcntl.h>
 #include <sstream>
-#include "securec.h"
+#include <sys/stat.h>
+#include <unistd.h>
+#include <vector>
+
 #include "linux/input.h"
 #include "linux/uinput.h"
+#include "securec.h"
 
 #ifndef REL_WHEEL_HI_RES
 #define REL_WHEEL_HI_RES    0x0b
diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index 266bafe007..ac71d5d8c2 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -234,17 +234,17 @@ static void StartPen()
 
 using virtualFun = void (*)();
 std::map<std::string, virtualFun> mapFun = {
-    {"mouse", &StartMouse},
-    {"keyboard", &StartKeyboard},
-    {"joystick", &StartJoystick},
-    {"trackball", &StartTrackball},
-    {"remotecontrol", &StartRemoteControl},
-    {"trackpad", &StartTrackpad},
-    {"knob", &StartKnob},
-    {"gamepad", &StartGamePad},
-    {"touchpad", &StartTouchPad},
-    {"touchscreen", &StartTouchScreen},
-    {"pen", &StartPen}
+    { "mouse", &StartMouse },
+    { "keyboard", &StartKeyboard },
+    { "joystick", &StartJoystick },
+    { "trackball", &StartTrackball },
+    { "remotecontrol", &StartRemoteControl },
+    { "trackpad", &StartTrackpad },
+    { "knob", &StartKnob },
+    { "gamepad", &StartGamePad },
+    { "touchpad", &StartTouchPad },
+    { "touchscreen", &StartTouchScreen },
+    { "pen", &StartPen }
 };
 
 static void StartAllDevices()
@@ -388,31 +388,31 @@ bool VirtualDevice::SetPhys(const std::string& deviceName)
 {
     std::string phys;
     std::map<std::string, std::string> typeDevice = {
-        {"Virtual Mouse",                "mouse"},
-        {"Virtual keyboard",             "keyboard"},
-        {"Virtual KeyboardConsumerCtrl", "keyboard"},
-        {"Virtual keyboardExt",          "keyboard"},
-        {"Virtual KeyboardSysCtrl",      "keyboard"},
-        {"Virtual Knob",                 "knob"},
-        {"Virtual KnobConsumerCtrl",     "knob"},
-        {"Virtual KnobMouse",            "knob"},
-        {"Virtual KnobSysCtrl",          "knob"},
-        {"Virtual Trackpad",             "trackpad"},
-        {"Virtual TrackPadMouse",        "trackpad"},
-        {"Virtual TrackpadSysCtrl",      "trackpad"},
-        {"Virtual Finger",               "touchpad"},
-        {"Virtual SingleFinger",         "touchpad"},
-        {"Virtual Stylus",               "touchpad"},
-        {"Virtual Touchpad",             "touchpad"},
-        {"Virtual RemoteControl",        "remotecontrol"},
-        {"Virtual Joystick",             "joystick"},
-        {"Virtual GamePad",              "gamepad"},
-        {"Virtual Trackball",            "trackball"},
-        {"Virtual TouchScreen",          "touchscreen"},
-        {"Virtual SingleTouchScreen",    "touchscreen"},
-        {"V-Pencil",                     "pen"},
-        {"V-Pencil-mouse",               "pen"},
-        {"V-Pencil-keyboard",            "pen"},
+        { "Virtual Mouse",                "mouse" },
+        { "Virtual keyboard",             "keyboard" },
+        { "Virtual KeyboardConsumerCtrl", "keyboard" },
+        { "Virtual keyboardExt",          "keyboard" },
+        { "Virtual KeyboardSysCtrl",      "keyboard" },
+        { "Virtual Knob",                 "knob" },
+        { "Virtual KnobConsumerCtrl",     "knob" },
+        { "Virtual KnobMouse",            "knob" },
+        { "Virtual KnobSysCtrl",          "knob" },
+        { "Virtual Trackpad",             "trackpad" },
+        { "Virtual TrackPadMouse",        "trackpad" },
+        { "Virtual TrackpadSysCtrl",      "trackpad" },
+        { "Virtual Finger",               "touchpad" },
+        { "Virtual SingleFinger",         "touchpad" },
+        { "Virtual Stylus",               "touchpad" },
+        { "Virtual Touchpad",             "touchpad" },
+        { "Virtual RemoteControl",        "remotecontrol" },
+        { "Virtual Joystick",             "joystick" },
+        { "Virtual GamePad",              "gamepad" },
+        { "Virtual Trackball",            "trackball" },
+        { "Virtual TouchScreen",          "touchscreen" },
+        { "Virtual SingleTouchScreen",    "touchscreen" },
+        { "V-Pencil",                     "pen" },
+        { "V-Pencil-mouse",               "pen" },
+        { "V-Pencil-keyboard",            "pen" },
     };
     std::string deviceType = typeDevice.find(deviceName)->second;
     phys.append(deviceType).append(g_pid).append("/").append(g_pid);
@@ -507,7 +507,7 @@ std::string VirtualDevice::ReadFile(const std::string& filePath)
 
 int32_t VirtualDevice::GetFileSize(const std::string& filePath)
 {
-    struct stat statbuf = {0};
+    struct stat statbuf = { 0 };
     if (stat(filePath.c_str(), &statbuf) != 0) {
         std::cout << "Get file size error" << std::endl;
         return INVALID_FILE_SIZE;
diff --git a/tools/vuinput/src/virtual_finger.cpp b/tools/vuinput/src/virtual_finger.cpp
index b7fa1679ee..f367019e5f 100644
--- a/tools/vuinput/src/virtual_finger.cpp
+++ b/tools/vuinput/src/virtual_finger.cpp
@@ -30,30 +30,30 @@ constexpr int32_t ABS_MAX_MT_ORIENTATION = 1;
 constexpr int32_t FINGER_ABS_RANGE = 40;
 
 ResolutionInfo resolutionInfos[] = {
-    {ABS_X, FINGER_ABS_RANGE},
-    {ABS_Y, FINGER_ABS_RANGE},
-    {ABS_MT_POSITION_X, FINGER_ABS_RANGE},
-    {ABS_MT_POSITION_Y, FINGER_ABS_RANGE},
-    {ABS_MT_TOOL_X, FINGER_ABS_RANGE},
-    {ABS_MT_TOOL_Y, FINGER_ABS_RANGE},
+    { ABS_X, FINGER_ABS_RANGE },
+    { ABS_Y, FINGER_ABS_RANGE },
+    { ABS_MT_POSITION_X, FINGER_ABS_RANGE },
+    { ABS_MT_POSITION_Y, FINGER_ABS_RANGE },
+    { ABS_MT_TOOL_X, FINGER_ABS_RANGE },
+    { ABS_MT_TOOL_Y, FINGER_ABS_RANGE },
 };
 
 AbsInfo absInfos[] = {
-    {ABS_X, 0, ABS_MAX_X, 0, 0},
-    {ABS_Y, 0, ABS_MAX_Y, 0, 0},
-    {ABS_MT_SLOT, 0, ABS_MAX_MT_SLOT, 0, 0},
-    {ABS_MT_TOUCH_MAJOR, 0, ABS_MAX_MT_TOUCH_MAJOR, 0, 0},
-    {ABS_MT_TOUCH_MINOR, 0, ABS_MAX_MT_TOUCH_MINOR, 0, 0},
-    {ABS_MT_ORIENTATION, 0, ABS_MAX_MT_ORIENTATION, 0, 0},
-    {ABS_MT_POSITION_X, 0, ABS_MAX_X, 0, 0},
-    {ABS_MT_POSITION_Y, 0, ABS_MAX_Y, 0, 0},
-    {ABS_MT_TRACKING_ID, 0, ABS_MAX_MT_TRACKING_ID, 0, 0},
-    {ABS_MT_PRESSURE, 0, ABS_MAX_MT_PRESSURE, 0, 0},
-    {ABS_MT_TOOL_TYPE, 0, ABS_TOOL_TYPE_MAX, 0, 0},
-    {ABS_MT_TOOL_X, 0, ABS_MAX_X, 0, 0},
-    {ABS_MT_TOOL_Y, 0, ABS_MAX_Y, 0, 0},
-    {ABS_MT_WIDTH_MAJOR, 0, ABS_MAX_X, 0, 0},
-    {ABS_MT_WIDTH_MINOR, 0, ABS_MAX_Y, 0, 0}
+    { ABS_X, 0, ABS_MAX_X, 0, 0 },
+    { ABS_Y, 0, ABS_MAX_Y, 0, 0 },
+    { ABS_MT_SLOT, 0, ABS_MAX_MT_SLOT, 0, 0 },
+    { ABS_MT_TOUCH_MAJOR, 0, ABS_MAX_MT_TOUCH_MAJOR, 0, 0 },
+    { ABS_MT_TOUCH_MINOR, 0, ABS_MAX_MT_TOUCH_MINOR, 0, 0 },
+    { ABS_MT_ORIENTATION, 0, ABS_MAX_MT_ORIENTATION, 0, 0 },
+    { ABS_MT_POSITION_X, 0, ABS_MAX_X, 0, 0 },
+    { ABS_MT_POSITION_Y, 0, ABS_MAX_Y, 0, 0 },
+    { ABS_MT_TRACKING_ID, 0, ABS_MAX_MT_TRACKING_ID, 0, 0 },
+    { ABS_MT_PRESSURE, 0, ABS_MAX_MT_PRESSURE, 0, 0 },
+    { ABS_MT_TOOL_TYPE, 0, ABS_TOOL_TYPE_MAX, 0, 0 },
+    { ABS_MT_TOOL_X, 0, ABS_MAX_X, 0, 0 },
+    { ABS_MT_TOOL_Y, 0, ABS_MAX_Y, 0, 0 },
+    { ABS_MT_WIDTH_MAJOR, 0, ABS_MAX_X, 0, 0 },
+    { ABS_MT_WIDTH_MINOR, 0, ABS_MAX_Y, 0, 0 }
 };
 } // namespace
 
diff --git a/tools/vuinput/src/virtual_gamepad.cpp b/tools/vuinput/src/virtual_gamepad.cpp
index f64fba6832..7d7f056cf8 100644
--- a/tools/vuinput/src/virtual_gamepad.cpp
+++ b/tools/vuinput/src/virtual_gamepad.cpp
@@ -27,16 +27,16 @@ constexpr int32_t ABS_FUZZ_VALUE = 16;
 constexpr int32_t ABS_FLAT_VALUE = 128;
 
 AbsInfo absInfos[] = {
-    {ABS_X, 0, ABS_MAX_RXYZ, 0, ABS_FLAT},
-    {ABS_Y, 0, ABS_MAX_RXYZ, 0, ABS_FLAT},
-    {ABS_Z, 0, ABS_MAX_RXYZ, 0, ABS_FLAT},
-    {ABS_RX, ABS_MIN_VALUE, ABS_MAX_RXYZ, ABS_FUZZ_VALUE, ABS_FLAT_VALUE},
-    {ABS_RY, ABS_MIN_VALUE, ABS_MAX_VALUE, ABS_FUZZ_VALUE, ABS_FLAT_VALUE},
-    {ABS_RZ, 0, ABS_MAX_RXYZ, 0, ABS_FLAT},
-    {ABS_GAS, 0, ABS_MAX_RXYZ, 0, ABS_FLAT},
-    {ABS_BRAKE, 0, ABS_MAX_RXYZ, 0, ABS_FLAT},
-    {ABS_HAT0X, ABS_MIN_HAT, 1, 0, 0},
-    {ABS_HAT0Y, ABS_MIN_HAT, 1, 0, 0}
+    { ABS_X, 0, ABS_MAX_RXYZ, 0, ABS_FLAT },
+    { ABS_Y, 0, ABS_MAX_RXYZ, 0, ABS_FLAT },
+    { ABS_Z, 0, ABS_MAX_RXYZ, 0, ABS_FLAT },
+    { ABS_RX, ABS_MIN_VALUE, ABS_MAX_RXYZ, ABS_FUZZ_VALUE, ABS_FLAT_VALUE },
+    { ABS_RY, ABS_MIN_VALUE, ABS_MAX_VALUE, ABS_FUZZ_VALUE, ABS_FLAT_VALUE },
+    { ABS_RZ, 0, ABS_MAX_RXYZ, 0, ABS_FLAT },
+    { ABS_GAS, 0, ABS_MAX_RXYZ, 0, ABS_FLAT },
+    { ABS_BRAKE, 0, ABS_MAX_RXYZ, 0, ABS_FLAT },
+    { ABS_HAT0X, ABS_MIN_HAT, 1, 0, 0 },
+    { ABS_HAT0Y, ABS_MIN_HAT, 1, 0, 0 }
 };
 } // namespace
 
diff --git a/tools/vuinput/src/virtual_joystick.cpp b/tools/vuinput/src/virtual_joystick.cpp
index e4e085771a..8a01ca428d 100644
--- a/tools/vuinput/src/virtual_joystick.cpp
+++ b/tools/vuinput/src/virtual_joystick.cpp
@@ -26,12 +26,12 @@ constexpr int32_t ABS_FLAT_RZ = 15;
 constexpr int32_t ABS_MIN_HAT = -1;
 
 AbsInfo absInfos[] = {
-    {ABS_X, 0, ABS_MAX_XY, ABS_FUZZ, ABS_FLAT},
-    {ABS_Y, 0, ABS_MAX_XY, ABS_FUZZ, ABS_FLAT},
-    {ABS_RZ, 0, ABS_MAX_RZ, 0, ABS_FLAT_RZ},
-    {ABS_THROTTLE, 0, ABS_MAX_RZ, 0, ABS_FLAT_RZ},
-    {ABS_HAT0X, ABS_MIN_HAT, 1, 0, 0},
-    {ABS_HAT0Y, ABS_MIN_HAT, 1, 0, 0}
+    { ABS_X, 0, ABS_MAX_XY, ABS_FUZZ, ABS_FLAT },
+    { ABS_Y, 0, ABS_MAX_XY, ABS_FUZZ, ABS_FLAT },
+    { ABS_RZ, 0, ABS_MAX_RZ, 0, ABS_FLAT_RZ },
+    { ABS_THROTTLE, 0, ABS_MAX_RZ, 0, ABS_FLAT_RZ },
+    { ABS_HAT0X, ABS_MIN_HAT, 1, 0, 0 },
+    { ABS_HAT0Y, ABS_MIN_HAT, 1, 0, 0 }
 };
 } // namespace
 
diff --git a/tools/vuinput/src/virtual_knob.cpp b/tools/vuinput/src/virtual_knob.cpp
index 5579528dcc..d7dff57dad 100644
--- a/tools/vuinput/src/virtual_knob.cpp
+++ b/tools/vuinput/src/virtual_knob.cpp
@@ -21,7 +21,7 @@ VirtualKnob::VirtualKnob() : VirtualDevice("Virtual Knob", BUS_USB, 0x5ac, 0x202
 {
     eventTypes_ = { EV_KEY, EV_MSC, EV_LED, EV_REP };
     miscellaneous_ = { MSC_SCAN };
-    leds_ = {LED_NUML, LED_CAPSL, LED_SCROLLL};
+    leds_ = { LED_NUML, LED_CAPSL, LED_SCROLLL };
     repeats_ = { REP_DELAY, REP_PERIOD };
     keys_ = {
         1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
diff --git a/tools/vuinput/src/virtual_pen.cpp b/tools/vuinput/src/virtual_pen.cpp
index 273bdfdaa3..788b7533cf 100644
--- a/tools/vuinput/src/virtual_pen.cpp
+++ b/tools/vuinput/src/virtual_pen.cpp
@@ -28,17 +28,17 @@ constexpr int32_t ABS_MAX_TYPE = 15;
 constexpr int32_t PEN_ABS_RANGE = 200;
 
 ResolutionInfo resolutionInfos[] = {
-    {ABS_X, PEN_ABS_RANGE},
-    {ABS_Y, PEN_ABS_RANGE}
+    { ABS_X, PEN_ABS_RANGE },
+    { ABS_Y, PEN_ABS_RANGE }
 };
 
 AbsInfo absInfos[] = {
-    {ABS_X, 0, ABS_MAX_X, 0, 0},
-    {ABS_Y, 0, ABS_MAX_Y, 0, 0},
-    {ABS_PRESSURE, 0, ABS_MAX_PRESSURE, 0, 0},
-    {ABS_TILT_X, ABS_MIN_TILT_X, ABS_MAX_TILT_X, 0, 0},
-    {ABS_TILT_Y, ABS_MIN_TILT_Y, ABS_MAX_TILT_Y, 0, 0},
-    {ABS_MT_TOOL_TYPE, 0, ABS_MAX_TYPE, 0, 0}
+    { ABS_X, 0, ABS_MAX_X, 0, 0 },
+    { ABS_Y, 0, ABS_MAX_Y, 0, 0 },
+    { ABS_PRESSURE, 0, ABS_MAX_PRESSURE, 0, 0 },
+    { ABS_TILT_X, ABS_MIN_TILT_X, ABS_MAX_TILT_X, 0, 0 },
+    { ABS_TILT_Y, ABS_MIN_TILT_Y, ABS_MAX_TILT_Y, 0, 0 },
+    { ABS_MT_TOOL_TYPE, 0, ABS_MAX_TYPE, 0, 0 }
 };
 } // namespace
 
diff --git a/tools/vuinput/src/virtual_remote_control.cpp b/tools/vuinput/src/virtual_remote_control.cpp
index 1f3090c902..e44693c180 100644
--- a/tools/vuinput/src/virtual_remote_control.cpp
+++ b/tools/vuinput/src/virtual_remote_control.cpp
@@ -23,8 +23,8 @@ constexpr int32_t ABS_FUZZ_REMOTE = 255;
 constexpr int32_t ABS_FLAT_REMOTE = 4095;
 
 AbsInfo absInfos[] = {
-    {ABS_X, 0, ABS_MAX_REMOTE, ABS_FUZZ_REMOTE, ABS_FLAT_REMOTE},
-    {ABS_Y, 0, ABS_MAX_REMOTE, ABS_FUZZ_REMOTE, ABS_FLAT_REMOTE}
+    { ABS_X, 0, ABS_MAX_REMOTE, ABS_FUZZ_REMOTE, ABS_FLAT_REMOTE },
+    { ABS_Y, 0, ABS_MAX_REMOTE, ABS_FUZZ_REMOTE, ABS_FLAT_REMOTE }
 };
 } // namespace
 
diff --git a/tools/vuinput/src/virtual_single_finger.cpp b/tools/vuinput/src/virtual_single_finger.cpp
index 44c09dfe19..2655d9e953 100644
--- a/tools/vuinput/src/virtual_single_finger.cpp
+++ b/tools/vuinput/src/virtual_single_finger.cpp
@@ -23,9 +23,9 @@ constexpr int32_t ABS_MAX_Y = 4000;
 constexpr int32_t ABS_PRESSURE_MAX = 8191;
 
 AbsInfo absInfos[] = {
-    {ABS_X, 0, ABS_MAX_X, 0, 0},
-    {ABS_Y, 0, ABS_MAX_Y, 0, 0},
-    {ABS_PRESSURE, 0, ABS_PRESSURE_MAX, 0, 0}
+    { ABS_X, 0, ABS_MAX_X, 0, 0 },
+    { ABS_Y, 0, ABS_MAX_Y, 0, 0 },
+    { ABS_PRESSURE, 0, ABS_PRESSURE_MAX, 0, 0 }
 };
 } // namespace
 
diff --git a/tools/vuinput/src/virtual_stylus.cpp b/tools/vuinput/src/virtual_stylus.cpp
index 1be6647301..c76aa33ebc 100644
--- a/tools/vuinput/src/virtual_stylus.cpp
+++ b/tools/vuinput/src/virtual_stylus.cpp
@@ -32,20 +32,20 @@ constexpr int32_t ABS_FUZZ_XY = 4;
 constexpr int32_t STYLUS_ABS_RANGE = 200;
 
 AbsInfo absInfos[] = {
-    {ABS_X, 0, ABS_MAX_X, ABS_FUZZ_XY, 0},
-    {ABS_Y, 0, ABS_MAX_Y, ABS_FUZZ_XY, 0},
-    {ABS_Z, ABS_MIN_Z, ABS_MAX_Z, 0, 0},
-    {ABS_WHEEL, 0, ABS_MAX_WHEEL, 0, 0},
-    {ABS_PRESSURE, 0, ABS_MAX_PRESSURE, 0, 0},
-    {ABS_DISTANCE, 0, ABS_MAX_TILT_XY_DISTANCE, 0, 0},
-    {ABS_TILT_X, ABS_MIN_TILT_XY, ABS_MAX_TILT_XY_DISTANCE, 0, 0},
-    {ABS_TILT_Y, ABS_MIN_TILT_XY, ABS_MAX_TILT_XY_DISTANCE, 0, 0},
-    {ABS_MISC, ABS_MIN_MISC, ABS_MAX_MISC, 0, 0}
+    { ABS_X, 0, ABS_MAX_X, ABS_FUZZ_XY, 0 },
+    { ABS_Y, 0, ABS_MAX_Y, ABS_FUZZ_XY, 0 },
+    { ABS_Z, ABS_MIN_Z, ABS_MAX_Z, 0, 0 },
+    { ABS_WHEEL, 0, ABS_MAX_WHEEL, 0, 0 },
+    { ABS_PRESSURE, 0, ABS_MAX_PRESSURE, 0, 0 },
+    { ABS_DISTANCE, 0, ABS_MAX_TILT_XY_DISTANCE, 0, 0 },
+    { ABS_TILT_X, ABS_MIN_TILT_XY, ABS_MAX_TILT_XY_DISTANCE, 0, 0 },
+    { ABS_TILT_Y, ABS_MIN_TILT_XY, ABS_MAX_TILT_XY_DISTANCE, 0, 0 },
+    { ABS_MISC, ABS_MIN_MISC, ABS_MAX_MISC, 0, 0 }
 };
 
 ResolutionInfo resolutionInfos[] = {
-    {ABS_X, STYLUS_ABS_RANGE},
-    {ABS_Y, STYLUS_ABS_RANGE}
+    { ABS_X, STYLUS_ABS_RANGE },
+    { ABS_Y, STYLUS_ABS_RANGE }
 };
 } // namespace
 
diff --git a/tools/vuinput/src/virtual_touchpad.cpp b/tools/vuinput/src/virtual_touchpad.cpp
index 758fa1f1b2..d4e7596c9b 100644
--- a/tools/vuinput/src/virtual_touchpad.cpp
+++ b/tools/vuinput/src/virtual_touchpad.cpp
@@ -22,15 +22,15 @@ constexpr int32_t ABS_MAX_WHEEL = 71;
 constexpr int32_t ABS_RANGE = 200;
 
 AbsInfo absInfos[] = {
-    {ABS_X, 0, 1, 0, 0},
-    {ABS_Y, 0, 1, 0, 0},
-    {ABS_WHEEL, 0, ABS_MAX_WHEEL, 0, 0},
-    {ABS_MISC, 0, 0, 0, 0},
+    { ABS_X, 0, 1, 0, 0 },
+    { ABS_Y, 0, 1, 0, 0 },
+    { ABS_WHEEL, 0, ABS_MAX_WHEEL, 0, 0 },
+    { ABS_MISC, 0, 0, 0, 0 },
 };
 
 ResolutionInfo resolutionInfos[] = {
-    {ABS_X, ABS_RANGE},
-    {ABS_Y, ABS_RANGE}
+    { ABS_X, ABS_RANGE },
+    { ABS_Y, ABS_RANGE }
 };
 } // namespace
 
diff --git a/tools/vuinput/src/virtual_touchscreen.cpp b/tools/vuinput/src/virtual_touchscreen.cpp
index 6ee17cf1a6..2bc55c4ac4 100644
--- a/tools/vuinput/src/virtual_touchscreen.cpp
+++ b/tools/vuinput/src/virtual_touchscreen.cpp
@@ -28,22 +28,22 @@ constexpr int32_t ABS_MT_TRACKING_ID_MAX = 9;
 constexpr int32_t ABS_TOOL_TYPE_MAX = 15;
 
 AbsInfo absInfos[] = {
-    {ABS_X, 0, ABS_MAX_X, 0, 0},
-    {ABS_Y, 0, ABS_MAX_Y, 0, 0},
-    {ABS_PRESSURE, 0, ABS_PRESSURE_MAX, 0, 0},
-    {ABS_MT_TOUCH_MAJOR, 0, 1, 0, 0},
-    {ABS_MT_TOUCH_MINOR, 0, 1, 0, 0},
-    {ABS_MT_ORIENTATION, ABS_MT_ORIENTATION_MIN, ABS_MT_ORIENTATION_MAX, 0, 0},
-    {ABS_MT_POSITION_X, 0, ABS_MAX_X, 0, 0},
-    {ABS_MT_POSITION_Y, 0, ABS_MAX_Y, 0, 0},
-    {ABS_MT_BLOB_ID, 0, ABS_MT_BLOB_ID_MAX, 0, 0},
-    {ABS_MT_TRACKING_ID, 0, ABS_MT_TRACKING_ID_MAX, 0, 0},
-    {ABS_MT_PRESSURE, 0, ABS_PRESSURE_MAX, 0, 0},
-    {ABS_MT_TOOL_TYPE, 0, ABS_TOOL_TYPE_MAX, 0, 0},
-    {ABS_MT_WIDTH_MAJOR, 0, 1, 0, 0},
-    {ABS_MT_WIDTH_MINOR, 0, 1, 0, 0},
-    {ABS_MT_TOOL_X, 0, ABS_MAX_X, 0, 0},
-    {ABS_MT_TOOL_Y, 0, 1, 0, 0}
+    { ABS_X, 0, ABS_MAX_X, 0, 0 },
+    { ABS_Y, 0, ABS_MAX_Y, 0, 0 },
+    { ABS_PRESSURE, 0, ABS_PRESSURE_MAX, 0, 0 },
+    { ABS_MT_TOUCH_MAJOR, 0, 1, 0, 0 },
+    { ABS_MT_TOUCH_MINOR, 0, 1, 0, 0 },
+    { ABS_MT_ORIENTATION, ABS_MT_ORIENTATION_MIN, ABS_MT_ORIENTATION_MAX, 0, 0 },
+    { ABS_MT_POSITION_X, 0, ABS_MAX_X, 0, 0 },
+    { ABS_MT_POSITION_Y, 0, ABS_MAX_Y, 0, 0 },
+    { ABS_MT_BLOB_ID, 0, ABS_MT_BLOB_ID_MAX, 0, 0 },
+    { ABS_MT_TRACKING_ID, 0, ABS_MT_TRACKING_ID_MAX, 0, 0 },
+    { ABS_MT_PRESSURE, 0, ABS_PRESSURE_MAX, 0, 0 },
+    { ABS_MT_TOOL_TYPE, 0, ABS_TOOL_TYPE_MAX, 0, 0 },
+    { ABS_MT_WIDTH_MAJOR, 0, 1, 0, 0 },
+    { ABS_MT_WIDTH_MINOR, 0, 1, 0, 0 },
+    { ABS_MT_TOOL_X, 0, ABS_MAX_X, 0, 0 },
+    { ABS_MT_TOOL_Y, 0, 1, 0, 0 }
 };
 } // namespace
 
diff --git a/tools/vuinput/test/virtual_device_test.cpp b/tools/vuinput/test/virtual_device_test.cpp
index 609a3d82cf..daf36d6fe7 100644
--- a/tools/vuinput/test/virtual_device_test.cpp
+++ b/tools/vuinput/test/virtual_device_test.cpp
@@ -12,7 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <gtest/gtest.h>
+
 #include "virtual_device.h"
 
 namespace OHOS {
diff --git a/uinput/hdf_device_event_dispatch.cpp b/uinput/hdf_device_event_dispatch.cpp
index db847f0386..fab41a9ce7 100644
--- a/uinput/hdf_device_event_dispatch.cpp
+++ b/uinput/hdf_device_event_dispatch.cpp
@@ -49,7 +49,7 @@ void HdfDeviceEventDispatch::GetEventCallbackDispatch(
             continue;
         }
         if ((pkgs[i]->type == 0) && (pkgs[i]->code == 0) && (pkgs[i]->value == 0)) {
-            InjectInputEvent injectInputSync = {injectThread_.TOUCH_SCREEN_DEVICE_ID, 0, SYN_MT_REPORT, 0};
+            InjectInputEvent injectInputSync = { injectThread_.TOUCH_SCREEN_DEVICE_ID, 0, SYN_MT_REPORT, 0 };
             injectThread_.WaitFunc(injectInputSync);
         }
         InjectInputEvent injectInputEvent = {
diff --git a/uinput/hdf_device_event_dispatch.h b/uinput/hdf_device_event_dispatch.h
index 0388f95128..ac4cc32b0a 100644
--- a/uinput/hdf_device_event_dispatch.h
+++ b/uinput/hdf_device_event_dispatch.h
@@ -18,8 +18,8 @@
 
 #include <cstdint>
 
-#include "input_type.h"
 #include "inject_thread.h"
+#include "input_type.h"
 #include "nocopyable.h"
 
 namespace OHOS {
diff --git a/uinput/keyboard_inject.cpp b/uinput/keyboard_inject.cpp
index 02120c0fd2..8eb1412587 100644
--- a/uinput/keyboard_inject.cpp
+++ b/uinput/keyboard_inject.cpp
@@ -53,9 +53,9 @@ void KeyboardInject::InjectKeyEvent(uint16_t code, uint32_t value) const
     if (it == keyCodeMap_.end()) {
         return;
     }
-    InjectInputEvent injectInputEvent = {injectThread_->KEYBOARD_DEVICE_ID, EV_KEY, it->second, value};
+    InjectInputEvent injectInputEvent = { injectThread_->KEYBOARD_DEVICE_ID, EV_KEY, it->second, value };
     injectThread_->WaitFunc(injectInputEvent);
-    InjectInputEvent injectInputSync = {injectThread_->KEYBOARD_DEVICE_ID, EV_SYN, SYN_REPORT, 0};
+    InjectInputEvent injectInputSync = { injectThread_->KEYBOARD_DEVICE_ID, EV_SYN, SYN_REPORT, 0 };
     injectThread_->WaitFunc(injectInputSync);
 }
 } // namespace MMI
diff --git a/uinput/virtual_keyboard.h b/uinput/virtual_keyboard.h
index f06f2f6846..c03be24977 100644
--- a/uinput/virtual_keyboard.h
+++ b/uinput/virtual_keyboard.h
@@ -17,8 +17,8 @@
 #define VIRTUAL_KEYBOARD_H
 
 #include <cstdint>
-#include "nocopyable.h"
 
+#include "nocopyable.h"
 #include "virtual_device.h"
 
 namespace OHOS {
diff --git a/util/common/include/input_event_data_transformation.h b/util/common/include/input_event_data_transformation.h
index e146db2021..c35988715f 100644
--- a/util/common/include/input_event_data_transformation.h
+++ b/util/common/include/input_event_data_transformation.h
@@ -12,8 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef INPUT_EVENT_DATA_TRANSFORMATION_H
 #define INPUT_EVENT_DATA_TRANSFORMATION_H
+
 #include "key_event.h"
 #include "net_packet.h"
 #include "pointer_event.h"
diff --git a/util/common/include/proto.h b/util/common/include/proto.h
index 4883595673..128bca53f9 100644
--- a/util/common/include/proto.h
+++ b/util/common/include/proto.h
@@ -12,8 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef PROTO_H
 #define PROTO_H
+
 #include <sys/types.h>
 
 enum class MmiMessageId : int32_t {
diff --git a/util/common/include/util_napi_error.h b/util/common/include/util_napi_error.h
index 93b949a032..e6881061ed 100644
--- a/util/common/include/util_napi_error.h
+++ b/util/common/include/util_napi_error.h
@@ -45,13 +45,13 @@ enum NapiErrorCode : int32_t {
 };
 
 const std::map<int32_t, NapiError> NAPI_ERRORS = {
-    {COMMON_PERMISSION_CHECK_ERROR,
-        {COMMON_PERMISSION_CHECK_ERROR, "Permission denied. An attempt was made to %s forbidden by permission:%s."}},
-    {COMMON_PARAMETER_ERROR, {COMMON_PARAMETER_ERROR, "Parameter error. The type of %s must be %s."}},
-    {COOPERATOR_TARGET_DEV_DESCRIPTOR_ERROR,
-        {COOPERATOR_TARGET_DEV_DESCRIPTOR_ERROR, "Incorrect descriptor for the target device"}},
-    {COOPERATOR_DEVICE_ID_ERROR, {COMMON_PARAMETER_ERROR, "Incorrect ID of the input device"}},
-    {COOPERATOR_FAIL, {COOPERATOR_FAIL, "Input device operation failed"}},
+    { COMMON_PERMISSION_CHECK_ERROR,
+        { COMMON_PERMISSION_CHECK_ERROR, "Permission denied. An attempt was made to %s forbidden by permission:%s." } },
+    { COMMON_PARAMETER_ERROR, { COMMON_PARAMETER_ERROR, "Parameter error. The type of %s must be %s." } },
+    { COOPERATOR_TARGET_DEV_DESCRIPTOR_ERROR,
+        { COOPERATOR_TARGET_DEV_DESCRIPTOR_ERROR, "Incorrect descriptor for the target device" } },
+    { COOPERATOR_DEVICE_ID_ERROR, { COMMON_PARAMETER_ERROR, "Incorrect ID of the input device" } },
+    { COOPERATOR_FAIL, { COOPERATOR_FAIL, "Input device operation failed" } },
 };
 
 #define THROWERR_CUSTOM(env, code, msg) \
diff --git a/util/common/src/klog.cpp b/util/common/src/klog.cpp
index 6a95a36e43..a287a551e6 100644
--- a/util/common/src/klog.cpp
+++ b/util/common/src/klog.cpp
@@ -15,12 +15,12 @@
 
 #include "klog.h"
 
+#include <cerrno>
+#include <cstdarg>
 #include <cstdio>
-#include <cstring>
 #include <cstdlib>
-#include <cstdarg>
+#include <cstring>
 #include <ctime>
-#include <cerrno>
 
 #include <fcntl.h>
 #include <pthread.h>
@@ -32,7 +32,6 @@
 #include "hilog/log.h"
 #include "securec.h"
 
-
 namespace OHOS {
 namespace MMI {
 #define UNUSED(x) \
diff --git a/util/common/src/util.cpp b/util/common/src/util.cpp
index b330cf1463..c5aeee2a56 100644
--- a/util/common/src/util.cpp
+++ b/util/common/src/util.cpp
@@ -246,7 +246,7 @@ static bool CheckFileExtendName(const std::string &filePath, const std::string &
 
 static int32_t GetFileSize(const std::string &filePath)
 {
-    struct stat statbuf = {0};
+    struct stat statbuf = { 0 };
     if (stat(filePath.c_str(), &statbuf) != 0) {
         MMI_HILOGE("Get file size error");
         return INVALID_FILE_SIZE;
diff --git a/util/network/include/circle_stream_buffer.h b/util/network/include/circle_stream_buffer.h
index f286132965..0702652bfc 100644
--- a/util/network/include/circle_stream_buffer.h
+++ b/util/network/include/circle_stream_buffer.h
@@ -12,8 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef CIRCLE_STREAM_BUFFER_H
 #define CIRCLE_STREAM_BUFFER_H
+
 #include "stream_buffer.h"
 
 namespace OHOS {
diff --git a/util/network/src/net_packet.cpp b/util/network/src/net_packet.cpp
index 5afb6bfff3..05b2fb5983 100644
--- a/util/network/src/net_packet.cpp
+++ b/util/network/src/net_packet.cpp
@@ -29,7 +29,7 @@ NetPacket::~NetPacket() {}
 
 void NetPacket::MakeData(StreamBuffer &buf) const
 {
-    PACKHEAD head = {msgId_, wPos_};
+    PACKHEAD head = { msgId_, wPos_ };
     buf << head;
     if (wPos_ > 0) {
         if (!buf.Write(&szBuff_[0], wPos_)) {
diff --git a/util/network/src/stream_buffer.cpp b/util/network/src/stream_buffer.cpp
index 66b7245159..c170679cc4 100644
--- a/util/network/src/stream_buffer.cpp
+++ b/util/network/src/stream_buffer.cpp
@@ -181,9 +181,9 @@ bool StreamBuffer::ChkRWError() const
 const std::string &StreamBuffer::GetErrorStatusRemark() const
 {
     static const std::vector<std::pair<ErrorStatus, std::string>> remark {
-        {ErrorStatus::ERROR_STATUS_OK, "OK"},
-        {ErrorStatus::ERROR_STATUS_READ, "READ_ERROR"},
-        {ErrorStatus::ERROR_STATUS_WRITE, "WRITE_ERROR"},
+        { ErrorStatus::ERROR_STATUS_OK, "OK" },
+        { ErrorStatus::ERROR_STATUS_READ, "READ_ERROR" },
+        { ErrorStatus::ERROR_STATUS_WRITE, "WRITE_ERROR" },
     };
     for (const auto &it : remark) {
         if (it.first == rwErrorStatus_) {
diff --git a/util/network/test/net_packet_test.cpp b/util/network/test/net_packet_test.cpp
index 9a634dcd1c..04e20f430d 100644
--- a/util/network/test/net_packet_test.cpp
+++ b/util/network/test/net_packet_test.cpp
@@ -234,7 +234,7 @@ HWTEST_F(NetPacketTest, WriteError, TestSize.Level1)
         int32_t xx;
         char szTest[MAX_STREAM_BUF_SIZE];
     };
-    TestData data = {333, "test111"};
+    TestData data = { 333, "test111" };
     pkt << data;
     EXPECT_TRUE(pkt.ChkRWError());
 }
diff --git a/util/socket/test/stream_buffer_test.cpp b/util/socket/test/stream_buffer_test.cpp
index 55091cfb82..9f1b7a3850 100644
--- a/util/socket/test/stream_buffer_test.cpp
+++ b/util/socket/test/stream_buffer_test.cpp
@@ -17,7 +17,6 @@
 
 #include "stream_buffer.h"
 
-
 namespace OHOS {
 namespace MMI {
 namespace {
diff --git a/util/socket/test/uds_client_test.cpp b/util/socket/test/uds_client_test.cpp
index 0b497d6c03..5117ce576c 100644
--- a/util/socket/test/uds_client_test.cpp
+++ b/util/socket/test/uds_client_test.cpp
@@ -19,7 +19,6 @@
 
 #include "uds_client.h"
 
-
 namespace OHOS {
 namespace MMI {
 namespace {
-- 
Gitee


From fbd8d07637920d9f6cf893a9dedc81c04c561847 Mon Sep 17 00:00:00 2001
From: baiwei <baiwei28@huawei.com>
Date: Tue, 13 Dec 2022 11:47:21 +0800
Subject: [PATCH 233/360] modify the interface GetKeyItem

Signed-off-by: baiwei <baiwei28@huawei.com>
Change-Id: I758c84c1b0809fffa1418e8eaa86d90bcc30650a
---
 test/unittest/common/src/event_util_test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/unittest/common/src/event_util_test.cpp b/test/unittest/common/src/event_util_test.cpp
index 9621edcc1d..138688991a 100644
--- a/test/unittest/common/src/event_util_test.cpp
+++ b/test/unittest/common/src/event_util_test.cpp
@@ -243,8 +243,8 @@ std::string EventUtilTest::DumpInputEvent(const std::shared_ptr<KeyEvent>& keyEv
             return "";
         }
         strm << ", KeyCode:" << keyItem->GetKeyCode()
-             << ", DeviceId:" << keyItem->GetDeviceId()
-             << ", Unicode:" << keyItem->GetUnicode();
+            << ", DeviceId:" << keyItem->GetDeviceId()
+            << ", Unicode:" << keyItem->GetUnicode();
     }
     return strm.str();
 }
-- 
Gitee


From cc8a92318cec3064c79fd38fef1698630a40d975 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Tue, 13 Dec 2022 17:32:42 +0800
Subject: [PATCH 234/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8D=95=E8=8E=B7?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 .../proxy/event_handler/include/input_manager_impl.h      | 4 ++--
 frameworks/proxy/event_handler/src/input_manager_impl.cpp | 8 ++++----
 frameworks/proxy/events/src/input_manager.cpp             | 1 +
 interfaces/native/innerkits/proxy/include/input_manager.h | 2 +-
 service/window_manager/include/input_windows_manager.h    | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index 6f4df77616..2a98ff96cf 100644
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -106,9 +106,9 @@ public:
     void SetAnrObserver(std::shared_ptr<IAnrObserver> observer);
     void OnAnr(int32_t pid);
 
+    int32_t RegisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener);
     int32_t EnterCaptureMode(int32_t windowId);
-    int32_t LeaveCaptureMode(int32_t windowId);    
-	int32_t RegisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener);
+    int32_t LeaveCaptureMode(int32_t windowId);
     int32_t UnregisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener = nullptr);
     int32_t EnableInputDeviceCooperate(bool enabled, std::function<void(std::string, CooperationMessage)> callback);
     int32_t StartInputDeviceCooperate(const std::string &sinkDeviceId, int32_t srcInputDeviceId,
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index f6bbc04fde..014ae7eaa4 100755
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -967,8 +967,8 @@ int32_t InputManagerImpl::EnterCaptureMode(int32_t windowId)
     }
     return ret;
 #else
-        MMI_HILOGW("Pointer device module does not support");
-        return ERROR_UNSUPPORT;
+    MMI_HILOGW("Pointer device module does not support");
+    return ERROR_UNSUPPORT;
 #endif // OHOS_BUILD_ENABLE_POINTER
 }
 
@@ -983,8 +983,8 @@ int32_t InputManagerImpl::LeaveCaptureMode(int32_t windowId)
     }
     return ret;
 #else
-        MMI_HILOGW("Pointer device module does not support");
-        return ERROR_UNSUPPORT;
+    MMI_HILOGW("Pointer device module does not support");
+    return ERROR_UNSUPPORT;
 #endif // OHOS_BUILD_ENABLE_POINTER
 }
 } // namespace MMI
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index 3dbba16916..b725df51cb 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -249,6 +249,7 @@ void InputManager::SetPointerLocation(int32_t x, int32_t y)
 {
     InputMgrImpl.SetPointerLocation(x, y);
 }
+
 int32_t InputManager::EnterCaptureMode(int32_t windowId)
 {
     return InputMgrImpl.EnterCaptureMode(windowId);
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index 50db9b5842..433dc8c3f8 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -408,8 +408,8 @@ public:
      * @return 进入捕获模式成功或失败.
      * @since 9
      */
-
     int32_t EnterCaptureMode(int32_t windowId);
+
     /**
      * @brief 退出捕获模式
      * @param windowId 窗口id.
diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
index 4c59d7dcec..35f0b1d98e 100644
--- a/service/window_manager/include/input_windows_manager.h
+++ b/service/window_manager/include/input_windows_manager.h
@@ -85,6 +85,7 @@ public:
 #endif // OHOS_BUILD_ENABLE_POINTER
     int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode);
     bool GetMouseIsCaptureMode() const;
+
 private:
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
     bool IsInHotArea(int32_t x, int32_t y, const std::vector<Rect> &rects) const;
@@ -150,7 +151,6 @@ private:
         bool isCaptureMode { false };
     } captureModeInfo_;
 };
-};
 
 #define WinMgr ::OHOS::DelayedSingleton<InputWindowsManager>::GetInstance()
 } // namespace MMI
-- 
Gitee


From 22624b6ae5abcc4df91b527b736aa638085fd9db Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Wed, 14 Dec 2022 09:39:38 +0800
Subject: [PATCH 235/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 service/device_config/include/device_config_file_parser.h   | 3 +--
 service/mouse_event_normalize/src/mouse_event_normalize.cpp | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/service/device_config/include/device_config_file_parser.h b/service/device_config/include/device_config_file_parser.h
index 887943fecd..50d094885a 100644
--- a/service/device_config/include/device_config_file_parser.h
+++ b/service/device_config/include/device_config_file_parser.h
@@ -22,8 +22,7 @@ struct libinput_device;
 
 namespace OHOS {
 namespace MMI {
-enum class ConfigFileItem
-{
+enum class ConfigFileItem {
     INVALID = -1,
     POINTER_BASE = 0,
     POINTER_SPEED,
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index 74e7f5c14c..4dafc3133a 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -450,7 +450,6 @@ int32_t MouseEventNormalize::SetPointerSpeedWithDeviceId(int32_t deviceId, int32
     CALL_DEBUG_ENTER;
     pointerDeviceSpeeds[deviceId] = PointerSpeedCheck(speed);
     MMI_HILOGD("Set pointer speed:%{public}d", pointerDeviceSpeeds[deviceId]);
-    // Notify
     return RET_OK;
 }
 
@@ -462,7 +461,6 @@ int32_t MouseEventNormalize::RemovePointerSpeed(int32_t deviceId)
         pointerDeviceSpeeds.erase(it);
         MMI_HILOGD("remove pointer speed with deviceId:%{public}d", deviceId);
     }
-    // notify
     return RET_OK;
 }
 
-- 
Gitee


From af7d1141baa08b4686f6c12bb0acc8a552fa13a1 Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Wed, 14 Dec 2022 02:11:08 +0000
Subject: [PATCH 236/360] Header file order optimization

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: Ie7ee91b8079136de0300f581c41d32503b67a023
---
 .../innerkits/event/include/key_event.h       | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/interfaces/native/innerkits/event/include/key_event.h b/interfaces/native/innerkits/event/include/key_event.h
index bb32d4bec8..446399a6d2 100644
--- a/interfaces/native/innerkits/event/include/key_event.h
+++ b/interfaces/native/innerkits/event/include/key_event.h
@@ -1370,7 +1370,7 @@ public:
     static const int32_t KEYCODE_BUTTON_DEAD;
 
     /**
-     * 键盘list菜单键
+     *  List Menu key on keyboard
      *
      * @since 9
      */
@@ -2867,196 +2867,196 @@ public:
     static const int32_t KEY_ACTION_UP;
 
     /**
-     * 未知意图
+     * Unknown intention
      *
      * @since 9
      */
     static const int32_t INTENTION_UNKNOWN;
 
     /**
-     * D-pad 上
+     * Up intention
      *
      * @since 9
      */
     static const int32_t INTENTION_UP;
 
     /**
-     * D-pad 下
+     * Down intention
      *
      * @since 9
      */
     static const int32_t INTENTION_DOWN;
 
     /**
-     * D-pad 左
+     * Left intention
      *
      * @since 9
      */
     static const int32_t INTENTION_LEFT;
 
     /**
-     * D-pad 右
+     * Right intention
      *
      * @since 9
      */
     static const int32_t INTENTION_RIGHT;
 
     /**
-     * 选中
+     * Select intention
      *
      * @since 9
      */
     static const int32_t INTENTION_SELECT;
 
     /**
-     * 逃逸
+     * Escape intention
      *
      * @since 9
      */
     static const int32_t INTENTION_ESCAPE;
 
     /**
-     * 返回
+     * Back intention
      *
      * @since 9
      */
     static const int32_t INTENTION_BACK;
 
     /**
-     * 前进
+     * Forward intention
      *
      * @since 9
      */
     static const int32_t INTENTION_FORWARD;
 
     /**
-     * 菜单
+     * Menu intention
      *
      * @since 9
      */
     static const int32_t INTENTION_MENU;
     
     /**
-     * 回到桌面
+     * Home intention
      *
      * @since 9
      */
     static const int32_t INTENTION_HOME;
     
     /**
-     * 上一页
+     * Page Up intention
      *
      * @since 9
      */
     static const int32_t INTENTION_PAGE_UP;
     
     /**
-     * 下一页
+     * Page down intention
      *
      * @since 9
      */
     static const int32_t INTENTION_PAGE_DOWN;
     
     /**
-     * 放大键
+     * Zoom out intention
      *
      * @since 9
      */
     static const int32_t INTENTION_ZOOM_OUT;
     
     /**
-     * 缩小键
+     * Zoom in intention
      *
      * @since 9
      */
     static const int32_t INTENTION_ZOOM_IN;
 
     /**
-     * 播放/暂停
+     * Media play/pause intention
      *
      * @since 9
      */
     static const int32_t INTENTION_MEDIA_PLAY_PAUSE;
     
     /**
-     * 快进
+     * Media fast forward intention
      *
      * @since 9
      */
     static const int32_t INTENTION_MEDIA_FAST_FORWARD;
     
     /**
-     * 快退
+     * Media fast rewind intention
      *
      * @since 9
      */
     static const int32_t INTENTION_MEDIA_FAST_REWIND;
     
     /**
-     * 倍速播放
+     * Media fast playback intention
      *
      * @since 9
      */
     static const int32_t INTENTION_MEDIA_FAST_PLAYBACK;
     
     /**
-     * 下一首/下一集
+     * Media next intention
      *
      * @since 9
      */
     static const int32_t INTENTION_MEDIA_NEXT;
     
     /**
-     * 上一首/上一集
+     * Media previous intention
      *
      * @since 9
      */
     static const int32_t INTENTION_MEDIA_PREVIOUS;
     
     /**
-     * 扬声器静音键
+     * Media mute intention
      *
      * @since 9
      */
     static const int32_t INTENTION_MEDIA_MUTE;
 
     /**
-     * 音量增加键
+     * Volume up intention
      *
      * @since 9
      */
     static const int32_t INTENTION_VOLUTE_UP;
     
     /**
-     * 音量减小键
+     * Volume down intention
      *
      * @since 9
      */
     static const int32_t INTENTION_VOLUTE_DOWN;
 
     /**
-     * 接听/挂断/拨号
+     * Call intention
      *
      * @since 9
      */
     static const int32_t INTENTION_CALL;
     
     /**
-     * 挂断
+     * End call intention
      *
      * @since 9
      */
     static const int32_t INTENTION_ENDCALL;
     
     /**
-     * 拒绝
+     * Reject call intention
      *
      * @since 9
      */
     static const int32_t INTENTION_REJECTCALL;
 
     /**
-     * 拍照键
+     * Camera intention
      *
      * @since 9
      */
@@ -3329,16 +3329,16 @@ public:
     bool GetFunctionKey(int32_t funcKey) const;
 
     /**
-     * @brief 获取当前事件的按键意图。
+     * @brief Obtains the key intention of the current event.
      * @param void
-     * @return 返回当前事件的按键意图。
+     * @return Returns the key intention of the current event.
      * @since 9
      */
     int32_t GetKeyIntention() const;
 
     /**
-     * @brief 给当前按键事件设置按键意图。
-     * @param keyIntention 指定的按键意图。
+     * @brief Sets the key intention for the current key event.
+     * @param keyIntention Specified key intention.
      * @return void
      * @since 9
      */
-- 
Gitee


From b111185cacbe9ea8265047ee4459dd18fe781063 Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Wed, 14 Dec 2022 09:00:03 +0000
Subject: [PATCH 237/360] Header file order optimization

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: If9a2c0b3e98cffbdc9791be6acb7c6e72c1ee2b7
---
 .../event_handler/src/client_msg_handler.cpp  |  2 +-
 .../innerkits/event/include/pointer_event.h   |  3 +-
 tools/vuinput/src/virtual_device.cpp          | 72 +++++++++----------
 3 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/client_msg_handler.cpp b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
index 805eb5d265..97a74d5a9b 100644
--- a/frameworks/proxy/event_handler/src/client_msg_handler.cpp
+++ b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
@@ -54,7 +54,7 @@ void ClientMsgHandler::Init()
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
         { MmiMessageId::ON_KEY_EVENT, MsgCallbackBind2(&ClientMsgHandler::OnKeyEvent, this) },
         { MmiMessageId::ON_SUBSCRIBE_KEY, std::bind(&ClientMsgHandler::OnSubscribeKeyEventCallback,
-                                                   this, std::placeholders::_1, std::placeholders::_2) },
+            this, std::placeholders::_1, std::placeholders::_2) },
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
         { MmiMessageId::ON_POINTER_EVENT, MsgCallbackBind2(&ClientMsgHandler::OnPointerEvent, this) },
diff --git a/interfaces/native/innerkits/event/include/pointer_event.h b/interfaces/native/innerkits/event/include/pointer_event.h
index 5a46114d6d..982cdda64a 100644
--- a/interfaces/native/innerkits/event/include/pointer_event.h
+++ b/interfaces/native/innerkits/event/include/pointer_event.h
@@ -248,7 +248,8 @@ public:
     static constexpr int32_t SOURCE_TYPE_TOUCHPAD = 3;
 
     /**
-     * Indicates joystick-like events generated by the input source, such as button pressing, button lifting, and wheel scrolling.
+     * Indicates joystick-like events generated by the input source, such as button pressing, button lifting,
+     * and wheel scrolling.
      *
      * @since 9
      */
diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index ac71d5d8c2..e1c1bd7682 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -234,17 +234,17 @@ static void StartPen()
 
 using virtualFun = void (*)();
 std::map<std::string, virtualFun> mapFun = {
-    { "mouse", &StartMouse },
-    { "keyboard", &StartKeyboard },
-    { "joystick", &StartJoystick },
-    { "trackball", &StartTrackball },
-    { "remotecontrol", &StartRemoteControl },
-    { "trackpad", &StartTrackpad },
-    { "knob", &StartKnob },
-    { "gamepad", &StartGamePad },
-    { "touchpad", &StartTouchPad },
-    { "touchscreen", &StartTouchScreen },
-    { "pen", &StartPen }
+    {"mouse", &StartMouse},
+    {"keyboard", &StartKeyboard},
+    {"joystick", &StartJoystick},
+    {"trackball", &StartTrackball},
+    {"remotecontrol", &StartRemoteControl},
+    {"trackpad", &StartTrackpad},
+    {"knob", &StartKnob},
+    {"gamepad", &StartGamePad},
+    {"touchpad", &StartTouchPad},
+    {"touchscreen", &StartTouchScreen},
+    {"pen", &StartPen}
 };
 
 static void StartAllDevices()
@@ -388,31 +388,31 @@ bool VirtualDevice::SetPhys(const std::string& deviceName)
 {
     std::string phys;
     std::map<std::string, std::string> typeDevice = {
-        { "Virtual Mouse",                "mouse" },
-        { "Virtual keyboard",             "keyboard" },
-        { "Virtual KeyboardConsumerCtrl", "keyboard" },
-        { "Virtual keyboardExt",          "keyboard" },
-        { "Virtual KeyboardSysCtrl",      "keyboard" },
-        { "Virtual Knob",                 "knob" },
-        { "Virtual KnobConsumerCtrl",     "knob" },
-        { "Virtual KnobMouse",            "knob" },
-        { "Virtual KnobSysCtrl",          "knob" },
-        { "Virtual Trackpad",             "trackpad" },
-        { "Virtual TrackPadMouse",        "trackpad" },
-        { "Virtual TrackpadSysCtrl",      "trackpad" },
-        { "Virtual Finger",               "touchpad" },
-        { "Virtual SingleFinger",         "touchpad" },
-        { "Virtual Stylus",               "touchpad" },
-        { "Virtual Touchpad",             "touchpad" },
-        { "Virtual RemoteControl",        "remotecontrol" },
-        { "Virtual Joystick",             "joystick" },
-        { "Virtual GamePad",              "gamepad" },
-        { "Virtual Trackball",            "trackball" },
-        { "Virtual TouchScreen",          "touchscreen" },
-        { "Virtual SingleTouchScreen",    "touchscreen" },
-        { "V-Pencil",                     "pen" },
-        { "V-Pencil-mouse",               "pen" },
-        { "V-Pencil-keyboard",            "pen" },
+        {"Virtual Mouse",                "mouse"},
+        {"Virtual keyboard",             "keyboard"},
+        {"Virtual KeyboardConsumerCtrl", "keyboard"},
+        {"Virtual keyboardExt",          "keyboard"},
+        {"Virtual KeyboardSysCtrl",      "keyboard"},
+        {"Virtual Knob",                 "knob"},
+        {"Virtual KnobConsumerCtrl",     "knob"},
+        {"Virtual KnobMouse",            "knob"},
+        {"Virtual KnobSysCtrl",          "knob"},
+        {"Virtual Trackpad",             "trackpad"},
+        {"Virtual TrackPadMouse",        "trackpad"},
+        {"Virtual TrackpadSysCtrl",      "trackpad"},
+        {"Virtual Finger",               "touchpad"},
+        {"Virtual SingleFinger",         "touchpad"},
+        {"Virtual Stylus",               "touchpad"},
+        {"Virtual Touchpad",             "touchpad"},
+        {"Virtual RemoteControl",        "remotecontrol"},
+        {"Virtual Joystick",             "joystick"},
+        {"Virtual GamePad",              "gamepad"},
+        {"Virtual Trackball",            "trackball"},
+        {"Virtual TouchScreen",          "touchscreen"},
+        {"Virtual SingleTouchScreen",    "touchscreen"},
+        {"V-Pencil",                     "pen"},
+        {"V-Pencil-mouse",               "pen"},
+        {"V-Pencil-keyboard",            "pen"},
     };
     std::string deviceType = typeDevice.find(deviceName)->second;
     phys.append(deviceType).append(g_pid).append("/").append(g_pid);
-- 
Gitee


From 65fe102cbea126eeaae2f3c10cc40a6240ac1d8e Mon Sep 17 00:00:00 2001
From: wangdi119 <wangdi119@huawei.com>
Date: Wed, 14 Dec 2022 17:07:26 +0800
Subject: [PATCH 238/360] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20Signed-off-by:=20w?=
 =?UTF-8?q?angdi119=20<wangdi119@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frameworks/napi/pointer/src/js_pointer_context.cpp |  8 ++++----
 frameworks/napi/pointer/src/js_pointer_manager.cpp | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frameworks/napi/pointer/src/js_pointer_context.cpp b/frameworks/napi/pointer/src/js_pointer_context.cpp
index 540ea8cfbb..15c7259f8e 100644
--- a/frameworks/napi/pointer/src/js_pointer_context.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_context.cpp
@@ -452,7 +452,7 @@ napi_value JsPointerContext::EnterCaptureMode(napi_env env, napi_callback_info i
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 1 || argc > 2) {
         THROWERR(env, "The number of parameters is not as expected");
         return nullptr;
@@ -463,7 +463,7 @@ napi_value JsPointerContext::EnterCaptureMode(napi_env env, napi_callback_info i
     }
 
     int32_t windowId = 0;
-    CHKRP(env, napi_get_value_int32(env, argv[0], &windowId), GET_BOOL);
+    CHKRP(napi_get_value_int32(env, argv[0], &windowId), GET_VALUE_INT32);
     JsPointerContext *jsPointer = JsPointerContext::GetInstance(env);
     auto jsPointerMgr = jsPointer->GetJsPointerMgr();
     if(argc == 1) {
@@ -481,7 +481,7 @@ napi_value JsPointerContext::LeaveCaptureMode(napi_env env, napi_callback_info i
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 1 || argc > 2) {
         THROWERR(env, "The number of parameters is not as expected");
         return nullptr;
@@ -492,7 +492,7 @@ napi_value JsPointerContext::LeaveCaptureMode(napi_env env, napi_callback_info i
     }
     
     int32_t windowId = 0;
-    CHKRP(env, napi_get_value_int32(env, argv[0], &windowId), GET_BOOL);
+    CHKRP(napi_get_value_int32(env, argv[0], &windowId), GET_VALUE_INT32);
 
     JsPointerContext *jsPointer = JsPointerContext::GetInstance(env);
     auto jsPointerMgr = jsPointer->GetJsPointerMgr();
diff --git a/frameworks/napi/pointer/src/js_pointer_manager.cpp b/frameworks/napi/pointer/src/js_pointer_manager.cpp
index 6de00f4ec1..6bab563fca 100644
--- a/frameworks/napi/pointer/src/js_pointer_manager.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_manager.cpp
@@ -269,10 +269,10 @@ napi_value JsPointerManager::EnterCaptureMode(napi_env env, int32_t windowId, na
 
     napi_value promise = nullptr;
     if(handle != nullptr) {
-        CHKRP(env, napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
-        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
+        CHKRP(napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
+        CHKRP(napi_get_undefined(env, &promise), GET_UNDEFINED);
     } else {
-        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
+        CHKRP(napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
     }
     AsyncCallbackWork(asyncContext);
     return promise;
@@ -292,10 +292,10 @@ napi_value JsPointerManager::LeaveCaptureMode(napi_env env, int32_t windowId, na
 
     napi_value promise = nullptr;
     if(handle != nullptr) {
-        CHKRP(env, napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
-        CHKRP(env, napi_get_undefined(env, &promise), GET_UNDEFINED);
+        CHKRP(napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
+        CHKRP(napi_get_undefined(env, &promise), GET_UNDEFINED);
     } else {
-        CHKRP(env, napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
+        CHKRP(napi_create_promise(env, &asyncContext->deferred, &promise), CREATE_PROMISE);
     }
     AsyncCallbackWork(asyncContext);
     return promise;
-- 
Gitee


From c34bf8e9605a5b0f90cdbff754136c26e4357142 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Wed, 14 Dec 2022 18:16:55 +0800
Subject: [PATCH 239/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 service/device_config/include/device_config_file_parser.h  | 1 +
 service/device_config/src/device_config_file_parser.cpp    | 7 ++++---
 service/event_handler/src/event_normalize_handler.cpp      | 2 +-
 .../mouse_event_normalize/include/mouse_event_normalize.h  | 1 -
 .../mouse_event_normalize/src/mouse_event_normalize.cpp    | 3 +--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/service/device_config/include/device_config_file_parser.h b/service/device_config/include/device_config_file_parser.h
index 50d094885a..e4395de03f 100644
--- a/service/device_config/include/device_config_file_parser.h
+++ b/service/device_config/include/device_config_file_parser.h
@@ -18,6 +18,7 @@
 
 #include <map>
 #include <string>
+
 struct libinput_device;
 
 namespace OHOS {
diff --git a/service/device_config/src/device_config_file_parser.cpp b/service/device_config/src/device_config_file_parser.cpp
index f87a0b5115..d6cc3cf064 100644
--- a/service/device_config/src/device_config_file_parser.cpp
+++ b/service/device_config/src/device_config_file_parser.cpp
@@ -14,12 +14,13 @@
  */
 
 #include "device_config_file_parser.h"
+
 #include <fstream>
-#include "libinput.h"
-#include "input_device.h"
+
 #include "error_multimodal.h"
-#include "mouse_event_handler.h"
+#include "input_device.h"
 #include "input_device_manager.h"
+#include "libinput.h"
 
 namespace OHOS {
 namespace MMI {
diff --git a/service/event_handler/src/event_normalize_handler.cpp b/service/event_handler/src/event_normalize_handler.cpp
index 9f675ffa12..6172876122 100644
--- a/service/event_handler/src/event_normalize_handler.cpp
+++ b/service/event_handler/src/event_normalize_handler.cpp
@@ -18,6 +18,7 @@
 #include "dfx_hisysevent.h"
 #include "bytrace_adapter.h"
 #include "define_multimodal.h"
+#include "device_config_file_parser.h"
 #include "error_multimodal.h"
 #include "event_log_helper.h"
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
@@ -34,7 +35,6 @@
 #include "time_cost_chk.h"
 #include "timer_manager.h"
 #include "touch_event_normalize.h"
-#include "device_config_file_parser.h"
 
 namespace OHOS {
 namespace MMI {
diff --git a/service/mouse_event_normalize/include/mouse_event_normalize.h b/service/mouse_event_normalize/include/mouse_event_normalize.h
index da71c9e1c5..59d16b6e52 100644
--- a/service/mouse_event_normalize/include/mouse_event_normalize.h
+++ b/service/mouse_event_normalize/include/mouse_event_normalize.h
@@ -57,7 +57,6 @@ public:
     int32_t GetDisplayId() const;
     int32_t SetPointerLocation(int32_t x, int32_t y);
     int32_t GetPointerSpeedByDeviceId(int32_t deviceId) const;
-
 private:
     int32_t HandleMotionInner(struct libinput_event_pointer* data, int32_t deviceId);
     int32_t HandleButtonInner(struct libinput_event_pointer* data);
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index f1a669bc37..c060ed8d27 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -88,7 +88,7 @@ int32_t MouseEventNormalize::GetSpeed(int32_t deviceId) const
     }
 }
 
-bool MouseEventNormalize::GetSpeedGain(double vin, double &gain) const
+bool MouseEventNormalize::GetSpeedGain(double vin, double &gain, int32_t deviceId) const
 {
     if (fabs(vin) < DOUBLE_ZERO) {
         MMI_HILOGE("The value of the parameter passed in is 0");
@@ -338,7 +338,6 @@ int32_t MouseEventNormalize::Normalize(struct libinput_event *event)
             return RET_ERR;
         }
     }
-
     PointerEvent::PointerItem pointerItem;
     HandlePostInner(data, deviceId, pointerItem);
     WinMgr->UpdateTargetPointer(pointerEvent_);
-- 
Gitee


From 4704b447c71e0c807d43b1fd8f5e6b2d87feb79e Mon Sep 17 00:00:00 2001
From: wangdi119 <wangdi119@huawei.com>
Date: Wed, 14 Dec 2022 18:36:43 +0800
Subject: [PATCH 240/360] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangdi119 <wangdi119@huawei.com>
---
 .../napi/pointer/src/js_pointer_context.cpp   | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/frameworks/napi/pointer/src/js_pointer_context.cpp b/frameworks/napi/pointer/src/js_pointer_context.cpp
index 15c7259f8e..37cefee706 100644
--- a/frameworks/napi/pointer/src/js_pointer_context.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_context.cpp
@@ -124,7 +124,7 @@ napi_value JsPointerContext::SetPointerVisible(napi_env env, napi_callback_info
         return nullptr;
     }
     if (!JsCommon::TypeOf(env, argv[0], napi_boolean)) {
-        MMI_HILOGE("visible parameter type is wrong");
+        MMI_HILOGE("visible parameter type is invalid");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "visible", "boolean");
         return nullptr;
     }
@@ -137,7 +137,7 @@ napi_value JsPointerContext::SetPointerVisible(napi_env env, napi_callback_info
         return jsPointerMgr->SetPointerVisible(env, visible);
     }
     if (!JsCommon::TypeOf(env, argv[1], napi_function)) {
-        MMI_HILOGE("callback parameter type is wrong ");
+        MMI_HILOGE("callback parameter type is invalid ");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "callback", "function");
         return nullptr;
     }
@@ -157,7 +157,7 @@ napi_value JsPointerContext::IsPointerVisible(napi_env env, napi_callback_info i
         return jsPointerMgr->IsPointerVisible(env);
     }
     if (!JsCommon::TypeOf(env, argv[0], napi_function)) {
-        MMI_HILOGE("callback parameter type is wrong");
+        MMI_HILOGE("callback parameter type is invalid");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "callback", "function");
         return nullptr;
     }
@@ -177,7 +177,7 @@ napi_value JsPointerContext::SetPointerSpeed(napi_env env, napi_callback_info in
         return nullptr;
     }
     if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
-        MMI_HILOGE("speed parameter type is wrong");
+        MMI_HILOGE("speed parameter type is invalid");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "speed", "number");
         return nullptr;
     }
@@ -194,7 +194,7 @@ napi_value JsPointerContext::SetPointerSpeed(napi_env env, napi_callback_info in
         return jsPointerMgr->SetPointerSpeed(env, pointerSpeed);
     }
     if (!JsCommon::TypeOf(env, argv[1], napi_function)) {
-        MMI_HILOGE("callback parameter type is wrong");
+        MMI_HILOGE("callback parameter type is invalid");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "callback", "function");
         return nullptr;
     }
@@ -213,7 +213,7 @@ napi_value JsPointerContext::GetPointerSpeed(napi_env env, napi_callback_info in
         return jsPointerMgr->GetPointerSpeed(env);
     }
     if (!JsCommon::TypeOf(env, argv[0], napi_function)) {
-        MMI_HILOGE("callback parameter type is wrong");
+        MMI_HILOGE("callback parameter type is invalid");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "callback", "function");
         return nullptr;
     }
@@ -233,7 +233,7 @@ napi_value JsPointerContext::SetPointerStyle(napi_env env, napi_callback_info in
         return nullptr;
     }
     if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
-        MMI_HILOGE("windowId parameter type is wrong");
+        MMI_HILOGE("windowId parameter type is invalid");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "windowId", "number");
         return nullptr;
     }
@@ -245,7 +245,7 @@ napi_value JsPointerContext::SetPointerStyle(napi_env env, napi_callback_info in
         return nullptr;
     }
     if (!JsCommon::TypeOf(env, argv[1], napi_number)) {
-        MMI_HILOGE("pointerStyle parameter type is wrong");
+        MMI_HILOGE("pointerStyle parameter type is invalid");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "pointerStyle", "number");
         return nullptr;
     }
@@ -262,7 +262,7 @@ napi_value JsPointerContext::SetPointerStyle(napi_env env, napi_callback_info in
         return jsPointerMgr->SetPointerStyle(env, windowid, pointerStyle);
     }
     if (!JsCommon::TypeOf(env, argv[2], napi_function)) {
-        MMI_HILOGE("callback parameter type is wrong");
+        MMI_HILOGE("callback parameter type is invalid");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "callback", "function");
         return nullptr;
     }
@@ -281,7 +281,7 @@ napi_value JsPointerContext::GetPointerStyle(napi_env env, napi_callback_info in
         return nullptr;
     }
     if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
-        MMI_HILOGE("windowId parameter type is wrong");
+        MMI_HILOGE("windowId parameter type is invalid");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "windowId", "number");
         return nullptr;
     }
@@ -298,7 +298,7 @@ napi_value JsPointerContext::GetPointerStyle(napi_env env, napi_callback_info in
         return jsPointerMgr->GetPointerStyle(env, windowid);
     }
     if (!JsCommon::TypeOf(env, argv[1], napi_function)) {
-        MMI_HILOGE("callback parameter type is wrong");
+        MMI_HILOGE("callback parameter type is invalid");
         THROWERR_API9(env, COMMON_PARAMETER_ERROR, "callback", "function");
         return nullptr;
     }
@@ -458,19 +458,20 @@ napi_value JsPointerContext::EnterCaptureMode(napi_env env, napi_callback_info i
         return nullptr;
     }
     if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
-        THROWERR(env, "The first parameter type is wrong");
+        THROWERR(env, "The first parameter type is invalid");
         return nullptr;
     }
 
     int32_t windowId = 0;
     CHKRP(napi_get_value_int32(env, argv[0], &windowId), GET_VALUE_INT32);
     JsPointerContext *jsPointer = JsPointerContext::GetInstance(env);
+    CHKPV(jsPointer);
     auto jsPointerMgr = jsPointer->GetJsPointerMgr();
     if(argc == 1) {
         return jsPointerMgr->EnterCaptureMode(env, windowId);
     }
     if (!JsCommon::TypeOf(env, argv[1], napi_function)) {
-        THROWERR(env, "The second parameter type is wrong");
+        THROWERR(env, "The second parameter type is invalid");
         return nullptr;
     }
     return jsPointerMgr->EnterCaptureMode(env, windowId, argv[1]);
@@ -481,13 +482,13 @@ napi_value JsPointerContext::LeaveCaptureMode(napi_env env, napi_callback_info i
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKPP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 1 || argc > 2) {
         THROWERR(env, "The number of parameters is not as expected");
         return nullptr;
     }
     if (!JsCommon::TypeOf(env, argv[0], napi_number)) {
-        THROWERR(env, "The first parameter type is wrong");
+        THROWERR(env, "The first parameter type is invalid");
         return nullptr;
     }
     
@@ -495,12 +496,13 @@ napi_value JsPointerContext::LeaveCaptureMode(napi_env env, napi_callback_info i
     CHKRP(napi_get_value_int32(env, argv[0], &windowId), GET_VALUE_INT32);
 
     JsPointerContext *jsPointer = JsPointerContext::GetInstance(env);
+    CHKPP(jsPointer);
     auto jsPointerMgr = jsPointer->GetJsPointerMgr();
     if(argc == 1) {
         return jsPointerMgr->LeaveCaptureMode(env, windowId);
     }
     if (!JsCommon::TypeOf(env, argv[1], napi_function)) {
-        THROWERR(env, "The second parameter type is wrong");
+        THROWERR(env, "The second parameter type is invalid");
         return nullptr;
     }
     return jsPointerMgr->LeaveCaptureMode(env, windowId, argv[1]);
-- 
Gitee


From 0769158260138771ea9b6f234cfa55ac629e6632 Mon Sep 17 00:00:00 2001
From: wangdi119 <wangdi119@huawei.com>
Date: Wed, 14 Dec 2022 19:00:10 +0800
Subject: [PATCH 241/360] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangdi119 <wangdi119@huawei.com>
---
 frameworks/napi/pointer/src/js_pointer_context.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frameworks/napi/pointer/src/js_pointer_context.cpp b/frameworks/napi/pointer/src/js_pointer_context.cpp
index 37cefee706..efc24d636f 100644
--- a/frameworks/napi/pointer/src/js_pointer_context.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_context.cpp
@@ -465,7 +465,7 @@ napi_value JsPointerContext::EnterCaptureMode(napi_env env, napi_callback_info i
     int32_t windowId = 0;
     CHKRP(napi_get_value_int32(env, argv[0], &windowId), GET_VALUE_INT32);
     JsPointerContext *jsPointer = JsPointerContext::GetInstance(env);
-    CHKPV(jsPointer);
+    CHKPP(jsPointer);
     auto jsPointerMgr = jsPointer->GetJsPointerMgr();
     if(argc == 1) {
         return jsPointerMgr->EnterCaptureMode(env, windowId);
@@ -482,7 +482,7 @@ napi_value JsPointerContext::LeaveCaptureMode(napi_env env, napi_callback_info i
     CALL_DEBUG_ENTER;
     size_t argc = 2;
     napi_value argv[2];
-    CHKPP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
     if (argc < 1 || argc > 2) {
         THROWERR(env, "The number of parameters is not as expected");
         return nullptr;
-- 
Gitee


From de7c13b1747db55249e5a5dcfd414b7d58500442 Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Wed, 14 Dec 2022 20:08:53 +0800
Subject: [PATCH 242/360] The mouse device is independently to report event.

Signed-off-by: mayunteng <mayunteng@huawei.com>
---
 service/BUILD.gn                              |   1 +
 .../src/event_normalize_handler.cpp           |   2 +-
 .../include/mouse_device_state.h              |   3 +-
 .../include/mouse_event_normalize.h           |  45 +-
 .../include/mouse_transform_processor.h       |  83 +++
 .../src/mouse_device_state.cpp                |   7 +-
 .../src/mouse_event_normalize.cpp             | 465 ++--------------
 .../src/mouse_transform_processor.cpp         | 513 ++++++++++++++++++
 8 files changed, 668 insertions(+), 451 deletions(-)
 create mode 100644 service/mouse_event_normalize/include/mouse_transform_processor.h
 create mode 100644 service/mouse_event_normalize/src/mouse_transform_processor.cpp

diff --git a/service/BUILD.gn b/service/BUILD.gn
index ddc05b23e7..8ea5a6cfb5 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -137,6 +137,7 @@ ohos_shared_library("libmmi-server") {
       sources += [
         "mouse_event_normalize/src/mouse_device_state.cpp",
         "mouse_event_normalize/src/mouse_event_normalize.cpp",
+        "mouse_event_normalize/src/mouse_transform_processor.cpp",
         "touch_event_normalize/src/gesture_transform_processor.cpp",
         "touch_event_normalize/src/touchpad_transform_processor.cpp",
       ]
diff --git a/service/event_handler/src/event_normalize_handler.cpp b/service/event_handler/src/event_normalize_handler.cpp
index 674093b40c..f3a32b14e0 100644
--- a/service/event_handler/src/event_normalize_handler.cpp
+++ b/service/event_handler/src/event_normalize_handler.cpp
@@ -328,7 +328,7 @@ int32_t EventNormalizeHandler::HandleMouseEvent(libinput_event* event)
     const auto &keyEvent = KeyEventHdr->GetKeyEvent();
     CHKPR(keyEvent, ERROR_NULL_POINTER);
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
-    MouseEventHdr->Normalize(event);
+    MouseEventHdr->OnEvent(event);
     auto pointerEvent = MouseEventHdr->GetPointerEvent();
     CHKPR(pointerEvent, ERROR_NULL_POINTER);
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
diff --git a/service/mouse_event_normalize/include/mouse_device_state.h b/service/mouse_event_normalize/include/mouse_device_state.h
index 7102901506..6b35414a72 100644
--- a/service/mouse_event_normalize/include/mouse_device_state.h
+++ b/service/mouse_event_normalize/include/mouse_device_state.h
@@ -58,10 +58,9 @@ public:
     DISALLOW_COPY_AND_MOVE(MouseDeviceState);
     int32_t GetMouseCoordsX() const;
     int32_t GetMouseCoordsY() const;
-    void SetMouseCoords(const int32_t x, const int32_t y);
+    void SetMouseCoords(int32_t x, int32_t y);
     bool IsLeftBtnPressed();
     void GetPressedButtons(std::vector<int32_t>& pressedButtons);
-    std::map<uint32_t, int32_t> GetMouseBtnState() const;
     void MouseBtnStateCounts(uint32_t btnCode, const BUTTON_STATE btnState);
     int32_t LibinputChangeToPointer(const uint32_t keyValue);
 
diff --git a/service/mouse_event_normalize/include/mouse_event_normalize.h b/service/mouse_event_normalize/include/mouse_event_normalize.h
index f353dbe4da..a869c7344a 100644
--- a/service/mouse_event_normalize/include/mouse_event_normalize.h
+++ b/service/mouse_event_normalize/include/mouse_event_normalize.h
@@ -21,26 +21,19 @@
 #include "libinput.h"
 #include "singleton.h"
 
+#include "define_multimodal.h"
+#include "mouse_transform_processor.h"
 #include "pointer_event.h"
 
 namespace OHOS {
 namespace MMI {
-namespace {
-constexpr int32_t DEFAULT_SPEED = 5;
-} // namespace
-
-struct AccelerateCurve {
-    std::vector<int32_t> speeds;
-    std::vector<double> slopes;
-    std::vector<double> diffNums;
-};
-
 class MouseEventNormalize final : public std::enable_shared_from_this<MouseEventNormalize> {
     DECLARE_DELAYED_SINGLETON(MouseEventNormalize);
 public:
     DISALLOW_COPY_AND_MOVE(MouseEventNormalize);
-    std::shared_ptr<PointerEvent> GetPointerEvent() const;
-    int32_t Normalize(struct libinput_event *event);
+    std::shared_ptr<PointerEvent> GetPointerEvent();
+    int32_t OnEvent(struct libinput_event *event);
+    bool GetSpeedGain(double vin, double &gain) const;
     void Dump(int32_t fd, const std::vector<std::string> &args);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     void SetAbsolutionLocation(double xPercent, double yPercent);
@@ -53,33 +46,19 @@ public:
     void OnDisplayLost(int32_t displayId);
     int32_t GetDisplayId() const;
     int32_t SetPointerLocation(int32_t x, int32_t y);
+
 private:
-    int32_t HandleMotionInner(struct libinput_event_pointer* data);
-    int32_t HandleButtonInner(struct libinput_event_pointer* data);
-    int32_t HandleAxisInner(struct libinput_event_pointer* data);
-    void HandlePostInner(struct libinput_event_pointer* data, int32_t deviceId, PointerEvent::PointerItem &pointerItem);
-#ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
-    void HandleMotionMoveMouse(int32_t offsetX, int32_t offsetY);
-    void HandlePostMoveMouse(PointerEvent::PointerItem &pointerItem);
-#endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
-    int32_t HandleButtonValueInner(struct libinput_event_pointer* data);
-    int32_t HandleMotionAccelerate(struct libinput_event_pointer* data);
-    bool GetSpeedGain(double vin, double &gain) const;
-    void DumpInner();
-    void InitAbsolution();
-    void SetDxDyForDInput(PointerEvent::PointerItem& pointerItem, libinput_event_pointer* data);
+    std::shared_ptr<MouseTransformProcessor> GetProcessor(int32_t deviceId) const;
+    std::shared_ptr<MouseTransformProcessor> GetCurrentProcessor() const;
+    void SetCurrentDeviceId(int32_t deviceId);
+    int32_t GetCurrentDeviceId() const;
 
 private:
-    std::shared_ptr<PointerEvent> pointerEvent_ { nullptr };
-    int32_t timerId_ { -1 };
-    double absolutionX_ { -1.0 };
-    double absolutionY_ { -1.0 };
     int32_t buttonId_ { -1 };
     bool isPressed_ { false };
-    int32_t currentDisplayId_ { -1 };
-    int32_t speed_ { DEFAULT_SPEED };
+    std::map<int32_t, std::shared_ptr<MouseTransformProcessor>> processors_;
+    int32_t currentDeviceId_ { -1 };
 };
-
 #define MouseEventHdr ::OHOS::DelayedSingleton<MouseEventNormalize>::GetInstance()
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/mouse_event_normalize/include/mouse_transform_processor.h b/service/mouse_event_normalize/include/mouse_transform_processor.h
new file mode 100644
index 0000000000..87364e35ad
--- /dev/null
+++ b/service/mouse_event_normalize/include/mouse_transform_processor.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MOUSE_TRANSFORM_PROCESSOR_H
+#define MOUSE_TRANSFORM_PROCESSOR_H
+
+#include <memory>
+
+#include "libinput.h"
+#include "singleton.h"
+#include "define_multimodal.h"
+
+#include "pointer_event.h"
+
+namespace OHOS {
+namespace MMI {
+struct AccelerateCurve {
+    std::vector<int32_t> speeds;
+    std::vector<double> slopes;
+    std::vector<double> diffNums;
+};
+class MouseTransformProcessor final : public std::enable_shared_from_this<MouseTransformProcessor> {
+public:
+    DISALLOW_COPY_AND_MOVE(MouseTransformProcessor);
+    explicit MouseTransformProcessor(int32_t deviceId);
+    ~MouseTransformProcessor() = default;
+    std::shared_ptr<PointerEvent> GetPointerEvent() const;
+    int32_t Normalize(struct libinput_event *event);
+    void Dump(int32_t fd, const std::vector<std::string> &args);
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+    static void SetAbsolutionLocation(double xPercent, double yPercent);
+#endif // OHOS_BUILD_ENABLE_COOPERATE
+#ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
+    bool NormalizeMoveMouse(int32_t offsetX, int32_t offsetY);
+#endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
+private:
+    int32_t HandleMotionInner(struct libinput_event_pointer* data);
+    int32_t HandleButtonInner(struct libinput_event_pointer* data);
+    int32_t HandleAxisInner(struct libinput_event_pointer* data);
+    void HandlePostInner(struct libinput_event_pointer* data, PointerEvent::PointerItem &pointerItem);
+#ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
+    void HandleMotionMoveMouse(int32_t offsetX, int32_t offsetY);
+    void HandlePostMoveMouse(PointerEvent::PointerItem &pointerItem);
+#endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
+    int32_t HandleButtonValueInner(struct libinput_event_pointer* data);
+    int32_t HandleMotionAccelerate(struct libinput_event_pointer* data);
+    void DumpInner();
+    void SetDxDyForDInput(PointerEvent::PointerItem& pointerItem, struct libinput_event_pointer* data);
+public:
+    static void InitAbsolution();
+    static void OnDisplayLost(int32_t displayId);
+    static int32_t GetDisplayId();
+    static int32_t SetPointerSpeed(int32_t speed);
+    static int32_t GetPointerSpeed();
+    static bool GetSpeedGain(double vin, double &gain);
+    static int32_t SetPointerLocation(int32_t x, int32_t y);
+
+private:
+    static double absolutionX_;
+    static double absolutionY_;
+    static int32_t currentDisplayId_;
+    static int32_t speed_;
+    std::shared_ptr<PointerEvent> pointerEvent_ { nullptr };
+    int32_t timerId_ { -1 };
+    int32_t buttonId_ { -1 };
+    bool isPressed_ { false };
+    int32_t deviceId_ { -1 };
+};
+} // namespace MMI
+} // namespace OHOS
+#endif // MOUSE_TRANSFORM_PROCESSOR_H
\ No newline at end of file
diff --git a/service/mouse_event_normalize/src/mouse_device_state.cpp b/service/mouse_event_normalize/src/mouse_device_state.cpp
index 75f1bd6a41..c007aa5443 100644
--- a/service/mouse_event_normalize/src/mouse_device_state.cpp
+++ b/service/mouse_event_normalize/src/mouse_device_state.cpp
@@ -40,7 +40,7 @@ int32_t MouseDeviceState::GetMouseCoordsY() const
     return mouseCoord_.physicalY;
 }
 
-void MouseDeviceState::SetMouseCoords(const int32_t x, const int32_t y)
+void MouseDeviceState::SetMouseCoords(int32_t x, int32_t y)
 {
     mouseCoord_.physicalX = x;
     mouseCoord_.physicalY = y;
@@ -64,11 +64,6 @@ void MouseDeviceState::GetPressedButtons(std::vector<int32_t>& pressedButtons)
     }
 }
 
-std::map<uint32_t, int32_t> MouseDeviceState::GetMouseBtnState() const
-{
-    return mouseBtnState_;
-}
-
 void MouseDeviceState::MouseBtnStateCounts(uint32_t btnCode, const BUTTON_STATE btnState)
 {
     std::map<uint32_t, int32_t>::iterator iter = mouseBtnState_.find(btnCode);
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index 60728ef0dc..b0c1dceeaf 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -34,478 +34,125 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MouseEventNormalize" };
-const std::vector<AccelerateCurve> ACCELERATE_CURVES {
-    { { 8, 32, 128 }, { 0.16, 0.30, 0.56 }, { 0.0, -1.12, -9.44 } },
-    { { 8, 32, 128 }, { 0.32, 0.60, 1.12 }, { 0.0, -2.24, -18.88 } },
-    { { 8, 32, 128 }, { 0.48, 0.90, 1.68 }, { 0.0, -3.36, -28.32 } },
-    { { 8, 32, 128 }, { 0.64, 1.20, 2.24 }, { 0.0, -4.48, -37.76 } },
-    { { 8, 32, 128 }, { 0.80, 1.50, 2.80 }, { 0.0, -5.60, -47.20 } },
-    { { 8, 32, 128 }, { 0.86, 1.95, 3.64 }, { 0.0, -8.72, -62.80 } },
-    { { 8, 32, 128 }, { 0.92, 2.40, 4.48 }, { 0.0, -11.84, -78.40 } },
-    { { 8, 32, 128 }, { 0.98, 2.85, 5.32 }, { 0.0, -14.96, -94.00 } },
-    { { 8, 32, 128 }, { 1.04, 3.30, 6.16 }, { 0.0, -18.08, -109.60 } },
-    { { 8, 32, 128 }, { 1.10, 3.75, 7.00 }, { 0.0, -21.20, -125.20 } },
-    { { 8, 32, 128 }, { 1.16, 4.20, 7.84 }, { 0.0, -24.32, -140.80 } }
-};
-constexpr double DOUBLE_ZERO = 1e-6;
-constexpr int32_t MIN_SPEED = 1;
-constexpr int32_t MAX_SPEED = 11;
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
-constexpr double PERCENT_CONST = 100.0;
-#endif // OHOS_BUILD_ENABLE_COOPERATE
 } // namespace
-MouseEventNormalize::MouseEventNormalize()
-{
-    pointerEvent_ = PointerEvent::Create();
-    CHKPL(pointerEvent_);
-}
-
+MouseEventNormalize::MouseEventNormalize() {}
 MouseEventNormalize::~MouseEventNormalize() {}
 
-std::shared_ptr<PointerEvent> MouseEventNormalize::GetPointerEvent() const
-{
-    return pointerEvent_;
-}
-
 bool MouseEventNormalize::GetSpeedGain(double vin, double &gain) const
 {
-    if (fabs(vin) < DOUBLE_ZERO) {
-        MMI_HILOGE("The value of the parameter passed in is 0");
-        return false;
-    }
-    if (speed_ < 1) {
-        MMI_HILOGE("The speed value can't be less than 1");
-        return false;
-    }
-    const AccelerateCurve& curve = ACCELERATE_CURVES[speed_ - 1];
-    int32_t num = static_cast<int32_t>(ceil(fabs(vin)));
-    for (size_t i = 0; i < curve.speeds.size(); ++i) {
-        if (num <= curve.speeds[i]) {
-            gain = (curve.slopes[i] * vin + curve.diffNums[i]) / vin;
-            return true;
-        }
-    }
-    gain = (curve.slopes.back() * vin + curve.diffNums.back()) / vin;
-    return true;
+    return MouseTransformProcessor::GetSpeedGain(vin, gain);
 }
 
-int32_t MouseEventNormalize::HandleMotionInner(struct libinput_event_pointer* data)
+std::shared_ptr<MouseTransformProcessor> MouseEventNormalize::GetProcessor(int32_t deviceId) const
 {
-    CALL_DEBUG_ENTER;
-    CHKPR(data, ERROR_NULL_POINTER);
-    CHKPR(pointerEvent_, ERROR_NULL_POINTER);
-    pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_MOVE);
-    pointerEvent_->SetButtonId(buttonId_);
-
-    InitAbsolution();
-    if (currentDisplayId_ == -1) {
-        absolutionX_ = -1;
-        absolutionY_ = -1;
-        MMI_HILOGI("The currentDisplayId_ is -1");
-        return RET_ERR;
+    auto iter = processors_.find(deviceId);
+    if (iter == processors_.end()) {
+        MMI_HILOGE("Can't find mouse processor by deviceId:%{public}d", deviceId);
+        return nullptr;
     }
+    return iter->second;
+}   
 
-    int32_t ret = HandleMotionAccelerate(data);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Failed to handle motion correction");
-        return ret;
-    }
-    WinMgr->UpdateAndAdjustMouseLocation(currentDisplayId_, absolutionX_, absolutionY_);
-    pointerEvent_->SetTargetDisplayId(currentDisplayId_);
-    MMI_HILOGD("Change coordinate: x:%{public}lf, y:%{public}lf, currentDisplayId_:%{public}d",
-        absolutionX_, absolutionY_, currentDisplayId_);
-    return RET_OK;
-}
-
-int32_t MouseEventNormalize::HandleMotionAccelerate(struct libinput_event_pointer* data)
+std::shared_ptr<MouseTransformProcessor> MouseEventNormalize::GetCurrentProcessor() const
 {
-    CHKPR(data, ERROR_NULL_POINTER);
-    double dx = libinput_event_pointer_get_dx(data);
-    double dy = libinput_event_pointer_get_dy(data);
-    double vin = (fmax(abs(dx), abs(dy)) + fmin(abs(dx), abs(dy))) / 2.0;
-    double gain { 0.0 };
-    if (!GetSpeedGain(vin, gain)) {
-        MMI_HILOGE("Get speed gain failed");
-        return RET_ERR;
-    }
-    double correctionX = dx * gain;
-    double correctionY = dy * gain;
-    MMI_HILOGD("Get and process the movement coordinates, dx:%{public}lf, dy:%{public}lf,"
-               "correctionX:%{public}lf, correctionY:%{public}lf, gain:%{public}lf",
-               dx, dy, correctionX, correctionY, gain);
-    if (!WinMgr->GetMouseIsCaptureMode()) {
-        absolutionX_ += correctionX;
-        absolutionY_ += correctionY;
+    int32_t deviceId = GetCurrentDeviceId();
+    auto iter = processors_.find(deviceId);
+    if (iter == processors_.end()) {
+        MMI_HILOGE("Can't find mouse processor by deviceId:%{public}d", deviceId);
+        return nullptr;
     }
-    return RET_OK;
+    return iter->second;
 }
 
-void MouseEventNormalize::InitAbsolution()
+void MouseEventNormalize::SetCurrentDeviceId(int32_t deviceId)
 {
-    if (absolutionX_ != -1 || absolutionY_ != -1 || currentDisplayId_ != -1) {
-        return;
-    }
-    MMI_HILOGD("Init absolution");
-    auto displayGroupInfo = WinMgr->GetDisplayGroupInfo();
-    if (displayGroupInfo.displaysInfo.empty()) {
-        MMI_HILOGI("The displayInfo is empty");
-        return;
-    }
-    currentDisplayId_ = displayGroupInfo.displaysInfo[0].id;
-    absolutionX_ = displayGroupInfo.displaysInfo[0].width * 1.0 / 2;
-    absolutionY_ = displayGroupInfo.displaysInfo[0].height * 1.0 / 2;
+    currentDeviceId_ = deviceId;
 }
 
-int32_t MouseEventNormalize::HandleButtonInner(struct libinput_event_pointer* data)
+int32_t MouseEventNormalize::GetCurrentDeviceId() const
 {
-    CALL_DEBUG_ENTER;
-    CHKPR(data, ERROR_NULL_POINTER);
-    MMI_HILOGD("Current action:%{public}d", pointerEvent_->GetPointerAction());
-
-    auto ret = HandleButtonValueInner(data);
-    if (ret != RET_OK) {
-        MMI_HILOGE("The button value does not exist");
-        return RET_ERR;
-    }
-    uint32_t button = libinput_event_pointer_get_button(data);
-    auto state = libinput_event_pointer_get_button_state(data);
-    if (state == LIBINPUT_BUTTON_STATE_RELEASED) {
-        MouseState->MouseBtnStateCounts(button, BUTTON_STATE_RELEASED);
-        pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_BUTTON_UP);
-        int32_t buttonId = MouseState->LibinputChangeToPointer(button);
-        pointerEvent_->DeleteReleaseButton(buttonId);
-        isPressed_ = false;
-        buttonId_ = PointerEvent::BUTTON_NONE;
-    } else if (state == LIBINPUT_BUTTON_STATE_PRESSED) {
-        MouseState->MouseBtnStateCounts(button, BUTTON_STATE_PRESSED);
-        pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_BUTTON_DOWN);
-        int32_t buttonId = MouseState->LibinputChangeToPointer(button);
-        pointerEvent_->SetButtonPressed(buttonId);
-        isPressed_ = true;
-        buttonId_ = pointerEvent_->GetButtonId();
-    } else {
-        MMI_HILOGE("Unknown state, state:%{public}u", state);
-        return RET_ERR;
-    }
-    return RET_OK;
+    return currentDeviceId_;
 }
 
-int32_t MouseEventNormalize::HandleButtonValueInner(struct libinput_event_pointer* data)
+std::shared_ptr<PointerEvent>MouseEventNormalize::GetPointerEvent()
 {
-    CALL_DEBUG_ENTER;
-    CHKPR(data, ERROR_NULL_POINTER);
-
-    uint32_t button = libinput_event_pointer_get_button(data);
-    int32_t buttonId = MouseState->LibinputChangeToPointer(button);
-    if (buttonId == PointerEvent::BUTTON_NONE) {
-        MMI_HILOGE("Unknown btn, btn:%{public}u", button);
-        return RET_ERR;
-    }
-    pointerEvent_->SetButtonId(buttonId);
-    return RET_OK;
+    auto processor = GetCurrentProcessor();
+    CHKPP(processor);
+    return processor->GetPointerEvent();
 }
 
-int32_t MouseEventNormalize::HandleAxisInner(struct libinput_event_pointer* data)
+int32_t MouseEventNormalize::OnEvent(struct libinput_event *event)
 {
-    CALL_DEBUG_ENTER;
-    CHKPR(data, ERROR_NULL_POINTER);
-    if (buttonId_ == PointerEvent::BUTTON_NONE && pointerEvent_->GetButtonId() != PointerEvent::BUTTON_NONE) {
-        pointerEvent_->SetButtonId(PointerEvent::BUTTON_NONE);
+    CHKPR(event, RET_ERR);
+    auto device = libinput_event_get_device(event);
+    CHKPR(device, RET_ERR);
+    int32_t deviceId = InputDevMgr->FindInputDeviceId(device);
+    if (deviceId < 0) {
+        MMI_HILOGE("The deviceId:%{public}d is invalid", deviceId);
+        return RET_ERR;
     }
-    if (TimerMgr->IsExist(timerId_)) {
-        pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_AXIS_UPDATE);
-        TimerMgr->ResetTimer(timerId_);
-        MMI_HILOGD("Axis update");
+    SetCurrentDeviceId(deviceId);
+    std::shared_ptr<MouseTransformProcessor>processor { nullptr };
+    if (auto it = processors_.find(deviceId); it != processors_.end()) {
+        processor = it->second;
     } else {
-        static constexpr int32_t timeout = 100;
-        std::weak_ptr<MouseEventNormalize> weakPtr = shared_from_this();
-        timerId_ = TimerMgr->AddTimer(timeout, 1, [weakPtr]() {
-            CALL_DEBUG_ENTER;
-            auto sharedPtr = weakPtr.lock();
-            CHKPV(sharedPtr);
-            MMI_HILOGD("timer:%{public}d", sharedPtr->timerId_);
-            sharedPtr->timerId_ = -1;
-            auto pointerEvent = sharedPtr->GetPointerEvent();
-            CHKPV(pointerEvent);
-            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_AXIS_END);
-            pointerEvent->UpdateId();
-            auto inputEventNormalizeHandler = InputHandler->GetEventNormalizeHandler();
-            CHKPV(inputEventNormalizeHandler);
-            inputEventNormalizeHandler->HandlePointerEvent(pointerEvent);
-        });
-
-        pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_AXIS_BEGIN);
-        MMI_HILOGD("Axis begin");
-    }
-
-    if (libinput_event_pointer_has_axis(data, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)) {
-        double axisValue = libinput_event_pointer_get_axis_value(data, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
-        pointerEvent_->SetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_VERTICAL, axisValue);
-    }
-    if (libinput_event_pointer_has_axis(data, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)) {
-        double axisValue = libinput_event_pointer_get_axis_value(data, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
-        pointerEvent_->SetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_HORIZONTAL, axisValue);
-    }
-    return RET_OK;
-}
-
-void MouseEventNormalize::HandlePostInner(struct libinput_event_pointer* data, int32_t deviceId,
-    PointerEvent::PointerItem &pointerItem)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(data);
-    auto mouseInfo = WinMgr->GetMouseInfo();
-    MouseState->SetMouseCoords(mouseInfo.physicalX, mouseInfo.physicalY);
-    if (WinMgr->GetMouseIsCaptureMode()) {
-        pointerItem.SetRawDx(static_cast<int32_t>(libinput_event_pointer_get_dx(data)));
-        pointerItem.SetRawDy(static_cast<int32_t>(libinput_event_pointer_get_dy(data)));
-    }
-    pointerItem.SetDisplayX(mouseInfo.physicalX);
-    pointerItem.SetDisplayY(mouseInfo.physicalY);
-    pointerItem.SetWindowX(0);
-    pointerItem.SetWindowY(0);
-    pointerItem.SetPointerId(0);
-    pointerItem.SetPressed(isPressed_);
-
-    int64_t time = GetSysClockTime();
-    pointerItem.SetDownTime(time);
-    pointerItem.SetWidth(0);
-    pointerItem.SetHeight(0);
-    pointerItem.SetPressure(0);
-    pointerItem.SetToolType(PointerEvent::TOOL_TYPE_FINGER);
-    pointerItem.SetDeviceId(deviceId);
-    SetDxDyForDInput(pointerItem, data);
-    pointerEvent_->UpdateId();
-    pointerEvent_->UpdatePointerItem(pointerEvent_->GetPointerId(), pointerItem);
-    pointerEvent_->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
-    pointerEvent_->SetActionTime(time);
-    pointerEvent_->SetActionStartTime(time);
-    pointerEvent_->SetDeviceId(deviceId);
-    pointerEvent_->SetPointerId(0);
-    pointerEvent_->SetTargetDisplayId(currentDisplayId_);
-    pointerEvent_->SetTargetWindowId(-1);
-    pointerEvent_->SetAgentWindowId(-1);
-}
-
-int32_t MouseEventNormalize::Normalize(struct libinput_event *event)
-{
-    CALL_DEBUG_ENTER;
-    CHKPR(event, ERROR_NULL_POINTER);
-    auto data = libinput_event_get_pointer_event(event);
-    CHKPR(data, ERROR_NULL_POINTER);
-    CHKPR(pointerEvent_, ERROR_NULL_POINTER);
-    pointerEvent_->ClearAxisValue();
-    int32_t result;
-    const int32_t type = libinput_event_get_type(event);
-    switch (type) {
-        case LIBINPUT_EVENT_POINTER_MOTION:
-        case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: {
-            result = HandleMotionInner(data);
-            break;
-        }
-        case LIBINPUT_EVENT_POINTER_BUTTON: {
-            result = HandleButtonInner(data);
-            break;
-        }
-        case LIBINPUT_EVENT_POINTER_AXIS: {
-            result = HandleAxisInner(data);
-            break;
-        }
-        default: {
-            MMI_HILOGE("Unknown type:%{public}d", type);
-            return RET_ERR;
+        processor = std::make_shared<MouseTransformProcessor>(deviceId);
+        CHKPR(processor, RET_ERR);
+        auto [tIter, isOk] = processors_.emplace(deviceId, processor);
+        if (!isOk) {
+            MMI_HILOGE("Duplicate device record:%{public}d", deviceId);
         }
     }
-    int32_t deviceId = InputDevMgr->FindInputDeviceId(libinput_event_get_device(event));
-    PointerEvent::PointerItem pointerItem;
-    HandlePostInner(data, deviceId, pointerItem);
-    WinMgr->UpdateTargetPointer(pointerEvent_);
-    DumpInner();
-    return result;
-}
-#ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
-void MouseEventNormalize::HandleMotionMoveMouse(int32_t offsetX, int32_t offsetY)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(pointerEvent_);
-    pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_MOVE);
-    InitAbsolution();
-    absolutionX_ += offsetX;
-    absolutionY_ += offsetY;
-    WinMgr->UpdateAndAdjustMouseLocation(currentDisplayId_, absolutionX_, absolutionY_);
+    return processor->Normalize(event);
 }
 
+#ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
 void MouseEventNormalize::OnDisplayLost(int32_t displayId)
 {
-    if (currentDisplayId_ != displayId) {
-        currentDisplayId_ = -1;
-        absolutionX_ = -1;
-        absolutionY_ = -1;
-        InitAbsolution();
-        WinMgr->UpdateAndAdjustMouseLocation(currentDisplayId_, absolutionX_, absolutionY_);
-    }
+    MouseTransformProcessor::OnDisplayLost(displayId);
 }
 
 int32_t MouseEventNormalize::GetDisplayId() const
 {
-    return currentDisplayId_;
-}
-
-void MouseEventNormalize::HandlePostMoveMouse(PointerEvent::PointerItem& pointerItem)
-{
-    CALL_DEBUG_ENTER;
-    auto mouseInfo = WinMgr->GetMouseInfo();
-    CHKPV(pointerEvent_);
-    MouseState->SetMouseCoords(mouseInfo.physicalX, mouseInfo.physicalY);
-    pointerItem.SetDisplayX(mouseInfo.physicalX);
-    pointerItem.SetDisplayY(mouseInfo.physicalY);
-    pointerItem.SetWindowX(0);
-    pointerItem.SetWindowY(0);
-    pointerItem.SetPointerId(0);
-    pointerItem.SetPressed(isPressed_);
-
-    int64_t time = GetSysClockTime();
-    pointerItem.SetDownTime(time);
-    pointerItem.SetWidth(0);
-    pointerItem.SetHeight(0);
-    pointerItem.SetPressure(0);
-
-    pointerEvent_->UpdateId();
-    pointerEvent_->UpdatePointerItem(pointerEvent_->GetPointerId(), pointerItem);
-    pointerEvent_->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
-    pointerEvent_->SetActionTime(time);
-    pointerEvent_->SetActionStartTime(time);
-
-    pointerEvent_->SetPointerId(0);
-    pointerEvent_->SetTargetDisplayId(-1);
-    pointerEvent_->SetTargetWindowId(-1);
-    pointerEvent_->SetAgentWindowId(-1);
+    return MouseTransformProcessor::GetDisplayId();
 }
 
 bool MouseEventNormalize::NormalizeMoveMouse(int32_t offsetX, int32_t offsetY)
 {
     CALL_DEBUG_ENTER;
-    CHKPF(pointerEvent_);
-    bool bHasPointerDevice = InputDevMgr->HasPointerDevice();
-    if (!bHasPointerDevice) {
-        MMI_HILOGE("There hasn't any pointer device");
-        return false;
-    }
-
-    PointerEvent::PointerItem pointerItem;
-    HandleMotionMoveMouse(offsetX, offsetY);
-    HandlePostMoveMouse(pointerItem);
-    DumpInner();
-    return bHasPointerDevice;
+    auto processor = GetCurrentProcessor();
+    CHKPF(processor);
+    return processor->NormalizeMoveMouse(offsetX, offsetY);
 }
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
 
-void MouseEventNormalize::DumpInner()
-{
-    EventLogHelper::PrintEventData(pointerEvent_);
-}
-
 void MouseEventNormalize::Dump(int32_t fd, const std::vector<std::string> &args)
 {
-    CALL_DEBUG_ENTER;
-    PointerEvent::PointerItem item;
-    CHKPV(pointerEvent_);
-    pointerEvent_->GetPointerItem(pointerEvent_->GetPointerId(), item);
-    mprintf(fd, "Mouse device state information:\t");
-    mprintf(fd,
-            "PointerId:%d | SourceType:%s | PointerAction:%s | WindowX:%d | WindowY:%d | ButtonId:%d "
-            "| AgentWindowId:%d | TargetWindowId:%d | DownTime:%" PRId64 " | IsPressed:%s \t",
-            pointerEvent_->GetPointerId(), pointerEvent_->DumpSourceType(), pointerEvent_->DumpPointerAction(),
-            item.GetWindowX(), item.GetWindowY(), pointerEvent_->GetButtonId(), pointerEvent_->GetAgentWindowId(),
-            pointerEvent_->GetTargetWindowId(), item.GetDownTime(), item.IsPressed() ? "true" : "false");
+    auto processor = GetCurrentProcessor();
+    CHKPV(processor);
+    processor->Dump(fd, args);
 }
 
 int32_t MouseEventNormalize::SetPointerSpeed(int32_t speed)
 {
-    CALL_DEBUG_ENTER;
-    if (speed < MIN_SPEED) {
-        speed_ = MIN_SPEED;
-    } else if (speed > MAX_SPEED) {
-        speed_ = MAX_SPEED;
-    } else {
-        speed_ = speed;
-    }
-    MMI_HILOGD("Set pointer speed:%{public}d", speed_);
-    return RET_OK;
+    return MouseTransformProcessor::SetPointerSpeed(speed);
 }
 
 int32_t MouseEventNormalize::GetPointerSpeed() const
 {
-    CALL_DEBUG_ENTER;
-    MMI_HILOGD("Get pointer speed:%{public}d", speed_);
-    return speed_;
+    return MouseTransformProcessor::GetPointerSpeed();
 }
 
-void MouseEventNormalize::SetDxDyForDInput(PointerEvent::PointerItem& pointerItem, libinput_event_pointer* data)
+int32_t MouseEventNormalize::SetPointerLocation(int32_t x, int32_t y)
 {
-    double dx = libinput_event_pointer_get_dx(data);
-    double dy = libinput_event_pointer_get_dy(data);
-    int32_t rawDx = static_cast<int32_t>(dx);
-    int32_t rawDy = static_cast<int32_t>(dy);
-    pointerItem.SetRawDx(rawDx);
-    pointerItem.SetRawDy(rawDy);
-    MMI_HILOGD("MouseEventNormalize SetDxDyForDInput, dx:%{public}d, dy:%{public}d", rawDx, rawDy);
+    return MouseTransformProcessor::SetPointerLocation(x, y);
 }
 
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
 void MouseEventNormalize::SetAbsolutionLocation(double xPercent, double yPercent)
 {
-    MMI_HILOGI("Cross screen location, xPercent:%{public}lf, yPercent:%{public}lf",
-        xPercent, yPercent);
-    auto displayGroupInfo = WinMgr->GetDisplayGroupInfo();
-    if (currentDisplayId_ == -1) {
-        if (displayGroupInfo.displaysInfo.empty()) {
-            MMI_HILOGI("The displayInfo is empty");
-            return;
-        }
-        currentDisplayId_ = displayGroupInfo.displaysInfo[0].id;
-    }
-    struct DisplayInfo display;
-    for (auto &it : displayGroupInfo.displaysInfo) {
-        if (it.id == currentDisplayId_) {
-            display = it;
-            break;
-        }
-    }
-    absolutionX_ = display.width * xPercent / PERCENT_CONST;
-    absolutionY_ = display.height * yPercent / PERCENT_CONST;
-    WinMgr->UpdateAndAdjustMouseLocation(currentDisplayId_, absolutionX_, absolutionY_);
-    int32_t physicalX = WinMgr->GetMouseInfo().physicalX;
-    int32_t physicalY = WinMgr->GetMouseInfo().physicalY;
-    IPointerDrawingManager::GetInstance()->SetPointerLocation(getpid(), physicalX, physicalY);
+    MouseTransformProcessor::SetAbsolutionLocation(xPercent, yPercent);
 }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-
-int32_t MouseEventNormalize::SetPointerLocation(int32_t x, int32_t y)
-{
-    MMI_HILOGI("Location, x:%{public}d, y:%{public}d",x, y);
-    auto displayGroupInfo = WinMgr->GetDisplayGroupInfo();
-    if (currentDisplayId_ == -1) {
-        if (displayGroupInfo.displaysInfo.empty()) {
-            MMI_HILOGI("The displayInfo is empty");
-            return RET_ERR;
-        }
-        currentDisplayId_ = displayGroupInfo.displaysInfo[0].id;
-    }
-    struct DisplayInfo display;
-    for (auto &it : displayGroupInfo.displaysInfo) {
-        if (it.id == currentDisplayId_) {
-            display = it;
-            break;
-        }
-    }
-    absolutionX_ = static_cast<double>(x);
-    absolutionY_ = static_cast<double>(y);
-    WinMgr->UpdateAndAdjustMouseLocation(currentDisplayId_, absolutionX_, absolutionY_);
-    int32_t physicalX = WinMgr->GetMouseInfo().physicalX;
-    int32_t physicalY = WinMgr->GetMouseInfo().physicalY;
-    IPointerDrawingManager::GetInstance()->SetPointerLocation(getpid(), physicalX, physicalY);
-    return RET_OK;
-}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/mouse_event_normalize/src/mouse_transform_processor.cpp b/service/mouse_event_normalize/src/mouse_transform_processor.cpp
new file mode 100644
index 0000000000..9dcc9a6cc2
--- /dev/null
+++ b/service/mouse_event_normalize/src/mouse_transform_processor.cpp
@@ -0,0 +1,513 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mouse_transform_processor.h"
+
+#include <cinttypes>
+
+#include "input-event-codes.h"
+
+#include "define_multimodal.h"
+#include "event_log_helper.h"
+#include "i_pointer_drawing_manager.h"
+#include "input_device_manager.h"
+#include "input_event_handler.h"
+#include "input_windows_manager.h"
+#include "mouse_device_state.h"
+#include "timer_manager.h"
+#include "util_ex.h"
+#include "util.h"
+
+namespace OHOS {
+namespace MMI {
+namespace {
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "MouseTransformProcessor" };
+constexpr double DOUBLE_ZERO = 1e-6;
+constexpr int32_t MIN_SPEED = 1;
+constexpr int32_t MAX_SPEED = 11;
+constexpr int32_t DEFAULT_SPEED = 5;
+const std::vector<AccelerateCurve> ACCELERATE_CURVES {
+    { { 8, 32, 128 }, { 0.16, 0.30, 0.56 }, { 0.0, -1.12, -9.44 } },
+    { { 8, 32, 128 }, { 0.32, 0.60, 1.12 }, { 0.0, -2.24, -18.88 } },
+    { { 8, 32, 128 }, { 0.48, 0.90, 1.68 }, { 0.0, -3.36, -28.32 } },
+    { { 8, 32, 128 }, { 0.64, 1.20, 2.24 }, { 0.0, -4.48, -37.76 } },
+    { { 8, 32, 128 }, { 0.80, 1.50, 2.80 }, { 0.0, -5.60, -47.20 } },
+    { { 8, 32, 128 }, { 0.86, 1.95, 3.64 }, { 0.0, -8.72, -62.80 } },
+    { { 8, 32, 128 }, { 0.92, 2.40, 4.48 }, { 0.0, -11.84, -78.40 } },
+    { { 8, 32, 128 }, { 0.98, 2.85, 5.32 }, { 0.0, -14.96, -94.00 } },
+    { { 8, 32, 128 }, { 1.04, 3.30, 6.16 }, { 0.0, -18.08, -109.60 } },
+    { { 8, 32, 128 }, { 1.10, 3.75, 7.00 }, { 0.0, -21.20, -125.20 } },
+    { { 8, 32, 128 }, { 1.16, 4.20, 7.84 }, { 0.0, -24.32, -140.80 } }
+};
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+constexpr double PERCENT_CONST = 100.0;
+#endif // OHOS_BUILD_ENABLE_COOPERATE
+} // namespace
+
+double MouseTransformProcessor::absolutionX_ = -1.0;
+double MouseTransformProcessor::absolutionY_ = -1.0;
+int32_t MouseTransformProcessor::currentDisplayId_ = -1;
+int32_t MouseTransformProcessor::speed_ = DEFAULT_SPEED;
+
+MouseTransformProcessor::MouseTransformProcessor(int32_t deviceId)
+    : pointerEvent_(PointerEvent::Create()), deviceId_(deviceId)
+{}
+
+std::shared_ptr<PointerEvent> MouseTransformProcessor::GetPointerEvent() const
+{
+    return pointerEvent_;
+}
+
+int32_t MouseTransformProcessor::HandleMotionInner(struct libinput_event_pointer* data)
+{
+    CALL_DEBUG_ENTER;
+    CHKPR(data, ERROR_NULL_POINTER);
+    CHKPR(pointerEvent_, ERROR_NULL_POINTER);
+    pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_MOVE);
+    pointerEvent_->SetButtonId(buttonId_);
+
+    InitAbsolution();
+    if (currentDisplayId_ == -1) {
+        absolutionX_ = -1;
+        absolutionY_ = -1;
+        MMI_HILOGI("The currentDisplayId_ is -1");
+        return RET_ERR;
+    }
+
+    int32_t ret = HandleMotionAccelerate(data);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Failed to handle motion correction");
+        return ret;
+    }
+    WinMgr->UpdateAndAdjustMouseLocation(currentDisplayId_, absolutionX_, absolutionY_);
+    pointerEvent_->SetTargetDisplayId(currentDisplayId_);
+    MMI_HILOGD("Change coordinate: x:%{public}lf, y:%{public}lf, currentDisplayId_:%{public}d",
+        absolutionX_, absolutionY_, currentDisplayId_);
+    return RET_OK;
+}
+
+int32_t MouseTransformProcessor::HandleMotionAccelerate(struct libinput_event_pointer* data)
+{
+    CHKPR(data, ERROR_NULL_POINTER);
+    double dx = libinput_event_pointer_get_dx(data);
+    double dy = libinput_event_pointer_get_dy(data);
+    double vin = (fmax(abs(dx), abs(dy)) + fmin(abs(dx), abs(dy))) / 2.0;
+    double gain { 0.0 };
+    if (!GetSpeedGain(vin, gain)) {
+        MMI_HILOGE("Get speed gain failed");
+        return RET_ERR;
+    }
+    double correctionX = dx * gain;
+    double correctionY = dy * gain;
+    MMI_HILOGD("Get and process the movement coordinates, dx:%{public}lf, dy:%{public}lf,"
+               "correctionX:%{public}lf, correctionY:%{public}lf, gain:%{public}lf",
+               dx, dy, correctionX, correctionY, gain);
+    absolutionX_ += correctionX;
+    absolutionY_ += correctionY;
+    return RET_OK;
+}
+
+void MouseTransformProcessor::InitAbsolution()
+{
+    CALL_DEBUG_ENTER;
+    if (absolutionX_ != -1 || absolutionY_ != -1 || currentDisplayId_ != -1) {
+        MMI_HILOGW("Unable to initialize coordinate information");
+        return;
+    }
+    auto displayGroupInfo = WinMgr->GetDisplayGroupInfo();
+    if (displayGroupInfo.displaysInfo.empty()) {
+        MMI_HILOGI("The displayInfo is empty");
+        return;
+    }
+    currentDisplayId_ = displayGroupInfo.displaysInfo[0].id;
+    absolutionX_ = displayGroupInfo.displaysInfo[0].width * 1.0 / 2;
+    absolutionY_ = displayGroupInfo.displaysInfo[0].height * 1.0 / 2;
+}
+
+int32_t MouseTransformProcessor::HandleButtonInner(struct libinput_event_pointer* data)
+{
+    CALL_DEBUG_ENTER;
+    CHKPR(data, ERROR_NULL_POINTER);
+    CHKPR(pointerEvent_, ERROR_NULL_POINTER);
+    MMI_HILOGD("Current action:%{public}d", pointerEvent_->GetPointerAction());
+
+    auto ret = HandleButtonValueInner(data);
+    if (ret != RET_OK) {
+        MMI_HILOGE("The button value does not exist");
+        return RET_ERR;
+    }
+    uint32_t button = libinput_event_pointer_get_button(data);
+    auto state = libinput_event_pointer_get_button_state(data);
+    if (state == LIBINPUT_BUTTON_STATE_RELEASED) {
+        MouseState->MouseBtnStateCounts(button, BUTTON_STATE_RELEASED);
+        pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_BUTTON_UP);
+        int32_t buttonId = MouseState->LibinputChangeToPointer(button);
+        pointerEvent_->DeleteReleaseButton(buttonId);
+        isPressed_ = false;
+        buttonId_ = PointerEvent::BUTTON_NONE;
+    } else if (state == LIBINPUT_BUTTON_STATE_PRESSED) {
+        MouseState->MouseBtnStateCounts(button, BUTTON_STATE_PRESSED);
+        pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_BUTTON_DOWN);
+        int32_t buttonId = MouseState->LibinputChangeToPointer(button);
+        pointerEvent_->SetButtonPressed(buttonId);
+        isPressed_ = true;
+        buttonId_ = pointerEvent_->GetButtonId();
+    } else {
+        MMI_HILOGE("Unknown state, state:%{public}u", state);
+        return RET_ERR;
+    }
+    return RET_OK;
+}
+
+int32_t MouseTransformProcessor::HandleButtonValueInner(struct libinput_event_pointer* data)
+{
+    CALL_DEBUG_ENTER;
+    CHKPR(data, ERROR_NULL_POINTER);
+    CHKPR(pointerEvent_, ERROR_NULL_POINTER);
+    uint32_t button = libinput_event_pointer_get_button(data);
+    int32_t buttonId = MouseState->LibinputChangeToPointer(button);
+    if (buttonId == PointerEvent::BUTTON_NONE) {
+        MMI_HILOGE("Unknown btn, btn:%{public}u", button);
+        return RET_ERR;
+    }
+    pointerEvent_->SetButtonId(buttonId);
+    return RET_OK;
+}
+
+int32_t MouseTransformProcessor::HandleAxisInner(struct libinput_event_pointer* data)
+{
+    CALL_DEBUG_ENTER;
+    CHKPR(data, ERROR_NULL_POINTER);
+    CHKPR(pointerEvent_, ERROR_NULL_POINTER);
+    if (buttonId_ == PointerEvent::BUTTON_NONE && pointerEvent_->GetButtonId() != PointerEvent::BUTTON_NONE) {
+        pointerEvent_->SetButtonId(PointerEvent::BUTTON_NONE);
+    }
+    if (TimerMgr->IsExist(timerId_)) {
+        pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_AXIS_UPDATE);
+        TimerMgr->ResetTimer(timerId_);
+        MMI_HILOGD("Axis update");
+    } else {
+        static constexpr int32_t timeout = 100;
+        std::weak_ptr<MouseTransformProcessor> weakPtr = shared_from_this();
+        timerId_ = TimerMgr->AddTimer(timeout, 1, [weakPtr]() {
+            CALL_DEBUG_ENTER;
+            auto sharedPtr = weakPtr.lock();
+            CHKPV(sharedPtr);
+            MMI_HILOGD("timer:%{public}d", sharedPtr->timerId_);
+            sharedPtr->timerId_ = -1;
+            auto pointerEvent = sharedPtr->GetPointerEvent();
+            CHKPV(pointerEvent);
+            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_AXIS_END);
+            pointerEvent->UpdateId();
+            auto inputEventNormalizeHandler = InputHandler->GetEventNormalizeHandler();
+            CHKPV(inputEventNormalizeHandler);
+            inputEventNormalizeHandler->HandlePointerEvent(pointerEvent);
+        });
+
+        pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_AXIS_BEGIN);
+        MMI_HILOGD("Axis begin");
+    }
+
+    if (libinput_event_pointer_has_axis(data, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)) {
+        double axisValue = libinput_event_pointer_get_axis_value(data, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+        pointerEvent_->SetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_VERTICAL, axisValue);
+    }
+    if (libinput_event_pointer_has_axis(data, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)) {
+        double axisValue = libinput_event_pointer_get_axis_value(data, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
+        pointerEvent_->SetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_HORIZONTAL, axisValue);
+    }
+    return RET_OK;
+}
+
+void MouseTransformProcessor::HandlePostInner(struct libinput_event_pointer* data, 
+    PointerEvent::PointerItem &pointerItem)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(data);
+    CHKPV(pointerEvent_);
+    auto mouseInfo = WinMgr->GetMouseInfo();
+    MouseState->SetMouseCoords(mouseInfo.physicalX, mouseInfo.physicalY);
+    pointerItem.SetDisplayX(mouseInfo.physicalX);
+    pointerItem.SetDisplayY(mouseInfo.physicalY);
+    pointerItem.SetWindowX(0);
+    pointerItem.SetWindowY(0);
+    pointerItem.SetPointerId(0);
+    pointerItem.SetPressed(isPressed_);
+
+    int64_t time = GetSysClockTime();
+    pointerItem.SetDownTime(time);
+    pointerItem.SetWidth(0);
+    pointerItem.SetHeight(0);
+    pointerItem.SetPressure(0);
+    pointerItem.SetToolType(PointerEvent::TOOL_TYPE_FINGER);
+    pointerItem.SetDeviceId(deviceId_);
+    SetDxDyForDInput(pointerItem, data);
+    pointerEvent_->UpdateId();
+    pointerEvent_->UpdatePointerItem(pointerEvent_->GetPointerId(), pointerItem);
+    pointerEvent_->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
+    pointerEvent_->SetActionTime(time);
+    pointerEvent_->SetActionStartTime(time);
+    pointerEvent_->SetDeviceId(deviceId_);
+    pointerEvent_->SetPointerId(0);
+    pointerEvent_->SetTargetDisplayId(currentDisplayId_);
+    pointerEvent_->SetTargetWindowId(-1);
+    pointerEvent_->SetAgentWindowId(-1);
+}
+
+int32_t MouseTransformProcessor::Normalize(struct libinput_event *event)
+{
+    CALL_DEBUG_ENTER;
+    CHKPR(event, ERROR_NULL_POINTER);
+    CHKPR(pointerEvent_, ERROR_NULL_POINTER);
+    auto data = libinput_event_get_pointer_event(event);
+    CHKPR(data, ERROR_NULL_POINTER);
+    pointerEvent_->ClearAxisValue();
+    int32_t result;
+    const int32_t type = libinput_event_get_type(event);
+    switch (type) {
+        case LIBINPUT_EVENT_POINTER_MOTION:
+        case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: {
+            result = HandleMotionInner(data);
+            break;
+        }
+        case LIBINPUT_EVENT_POINTER_BUTTON: {
+            result = HandleButtonInner(data);
+            break;
+        }
+        case LIBINPUT_EVENT_POINTER_AXIS: {
+            result = HandleAxisInner(data);
+            break;
+        }
+        default: {
+            MMI_HILOGE("Unknown type:%{public}d", type);
+            return RET_ERR;
+        }
+    }
+    PointerEvent::PointerItem pointerItem;
+    HandlePostInner(data, pointerItem);
+    WinMgr->UpdateTargetPointer(pointerEvent_);
+    DumpInner();
+    return result;
+}
+
+#ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
+void MouseTransformProcessor::HandleMotionMoveMouse(int32_t offsetX, int32_t offsetY)
+{
+    CALL_DEBUG_ENTER;
+    CHKPV(pointerEvent_);
+    pointerEvent_->SetPointerAction(PointerEvent::POINTER_ACTION_MOVE);
+    InitAbsolution();
+    absolutionX_ += offsetX;
+    absolutionY_ += offsetY;
+    WinMgr->UpdateAndAdjustMouseLocation(currentDisplayId_, absolutionX_, absolutionY_);
+}
+
+void MouseTransformProcessor::OnDisplayLost(int32_t displayId)
+{
+    if (currentDisplayId_ != displayId) {
+        currentDisplayId_ = -1;
+        absolutionX_ = -1;
+        absolutionY_ = -1;
+        InitAbsolution();
+        WinMgr->UpdateAndAdjustMouseLocation(currentDisplayId_, absolutionX_, absolutionY_);
+    }
+}
+
+int32_t MouseTransformProcessor::GetDisplayId()
+{
+    return currentDisplayId_;
+}
+
+void MouseTransformProcessor::HandlePostMoveMouse(PointerEvent::PointerItem& pointerItem)
+{
+    CALL_DEBUG_ENTER;
+    auto mouseInfo = WinMgr->GetMouseInfo();
+    CHKPV(pointerEvent_);
+    MouseState->SetMouseCoords(mouseInfo.physicalX, mouseInfo.physicalY);
+    pointerItem.SetDisplayX(mouseInfo.physicalX);
+    pointerItem.SetDisplayY(mouseInfo.physicalY);
+    pointerItem.SetWindowX(0);
+    pointerItem.SetWindowY(0);
+    pointerItem.SetPointerId(0);
+    pointerItem.SetPressed(isPressed_);
+
+    int64_t time = GetSysClockTime();
+    pointerItem.SetDownTime(time);
+    pointerItem.SetWidth(0);
+    pointerItem.SetHeight(0);
+    pointerItem.SetPressure(0);
+
+    pointerEvent_->UpdateId();
+    pointerEvent_->UpdatePointerItem(pointerEvent_->GetPointerId(), pointerItem);
+    pointerEvent_->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
+    pointerEvent_->SetActionTime(time);
+    pointerEvent_->SetActionStartTime(time);
+
+    pointerEvent_->SetPointerId(0);
+    pointerEvent_->SetTargetDisplayId(-1);
+    pointerEvent_->SetTargetWindowId(-1);
+    pointerEvent_->SetAgentWindowId(-1);
+}
+
+bool MouseTransformProcessor::NormalizeMoveMouse(int32_t offsetX, int32_t offsetY)
+{
+    CALL_DEBUG_ENTER;
+    CHKPF(pointerEvent_);
+    bool bHasPointerDevice = InputDevMgr->HasPointerDevice();
+    if (!bHasPointerDevice) {
+        MMI_HILOGE("There hasn't any pointer device");
+        return false;
+    }
+
+    PointerEvent::PointerItem pointerItem;
+    HandleMotionMoveMouse(offsetX, offsetY);
+    HandlePostMoveMouse(pointerItem);
+    DumpInner();
+    return bHasPointerDevice;
+}
+#endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
+
+void MouseTransformProcessor::DumpInner()
+{
+    EventLogHelper::PrintEventData(pointerEvent_);
+}
+
+void MouseTransformProcessor::Dump(int32_t fd, const std::vector<std::string> &args)
+{
+    CALL_DEBUG_ENTER;
+    PointerEvent::PointerItem item;
+    CHKPV(pointerEvent_);
+    pointerEvent_->GetPointerItem(pointerEvent_->GetPointerId(), item);
+    mprintf(fd, "Mouse device state information:\t");
+    mprintf(fd,
+            "PointerId:%d | SourceType:%s | PointerAction:%s | WindowX:%d | WindowY:%d | ButtonId:%d "
+            "| AgentWindowId:%d | TargetWindowId:%d | DownTime:%" PRId64 " | IsPressed:%s \t",
+            pointerEvent_->GetPointerId(), pointerEvent_->DumpSourceType(), pointerEvent_->DumpPointerAction(),
+            item.GetWindowX(), item.GetWindowY(), pointerEvent_->GetButtonId(), pointerEvent_->GetAgentWindowId(),
+            pointerEvent_->GetTargetWindowId(), item.GetDownTime(), item.IsPressed() ? "true" : "false");
+}
+
+int32_t MouseTransformProcessor::SetPointerSpeed(int32_t speed)
+{
+    CALL_DEBUG_ENTER;
+    if (speed < MIN_SPEED) {
+        speed_ = MIN_SPEED;
+    } else if (speed > MAX_SPEED) {
+        speed_ = MAX_SPEED;
+    } else {
+        speed_ = speed;
+    }
+    MMI_HILOGD("Set pointer speed:%{public}d", speed_);
+    return RET_OK;
+}
+
+int32_t MouseTransformProcessor::GetPointerSpeed()
+{
+    CALL_DEBUG_ENTER;
+    MMI_HILOGD("Get pointer speed:%{public}d", speed_);
+    return speed_;
+}
+
+bool MouseTransformProcessor::GetSpeedGain(double vin, double &gain)
+{
+    if (fabs(vin) < DOUBLE_ZERO) {
+        MMI_HILOGE("The value of the parameter passed in is 0");
+        return false;
+    }
+    if (speed_ < 1) {
+        MMI_HILOGE("The speed value can't be less than 1");
+        return false;
+    }
+    const AccelerateCurve& curve = ACCELERATE_CURVES[speed_ - 1];
+    int32_t num = static_cast<int32_t>(ceil(fabs(vin)));
+    for (size_t i = 0; i < curve.speeds.size(); ++i) {
+        if (num <= curve.speeds[i]) {
+            gain = (curve.slopes[i] * vin + curve.diffNums[i]) / vin;
+            return true;
+        }
+    }
+    gain = (curve.slopes.back() * vin + curve.diffNums.back()) / vin;
+    return true;
+}
+
+void MouseTransformProcessor::SetDxDyForDInput(PointerEvent::PointerItem& pointerItem,
+    struct libinput_event_pointer* data)
+{
+    double dx = libinput_event_pointer_get_dx(data);
+    double dy = libinput_event_pointer_get_dy(data);
+    int32_t rawDx = static_cast<int32_t>(dx);
+    int32_t rawDy = static_cast<int32_t>(dy);
+    pointerItem.SetRawDx(rawDx);
+    pointerItem.SetRawDy(rawDy);
+    MMI_HILOGD("MouseTransformProcessor SetDxDyForDInput, dx:%{public}d, dy:%{public}d", rawDx, rawDy);
+}
+
+int32_t MouseTransformProcessor::SetPointerLocation(int32_t x, int32_t y)
+{
+    MMI_HILOGI("Location, x:%{public}d, y:%{public}d", x, y);
+    auto displayGroupInfo = WinMgr->GetDisplayGroupInfo();
+    if (currentDisplayId_ == -1) {
+        if (displayGroupInfo.displaysInfo.empty()) {
+            MMI_HILOGI("The displayInfo is empty");
+            return RET_ERR;
+        }
+        currentDisplayId_ = displayGroupInfo.displaysInfo[0].id;
+    }
+    struct DisplayInfo display;
+    for (auto& it : displayGroupInfo.displaysInfo) {
+        if (it.id == currentDisplayId_) {
+            display = it;
+            break;
+        }
+    }
+    absolutionX_ = static_cast<double>(x);
+    absolutionY_ = static_cast<double>(y);
+    WinMgr->UpdateAndAdjustMouseLocation(currentDisplayId_, absolutionX_, absolutionY_);
+    int32_t physicalX = WinMgr->GetMouseInfo().physicalX;
+    int32_t physicalY = WinMgr->GetMouseInfo().physicalY;
+    IPointerDrawingManager::GetInstance()->SetPointerLocation(getpid(), physicalX, physicalY);
+    return RET_OK;
+}
+
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+void MouseTransformProcessor::SetAbsolutionLocation(double xPercent, double yPercent)
+{
+    MMI_HILOGI("Cross screen location, xPercent:%{public}lf, yPercent:%{public}lf",
+        xPercent, yPercent);
+    auto displayGroupInfo = WinMgr->GetDisplayGroupInfo();
+    if (currentDisplayId_ == -1) {
+        if (displayGroupInfo.displaysInfo.empty()) {
+            MMI_HILOGI("The displayInfo is empty");
+            return;
+        }
+        currentDisplayId_ = displayGroupInfo.displaysInfo[0].id;
+    }
+    struct DisplayInfo display;
+    for (auto &it : displayGroupInfo.displaysInfo) {
+        if (it.id == currentDisplayId_) {
+            display = it;
+            break;
+        }
+    }
+    absolutionX_ = display.width * xPercent / PERCENT_CONST;
+    absolutionY_ = display.height * yPercent / PERCENT_CONST;
+    WinMgr->UpdateAndAdjustMouseLocation(currentDisplayId_, absolutionX_, absolutionY_);
+    int32_t physicalX = WinMgr->GetMouseInfo().physicalX;
+    int32_t physicalY = WinMgr->GetMouseInfo().physicalY;
+    IPointerDrawingManager::GetInstance()->SetPointerLocation(getpid(), physicalX, physicalY);
+}
+#endif // OHOS_BUILD_ENABLE_COOPERATE
+} // namespace MMI
+} // namespace OHOS
-- 
Gitee


From 80c06183c0981f997a30f0dd548afcbc9fc7d9cf Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 15 Dec 2022 09:57:35 +0800
Subject: [PATCH 243/360] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAdebug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ibef0f8b831c321b400cfe5a0bd77d0ddb89438b6
---
 .../event_handler/src/input_manager_impl.cpp   | 18 +++++++++---------
 .../message_handle/src/server_msg_handler.cpp  |  4 ++--
 service/module_loader/src/mmi_service.cpp      |  6 +++---
 .../src/input_windows_manager.cpp              | 14 +++++++-------
 util/common/include/time_cost_chk.h            |  4 ++--
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 546b43c010..5274bacebb 100755
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -332,11 +332,11 @@ int32_t InputManagerImpl::PackDisplayInfo(NetPacket &pkt)
 
 void InputManagerImpl::PrintDisplayInfo()
 {
-    MMI_HILOGI("logicalInfo,width:%{public}d,height:%{public}d,focusWindowId:%{public}d",
+    MMI_HILOGD("logicalInfo,width:%{public}d,height:%{public}d,focusWindowId:%{public}d",
         displayGroupInfo_.width, displayGroupInfo_.height, displayGroupInfo_.focusWindowId);
-    MMI_HILOGI("windowsInfos,num:%{public}zu", displayGroupInfo_.windowsInfo.size());
+    MMI_HILOGD("windowsInfos,num:%{public}zu", displayGroupInfo_.windowsInfo.size());
     for (const auto &item : displayGroupInfo_.windowsInfo) {
-        MMI_HILOGI("windowsInfos,id:%{public}d,pid:%{public}d,uid:%{public}d,"
+        MMI_HILOGD("windowsInfos,id:%{public}d,pid:%{public}d,uid:%{public}d,"
             "area.x:%{public}d,area.y:%{public}d,area.width:%{public}d,area.height:%{public}d,"
             "defaultHotAreas.size:%{public}zu,pointerHotAreas.size:%{public}zu,"
             "agentWindowId:%{public}d,flags:%{public}d",
@@ -344,16 +344,16 @@ void InputManagerImpl::PrintDisplayInfo()
             item.area.height, item.defaultHotAreas.size(), item.pointerHotAreas.size(),
             item.agentWindowId, item.flags);
         for (const auto &win : item.defaultHotAreas) {
-            MMI_HILOGI("defaultHotAreas:x:%{public}d,y:%{public}d,width:%{public}d,height:%{public}d",
+            MMI_HILOGD("defaultHotAreas:x:%{public}d,y:%{public}d,width:%{public}d,height:%{public}d",
                 win.x, win.y, win.width, win.height);
         }
         for (const auto &pointer : item.pointerHotAreas) {
-            MMI_HILOGI("pointerHotAreas:x:%{public}d,y:%{public}d,width:%{public}d,height:%{public}d",
+            MMI_HILOGD("pointerHotAreas:x:%{public}d,y:%{public}d,width:%{public}d,height:%{public}d",
                 pointer.x, pointer.y, pointer.width, pointer.height);
         }
     }
 
-    MMI_HILOGI("displayInfos,num:%{public}zu", displayGroupInfo_.displaysInfo.size());
+    MMI_HILOGD("displayInfos,num:%{public}zu", displayGroupInfo_.displaysInfo.size());
     for (const auto &item : displayGroupInfo_.displaysInfo) {
         MMI_HILOGI("displayInfos,id:%{public}d,x:%{public}d,y:%{public}d,"
             "width:%{public}d,height:%{public}d,dpi:%{public}d,name:%{public}s,"
@@ -423,7 +423,7 @@ void InputManagerImpl::RemoveMonitor(int32_t monitorId)
 
 void InputManagerImpl::MarkConsumed(int32_t monitorId, int32_t eventId)
 {
-    CALL_INFO_TRACE;
+    CALL_DEBUG_ENTER;
 #ifdef OHOS_BUILD_ENABLE_MONITOR
     std::lock_guard<std::mutex> guard(mtx_);
     if (!MMIEventHdl.InitClient()) {
@@ -502,7 +502,7 @@ void InputManagerImpl::RemoveInterceptor(int32_t interceptorId)
 
 void InputManagerImpl::SimulateInputEvent(std::shared_ptr<KeyEvent> keyEvent)
 {
-    CALL_INFO_TRACE;
+    CALL_DEBUG_ENTER;
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     CHKPV(keyEvent);
     std::lock_guard<std::mutex> guard(mtx_);
@@ -516,7 +516,7 @@ void InputManagerImpl::SimulateInputEvent(std::shared_ptr<KeyEvent> keyEvent)
 
 void InputManagerImpl::SimulateInputEvent(std::shared_ptr<PointerEvent> pointerEvent)
 {
-    CALL_INFO_TRACE;
+    CALL_DEBUG_ENTER;
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
     CHKPV(pointerEvent);
     if (pointerEvent->GetSourceType() == PointerEvent::SOURCE_TYPE_MOUSE ||
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index 418affe709..8b407b0d9c 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -74,7 +74,7 @@ void ServerMsgHandler::OnMsgHandler(SessionPtr sess, NetPacket& pkt)
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
 int32_t ServerMsgHandler::OnInjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent)
 {
-    CALL_INFO_TRACE;
+    CALL_DEBUG_ENTER;
     CHKPR(keyEvent, ERROR_NULL_POINTER);
     auto inputEventNormalizeHandler = InputHandler->GetEventNormalizeHandler();
     CHKPR(inputEventNormalizeHandler, ERROR_NULL_POINTER);
@@ -119,7 +119,7 @@ int32_t ServerMsgHandler::OnSetFunctionKeyState(int32_t funcKey, bool enable)
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
 int32_t ServerMsgHandler::OnInjectPointerEvent(const std::shared_ptr<PointerEvent> pointerEvent)
 {
-    CALL_INFO_TRACE;
+    CALL_DEBUG_ENTER;
     CHKPR(pointerEvent, ERROR_NULL_POINTER);
     pointerEvent->UpdateId();
     int32_t action = pointerEvent->GetPointerAction();
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 6c9705a24f..cc4bae31a1 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -732,7 +732,7 @@ int32_t MMIService::CheckMarkConsumed(int32_t pid, int32_t eventId)
 
 int32_t MMIService::MarkEventConsumed(int32_t eventId)
 {
-    CALL_INFO_TRACE;
+    CALL_DEBUG_ENTER;
 #ifdef OHOS_BUILD_ENABLE_MONITOR
     int32_t pid = GetCallingPid();
     int32_t ret = delegateTasks_.PostSyncTask(
@@ -761,7 +761,7 @@ int32_t MMIService::MoveMouseEvent(int32_t offsetX, int32_t offsetY)
 
 int32_t MMIService::InjectKeyEvent(const std::shared_ptr<KeyEvent> keyEvent)
 {
-    CALL_INFO_TRACE;
+    CALL_DEBUG_ENTER;
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     int32_t ret = delegateTasks_.PostSyncTask(
         std::bind(&MMIService::CheckInjectKeyEvent, this, keyEvent));
@@ -791,7 +791,7 @@ int32_t MMIService::CheckInjectPointerEvent(const std::shared_ptr<PointerEvent>
 
 int32_t MMIService::InjectPointerEvent(const std::shared_ptr<PointerEvent> pointerEvent)
 {
-    CALL_INFO_TRACE;
+    CALL_DEBUG_ENTER;
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
     int32_t ret = delegateTasks_.PostSyncTask(
         std::bind(&MMIService::CheckInjectPointerEvent, this, pointerEvent));
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index b20aeacc27..6b81c5952a 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -442,11 +442,11 @@ void InputWindowsManager::NotifyPointerToWindow()
 
 void InputWindowsManager::PrintDisplayInfo()
 {
-    MMI_HILOGI("logicalInfo,width:%{public}d,height:%{public}d,focusWindowId:%{public}d",
+    MMI_HILOGD("logicalInfo,width:%{public}d,height:%{public}d,focusWindowId:%{public}d",
         displayGroupInfo_.width, displayGroupInfo_.height, displayGroupInfo_.focusWindowId);
-    MMI_HILOGI("windowsInfos,num:%{public}zu", displayGroupInfo_.windowsInfo.size());
+    MMI_HILOGD("windowsInfos,num:%{public}zu", displayGroupInfo_.windowsInfo.size());
     for (const auto &item : displayGroupInfo_.windowsInfo) {
-        MMI_HILOGI("windowsInfos,id:%{public}d,pid:%{public}d,uid:%{public}d,"
+        MMI_HILOGD("windowsInfos,id:%{public}d,pid:%{public}d,uid:%{public}d,"
             "area.x:%{public}d,area.y:%{public}d,area.width:%{public}d,area.height:%{public}d,"
             "defaultHotAreas.size:%{public}zu,pointerHotAreas.size:%{public}zu,"
             "agentWindowId:%{public}d,flags:%{public}d",
@@ -454,18 +454,18 @@ void InputWindowsManager::PrintDisplayInfo()
             item.area.height, item.defaultHotAreas.size(), item.pointerHotAreas.size(),
             item.agentWindowId, item.flags);
         for (const auto &win : item.defaultHotAreas) {
-            MMI_HILOGI("defaultHotAreas:x:%{public}d,y:%{public}d,width:%{public}d,height:%{public}d",
+            MMI_HILOGD("defaultHotAreas:x:%{public}d,y:%{public}d,width:%{public}d,height:%{public}d",
                 win.x, win.y, win.width, win.height);
         }
         for (const auto &pointer : item.pointerHotAreas) {
-            MMI_HILOGI("pointerHotAreas:x:%{public}d,y:%{public}d,width:%{public}d,height:%{public}d",
+            MMI_HILOGD("pointerHotAreas:x:%{public}d,y:%{public}d,width:%{public}d,height:%{public}d",
                 pointer.x, pointer.y, pointer.width, pointer.height);
         }
     }
 
-    MMI_HILOGI("displayInfos,num:%{public}zu", displayGroupInfo_.displaysInfo.size());
+    MMI_HILOGD("displayInfos,num:%{public}zu", displayGroupInfo_.displaysInfo.size());
     for (const auto &item : displayGroupInfo_.displaysInfo) {
-        MMI_HILOGI("displayInfos,id:%{public}d,x:%{public}d,y:%{public}d,"
+        MMI_HILOGD("displayInfos,id:%{public}d,x:%{public}d,y:%{public}d,"
             "width:%{public}d,height:%{public}d,name:%{public}s,"
             "uniq:%{public}s,direction:%{public}d",
             item.id, item.x, item.y, item.width, item.height, item.name.c_str(),
diff --git a/util/common/include/time_cost_chk.h b/util/common/include/time_cost_chk.h
index 356d4d22f5..6ac3881bec 100644
--- a/util/common/include/time_cost_chk.h
+++ b/util/common/include/time_cost_chk.h
@@ -62,12 +62,12 @@ public:
         int64_t ullCost = GetElapsed_micro();
         if ((ullCost > uiTime_) && strReason_.size() > 0 && strOutput_.size() > 0) {
             if (llParam1_ != 0 || llParam2_ != 0) {
-                MMI_HILOGW("Time cost overtime (%{public}" PRId64 ",(us)>%{public}" PRId64
+                MMI_HILOGD("Time cost overtime (%{public}" PRId64 ",(us)>%{public}" PRId64
                          "(us)) when Reason:%{public}s,chk:%{public}s,"
                          "paramType:%{public}s, param2:%{public}" PRId64 "",
                          ullCost, uiTime_, strReason_.c_str(), strOutput_.c_str(), paramType[llParam1_].data(), llParam2_);
             } else {
-                MMI_HILOGW("Overtime(%{public}" PRId64 ",(us)>%{public}" PRId64
+                MMI_HILOGD("Overtime(%{public}" PRId64 ",(us)>%{public}" PRId64
                          "(us)) when Reason:%{public}s,chk:%{public}s",
                          ullCost, uiTime_, strReason_.c_str(), strOutput_.c_str());
             }
-- 
Gitee


From 67fcd03a131b2834aa39b4a63d95b079a30c2826 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Thu, 15 Dec 2022 18:33:44 +0800
Subject: [PATCH 244/360] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 .../src/device_config_file_parser.cpp         | 32 +++++++++++--------
 .../include/mouse_event_normalize.h           |  4 +--
 .../src/mouse_event_normalize.cpp             | 14 ++++----
 util/common/include/util.h                    |  2 ++
 util/common/src/util.cpp                      | 27 ++++++++++++++++
 5 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/service/device_config/src/device_config_file_parser.cpp b/service/device_config/src/device_config_file_parser.cpp
index d6cc3cf064..de43bbc4b6 100644
--- a/service/device_config/src/device_config_file_parser.cpp
+++ b/service/device_config/src/device_config_file_parser.cpp
@@ -16,11 +16,13 @@
 #include "device_config_file_parser.h"
 
 #include <fstream>
+#include <regex>
 
 #include "error_multimodal.h"
 #include "input_device.h"
 #include "input_device_manager.h"
 #include "libinput.h"
+#include "util.h"
 
 namespace OHOS {
 namespace MMI {
@@ -98,8 +100,13 @@ std::map<ConfigFileItem, int32_t> DeviceConfigManagement::ReadConfigFile(const s
             continue;
         }
         std::string key = tmp.substr(0, pos);
-        std::string value = tmp.substr(pos + 1);
-        configList[ConfigItemName2Id(key)] = std::stoi(value);
+
+        std::smatch match;
+        bool isNumber = std::regex_search(tmp, match, std::regex("\\d+"));
+        if (!isNumber) {
+            continue;
+        }
+        configList[ConfigItemName2Id(key)] = std::stoi(match[0]);
     }
     cfgFile.close();
     return configList;
@@ -109,18 +116,18 @@ int32_t DeviceConfigManagement::DeviceConfiguration(struct libinput_device *devi
 {
     CALL_DEBUG_ENTER;
     std::string fileName = "/vendor/etc/pointer/" + CombDeviceFileName(device) + ".TOML";
+    if(FileVerification(fileName, "TOML") != RET_OK) {
+        MMI_HILOGE("File validation failed");
+        return RET_ERR;
+    }
     auto configList = ReadConfigFile(fileName);
     if (configList.empty()) {
-        MMI_HILOGE("configList is empty");
+        MMI_HILOGE("ConfigList is empty");
         return RET_ERR;
     }
     deviceConfigs_[deviceId] = configList;
-    int32_t ret = MouseEventHdr->SetPointerSpeedWithDeviceId(deviceId,
-        configList[ConfigFileItem::POINTER_SPEED]);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Pointer speed set failed, ret : %{public}d", ret);
-    }
-    return ret;
+    MouseEventHdr->SetPointerSpeedWithDeviceId(deviceId, configList[ConfigFileItem::POINTER_SPEED]);
+    return RET_OK;
 }
 
 int32_t DeviceConfigManagement::DeviceClassification(struct libinput_device *device, DeviceId deviceId)
@@ -144,7 +151,7 @@ int32_t DeviceConfigManagement::OnDeviceAdd(struct libinput_device *device)
     CHKPR(device, ERROR_NULL_POINTER);
     int32_t deviceId = InputDevMgr->FindInputDeviceId(device);
     if (deviceId == INVALID_DEVICE_ID) {
-        MMI_HILOGE("Find to device failed");
+        MMI_HILOGE("Find device failed");
         return RET_ERR;
     }
     return DeviceClassification(device, deviceId);
@@ -160,10 +167,7 @@ void DeviceConfigManagement::OnDeviceRemove(struct libinput_device *device)
         MMI_HILOGE("Device config file remove failed");
         return;
     }
-    int32_t ret = MouseEventHdr->RemovePointerSpeed(deviceId);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Pointer speed set failed, ret : %{public}d", ret);
-    }
+    MouseEventHdr->RemovePointerSpeed(deviceId);
     deviceConfigs_.erase(iter);
 }
 } // namespace MMI
diff --git a/service/mouse_event_normalize/include/mouse_event_normalize.h b/service/mouse_event_normalize/include/mouse_event_normalize.h
index 59d16b6e52..0bebfd8c2f 100644
--- a/service/mouse_event_normalize/include/mouse_event_normalize.h
+++ b/service/mouse_event_normalize/include/mouse_event_normalize.h
@@ -50,8 +50,8 @@ public:
     bool NormalizeMoveMouse(int32_t offsetX, int32_t offsetY);
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
     int32_t SetPointerSpeed(int32_t speed);
-    int32_t SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed);
-    int32_t RemovePointerSpeed(int32_t deviceId);
+    void SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed);
+    void RemovePointerSpeed(int32_t deviceId);
     int32_t GetPointerSpeed() const;
     void OnDisplayLost(int32_t displayId);
     int32_t GetDisplayId() const;
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index c060ed8d27..eff8177427 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -58,12 +58,12 @@ int32_t PointerSpeedCheck(int32_t speed)
     if (speed < MIN_SPEED) {
         MMI_HILOGW("Set pointer speed less than minimum speed:%{public}d", speed);
         return MIN_SPEED;
-    } else if (speed > MAX_SPEED) {
+    }
+    if (speed > MAX_SPEED) {
         MMI_HILOGW("Set pointer speed greater than the maximum value speed:%{public}d", speed);
         return MAX_SPEED;
-    } else {
-        return speed;
     }
+    return speed;
 }
 } // namespace
 MouseEventNormalize::MouseEventNormalize()
@@ -450,23 +450,21 @@ int32_t MouseEventNormalize::SetPointerSpeed(int32_t speed)
     return RET_OK;
 }
 
-int32_t MouseEventNormalize::SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed)
+void MouseEventNormalize::SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed)
 {
     CALL_DEBUG_ENTER;
     pointerDeviceSpeeds[deviceId] = PointerSpeedCheck(speed);
     MMI_HILOGD("Set pointer speed:%{public}d", pointerDeviceSpeeds[deviceId]);
-    return RET_OK;
 }
 
-int32_t MouseEventNormalize::RemovePointerSpeed(int32_t deviceId)
+void MouseEventNormalize::RemovePointerSpeed(int32_t deviceId)
 {
     CALL_DEBUG_ENTER;
     auto it = pointerDeviceSpeeds.find(deviceId);
-    if (it == pointerDeviceSpeeds.end()) {
+    if (it != pointerDeviceSpeeds.end()) {
         pointerDeviceSpeeds.erase(it);
         MMI_HILOGD("remove pointer speed with deviceId:%{public}d", deviceId);
     }
-    return RET_OK;
 }
 
 int32_t MouseEventNormalize::GetPointerSpeedByDeviceId(int32_t deviceId) const
diff --git a/util/common/include/util.h b/util/common/include/util.h
index f2ff5cc62f..05f814c4e0 100644
--- a/util/common/include/util.h
+++ b/util/common/include/util.h
@@ -59,6 +59,8 @@ int32_t ReadCursorStyleFile(const std::string &filePath);
 
 int32_t ReadTomlFile(const std::string &filePath, DeviceConfig &devConf);
 
+int32_t FileVerification(std::string &filePath, const std::string &checkExtension);
+
 std::string StringPrintf(const char *format, ...);
 
 inline void RemoveSpace(std::string &str)
diff --git a/util/common/src/util.cpp b/util/common/src/util.cpp
index c5aeee2a56..9e56fc8b61 100644
--- a/util/common/src/util.cpp
+++ b/util/common/src/util.cpp
@@ -552,5 +552,32 @@ std::string StringPrintf(const char *format, ...)
     va_end(ap);
     return result;
 }
+
+int32_t FileVerification(std::string &filePath, const std::string &checkExtension) {
+    if (filePath.empty()) {
+        MMI_HILOGE("FilePath is empty");
+        return RET_ERR;
+    }
+    char realPath[PATH_MAX] = {};
+    if (realpath(filePath.c_str(), realPath) == nullptr) {
+        MMI_HILOGI("The realpath return nullptr");
+        return RET_ERR;
+    }
+    if (!IsFileExists(realPath)) {
+        MMI_HILOGE("File is not existent");
+        return RET_ERR;
+    }
+    if (!CheckFileExtendName(realPath, checkExtension)) {
+        MMI_HILOGE("Unable to parse files other than json format");
+        return RET_ERR;
+    }
+    int32_t fileSize = GetFileSize(realPath);
+    if ((fileSize <= 0) || (fileSize > FILE_SIZE_MAX)) {
+        MMI_HILOGE("File size out of read range");
+        return RET_ERR;
+    }
+    filePath = realPath;
+    return RET_OK;
+}
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From 96951f6680ff2ac8677676d5d19a010c56255d04 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Thu, 15 Dec 2022 18:37:25 +0800
Subject: [PATCH 245/360] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 service/device_config/src/device_config_file_parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/device_config/src/device_config_file_parser.cpp b/service/device_config/src/device_config_file_parser.cpp
index de43bbc4b6..9f8f57eb38 100644
--- a/service/device_config/src/device_config_file_parser.cpp
+++ b/service/device_config/src/device_config_file_parser.cpp
@@ -70,7 +70,7 @@ ConfigFileItem DeviceConfigManagement::ConfigItemName2Id(const std::string &name
 
     auto iter = configList.find(name);
     if (iter == configList.end()) {
-        MMI_HILOGE("Device config file remove failed");
+        MMI_HILOGE("Device name failed");
         return ConfigFileItem::INVALID;
     }
     return configList.at(name);
-- 
Gitee


From 3a7ca82bad5ad3f38be3dbfa6e13d02861480a61 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Thu, 15 Dec 2022 20:09:50 +0800
Subject: [PATCH 246/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 .../include/device_config_file_parser.h           |  2 +-
 .../src/device_config_file_parser.cpp             |  9 +++++----
 .../src/mouse_event_normalize.cpp                 |  9 ++-------
 util/common/include/util.h                        |  2 +-
 util/common/src/util.cpp                          | 15 +++++++--------
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/service/device_config/include/device_config_file_parser.h b/service/device_config/include/device_config_file_parser.h
index e4395de03f..db8b2b79fd 100644
--- a/service/device_config/include/device_config_file_parser.h
+++ b/service/device_config/include/device_config_file_parser.h
@@ -39,7 +39,7 @@ public:
 private:
     using DeviceId = int32_t;
     std::map<DeviceId, std::map<ConfigFileItem, int32_t>> deviceConfigs_;
-private:
+
     int32_t DeviceClassification(struct libinput_device *device, DeviceId deviceId);
     int32_t DeviceConfiguration(struct libinput_device *device, DeviceId deviceId);
     std::map<ConfigFileItem, int32_t> ReadConfigFile(const std::string &filePath);
diff --git a/service/device_config/src/device_config_file_parser.cpp b/service/device_config/src/device_config_file_parser.cpp
index 9f8f57eb38..1f3c065c46 100644
--- a/service/device_config/src/device_config_file_parser.cpp
+++ b/service/device_config/src/device_config_file_parser.cpp
@@ -115,14 +115,15 @@ std::map<ConfigFileItem, int32_t> DeviceConfigManagement::ReadConfigFile(const s
 int32_t DeviceConfigManagement::DeviceConfiguration(struct libinput_device *device, DeviceId deviceId)
 {
     CALL_DEBUG_ENTER;
-    std::string fileName = "/vendor/etc/pointer/" + CombDeviceFileName(device) + ".TOML";
-    if(FileVerification(fileName, "TOML") != RET_OK) {
+    std::string filePath = "/vendor/etc/pointer/" + CombDeviceFileName(device) + ".TOML";
+    auto path = FileVerification(filePath, "TOML");
+    if(path.empty()) {
         MMI_HILOGE("File validation failed");
         return RET_ERR;
     }
-    auto configList = ReadConfigFile(fileName);
+    auto configList = ReadConfigFile(path);
     if (configList.empty()) {
-        MMI_HILOGE("ConfigList is empty");
+        MMI_HILOGE("configList is empty");
         return RET_ERR;
     }
     deviceConfigs_[deviceId] = configList;
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index eff8177427..1006dc8535 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -58,8 +58,7 @@ int32_t PointerSpeedCheck(int32_t speed)
     if (speed < MIN_SPEED) {
         MMI_HILOGW("Set pointer speed less than minimum speed:%{public}d", speed);
         return MIN_SPEED;
-    }
-    if (speed > MAX_SPEED) {
+    } else if (speed > MAX_SPEED) {
         MMI_HILOGW("Set pointer speed greater than the maximum value speed:%{public}d", speed);
         return MAX_SPEED;
     }
@@ -81,11 +80,7 @@ std::shared_ptr<PointerEvent> MouseEventNormalize::GetPointerEvent() const
 
 int32_t MouseEventNormalize::GetSpeed(int32_t deviceId) const
 {
-    if (isSpeedSetByUser_) {
-        return speed_;
-    } else {
-        return GetPointerSpeedByDeviceId(deviceId);
-    }
+    return isSpeedSetByUser_ ? speed_ : GetPointerSpeedByDeviceId(deviceId);
 }
 
 bool MouseEventNormalize::GetSpeedGain(double vin, double &gain, int32_t deviceId) const
diff --git a/util/common/include/util.h b/util/common/include/util.h
index 05f814c4e0..6561d7009c 100644
--- a/util/common/include/util.h
+++ b/util/common/include/util.h
@@ -59,7 +59,7 @@ int32_t ReadCursorStyleFile(const std::string &filePath);
 
 int32_t ReadTomlFile(const std::string &filePath, DeviceConfig &devConf);
 
-int32_t FileVerification(std::string &filePath, const std::string &checkExtension);
+std::string FileVerification(std::string &filePath, const std::string &checkExtension);
 
 std::string StringPrintf(const char *format, ...);
 
diff --git a/util/common/src/util.cpp b/util/common/src/util.cpp
index 9e56fc8b61..8e07eff819 100644
--- a/util/common/src/util.cpp
+++ b/util/common/src/util.cpp
@@ -553,31 +553,30 @@ std::string StringPrintf(const char *format, ...)
     return result;
 }
 
-int32_t FileVerification(std::string &filePath, const std::string &checkExtension) {
+std::string FileVerification(std::string &filePath, const std::string &checkExtension) {
     if (filePath.empty()) {
         MMI_HILOGE("FilePath is empty");
-        return RET_ERR;
+        return "";
     }
     char realPath[PATH_MAX] = {};
     if (realpath(filePath.c_str(), realPath) == nullptr) {
         MMI_HILOGI("The realpath return nullptr");
-        return RET_ERR;
+        return "";
     }
     if (!IsFileExists(realPath)) {
         MMI_HILOGE("File is not existent");
-        return RET_ERR;
+        return "";
     }
     if (!CheckFileExtendName(realPath, checkExtension)) {
         MMI_HILOGE("Unable to parse files other than json format");
-        return RET_ERR;
+        return "";
     }
     int32_t fileSize = GetFileSize(realPath);
     if ((fileSize <= 0) || (fileSize > FILE_SIZE_MAX)) {
         MMI_HILOGE("File size out of read range");
-        return RET_ERR;
+        return "";
     }
-    filePath = realPath;
-    return RET_OK;
+    return realPath;
 }
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From 980d371077e675d1ab3dc4d8808c4a2ec3b4dca0 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Fri, 16 Dec 2022 12:09:47 +0800
Subject: [PATCH 247/360] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 .../src/device_config_file_parser.cpp           |  8 ++------
 .../include/mouse_event_normalize.h             |  8 +++++---
 .../src/mouse_event_normalize.cpp               | 17 ++++++++++++++++-
 .../src/mouse_transform_processor.cpp           |  2 +-
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/service/device_config/src/device_config_file_parser.cpp b/service/device_config/src/device_config_file_parser.cpp
index 9366df14f5..1f3c065c46 100644
--- a/service/device_config/src/device_config_file_parser.cpp
+++ b/service/device_config/src/device_config_file_parser.cpp
@@ -127,9 +127,7 @@ int32_t DeviceConfigManagement::DeviceConfiguration(struct libinput_device *devi
         return RET_ERR;
     }
     deviceConfigs_[deviceId] = configList;
-    auto processor = MouseEventHdr->GetProcessor(deviceId);
-    CHKPR(processor, RET_ERR);
-    processor->SetPointerSpeedWithDeviceId(deviceId, configList[ConfigFileItem::POINTER_SPEED]);
+    MouseEventHdr->SetPointerSpeedWithDeviceId(deviceId, configList[ConfigFileItem::POINTER_SPEED]);
     return RET_OK;
 }
 
@@ -170,9 +168,7 @@ void DeviceConfigManagement::OnDeviceRemove(struct libinput_device *device)
         MMI_HILOGE("Device config file remove failed");
         return;
     }
-    auto processor = MouseEventHdr->GetProcessor(deviceId);
-    CHKPV(processor);
-    processor->RemovePointerSpeed(deviceId);
+    MouseEventHdr->RemovePointerSpeed(deviceId);
     deviceConfigs_.erase(iter);
 }
 } // namespace MMI
diff --git a/service/mouse_event_normalize/include/mouse_event_normalize.h b/service/mouse_event_normalize/include/mouse_event_normalize.h
index 0fb073d4a0..45d524b4a5 100644
--- a/service/mouse_event_normalize/include/mouse_event_normalize.h
+++ b/service/mouse_event_normalize/include/mouse_event_normalize.h
@@ -46,10 +46,12 @@ public:
     void OnDisplayLost(int32_t displayId);
     int32_t GetDisplayId() const;
     int32_t SetPointerLocation(int32_t x, int32_t y);
-    std::shared_ptr<MouseTransformProcessor> GetProcessor(int32_t deviceId) const;
-
-private:
     std::shared_ptr<MouseTransformProcessor> GetCurrentProcessor() const;
+    void SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed);
+    void RemovePointerSpeed(int32_t deviceId);
+    int32_t GetPointerSpeedByDeviceId(int32_t deviceId);
+private:
+    std::shared_ptr<MouseTransformProcessor> GetProcessor(int32_t deviceId) const;
     void SetCurrentDeviceId(int32_t deviceId);
     int32_t GetCurrentDeviceId() const;
 
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index bd45345a20..25bbc8744b 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -51,7 +51,7 @@ std::shared_ptr<MouseTransformProcessor> MouseEventNormalize::GetProcessor(int32
         return nullptr;
     }
     return iter->second;
-}   
+}
 
 std::shared_ptr<MouseTransformProcessor> MouseEventNormalize::GetCurrentProcessor() const
 {
@@ -154,5 +154,20 @@ void MouseEventNormalize::SetAbsolutionLocation(double xPercent, double yPercent
     MouseTransformProcessor::SetAbsolutionLocation(xPercent, yPercent);
 }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
+
+void MouseEventNormalize::SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed)
+{
+    MouseTransformProcessor::SetPointerSpeedWithDeviceId(deviceId, speed);
+}
+
+void MouseEventNormalize::RemovePointerSpeed(int32_t deviceId)
+{
+    MouseTransformProcessor::RemovePointerSpeed(deviceId);
+}
+
+int32_t MouseEventNormalize::GetPointerSpeedByDeviceId(int32_t deviceId)
+{
+    return MouseTransformProcessor::GetPointerSpeedByDeviceId(deviceId);
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/mouse_event_normalize/src/mouse_transform_processor.cpp b/service/mouse_event_normalize/src/mouse_transform_processor.cpp
index 117017e478..cd919c8474 100644
--- a/service/mouse_event_normalize/src/mouse_transform_processor.cpp
+++ b/service/mouse_event_normalize/src/mouse_transform_processor.cpp
@@ -245,7 +245,7 @@ int32_t MouseTransformProcessor::HandleAxisInner(struct libinput_event_pointer*
     return RET_OK;
 }
 
-void MouseTransformProcessor::HandlePostInner(struct libinput_event_pointer* data, 
+void MouseTransformProcessor::HandlePostInner(struct libinput_event_pointer* data,
     PointerEvent::PointerItem &pointerItem)
 {
     CALL_DEBUG_ENTER;
-- 
Gitee


From df6c6b2c820fd9c515dffda96c91a8f529200b08 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Fri, 16 Dec 2022 14:51:08 +0800
Subject: [PATCH 248/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=20Signed-off-by:=20yangli1?=
 =?UTF-8?q?98=20<yangli198@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/mouse_event_normalize/include/mouse_event_normalize.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/mouse_event_normalize/include/mouse_event_normalize.h b/service/mouse_event_normalize/include/mouse_event_normalize.h
index 45d524b4a5..218e4863c0 100644
--- a/service/mouse_event_normalize/include/mouse_event_normalize.h
+++ b/service/mouse_event_normalize/include/mouse_event_normalize.h
@@ -46,12 +46,13 @@ public:
     void OnDisplayLost(int32_t displayId);
     int32_t GetDisplayId() const;
     int32_t SetPointerLocation(int32_t x, int32_t y);
-    std::shared_ptr<MouseTransformProcessor> GetCurrentProcessor() const;
     void SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed);
     void RemovePointerSpeed(int32_t deviceId);
     int32_t GetPointerSpeedByDeviceId(int32_t deviceId);
+
 private:
     std::shared_ptr<MouseTransformProcessor> GetProcessor(int32_t deviceId) const;
+    std::shared_ptr<MouseTransformProcessor> GetCurrentProcessor() const;
     void SetCurrentDeviceId(int32_t deviceId);
     int32_t GetCurrentDeviceId() const;
 
-- 
Gitee


From 42ad6400064ac9a17f3d7943fb94bb003c348da3 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Fri, 16 Dec 2022 19:39:27 +0800
Subject: [PATCH 249/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 service/event_handler/include/event_normalize_handler.h       | 1 +
 service/event_handler/src/event_normalize_handler.cpp         | 2 +-
 service/mouse_event_normalize/include/mouse_event_normalize.h | 2 +-
 .../mouse_event_normalize/include/mouse_transform_processor.h | 2 +-
 service/mouse_event_normalize/src/mouse_event_normalize.cpp   | 4 ++--
 .../mouse_event_normalize/src/mouse_transform_processor.cpp   | 4 ++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/service/event_handler/include/event_normalize_handler.h b/service/event_handler/include/event_normalize_handler.h
index e42c30dd73..c2f82b64f5 100644
--- a/service/event_handler/include/event_normalize_handler.h
+++ b/service/event_handler/include/event_normalize_handler.h
@@ -58,6 +58,7 @@ private:
 private:
     int32_t timerId_ { -1 };
     void ResetTouchUpEvent(std::shared_ptr<PointerEvent> pointerEvent, struct libinput_event *event);
+    DeviceConfigManagement configManagement_;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/event_handler/src/event_normalize_handler.cpp b/service/event_handler/src/event_normalize_handler.cpp
index 562bb079ca..ec54babd6a 100644
--- a/service/event_handler/src/event_normalize_handler.cpp
+++ b/service/event_handler/src/event_normalize_handler.cpp
@@ -18,6 +18,7 @@
 #include "bytrace_adapter.h"
 #include "define_multimodal.h"
 #include "dfx_hisysevent.h"
+
 #include "device_config_file_parser.h"
 #include "error_multimodal.h"
 #include "event_log_helper.h"
@@ -40,7 +41,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "EventNormalizeHandler" };
-DeviceConfigManagement configManagement_;
 }
 
 void EventNormalizeHandler::HandleEvent(libinput_event* event)
diff --git a/service/mouse_event_normalize/include/mouse_event_normalize.h b/service/mouse_event_normalize/include/mouse_event_normalize.h
index 218e4863c0..58a76cc9ad 100644
--- a/service/mouse_event_normalize/include/mouse_event_normalize.h
+++ b/service/mouse_event_normalize/include/mouse_event_normalize.h
@@ -33,7 +33,7 @@ public:
     DISALLOW_COPY_AND_MOVE(MouseEventNormalize);
     std::shared_ptr<PointerEvent> GetPointerEvent();
     int32_t OnEvent(struct libinput_event *event);
-    bool GetSpeedGain(double vin, double &gain, int32_t deviceId) const;
+    bool GetSpeedGain(double vin, int32_t deviceId, double &gain) const;
     void Dump(int32_t fd, const std::vector<std::string> &args);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     void SetAbsolutionLocation(double xPercent, double yPercent);
diff --git a/service/mouse_event_normalize/include/mouse_transform_processor.h b/service/mouse_event_normalize/include/mouse_transform_processor.h
index 5f01b26239..6c1d58a0e2 100644
--- a/service/mouse_event_normalize/include/mouse_transform_processor.h
+++ b/service/mouse_event_normalize/include/mouse_transform_processor.h
@@ -65,7 +65,7 @@ public:
     static int32_t GetDisplayId();
     static int32_t SetPointerSpeed(int32_t speed);
     static int32_t GetPointerSpeed();
-    static bool GetSpeedGain(double vin, double &gain, int32_t deviceId);
+    static bool GetSpeedGain(double vin, int32_t deviceId, double &gain);
     static int32_t SetPointerLocation(int32_t x, int32_t y);
     static void SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed);
     static void RemovePointerSpeed(int32_t deviceId);
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index 25bbc8744b..1ff635d788 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -38,9 +38,9 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Mouse
 MouseEventNormalize::MouseEventNormalize() {}
 MouseEventNormalize::~MouseEventNormalize() {}
 
-bool MouseEventNormalize::GetSpeedGain(double vin, double &gain, int32_t deviceId) const
+bool MouseEventNormalize::GetSpeedGain(double vin, int32_t deviceId, double &gain) const
 {
-    return MouseTransformProcessor::GetSpeedGain(vin, gain, deviceId);
+    return MouseTransformProcessor::GetSpeedGain(vin, deviceId, gain);
 }
 
 std::shared_ptr<MouseTransformProcessor> MouseEventNormalize::GetProcessor(int32_t deviceId) const
diff --git a/service/mouse_event_normalize/src/mouse_transform_processor.cpp b/service/mouse_event_normalize/src/mouse_transform_processor.cpp
index cd919c8474..aeb2030638 100644
--- a/service/mouse_event_normalize/src/mouse_transform_processor.cpp
+++ b/service/mouse_event_normalize/src/mouse_transform_processor.cpp
@@ -119,7 +119,7 @@ int32_t MouseTransformProcessor::HandleMotionAccelerate(struct libinput_event_po
     double dy = libinput_event_pointer_get_dy(data);
     double vin = (fmax(abs(dx), abs(dy)) + fmin(abs(dx), abs(dy))) / 2.0;
     double gain { 0.0 };
-    if (!GetSpeedGain(vin, gain, deviceId)) {
+    if (!GetSpeedGain(vin, deviceId, gain)) {
         MMI_HILOGE("Get speed gain failed");
         return RET_ERR;
     }
@@ -429,7 +429,7 @@ int32_t MouseTransformProcessor::GetPointerSpeed()
     return speed_;
 }
 
-bool MouseTransformProcessor::GetSpeedGain(double vin, double &gain, int32_t deviceId)
+bool MouseTransformProcessor::GetSpeedGain(double vin, int32_t deviceId, double &gain)
 {
     if (fabs(vin) < DOUBLE_ZERO) {
         MMI_HILOGE("The value of the parameter passed in is 0");
-- 
Gitee


From 5ecd9f4c65cdf7b549fb906044a9e616a687900d Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Fri, 16 Dec 2022 20:29:51 +0800
Subject: [PATCH 250/360] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 service/event_handler/include/event_normalize_handler.h | 1 +
 service/event_handler/src/event_normalize_handler.cpp   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/event_handler/include/event_normalize_handler.h b/service/event_handler/include/event_normalize_handler.h
index c2f82b64f5..e07c01629b 100644
--- a/service/event_handler/include/event_normalize_handler.h
+++ b/service/event_handler/include/event_normalize_handler.h
@@ -18,6 +18,7 @@
 
 #include <memory>
 
+#include "device_config_file_parser.h"
 #include "i_input_event_handler.h"
 
 namespace OHOS {
diff --git a/service/event_handler/src/event_normalize_handler.cpp b/service/event_handler/src/event_normalize_handler.cpp
index ec54babd6a..49e30ab143 100644
--- a/service/event_handler/src/event_normalize_handler.cpp
+++ b/service/event_handler/src/event_normalize_handler.cpp
@@ -19,7 +19,6 @@
 #include "define_multimodal.h"
 #include "dfx_hisysevent.h"
 
-#include "device_config_file_parser.h"
 #include "error_multimodal.h"
 #include "event_log_helper.h"
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-- 
Gitee


From 6ca75f21e894e93830faeb60190979f23e7c283e Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 20 Dec 2022 10:18:09 +0800
Subject: [PATCH 251/360] input device and display bind

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 BUILD.gn                                      |   4 +
 bundle.json                                   |   3 +-
 examples/input_device_display_bind/BUILD.gn   |  28 +
 .../src/input_device_display_bind.cpp         | 121 +++++
 .../include/input_manager_impl.h              |   3 +
 .../event_handler/src/input_manager_impl.cpp  |  24 +
 frameworks/proxy/events/src/input_manager.cpp |  10 +
 .../innerkits/proxy/include/input_manager.h   |   3 +
 .../innerkits/proxy/include/window_info.h     |   9 +
 multimodalinput.cfg                           |   3 +-
 service/BUILD.gn                              |   2 +
 service/connect_manager/BUILD.gn              |   1 +
 .../include/i_multimodal_input_connect.h      |   9 +-
 .../multimodal_input_connect_manager.h        |   2 +
 .../include/multimodal_input_connect_proxy.h  |   2 +
 .../include/multimodal_input_connect_stub.h   |   2 +
 .../src/multimodal_input_connect_manager.cpp  |  20 +
 .../src/multimodal_input_connect_proxy.cpp    |  55 ++
 .../src/multimodal_input_connect_stub.cpp     |  56 ++
 .../include/input_device_manager.h            |   9 +-
 .../src/input_device_manager.cpp              |  55 +-
 service/module_loader/include/mmi_service.h   |   2 +
 service/module_loader/src/mmi_service.cpp     |  24 +
 .../include/input_display_bind_helper.h       |  52 ++
 .../include/input_windows_manager.h           |   8 +-
 .../src/input_display_bind_helper.cpp         | 511 ++++++++++++++++++
 .../src/input_windows_manager.cpp             |  63 ++-
 .../test/input_display_bind_helper_test.cpp   | 250 +++++++++
 28 files changed, 1321 insertions(+), 10 deletions(-)
 create mode 100644 examples/input_device_display_bind/BUILD.gn
 create mode 100644 examples/input_device_display_bind/src/input_device_display_bind.cpp
 create mode 100644 service/window_manager/include/input_display_bind_helper.h
 create mode 100644 service/window_manager/src/input_display_bind_helper.cpp
 create mode 100644 service/window_manager/test/input_display_bind_helper_test.cpp

diff --git a/BUILD.gn b/BUILD.gn
index 1a3a23dde2..965d38c173 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -150,3 +150,7 @@ group("mmi_tests") {
     "util:ut-mmi-util-out",
   ]
 }
+
+group("examples_group") {
+  deps = [ "examples/input_device_display_bind:input_device_display_bind" ]
+}
diff --git a/bundle.json b/bundle.json
index 3b314ac886..3fcd435040 100644
--- a/bundle.json
+++ b/bundle.json
@@ -91,7 +91,8 @@
           "//third_party/mtdev:libmtdev",
           "//third_party/libevdev:libevdev",
           "//foundation/multimodalinput/input:uinput_inject",
-          "//foundation/multimodalinput/input:mmi_uinput.rc"
+          "//foundation/multimodalinput/input:mmi_uinput.rc",
+          "//foundation/multimodalinput/input:examples_group"
         ]
       },
       "inner_kits": [
diff --git a/examples/input_device_display_bind/BUILD.gn b/examples/input_device_display_bind/BUILD.gn
new file mode 100644
index 0000000000..b3d665d894
--- /dev/null
+++ b/examples/input_device_display_bind/BUILD.gn
@@ -0,0 +1,28 @@
+# Copyright (c) 2022 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+
+ohos_executable("input_device_display_bind") {
+  sources = [ "src/input_device_display_bind.cpp" ]
+
+  include_dirs = []
+
+  deps = [
+    "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
+    "//foundation/multimodalinput/input/util:libmmi-util",
+  ]
+
+  subsystem_name = "multimodalinput"
+  part_name = "input"
+}
diff --git a/examples/input_device_display_bind/src/input_device_display_bind.cpp b/examples/input_device_display_bind/src/input_device_display_bind.cpp
new file mode 100644
index 0000000000..a17e2aacdf
--- /dev/null
+++ b/examples/input_device_display_bind/src/input_device_display_bind.cpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <iostream>
+#include <cstdio>
+#include <sstream>
+#include <getopt.h>
+#include <vector>
+#include <array>
+#include <iomanip>
+#include <algorithm>
+
+#include "input_manager.h"
+
+void Help(const std::string title = {})
+{
+    std::cout << title << std::endl;
+    printf(
+"Usage\n"
+"-q     --query                             Query input device and display infomation\n"
+"-s     --set 'inputDeivceId displayId'     Query input device and display infomation\n"
+    );
+}
+
+int main(int argc, char *argv[])
+{
+    struct option headOptions[] = {
+        {"query", no_argument, NULL, 'q'},
+        {"set", required_argument, NULL, 's'},
+        {"help", no_argument, NULL, 'h'},
+        {NULL, 0, NULL, 0}
+    };
+
+    if (argc < 2) {
+        Help();
+        return 0;
+    }
+
+    int32_t optionIndex = 0;
+    optind = 0;
+    int32_t c = 0;
+    if ((c = getopt_long(argc, argv, "qs:h?", headOptions, &optionIndex)) != -1) {
+        switch (c) {
+            case 'q': {
+                printf("query\n");
+                OHOS::MMI::DisplayBindInfos infos;
+                auto ret = OHOS::MMI::InputManager::GetInstance()->GetDisplayBindInfo(infos);
+                if (ret != 0) {
+                    printf("Get display bind info failed.\n");
+                    return -1;
+                }
+                std::vector<std::array<std::string, 5>> arrStrings;
+                std::array<std::string, 5> arr0 = {"No.", "Input device Id", "Input device Name", "Display id", "Display name"};
+                arrStrings.push_back(arr0);
+                for (size_t i = 0; i < infos.size(); ++i) {
+                    const auto &info = infos[i];
+                    std::array<std::string, 5> arr;
+                    arr[0] = std::to_string(i + 1);
+                    arr[1] = (info.inputDeviceId == -1) ? "" : std::to_string(info.inputDeviceId);
+                    arr[2] = info.inputDeviceName;
+                    arr[3] = (info.displayId == -1) ? "" : std::to_string(info.displayId);
+                    arr[4] = info.displayName;
+                    arrStrings.push_back(arr);
+                }
+                std::array<size_t, 5> arrWidth {};
+                for (const auto &[a, b, c, d, e] : arrStrings) {
+                    arrWidth[0] = std::max(arrWidth[0], a.length());
+                    arrWidth[1] = std::max(arrWidth[1], b.length());
+                    arrWidth[2] = std::max(arrWidth[2], c.length());
+                    arrWidth[3] = std::max(arrWidth[3], d.length());
+                    arrWidth[4] = std::max(arrWidth[4], e.length());
+                }
+                for (const auto &[a, b, c, d, e] : arrStrings) {
+                    std::cout << "|" << " " << std::setw(arrWidth[0]) << std::setfill(' ') << std::left << a << " "
+                        << "|" << " " << std::setw(arrWidth[1]) << std::setfill(' ') << std::left << b << " "
+                        << "|" << " " << std::setw(arrWidth[2]) << std::setfill(' ') << std::left << c << " "
+                        << "|" << " " << std::setw(arrWidth[3]) << std::setfill(' ') << std::left << d << " "
+                        << "|" << " " << std::setw(arrWidth[4]) << std::setfill(' ') << std::left << e << " "
+                        << "|" << std::endl;
+                }
+                return 0;
+            }
+            case 's': {
+                std::istringstream iss(optarg);
+                int32_t deviceId = -1;
+                int32_t displayId = -1;
+                iss >> deviceId >> displayId;
+                if (iss.fail()) {
+                    Help("Arg is not right");
+                    return -1;
+                }
+                printf("args: deviceId:%d, displayId:%d\n", deviceId, displayId);
+                std::string msg;
+                auto ret = OHOS::MMI::InputManager::GetInstance()->SetDisplayBind(deviceId, displayId, msg);
+                if (ret != 0) {
+                    printf("Set display bind failed, %s\n", msg.c_str());
+                    return -1;
+                }
+                return 0;
+            }
+            case 'h':
+            default: {
+                Help();
+                break;
+            }
+        }
+    };
+    return 0;
+}
\ No newline at end of file
diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index 15184567f3..02d2c523e5 100644
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -47,6 +47,9 @@ class InputManagerImpl final {
 public:
     DISALLOW_MOVE(InputManagerImpl);
 
+    int32_t GetDisplayBindInfo(DisplayBindInfos &infos);
+    int32_t SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg);
+
     void UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo);
     int32_t SubscribeKeyEvent(
         std::shared_ptr<KeyOption> keyOption,
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 5274bacebb..0a480e0b68 100755
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -71,6 +71,30 @@ private:
 InputManagerImpl::InputManagerImpl() {}
 InputManagerImpl::~InputManagerImpl() {}
 
+
+int32_t InputManagerImpl::GetDisplayBindInfo(DisplayBindInfos &infos)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mtx_);
+    int32_t ret = MultimodalInputConnMgr->GetDisplayBindInfo(infos);
+    if (ret != RET_OK) {
+        MMI_HILOGE("GetDisplayBindInfo failed, ret:%{public}d", ret);
+        return RET_ERR;
+    }
+    return RET_OK;
+}
+
+int32_t InputManagerImpl::SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg)
+{
+    std::lock_guard<std::mutex> guard(mtx_);
+    int32_t ret = MultimodalInputConnMgr->SetDisplayBind(deviceId, displayId, msg);
+    if (ret != RET_OK) {
+        MMI_HILOGE("SetDisplayBind failed, ret:%{public}d", ret);
+        return RET_ERR;
+    }
+    return RET_OK;
+}
+
 void InputManagerImpl::UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo)
 {
     CALL_DEBUG_ENTER;
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index b725df51cb..7c9a515115 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -32,6 +32,16 @@ InputManager *InputManager::GetInstance()
     return instance_;
 }
 
+int32_t InputManager::GetDisplayBindInfo(DisplayBindInfos &infos)
+{
+    return InputMgrImpl.GetDisplayBindInfo(infos);
+}
+
+int32_t InputManager::SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg)
+{
+    return InputMgrImpl.SetDisplayBind(deviceId, displayId, msg);
+}
+
 void InputManager::UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo)
 {
     InputMgrImpl.UpdateDisplayInfo(displayGroupInfo);
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index e81dc740c9..627a0b4dfa 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -46,6 +46,9 @@ public:
     static InputManager *GetInstance();
     virtual ~InputManager() = default;
 
+    int32_t GetDisplayBindInfo(DisplayBindInfos &infos);
+    int32_t SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg);
+
     /**
      * @brief Updates the screen and window information.
      * @param displayGroupInfo Indicates the logical screen information.
diff --git a/interfaces/native/innerkits/proxy/include/window_info.h b/interfaces/native/innerkits/proxy/include/window_info.h
index 6a2cbb4299..8117b4d966 100644
--- a/interfaces/native/innerkits/proxy/include/window_info.h
+++ b/interfaces/native/innerkits/proxy/include/window_info.h
@@ -269,6 +269,15 @@ struct DisplayGroupInfo {
      */
     std::vector<DisplayInfo> displaysInfo;
 };
+
+struct DisplayBindInfo
+{
+    int32_t inputDeviceId = -1;
+    std::string inputDeviceName;
+    int32_t displayId = -1;
+    std::string displayName;
+};
+using DisplayBindInfos = std::vector<DisplayBindInfo>;
 } // namespace MMI
 } // namespace OHOS
 #endif // DISPLAY_INFO_H
\ No newline at end of file
diff --git a/multimodalinput.cfg b/multimodalinput.cfg
index 53d4bd8b7e..bb184e05b6 100644
--- a/multimodalinput.cfg
+++ b/multimodalinput.cfg
@@ -16,7 +16,8 @@
         },{
             "name" : "early-boot",
             "cmds" : [
-                "mkdir /data/service/el1/public/udev 0711 root system"
+                "mkdir /data/service/el1/public/udev 0711 root system",                
+                "mkdir /data/service/el1/public/multimodalinput 0644 input input"
             ]
         }
     ],
diff --git a/service/BUILD.gn b/service/BUILD.gn
index e3a08ca8b7..2dffef5db2 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -103,6 +103,7 @@ ohos_shared_library("libmmi-server") {
     "module_loader/src/uds_server.cpp",
     "permission_helper/src/permission_helper.cpp",
     "timer_manager/src/timer_manager.cpp",
+    "window_manager/src/input_display_bind_helper.cpp",
     "window_manager/src/input_windows_manager.cpp",
   ]
 
@@ -265,6 +266,7 @@ ohos_unittest("ut-mmi-service-out") {
   sources = [
     "event_dispatch/test/event_dispatch_test.cpp",
     "module_loader/test/uds_server_test.cpp",
+    "window_manager/test/input_display_bind_helper_test.cpp",
     "window_manager/test/input_windows_manager_test.cpp",
   ]
 
diff --git a/service/connect_manager/BUILD.gn b/service/connect_manager/BUILD.gn
index e9e24fc829..71c4fad7bd 100644
--- a/service/connect_manager/BUILD.gn
+++ b/service/connect_manager/BUILD.gn
@@ -19,6 +19,7 @@ config("mmi_connect_manager_config") {
   include_dirs = [
     "//foundation/multimodalinput/input/interfaces/native/innerkits/common/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
+    "//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include",
     "//foundation/multimodalinput/input/util/common/include",
     "//foundation/multimodalinput/input/util/network/include",
     "//foundation/multimodalinput/input/util/socket/include",
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
index ce24b9b672..0bc2e786c3 100644
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -19,13 +19,14 @@
 #include "iremote_broker.h"
 
 #include "i_event_filter.h"
-#include "input_device.h"
 #include "i_input_event_filter.h"
+#include "input_device.h"
 #include "input_handler_type.h"
 #include "key_event.h"
 #include "key_option.h"
 #include "pointer_event.h"
 #include "system_ability_definition.h"
+#include "window_info.h"
 
 namespace OHOS {
 namespace MMI {
@@ -60,12 +61,14 @@ public:
         GET_FUNCTION_KEY_STATE = 26,
         RMV_INPUT_EVENT_FILTER = 27,
         SET_CAPTURE_MODE = 28,
+        GET_DISPLAY_BIND_INFO = 29,
         REGISTER_COOPERATE_MONITOR = 30,
         UNREGISTER_COOPERATE_MONITOR = 31,
         ENABLE_INPUT_DEVICE_COOPERATE = 32,
         START_INPUT_DEVICE_COOPERATE = 33,
         STOP_DEVICE_COOPERATE = 34,
-        GET_INPUT_DEVICE_COOPERATE_STATE = 35,
+        GET_INPUT_DEVICE_COOPERATE_STATE = 35,        
+        SET_DISPLAY_BIND = 36,
         SET_INPUT_DEVICE_TO_SCREEN = 50,
         SET_POINTER_LOCATION = 51,
     };
@@ -105,6 +108,8 @@ public:
     virtual int32_t UnsubscribeKeyEvent(int32_t subscribeId) = 0;
     virtual int32_t InjectPointerEvent(const std::shared_ptr<PointerEvent> pointerEvent) = 0;
     virtual int32_t SetAnrObserver() = 0;
+    virtual int32_t GetDisplayBindInfo(DisplayBindInfos &infos) = 0;
+    virtual int32_t SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg) = 0;
     virtual int32_t RegisterCooperateListener() = 0;
     virtual int32_t UnregisterCooperateListener() = 0;
     virtual int32_t EnableInputDeviceCooperate(int32_t userData, bool enabled) = 0;
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
index 8fa3ee83af..bea8091aae 100644
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -39,6 +39,8 @@ public:
     }
     int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority);
     int32_t RemoveInputEventFilter(int32_t filterId);
+    int32_t GetDisplayBindInfo(DisplayBindInfos &infos);
+    int32_t SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg);
     int32_t SetPointerVisible(bool visible);
     int32_t IsPointerVisible(bool &visible);
     int32_t MarkProcessed(int32_t eventType, int32_t eventId);
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
index eccc869e88..5fb11b425a 100644
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -58,6 +58,8 @@ public:
     int32_t UnsubscribeKeyEvent(int32_t subscribeId) override;
     int32_t InjectPointerEvent(const std::shared_ptr<PointerEvent> pointerEvent) override;
     int32_t SetAnrObserver() override;
+    int32_t GetDisplayBindInfo(DisplayBindInfos &infos) override;
+    int32_t SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg) override;
     int32_t RegisterCooperateListener() override;
     int32_t UnregisterCooperateListener() override;
     int32_t EnableInputDeviceCooperate(int32_t userData, bool enabled) override;
diff --git a/service/connect_manager/include/multimodal_input_connect_stub.h b/service/connect_manager/include/multimodal_input_connect_stub.h
index dccb380c6d..799bba8e6f 100644
--- a/service/connect_manager/include/multimodal_input_connect_stub.h
+++ b/service/connect_manager/include/multimodal_input_connect_stub.h
@@ -60,6 +60,8 @@ protected:
     int32_t StubUnsubscribeKeyEvent(MessageParcel& data, MessageParcel& reply);
     int32_t StubInjectPointerEvent(MessageParcel& data, MessageParcel& reply);
     int32_t StubSetAnrListener(MessageParcel& data, MessageParcel& reply);
+    int32_t StubGetDisplayBindInfo(MessageParcel& data, MessageParcel& reply);
+    int32_t StubSetDisplayBind(MessageParcel& data, MessageParcel& reply);
     int32_t StubSetPointerSpeed(MessageParcel& data, MessageParcel& reply);
     int32_t StubGetPointerSpeed(MessageParcel& data, MessageParcel& reply);
     int32_t StubRegisterCooperateMonitor(MessageParcel& data, MessageParcel& reply);
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
index 9edd02ca8c..e8e68fe756 100644
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -73,6 +73,26 @@ int32_t MultimodalInputConnectManager::GetClientSocketFdOfAllocedSocketPair() co
     return socketFd_;
 }
 
+int32_t MultimodalInputConnectManager::GetDisplayBindInfo(DisplayBindInfos &infos)
+{
+    std::lock_guard<std::mutex> guard(lock_);
+    if (multimodalInputConnectService_ == nullptr) {
+        MMI_HILOGE("The multimodalInputConnectService_ is nullptr");
+        return RET_ERR;
+    }
+    return multimodalInputConnectService_->GetDisplayBindInfo(infos);
+}
+
+int32_t MultimodalInputConnectManager::SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg)
+{
+    std::lock_guard<std::mutex> guard(lock_);
+    if (multimodalInputConnectService_ == nullptr) {
+        MMI_HILOGE("The multimodalInputConnectService_ is nullptr");
+        return RET_ERR;
+    }
+    return multimodalInputConnectService_->SetDisplayBind(deviceId, displayId, msg);    
+}
+
 int32_t MultimodalInputConnectManager::AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority)
 {
     std::lock_guard<std::mutex> guard(lock_);
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index e7025bdb4d..07d6ac48d4 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -679,6 +679,61 @@ int32_t MultimodalInputConnectProxy::SetAnrObserver()
     return RET_OK;
 }
 
+int32_t MultimodalInputConnectProxy::GetDisplayBindInfo(DisplayBindInfos &infos)
+{
+    CALL_DEBUG_ENTER;
+    MessageParcel data;
+    if (!data.WriteInterfaceToken(MultimodalInputConnectProxy::GetDescriptor())) {
+        MMI_HILOGE("Failed to write descriptor");
+        return ERR_INVALID_VALUE;
+    }
+    MessageParcel reply;
+    MessageOption option;
+    sptr<IRemoteObject> remote = Remote();
+    CHKPR(remote, RET_ERR);
+    int32_t ret = remote->SendRequest(GET_DISPLAY_BIND_INFO, data, reply, option);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Send request failed, ret:%{public}d", ret);
+        return ret;
+    }
+    int32_t size = 0;
+    READINT32(reply, size, ERR_INVALID_VALUE);
+    infos.reserve(size);
+    for (int32_t i = 0; i < size; ++i) {
+        DisplayBindInfo info;
+        READINT32(reply, info.inputDeviceId, ERR_INVALID_VALUE);
+        READSTRING(reply, info.inputDeviceName, ERR_INVALID_VALUE);
+        READINT32(reply, info.displayId, ERR_INVALID_VALUE);
+        READSTRING(reply, info.displayName, ERR_INVALID_VALUE);
+        infos.push_back(info);
+    }
+    return RET_OK;
+}
+
+int32_t MultimodalInputConnectProxy::SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg)
+{
+    CALL_DEBUG_ENTER;
+    MessageParcel data;
+    if (!data.WriteInterfaceToken(MultimodalInputConnectProxy::GetDescriptor())) {
+        MMI_HILOGE("Failed to write descriptor");
+        return ERR_INVALID_VALUE;
+    }
+
+    WRITEINT32(data, deviceId, ERR_INVALID_VALUE);
+    WRITEINT32(data, displayId, ERR_INVALID_VALUE);
+
+    MessageParcel reply;
+    MessageOption option;
+    sptr<IRemoteObject> remote = Remote();
+    CHKPR(remote, RET_ERR);
+    int32_t ret = remote->SendRequest(SET_DISPLAY_BIND, data, reply, option);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Send request fail, result:%{public}d", ret);
+        return ret;
+    }
+    return RET_OK;
+}
+
 int32_t MultimodalInputConnectProxy::SetInputDevice(const std::string& dhid, const std::string& screenId)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index f4bf4fd774..00fd74e20e 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -73,6 +73,8 @@ int32_t MultimodalInputConnectStub::OnRemoteRequest(uint32_t code, MessageParcel
         {IMultimodalInputConnect::INJECT_KEY_EVENT, &MultimodalInputConnectStub::StubInjectKeyEvent},
         {IMultimodalInputConnect::INJECT_POINTER_EVENT, &MultimodalInputConnectStub::StubInjectPointerEvent},
         {IMultimodalInputConnect::SET_ANR_OBSERVER, &MultimodalInputConnectStub::StubSetAnrListener},
+        {IMultimodalInputConnect::GET_DISPLAY_BIND_INFO, &MultimodalInputConnectStub::StubGetDisplayBindInfo},
+        {IMultimodalInputConnect::SET_DISPLAY_BIND, &MultimodalInputConnectStub::StubSetDisplayBind},
         {IMultimodalInputConnect::REGISTER_COOPERATE_MONITOR,
             &MultimodalInputConnectStub::StubRegisterCooperateMonitor},
         {IMultimodalInputConnect::UNREGISTER_COOPERATE_MONITOR,
@@ -630,6 +632,60 @@ int32_t MultimodalInputConnectStub::StubSetAnrListener(MessageParcel& data, Mess
     return ret;
 }
 
+
+int32_t MultimodalInputConnectStub::StubGetDisplayBindInfo(MessageParcel& data, MessageParcel& reply)
+{
+    CALL_DEBUG_ENTER;
+    if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
+        MMI_HILOGE("Permission check failed");
+        return CHECK_PERMISSION_FAIL;
+    }
+    if (!IsRunning()) {
+        MMI_HILOGE("Service is not running");
+        return MMISERVICE_NOT_RUNNING;
+    }
+    DisplayBindInfos infos;
+    int32_t ret = GetDisplayBindInfo(infos);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Call GetDisplayBindInfo failed, ret:%{public}d", ret);
+        return ret;
+    }
+    int32_t size = static_cast<int32_t>(infos.size());
+    WRITEINT32(reply, size, ERR_INVALID_VALUE);
+    infos.reserve(size);
+    for (const auto &info : infos) {
+        WRITEINT32(reply, info.inputDeviceId, ERR_INVALID_VALUE);
+        WRITESTRING(reply, info.inputDeviceName, ERR_INVALID_VALUE);
+        WRITEINT32(reply, info.displayId, ERR_INVALID_VALUE);
+        WRITESTRING(reply, info.displayName, ERR_INVALID_VALUE);
+    }
+    return RET_OK;
+}
+
+int32_t MultimodalInputConnectStub::StubSetDisplayBind(MessageParcel& data, MessageParcel& reply)
+{
+    CALL_DEBUG_ENTER;
+    if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
+        MMI_HILOGE("Permission check failed");
+        return CHECK_PERMISSION_FAIL;
+    }
+    if (!IsRunning()) {
+        MMI_HILOGE("Service is not running");
+        return MMISERVICE_NOT_RUNNING;
+    }
+    int32_t inputDeviceId = -1;
+    READINT32(data, inputDeviceId, ERR_INVALID_VALUE);
+    int32_t displayId = -1;
+    READINT32(data, displayId, ERR_INVALID_VALUE); 
+    std::string msg;  
+    int32_t ret = SetDisplayBind(inputDeviceId, displayId, msg);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Call SetDisplayBind failed, ret:%{public}d", ret);
+    }
+    WRITESTRING(reply, msg, ERR_INVALID_VALUE);  
+    return ret;
+}
+
 int32_t MultimodalInputConnectStub::StubRegisterCooperateMonitor(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/device_manager/include/input_device_manager.h b/service/device_manager/include/input_device_manager.h
index eac3fb24cb..e42f69691d 100644
--- a/service/device_manager/include/input_device_manager.h
+++ b/service/device_manager/include/input_device_manager.h
@@ -43,6 +43,7 @@ class InputDeviceManager final : public IDeviceObject {
         bool isPointerDevice { false };
         bool isTouchableDevice { false };
         std::string dhid;
+        std::string sysUid;
     };
 public:
     DISALLOW_COPY_AND_MOVE(InputDeviceManager);
@@ -83,7 +84,8 @@ public:
     bool HasTouchDevice();
     int32_t SetInputDevice(const std::string& dhid, const std::string& screenId);
     const std::string& GetScreenId(int32_t deviceId) const;
-
+    using inputDeviceCallback = std::function<void(int32_t deviceId, std::string devName, std::string devStatus)>;
+    void SetInputStatusChangeCallback(inputDeviceCallback callback);
 private:
     void MakeDeviceInfo(struct libinput_device *inputDevice, struct InputDeviceInfo& info);
     bool IsMatchKeys(struct libinput_device* device, const std::vector<int32_t> &keyCodes) const;
@@ -93,11 +95,16 @@ private:
     std::string Sha256(const std::string &in) const;
     std::string GenerateDescriptor(struct libinput_device *inputDevice, bool isRemote) const;
 #endif // OHOS_BUILD_ENABLE_COOPERATE
+    std::string GetInputIdentification(struct libinput_device* inputDevice);
+    void NotifyDevCallback(int32_t deviceId,  struct InputDeviceInfo inDevice);
+private:
     std::map<int32_t, struct InputDeviceInfo> inputDevice_;
     std::map<std::string, std::string> inputDeviceScreens_;
     int32_t nextId_ { 0 };
     std::list<std::shared_ptr<IDeviceObserver>> observers_;
     std::map<SessionPtr, std::function<void(int32_t, const std::string&)>> devListener_;
+    inputDeviceCallback devCallbacks_ = { nullptr };
+    std::map<int32_t, std::string> displayInputBindInfos_;
 };
 
 #define InputDevMgr ::OHOS::DelayedSingleton<InputDeviceManager>::GetInstance()
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 08223e11ff..1acd020ec8 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -42,7 +42,6 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDeviceManager" };
 constexpr int32_t INVALID_DEVICE_ID = -1;
 constexpr int32_t SUPPORT_KEY = 1;
-
 const std::string UNKNOWN_SCREEN_ID = "";
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
 const char *SPLIT_SYMBOL = "|";
@@ -249,6 +248,12 @@ int32_t InputDeviceManager::GetKeyboardType(int32_t deviceId, int32_t &keyboardT
     return GetDeviceSupportKey(deviceId, keyboardType);
 }
 
+void InputDeviceManager::SetInputStatusChangeCallback(inputDeviceCallback callback)
+{
+    CALL_DEBUG_ENTER;
+    devCallbacks_ = callback;
+}
+
 void InputDeviceManager::AddDevListener(SessionPtr sess, std::function<void(int32_t, const std::string&)> callback)
 {
     CALL_DEBUG_ENTER;
@@ -293,6 +298,45 @@ bool InputDeviceManager::HasTouchDevice()
     return false;
 }
 
+std::string InputDeviceManager::GetInputIdentification(struct libinput_device* inputDevice)
+{
+    CALL_DEBUG_ENTER;
+    uint32_t deviceVendor = libinput_device_get_id_vendor(inputDevice);
+    uint32_t deviceProduct = libinput_device_get_id_product(inputDevice);
+    struct udev_device* udevDevice = libinput_device_get_udev_device(inputDevice);
+    std::string sysPath = udev_device_get_syspath(udevDevice);
+    if ((deviceVendor < 0) || (deviceProduct < 0) || sysPath.empty()) {
+        MMI_HILOGE("Get device identification failed");
+        return "";
+    }
+    const size_t bufSize = 10;
+    char vid[bufSize] = "";
+    char pid[bufSize] = "";
+    sprintf_s(vid, sizeof(vid), "%04X", deviceVendor);
+    sprintf_s(pid, sizeof(pid), "%04X", deviceProduct);
+    std::string strVid(vid);
+    std::string strPid(pid);
+    std::string vendorProduct = strVid + ":" + strPid;
+    std::string deviceIdentification = sysPath.substr(0, sysPath.find(vendorProduct)) + vendorProduct;
+    MMI_HILOGI("Device identification is:%{public}s", deviceIdentification.c_str());
+    return deviceIdentification;
+}
+
+void InputDeviceManager::NotifyDevCallback(int32_t deviceId,  struct InputDeviceInfo inDevice)
+{
+    if (!inDevice.isTouchableDevice || (deviceId < 0)) {
+        MMI_HILOGI("The device is not touchable device already existent");
+        return;
+    }
+    if (!inDevice.sysUid.empty()) {
+        devCallbacks_(deviceId, inDevice.sysUid, "add");
+        MMI_HILOGI("Send device info to window manager, device id:%{public}d, system uid:%{public}s, status:add",
+            deviceId, inDevice.sysUid.c_str());
+    } else {
+        MMI_HILOGE("Get device system uid id is empty, deviceId:%{public}d", deviceId);
+    }
+}
+
 void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
 {
     CALL_DEBUG_ENTER;
@@ -320,6 +364,7 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
         CHKPC(item.first);
         item.second(nextId_, "add");
     }
+    NotifyDevCallback(nextId_, info);
     ++nextId_;
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     if (IsKeyboardDevice(inputDevice)) {
@@ -354,6 +399,7 @@ void InputDeviceManager::MakeDeviceInfo(struct libinput_device *inputDevice, str
     info.isRemote = IsRemote(inputDevice);
     info.isPointerDevice = IsPointerDevice(inputDevice);
     info.isTouchableDevice = IsTouchDevice(inputDevice);
+    info.sysUid = GetInputIdentification(inputDevice);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     if (info.isRemote) {
         info.networkIdOrigin = MakeNetworkId(libinput_device_get_phys(inputDevice));
@@ -383,6 +429,13 @@ void InputDeviceManager::OnInputDeviceRemoved(struct libinput_device *inputDevic
             break;
         }
     }
+    std::string sysUid = GetInputIdentification(inputDevice);
+    if (!sysUid.empty()) {
+        devCallbacks_(deviceId, sysUid, "remove");
+        MMI_HILOGI("Send device info to window manager, device id:%{public}d, system uid:%{public}s, status:remove",
+            deviceId, sysUid.c_str());
+    }
+
 #ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
     if (IsPointerDevice(inputDevice) && !HasPointerDevice() &&
         IPointerDrawingManager::GetInstance()->GetMouseDisplayState()) {
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index 2be00c048f..9f0e3a9255 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -72,6 +72,8 @@ public:
     int32_t UnsubscribeKeyEvent(int32_t subscribeId) override;
     int32_t InjectPointerEvent(const std::shared_ptr<PointerEvent> pointerEvent) override;
     int32_t SetAnrObserver() override;
+    int32_t GetDisplayBindInfo(DisplayBindInfos &infos) override;
+    int32_t SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg) override;
     int32_t RegisterCooperateListener() override;
     int32_t UnregisterCooperateListener() override;
     int32_t EnableInputDeviceCooperate(int32_t userData, bool enabled) override;
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 9c4433e03d..1c75528759 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -863,6 +863,30 @@ int32_t MMIService::SetAnrObserver()
     return RET_OK;
 }
 
+int32_t MMIService::GetDisplayBindInfo(DisplayBindInfos &infos)
+{
+    CALL_DEBUG_ENTER;
+    int32_t ret = delegateTasks_.PostSyncTask(
+        std::bind(&InputWindowsManager::GetDisplayBindInfo, WinMgr, std::ref(infos)));
+    if (ret != RET_OK) {
+        MMI_HILOGE("GetDisplayBindInfo pid failed, ret:%{public}d", ret);
+        return RET_ERR;
+    }
+    return RET_OK;
+}
+
+int32_t MMIService::SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg)
+{
+    CALL_DEBUG_ENTER;
+    int32_t ret = delegateTasks_.PostSyncTask(
+        std::bind(&InputWindowsManager::SetDisplayBind, WinMgr, deviceId, displayId, std::ref(msg)));
+    if (ret != RET_OK) {
+        MMI_HILOGE("SetDisplayBind pid failed, ret:%{public}d", ret);
+        return RET_ERR;
+    }
+    return RET_OK;    
+}
+
 int32_t MMIService::GetFunctionKeyState(int32_t funcKey, bool &state)
 {
     CALL_INFO_TRACE;
diff --git a/service/window_manager/include/input_display_bind_helper.h b/service/window_manager/include/input_display_bind_helper.h
new file mode 100644
index 0000000000..c63fc10704
--- /dev/null
+++ b/service/window_manager/include/input_display_bind_helper.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INPUT_DISPLAY_BIND_HELPER_H
+#define INPUT_DISPLAY_BIND_HELPER_H
+
+#include <cstdint>
+#include <memory>
+#include <set>
+#include <string>
+
+#include "window_info.h"
+
+namespace OHOS {
+namespace MMI {
+class BindInfos;
+class InputDisplayBindHelper
+{
+public:
+	InputDisplayBindHelper(const std::string bindCfgFile);
+	std::string GetBindDisplayNameByInputDevice(int32_t inputDeviceId) const;
+	void AddInputDevice(int32_t id, const std::string &name);
+	void RemoveInputDevice(int32_t id);
+	bool IsDisplayAdd(int32_t id, const std::string &name);
+	std::set<std::pair<int32_t, std::string>> GetDisplayIdNames() const;
+	void AddDisplay(int32_t id, const std::string &name);
+	void RemoveDisplay(int32_t id);
+	void Load();
+	std::string Dumps() const;
+	void Store();
+	int32_t GetDisplayBindInfo(DisplayBindInfos &infos);
+	int32_t SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg);
+private:
+	const std::string fileName_;
+	std::shared_ptr<BindInfos> infos_;
+	std::shared_ptr<BindInfos> configFileInfos_;
+};
+} //namespace MMI
+} // namespace OHOS
+#endif // INPUT_DISPLAY_BIND_HELPER_H
\ No newline at end of file
diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
index 35f0b1d98e..14735f4b74 100644
--- a/service/window_manager/include/input_windows_manager.h
+++ b/service/window_manager/include/input_windows_manager.h
@@ -23,7 +23,9 @@
 
 #include "window_info.h"
 #include "input_event.h"
+#include "input_display_bind_helper.h"
 #include "input_event_data_transformation.h"
+#include "input_event.h"
 #include "pointer_event.h"
 #include "uds_server.h"
 
@@ -85,7 +87,9 @@ public:
 #endif // OHOS_BUILD_ENABLE_POINTER
     int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode);
     bool GetMouseIsCaptureMode() const;
-
+    void DeviceStatusChanged(int32_t deviceId, const std::string &sysUid, const std::string devStatus);
+    int32_t GetDisplayBindInfo(DisplayBindInfos &infos);
+    int32_t SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg);
 private:
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
     bool IsInHotArea(int32_t x, int32_t y, const std::vector<Rect> &rects) const;
@@ -132,6 +136,7 @@ private:
 #endif // OHOS_BUILD_ENABLE_POINTER
     void CheckFocusWindowChange(const DisplayGroupInfo &displayGroupInfo);
     void CheckZorderWindowChange(const DisplayGroupInfo &displayGroupInfo);
+    void UpdateDisplayIdAndName();
 private:
     UDSServer* udsServer_ { nullptr };
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -146,6 +151,7 @@ private:
     DisplayGroupInfo displayGroupInfo_;
     MouseLocation mouseLocation_ = { -1, -1 };
     std::map<int32_t, WindowInfo> touchItemDownInfos_;
+    InputDisplayBindHelper bindInfo_;
     struct CaptureModeInfo {
         int32_t windowId { -1 };
         bool isCaptureMode { false };
diff --git a/service/window_manager/src/input_display_bind_helper.cpp b/service/window_manager/src/input_display_bind_helper.cpp
new file mode 100644
index 0000000000..4d3aac7233
--- /dev/null
+++ b/service/window_manager/src/input_display_bind_helper.cpp
@@ -0,0 +1,511 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "input_display_bind_helper.h"
+
+#include <fstream>
+#include <iostream>
+#include <list>
+#include <sstream>
+
+#include "mmi_log.h"
+
+namespace OHOS {
+namespace MMI {
+namespace {
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDisplayBindHelper" };
+}
+class BindInfo
+{
+public:
+	int32_t GetInputDeviceId() const { return inputDeviceId_; }
+	std::string GetInputDeviceName() const { return inputDeviceName_; }
+	int32_t GetDisplayId() const { return displayId_; }
+	std::string GetDisplayName() const { return displayName_; }
+	bool IsUnbind() const {	return ((inputDeviceId_ == -1) || (displayId_ == -1)); }
+	bool InputDeviceNotBind() const { return (inputDeviceId_ == -1);	}
+	bool DisplayNotBind() const { return (displayId_ == -1); }
+	bool AddInputDevice(int32_t deviceId, const std::string &deviceName);
+	void RemoveInputDevice();
+	bool AddDisplay(int32_t id, const std::string &name);
+	void RemoveDisplay();
+	std::string GetDesc() const;
+	friend bool operator<(const BindInfo &l, const BindInfo &r);
+	friend std::ostream& operator<<(std::ostream &os, const BindInfo &r);
+	friend std::istream& operator>>(std::istream &is, BindInfo &r);
+private:
+	int32_t inputDeviceId_ { -1 };
+	std::string inputDeviceName_;
+	int32_t displayId_ { -1 };
+	std::string displayName_;
+};
+
+class BindInfos {
+public:
+	bool Add(const BindInfo &info);
+	void UnbindInputDevice(int32_t deviceId);
+	void UnbindDisplay(int32_t displayId);
+	BindInfo GetUnbindInputDevice(const std::string &displayName);
+	BindInfo GetUnbindDisplay(const std::string &inputDeviceName);    
+	std::string GetDisplayNameByInputDevice(const std::string &name);
+	int32_t GetBindDisplayIdByInputDevice(int32_t inputDeviceId) const;
+	std::string GetBindDisplayNameByInputDevice(int32_t inputDeviceId) const;
+	std::string GetInputDeviceByDisplayName(const std::string &name);
+    std::string GetDesc() const;
+	const std::list<BindInfo> &GetInfos() const { return infos_; }
+	friend std::ostream& operator<<(std::ostream &os, const BindInfos &r);
+	friend std::istream& operator>>(std::istream &is, BindInfos &r);
+private:
+    BindInfo GetUnbindInputDevice();
+    BindInfo GetUnbindInfo();
+    BindInfo GetUnbindDisplay();
+    std::list<BindInfo> infos_;
+};
+
+bool BindInfo::AddInputDevice(int32_t deviceId, const std::string &deviceName)
+{
+    if ((inputDeviceId_ != -1) || !inputDeviceName_.empty()) {
+        return false;
+    }
+    inputDeviceId_ = deviceId;
+    inputDeviceName_ = deviceName;
+    return true;
+}
+
+void BindInfo::RemoveInputDevice() {
+    inputDeviceId_ = -1;
+    inputDeviceName_.clear();
+}
+bool BindInfo::AddDisplay(int32_t id, const std::string &name) {
+    if ((displayId_ != -1) || !displayName_.empty()) {
+        return false;
+    }
+    displayId_ = id;
+    displayName_ = name;
+    return true;
+}
+void BindInfo::RemoveDisplay() {
+    displayId_ = -1;
+    displayName_.clear();
+}
+std::string BindInfo::GetDesc() const {
+    std::ostringstream oss;
+    oss << "InputDevice(id:" << inputDeviceId_ << ",name:" << inputDeviceName_ << "),Display(id:" << displayId_ << ",name:" << displayName_ << ")";
+    return oss.str();
+}
+
+bool operator<(const BindInfo &l, const BindInfo &r) {
+	if (l.inputDeviceId_ != r.inputDeviceId_) {
+		return (l.inputDeviceId_ < r.inputDeviceId_);
+	}
+	return (l.displayId_ < r.displayId_);
+}
+
+std::ostream& operator<<(std::ostream &os, const BindInfo &r) {
+	os << r.inputDeviceName_ << "<=>" << r.displayName_ << std::endl;
+	return os;
+}
+
+std::istream& operator>>(std::istream &is, BindInfo &r) {
+	std::string line;
+	std::getline(is, line);
+	const std::string delim = "<=>";
+	std::string::size_type pos = line.find(delim);
+	if (pos == std::string::npos) {
+		return is;
+	}
+	r.inputDeviceName_ = line.substr(0, pos);
+	r.displayName_ = line.substr(pos + delim.length());
+	r.inputDeviceId_ = 0;
+	r.displayId_ = 0;
+	return is;
+}
+
+std::string BindInfos::GetDesc() const {
+	int32_t index = 0;
+	std::ostringstream oss;
+	for (auto &info : infos_) {
+		oss << "index:" << index << "," << info.GetDesc() << std::endl;
+	}
+	return oss.str();
+}
+
+int32_t BindInfos::GetBindDisplayIdByInputDevice(int32_t inputDeviceId) const {
+	for (const auto &item : infos_) {
+		if (item.GetInputDeviceId() == inputDeviceId) {
+			if (!item.IsUnbind()) {
+				return item.GetDisplayId();
+			}
+		}
+	}
+	return -1;
+}
+
+std::string BindInfos::GetBindDisplayNameByInputDevice(int32_t inputDeviceId) const {
+	for (const auto &item : infos_) {
+		if (item.GetInputDeviceId() == inputDeviceId) {
+			if (!item.IsUnbind()) {
+				return item.GetDisplayName();
+			}
+		}
+	}
+	return "";
+}
+
+std::string BindInfos::GetDisplayNameByInputDevice(const std::string &name) {
+	for (const auto &item : infos_) {
+		if (item.GetInputDeviceName() == name) {
+			return item.GetDisplayName();
+		}
+	}
+	return "";
+}
+
+std::string BindInfos::GetInputDeviceByDisplayName(const std::string &name) {
+	for (const auto &item : infos_) {
+		if (item.GetDisplayName() == name) {
+			return item.GetInputDeviceName();
+		}
+	}
+	return "";
+}
+
+bool BindInfos::Add(const BindInfo &info) {
+	auto it = infos_.begin();
+	for (; it != infos_.end(); ++it) {
+		if (info < *it) {
+			break;
+		}
+	}
+	auto it2 = infos_.emplace(it, std::move(info));
+	if (it2 == infos_.end()) {
+		MMI_HILOGE("Duplicate %{public}s", info.GetDesc().c_str());
+	}
+	return true;
+}
+
+void BindInfos::UnbindInputDevice(int32_t deviceId) {
+	auto it = infos_.begin();
+	for (; it != infos_.end(); ++it) {
+		if (it->GetInputDeviceId() == deviceId) {
+			it->RemoveInputDevice();
+			if (it->IsUnbind()) {
+				infos_.erase(it);
+			}
+			return;
+		}
+	} 
+}
+
+void BindInfos::UnbindDisplay(int32_t displayId) {
+	auto it = infos_.begin();
+	for (; it != infos_.end(); ++it) {
+		if (it->GetDisplayId() == displayId) {
+			it->RemoveDisplay();
+			if (it->IsUnbind()) {
+				infos_.erase(it);
+			}
+			return;
+		}
+	} 
+}
+
+BindInfo BindInfos::GetUnbindInfo() {
+	auto it = infos_.begin();
+	while (it != infos_.end()) {
+		if (it->IsUnbind()) {
+			auto info = std::move(*it);
+			infos_.erase(it);
+			return info;
+		}
+		++it;
+	}
+	return BindInfo();
+}
+
+BindInfo BindInfos::GetUnbindInputDevice(const std::string &displayName) {
+	auto it = infos_.begin();
+	while (it != infos_.end()) {
+		if (it->InputDeviceNotBind()) {
+			if (it->GetDisplayName() == displayName) {
+				auto info = std::move(*it);
+				infos_.erase(it);
+				return info;
+			}
+		}
+		++it;
+	}
+	return BindInfo();
+}
+
+BindInfo BindInfos::GetUnbindDisplay() {
+	auto it = infos_.begin();
+	while (it != infos_.end()) {
+		if (it->DisplayNotBind()) {
+			auto info = std::move(*it);
+			infos_.erase(it);
+			return info;
+		}
+		++it;
+	}
+	return BindInfo();
+}
+
+BindInfo BindInfos::GetUnbindDisplay(const std::string &inputDeviceName) {
+	auto it = infos_.begin();
+	while (it != infos_.end()) {
+		if (it->DisplayNotBind()) {
+			if (it->GetInputDeviceName() == inputDeviceName) {
+				auto info = std::move(*it);
+				infos_.erase(it);
+				return info;
+			}
+		}
+		++it;
+	}
+	return GetUnbindDisplay();
+}
+
+std::ostream& operator<<(std::ostream &os, const BindInfos &r) {
+	const auto &infos = r.GetInfos();
+	for (const auto &info : infos) {
+		if (!info.IsUnbind()) {
+			os << info;
+		}
+	}
+	return os;
+}
+
+std::istream& operator>>(std::istream &is, BindInfos &r) {
+	while (!is.eof()) {
+		BindInfo info;
+		is >> info;
+		if (info.IsUnbind()) {
+			break;
+		}
+		r.Add(info);
+	}
+	return is;
+}
+
+InputDisplayBindHelper::InputDisplayBindHelper(const std::string bindCfgFile)
+	: fileName_(bindCfgFile),
+	infos_(std::make_shared<BindInfos>()),
+	configFileInfos_(std::make_shared<BindInfos>())
+{}
+
+std::string InputDisplayBindHelper::GetBindDisplayNameByInputDevice(int32_t inputDeviceId) const 
+{
+	CALL_DEBUG_ENTER;
+	if (infos_ == nullptr) {
+		return {};
+	}
+	return infos_->GetBindDisplayNameByInputDevice(inputDeviceId);
+}
+
+void InputDisplayBindHelper::AddInputDevice(int32_t id, const std::string &name)
+{
+	CALL_DEBUG_ENTER;
+	MMI_HILOGD("Param: id:%{public}d, name:%{public}s", id, name.c_str());
+	auto displayName = configFileInfos_->GetDisplayNameByInputDevice(name);
+	BindInfo info = infos_->GetUnbindInputDevice(displayName);
+	info.AddInputDevice(id, name);
+	infos_->Add(info);
+	Store();
+}
+
+void InputDisplayBindHelper::RemoveInputDevice(int32_t id)
+{
+	CALL_DEBUG_ENTER;
+	MMI_HILOGD("Param: id:%{public}d", id);
+	infos_->UnbindInputDevice(id);
+}
+
+bool InputDisplayBindHelper::IsDisplayAdd(int32_t id, const std::string &name)
+{
+	const auto &infos = infos_->GetInfos();
+	for (const auto &info : infos)	 {
+		if ((info.GetDisplayName() == name) && (info.GetDisplayId() == id)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+std::set<std::pair<int32_t, std::string>> InputDisplayBindHelper::GetDisplayIdNames() const
+{
+	CALL_DEBUG_ENTER;
+	std::set<std::pair<int32_t, std::string>> idNames;
+	const auto &infos = infos_->GetInfos();
+	for (const auto &info : infos)	 {
+		if (info.GetDisplayId() != -1) {
+			idNames.insert(std::make_pair(info.GetDisplayId(), info.GetDisplayName()));
+		}
+	}
+	return idNames;
+}
+
+void InputDisplayBindHelper::AddDisplay(int32_t id, const std::string &name)
+{
+	CALL_DEBUG_ENTER;
+	MMI_HILOGD("Param: id:%{public}d, name:%{public}s", id, name.c_str());
+	auto inputDeviceName = configFileInfos_->GetInputDeviceByDisplayName(name);
+	BindInfo info = infos_->GetUnbindDisplay(inputDeviceName);
+	info.AddDisplay(id, name);
+	infos_->Add(info);
+	Store();
+}
+
+void InputDisplayBindHelper::RemoveDisplay(int32_t id)
+{
+	CALL_DEBUG_ENTER;
+	MMI_HILOGD("Param: id:%{public}d", id);
+	infos_->UnbindDisplay(id);
+}
+
+void InputDisplayBindHelper::Store()
+{
+	CALL_DEBUG_ENTER;
+	if (infos_ == nullptr) {
+		return;
+	}
+	std::ofstream ofs(fileName_.c_str(), std::ios::trunc | std::ios::out | std::ios_base::binary);
+	if (!ofs) {
+		MMI_HILOGE("Open file fail.%{public}s, errno:%{public}d", fileName_.c_str(), errno);
+		return;
+	}
+	ofs << *infos_;
+	ofs.close();
+}
+
+int32_t InputDisplayBindHelper::GetDisplayBindInfo(DisplayBindInfos &infos)
+{
+	CALL_DEBUG_ENTER;
+	if (infos_ == nullptr) {
+		MMI_HILOGE("Infos_ is nullptr");
+		return RET_ERR;
+	}
+	for (const auto &item : infos_->GetInfos()) {
+		infos.push_back({
+			.inputDeviceId = item.GetInputDeviceId(), 
+			.inputDeviceName = item.GetInputDeviceName(), 
+			.displayId = item.GetDisplayId(), 
+			.displayName = item.GetDisplayName(), 
+		});
+	}
+	return RET_OK;
+}
+
+int32_t InputDisplayBindHelper::SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg)
+{
+	CALL_DEBUG_ENTER;
+	MMI_HILOGD("Param: deviceId:%{public}d, displayId:%{public}d", deviceId, displayId);
+	if ((deviceId == -1) || (displayId == -1)) {
+		msg = "The deviceId or displayId is invalid";
+		MMI_HILOGE("%s", msg.c_str());
+		return RET_ERR;
+	}
+	if (infos_ == nullptr) {
+		msg = "Infos_ is nullptr";
+		MMI_HILOGE("%s", msg.c_str());
+		return RET_ERR;
+	}
+
+	BindInfo bindByDevice;
+	BindInfo bindByDisplay;
+	for (const auto &item : infos_->GetInfos()) {
+		if (item.GetInputDeviceId() == deviceId) {
+			bindByDevice = item;
+		}
+		if (item.GetDisplayId() == displayId) {
+			bindByDisplay = item;
+		}
+	}
+	if (bindByDevice.GetInputDeviceId() == -1) {
+		msg = "The deviceId is invalid";
+		MMI_HILOGE("%s", msg.c_str());
+		return RET_ERR;
+	}
+	if (bindByDisplay.GetDisplayId() == -1) {
+		msg = "The displayId is invalid";
+		MMI_HILOGE("%s", msg.c_str());
+		return RET_ERR;
+	}
+
+	if (infos_->GetBindDisplayIdByInputDevice(deviceId) == displayId) {
+		msg = "The input device and display has alread bind";
+		MMI_HILOGE("%s", msg.c_str());
+		return RET_ERR;
+	}
+
+	infos_->UnbindInputDevice(bindByDevice.GetInputDeviceId());
+	infos_->UnbindInputDevice(bindByDisplay.GetInputDeviceId());
+	infos_->UnbindDisplay(bindByDevice.GetDisplayId());
+	infos_->UnbindDisplay(bindByDisplay.GetDisplayId());
+
+	BindInfo info1;
+	info1.AddInputDevice(bindByDevice.GetInputDeviceId(), bindByDevice.GetInputDeviceName()) ;
+	info1.AddDisplay(bindByDisplay.GetDisplayId(), bindByDisplay.GetDisplayName());
+	infos_->Add(info1);
+
+	if ((bindByDevice.GetDisplayId() != -1) && (bindByDisplay.GetInputDeviceId() != -1)) {
+		MMI_HILOGD("Both display id and input device id are invalid");
+		BindInfo info2;
+		info2.AddInputDevice(bindByDisplay.GetInputDeviceId(), bindByDisplay.GetInputDeviceName());
+		info2.AddDisplay(bindByDevice.GetDisplayId(), bindByDevice.GetDisplayName());
+		infos_->Add(info2);
+		return RET_OK;
+	}
+
+	if (bindByDevice.GetDisplayId() != -1) {
+		MMI_HILOGD("The display id is invalid");
+		AddDisplay(bindByDevice.GetDisplayId(), bindByDevice.GetDisplayName());
+		return RET_OK;
+	}
+
+	if (bindByDisplay.GetInputDeviceId() != -1) {
+		MMI_HILOGD("The input device id is invalid");
+		AddInputDevice(bindByDisplay.GetInputDeviceId(), bindByDisplay.GetInputDeviceName());
+		return RET_OK;
+	}
+	
+	msg = "Can not reach here";
+	return RET_ERR;
+}
+
+void InputDisplayBindHelper::Load()
+{
+	CALL_DEBUG_ENTER;
+	std::ifstream ifs(fileName_.c_str());
+	MMI_HILOGEK("Open file end:%{public}s", fileName_.c_str());
+	if (!ifs) {
+		MMI_HILOGE("Open file fail.%{public}s, errno:%{public}d", fileName_.c_str(), errno);
+		return;
+	}
+	ifs >> *configFileInfos_;
+	ifs.close();
+}
+
+std::string InputDisplayBindHelper::Dumps() const
+{
+	CALL_DEBUG_ENTER;
+	if (infos_ == nullptr) {
+		return {};
+	}
+	std::ostringstream oss;
+	oss << *infos_;
+	return oss.str();
+}
+} //namespace MMI
+} // namespace OHOS
\ No newline at end of file
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index bd63ac51d7..b0b0a530b6 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -35,19 +35,37 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Input
 constexpr int32_t DEFAULT_POINTER_STYLE = 0;
 constexpr size_t MAX_WINDOW_COUNT = 20;
 #endif // OHOS_BUILD_ENABLE_POINTER
+const std::string bindCfgFileName = "/data/service/el1/public/multimodalinput/display_bind.cfg";
 } // namespace
 
-InputWindowsManager::InputWindowsManager() {}
+InputWindowsManager::InputWindowsManager() : bindInfo_(bindCfgFileName)
+{
+    MMI_HILOGI("Bind cfg file name:%{public}s", bindCfgFileName.c_str());
+}
+
 InputWindowsManager::~InputWindowsManager() {}
 
+void InputWindowsManager::DeviceStatusChanged(int32_t deviceId, const std::string &sysUid, const std::string devStatus)
+{
+    CALL_INFO_TRACE;
+    if (devStatus == "add") {
+        bindInfo_.AddInputDevice(deviceId, sysUid);
+    } else {
+        bindInfo_.RemoveInputDevice(deviceId);
+    }
+}
+
 void InputWindowsManager::Init(UDSServer& udsServer)
 {
     udsServer_ = &udsServer;
     CHKPV(udsServer_);
+    bindInfo_.Load();
 #ifdef OHOS_BUILD_ENABLE_POINTER
     udsServer_->AddSessionDeletedCallback(std::bind(&InputWindowsManager::OnSessionLost, this, std::placeholders::_1));
     InitMouseDownInfo();
 #endif // OHOS_BUILD_ENABLE_POINTER
+    InputDevMgr->SetInputStatusChangeCallback(std::bind(&InputWindowsManager::DeviceStatusChanged, this,
+        std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 }
 
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -207,6 +225,43 @@ void InputWindowsManager::CheckZorderWindowChange(const DisplayGroupInfo &displa
         oldZorderFirstWindowPid, newZorderFirstWindowPid);
 }
 
+void InputWindowsManager::UpdateDisplayIdAndName() {
+    using IdNames = std::set<std::pair<int32_t, std::string>>;
+    IdNames newInfo;
+    for (const auto &item : displayGroupInfo_.displaysInfo) {
+        newInfo.insert(std::make_pair(item.id, item.uniq));
+    }
+    auto oldInfo = bindInfo_.GetDisplayIdNames();
+    if (newInfo == oldInfo) {
+        return;
+    }
+    for (auto it = oldInfo.begin(); it != oldInfo.end();) {
+        if (newInfo.find(*it) == newInfo.end()) {
+            bindInfo_.RemoveDisplay(it->first);
+            oldInfo.erase(it++);
+        } else {
+            ++it;
+        }
+    }
+    for (const auto &item : newInfo) {
+        if (!bindInfo_.IsDisplayAdd(item.first, item.second)) {
+            bindInfo_.AddDisplay(item.first, item.second);
+        }
+    }
+}
+
+int32_t InputWindowsManager::GetDisplayBindInfo(DisplayBindInfos &infos)
+{
+    CALL_DEBUG_ENTER;
+    return bindInfo_.GetDisplayBindInfo(infos);
+}
+
+int32_t InputWindowsManager::SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg)
+{
+    CALL_DEBUG_ENTER;
+    return bindInfo_.SetDisplayBind(deviceId, displayId, msg);    
+}
+
 void InputWindowsManager::UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo)
 {
     CALL_DEBUG_ENTER;
@@ -219,6 +274,7 @@ void InputWindowsManager::UpdateDisplayInfo(const DisplayGroupInfo &displayGroup
     }
     displayGroupInfo_ = displayGroupInfo;
     PrintDisplayInfo();
+    UpdateDisplayIdAndName();
 #ifdef OHOS_BUILD_ENABLE_POINTER
     UpdatePointerStyle();
 #endif // OHOS_BUILD_ENABLE_POINTER
@@ -552,9 +608,9 @@ bool InputWindowsManager::TouchPointToDisplayPoint(int32_t deviceId, struct libi
     EventTouch& touchInfo, int32_t& physicalDisplayId)
 {
     CHKPF(touch);
-    std::string screenId = InputDevMgr->GetScreenId(deviceId);
+    const std::string screenId = bindInfo_.GetBindDisplayNameByInputDevice(deviceId);
     if (screenId.empty()) {
-        screenId = "default0";
+        return false;
     }
     auto info = FindPhysicalDisplayInfo(screenId);
     CHKPF(info);
@@ -1268,6 +1324,7 @@ void InputWindowsManager::Dump(int32_t fd, const std::vector<std::string> &args)
                 item.id, item.x, item.y, item.width, item.height, item.name.c_str(),
                 item.uniq.c_str(), item.direction);
     }
+    mprintf(fd, "Input device and display bind info:\n%s\n", bindInfo_.Dumps().c_str());
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/window_manager/test/input_display_bind_helper_test.cpp b/service/window_manager/test/input_display_bind_helper_test.cpp
new file mode 100644
index 0000000000..f076d6f237
--- /dev/null
+++ b/service/window_manager/test/input_display_bind_helper_test.cpp
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "gtest/gtest.h"
+
+#include <fstream>
+
+#include "input_display_bind_helper.h"
+#include "mmi_log.h"
+
+namespace OHOS {
+namespace MMI {
+namespace {
+using namespace testing::ext;
+constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputDisplayBindHelperTest" };
+} // namespace
+class InputDisplayBindHelperTest : public testing::Test {
+public:
+    static void SetUpTestCase(void) {}
+    static void TearDownTestCase(void) {}
+    static bool WriteConfigFile(const std::string &content);
+    static inline const std::string bindCfgFile_ = "input_display_bind_helper.cfg";
+    static std::string GetCfgFileName() { return bindCfgFile_; }
+};
+
+bool InputDisplayBindHelperTest::WriteConfigFile(const std::string &content)
+{
+    const std::string &fileName = InputDisplayBindHelperTest::bindCfgFile_;
+    std::ofstream ofs(fileName.c_str()); 
+	if (!ofs) {
+		MMI_HILOGE("Open file fail.%s\n", fileName.c_str());
+		return false;
+	}
+	ofs << content;
+	ofs.close();
+    return true;
+}
+
+/**
+ * @tc.name: InputDisplayBindHelperTest_001
+ * @tc.desc: No bind info in disk
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputDisplayBindHelperTest, InputDisplayBindHelperTest_001, TestSize.Level1)
+{
+    InputDisplayBindHelperTest::WriteConfigFile("");
+	InputDisplayBindHelper bindInfo(InputDisplayBindHelperTest::GetCfgFileName());
+	// 多模初始化
+	bindInfo.Load();
+	// 检测到触摸板设备
+	bindInfo.AddInputDevice(1, "mouse");
+	bindInfo.AddInputDevice(2, "keyboard");
+	// 窗口同步信息
+	bindInfo.AddDisplay(0, "hp 223");
+	bindInfo.AddDisplay(2, "think 123");
+    ASSERT_EQ(bindInfo.Dumps(), std::string("mouse<=>hp 223\nkeyboard<=>think 123\n"));
+}
+
+/**
+ * @tc.name: InputDisplayBindHelperTest_002
+ * @tc.desc: Has info with adding order in disk
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputDisplayBindHelperTest, InputDisplayBindHelperTest_002, TestSize.Level1)
+{
+    InputDisplayBindHelperTest::WriteConfigFile("mouse<=>hp 223\nkeyboard<=>think 123\n");
+	InputDisplayBindHelper bindInfo(InputDisplayBindHelperTest::GetCfgFileName());
+	// 多模初始化
+	bindInfo.Load();
+	// 检测到触摸板设备
+	bindInfo.AddInputDevice(1, "mouse");
+	bindInfo.AddInputDevice(2, "keyboard");
+	// 窗口同步信息
+	bindInfo.AddDisplay(0, "hp 223");
+	bindInfo.AddDisplay(2, "think 123");
+    ASSERT_EQ(bindInfo.Dumps(), std::string("mouse<=>hp 223\nkeyboard<=>think 123\n"));
+}
+
+/**
+ * @tc.name: InputDisplayBindHelperTest_003
+ * @tc.desc: Has info without adding order in disk
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputDisplayBindHelperTest, InputDisplayBindHelperTest_003, TestSize.Level1)
+{
+    InputDisplayBindHelperTest::WriteConfigFile("mouse<=>think 123\nkeyboard<=>hp 223\n");
+	InputDisplayBindHelper bindInfo(InputDisplayBindHelperTest::GetCfgFileName());
+	// 多模初始化
+	bindInfo.Load();
+	// 检测到触摸板设备
+	bindInfo.AddInputDevice(1, "mouse");
+	bindInfo.AddInputDevice(2, "keyboard");
+	// 窗口同步信息
+	bindInfo.AddDisplay(0, "hp 223");
+	bindInfo.AddDisplay(2, "think 123");
+    ASSERT_EQ(bindInfo.Dumps(), std::string("mouse<=>think 123\nkeyboard<=>hp 223\n"));
+}
+
+/**
+ * @tc.name: InputDisplayBindHelperTest_004
+ * @tc.desc: Bind and remove test
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputDisplayBindHelperTest, InputDisplayBindHelperTest_004, TestSize.Level1)
+{
+    InputDisplayBindHelperTest::WriteConfigFile("");
+	InputDisplayBindHelper bindInfo(InputDisplayBindHelperTest::GetCfgFileName());
+	// 多模初始化
+	bindInfo.Load();
+	// 检测到触摸板设备
+	bindInfo.AddInputDevice(1, "mouse");
+	bindInfo.AddInputDevice(2, "keyboard");
+	// 窗口同步信息
+	bindInfo.AddDisplay(0, "hp 223");
+	bindInfo.AddDisplay(2, "think 123");
+	// 显示屏移除
+	bindInfo.RemoveDisplay(2);
+	bindInfo.RemoveDisplay(0);
+	// 输入设备移除
+	bindInfo.RemoveInputDevice(1);
+	bindInfo.RemoveInputDevice(2);
+	bindInfo.RemoveInputDevice(3);
+	// 窗口同步信息
+	bindInfo.AddDisplay(0, "hp 223");
+	bindInfo.AddDisplay(2, "think 123");
+	// 检测到触摸板设备
+	bindInfo.AddInputDevice(1, "mouse");
+	bindInfo.AddInputDevice(2, "keyboard");
+	bindInfo.AddInputDevice(3, "keyboard88");
+	
+	bindInfo.Store();
+	bindInfo.Load();
+	bindInfo.Dumps();
+	// 输入设备移除
+	bindInfo.RemoveInputDevice(1);
+	bindInfo.RemoveInputDevice(2);
+	// 触摸板设备移除
+	bindInfo.RemoveDisplay(2);
+	bindInfo.RemoveDisplay(0);
+    ASSERT_EQ(bindInfo.Dumps(), std::string(""));
+}
+
+/**
+ * @tc.name: InputDisplayBindHelperTest_005
+ * @tc.desc: Test GetBindDisplayNameByInputDevice
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputDisplayBindHelperTest, InputDisplayBindHelperTest_GetBindDisplayNameByInputDevice_005, TestSize.Level1)
+{
+    InputDisplayBindHelperTest::WriteConfigFile("mouse<=>think 123\nkeyboard<=>hp 223\n");
+	InputDisplayBindHelper bindInfo(InputDisplayBindHelperTest::GetCfgFileName());
+	// 多模初始化
+	bindInfo.Load();
+	// 检测到触摸板设备
+	bindInfo.AddInputDevice(1, "mouse");
+	bindInfo.AddInputDevice(2, "keyboard");
+	// 窗口同步信息
+	bindInfo.AddDisplay(0, "hp 223");
+	bindInfo.AddDisplay(2, "think 123");
+    ASSERT_EQ(bindInfo.Dumps(), std::string("mouse<=>think 123\nkeyboard<=>hp 223\n"));
+    // 获取
+    ASSERT_EQ(bindInfo.GetBindDisplayNameByInputDevice(1), std::string("think 123"));
+    ASSERT_EQ(bindInfo.GetBindDisplayNameByInputDevice(2), std::string("hp 223"));
+    ASSERT_EQ(bindInfo.GetBindDisplayNameByInputDevice(3), std::string());
+    // 删除display
+    bindInfo.RemoveDisplay(0);
+    ASSERT_EQ(bindInfo.GetBindDisplayNameByInputDevice(1), std::string("think 123"));
+    ASSERT_EQ(bindInfo.GetBindDisplayNameByInputDevice(2), std::string());
+    bindInfo.RemoveDisplay(2);
+    ASSERT_EQ(bindInfo.GetBindDisplayNameByInputDevice(1), std::string());
+    ASSERT_EQ(bindInfo.GetBindDisplayNameByInputDevice(2), std::string());
+}
+
+/**
+ * @tc.name: InputDisplayBindHelperTest_IsDisplayAdd_006
+ * @tc.desc: Test GetBindDisplayNameByInputDevice
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputDisplayBindHelperTest, InputDisplayBindHelperTest_IsDisplayAdd_006, TestSize.Level1)
+{
+    InputDisplayBindHelperTest::WriteConfigFile("mouse<=>think 123\nkeyboard<=>hp 223\n");
+	InputDisplayBindHelper bindInfo(InputDisplayBindHelperTest::GetCfgFileName());
+	// 多模初始化
+	bindInfo.Load();
+    ASSERT_FALSE(bindInfo.IsDisplayAdd(0, "hp 223"));
+    ASSERT_FALSE(bindInfo.IsDisplayAdd(2, "think 123"));
+    ASSERT_FALSE(bindInfo.IsDisplayAdd(1, "think 123"));
+	// 窗口同步信息
+	bindInfo.AddDisplay(0, "hp 223");
+	bindInfo.AddDisplay(2, "think 123");
+    ASSERT_EQ(bindInfo.Dumps(), std::string());
+    ASSERT_TRUE(bindInfo.IsDisplayAdd(0, "hp 223"));
+    ASSERT_TRUE(bindInfo.IsDisplayAdd(2, "think 123"));
+    ASSERT_FALSE(bindInfo.IsDisplayAdd(1, "think 123"));
+    // 检测到触摸板设备
+	bindInfo.AddInputDevice(1, "mouse");
+	bindInfo.AddInputDevice(2, "keyboard");
+    ASSERT_EQ(bindInfo.Dumps(), std::string("mouse<=>think 123\nkeyboard<=>hp 223\n"));
+}
+
+/**
+ * @tc.name: InputDisplayBindHelperTest_GetDisplayIdNames_007
+ * @tc.desc: Test GetBindDisplayNameByInputDevice
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputDisplayBindHelperTest, InputDisplayBindHelperTest_GetDisplayIdNames_007, TestSize.Level1)
+{
+	using IdNames = std::set<std::pair<int32_t, std::string>>;
+    InputDisplayBindHelperTest::WriteConfigFile("mouse<=>think 123\nkeyboard<=>hp 223\n");
+	InputDisplayBindHelper bindInfo(InputDisplayBindHelperTest::GetCfgFileName());
+	// 多模初始化
+	bindInfo.Load();
+	IdNames idNames;
+	ASSERT_EQ(bindInfo.GetDisplayIdNames(), idNames);
+	// 窗口同步信息
+	bindInfo.AddDisplay(0, "hp 223");
+	idNames.insert(std::make_pair(0, "hp 223"));
+	ASSERT_EQ(bindInfo.GetDisplayIdNames(), idNames);
+	bindInfo.AddDisplay(2, "think 123");
+	idNames.insert(std::make_pair(2, "think 123"));
+	ASSERT_EQ(bindInfo.GetDisplayIdNames(), idNames);
+    ASSERT_EQ(bindInfo.Dumps(), std::string());
+    // 检测到触摸板设备
+	bindInfo.AddInputDevice(1, "mouse");
+	bindInfo.AddInputDevice(2, "keyboard");
+	idNames.insert(std::make_pair(2, "think 123"));
+	ASSERT_EQ(bindInfo.GetDisplayIdNames(), idNames);
+    ASSERT_EQ(bindInfo.Dumps(), std::string("mouse<=>think 123\nkeyboard<=>hp 223\n"));
+}
+} //namespace MMI
+} // namespace OHOS
\ No newline at end of file
-- 
Gitee


From 01886895da6a622856c4ec2228efbf24e74eee91 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 20 Dec 2022 02:30:08 +0000
Subject: [PATCH 252/360] Rectify the problem that there is a possibility that
 the bottom slide fails to return to the desktop

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I698f813b5a9e738e346255f35480f0bd5122822e
---
 .vscode/settings.json                         | 86 +++++++++++++++++++
 .../input_monitor/src/js_input_monitor.cpp    | 21 +++--
 2 files changed, 98 insertions(+), 9 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000..2f05f530e2
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,86 @@
+{
+    "files.associations": {
+        "algorithm": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "charconv": "cpp",
+        "chrono": "cpp",
+        "cinttypes": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "csignal": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "deque": "cpp",
+        "exception": "cpp",
+        "coroutine": "cpp",
+        "resumable": "cpp",
+        "format": "cpp",
+        "forward_list": "cpp",
+        "fstream": "cpp",
+        "functional": "cpp",
+        "future": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "ios": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "iterator": "cpp",
+        "limits": "cpp",
+        "list": "cpp",
+        "locale": "cpp",
+        "map": "cpp",
+        "memory": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "queue": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "set": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "string": "cpp",
+        "system_error": "cpp",
+        "thread": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "typeinfo": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "utility": "cpp",
+        "vector": "cpp",
+        "xfacet": "cpp",
+        "xhash": "cpp",
+        "xiosbase": "cpp",
+        "xlocale": "cpp",
+        "xlocbuf": "cpp",
+        "xlocinfo": "cpp",
+        "xlocmes": "cpp",
+        "xlocmon": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "xmemory": "cpp",
+        "xstddef": "cpp",
+        "xstring": "cpp",
+        "xtr1common": "cpp",
+        "xtree": "cpp",
+        "xutility": "cpp"
+    }
+}
\ No newline at end of file
diff --git a/frameworks/napi/input_monitor/src/js_input_monitor.cpp b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
index 6fc36d1082..96ed9f860d 100644
--- a/frameworks/napi/input_monitor/src/js_input_monitor.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
@@ -697,22 +697,25 @@ void JsInputMonitor::OnPointerEvent(std::shared_ptr<PointerEvent> pointerEvent)
     }
     CHKPV(monitor_);
     CHKPV(pointerEvent);
-    int32_t num = 0;
     {
         std::lock_guard<std::mutex> guard(mutex_);
-        std::queue<std::shared_ptr<PointerEvent>> tmp;
         if (!evQueue_.empty()) {
-            auto markProcessedEvent = evQueue_.front();
-            CHKPV(markProcessedEvent);
-            markProcessedEvent->MarkProcessed();
+            if (pointerEvent->GetPointerAction() == PointerEvent::POINTER_ACTION_DOWN ||
+                pointerEvent->GetPointerAction() == PointerEvent::POINTER_ACTION_UP) {
+                auto markProcessedEvent = evQueue_.front();
+                CHKPV(markProcessedEvent);
+                markProcessedEvent->MarkProcessed();
+                std::queue<std::shared_ptr<PointerEvent>> tmp;
+                std::swap(evQueue_, tmp);
+                evQueue_.push(pointerEvent);        
+            }
+        } else {
+            evQueue_.push(pointerEvent);
         }
-        std::swap(evQueue_, tmp);
-        evQueue_.push(pointerEvent);
-        num = jsTaskNum_;
         jsTaskNum_ = 1;
     }
 
-    if (num < 1) {
+    if (!evQueue_.empty()) {
         int32_t *id = &monitorId_;
         uv_work_t *work = new (std::nothrow) uv_work_t;
         CHKPV(work);
-- 
Gitee


From 50a99bcb2913081385880e3d5f6d4bacb01a79b7 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 20 Dec 2022 02:33:38 +0000
Subject: [PATCH 253/360] Rectify the problem that there is a possibility that
 the bottom slide fails to return to the desktop

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I5d8b7054be83e614e26c2b1ace7bb9c9e98ef6aa
---
 .vscode/settings.json | 86 -------------------------------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 2f05f530e2..0000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-    "files.associations": {
-        "algorithm": "cpp",
-        "array": "cpp",
-        "atomic": "cpp",
-        "bit": "cpp",
-        "bitset": "cpp",
-        "cctype": "cpp",
-        "charconv": "cpp",
-        "chrono": "cpp",
-        "cinttypes": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "compare": "cpp",
-        "concepts": "cpp",
-        "condition_variable": "cpp",
-        "csignal": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdint": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cstring": "cpp",
-        "ctime": "cpp",
-        "cwchar": "cpp",
-        "deque": "cpp",
-        "exception": "cpp",
-        "coroutine": "cpp",
-        "resumable": "cpp",
-        "format": "cpp",
-        "forward_list": "cpp",
-        "fstream": "cpp",
-        "functional": "cpp",
-        "future": "cpp",
-        "initializer_list": "cpp",
-        "iomanip": "cpp",
-        "ios": "cpp",
-        "iosfwd": "cpp",
-        "iostream": "cpp",
-        "istream": "cpp",
-        "iterator": "cpp",
-        "limits": "cpp",
-        "list": "cpp",
-        "locale": "cpp",
-        "map": "cpp",
-        "memory": "cpp",
-        "mutex": "cpp",
-        "new": "cpp",
-        "optional": "cpp",
-        "ostream": "cpp",
-        "queue": "cpp",
-        "ratio": "cpp",
-        "regex": "cpp",
-        "set": "cpp",
-        "sstream": "cpp",
-        "stdexcept": "cpp",
-        "stop_token": "cpp",
-        "streambuf": "cpp",
-        "string": "cpp",
-        "system_error": "cpp",
-        "thread": "cpp",
-        "tuple": "cpp",
-        "type_traits": "cpp",
-        "typeinfo": "cpp",
-        "unordered_map": "cpp",
-        "unordered_set": "cpp",
-        "utility": "cpp",
-        "vector": "cpp",
-        "xfacet": "cpp",
-        "xhash": "cpp",
-        "xiosbase": "cpp",
-        "xlocale": "cpp",
-        "xlocbuf": "cpp",
-        "xlocinfo": "cpp",
-        "xlocmes": "cpp",
-        "xlocmon": "cpp",
-        "xlocnum": "cpp",
-        "xloctime": "cpp",
-        "xmemory": "cpp",
-        "xstddef": "cpp",
-        "xstring": "cpp",
-        "xtr1common": "cpp",
-        "xtree": "cpp",
-        "xutility": "cpp"
-    }
-}
\ No newline at end of file
-- 
Gitee


From 5e20831715b185a643da98c8dfc90d4b240baf97 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 20 Dec 2022 03:16:15 +0000
Subject: [PATCH 254/360] Rectify the problem that there is a possibility that
 the bottom slide fails to return to the desktop

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I910b500449761d2eadd36ab3dfa32387fabae6e8
---
 frameworks/napi/input_monitor/src/js_input_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frameworks/napi/input_monitor/src/js_input_monitor.cpp b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
index 96ed9f860d..4268fee916 100644
--- a/frameworks/napi/input_monitor/src/js_input_monitor.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
@@ -707,7 +707,7 @@ void JsInputMonitor::OnPointerEvent(std::shared_ptr<PointerEvent> pointerEvent)
                 markProcessedEvent->MarkProcessed();
                 std::queue<std::shared_ptr<PointerEvent>> tmp;
                 std::swap(evQueue_, tmp);
-                evQueue_.push(pointerEvent);        
+                evQueue_.push(pointerEvent); 
             }
         } else {
             evQueue_.push(pointerEvent);
-- 
Gitee


From 757a7cb3d606434b41df7a1584c6ff9ef387e290 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 20 Dec 2022 03:50:23 +0000
Subject: [PATCH 255/360] Rectify the problem that there is a possibility that
 the bottom slide fails to return to the desktop

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Icf7fca75dc4e75813c7857dc6882eaf0bb2fd106
---
 frameworks/napi/input_monitor/src/js_input_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frameworks/napi/input_monitor/src/js_input_monitor.cpp b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
index 4268fee916..9679e927a5 100644
--- a/frameworks/napi/input_monitor/src/js_input_monitor.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
@@ -707,7 +707,7 @@ void JsInputMonitor::OnPointerEvent(std::shared_ptr<PointerEvent> pointerEvent)
                 markProcessedEvent->MarkProcessed();
                 std::queue<std::shared_ptr<PointerEvent>> tmp;
                 std::swap(evQueue_, tmp);
-                evQueue_.push(pointerEvent); 
+                evQueue_.push(pointerEvent);
             }
         } else {
             evQueue_.push(pointerEvent);
-- 
Gitee


From 409d9065f977dc4e087be499da6647797716fa65 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Tue, 20 Dec 2022 15:31:40 +0800
Subject: [PATCH 256/360] =?UTF-8?q?=E6=8C=87=E9=92=88=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 .../include/device_config_file_parser.h       | 16 ++--
 .../src/device_config_file_parser.cpp         | 58 +++----------
 .../include/input_device_manager.h            |  4 +
 .../src/input_device_manager.cpp              | 12 +++
 .../include/event_normalize_handler.h         |  2 -
 .../src/event_normalize_handler.cpp           |  2 -
 .../include/mouse_event_normalize.h           |  4 -
 .../include/mouse_transform_processor.h       | 19 ++--
 .../src/mouse_event_normalize.cpp             | 25 +-----
 .../src/mouse_transform_processor.cpp         | 87 +++++++------------
 10 files changed, 82 insertions(+), 147 deletions(-)

diff --git a/service/device_config/include/device_config_file_parser.h b/service/device_config/include/device_config_file_parser.h
index db8b2b79fd..b28d7d7913 100644
--- a/service/device_config/include/device_config_file_parser.h
+++ b/service/device_config/include/device_config_file_parser.h
@@ -21,6 +21,10 @@
 
 struct libinput_device;
 
+struct VendorConfig {
+    int32_t pointerSpeed { -1 };
+};
+
 namespace OHOS {
 namespace MMI {
 enum class ConfigFileItem {
@@ -33,15 +37,11 @@ public:
     DeviceConfigManagement() = default;
     ~DeviceConfigManagement() = default;
 public:
-    int32_t OnDeviceAdd(struct libinput_device *device);
-    void OnDeviceRemove(struct libinput_device *device);
-    std::string CombDeviceFileName(struct libinput_device *device);
-private:
-    using DeviceId = int32_t;
-    std::map<DeviceId, std::map<ConfigFileItem, int32_t>> deviceConfigs_;
+    VendorConfig OnDeviceAdd(struct libinput_device *device);
 
-    int32_t DeviceClassification(struct libinput_device *device, DeviceId deviceId);
-    int32_t DeviceConfiguration(struct libinput_device *device, DeviceId deviceId);
+private:
+    std::string CombDeviceFileName(struct libinput_device *device) const;
+    VendorConfig DeviceConfiguration(struct libinput_device *device);
     std::map<ConfigFileItem, int32_t> ReadConfigFile(const std::string &filePath);
     ConfigFileItem ConfigItemName2Id(const std::string &name);
 };
diff --git a/service/device_config/src/device_config_file_parser.cpp b/service/device_config/src/device_config_file_parser.cpp
index 1f3c065c46..e95fba9533 100644
--- a/service/device_config/src/device_config_file_parser.cpp
+++ b/service/device_config/src/device_config_file_parser.cpp
@@ -20,7 +20,6 @@
 
 #include "error_multimodal.h"
 #include "input_device.h"
-#include "input_device_manager.h"
 #include "libinput.h"
 #include "util.h"
 
@@ -28,7 +27,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "DeviceConfigManagement" };
-constexpr int32_t INVALID_DEVICE_ID = -1;
 constexpr int32_t COMMENT_SUBSCRIPT = 0;
 } // namespace
 
@@ -47,7 +45,7 @@ enum evdev_device_udev_tags {
     EVDEV_UDEV_TAG_SWITCH = 1 << 11,
 };
 
-std::string DeviceConfigManagement::CombDeviceFileName(struct libinput_device *device)
+std::string DeviceConfigManagement::CombDeviceFileName(struct libinput_device *device) const
 {
     CALL_DEBUG_ENTER;
     CHKPS(device);
@@ -112,64 +110,34 @@ std::map<ConfigFileItem, int32_t> DeviceConfigManagement::ReadConfigFile(const s
     return configList;
 }
 
-int32_t DeviceConfigManagement::DeviceConfiguration(struct libinput_device *device, DeviceId deviceId)
+VendorConfig DeviceConfigManagement::DeviceConfiguration(struct libinput_device *device)
 {
     CALL_DEBUG_ENTER;
     std::string filePath = "/vendor/etc/pointer/" + CombDeviceFileName(device) + ".TOML";
     auto path = FileVerification(filePath, "TOML");
+    VendorConfig vendorConfigTmp;
     if(path.empty()) {
         MMI_HILOGE("File validation failed");
-        return RET_ERR;
+        return vendorConfigTmp;
     }
     auto configList = ReadConfigFile(path);
     if (configList.empty()) {
         MMI_HILOGE("configList is empty");
-        return RET_ERR;
+        return vendorConfigTmp;
     }
-    deviceConfigs_[deviceId] = configList;
-    MouseEventHdr->SetPointerSpeedWithDeviceId(deviceId, configList[ConfigFileItem::POINTER_SPEED]);
-    return RET_OK;
-}
-
-int32_t DeviceConfigManagement::DeviceClassification(struct libinput_device *device, DeviceId deviceId)
-{
-    CHKPR(device, ERROR_NULL_POINTER);
-    uint32_t udevTags = static_cast<int32_t>(libinput_device_get_tags(device));
-    if (udevTags & (EVDEV_UDEV_TAG_MOUSE |
-                    EVDEV_UDEV_TAG_TRACKBALL |
-                    EVDEV_UDEV_TAG_POINTINGSTICK |
-                    EVDEV_UDEV_TAG_TOUCHPAD |
-                    EVDEV_UDEV_TAG_TABLET_PAD)) {
-        return DeviceConfiguration(device, deviceId);
+    if (configList.find(ConfigFileItem::POINTER_SPEED) == configList.end()) {
+        MMI_HILOGE("configList not find POINTER_SPEED");
+        return vendorConfigTmp;
     }
-    MMI_HILOGE("Device config set failed");
-    return RET_ERR;
+    vendorConfigTmp.pointerSpeed = configList[ConfigFileItem::POINTER_SPEED];
+    return vendorConfigTmp;
 }
 
-int32_t DeviceConfigManagement::OnDeviceAdd(struct libinput_device *device)
+VendorConfig DeviceConfigManagement::OnDeviceAdd(struct libinput_device *device)
 {
     CALL_DEBUG_ENTER;
-    CHKPR(device, ERROR_NULL_POINTER);
-    int32_t deviceId = InputDevMgr->FindInputDeviceId(device);
-    if (deviceId == INVALID_DEVICE_ID) {
-        MMI_HILOGE("Find device failed");
-        return RET_ERR;
-    }
-    return DeviceClassification(device, deviceId);
-}
-
-void DeviceConfigManagement::OnDeviceRemove(struct libinput_device *device)
-{
-    CALL_DEBUG_ENTER;
-    CHKPV(device);
-    int32_t deviceId = InputDevMgr->FindInputDeviceId(device);
-    auto iter = deviceConfigs_.find(deviceId);
-    if (iter == deviceConfigs_.end()) {
-        MMI_HILOGE("Device config file remove failed");
-        return;
-    }
-    MouseEventHdr->RemovePointerSpeed(deviceId);
-    deviceConfigs_.erase(iter);
+    CHKPO(device);
+    return DeviceConfiguration(device);
 }
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/service/device_manager/include/input_device_manager.h b/service/device_manager/include/input_device_manager.h
index eac3fb24cb..84e06a3ca1 100644
--- a/service/device_manager/include/input_device_manager.h
+++ b/service/device_manager/include/input_device_manager.h
@@ -19,6 +19,7 @@
 #include <list>
 #include <string>
 
+#include "device_config_file_parser.h"
 #include "device_observer.h"
 #include "event_dispatch_handler.h"
 #include "input_device.h"
@@ -43,6 +44,7 @@ class InputDeviceManager final : public IDeviceObject {
         bool isPointerDevice { false };
         bool isTouchableDevice { false };
         std::string dhid;
+        VendorConfig vendorConfig;
     };
 public:
     DISALLOW_COPY_AND_MOVE(InputDeviceManager);
@@ -83,6 +85,7 @@ public:
     bool HasTouchDevice();
     int32_t SetInputDevice(const std::string& dhid, const std::string& screenId);
     const std::string& GetScreenId(int32_t deviceId) const;
+    VendorConfig GetVendorConfig(int32_t deviceId) const;
 
 private:
     void MakeDeviceInfo(struct libinput_device *inputDevice, struct InputDeviceInfo& info);
@@ -98,6 +101,7 @@ private:
     int32_t nextId_ { 0 };
     std::list<std::shared_ptr<IDeviceObserver>> observers_;
     std::map<SessionPtr, std::function<void(int32_t, const std::string&)>> devListener_;
+    DeviceConfigManagement configManagement_;
 };
 
 #define InputDevMgr ::OHOS::DelayedSingleton<InputDeviceManager>::GetInstance()
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 08223e11ff..2ab4ab5187 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -360,6 +360,7 @@ void InputDeviceManager::MakeDeviceInfo(struct libinput_device *inputDevice, str
     }
     info.dhid = GenerateDescriptor(inputDevice, info.isRemote);
 #endif // OHOS_BUILD_ENABLE_COOPERATE
+    info.vendorConfig = configManagement_.OnDeviceAdd(inputDevice);
 }
 
 void InputDeviceManager::OnInputDeviceRemoved(struct libinput_device *inputDevice)
@@ -771,5 +772,16 @@ const std::string& InputDeviceManager::GetScreenId(int32_t deviceId) const
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     return UNKNOWN_SCREEN_ID;
 }
+
+VendorConfig InputDeviceManager::GetVendorConfig(int32_t deviceId) const
+{
+    CALL_DEBUG_ENTER;
+    auto it = inputDevice_.find(deviceId);
+    if (it == inputDevice_.end()) {
+        MMI_HILOGE("Device info not find id: %{public}d", deviceId);
+        return {};
+    }
+    return it->second.vendorConfig;
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/event_handler/include/event_normalize_handler.h b/service/event_handler/include/event_normalize_handler.h
index e07c01629b..e42c30dd73 100644
--- a/service/event_handler/include/event_normalize_handler.h
+++ b/service/event_handler/include/event_normalize_handler.h
@@ -18,7 +18,6 @@
 
 #include <memory>
 
-#include "device_config_file_parser.h"
 #include "i_input_event_handler.h"
 
 namespace OHOS {
@@ -59,7 +58,6 @@ private:
 private:
     int32_t timerId_ { -1 };
     void ResetTouchUpEvent(std::shared_ptr<PointerEvent> pointerEvent, struct libinput_event *event);
-    DeviceConfigManagement configManagement_;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/event_handler/src/event_normalize_handler.cpp b/service/event_handler/src/event_normalize_handler.cpp
index 49e30ab143..614fd7c75c 100644
--- a/service/event_handler/src/event_normalize_handler.cpp
+++ b/service/event_handler/src/event_normalize_handler.cpp
@@ -130,7 +130,6 @@ int32_t EventNormalizeHandler::OnEventDeviceAdded(libinput_event *event)
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
     KeyEventHdr->ResetKeyEvent(device);
 #endif // OHOS_BUILD_ENABLE_KEYBOARD
-    configManagement_.OnDeviceAdd(device);
     return RET_OK;
 }
 
@@ -142,7 +141,6 @@ int32_t EventNormalizeHandler::OnEventDeviceRemoved(libinput_event *event)
     KeyMapMgr->RemoveKeyValue(device);
     KeyRepeat->RemoveDeviceConfig(device);
     InputDevMgr->OnInputDeviceRemoved(device);
-    configManagement_.OnDeviceRemove(device);
     return RET_OK;
 }
 
diff --git a/service/mouse_event_normalize/include/mouse_event_normalize.h b/service/mouse_event_normalize/include/mouse_event_normalize.h
index 58a76cc9ad..d5b499a71f 100644
--- a/service/mouse_event_normalize/include/mouse_event_normalize.h
+++ b/service/mouse_event_normalize/include/mouse_event_normalize.h
@@ -33,7 +33,6 @@ public:
     DISALLOW_COPY_AND_MOVE(MouseEventNormalize);
     std::shared_ptr<PointerEvent> GetPointerEvent();
     int32_t OnEvent(struct libinput_event *event);
-    bool GetSpeedGain(double vin, int32_t deviceId, double &gain) const;
     void Dump(int32_t fd, const std::vector<std::string> &args);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     void SetAbsolutionLocation(double xPercent, double yPercent);
@@ -46,9 +45,6 @@ public:
     void OnDisplayLost(int32_t displayId);
     int32_t GetDisplayId() const;
     int32_t SetPointerLocation(int32_t x, int32_t y);
-    void SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed);
-    void RemovePointerSpeed(int32_t deviceId);
-    int32_t GetPointerSpeedByDeviceId(int32_t deviceId);
 
 private:
     std::shared_ptr<MouseTransformProcessor> GetProcessor(int32_t deviceId) const;
diff --git a/service/mouse_event_normalize/include/mouse_transform_processor.h b/service/mouse_event_normalize/include/mouse_transform_processor.h
index 6c1d58a0e2..0319eb8ced 100644
--- a/service/mouse_event_normalize/include/mouse_transform_processor.h
+++ b/service/mouse_event_normalize/include/mouse_transform_processor.h
@@ -47,7 +47,7 @@ public:
     bool NormalizeMoveMouse(int32_t offsetX, int32_t offsetY);
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
 private:
-    int32_t HandleMotionInner(struct libinput_event_pointer* data, int32_t deviceId);
+    int32_t HandleMotionInner(struct libinput_event_pointer* data);
     int32_t HandleButtonInner(struct libinput_event_pointer* data);
     int32_t HandleAxisInner(struct libinput_event_pointer* data);
     void HandlePostInner(struct libinput_event_pointer* data, PointerEvent::PointerItem &pointerItem);
@@ -56,7 +56,7 @@ private:
     void HandlePostMoveMouse(PointerEvent::PointerItem &pointerItem);
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
     int32_t HandleButtonValueInner(struct libinput_event_pointer* data);
-    int32_t HandleMotionAccelerate(struct libinput_event_pointer* data, int32_t deviceId);
+    int32_t HandleMotionAccelerate(struct libinput_event_pointer* data);
     void DumpInner();
     void SetDxDyForDInput(PointerEvent::PointerItem& pointerItem, struct libinput_event_pointer* data);
 public:
@@ -65,25 +65,24 @@ public:
     static int32_t GetDisplayId();
     static int32_t SetPointerSpeed(int32_t speed);
     static int32_t GetPointerSpeed();
-    static bool GetSpeedGain(double vin, int32_t deviceId, double &gain);
+    bool GetSpeedGain(double vin, double &gain);
     static int32_t SetPointerLocation(int32_t x, int32_t y);
-    static void SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed);
-    static void RemovePointerSpeed(int32_t deviceId);
-    static int32_t GetPointerSpeedByDeviceId(int32_t deviceId);
-    static int32_t GetSpeed(int32_t deviceId);
+    void SetConfigPointerSpeed(int32_t speed);
+    int32_t GetSpeed() const;
 
 private:
     static double absolutionX_;
     static double absolutionY_;
     static int32_t currentDisplayId_;
-    static int32_t speed_;
+    static int32_t globalSpeed_;
+    static bool isUserSetSpeedStatus_;
+
     std::shared_ptr<PointerEvent> pointerEvent_ { nullptr };
     int32_t timerId_ { -1 };
     int32_t buttonId_ { -1 };
     bool isPressed_ { false };
     int32_t deviceId_ { -1 };
-    static std::map<int32_t, int32_t> pointerDeviceSpeeds;
-    static bool isSpeedSetByUser_;
+    int32_t configSpeed_ { -1 };
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/mouse_event_normalize/src/mouse_event_normalize.cpp b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
index 1ff635d788..374af0234b 100644
--- a/service/mouse_event_normalize/src/mouse_event_normalize.cpp
+++ b/service/mouse_event_normalize/src/mouse_event_normalize.cpp
@@ -38,11 +38,6 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Mouse
 MouseEventNormalize::MouseEventNormalize() {}
 MouseEventNormalize::~MouseEventNormalize() {}
 
-bool MouseEventNormalize::GetSpeedGain(double vin, int32_t deviceId, double &gain) const
-{
-    return MouseTransformProcessor::GetSpeedGain(vin, deviceId, gain);
-}
-
 std::shared_ptr<MouseTransformProcessor> MouseEventNormalize::GetProcessor(int32_t deviceId) const
 {
     auto iter = processors_.find(deviceId);
@@ -97,7 +92,10 @@ int32_t MouseEventNormalize::OnEvent(struct libinput_event *event)
         processor = it->second;
     } else {
         processor = std::make_shared<MouseTransformProcessor>(deviceId);
-        CHKPR(processor, RET_ERR);
+        auto vendorConfig = InputDevMgr->GetVendorConfig(deviceId);
+        if (vendorConfig.pointerSpeed != -1) {
+            processor->SetConfigPointerSpeed(vendorConfig.pointerSpeed);
+        }
         auto [tIter, isOk] = processors_.emplace(deviceId, processor);
         if (!isOk) {
             MMI_HILOGE("Duplicate device record:%{public}d", deviceId);
@@ -154,20 +152,5 @@ void MouseEventNormalize::SetAbsolutionLocation(double xPercent, double yPercent
     MouseTransformProcessor::SetAbsolutionLocation(xPercent, yPercent);
 }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-
-void MouseEventNormalize::SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed)
-{
-    MouseTransformProcessor::SetPointerSpeedWithDeviceId(deviceId, speed);
-}
-
-void MouseEventNormalize::RemovePointerSpeed(int32_t deviceId)
-{
-    MouseTransformProcessor::RemovePointerSpeed(deviceId);
-}
-
-int32_t MouseEventNormalize::GetPointerSpeedByDeviceId(int32_t deviceId)
-{
-    return MouseTransformProcessor::GetPointerSpeedByDeviceId(deviceId);
-}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/mouse_event_normalize/src/mouse_transform_processor.cpp b/service/mouse_event_normalize/src/mouse_transform_processor.cpp
index aeb2030638..db2869827d 100644
--- a/service/mouse_event_normalize/src/mouse_transform_processor.cpp
+++ b/service/mouse_event_normalize/src/mouse_transform_processor.cpp
@@ -54,26 +54,13 @@ const std::vector<AccelerateCurve> ACCELERATE_CURVES {
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
 constexpr double PERCENT_CONST = 100.0;
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-
-int32_t PointerSpeedCheck(int32_t speed)
-{
-    if (speed < MIN_SPEED) {
-        MMI_HILOGW("Set pointer speed less than minimum speed:%{public}d", speed);
-        return MIN_SPEED;
-    } else if (speed > MAX_SPEED) {
-        MMI_HILOGW("Set pointer speed greater than the maximum value speed:%{public}d", speed);
-        return MAX_SPEED;
-    }
-    return speed;
-}
 } // namespace
 
 double MouseTransformProcessor::absolutionX_ = -1.0;
 double MouseTransformProcessor::absolutionY_ = -1.0;
 int32_t MouseTransformProcessor::currentDisplayId_ = -1;
-int32_t MouseTransformProcessor::speed_ = DEFAULT_SPEED;
-bool MouseTransformProcessor::isSpeedSetByUser_ = false;
-std::map<int32_t, int32_t> MouseTransformProcessor::pointerDeviceSpeeds = {};
+int32_t MouseTransformProcessor::globalSpeed_ = DEFAULT_SPEED;
+bool MouseTransformProcessor::isUserSetSpeedStatus_ = false;
 
 MouseTransformProcessor::MouseTransformProcessor(int32_t deviceId)
     : pointerEvent_(PointerEvent::Create()), deviceId_(deviceId)
@@ -84,7 +71,7 @@ std::shared_ptr<PointerEvent> MouseTransformProcessor::GetPointerEvent() const
     return pointerEvent_;
 }
 
-int32_t MouseTransformProcessor::HandleMotionInner(struct libinput_event_pointer* data, int32_t deviceId)
+int32_t MouseTransformProcessor::HandleMotionInner(struct libinput_event_pointer* data)
 {
     CALL_DEBUG_ENTER;
     CHKPR(data, ERROR_NULL_POINTER);
@@ -100,7 +87,7 @@ int32_t MouseTransformProcessor::HandleMotionInner(struct libinput_event_pointer
         return RET_ERR;
     }
 
-    int32_t ret = HandleMotionAccelerate(data, deviceId);
+    int32_t ret = HandleMotionAccelerate(data);
     if (ret != RET_OK) {
         MMI_HILOGE("Failed to handle motion correction");
         return ret;
@@ -112,14 +99,14 @@ int32_t MouseTransformProcessor::HandleMotionInner(struct libinput_event_pointer
     return RET_OK;
 }
 
-int32_t MouseTransformProcessor::HandleMotionAccelerate(struct libinput_event_pointer* data, int32_t deviceId)
+int32_t MouseTransformProcessor::HandleMotionAccelerate(struct libinput_event_pointer* data)
 {
     CHKPR(data, ERROR_NULL_POINTER);
     double dx = libinput_event_pointer_get_dx(data);
     double dy = libinput_event_pointer_get_dy(data);
     double vin = (fmax(abs(dx), abs(dy)) + fmin(abs(dx), abs(dy))) / 2.0;
     double gain { 0.0 };
-    if (!GetSpeedGain(vin, deviceId, gain)) {
+    if (!GetSpeedGain(vin, gain)) {
         MMI_HILOGE("Get speed gain failed");
         return RET_ERR;
     }
@@ -293,7 +280,7 @@ int32_t MouseTransformProcessor::Normalize(struct libinput_event *event)
     switch (type) {
         case LIBINPUT_EVENT_POINTER_MOTION:
         case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: {
-            result = HandleMotionInner(data, InputDevMgr->FindInputDeviceId(libinput_event_get_device(event)));
+            result = HandleMotionInner(data);
             break;
         }
         case LIBINPUT_EVENT_POINTER_BUTTON: {
@@ -416,30 +403,36 @@ void MouseTransformProcessor::Dump(int32_t fd, const std::vector<std::string> &a
 int32_t MouseTransformProcessor::SetPointerSpeed(int32_t speed)
 {
     CALL_DEBUG_ENTER;
-    speed_ = PointerSpeedCheck(speed);
-    isSpeedSetByUser_ = true;
-    MMI_HILOGD("Set pointer speed:%{public}d", speed_);
+    if (speed < MIN_SPEED) {
+        globalSpeed_ = MIN_SPEED;
+    } else if (speed > MAX_SPEED) {
+        globalSpeed_ = MAX_SPEED;
+    } else {
+        globalSpeed_ = speed;
+    }
+    isUserSetSpeedStatus_ = true;
+    MMI_HILOGD("Set pointer speed:%{public}d", globalSpeed_);
     return RET_OK;
 }
 
 int32_t MouseTransformProcessor::GetPointerSpeed()
 {
     CALL_DEBUG_ENTER;
-    MMI_HILOGD("Get pointer speed:%{public}d", speed_);
-    return speed_;
+    MMI_HILOGD("Get pointer speed:%{public}d", globalSpeed_);
+    return globalSpeed_;
 }
 
-bool MouseTransformProcessor::GetSpeedGain(double vin, int32_t deviceId, double &gain)
+bool MouseTransformProcessor::GetSpeedGain(double vin, double &gain)
 {
     if (fabs(vin) < DOUBLE_ZERO) {
         MMI_HILOGE("The value of the parameter passed in is 0");
         return false;
     }
-    if (GetSpeed(deviceId) < 1) {
+    if (GetSpeed() < 1) {
         MMI_HILOGE("The speed value can't be less than 1");
         return false;
     }
-    const AccelerateCurve& curve = ACCELERATE_CURVES[GetSpeed(deviceId) - 1];
+    const AccelerateCurve& curve = ACCELERATE_CURVES[GetSpeed() - 1];
     int32_t num = static_cast<int32_t>(ceil(fabs(vin)));
     for (size_t i = 0; i < curve.speeds.size(); ++i) {
         if (num <= curve.speeds[i]) {
@@ -519,39 +512,23 @@ void MouseTransformProcessor::SetAbsolutionLocation(double xPercent, double yPer
 }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
 
-int32_t MouseTransformProcessor::GetSpeed(int32_t deviceId)
+int32_t MouseTransformProcessor::GetSpeed() const
 {
-    return isSpeedSetByUser_ ? speed_ : GetPointerSpeedByDeviceId(deviceId);
-}
-
-void MouseTransformProcessor::SetPointerSpeedWithDeviceId(int32_t deviceId, int32_t speed)
-{
-    CALL_DEBUG_ENTER;
-    pointerDeviceSpeeds[deviceId] = PointerSpeedCheck(speed);
-    MMI_HILOGD("Set pointer speed:%{public}d", pointerDeviceSpeeds[deviceId]);
-}
-
-void MouseTransformProcessor::RemovePointerSpeed(int32_t deviceId)
-{
-    CALL_DEBUG_ENTER;
-    auto it = pointerDeviceSpeeds.find(deviceId);
-    if (it != pointerDeviceSpeeds.end()) {
-        pointerDeviceSpeeds.erase(it);
-        MMI_HILOGD("remove pointer speed with deviceId:%{public}d", deviceId);
+    if ((configSpeed_ == -1) || isUserSetSpeedStatus_) {
+        return globalSpeed_;
     }
+    return configSpeed_;
 }
 
-int32_t MouseTransformProcessor::GetPointerSpeedByDeviceId(int32_t deviceId)
+void MouseTransformProcessor::SetConfigPointerSpeed(int32_t speed)
 {
-    CALL_DEBUG_ENTER;
-    auto it = pointerDeviceSpeeds.find(deviceId);
-    if (it == pointerDeviceSpeeds.end()) {
-        MMI_HILOGD("Not find speed with deviceId:%{public}d", deviceId);
-        return speed_;
+    if (speed < MIN_SPEED) {
+        configSpeed_ = MIN_SPEED;
+    } else if (speed > MAX_SPEED) {
+        configSpeed_ = MAX_SPEED;
+    } else {
+        configSpeed_ = speed;
     }
-    MMI_HILOGD("Get pointer speed:%{public}d", speed_);
-    return pointerDeviceSpeeds.at(deviceId);
 }
-
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From 63081cf2a8bc9600df643476cc647823e76a82ac Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 20 Dec 2022 10:55:53 +0000
Subject: [PATCH 257/360] Test case branch and interface coverage modificatio

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I63ee7c7027ad6c6f04f5ae92fba45cdfc45d1c64
---
 .../events/test/input_manager_manual_test.cpp |  83 ++++++++++-
 .../proxy/events/test/input_manager_test.cpp  | 131 +++++++++++++++++-
 .../proxy/events/test/key_event_test.cpp      |  26 ++++
 .../module_loader/test/mmi_client_test.cpp    |   8 +-
 4 files changed, 238 insertions(+), 10 deletions(-)

diff --git a/frameworks/proxy/events/test/input_manager_manual_test.cpp b/frameworks/proxy/events/test/input_manager_manual_test.cpp
index ea841f4a9f..79b599a7bf 100644
--- a/frameworks/proxy/events/test/input_manager_manual_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_manual_test.cpp
@@ -17,6 +17,7 @@
 #include <semaphore.h>
 
 #include "accesstoken_kit.h"
+#include "bytrace_adapter.h"
 #include "define_multimodal.h"
 #include "error_multimodal.h"
 #include "input_handler_manager.h"
@@ -99,6 +100,86 @@ public:
     void TearDown() {}
 };
 
+/**
+ * @tc.name: StartBytrace_001
+ * @tc.desc: Verify keyevent start bytrace
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerManualTest, StartBytrace_001, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    std::shared_ptr<KeyEvent> keyEvent = KeyEvent::Create();
+    ASSERT_NE(keyEvent, nullptr);
+    keyEvent->SetId(0);
+    BytraceAdapter::StartBytrace(keyEvent);
+    ASSERT_EQ(keyEvent->GetId(), 0);
+}
+
+/**
+ * @tc.name: StartBytrace_002
+ * @tc.desc: Verify keyevent start bytrace
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerManualTest, StartBytrace_002, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    std::shared_ptr<KeyEvent> keyEvent = KeyEvent::Create();
+    ASSERT_NE(keyEvent, nullptr);
+    keyEvent->SetId(0);
+    keyEvent->SetKeyCode(0);
+    BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::KEY_INTERCEPT_EVENT);
+    BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::KEY_LAUNCH_EVENT);
+    BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::KEY_SUBSCRIBE_EVENT);
+    BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::KEY_DISPATCH_EVENT);
+    BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::POINT_INTERCEPT_EVENT);
+    ASSERT_EQ(keyEvent->GetKeyCode(), 0);
+}
+
+/**
+ * @tc.name: StartBytrace_003
+ * @tc.desc: Verify pointerEvent start bytrace
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerManualTest, StartBytrace_003, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    std::shared_ptr<PointerEvent> pointerEvent = PointerEvent::Create();
+    ASSERT_NE(pointerEvent, nullptr);
+    pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
+    BytraceAdapter::StartBytrace(pointerEvent, BytraceAdapter::TRACE_START);
+    pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
+    BytraceAdapter::StartBytrace(pointerEvent, BytraceAdapter::TRACE_START);
+    pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
+    BytraceAdapter::StartBytrace(pointerEvent, BytraceAdapter::TRACE_STOP);
+    pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
+    BytraceAdapter::StartBytrace(pointerEvent, BytraceAdapter::TRACE_STOP);
+    ASSERT_EQ(pointerEvent->GetSourceType(), PointerEvent::SOURCE_TYPE_TOUCHSCREEN);
+}
+
+/**
+ * @tc.name: StartBytrace_004
+ * @tc.desc: Verify pointerEvent start bytrace
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerManualTest, StartBytrace_004, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    std::shared_ptr<PointerEvent> pointerEvent = PointerEvent::Create();
+    ASSERT_NE(pointerEvent, nullptr);
+    pointerEvent->SetSourceType(PointerEvent::SOURCE_TYPE_MOUSE);
+    BytraceAdapter::StartBytrace(BytraceAdapter::TRACE_START, BytraceAdapter::START_EVENT);
+    BytraceAdapter::StartBytrace(BytraceAdapter::TRACE_START, BytraceAdapter::LAUNCH_EVENT);
+    BytraceAdapter::StartBytrace(BytraceAdapter::TRACE_START, BytraceAdapter::STOP_EVENT);
+    BytraceAdapter::StartBytrace(BytraceAdapter::TRACE_STOP, BytraceAdapter::START_EVENT);
+    BytraceAdapter::StartBytrace(BytraceAdapter::TRACE_STOP, BytraceAdapter::LAUNCH_EVENT);
+    BytraceAdapter::StartBytrace(BytraceAdapter::TRACE_STOP, BytraceAdapter::STOP_EVENT);
+    ASSERT_EQ(pointerEvent->GetSourceType(), PointerEvent::SOURCE_TYPE_MOUSE);
+}
+
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
 /**
  * @tc.name: HandlePointerEventFilter_002
@@ -108,7 +189,7 @@ public:
  */
 HWTEST_F(InputManagerManualTest, HandleKeyEventFilter_003, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     struct KeyFilter : public IInputEventFilter {
         bool OnInputEvent(std::shared_ptr<KeyEvent> keyEvent) const override
         {
diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 4ebde66c0c..806afb37c1 100644
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -766,7 +766,7 @@ void InputManagerTest::TestMarkConsumed(int32_t monitorId, int32_t eventId)
  */
 HWTEST_F(InputManagerTest, InputManagerTest_AddMonitor_001, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto PointerEventFun = [](std::shared_ptr<PointerEvent> event) {
         MMI_HILOGD("Add monitor success");
     };
@@ -786,7 +786,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_AddMonitor_001, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, InputManagerTest_AddMonitor_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto keyEventFun = [](std::shared_ptr<KeyEvent> event) {
         MMI_HILOGD("Add monitor success");
     };
@@ -1556,6 +1556,47 @@ HWTEST_F(InputManagerTest, InputManagerTest_SubscribeKeyEvent_03, TestSize.Level
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
 }
 
+/**
+ * @tc.name: InputManagerTest_SubscribeKeyEvent_04
+ * @tc.desc: Verify subscribe key event.
+ * @tc.type: FUNC
+ * @tc.require:
+ * @tc.author:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_SubscribeKeyEvent_04, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    std::set<int32_t> preKeys;
+    std::shared_ptr<KeyOption> keyOption = std::make_shared<KeyOption>();
+    keyOption->SetPreKeys(preKeys);
+    keyOption->SetFinalKey(KeyEvent::KEYCODE_VOLUME_DOWN);
+    keyOption->SetFinalKeyDown(true);
+    keyOption->SetFinalKeyDownDuration(-1);
+    int32_t subscribeId = -1;
+    subscribeId = InputManager::GetInstance()->SubscribeKeyEvent(keyOption,
+        [](std::shared_ptr<KeyEvent> keyEvent) {
+        EventLogHelper::PrintEventData(keyEvent);
+        MMI_HILOGD("Subscribe key event KEYCODE_POWER down trigger callback");
+    });
+#ifdef OHOS_BUILD_ENABLE_KEYBOARD
+    EXPECT_TRUE(subscribeId >= 0);
+#else
+    EXPECT_TRUE(subscribeId < 0);
+#endif // OHOS_BUILD_ENABLE_KEYBOARD
+    std::shared_ptr<KeyEvent> injectDownEvent = KeyEvent::Create();
+    ASSERT_TRUE(injectDownEvent != nullptr);
+    int64_t downTime = GetNanoTime() / NANOSECOND_TO_MILLISECOND;
+    KeyEvent::KeyItem kitDown;
+    kitDown.SetKeyCode(KeyEvent::KEYCODE_VOLUME_DOWN);
+    kitDown.SetPressed(true);
+    kitDown.SetDownTime(downTime);
+    injectDownEvent->SetKeyCode(KeyEvent::KEYCODE_VOLUME_DOWN);
+    injectDownEvent->SetKeyAction(KeyEvent::KEY_ACTION_DOWN);
+    injectDownEvent->AddPressedKeyItems(kitDown);
+    InputManager::GetInstance()->SimulateInputEvent(injectDownEvent);
+    ASSERT_EQ(injectDownEvent->GetKeyAction(), KeyEvent::KEY_ACTION_DOWN);
+}
+
 /**
  * @tc.name: TestGetKeystrokeAbility_001
  * @tc.desc: Verify SupportKeys
@@ -2319,7 +2360,7 @@ HWTEST_F(InputManagerTest, TestInputEventInterceptor_015, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, TestInputEventInterceptor_016, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     auto fun = [](std::shared_ptr<KeyEvent> keyEvent) {
         MMI_HILOGD("Add interceptor success");
     };
@@ -3724,7 +3765,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_UpdateDisplayInfo, TestSize.Level1)
  */
 HWTEST_F(InputManagerTest, InputManagerTest_SetInputDevice, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     std::string dhid("");
     std::string screenId("");
     int32_t ret = InputManager::GetInstance()->SetInputDevice(dhid, screenId);
@@ -3761,7 +3802,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_RegisterCooperateListener_001, TestS
  */
 HWTEST_F(InputManagerTest, InputManagerTest_RegisterCooperateListener_002, TestSize.Level1)
 {
-    CALL_DEBUG_ENTER;
+    CALL_TEST_DEBUG;
     class InputDeviceCooperateListenerTest : public IInputDeviceCooperateListener {
     public:
         InputDeviceCooperateListenerTest() : IInputDeviceCooperateListener() {}
@@ -3939,6 +3980,86 @@ HWTEST_F(InputManagerTest, InputManagerTest_GetDeviceIds, TestSize.Level1)
     ASSERT_EQ(ret, RET_OK);
 }
 
+/**
+ * @tc.name: InputManagerTest_EventTypeToString
+ * @tc.desc: Verify inputevent interface
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_EventTypeToString, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    auto inputEvent = InputEvent::Create();
+    ASSERT_NE(inputEvent, nullptr);
+    auto ret = inputEvent->EventTypeToString(InputEvent::EVENT_TYPE_BASE);
+    ASSERT_STREQ(ret, "base");
+    ret =  inputEvent->EventTypeToString(InputEvent::EVENT_TYPE_KEY);
+    ASSERT_STREQ(ret, "key");
+    ret =  inputEvent->EventTypeToString(InputEvent::EVENT_TYPE_AXIS);
+    ASSERT_STREQ(ret, "axis");
+    ret =  inputEvent->EventTypeToString(-1);
+    ASSERT_STREQ(ret, "unknown");
+}
+
+/**
+ * @tc.name: InputManagerTest_InputDeviceInterface_001
+ * @tc.desc: Verify inputdevice interface
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_InputDeviceInterface_001, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    std::shared_ptr<InputDevice> inputDevice = std::make_shared<InputDevice>();
+    ASSERT_NE(inputDevice, nullptr);
+    inputDevice->SetId(0);
+    ASSERT_EQ(inputDevice->GetId(), 0);
+    inputDevice->SetName("name");
+    ASSERT_STREQ(inputDevice->GetName().c_str(), "name");
+    inputDevice->SetType(0);
+    ASSERT_EQ(inputDevice->GetType(), 0);
+    inputDevice->SetBus(0);
+    ASSERT_EQ(inputDevice->GetBus(), 0);
+    inputDevice->SetVersion(0);
+    ASSERT_EQ(inputDevice->GetVersion(), 0);
+    inputDevice->SetProduct(0);
+    ASSERT_EQ(inputDevice->GetProduct(), 0);
+    inputDevice->SetVendor(0);
+    ASSERT_EQ(inputDevice->GetVendor(), 0);
+    inputDevice->SetPhys("phys");
+    ASSERT_STREQ(inputDevice->GetPhys().c_str(), "phys");
+    inputDevice->SetUniq("uniq");
+    ASSERT_STREQ(inputDevice->GetUniq().c_str(), "uniq");
+}
+
+/**
+ * @tc.name: InputManagerTest_InputDeviceInterface_002
+ * @tc.desc: Verify inputdevice interface
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_InputDeviceInterface_002, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    std::shared_ptr<InputDevice> inputDevice = std::make_shared<InputDevice>();
+    ASSERT_NE(inputDevice, nullptr);
+    InputDevice::AxisInfo axis;
+    axis.SetAxisType(0);
+    axis.SetMinimum(0);
+    axis.SetMaximum(1);
+    axis.SetFuzz(0);
+    axis.SetFlat(1);
+    axis.SetResolution(0);
+    inputDevice->AddAxisInfo(axis);
+    auto iter = inputDevice->GetAxisInfo();
+    ASSERT_EQ(iter[0].GetAxisType(), 0);
+    ASSERT_EQ(iter[0].GetMinimum(), 0);
+    ASSERT_EQ(iter[0].GetMaximum(), 1);
+    ASSERT_EQ(iter[0].GetFuzz(), 0);
+    ASSERT_EQ(iter[0].GetFlat(), 1);
+    ASSERT_EQ(iter[0].GetResolution(), 0);    
+}
+
 /**
  * @tc.name: InputManagerTest_SetAnrObserver
  * @tc.desc: Verify the observer for events
diff --git a/frameworks/proxy/events/test/key_event_test.cpp b/frameworks/proxy/events/test/key_event_test.cpp
index 5b568926d0..38fabc1fbb 100755
--- a/frameworks/proxy/events/test/key_event_test.cpp
+++ b/frameworks/proxy/events/test/key_event_test.cpp
@@ -431,5 +431,31 @@ HWTEST_F(KeyEventTest, KeyEventTest_ReadFromParcel_002, TestSize.Level1)
         ASSERT_TRUE(ret);
     }
 }
+
+/**
+ * @tc.name: KeyEventTest_ReadFromParcel_003
+ * @tc.desc: Verify keyoption read from parcel
+ * @tc.type: FUNC
+ * @tc.require:
+ */
+HWTEST_F(KeyEventTest, KeyEventTest_ReadFromParcel_003, TestSize.Level1)
+{
+   std::set<int32_t> preKeys;
+   std::shared_ptr<KeyOption> keyOption = std::make_shared<KeyOption>();
+   keyOption->SetPreKeys(preKeys);
+   MessageParcel data;
+   bool ret = keyOption->ReadFromParcel(data);
+   ASSERT_FALSE(ret);
+   preKeys.insert(0);
+   preKeys.insert(1);
+   keyOption->SetPreKeys(preKeys);
+   keyOption->SetFinalKey(0);
+   keyOption->SetFinalKeyDown(0);
+   keyOption->SetFinalKeyDownDuration(0);
+   keyOption->SetFinalKeyUpDelay(0);
+   keyOption->WriteToParcel(data);
+   ret = keyOption->ReadFromParcel(data);
+   ASSERT_TRUE(ret);
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/proxy/module_loader/test/mmi_client_test.cpp b/frameworks/proxy/module_loader/test/mmi_client_test.cpp
index 2f4ee7462f..4df3dc89f0 100644
--- a/frameworks/proxy/module_loader/test/mmi_client_test.cpp
+++ b/frameworks/proxy/module_loader/test/mmi_client_test.cpp
@@ -32,8 +32,8 @@ public:
 ConnectCallback connectFun;
 
 /**
- * @tc.name:RegisterConnectedFunction
- * @tc.desc:Verify register connected
+ * @tc.name: RegisterConnectedFunction
+ * @tc.desc: Verify register connected
  * @tc.type: FUNC
  * @tc.require:
  */
@@ -44,8 +44,8 @@ HWTEST_F(MMIClientTest, RegisterConnectedFunction, TestSize.Level1)
 }
 
 /**
- * @tc.name:RegisterDisconnectedFunction
- * @tc.desc:Verify register disconnected
+ * @tc.name: RegisterDisconnectedFunction
+ * @tc.desc: Verify register disconnected
  * @tc.type: FUNC
  * @tc.require:
  */
-- 
Gitee


From c63475c4b7f29cd39e00ec41050df3e833b79472 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Tue, 20 Dec 2022 19:14:20 +0800
Subject: [PATCH 258/360] =?UTF-8?q?=E6=8C=87=E9=92=88=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 .../include/device_config_file_parser.h       |  7 +++--
 .../src/device_config_file_parser.cpp         | 16 ++++--------
 .../src/input_device_manager.cpp              |  2 +-
 .../include/mouse_transform_processor.h       |  4 +--
 .../src/mouse_transform_processor.cpp         | 26 +++++++++----------
 5 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/service/device_config/include/device_config_file_parser.h b/service/device_config/include/device_config_file_parser.h
index b28d7d7913..8cf49180b6 100644
--- a/service/device_config/include/device_config_file_parser.h
+++ b/service/device_config/include/device_config_file_parser.h
@@ -37,13 +37,12 @@ public:
     DeviceConfigManagement() = default;
     ~DeviceConfigManagement() = default;
 public:
-    VendorConfig OnDeviceAdd(struct libinput_device *device);
+    VendorConfig GetVendorConfig(struct libinput_device *device) const;
 
 private:
     std::string CombDeviceFileName(struct libinput_device *device) const;
-    VendorConfig DeviceConfiguration(struct libinput_device *device);
-    std::map<ConfigFileItem, int32_t> ReadConfigFile(const std::string &filePath);
-    ConfigFileItem ConfigItemName2Id(const std::string &name);
+    std::map<ConfigFileItem, int32_t> ReadConfigFile(const std::string &filePath) const;
+    ConfigFileItem ConfigItemName2Id(const std::string &name) const;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/device_config/src/device_config_file_parser.cpp b/service/device_config/src/device_config_file_parser.cpp
index e95fba9533..74fcd80183 100644
--- a/service/device_config/src/device_config_file_parser.cpp
+++ b/service/device_config/src/device_config_file_parser.cpp
@@ -60,7 +60,7 @@ std::string DeviceConfigManagement::CombDeviceFileName(struct libinput_device *d
     return fileName;
 }
 
-ConfigFileItem DeviceConfigManagement::ConfigItemName2Id(const std::string &name)
+ConfigFileItem DeviceConfigManagement::ConfigItemName2Id(const std::string &name) const
 {
     static const std::map<const std::string, ConfigFileItem> configList = {
         {"speed", ConfigFileItem::POINTER_SPEED},
@@ -74,7 +74,7 @@ ConfigFileItem DeviceConfigManagement::ConfigItemName2Id(const std::string &name
     return configList.at(name);
 }
 
-std::map<ConfigFileItem, int32_t> DeviceConfigManagement::ReadConfigFile(const std::string &filePath)
+std::map<ConfigFileItem, int32_t> DeviceConfigManagement::ReadConfigFile(const std::string &filePath) const
 {
     std::map<ConfigFileItem, int32_t> configList;
     std::ifstream cfgFile(filePath);
@@ -110,12 +110,13 @@ std::map<ConfigFileItem, int32_t> DeviceConfigManagement::ReadConfigFile(const s
     return configList;
 }
 
-VendorConfig DeviceConfigManagement::DeviceConfiguration(struct libinput_device *device)
+VendorConfig DeviceConfigManagement::GetVendorConfig(struct libinput_device *device) const
 {
     CALL_DEBUG_ENTER;
+    CHKPO(device);
     std::string filePath = "/vendor/etc/pointer/" + CombDeviceFileName(device) + ".TOML";
+     VendorConfig vendorConfigTmp;
     auto path = FileVerification(filePath, "TOML");
-    VendorConfig vendorConfigTmp;
     if(path.empty()) {
         MMI_HILOGE("File validation failed");
         return vendorConfigTmp;
@@ -132,12 +133,5 @@ VendorConfig DeviceConfigManagement::DeviceConfiguration(struct libinput_device
     vendorConfigTmp.pointerSpeed = configList[ConfigFileItem::POINTER_SPEED];
     return vendorConfigTmp;
 }
-
-VendorConfig DeviceConfigManagement::OnDeviceAdd(struct libinput_device *device)
-{
-    CALL_DEBUG_ENTER;
-    CHKPO(device);
-    return DeviceConfiguration(device);
-}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 2ab4ab5187..e319bee3eb 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -360,7 +360,7 @@ void InputDeviceManager::MakeDeviceInfo(struct libinput_device *inputDevice, str
     }
     info.dhid = GenerateDescriptor(inputDevice, info.isRemote);
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-    info.vendorConfig = configManagement_.OnDeviceAdd(inputDevice);
+    info.vendorConfig = configManagement_.GetVendorConfig(inputDevice);
 }
 
 void InputDeviceManager::OnInputDeviceRemoved(struct libinput_device *inputDevice)
diff --git a/service/mouse_event_normalize/include/mouse_transform_processor.h b/service/mouse_event_normalize/include/mouse_transform_processor.h
index 0319eb8ced..3d450b1770 100644
--- a/service/mouse_event_normalize/include/mouse_transform_processor.h
+++ b/service/mouse_event_normalize/include/mouse_transform_processor.h
@@ -74,7 +74,7 @@ private:
     static double absolutionX_;
     static double absolutionY_;
     static int32_t currentDisplayId_;
-    static int32_t globalSpeed_;
+    static int32_t globalPointerSpeed_;
     static bool isUserSetSpeedStatus_;
 
     std::shared_ptr<PointerEvent> pointerEvent_ { nullptr };
@@ -82,7 +82,7 @@ private:
     int32_t buttonId_ { -1 };
     bool isPressed_ { false };
     int32_t deviceId_ { -1 };
-    int32_t configSpeed_ { -1 };
+    int32_t vendorConfigPointerSpeed_ { -1 };
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/mouse_event_normalize/src/mouse_transform_processor.cpp b/service/mouse_event_normalize/src/mouse_transform_processor.cpp
index db2869827d..cc9f0c024b 100644
--- a/service/mouse_event_normalize/src/mouse_transform_processor.cpp
+++ b/service/mouse_event_normalize/src/mouse_transform_processor.cpp
@@ -59,7 +59,7 @@ constexpr double PERCENT_CONST = 100.0;
 double MouseTransformProcessor::absolutionX_ = -1.0;
 double MouseTransformProcessor::absolutionY_ = -1.0;
 int32_t MouseTransformProcessor::currentDisplayId_ = -1;
-int32_t MouseTransformProcessor::globalSpeed_ = DEFAULT_SPEED;
+int32_t MouseTransformProcessor::globalPointerSpeed_ = DEFAULT_SPEED;
 bool MouseTransformProcessor::isUserSetSpeedStatus_ = false;
 
 MouseTransformProcessor::MouseTransformProcessor(int32_t deviceId)
@@ -404,22 +404,22 @@ int32_t MouseTransformProcessor::SetPointerSpeed(int32_t speed)
 {
     CALL_DEBUG_ENTER;
     if (speed < MIN_SPEED) {
-        globalSpeed_ = MIN_SPEED;
+        globalPointerSpeed_ = MIN_SPEED;
     } else if (speed > MAX_SPEED) {
-        globalSpeed_ = MAX_SPEED;
+        globalPointerSpeed_ = MAX_SPEED;
     } else {
-        globalSpeed_ = speed;
+        globalPointerSpeed_ = speed;
     }
     isUserSetSpeedStatus_ = true;
-    MMI_HILOGD("Set pointer speed:%{public}d", globalSpeed_);
+    MMI_HILOGD("Set pointer speed:%{public}d", globalPointerSpeed_);
     return RET_OK;
 }
 
 int32_t MouseTransformProcessor::GetPointerSpeed()
 {
     CALL_DEBUG_ENTER;
-    MMI_HILOGD("Get pointer speed:%{public}d", globalSpeed_);
-    return globalSpeed_;
+    MMI_HILOGD("Get pointer speed:%{public}d", globalPointerSpeed_);
+    return globalPointerSpeed_;
 }
 
 bool MouseTransformProcessor::GetSpeedGain(double vin, double &gain)
@@ -514,20 +514,20 @@ void MouseTransformProcessor::SetAbsolutionLocation(double xPercent, double yPer
 
 int32_t MouseTransformProcessor::GetSpeed() const
 {
-    if ((configSpeed_ == -1) || isUserSetSpeedStatus_) {
-        return globalSpeed_;
+    if ((vendorConfigPointerSpeed_ == -1) || isUserSetSpeedStatus_) {
+        return globalPointerSpeed_;
     }
-    return configSpeed_;
+    return vendorConfigPointerSpeed_;
 }
 
 void MouseTransformProcessor::SetConfigPointerSpeed(int32_t speed)
 {
     if (speed < MIN_SPEED) {
-        configSpeed_ = MIN_SPEED;
+        vendorConfigPointerSpeed_ = MIN_SPEED;
     } else if (speed > MAX_SPEED) {
-        configSpeed_ = MAX_SPEED;
+        vendorConfigPointerSpeed_ = MAX_SPEED;
     } else {
-        configSpeed_ = speed;
+        vendorConfigPointerSpeed_ = speed;
     }
 }
 } // namespace MMI
-- 
Gitee


From 45210e46f22aaeda586e17c3d5b087a71b149597 Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Wed, 21 Dec 2022 08:52:26 +0800
Subject: [PATCH 259/360] =?UTF-8?q?=E6=8C=87=E9=92=88=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 service/device_config/src/device_config_file_parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/device_config/src/device_config_file_parser.cpp b/service/device_config/src/device_config_file_parser.cpp
index 74fcd80183..6b1e6c3886 100644
--- a/service/device_config/src/device_config_file_parser.cpp
+++ b/service/device_config/src/device_config_file_parser.cpp
@@ -115,7 +115,7 @@ VendorConfig DeviceConfigManagement::GetVendorConfig(struct libinput_device *dev
     CALL_DEBUG_ENTER;
     CHKPO(device);
     std::string filePath = "/vendor/etc/pointer/" + CombDeviceFileName(device) + ".TOML";
-     VendorConfig vendorConfigTmp;
+    VendorConfig vendorConfigTmp = {};
     auto path = FileVerification(filePath, "TOML");
     if(path.empty()) {
         MMI_HILOGE("File validation failed");
-- 
Gitee


From c3f4afdc24ae8c35c767a6a4e8bfabc09154f1ec Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 21 Dec 2022 01:12:23 +0000
Subject: [PATCH 260/360] Test case branch and interface coverage modificatio

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I6f5b6c502af5222e480b6ed666baddad4ddf483a
---
 .../proxy/events/test/input_manager_test.cpp  |  2 +-
 .../proxy/events/test/key_event_test.cpp      | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 806afb37c1..58ec90ecef 100644
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -4057,7 +4057,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_InputDeviceInterface_002, TestSize.L
     ASSERT_EQ(iter[0].GetMaximum(), 1);
     ASSERT_EQ(iter[0].GetFuzz(), 0);
     ASSERT_EQ(iter[0].GetFlat(), 1);
-    ASSERT_EQ(iter[0].GetResolution(), 0);    
+    ASSERT_EQ(iter[0].GetResolution(), 0);
 }
 
 /**
diff --git a/frameworks/proxy/events/test/key_event_test.cpp b/frameworks/proxy/events/test/key_event_test.cpp
index 38fabc1fbb..ecc8be8341 100755
--- a/frameworks/proxy/events/test/key_event_test.cpp
+++ b/frameworks/proxy/events/test/key_event_test.cpp
@@ -440,22 +440,22 @@ HWTEST_F(KeyEventTest, KeyEventTest_ReadFromParcel_002, TestSize.Level1)
  */
 HWTEST_F(KeyEventTest, KeyEventTest_ReadFromParcel_003, TestSize.Level1)
 {
-   std::set<int32_t> preKeys;
-   std::shared_ptr<KeyOption> keyOption = std::make_shared<KeyOption>();
-   keyOption->SetPreKeys(preKeys);
-   MessageParcel data;
-   bool ret = keyOption->ReadFromParcel(data);
-   ASSERT_FALSE(ret);
-   preKeys.insert(0);
-   preKeys.insert(1);
-   keyOption->SetPreKeys(preKeys);
-   keyOption->SetFinalKey(0);
-   keyOption->SetFinalKeyDown(0);
-   keyOption->SetFinalKeyDownDuration(0);
-   keyOption->SetFinalKeyUpDelay(0);
-   keyOption->WriteToParcel(data);
-   ret = keyOption->ReadFromParcel(data);
-   ASSERT_TRUE(ret);
+    std::set<int32_t> preKeys;
+    std::shared_ptr<KeyOption> keyOption = std::make_shared<KeyOption>();
+    keyOption->SetPreKeys(preKeys);
+    MessageParcel data;
+    bool ret = keyOption->ReadFromParcel(data);
+    ASSERT_FALSE(ret);
+    preKeys.insert(0);
+    preKeys.insert(1);
+    keyOption->SetPreKeys(preKeys);
+    keyOption->SetFinalKey(0);
+    keyOption->SetFinalKeyDown(0);
+    keyOption->SetFinalKeyDownDuration(0);
+    keyOption->SetFinalKeyUpDelay(0);
+    keyOption->WriteToParcel(data);
+    ret = keyOption->ReadFromParcel(data);
+    ASSERT_TRUE(ret);
 }
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From 96d1a85e8a3fcad281c5f5fd71517d0945d5e336 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 21 Dec 2022 17:54:31 +0800
Subject: [PATCH 261/360] =?UTF-8?q?key=E4=BA=8B=E4=BB=B6=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I233920f08def0f673e073cb2dccdbcf64a3e4670
---
 service/connect_manager/src/multimodal_input_connect_stub.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 00fd74e20e..5b2c237854 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -581,6 +581,7 @@ int32_t MultimodalInputConnectStub::StubInjectKeyEvent(MessageParcel& data, Mess
         MMI_HILOGE("Read Key Event failed");
         return IPC_PROXY_DEAD_OBJECT_ERR;
     }
+    event->UpdateId();
     int32_t ret = InjectKeyEvent(event);
     if (ret != RET_OK) {
         MMI_HILOGE("InjectKeyEvent failed, ret:%{public}d", ret);
-- 
Gitee


From b9f3951778e120ab99086b3a81fe5ac4de4de9d5 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 21 Dec 2022 20:41:47 +0800
Subject: [PATCH 262/360] Add caps field

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Id6eb296f72aec7bb4ee652ac9ea80d88b2d425a6
---
 .../event_handler/include/input_device_impl.h |  1 -
 .../event_handler/src/input_device_impl.cpp   | 47 -------------------
 .../src/multimodal_input_connect_proxy.cpp    |  3 ++
 .../src/multimodal_input_connect_stub.cpp     |  1 +
 util/common/include/define_multimodal.h       | 16 +++++++
 5 files changed, 20 insertions(+), 48 deletions(-)

diff --git a/frameworks/proxy/event_handler/include/input_device_impl.h b/frameworks/proxy/event_handler/include/input_device_impl.h
index f3adde371c..4c35a83edf 100644
--- a/frameworks/proxy/event_handler/include/input_device_impl.h
+++ b/frameworks/proxy/event_handler/include/input_device_impl.h
@@ -54,7 +54,6 @@ public:
     void OnDevListener(int32_t deviceId, const std::string &type);
     void OnKeyboardType(int32_t userData, int32_t keyboardType);
     int32_t GetUserData();
-    std::shared_ptr<InputDevice> DevDataUnmarshalling(NetPacket &pkt);
 
 private:
     InputDeviceImpl() = default;
diff --git a/frameworks/proxy/event_handler/src/input_device_impl.cpp b/frameworks/proxy/event_handler/src/input_device_impl.cpp
index 4ac7e4e5c8..b3672d38fb 100644
--- a/frameworks/proxy/event_handler/src/input_device_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_device_impl.cpp
@@ -177,52 +177,5 @@ int32_t InputDeviceImpl::GetUserData()
 {
     return userData_;
 }
-
-std::shared_ptr<InputDevice> InputDeviceImpl::DevDataUnmarshalling(NetPacket &pkt)
-{
-    auto devData = std::make_shared<InputDevice>();
-    int32_t deviceId;
-    std::string name;
-    int32_t deviceType;
-    int32_t bus;
-    int32_t product;
-    int32_t vendor;
-    int32_t version;
-    std::string phys;
-    std::string uniq;
-    unsigned long caps;
-    pkt >> deviceId >> name >> deviceType >> bus >> product >> vendor >> version >> phys >> uniq >> caps;
-    devData->SetId(deviceId);
-    devData->SetName(name);
-    devData->SetType(deviceType);
-    devData->SetBus(bus);
-    devData->SetProduct(product);
-    devData->SetVendor(vendor);
-    devData->SetVersion(version);
-    devData->SetPhys(phys);
-    devData->SetUniq(uniq);
-    devData->SetCapabilities(caps);
-
-    size_t size;
-    pkt >> size;
-    for (size_t i = 0; i < size; ++i) {
-        InputDevice::AxisInfo axis;
-        int32_t type;
-        int32_t min;
-        int32_t max;
-        int32_t fuzz;
-        int32_t flat;
-        int32_t resolution;
-        pkt >> type >> min >> max >> fuzz >> flat >> resolution;
-        axis.SetAxisType(type);
-        axis.SetMinimum(min);
-        axis.SetMaximum(max);
-        axis.SetFuzz(fuzz);
-        axis.SetFlat(flat);
-        axis.SetResolution(resolution);
-        devData->AddAxisInfo(axis);
-    }
-    return devData;
-}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index 07d6ac48d4..fd8bf2b026 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -50,6 +50,9 @@ int32_t ParseInputDevice(MessageParcel &reply, std::shared_ptr<InputDevice> &inp
     std::string uniq;
     READSTRING(reply, uniq, IPC_PROXY_DEAD_OBJECT_ERR);
     inputDevice->SetUniq(uniq);
+    uint64_t caps;
+    READUINT64(reply, caps, IPC_PROXY_DEAD_OBJECT_ERR);
+    inputDevice->SetCapabilities(static_cast<unsigned long>(caps));
 
     uint32_t size;
     READUINT32(reply, size, IPC_PROXY_DEAD_OBJECT_ERR);
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 5b2c237854..21c78279e5 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -351,6 +351,7 @@ int32_t MultimodalInputConnectStub::StubGetDevice(MessageParcel& data, MessagePa
     WRITEINT32(reply, inputDevice->GetVendor(), IPC_STUB_WRITE_PARCEL_ERR);
     WRITESTRING(reply, inputDevice->GetPhys(), IPC_STUB_WRITE_PARCEL_ERR);
     WRITESTRING(reply, inputDevice->GetUniq(), IPC_STUB_WRITE_PARCEL_ERR);
+    WRITEUINT64(reply, static_cast<uint64_t>(inputDevice->GetCapabilities()), IPC_STUB_WRITE_PARCEL_ERR);
     WRITEUINT32(reply, static_cast<uint32_t>(inputDevice->GetAxisInfo().size()), IPC_STUB_WRITE_PARCEL_ERR);
     for (const auto &item : inputDevice->GetAxisInfo()) {
         WRITEINT32(reply, item.GetMinimum(), IPC_STUB_WRITE_PARCEL_ERR);
diff --git a/util/common/include/define_multimodal.h b/util/common/include/define_multimodal.h
index 4f77d9753d..73fd959375 100644
--- a/util/common/include/define_multimodal.h
+++ b/util/common/include/define_multimodal.h
@@ -251,6 +251,14 @@ inline constexpr int32_t INVALID_PID { -1 };
         } \
     } while (0)
 
+#define WRITEUINT64(parcel, data, ...) \
+    do { \
+        if (!(parcel).WriteUint64(data)) { \
+            MMI_HILOGE("WriteUint64 "#data" failed"); \
+            return DEFRET(false, ##__VA_ARGS__); \
+        } \
+    } while (0)
+
 #define WRITEDOUBLE(parcel, data, ...) \
     do { \
         if (!(parcel).WriteDouble(data)) { \
@@ -299,6 +307,14 @@ inline constexpr int32_t INVALID_PID { -1 };
         } \
     } while (0)
 
+#define READUINT64(parcel, data, ...) \
+    do { \
+        if (!(parcel).ReadUint64(data)) { \
+            MMI_HILOGE("ReadUint64 "#data" failed"); \
+            return DEFRET(false, ##__VA_ARGS__); \
+        } \
+    } while (0)
+
 #define READDOUBLE(parcel, data, ...) \
     do { \
         if (!(parcel).ReadDouble(data)) { \
-- 
Gitee


From cc85b0c75f2923ae1bcee28bb0e04f46000e3658 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 22 Dec 2022 02:59:13 +0000
Subject: [PATCH 263/360] Modifying Interceptor crash

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ie7691e3f15017eacb1728e2ff1925bec39a6d558
---
 .vscode/settings.json                                 |  7 +++++++
 service/interceptor/src/event_interceptor_handler.cpp | 10 +++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000..66c594ccfe
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+    "files.associations": {
+        "list": "cpp",
+        "iterator": "cpp",
+        "vector": "cpp"
+    }
+}
\ No newline at end of file
diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp
index 2032d88214..72516a7123 100644
--- a/service/interceptor/src/event_interceptor_handler.cpp
+++ b/service/interceptor/src/event_interceptor_handler.cpp
@@ -314,12 +314,16 @@ void EventInterceptorHandler::InterceptorCollection::RemoveInterceptor(const Ses
 void EventInterceptorHandler::InterceptorCollection::OnSessionLost(SessionPtr session)
 {
     CALL_INFO_TRACE;
-    for (auto iter = interceptors_.begin(); iter != interceptors_.end(); ++iter) {
-        if (iter->session_ == session) {
-            interceptors_.erase(iter);
+    auto iter = interceptors_.cbegin();
+    while (iter != interceptors_.cend()) {
+        if (iter->session_ != session) {
+            ++iter;
+        } else {
+            iter = interceptors_.erase(iter);
         }
     }
 }
+
 void EventInterceptorHandler::Dump(int32_t fd, const std::vector<std::string> &args)
 {
     return interceptors_.Dump(fd, args);
-- 
Gitee


From f04e369482bff9b3aeab543d50696f899309523e Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 22 Dec 2022 02:59:38 +0000
Subject: [PATCH 264/360] Modifying Interceptor crash

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I99a2c0b0a8f781e04e2f0bde94d6762e94ce9913
---
 .vscode/settings.json | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 66c594ccfe..0000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "files.associations": {
-        "list": "cpp",
-        "iterator": "cpp",
-        "vector": "cpp"
-    }
-}
\ No newline at end of file
-- 
Gitee


From ea3ebba34405ce24d04f600e038f6048915c281e Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 23 Dec 2022 10:07:56 +0800
Subject: [PATCH 265/360] =?UTF-8?q?dfx=E6=89=93=E7=82=B9=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=BF=A1=E6=81=AF=E8=BF=87=E4=BA=8E=E7=AE=80?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I8868e1fd06f92088c27a6b315a384168c6329f9d
---
 service/hisysevent.yaml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/service/hisysevent.yaml b/service/hisysevent.yaml
index 0e2e86c75d..6af53d365c 100644
--- a/service/hisysevent.yaml
+++ b/service/hisysevent.yaml
@@ -77,8 +77,8 @@ INPUT_DEV_DISCONNECTION_FAILURE:
 
 CLIENT_CONNECTION_SUCCESS:
   __BASE: {type: BEHAVIOR, level: MINOR, tag: PowerStats, desc: client connection event success}
-  PID: {type: INT32, desc: pid}
-  UID: {type: INT32, desc: uid}
+  PID: {type: INT32, desc: session pid}
+  UID: {type: INT32, desc: session uid}
   MODULE_TYPE: {type: INT32, desc: module type}
   FD: {type: INT32, desc: server fd}
   PROGRAMNAME: {type: STRING, desc: program name}
@@ -86,16 +86,16 @@ CLIENT_CONNECTION_SUCCESS:
 
 CLIENT_CONNECTION_FAILURE:
   __BASE: {type: FAULT, level: MINOR, tag: PowerStats, desc: client connection event failure}
-  PID: {type: INT32, desc: pid}
-  UID: {type: INT32, desc: uid}
+  PID: {type: INT32, desc: session pid}
+  UID: {type: INT32, desc: session uid}
   MODULE_TYPE: {type: INT32, desc: module type}
   PROGRAMNAME: {type: STRING, desc: program name}
   MSG: {type: STRING, desc: message}
 
 CLIENT_DISCONNECTION_SUCCESS:
   __BASE: {type: BEHAVIOR, level: MINOR, tag: PowerStats, desc: client disconnection event success}
-  PID: {type: INT32, desc: pid}
-  UID: {type: INT32, desc: uid}
+  PID: {type: INT32, desc: session pid}
+  UID: {type: INT32, desc: session uid}
   MODULE_TYPE: {type: INT32, desc: module type}
   FD: {type: INT32, desc: server fd}
   PROGRAMNAME: {type: STRING, desc: program name}
@@ -110,7 +110,7 @@ TARGET_POINTER_EVENT_SUCCESS:
   EVENTTYPE: {type: INT32, desc: event type}
   AGENT_WINDOWID: {type: INT32, desc: agent windowid}
   TARGET_WINDOWID: {type: INT32, desc: target windowid}
-  PID: {type: INT32, desc: pid}
+  PID: {type: INT32, desc: session pid}
   FD: {type: INT32, desc: target fd}
   MSG: {type: STRING, desc: message}
 
@@ -122,27 +122,27 @@ TARGET_POINTER_EVENT_FAILURE:
 TARGET_KEY_EVENT_SUCCESS:
   __BASE: {type: BEHAVIOR, level: MINOR, tag: PowerStats, desc: target key event success}
   EVENTTYPE: {type: INT32, desc: event type}
-  KEYCODE: {type: INT32, desc: keycode}
-  ACTION: {type: INT32, desc: action}
+  KEYCODE: {type: INT32, desc: key code}
+  ACTION: {type: INT32, desc: key action}
   ACTION_TIME: {type: UINT64, desc: action time}
   ACTION_STARTTIME: {type: UINT64, desc: action start time}
-  FLAG: {type: INT32, desc: flag}
-  KEYACTION: {type: INT32, desc: keyaction}
+  FLAG: {type: INT32, desc: key flag}
+  KEYACTION: {type: INT32, desc: key action}
   FD: {type: INT32, desc: target fd}
   AGENT_WINDOWID: {type: INT32, desc: agent windowid}
   TARGET_WINDOWID: {type: INT32, desc: target windowid}
-  PID: {type: INT32, desc: pid}
+  PID: {type: INT32, desc: session pid}
   MSG: {type: STRING, desc: message}
 
 TARGET_KEY_EVENT_FAILURE:
   __BASE: {type: FAULT, level: MINOR, tag: PowerStats, desc: target key event failure}
   EVENTTYPE: {type: INT32, desc: event type}
-  KEYCODE: {type: INT32, desc: keycode}
-  ACTION: {type: INT32, desc: action}
+  KEYCODE: {type: INT32, desc: key code}
+  ACTION: {type: INT32, desc: key action}
   ACTION_TIME: {type: UINT64, desc: action time}
   ACTION_STARTTIME: {type: UINT64, desc: action start time}
-  FLAG: {type: INT32, desc: flag}
-  KEYACTION: {type: INT32, desc: keyaction}
+  FLAG: {type: INT32, desc: key flag}
+  KEYACTION: {type: INT32, desc: key action}
   MSG: {type: STRING, desc: message}
 
 FOCUS_WINDOW_CHANGE:
-- 
Gitee


From f960fc94b662dba86894302a1bdeeec051d7bf8a Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Sat, 24 Dec 2022 17:10:29 +0800
Subject: [PATCH 266/360] =?UTF-8?q?=E8=B0=83=E7=94=A8inputManagerImpl?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I193246d53d213747c4751e9fbc854679b3170568
---
 .../input_device_cooperate/src/js_event_target.cpp     |  8 ++++----
 .../src/js_input_device_cooperate_manager.cpp          | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
index 72843f8f24..47adc5d42c 100644
--- a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
@@ -21,7 +21,7 @@
 
 #include "define_multimodal.h"
 #include "error_multimodal.h"
-#include "input_manager.h"
+#include "input_manager_impl.h"
 #include "mmi_log.h"
 #include "napi_constants.h"
 #include "util_napi.h"
@@ -170,7 +170,7 @@ void JsEventTarget::AddListener(napi_env env, const std::string &type, napi_valu
     iter->second.push_back(std::move(monitor));
     if (!isListeningProcess_) {
         isListeningProcess_ = true;
-        InputMgr->RegisterCooperateListener(shared_from_this());
+        InputMgrImpl->RegisterCooperateListener(shared_from_this());
     }
 }
 
@@ -198,7 +198,7 @@ void JsEventTarget::RemoveListener(napi_env env, const std::string &type, napi_v
 monitorLabel:
     if (isListeningProcess_ && iter->second.empty()) {
         isListeningProcess_ = false;
-        InputMgr->UnregisterCooperateListener(shared_from_this());
+        InputMgrImpl->UnregisterCooperateListener(shared_from_this());
     }
 }
 
@@ -221,7 +221,7 @@ void JsEventTarget::ResetEnv()
     CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(mutex_);
     cooperateListener_.clear();
-    InputMgr->UnregisterCooperateListener(shared_from_this());
+    InputMgrImpl->UnregisterCooperateListener(shared_from_this());
 }
 
 void JsEventTarget::OnCooperateMessage(const std::string &deviceId, CooperationMessage msg)
diff --git a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp
index a941ffd07a..17c02da8e0 100644
--- a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp
@@ -19,7 +19,7 @@
 
 #include "define_multimodal.h"
 #include "input_device_cooperate_impl.h"
-#include "input_manager.h"
+#include "input_manager_impl.h"
 #include "mmi_log.h"
 #include "napi_constants.h"
 #include "util_napi.h"
@@ -37,7 +37,7 @@ napi_value JsInputDeviceCooperateManager::Enable(napi_env env, bool enable, napi
     CHKPP(cb);
     napi_value ret = CreateCallbackInfo(env, handle, cb);
     auto callback = std::bind(EmitJsEnable, cb, std::placeholders::_1, std::placeholders::_2);
-    int32_t errCode = InputMgr->EnableInputDeviceCooperate(enable, callback);
+    int32_t errCode = InputMgrImpl->EnableInputDeviceCooperate(enable, callback);
     HandleExecuteResult(env, errCode);
     return ret;
 }
@@ -50,7 +50,7 @@ napi_value JsInputDeviceCooperateManager::Start(napi_env env, const std::string
     CHKPP(cb);
     napi_value ret = CreateCallbackInfo(env, handle, cb);
     auto callback = std::bind(EmitJsStart, cb, std::placeholders::_1, std::placeholders::_2);
-    int32_t errCode = InputMgr->StartInputDeviceCooperate(sinkDeviceDescriptor, srcInputDeviceId, callback);
+    int32_t errCode = InputMgrImpl->StartInputDeviceCooperate(sinkDeviceDescriptor, srcInputDeviceId, callback);
     HandleExecuteResult(env, errCode);
     return ret;
 }
@@ -62,7 +62,7 @@ napi_value JsInputDeviceCooperateManager::Stop(napi_env env, napi_value handle)
     CHKPP(cb);
     napi_value ret = CreateCallbackInfo(env, handle, cb);
     auto callback = std::bind(EmitJsStop, cb, std::placeholders::_1, std::placeholders::_2);
-    int32_t errCode = InputMgr->StopDeviceCooperate(callback);
+    int32_t errCode = InputMgrImpl->StopDeviceCooperate(callback);
     HandleExecuteResult(env, errCode);
     return ret;
 }
@@ -74,7 +74,7 @@ napi_value JsInputDeviceCooperateManager::GetState(napi_env env, const std::stri
     CHKPP(cb);
     napi_value ret = CreateCallbackInfo(env, handle, cb);
     auto callback = std::bind(EmitJsGetState, cb, std::placeholders::_1);
-    int32_t errCode = InputMgr->GetInputDeviceCooperateState(deviceDescriptor, callback);
+    int32_t errCode = InputMgrImpl->GetInputDeviceCooperateState(deviceDescriptor, callback);
     HandleExecuteResult(env, errCode);
     return ret;
 }
-- 
Gitee


From 9f0b5f52db5ed933426e0cc627d2f620f303ac7c Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 26 Dec 2022 09:33:39 +0800
Subject: [PATCH 267/360] remove cooperation interface

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ie18c78ad8c9ac025a3f78432a96dc26f377b40f1
---
 .../src/js_event_target.cpp                   |  8 +--
 .../src/js_input_device_cooperate_manager.cpp | 10 ++--
 frameworks/proxy/BUILD.gn                     |  2 +
 frameworks/proxy/events/src/input_manager.cpp | 32 -----------
 .../proxy/events/test/input_manager_test.cpp  | 17 +++---
 .../innerkits/proxy/include/input_manager.h   | 53 -------------------
 .../getinputdevicecooperatestate_fuzzer.cpp   |  4 +-
 .../registercooperatelistener_fuzzer.cpp      |  6 +--
 8 files changed, 25 insertions(+), 107 deletions(-)

diff --git a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
index 72843f8f24..136cc37920 100644
--- a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
@@ -21,7 +21,7 @@
 
 #include "define_multimodal.h"
 #include "error_multimodal.h"
-#include "input_manager.h"
+#include "input_manager_impl.h"
 #include "mmi_log.h"
 #include "napi_constants.h"
 #include "util_napi.h"
@@ -170,7 +170,7 @@ void JsEventTarget::AddListener(napi_env env, const std::string &type, napi_valu
     iter->second.push_back(std::move(monitor));
     if (!isListeningProcess_) {
         isListeningProcess_ = true;
-        InputMgr->RegisterCooperateListener(shared_from_this());
+        InputMgrImpl.RegisterCooperateListener(shared_from_this());
     }
 }
 
@@ -198,7 +198,7 @@ void JsEventTarget::RemoveListener(napi_env env, const std::string &type, napi_v
 monitorLabel:
     if (isListeningProcess_ && iter->second.empty()) {
         isListeningProcess_ = false;
-        InputMgr->UnregisterCooperateListener(shared_from_this());
+        InputMgrImpl.UnregisterCooperateListener(shared_from_this());
     }
 }
 
@@ -221,7 +221,7 @@ void JsEventTarget::ResetEnv()
     CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(mutex_);
     cooperateListener_.clear();
-    InputMgr->UnregisterCooperateListener(shared_from_this());
+    InputMgrImpl.UnregisterCooperateListener(shared_from_this());
 }
 
 void JsEventTarget::OnCooperateMessage(const std::string &deviceId, CooperationMessage msg)
diff --git a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp
index a941ffd07a..9951a63e2d 100644
--- a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp
@@ -19,7 +19,7 @@
 
 #include "define_multimodal.h"
 #include "input_device_cooperate_impl.h"
-#include "input_manager.h"
+#include "input_manager_impl.h"
 #include "mmi_log.h"
 #include "napi_constants.h"
 #include "util_napi.h"
@@ -37,7 +37,7 @@ napi_value JsInputDeviceCooperateManager::Enable(napi_env env, bool enable, napi
     CHKPP(cb);
     napi_value ret = CreateCallbackInfo(env, handle, cb);
     auto callback = std::bind(EmitJsEnable, cb, std::placeholders::_1, std::placeholders::_2);
-    int32_t errCode = InputMgr->EnableInputDeviceCooperate(enable, callback);
+    int32_t errCode = InputMgrImpl.EnableInputDeviceCooperate(enable, callback);
     HandleExecuteResult(env, errCode);
     return ret;
 }
@@ -50,7 +50,7 @@ napi_value JsInputDeviceCooperateManager::Start(napi_env env, const std::string
     CHKPP(cb);
     napi_value ret = CreateCallbackInfo(env, handle, cb);
     auto callback = std::bind(EmitJsStart, cb, std::placeholders::_1, std::placeholders::_2);
-    int32_t errCode = InputMgr->StartInputDeviceCooperate(sinkDeviceDescriptor, srcInputDeviceId, callback);
+    int32_t errCode = InputMgrImpl.StartInputDeviceCooperate(sinkDeviceDescriptor, srcInputDeviceId, callback);
     HandleExecuteResult(env, errCode);
     return ret;
 }
@@ -62,7 +62,7 @@ napi_value JsInputDeviceCooperateManager::Stop(napi_env env, napi_value handle)
     CHKPP(cb);
     napi_value ret = CreateCallbackInfo(env, handle, cb);
     auto callback = std::bind(EmitJsStop, cb, std::placeholders::_1, std::placeholders::_2);
-    int32_t errCode = InputMgr->StopDeviceCooperate(callback);
+    int32_t errCode = InputMgrImpl.StopDeviceCooperate(callback);
     HandleExecuteResult(env, errCode);
     return ret;
 }
@@ -74,7 +74,7 @@ napi_value JsInputDeviceCooperateManager::GetState(napi_env env, const std::stri
     CHKPP(cb);
     napi_value ret = CreateCallbackInfo(env, handle, cb);
     auto callback = std::bind(EmitJsGetState, cb, std::placeholders::_1);
-    int32_t errCode = InputMgr->GetInputDeviceCooperateState(deviceDescriptor, callback);
+    int32_t errCode = InputMgrImpl.GetInputDeviceCooperateState(deviceDescriptor, callback);
     HandleExecuteResult(env, errCode);
     return ret;
 }
diff --git a/frameworks/proxy/BUILD.gn b/frameworks/proxy/BUILD.gn
index 150f261fac..2c63125ca5 100755
--- a/frameworks/proxy/BUILD.gn
+++ b/frameworks/proxy/BUILD.gn
@@ -200,7 +200,9 @@ ohos_unittest("InputManagerTest") {
   module_out_path = module_output_path
   include_dirs = [
     "${mmi_path}/frameworks/proxy/events/test",
+    "${mmi_path}/frameworks/proxy/event_handler/include",
     "$root_out_dir/diff_libinput_mmi/export_include",
+    "${mmi_path}/service/filter/include",
   ]
 
   defines = input_default_defines
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index 7c9a515115..1b9549885b 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -213,38 +213,6 @@ int32_t InputManager::SetInputDevice(const std::string& dhid, const std::string&
     return InputMgrImpl.SetInputDevice(dhid, screenId);
 }
 
-int32_t InputManager::RegisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener)
-{
-    return InputMgrImpl.RegisterCooperateListener(listener);
-}
-
-int32_t InputManager::UnregisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener)
-{
-    return InputMgrImpl.UnregisterCooperateListener(listener);
-}
-
-int32_t InputManager::EnableInputDeviceCooperate(bool enabled,
-    std::function<void(std::string, CooperationMessage)> callback)
-{
-    return InputMgrImpl.EnableInputDeviceCooperate(enabled, callback);
-}
-
-int32_t InputManager::StartInputDeviceCooperate(const std::string &sinkDeviceId, int32_t srcInputDeviceId,
-    std::function<void(std::string, CooperationMessage)> callback)
-{
-    return InputMgrImpl.StartInputDeviceCooperate(sinkDeviceId, srcInputDeviceId, callback);
-}
-
-int32_t InputManager::StopDeviceCooperate(std::function<void(std::string, CooperationMessage)> callback)
-{
-    return InputMgrImpl.StopDeviceCooperate(callback);
-}
-
-int32_t InputManager::GetInputDeviceCooperateState(const std::string &deviceId, std::function<void(bool)> callback)
-{
-    return InputMgrImpl.GetInputDeviceCooperateState(deviceId, callback);
-}
-
 bool InputManager::GetFunctionKeyState(int32_t funcKey)
 {
     return InputMgrImpl.GetFunctionKeyState(funcKey);
diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 58ec90ecef..19e9f5828c 100644
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -16,6 +16,7 @@
 #include "event_log_helper.h"
 #include "event_util_test.h"
 #include "input_handler_type.h"
+#include "input_manager_impl.h"
 #include "mmi_log.h"
 #include "multimodal_event_handler.h"
 #include "system_info.h"
@@ -3786,7 +3787,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_RegisterCooperateListener_001, TestS
 {
     CALL_TEST_DEBUG;
     std::shared_ptr<IInputDeviceCooperateListener> consumer = nullptr;
-    int32_t ret = InputManager::GetInstance()->RegisterCooperateListener(consumer);
+    int32_t ret = InputMgrImpl.RegisterCooperateListener(consumer);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     ASSERT_EQ(ret, RET_ERR);
 #else
@@ -3812,13 +3813,13 @@ HWTEST_F(InputManagerTest, InputManagerTest_RegisterCooperateListener_002, TestS
         };
     };
     std::shared_ptr<InputDeviceCooperateListenerTest> consumer = std::make_shared<InputDeviceCooperateListenerTest>();
-    int32_t ret = InputManager::GetInstance()->RegisterCooperateListener(consumer);
+    int32_t ret = InputMgrImpl.RegisterCooperateListener(consumer);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     ASSERT_EQ(ret, RET_OK);
 #else
     ASSERT_EQ(ret, ERROR_UNSUPPORT);
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-    ret = InputManager::GetInstance()->UnregisterCooperateListener(consumer);
+    ret = InputMgrImpl.UnregisterCooperateListener(consumer);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     ASSERT_EQ(ret, RET_OK);
 #else
@@ -3836,7 +3837,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_UnregisterCooperateListener, TestSiz
 {
     CALL_TEST_DEBUG;
     std::shared_ptr<IInputDeviceCooperateListener> consumer = nullptr;
-    int32_t ret = InputManager::GetInstance()->UnregisterCooperateListener(consumer);
+    int32_t ret = InputMgrImpl.UnregisterCooperateListener(consumer);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     ASSERT_EQ(ret, RET_OK);
 #else
@@ -3857,7 +3858,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_EnableInputDeviceCooperate, TestSize
     auto fun = [](std::string listener, CooperationMessage cooperateMessages) {
         MMI_HILOGD("Enable input device cooperate success");
     };
-    int32_t ret = InputManager::GetInstance()->EnableInputDeviceCooperate(enabled, fun);
+    int32_t ret = InputMgrImpl.EnableInputDeviceCooperate(enabled, fun);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     ASSERT_EQ(ret, RET_OK);
 #else
@@ -3879,7 +3880,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_StartInputDeviceCooperate, TestSize.
     auto fun = [](std::string listener, CooperationMessage cooperateMessages) {
         MMI_HILOGD("Start input device cooperate success");
     };
-    int32_t ret = InputManager::GetInstance()->StartInputDeviceCooperate(sinkDeviceId, srcInputDeviceId, fun);
+    int32_t ret = InputMgrImpl.StartInputDeviceCooperate(sinkDeviceId, srcInputDeviceId, fun);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     ASSERT_NE(ret, RET_OK);
 #else
@@ -3899,7 +3900,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_StopDeviceCooperate, TestSize.Level1
     auto fun = [](std::string listener, CooperationMessage cooperateMessages) {
         MMI_HILOGD("Start input device cooperate success");
     };
-    int32_t ret = InputManager::GetInstance()->StopDeviceCooperate(fun);
+    int32_t ret = InputMgrImpl.StopDeviceCooperate(fun);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     ASSERT_NE(ret, ERROR_UNSUPPORT);
 #else
@@ -3920,7 +3921,7 @@ HWTEST_F(InputManagerTest, InputManagerTest_GetInputDeviceCooperateState, TestSi
     auto fun = [](bool state) {
         MMI_HILOGD("Get inputdevice state success");
     };
-    int32_t ret = InputManager::GetInstance()->GetInputDeviceCooperateState(deviceId, fun);
+    int32_t ret = InputMgrImpl.GetInputDeviceCooperateState(deviceId, fun);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     ASSERT_EQ(ret, RET_OK);
 #else
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index 627a0b4dfa..461c9c6813 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -322,59 +322,6 @@ public:
      */
     int32_t SetInputDevice(const std::string &dhid, const std::string &screenId);
 
-    /**
-     * @brief Registers a listener for screen hopping events of the mouse pointer.
-     * @param listener Indicates the listener for screen hopping events of the mouse pointer.
-     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
-     * @since 9
-     */
-    int32_t RegisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener);
-
-    /**
-     * @brief Unregisters the listener for screen hopping events of the mouse pointer.
-     * @param listener Indicates the listener for screen hopping events of the mouse pointer.
-     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
-     * @since 9
-     */
-    int32_t UnregisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener = nullptr);
-
-    /**
-     * @brief Enables or disables screen hopping for the mouse pointer.
-     * @param enabled Indicates whether to enable or disable screen hopping for the mouse pointer.
-     * @param callback Indicates the callback used to receive the result of enabling or disabling screen hopping.
-     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
-     * @since 9
-     */
-    int32_t EnableInputDeviceCooperate(bool enabled, std::function<void(std::string, CooperationMessage)> callback);
-
-    /**
-     * @brief Starts screen hopping for the mouse pointer.
-     * @param sinkDeviceId Indicates the descriptor of the target input device (network ID) for screen hopping.
-     * @param srcInputDeviceId Indicates the ID of the source input device (device ID handle) for screen hopping.
-     * @param callback Indicates the callback used to receive the result of starting screen hopping.
-     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
-     * @since 9
-     */
-    int32_t StartInputDeviceCooperate(const std::string &sinkDeviceId, int32_t srcInputDeviceId,
-        std::function<void(std::string, CooperationMessage)> callback);
-
-    /**
-     * @brief Stops screen hopping for the mouse pointer.
-     * @param callback Indicates the callback used to receive the result of stopping screen hopping.
-     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
-     * @since 9
-     */
-    int32_t StopDeviceCooperate(std::function<void(std::string, CooperationMessage)> callback);
-
-    /**
-     * @brief Obtains the screen hopping status of a mouse pointer.
-     * @param deviceId Indicates the descriptor of the input device.
-     * @param callback Indicates the callback used to receive the screen hopping status.
-     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
-     * @since 9
-     */
-    int32_t GetInputDeviceCooperateState(const std::string &deviceId, std::function<void(bool)> callback);
-
     /**
      * @brief Obtains the enablement status of the specified function key on the keyboard.
      * @param funcKey Indicates the function key. Currently, the following function keys are supported:
diff --git a/test/fuzztest/getinputdevicecooperatestate_fuzzer/getinputdevicecooperatestate_fuzzer.cpp b/test/fuzztest/getinputdevicecooperatestate_fuzzer/getinputdevicecooperatestate_fuzzer.cpp
index fcc34a0282..73e1a2fa38 100644
--- a/test/fuzztest/getinputdevicecooperatestate_fuzzer/getinputdevicecooperatestate_fuzzer.cpp
+++ b/test/fuzztest/getinputdevicecooperatestate_fuzzer/getinputdevicecooperatestate_fuzzer.cpp
@@ -17,7 +17,7 @@
 
 #include "securec.h"
 
-#include "input_manager.h"
+#include "input_manager_impl.h"
 #include "mmi_log.h"
 
 namespace OHOS {
@@ -35,7 +35,7 @@ void GetInputDeviceCooperateStateFuzzTest(const uint8_t* data, size_t size)
     auto fun = [](bool inputdevice) {
         MMI_HILOGD("Get inputdevice state success");
     };
-    InputManager::GetInstance()->GetInputDeviceCooperateState(deviceId, fun);
+    InputMgrImpl.GetInputDeviceCooperateState(deviceId, fun);
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/test/fuzztest/registercooperatelistener_fuzzer/registercooperatelistener_fuzzer.cpp b/test/fuzztest/registercooperatelistener_fuzzer/registercooperatelistener_fuzzer.cpp
index b5fa9aeebc..cac0cf58cc 100644
--- a/test/fuzztest/registercooperatelistener_fuzzer/registercooperatelistener_fuzzer.cpp
+++ b/test/fuzztest/registercooperatelistener_fuzzer/registercooperatelistener_fuzzer.cpp
@@ -17,7 +17,7 @@
 
 #include "securec.h"
 
-#include "input_manager.h"
+#include "input_manager_impl.h"
 #include "mmi_log.h"
 #include "i_input_device_cooperate_listener.h"
 
@@ -39,8 +39,8 @@ public:
 void RegisterCooperateListenerFuzzTest(const uint8_t* data, size_t size)
 {
     std::shared_ptr<InputDeviceCooperateListenerTest> consumer = std::make_shared<InputDeviceCooperateListenerTest>();
-    InputManager::GetInstance()->RegisterCooperateListener(consumer);
-    InputManager::GetInstance()->UnregisterCooperateListener(consumer);
+    InputMgrImpl.RegisterCooperateListener(consumer);
+    InputMgrImpl.UnregisterCooperateListener(consumer);
 }
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From 0c1ae52d4b26e4f5d79a8902b3b22a6648f7f0a8 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 26 Dec 2022 02:39:28 +0000
Subject: [PATCH 268/360] add interface GetWindowPid

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I6c0630327daa2e965418ec153fab656fef72910f
---
 .../proxy/event_handler/include/input_manager_impl.h  |  2 +-
 .../proxy/event_handler/src/input_manager_impl.cpp    | 11 +++++++++++
 frameworks/proxy/events/src/input_manager.cpp         |  4 ++++
 .../native/innerkits/proxy/include/input_manager.h    |  1 +
 4 files changed, 17 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 frameworks/proxy/event_handler/src/input_manager_impl.cpp

diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index 02d2c523e5..dea862d3ce 100644
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -49,7 +49,7 @@ public:
 
     int32_t GetDisplayBindInfo(DisplayBindInfos &infos);
     int32_t SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg);
-
+    int32_t GetWindowPid(int32_t windowId);
     void UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo);
     int32_t SubscribeKeyEvent(
         std::shared_ptr<KeyOption> keyOption,
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
old mode 100755
new mode 100644
index 0a480e0b68..2d3914ff62
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -95,6 +95,17 @@ int32_t InputManagerImpl::SetDisplayBind(int32_t deviceId, int32_t displayId, st
     return RET_OK;
 }
 
+int32_t InputManagerImpl::GetWindowPid(int32_t windowId)
+{
+    std::lock_guard<std::mutex> guard(mtx_);
+    for (const auto& item : displayGroupInfo_.windowsInfo) {
+        if (windowId == item.id) {
+            return item.pid;
+        }
+    }
+    return RET_ERR;
+}
+
 void InputManagerImpl::UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo)
 {
     CALL_DEBUG_ENTER;
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index 7c9a515115..56b2fff13a 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -42,6 +42,10 @@ int32_t InputManager::SetDisplayBind(int32_t deviceId, int32_t displayId, std::s
     return InputMgrImpl.SetDisplayBind(deviceId, displayId, msg);
 }
 
+int32_t InputManager::GetWindowPid(int32_t windowId)
+{
+    return InputMgrImpl.GetWindowPid(windowId);
+}
 void InputManager::UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo)
 {
     InputMgrImpl.UpdateDisplayInfo(displayGroupInfo);
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index 627a0b4dfa..51bf3ce8ee 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -421,6 +421,7 @@ public:
      */
     int32_t LeaveCaptureMode(int32_t windowId);
 
+    int32_t GetWindowPid(int32_t windowId);
 private:
     InputManager() = default;
     DISALLOW_COPY_AND_MOVE(InputManager);
-- 
Gitee


From c1ee6233b42e229c6aa4509a61536388e5273498 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 26 Dec 2022 03:30:59 +0000
Subject: [PATCH 269/360] add interface GetWindowPid

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I07914e8e54db190beb14eddda7d5b7bac38f8a51
---
 .../event_handler/src/input_manager_impl.cpp  | 10 ++++----
 .../include/i_multimodal_input_connect.h      |  2 ++
 .../multimodal_input_connect_manager.h        |  2 +-
 .../include/multimodal_input_connect_proxy.h  |  2 +-
 .../include/multimodal_input_connect_stub.h   |  1 +
 .../src/multimodal_input_connect_manager.cpp  | 10 ++++++++
 .../src/multimodal_input_connect_proxy.cpp    | 25 +++++++++++++++++++
 .../src/multimodal_input_connect_stub.cpp     | 15 +++++++++++
 service/module_loader/include/mmi_service.h   |  2 +-
 service/module_loader/src/mmi_service.cpp     | 13 +++++++++-
 10 files changed, 73 insertions(+), 9 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 2d3914ff62..8be0a919cd 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -98,12 +98,12 @@ int32_t InputManagerImpl::SetDisplayBind(int32_t deviceId, int32_t displayId, st
 int32_t InputManagerImpl::GetWindowPid(int32_t windowId)
 {
     std::lock_guard<std::mutex> guard(mtx_);
-    for (const auto& item : displayGroupInfo_.windowsInfo) {
-        if (windowId == item.id) {
-            return item.pid;
-        }
+    int32_t ret = MultimodalInputConnMgr->GetWindowPid(windowId);
+    if (ret != RET_OK) {
+        MMI_HILOGE("SetDisplayBind failed, ret:%{public}d", ret);
+        return RET_ERR;
     }
-    return RET_ERR;
+    return RET_OK;
 }
 
 void InputManagerImpl::UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo)
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
index 0bc2e786c3..a7f2d56aeb 100644
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -71,6 +71,7 @@ public:
         SET_DISPLAY_BIND = 36,
         SET_INPUT_DEVICE_TO_SCREEN = 50,
         SET_POINTER_LOCATION = 51,
+        GET_WINDOW_PID = 52,
     };
 
     enum {
@@ -122,6 +123,7 @@ public:
     virtual int32_t SetFunctionKeyState(int32_t funcKey, bool enable) = 0;
     virtual int32_t SetPointerLocation(int32_t x, int32_t y) = 0;
     virtual int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode) = 0;
+    virtual int32_t GetWindowPid(int32_t windowId) = 0;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
index bea8091aae..b83fc802bb 100644
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -76,7 +76,7 @@ public:
     int32_t SetFunctionKeyState(int32_t funcKey, bool enable);
     int32_t SetPointerLocation(int32_t x, int32_t y);
     int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode);
-
+    int32_t GetWindowPid(int32_t windowId);
 private:
     MultimodalInputConnectManager() = default;
     DISALLOW_COPY_AND_MOVE(MultimodalInputConnectManager);
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
index 5fb11b425a..324ade4ad5 100644
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -72,7 +72,7 @@ public:
     int32_t SetFunctionKeyState(int32_t funcKey, bool enable) override;
     int32_t SetPointerLocation(int32_t x, int32_t y) override;
     virtual int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode) override;
-
+    int32_t GetWindowPid(int32_t windowId) override;
 private:
     static inline BrokerDelegator<MultimodalInputConnectProxy> delegator_;
 };
diff --git a/service/connect_manager/include/multimodal_input_connect_stub.h b/service/connect_manager/include/multimodal_input_connect_stub.h
index 799bba8e6f..e9856eaa04 100644
--- a/service/connect_manager/include/multimodal_input_connect_stub.h
+++ b/service/connect_manager/include/multimodal_input_connect_stub.h
@@ -75,6 +75,7 @@ protected:
     int32_t StubSetFunctionKeyState(MessageParcel &data, MessageParcel &reply);
     int32_t StubSetPointerLocation(MessageParcel &data, MessageParcel &reply);
     int32_t StubSetMouseCaptureMode(MessageParcel& data, MessageParcel& reply);
+    int32_t StubGetWindowPid(MessageParcel& data, MessageParcel& reply);
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
index e8e68fe756..53770d865d 100644
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -93,6 +93,16 @@ int32_t MultimodalInputConnectManager::SetDisplayBind(int32_t deviceId, int32_t
     return multimodalInputConnectService_->SetDisplayBind(deviceId, displayId, msg);    
 }
 
+int32_t MultimodalInputConnectManager::GetWindowPid(int32_t windowId)
+{
+    std::lock_guard<std::mutex> guard(lock_);
+    if (multimodalInputConnectService_ == nullptr) {
+        MMI_HILOGE("The multimodalInputConnectService_ is nullptr");
+        return RET_ERR;
+    }
+    return multimodalInputConnectService_->GetWindowPid(windowId);
+}
+
 int32_t MultimodalInputConnectManager::AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority)
 {
     std::lock_guard<std::mutex> guard(lock_);
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index fd8bf2b026..c228194fd3 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -737,6 +737,31 @@ int32_t MultimodalInputConnectProxy::SetDisplayBind(int32_t deviceId, int32_t di
     return RET_OK;
 }
 
+int32_t MultimodalInputConnectProxy::GetWindowPid(int32_t windowId)
+{
+    CALL_DEBUG_ENTER;
+    MessageParcel data;
+    if (!data.WriteInterfaceToken(MultimodalInputConnectProxy::GetDescriptor())) {
+        MMI_HILOGE("Failed to write descriptor");
+        return ERR_INVALID_VALUE;
+    }
+
+    WRITEINT32(data, windowId, ERR_INVALID_VALUE);
+
+    MessageParcel reply;
+    MessageOption option;
+    sptr<IRemoteObject> remote = Remote();
+    CHKPR(remote, RET_ERR);
+    int32_t ret = remote->SendRequest(GET_WINDOW_PID, data, reply, option);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Send request fail, result:%{public}d", ret);
+        return ret;
+    }
+    int32_t windowPid = 0;
+    READINT32(reply, windowPid, ERR_INVALID_VALUE);
+    return windowPid;
+}
+
 int32_t MultimodalInputConnectProxy::SetInputDevice(const std::string& dhid, const std::string& screenId)
 {
     CALL_DEBUG_ENTER;
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 21c78279e5..c88f70dfa7 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -91,6 +91,7 @@ int32_t MultimodalInputConnectStub::OnRemoteRequest(uint32_t code, MessageParcel
         {IMultimodalInputConnect::SET_FUNCTION_KEY_STATE, &MultimodalInputConnectStub::StubSetFunctionKeyState},
         {IMultimodalInputConnect::SET_POINTER_LOCATION, &MultimodalInputConnectStub::StubSetPointerLocation},
         {IMultimodalInputConnect::SET_CAPTURE_MODE, &MultimodalInputConnectStub::StubSetMouseCaptureMode},
+        {IMultimodalInputConnect::GET_WINDOW_PID, &MultimodalInputConnectStub::StubGetWindowPid},
     };
     auto it = mapConnFunc.find(code);
     if (it != mapConnFunc.end()) {
@@ -919,5 +920,19 @@ int32_t MultimodalInputConnectStub::StubSetMouseCaptureMode(MessageParcel& data,
     }
     return ret;
 }
+
+
+int32_t MultimodalInputConnectStub::StubGetWindowPid(MessageParcel& data, MessageParcel& reply)
+{
+    int32_t windowId = 0;
+    READINT32(data, windowId, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = GetWindowPid(windowId);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Fail to call SetMouseCaptureMode, ret:%{public}d", ret);
+    }
+    WRITEINT32(reply, ret, ERR_INVALID_VALUE);
+    return RET_OK;
+}
+
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index 9f0e3a9255..865399b019 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -86,7 +86,7 @@ public:
     int32_t SetFunctionKeyState(int32_t funcKey, bool enable) override;
     int32_t SetPointerLocation(int32_t x, int32_t y) override;
     virtual int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode) override;
-
+    int32_t GetWindowPid(int32_t windowId) override;
 #ifdef OHOS_RSS_CLIENT
     void OnAddSystemAbility(int32_t systemAbilityId, const std::string& deviceId) override;
 #endif
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 1c75528759..b33026ff06 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -1316,7 +1316,18 @@ int32_t MMIService::SetMouseCaptureMode(int32_t windowId, bool isCaptureMode)
     if (ret != RET_OK) {
         MMI_HILOGE("Set capture failed,return %{public}d", ret);
     }
-    return ret;;
+    return ret;
+}
+
+int32_t MMIService::GetWindowPid(int32_t windowId)
+{
+    CALL_DEBUG_ENTER;
+    int32_t ret = WinMgr->GetWindowPid(windowId);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Set capture failed,return %{public}d", ret);
+    }
+    return ret;
 }
+
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From c4014677b5aa0da62d94f0898f5f7a944e7f9ca8 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 26 Dec 2022 14:20:06 +0800
Subject: [PATCH 270/360] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8A=95=E5=B1=8F?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=8B=E8=BD=AF=E9=94=AE=E7=9B=98=E4=B8=8D?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../src/input_device_manager.cpp              | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index cd487a8535..6e9395ab5c 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -132,6 +132,11 @@ std::vector<int32_t> InputDeviceManager::GetInputDeviceIds() const
     CALL_DEBUG_ENTER;
     std::vector<int32_t> ids;
     for (const auto &item : inputDevice_) {
+        if (IsRemote(item.second.inputDeviceOrigin) &&
+            InputDevCooSM->GetCooperateState() == CooperateState::STATE_FREE) {
+            MMI_HILOGW("Current device id remote and in STATUS_STATE");
+            continue;
+        }
         ids.push_back(item.first);
     }
     return ids;
@@ -360,9 +365,11 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
     struct InputDeviceInfo info;
     MakeDeviceInfo(inputDevice, info);
     inputDevice_[nextId_] = info;
-    for (const auto &item : devListener_) {
-        CHKPC(item.first);
-        item.second(nextId_, "add");
+    if (IsRemote(inputDevice) && InputDevCooSM->GetCooperateState() != CooperateState::STATE_FREE) {
+        for (const auto &item : devListener_) {
+            CHKPC(item.first);
+            item.second(nextId_, "add");
+        }
     }
     NotifyDevCallback(nextId_, info);
     ++nextId_;
@@ -445,9 +452,11 @@ void InputDeviceManager::OnInputDeviceRemoved(struct libinput_device *inputDevic
 #endif // OHOS_BUILD_ENABLE_POINTER
     }
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
-    for (const auto &item : devListener_) {
-        CHKPC(item.first);
-        item.second(deviceId, "remove");
+    if (IsRemote(inputDevice) && InputDevCooSM->GetCooperateState() != CooperateState::STATE_FREE) {
+        for (const auto &item : devListener_) {
+            CHKPC(item.first);
+            item.second(deviceId, "remove");
+        }
     }
     ScanPointerDevice();
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-- 
Gitee


From 2962e15777a4dc5fee350038fe62fbaa5bc6fcfe Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 26 Dec 2022 14:28:56 +0800
Subject: [PATCH 271/360] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8A=95=E5=B1=8F?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=8B=E8=BD=AF=E9=94=AE=E7=9B=98=E4=B8=8D?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/device_manager/src/input_device_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 6e9395ab5c..6375fa2137 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -134,7 +134,7 @@ std::vector<int32_t> InputDeviceManager::GetInputDeviceIds() const
     for (const auto &item : inputDevice_) {
         if (IsRemote(item.second.inputDeviceOrigin) &&
             InputDevCooSM->GetCooperateState() == CooperateState::STATE_FREE) {
-            MMI_HILOGW("Current device id remote and in STATUS_STATE");
+            MMI_HILOGW("Current device is remote and in STATUS_STATE");
             continue;
         }
         ids.push_back(item.first);
-- 
Gitee


From 47687fb2b757d87c3fe0ae9223e1c558edb3ceed Mon Sep 17 00:00:00 2001
From: yangli198 <yangli198@huawei.com>
Date: Mon, 26 Dec 2022 16:01:02 +0800
Subject: [PATCH 272/360] modify InputMgr Macro

Signed-off-by: yangli198 <yangli198@huawei.com>
---
 .../napi/input_device_cooperate/src/js_event_target.cpp   | 6 +++---
 .../src/js_input_device_cooperate_manager.cpp             | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
index 47adc5d42c..136cc37920 100644
--- a/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_event_target.cpp
@@ -170,7 +170,7 @@ void JsEventTarget::AddListener(napi_env env, const std::string &type, napi_valu
     iter->second.push_back(std::move(monitor));
     if (!isListeningProcess_) {
         isListeningProcess_ = true;
-        InputMgrImpl->RegisterCooperateListener(shared_from_this());
+        InputMgrImpl.RegisterCooperateListener(shared_from_this());
     }
 }
 
@@ -198,7 +198,7 @@ void JsEventTarget::RemoveListener(napi_env env, const std::string &type, napi_v
 monitorLabel:
     if (isListeningProcess_ && iter->second.empty()) {
         isListeningProcess_ = false;
-        InputMgrImpl->UnregisterCooperateListener(shared_from_this());
+        InputMgrImpl.UnregisterCooperateListener(shared_from_this());
     }
 }
 
@@ -221,7 +221,7 @@ void JsEventTarget::ResetEnv()
     CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(mutex_);
     cooperateListener_.clear();
-    InputMgrImpl->UnregisterCooperateListener(shared_from_this());
+    InputMgrImpl.UnregisterCooperateListener(shared_from_this());
 }
 
 void JsEventTarget::OnCooperateMessage(const std::string &deviceId, CooperationMessage msg)
diff --git a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp
index 17c02da8e0..9951a63e2d 100644
--- a/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_input_device_cooperate_manager.cpp
@@ -37,7 +37,7 @@ napi_value JsInputDeviceCooperateManager::Enable(napi_env env, bool enable, napi
     CHKPP(cb);
     napi_value ret = CreateCallbackInfo(env, handle, cb);
     auto callback = std::bind(EmitJsEnable, cb, std::placeholders::_1, std::placeholders::_2);
-    int32_t errCode = InputMgrImpl->EnableInputDeviceCooperate(enable, callback);
+    int32_t errCode = InputMgrImpl.EnableInputDeviceCooperate(enable, callback);
     HandleExecuteResult(env, errCode);
     return ret;
 }
@@ -50,7 +50,7 @@ napi_value JsInputDeviceCooperateManager::Start(napi_env env, const std::string
     CHKPP(cb);
     napi_value ret = CreateCallbackInfo(env, handle, cb);
     auto callback = std::bind(EmitJsStart, cb, std::placeholders::_1, std::placeholders::_2);
-    int32_t errCode = InputMgrImpl->StartInputDeviceCooperate(sinkDeviceDescriptor, srcInputDeviceId, callback);
+    int32_t errCode = InputMgrImpl.StartInputDeviceCooperate(sinkDeviceDescriptor, srcInputDeviceId, callback);
     HandleExecuteResult(env, errCode);
     return ret;
 }
@@ -62,7 +62,7 @@ napi_value JsInputDeviceCooperateManager::Stop(napi_env env, napi_value handle)
     CHKPP(cb);
     napi_value ret = CreateCallbackInfo(env, handle, cb);
     auto callback = std::bind(EmitJsStop, cb, std::placeholders::_1, std::placeholders::_2);
-    int32_t errCode = InputMgrImpl->StopDeviceCooperate(callback);
+    int32_t errCode = InputMgrImpl.StopDeviceCooperate(callback);
     HandleExecuteResult(env, errCode);
     return ret;
 }
@@ -74,7 +74,7 @@ napi_value JsInputDeviceCooperateManager::GetState(napi_env env, const std::stri
     CHKPP(cb);
     napi_value ret = CreateCallbackInfo(env, handle, cb);
     auto callback = std::bind(EmitJsGetState, cb, std::placeholders::_1);
-    int32_t errCode = InputMgrImpl->GetInputDeviceCooperateState(deviceDescriptor, callback);
+    int32_t errCode = InputMgrImpl.GetInputDeviceCooperateState(deviceDescriptor, callback);
     HandleExecuteResult(env, errCode);
     return ret;
 }
-- 
Gitee


From 93b77ab55cd11448b957cd46a1671ac03d38f261 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 26 Dec 2022 16:17:32 +0800
Subject: [PATCH 273/360] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8A=95=E5=B1=8F?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=8B=E8=BD=AF=E9=94=AE=E7=9B=98=E4=B8=8D?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../src/input_device_manager.cpp              | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 6375fa2137..ab92e9fc28 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -132,11 +132,13 @@ std::vector<int32_t> InputDeviceManager::GetInputDeviceIds() const
     CALL_DEBUG_ENTER;
     std::vector<int32_t> ids;
     for (const auto &item : inputDevice_) {
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
         if (IsRemote(item.second.inputDeviceOrigin) &&
-            InputDevCooSM->GetCooperateState() == CooperateState::STATE_FREE) {
+            InputDevCooSM->GetCurrentCooperateState() == CooperateState::STATE_FREE) {
             MMI_HILOGW("Current device is remote and in STATUS_STATE");
             continue;
         }
+#endif // OHOS_BUILD_ENABLE_COOPERATE
         ids.push_back(item.first);
     }
     return ids;
@@ -365,12 +367,19 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
     struct InputDeviceInfo info;
     MakeDeviceInfo(inputDevice, info);
     inputDevice_[nextId_] = info;
-    if (IsRemote(inputDevice) && InputDevCooSM->GetCooperateState() != CooperateState::STATE_FREE) {
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+    if (IsRemote(inputDevice) && InputDevCooSM->GetCurrentCooperateState() != CooperateState::STATE_FREE) {
         for (const auto &item : devListener_) {
             CHKPC(item.first);
             item.second(nextId_, "add");
         }
     }
+#else
+    for (const auto &item : devListener_) {
+        CHKPC(item.first);
+        item.second(nextId_, "add");
+    }
+#endif // OHOS_BUILD_ENABLE_COOPERATE
     NotifyDevCallback(nextId_, info);
     ++nextId_;
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
@@ -452,12 +461,19 @@ void InputDeviceManager::OnInputDeviceRemoved(struct libinput_device *inputDevic
 #endif // OHOS_BUILD_ENABLE_POINTER
     }
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
-    if (IsRemote(inputDevice) && InputDevCooSM->GetCooperateState() != CooperateState::STATE_FREE) {
+#ifdef OHOS_BUILD_ENABLE_COOPERATE
+    if (IsRemote(inputDevice) && InputDevCooSM->GetCurrentCooperateState() != CooperateState::STATE_FREE) {
         for (const auto &item : devListener_) {
             CHKPC(item.first);
             item.second(deviceId, "remove");
         }
     }
+#else
+    for (const auto &item : devListener_) {
+        CHKPC(item.first);
+        item.second(deviceId, "remove");
+    }
+#endif // OHOS_BUILD_ENABLE_COOPERATE
     ScanPointerDevice();
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     if (IsPointerDevice(inputDevice)) {
-- 
Gitee


From 5bed00e1b14a4b3bf55de28aa85ba3d04d401d06 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 26 Dec 2022 08:52:49 +0000
Subject: [PATCH 274/360] add interface GetWindowPid

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ia93bfef2358c55c4592ff1c88cada7c6d16b8f78
---
 frameworks/proxy/event_handler/src/input_manager_impl.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 8be0a919cd..0e10bceaba 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -98,12 +98,7 @@ int32_t InputManagerImpl::SetDisplayBind(int32_t deviceId, int32_t displayId, st
 int32_t InputManagerImpl::GetWindowPid(int32_t windowId)
 {
     std::lock_guard<std::mutex> guard(mtx_);
-    int32_t ret = MultimodalInputConnMgr->GetWindowPid(windowId);
-    if (ret != RET_OK) {
-        MMI_HILOGE("SetDisplayBind failed, ret:%{public}d", ret);
-        return RET_ERR;
-    }
-    return RET_OK;
+    return MultimodalInputConnMgr->GetWindowPid(windowId);;
 }
 
 void InputManagerImpl::UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo)
-- 
Gitee


From 76f33016573fceffd3b52539b8cc770e32ffd6f8 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 26 Dec 2022 08:59:24 +0000
Subject: [PATCH 275/360] add interface GetWindowPid

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I0333d8d6a04dd82062494b1fd42c064a72722601
---
 frameworks/proxy/events/src/input_manager.cpp                 | 1 +
 service/connect_manager/src/multimodal_input_connect_stub.cpp | 2 --
 service/module_loader/src/mmi_service.cpp                     | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index 56b2fff13a..22714cb157 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -46,6 +46,7 @@ int32_t InputManager::GetWindowPid(int32_t windowId)
 {
     return InputMgrImpl.GetWindowPid(windowId);
 }
+
 void InputManager::UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo)
 {
     InputMgrImpl.UpdateDisplayInfo(displayGroupInfo);
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index c88f70dfa7..78cabd0929 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -921,7 +921,6 @@ int32_t MultimodalInputConnectStub::StubSetMouseCaptureMode(MessageParcel& data,
     return ret;
 }
 
-
 int32_t MultimodalInputConnectStub::StubGetWindowPid(MessageParcel& data, MessageParcel& reply)
 {
     int32_t windowId = 0;
@@ -933,6 +932,5 @@ int32_t MultimodalInputConnectStub::StubGetWindowPid(MessageParcel& data, Messag
     WRITEINT32(reply, ret, ERR_INVALID_VALUE);
     return RET_OK;
 }
-
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index b33026ff06..c9d9660023 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -1328,6 +1328,5 @@ int32_t MMIService::GetWindowPid(int32_t windowId)
     }
     return ret;
 }
-
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From 06e12f84391a65f2a2bee8319d5baad387dc27e1 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 26 Dec 2022 09:15:07 +0000
Subject: [PATCH 276/360] add interface GetWindowPid

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I38ca5eec789643afe38a46715ab14bc94cea441a
---
 service/connect_manager/src/multimodal_input_connect_stub.cpp | 4 ++--
 service/module_loader/src/mmi_service.cpp                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 78cabd0929..42a8fe58b0 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -926,8 +926,8 @@ int32_t MultimodalInputConnectStub::StubGetWindowPid(MessageParcel& data, Messag
     int32_t windowId = 0;
     READINT32(data, windowId, IPC_PROXY_DEAD_OBJECT_ERR);
     int32_t ret = GetWindowPid(windowId);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Fail to call SetMouseCaptureMode, ret:%{public}d", ret);
+    if (ret == RET_ERR) {
+        MMI_HILOGE("Get window pid failed");
     }
     WRITEINT32(reply, ret, ERR_INVALID_VALUE);
     return RET_OK;
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index c9d9660023..f360cb6e83 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -1323,8 +1323,8 @@ int32_t MMIService::GetWindowPid(int32_t windowId)
 {
     CALL_DEBUG_ENTER;
     int32_t ret = WinMgr->GetWindowPid(windowId);
-    if (ret != RET_OK) {
-        MMI_HILOGE("Set capture failed,return %{public}d", ret);
+    if (ret == RET_ERR) {
+        MMI_HILOGE("Get window pid failed");
     }
     return ret;
 }
-- 
Gitee


From 31edf775ec813cfc2573dc04685a6e63926d7da2 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 26 Dec 2022 09:17:19 +0000
Subject: [PATCH 277/360] add interface GetWindowPid

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I0b3dd5d4f1ba6f00fc78916f145632ea2ac6e20d
---
 frameworks/proxy/event_handler/src/input_manager_impl.cpp      | 2 +-
 service/connect_manager/src/multimodal_input_connect_proxy.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 0e10bceaba..561830b621 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -98,7 +98,7 @@ int32_t InputManagerImpl::SetDisplayBind(int32_t deviceId, int32_t displayId, st
 int32_t InputManagerImpl::GetWindowPid(int32_t windowId)
 {
     std::lock_guard<std::mutex> guard(mtx_);
-    return MultimodalInputConnMgr->GetWindowPid(windowId);;
+    return MultimodalInputConnMgr->GetWindowPid(windowId);
 }
 
 void InputManagerImpl::UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo)
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index c228194fd3..fc9afa6b46 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -757,7 +757,7 @@ int32_t MultimodalInputConnectProxy::GetWindowPid(int32_t windowId)
         MMI_HILOGE("Send request fail, result:%{public}d", ret);
         return ret;
     }
-    int32_t windowPid = 0;
+    int32_t windowPid = -1;
     READINT32(reply, windowPid, ERR_INVALID_VALUE);
     return windowPid;
 }
-- 
Gitee


From 7c708b01d9ce4a91e1772e9820fa3336c24db6a0 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 26 Dec 2022 09:20:14 +0000
Subject: [PATCH 278/360] add interface GetWindowPid

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ifc60d0fc22dca1708bf1e59d08e81c1816514a9a
---
 .../src/multimodal_input_connect_stub.cpp              | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 42a8fe58b0..da092f6c08 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -923,6 +923,16 @@ int32_t MultimodalInputConnectStub::StubSetMouseCaptureMode(MessageParcel& data,
 
 int32_t MultimodalInputConnectStub::StubGetWindowPid(MessageParcel& data, MessageParcel& reply)
 {
+    CALL_DEBUG_ENTER;
+    if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
+        MMI_HILOGE("Permission check failed");
+        return CHECK_PERMISSION_FAIL;
+    }
+    if (!IsRunning()) {
+        MMI_HILOGE("Service is not running");
+        return MMISERVICE_NOT_RUNNING;
+    }
+
     int32_t windowId = 0;
     READINT32(data, windowId, IPC_PROXY_DEAD_OBJECT_ERR);
     int32_t ret = GetWindowPid(windowId);
-- 
Gitee


From 70adc896e1cfbdba2b3051e428e00dc2a83ff42f Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 26 Dec 2022 19:15:41 +0800
Subject: [PATCH 279/360] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8A=95=E5=B1=8F?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=B8=8B=E8=BD=AF=E9=94=AE=E7=9B=98=E4=B8=8D?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/device_manager/src/input_device_manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index ab92e9fc28..7ceede2643 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -368,7 +368,7 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
     MakeDeviceInfo(inputDevice, info);
     inputDevice_[nextId_] = info;
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-    if (IsRemote(inputDevice) && InputDevCooSM->GetCurrentCooperateState() != CooperateState::STATE_FREE) {
+    if (!IsRemote(inputDevice) || InputDevCooSM->GetCurrentCooperateState() != CooperateState::STATE_FREE) {
         for (const auto &item : devListener_) {
             CHKPC(item.first);
             item.second(nextId_, "add");
@@ -462,7 +462,7 @@ void InputDeviceManager::OnInputDeviceRemoved(struct libinput_device *inputDevic
     }
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-    if (IsRemote(inputDevice) && InputDevCooSM->GetCurrentCooperateState() != CooperateState::STATE_FREE) {
+    if (!IsRemote(inputDevice) || InputDevCooSM->GetCurrentCooperateState() != CooperateState::STATE_FREE) {
         for (const auto &item : devListener_) {
             CHKPC(item.first);
             item.second(deviceId, "remove");
-- 
Gitee


From fdb1ad80e77eb57b61f6a33514dede7764819c10 Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Mon, 26 Dec 2022 11:55:52 +0000
Subject: [PATCH 280/360] Solve the problem of stuck for sink

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 service/input_device_cooperate/src/input_device_cooperate_sm.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index 7c095a7613..b59402ea18 100644
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -434,7 +434,6 @@ void InputDeviceCooperateSM::UpdatePreparedDevices(const std::string &srcNetwork
 std::pair<std::string, std::string> InputDeviceCooperateSM::GetPreparedDevices() const
 {
     CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
     return preparedNetworkId_;
 }
 
-- 
Gitee


From e6822d0332b09c3134d79ca31e2fe83e9ceb7839 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 27 Dec 2022 03:15:25 +0000
Subject: [PATCH 281/360] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../include/input_manager_impl.h              |  4 +--
 .../event_handler/src/input_manager_impl.cpp  | 16 ++++++----
 frameworks/proxy/events/src/input_manager.cpp |  5 +--
 .../test/input_manager_filter_manual_test.cpp | 32 +++++++++++++++----
 .../innerkits/proxy/include/input_manager.h   |  2 +-
 .../include/i_multimodal_input_connect.h      |  3 +-
 .../multimodal_input_connect_manager.h        |  2 +-
 .../include/multimodal_input_connect_proxy.h  |  3 +-
 .../src/multimodal_input_connect_manager.cpp  |  5 +--
 .../src/multimodal_input_connect_proxy.cpp    |  4 ++-
 .../src/multimodal_input_connect_stub.cpp     |  4 ++-
 .../include/input_device_manager.h            |  6 +---
 .../src/input_device_manager.cpp              |  5 +++
 service/dfx/src/dfx_hisysevent.cpp            |  2 ++
 service/filter/BUILD.gn                       |  4 +++
 service/filter/include/event_filter_handler.h |  4 ++-
 service/filter/src/event_filter_handler.cpp   | 28 ++++++++++++++--
 .../include/server_msg_handler.h              |  3 +-
 .../message_handle/src/server_msg_handler.cpp |  4 +--
 service/module_loader/include/mmi_service.h   |  3 +-
 service/module_loader/src/mmi_service.cpp     |  5 +--
 .../src/pointer_drawing_manager.cpp           |  1 +
 22 files changed, 104 insertions(+), 41 deletions(-)
 mode change 100644 => 100755 frameworks/proxy/event_handler/include/input_manager_impl.h
 mode change 100644 => 100755 frameworks/proxy/events/src/input_manager.cpp
 mode change 100644 => 100755 frameworks/proxy/events/test/input_manager_filter_manual_test.cpp
 mode change 100644 => 100755 interfaces/native/innerkits/proxy/include/input_manager.h
 mode change 100644 => 100755 service/connect_manager/include/i_multimodal_input_connect.h
 mode change 100644 => 100755 service/connect_manager/include/multimodal_input_connect_manager.h
 mode change 100644 => 100755 service/connect_manager/include/multimodal_input_connect_proxy.h
 mode change 100644 => 100755 service/connect_manager/src/multimodal_input_connect_manager.cpp
 mode change 100644 => 100755 service/connect_manager/src/multimodal_input_connect_proxy.cpp
 mode change 100644 => 100755 service/connect_manager/src/multimodal_input_connect_stub.cpp
 mode change 100644 => 100755 service/device_manager/include/input_device_manager.h
 mode change 100644 => 100755 service/device_manager/src/input_device_manager.cpp
 mode change 100644 => 100755 service/dfx/src/dfx_hisysevent.cpp
 mode change 100644 => 100755 service/filter/BUILD.gn
 mode change 100644 => 100755 service/filter/include/event_filter_handler.h
 mode change 100644 => 100755 service/filter/src/event_filter_handler.cpp
 mode change 100644 => 100755 service/message_handle/include/server_msg_handler.h
 mode change 100644 => 100755 service/message_handle/src/server_msg_handler.cpp
 mode change 100644 => 100755 service/module_loader/include/mmi_service.h
 mode change 100644 => 100755 service/module_loader/src/mmi_service.cpp
 mode change 100644 => 100755 service/window_manager/src/pointer_drawing_manager.cpp

diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
old mode 100644
new mode 100755
index 02d2c523e5..794ea2f8d4
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -56,7 +56,7 @@ public:
         std::function<void(std::shared_ptr<KeyEvent>)> callback
     );
     void UnsubscribeKeyEvent(int32_t subscriberId);
-    int32_t AddInputEventFilter(std::shared_ptr<IInputEventFilter> filter, int32_t priority);
+    int32_t AddInputEventFilter(std::shared_ptr<IInputEventFilter> filter, int32_t priority, uint32_t deviceTags);
     int32_t RemoveInputEventFilter(int32_t filterId);
 
     void SetWindowInputEventConsumer(std::shared_ptr<IInputEventConsumer> inputEventConsumer,
@@ -140,7 +140,7 @@ private:
         std::shared_ptr<PointerEvent> pointerEvent);
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 private:
-    std::map<int32_t, std::tuple<sptr<IEventFilter>, int32_t>> eventFilterServices_;
+    std::map<int32_t, std::tuple<sptr<IEventFilter>, int32_t, uint32_t>> eventFilterServices_;
     std::shared_ptr<IInputEventConsumer> consumer_ { nullptr };
     std::vector<std::shared_ptr<IAnrObserver>> anrObservers_;
 
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 0a480e0b68..f9704120ea 100755
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -122,7 +122,8 @@ void InputManagerImpl::UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInf
     PrintDisplayInfo();
 }
 
-int32_t InputManagerImpl::AddInputEventFilter(std::shared_ptr<IInputEventFilter> filter, int32_t priority)
+int32_t InputManagerImpl::AddInputEventFilter(std::shared_ptr<IInputEventFilter> filter, int32_t priority,
+    uint32_t deviceTags)
 {
     CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(mtx_);
@@ -134,13 +135,13 @@ int32_t InputManagerImpl::AddInputEventFilter(std::shared_ptr<IInputEventFilter>
     sptr<IEventFilter> service = new (std::nothrow) EventFilterService(filter);
     CHKPR(service, RET_ERR);
     const int32_t filterId = EventFilterService::GetNextId();
-    int32_t ret = MultimodalInputConnMgr->AddInputEventFilter(service, filterId, priority);
+    int32_t ret = MultimodalInputConnMgr->AddInputEventFilter(service, filterId, priority, deviceTags);
     if (ret != RET_OK) {
         MMI_HILOGE("AddInputEventFilter has send to server failed, priority:%{public}d, ret:%{public}d", priority, ret);
         service = nullptr;
         return RET_ERR;
     }
-    auto it =  eventFilterServices_.emplace(filterId, std::make_tuple(service, priority));
+    auto it =  eventFilterServices_.emplace(filterId, std::make_tuple(service, priority, deviceTags));
     if (!it.second) {
         MMI_HILOGW("Filter id duplicate");
     }
@@ -155,7 +156,7 @@ int32_t InputManagerImpl::RemoveInputEventFilter(int32_t filterId)
         MMI_HILOGE("Filters is empty, size:%{public}zu", eventFilterServices_.size());
         return RET_OK;
     }
-    std::map<int32_t, std::tuple<sptr<IEventFilter>, int32_t>>::iterator it;
+    std::map<int32_t, std::tuple<sptr<IEventFilter>, int32_t, uint32_t>>::iterator it;
     if (filterId != -1) {
         it = eventFilterServices_.find(filterId);
         if (it == eventFilterServices_.end()) {
@@ -707,10 +708,11 @@ void InputManagerImpl::ReAddInputEventFilter()
         return;
     }
     for (const auto &[filterId, t] : eventFilterServices_) {
-        const auto &[service, priority] = t;
-        int32_t ret = MultimodalInputConnMgr->AddInputEventFilter(service, filterId, priority);
+        const auto &[service, priority, deviceTags] = t;
+        int32_t ret = MultimodalInputConnMgr->AddInputEventFilter(service, filterId, priority, deviceTags);
         if (ret != RET_OK) {
-            MMI_HILOGE("AddInputEventFilter has send to server failed, filterId:%{public}d, priority:%{public}d, ret:%{public}d", filterId, priority, ret);
+            MMI_HILOGE("AddInputEventFilter has send to server failed, filterId:%{public}d, priority:%{public}d,"
+            "deviceTags:%{public}zu, ret:%{public}d", filterId, priority, deviceTags, ret);
         }
     }
 }
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
old mode 100644
new mode 100755
index 7c9a515115..d02d879016
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -47,9 +47,10 @@ void InputManager::UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo)
     InputMgrImpl.UpdateDisplayInfo(displayGroupInfo);
 }
 
-int32_t InputManager::AddInputEventFilter(std::shared_ptr<IInputEventFilter> filter, int32_t priority)
+int32_t InputManager::AddInputEventFilter(std::shared_ptr<IInputEventFilter> filter, int32_t priority,
+    uint32_t deviceTags)
 {
-    return InputMgrImpl.AddInputEventFilter(filter, priority);
+    return InputMgrImpl.AddInputEventFilter(filter, priority, deviceTags);
 }
 
 int32_t InputManager::RemoveInputEventFilter(int32_t filterId)
diff --git a/frameworks/proxy/events/test/input_manager_filter_manual_test.cpp b/frameworks/proxy/events/test/input_manager_filter_manual_test.cpp
old mode 100644
new mode 100755
index 4023438616..aafb1f44b3
--- a/frameworks/proxy/events/test/input_manager_filter_manual_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_filter_manual_test.cpp
@@ -257,7 +257,8 @@ HWTEST_F(InputManagerFilterManualTest, HandlePointerEventFilter_001, TestSize.Le
     bool result = false;
     auto filter = std::make_shared<PointerFilter>(10, 10, sem, result);
     const int32_t priority = 201;
-    const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, priority);
+    uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX);
+    const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, priority, touchTags);
     ASSERT_NE(filterId, -1);
     ASSERT_EQ(GetSelfHidumperFilterNum(), 1);
 
@@ -346,7 +347,8 @@ HWTEST_F(InputManagerFilterManualTest, HandleKeyEventFilter_002, TestSize.Level1
     ASSERT_EQ(ret, 0);
     bool resultA = false;
     auto filterA = std::make_shared<KeyFilter>(KeyEvent::KEYCODE_A, semA, resultA);
-    const int32_t filterIdA = InputManager::GetInstance()->AddInputEventFilter(filterA, 220);
+    uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX);
+    const int32_t filterIdA = InputManager::GetInstance()->AddInputEventFilter(filterA, 220, touchTags);
     ASSERT_NE(filterIdA, RET_ERR);
 
     sem_t semB;
@@ -354,7 +356,7 @@ HWTEST_F(InputManagerFilterManualTest, HandleKeyEventFilter_002, TestSize.Level1
     ASSERT_EQ(ret, 0);
     bool resultB = false;
     auto filterB = std::make_shared<KeyFilter>(KeyEvent::KEYCODE_B, semB, resultB);
-    const int32_t filterIdB = InputManager::GetInstance()->AddInputEventFilter(filterB, 210);
+    const int32_t filterIdB = InputManager::GetInstance()->AddInputEventFilter(filterB, 210, touchTags);
     ASSERT_NE(filterIdB, RET_ERR);
     ASSERT_EQ(GetSelfHidumperFilterNum(), 2);
 
@@ -372,7 +374,13 @@ HWTEST_F(InputManagerFilterManualTest, HandleKeyEventFilter_002, TestSize.Level1
     resultB = false;
     auto keyAEvent = KeyEvent::Create();
     ASSERT_NE(keyAEvent, nullptr);
+    KeyEvent::KeyItem kitDownA;
+    kitDownA.SetKeyCode(KeyEvent::KEYCODE_A);
+    kitDownA.SetPressed(true);
+    kitDownA.SetDeviceId(1);
     keyAEvent->SetKeyCode(KeyEvent::KEYCODE_A);
+    keyAEvent->SetKeyAction(KeyEvent::KEY_ACTION_DOWN);
+    keyAEvent->AddPressedKeyItems(kitDownA);
     MMI_HILOGI("SimulateInputEvent key event KEYCODE_A(2017)");
     InputManager::GetInstance()->SimulateInputEvent(keyAEvent);
     waitEnd(semA);
@@ -383,7 +391,13 @@ HWTEST_F(InputManagerFilterManualTest, HandleKeyEventFilter_002, TestSize.Level1
     resultB = false;
     auto keyBEvent = KeyEvent::Create();
     ASSERT_NE(keyAEvent, nullptr);
+    KeyEvent::KeyItem kitDownB;
+    kitDownB.SetKeyCode(KeyEvent::KEYCODE_B);
+    kitDownB.SetPressed(true);
+    kitDownB.SetDeviceId(1);
     keyBEvent->SetKeyCode(KeyEvent::KEYCODE_B);
+    keyBEvent->SetKeyAction(KeyEvent::KEY_ACTION_DOWN);
+    keyBEvent->AddPressedKeyItems(kitDownB);
     MMI_HILOGI("SimulateInputEvent key event KEYCODE_B(2018)");
     InputManager::GetInstance()->SimulateInputEvent(keyBEvent);
     waitEnd(semB);
@@ -419,7 +433,8 @@ HWTEST_F(InputManagerFilterManualTest, HandleKeyEventFilter_003, TestSize.Level1
     AccessToken accessToken;
     auto addFilter = []() -> int32_t {
         auto filter = std::make_shared<KeyFilter>();
-        const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220);
+        uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX);
+        const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220, touchTags);
         return filterId;
     };
     ASSERT_EQ(GetSelfHidumperFilterNum(), 0);
@@ -469,7 +484,8 @@ HWTEST_F(InputManagerFilterManualTest, DISABLED_HandleKeyEventFilter_004, TestSi
     AccessToken accessToken;
     auto addFilter = []() -> int32_t {
         auto filter = std::make_shared<KeyFilter>();
-        const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220);
+        uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX);
+        const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220, touchTags);
         return filterId;
     };
     const size_t singleClientSuportMaxNum = 4;
@@ -501,7 +517,8 @@ HWTEST_F(InputManagerFilterManualTest, HandleKeyEventFilter_005, TestSize.Level1
     AccessToken accessToken;
     auto addFilter = []() -> int32_t {
         auto filter = std::make_shared<KeyFilter>();
-        const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220);
+        uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX);
+        const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220, touchTags);
         return filterId;
     };
     ASSERT_EQ(GetSelfHidumperFilterNum(), 0);
@@ -537,7 +554,8 @@ HWTEST_F(InputManagerFilterManualTest, HandleKeyEventFilter_006, TestSize.Level1
     AccessToken accessToken;
     auto addFilter = []() -> int32_t {
         auto filter = std::make_shared<KeyFilter>();
-        const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220);
+        uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX);
+        const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220, touchTags);
         return filterId;
     };
     const size_t singleClientSuportMaxNum = 4;
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
old mode 100644
new mode 100755
index 627a0b4dfa..a4fb8979fe
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -56,7 +56,7 @@ public:
      */
     void UpdateDisplayInfo(const DisplayGroupInfo &displayGroupInfo);
 
-    int32_t AddInputEventFilter(std::shared_ptr<IInputEventFilter> filter, int32_t priority);
+    int32_t AddInputEventFilter(std::shared_ptr<IInputEventFilter> filter, int32_t priority, uint32_t deviceTags);
     int32_t RemoveInputEventFilter(int32_t filterId);
 
     /**
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
old mode 100644
new mode 100755
index 0bc2e786c3..e1dd139eb7
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -82,7 +82,8 @@ public:
 
     virtual int32_t AllocSocketFd(const std::string &programName, const int32_t moduleType,
         int32_t &socketFd, int32_t &tokenType) = 0;
-    virtual int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority) = 0;
+    virtual int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority,
+        uint32_t deviceTags) = 0;
     virtual int32_t RemoveInputEventFilter(int32_t filterId) = 0;
     virtual int32_t SetPointerVisible(bool visible) = 0;
     virtual int32_t IsPointerVisible(bool &visible) = 0;
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
old mode 100644
new mode 100755
index bea8091aae..bc90aeb727
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -37,7 +37,7 @@ public:
     {
         return tokenType_;
     }
-    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority);
+    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority, uint32_t deviceTags);
     int32_t RemoveInputEventFilter(int32_t filterId);
     int32_t GetDisplayBindInfo(DisplayBindInfos &infos);
     int32_t SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg);
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
old mode 100644
new mode 100755
index 5fb11b425a..ccb22a2753
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -32,7 +32,8 @@ public:
     ~MultimodalInputConnectProxy() override = default;
     int32_t AllocSocketFd(const std::string &programName, const int32_t moduleType,
         int32_t &socketFd, int32_t &tokenType) override;
-    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority) override;
+    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority,
+        uint32_t deviceTags) override;
     int32_t RemoveInputEventFilter(int32_t filterId) override;
     int32_t SetPointerVisible(bool visible) override;
     int32_t IsPointerVisible(bool &visible) override;
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
old mode 100644
new mode 100755
index e8e68fe756..a975b3e77f
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -93,14 +93,15 @@ int32_t MultimodalInputConnectManager::SetDisplayBind(int32_t deviceId, int32_t
     return multimodalInputConnectService_->SetDisplayBind(deviceId, displayId, msg);    
 }
 
-int32_t MultimodalInputConnectManager::AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority)
+int32_t MultimodalInputConnectManager::AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority,
+    uint32_t deviceTags)
 {
     std::lock_guard<std::mutex> guard(lock_);
     if (multimodalInputConnectService_ == nullptr) {
         MMI_HILOGE("The multimodalInputConnectService_ is nullptr");
         return RET_ERR;
     }
-    return multimodalInputConnectService_->AddInputEventFilter(filter, filterId, priority);
+    return multimodalInputConnectService_->AddInputEventFilter(filter, filterId, priority, deviceTags);
 }
 
 int32_t MultimodalInputConnectManager::RemoveInputEventFilter(int32_t filterId)
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
old mode 100644
new mode 100755
index fd8bf2b026..65287198d4
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -120,7 +120,8 @@ int32_t MultimodalInputConnectProxy::AllocSocketFd(const std::string &programNam
     return RET_OK;
 }
 
-int32_t MultimodalInputConnectProxy::AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority)
+int32_t MultimodalInputConnectProxy::AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority,
+    uint32_t deviceTags)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -134,6 +135,7 @@ int32_t MultimodalInputConnectProxy::AddInputEventFilter(sptr<IEventFilter> filt
     }
     WRITEINT32(data, filterId, ERR_INVALID_VALUE);
     WRITEINT32(data, priority, ERR_INVALID_VALUE);
+    WRITEUINT32(data, deviceTags, ERR_INVALID_VALUE);
     MessageParcel reply;
     MessageOption option;
     sptr<IRemoteObject> remote = Remote();
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
old mode 100644
new mode 100755
index 21c78279e5..e63fab611b
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -149,7 +149,9 @@ int32_t MultimodalInputConnectStub::StubAddInputEventFilter(MessageParcel& data,
     READINT32(data, filterId, IPC_PROXY_DEAD_OBJECT_ERR);
     int32_t priority = 0;
     READINT32(data, priority, IPC_PROXY_DEAD_OBJECT_ERR);
-    int32_t ret = AddInputEventFilter(filter, filterId, priority);
+    uint32_t deviceTags = 0;
+    READUINT32(data, deviceTags, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = AddInputEventFilter(filter, filterId, priority, deviceTags);
     if (ret != RET_OK) {
         MMI_HILOGE("Call AddInputEventFilter failed ret:%{public}d", ret);
         return ret;
diff --git a/service/device_manager/include/input_device_manager.h b/service/device_manager/include/input_device_manager.h
old mode 100644
new mode 100755
index e888d73287..4a342453e9
--- a/service/device_manager/include/input_device_manager.h
+++ b/service/device_manager/include/input_device_manager.h
@@ -21,15 +21,11 @@
 
 #include "device_config_file_parser.h"
 #include "device_observer.h"
-#include "event_dispatch_handler.h"
 #include "input_device.h"
-#include "key_auto_repeat.h"
-#include "key_event_normalize.h"
-#include "key_map_manager.h"
 #include "msg_handler.h"
 #include "nocopyable.h"
-#include "pointer_drawing_manager.h"
 #include "singleton.h"
+#include "uds_session.h"
 #include "util.h"
 
 namespace OHOS {
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
old mode 100644
new mode 100755
index cd487a8535..7e3e94c2a4
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -28,8 +28,13 @@
 #include "input_device_cooperate_sm.h"
 #include "input_device_cooperate_util.h"
 #endif // OHOS_BUILD_ENABLE_COOPERATE
+#include "event_dispatch_handler.h"
 #include "input_windows_manager.h"
+#include "key_auto_repeat.h"
+#include "key_event_normalize.h"
 #include "key_event_value_transformation.h"
+#include "key_map_manager.h"
+#include "pointer_drawing_manager.h"
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
 #include "util.h"
 #endif // OHOS_BUILD_ENABLE_COOPERATE
diff --git a/service/dfx/src/dfx_hisysevent.cpp b/service/dfx/src/dfx_hisysevent.cpp
old mode 100644
new mode 100755
index 5c119a8114..62b8887854
--- a/service/dfx/src/dfx_hisysevent.cpp
+++ b/service/dfx/src/dfx_hisysevent.cpp
@@ -15,6 +15,8 @@
 
 #include "dfx_hisysevent.h"
 
+#include "input_windows_manager.h"
+
 namespace OHOS {
 namespace MMI {
 namespace {
diff --git a/service/filter/BUILD.gn b/service/filter/BUILD.gn
old mode 100644
new mode 100755
index d6300e9bce..74154603d3
--- a/service/filter/BUILD.gn
+++ b/service/filter/BUILD.gn
@@ -19,8 +19,12 @@ config("mmi_event_filter_config") {
   include_dirs = [
     "//foundation/multimodalinput/input/interfaces/native/innerkits/common/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
+    "//foundation/multimodalinput/input/service/device_config/include",
     "//foundation/multimodalinput/input/service/event_handler/include",
+    "//foundation/multimodalinput/input/service/device_manager/include",
     "//foundation/multimodalinput/input/util/common/include",
+    "//foundation/multimodalinput/input/util/network/include",
+    "//foundation/multimodalinput/input/util/socket/include",
     "${event_filter_path}/include",
   ]
 }
diff --git a/service/filter/include/event_filter_handler.h b/service/filter/include/event_filter_handler.h
old mode 100644
new mode 100755
index b2ee27a7d2..527742e052
--- a/service/filter/include/event_filter_handler.h
+++ b/service/filter/include/event_filter_handler.h
@@ -42,7 +42,8 @@ public:
 #ifdef OHOS_BUILD_ENABLE_TOUCH
     void HandleTouchEvent(const std::shared_ptr<PointerEvent> pointerEvent) override;
 #endif // OHOS_BUILD_ENABLE_TOUCH
-    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority, int32_t clientPid);
+    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority, uint32_t deviceTags,
+        int32_t clientPid);
     int32_t RemoveInputEventFilter(int32_t filterId, int32_t clientPid);
     void Dump(int32_t fd, const std::vector<std::string> &args);
     bool HandleKeyEventFilter(std::shared_ptr<KeyEvent> event);
@@ -55,6 +56,7 @@ private:
         sptr<IRemoteObject::DeathRecipient> deathRecipient { nullptr };
         const int32_t filterId;
         const int32_t priority;
+        const uint32_t deviceTags;
         const int32_t clientPid;
         bool IsSameClient(int32_t id, int32_t pid) const { return ((filterId == id) && (clientPid == pid)); }
     };
diff --git a/service/filter/src/event_filter_handler.cpp b/service/filter/src/event_filter_handler.cpp
old mode 100644
new mode 100755
index 394115beeb..b42eb397b1
--- a/service/filter/src/event_filter_handler.cpp
+++ b/service/filter/src/event_filter_handler.cpp
@@ -16,6 +16,7 @@
 #include "event_filter_handler.h"
 
 #include "error_multimodal.h"
+#include "input_device_manager.h"
 #include "mmi_log.h"
 
 namespace OHOS {
@@ -65,7 +66,7 @@ void EventFilterHandler::HandleTouchEvent(const std::shared_ptr<PointerEvent> po
 #endif // OHOS_BUILD_ENABLE_TOUCH
 
 int32_t EventFilterHandler::AddInputEventFilter(sptr<IEventFilter> filter,
-    int32_t filterId, int32_t priority, int32_t clientPid)
+    int32_t filterId, int32_t priority, uint32_t deviceTags, int32_t clientPid)
 {
     CALL_INFO_TRACE;
     std::lock_guard<std::mutex> guard(lockFilter_);
@@ -91,8 +92,8 @@ int32_t EventFilterHandler::AddInputEventFilter(sptr<IEventFilter> filter,
     CHKPR(deathRecipient, RET_ERR);
     filter->AsObject()->AddDeathRecipient(deathRecipient);
     
-    FilterInfo info { .filter = filter, .deathRecipient = deathRecipient,
-        .filterId = filterId, .priority = priority, .clientPid = clientPid };
+    FilterInfo info { .filter = filter, .deathRecipient = deathRecipient, .filterId = filterId,
+        .priority = priority, .deviceTags = deviceTags, .clientPid = clientPid };
     auto it = filters_.cbegin();
     for (; it != filters_.cend(); ++it) {
         if (info.priority < it->priority) {
@@ -159,7 +160,17 @@ bool EventFilterHandler::HandleKeyEventFilter(std::shared_ptr<KeyEvent> event)
     if (filters_.empty()) {
         return false;
     }
+    std::vector<KeyEvent::KeyItem> keyItems = event->GetKeyItems();
+    if (keyItems.empty()) {
+        MMI_HILOGE("keyItems is empty");
+        return false;
+    }
+    std::shared_ptr<InputDevice> inputDevice = InputDevMgr->GetInputDevice(keyItems.front().GetDeviceId());
+    CHKPF(inputDevice);
     for (auto &i: filters_) {
+        if (!inputDevice->HasCapability(i.deviceTags)) {
+            continue;
+        }
         if (i.filter->HandleKeyEvent(event)) {
             MMI_HILOGD("Call HandleKeyEventFilter return true");
             return true;
@@ -176,7 +187,18 @@ bool EventFilterHandler::HandlePointerEventFilter(std::shared_ptr<PointerEvent>
     if (filters_.empty()) {
         return false;
     }
+    PointerEvent::PointerItem pointerItem;
+    int32_t pointerId = event->GetPointerId();
+    if (!event->GetPointerItem(pointerId, pointerItem)) {
+        MMI_HILOGE("GetPointerItem:%{public}d fail", pointerId);
+        return false;
+    }
+    std::shared_ptr<InputDevice> inputDevice = InputDevMgr->GetInputDevice(pointerItem.GetDeviceId());
+    CHKPF(inputDevice);
     for (auto &i: filters_) {
+        if (!inputDevice->HasCapability(i.deviceTags)) {
+            continue;
+        }
         if (i.filter->HandlePointerEvent(event)) {
             MMI_HILOGD("Call HandlePointerEvent return true");
             return true;
diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
old mode 100644
new mode 100755
index 3ff2a5862a..25e99b58f8
--- a/service/message_handle/include/server_msg_handler.h
+++ b/service/message_handle/include/server_msg_handler.h
@@ -61,7 +61,8 @@ public:
     int32_t OnInjectPointerEvent(const std::shared_ptr<PointerEvent> pointerEvent);
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
-    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority, int32_t clientPid);
+    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority, uint32_t deviceTags,
+        int32_t clientPid);
     int32_t RemoveInputEventFilter(int32_t clientPid, int32_t filterId);
 #endif // OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
 protected:
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
old mode 100644
new mode 100755
index b177afa681..df24d33c8d
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -329,11 +329,11 @@ int32_t ServerMsgHandler::OnUnsubscribeKeyEvent(IUdsServer *server, int32_t pid,
 
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
 int32_t ServerMsgHandler::AddInputEventFilter(sptr<IEventFilter> filter,
-    int32_t filterId, int32_t priority, int32_t clientPid)
+    int32_t filterId, int32_t priority, uint32_t deviceTags, int32_t clientPid)
 {
     auto filterHandler = InputHandler->GetFilterHandler();
     CHKPR(filterHandler, ERROR_NULL_POINTER);
-    return filterHandler->AddInputEventFilter(filter, filterId, priority, clientPid);
+    return filterHandler->AddInputEventFilter(filter, filterId, priority, deviceTags, clientPid);
 }
 
 int32_t ServerMsgHandler::RemoveInputEventFilter(int32_t clientPid, int32_t filterId)
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
old mode 100644
new mode 100755
index 9f0e3a9255..c0d6b5dc74
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -46,7 +46,8 @@ public:
     int32_t Dump(int32_t fd, const std::vector<std::u16string> &args) override;
     int32_t AllocSocketFd(const std::string &programName, const int32_t moduleType,
         int32_t &toReturnClientFd, int32_t &tokenType) override;
-    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority) override;
+    int32_t AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority,
+        uint32_t deviceTags) override;
     int32_t RemoveInputEventFilter(int32_t filterId) override;
     int32_t SetPointerVisible(bool visible) override;
     int32_t IsPointerVisible(bool &visible) override;
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
old mode 100644
new mode 100755
index 1c75528759..ccd1436adb
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -367,14 +367,15 @@ int32_t MMIService::AllocSocketFd(const std::string &programName, const int32_t
     return RET_OK;
 }
 
-int32_t MMIService::AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority)
+int32_t MMIService::AddInputEventFilter(sptr<IEventFilter> filter, int32_t filterId, int32_t priority,
+    uint32_t deviceTags)
 {
     CALL_INFO_TRACE;
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH) || defined(OHOS_BUILD_ENABLE_KEYBOARD)
     CHKPR(filter, ERROR_NULL_POINTER);
     int32_t clientPid = GetCallingPid();
     int32_t ret = delegateTasks_.PostSyncTask(std::bind(&ServerMsgHandler::AddInputEventFilter,
-        &sMsgHandler_, filter, filterId, priority, clientPid));
+        &sMsgHandler_, filter, filterId, priority, deviceTags, clientPid));
     if (ret != RET_OK) {
         MMI_HILOGE("Add event filter failed,return %{public}d", ret);
         return ret;
diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
old mode 100644
new mode 100755
index 663e3bdc66..a619331fa3
--- a/service/window_manager/src/pointer_drawing_manager.cpp
+++ b/service/window_manager/src/pointer_drawing_manager.cpp
@@ -23,6 +23,7 @@
 
 #include "define_multimodal.h"
 #include "input_device_manager.h"
+#include "input_windows_manager.h"
 #include "mmi_log.h"
 #include "util.h"
 
-- 
Gitee


From 12ed8974c5d9ee2b2249a96ca998c81655b7fe9e Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 27 Dec 2022 03:41:23 +0000
Subject: [PATCH 282/360] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 frameworks/proxy/event_handler/include/input_manager_impl.h       | 0
 frameworks/proxy/events/src/input_manager.cpp                     | 0
 frameworks/proxy/events/test/input_manager_filter_manual_test.cpp | 0
 interfaces/native/innerkits/proxy/include/input_manager.h         | 0
 service/connect_manager/include/i_multimodal_input_connect.h      | 0
 .../connect_manager/include/multimodal_input_connect_manager.h    | 0
 service/connect_manager/include/multimodal_input_connect_proxy.h  | 0
 service/connect_manager/src/multimodal_input_connect_manager.cpp  | 0
 service/connect_manager/src/multimodal_input_connect_proxy.cpp    | 0
 service/connect_manager/src/multimodal_input_connect_stub.cpp     | 0
 service/device_manager/include/input_device_manager.h             | 0
 service/device_manager/src/input_device_manager.cpp               | 0
 service/dfx/src/dfx_hisysevent.cpp                                | 0
 service/filter/BUILD.gn                                           | 0
 service/filter/include/event_filter_handler.h                     | 0
 service/filter/src/event_filter_handler.cpp                       | 0
 service/message_handle/include/server_msg_handler.h               | 0
 service/message_handle/src/server_msg_handler.cpp                 | 0
 service/module_loader/include/mmi_service.h                       | 0
 service/module_loader/src/mmi_service.cpp                         | 0
 service/window_manager/src/pointer_drawing_manager.cpp            | 0
 21 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 frameworks/proxy/event_handler/include/input_manager_impl.h
 mode change 100755 => 100644 frameworks/proxy/events/src/input_manager.cpp
 mode change 100755 => 100644 frameworks/proxy/events/test/input_manager_filter_manual_test.cpp
 mode change 100755 => 100644 interfaces/native/innerkits/proxy/include/input_manager.h
 mode change 100755 => 100644 service/connect_manager/include/i_multimodal_input_connect.h
 mode change 100755 => 100644 service/connect_manager/include/multimodal_input_connect_manager.h
 mode change 100755 => 100644 service/connect_manager/include/multimodal_input_connect_proxy.h
 mode change 100755 => 100644 service/connect_manager/src/multimodal_input_connect_manager.cpp
 mode change 100755 => 100644 service/connect_manager/src/multimodal_input_connect_proxy.cpp
 mode change 100755 => 100644 service/connect_manager/src/multimodal_input_connect_stub.cpp
 mode change 100755 => 100644 service/device_manager/include/input_device_manager.h
 mode change 100755 => 100644 service/device_manager/src/input_device_manager.cpp
 mode change 100755 => 100644 service/dfx/src/dfx_hisysevent.cpp
 mode change 100755 => 100644 service/filter/BUILD.gn
 mode change 100755 => 100644 service/filter/include/event_filter_handler.h
 mode change 100755 => 100644 service/filter/src/event_filter_handler.cpp
 mode change 100755 => 100644 service/message_handle/include/server_msg_handler.h
 mode change 100755 => 100644 service/message_handle/src/server_msg_handler.cpp
 mode change 100755 => 100644 service/module_loader/include/mmi_service.h
 mode change 100755 => 100644 service/module_loader/src/mmi_service.cpp
 mode change 100755 => 100644 service/window_manager/src/pointer_drawing_manager.cpp

diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
old mode 100755
new mode 100644
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
old mode 100755
new mode 100644
diff --git a/frameworks/proxy/events/test/input_manager_filter_manual_test.cpp b/frameworks/proxy/events/test/input_manager_filter_manual_test.cpp
old mode 100755
new mode 100644
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
old mode 100755
new mode 100644
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
old mode 100755
new mode 100644
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
old mode 100755
new mode 100644
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
old mode 100755
new mode 100644
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
old mode 100755
new mode 100644
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
old mode 100755
new mode 100644
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
old mode 100755
new mode 100644
diff --git a/service/device_manager/include/input_device_manager.h b/service/device_manager/include/input_device_manager.h
old mode 100755
new mode 100644
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
old mode 100755
new mode 100644
diff --git a/service/dfx/src/dfx_hisysevent.cpp b/service/dfx/src/dfx_hisysevent.cpp
old mode 100755
new mode 100644
diff --git a/service/filter/BUILD.gn b/service/filter/BUILD.gn
old mode 100755
new mode 100644
diff --git a/service/filter/include/event_filter_handler.h b/service/filter/include/event_filter_handler.h
old mode 100755
new mode 100644
diff --git a/service/filter/src/event_filter_handler.cpp b/service/filter/src/event_filter_handler.cpp
old mode 100755
new mode 100644
diff --git a/service/message_handle/include/server_msg_handler.h b/service/message_handle/include/server_msg_handler.h
old mode 100755
new mode 100644
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
old mode 100755
new mode 100644
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
old mode 100755
new mode 100644
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
old mode 100755
new mode 100644
diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
old mode 100755
new mode 100644
-- 
Gitee


From 0367c16ce4f5f41c1a0174734a02081ab98e4305 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 27 Dec 2022 06:27:16 +0000
Subject: [PATCH 283/360] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 frameworks/proxy/events/test/input_manager_manual_test.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frameworks/proxy/events/test/input_manager_manual_test.cpp b/frameworks/proxy/events/test/input_manager_manual_test.cpp
index 79b599a7bf..edcb674ce1 100644
--- a/frameworks/proxy/events/test/input_manager_manual_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_manual_test.cpp
@@ -199,7 +199,8 @@ HWTEST_F(InputManagerManualTest, HandleKeyEventFilter_003, TestSize.Level1)
         bool OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent) const override { return false; }
     };
     AccessToken accessToken;auto filter = std::make_shared<KeyFilter>();
-    const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220);
+    uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX);
+    const int32_t filterId = InputManager::GetInstance()->AddInputEventFilter(filter, 220, touchTags);
     ASSERT_NE(filterId, RET_ERR);
     auto retCode = InputManager::GetInstance()->RemoveInputEventFilter(filterId);
     ASSERT_EQ(retCode, RET_OK);
-- 
Gitee


From c90a22d90d169c27e827f72aaecd14d90558ccbc Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 27 Dec 2022 06:49:39 +0000
Subject: [PATCH 284/360] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 .../addinputeventfilter_fuzzer/addinputeventfilter_fuzzer.cpp  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/fuzztest/addinputeventfilter_fuzzer/addinputeventfilter_fuzzer.cpp b/test/fuzztest/addinputeventfilter_fuzzer/addinputeventfilter_fuzzer.cpp
index dc6246b860..1ea5934933 100644
--- a/test/fuzztest/addinputeventfilter_fuzzer/addinputeventfilter_fuzzer.cpp
+++ b/test/fuzztest/addinputeventfilter_fuzzer/addinputeventfilter_fuzzer.cpp
@@ -42,7 +42,8 @@ void AddInputEventFilterFuzzTest(const uint8_t* data, size_t size)
     };
     auto filter = std::make_shared<TestFilter>();
     const auto priority = 200 + (size % 100);
-    const auto filterId = InputManager::GetInstance()->AddInputEventFilter(filter, priority);
+    uint32_t touchTags = CapabilityToTags(InputDeviceCapability::INPUT_DEV_CAP_MAX);
+    const auto filterId = InputManager::GetInstance()->AddInputEventFilter(filter, priority, touchTags);
     if (filterId == -1) {
         MMI_HILOGE("Add filter,ret:%{public}d", filterId);
         return;
-- 
Gitee


From 8e215f85d63dd906a5fb97f29f64462a6a6abd53 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 27 Dec 2022 07:19:47 +0000
Subject: [PATCH 285/360] add interface GetWindowPid

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Id74a1f46682c52288d57e8182e21a901aa86e07a
---
 service/module_loader/include/mmi_service.h |  1 +
 service/module_loader/src/mmi_service.cpp   | 22 +++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index 865399b019..e3dfb3cf71 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -109,6 +109,7 @@ protected:
     int32_t OnGetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice);
     int32_t OnSupportKeys(int32_t deviceId, std::vector<int32_t> &keys, std::vector<bool> &keystroke);
     int32_t OnGetKeyboardType(int32_t deviceId, int32_t &keyboardType);
+    int32_t OnGetWindowPid(int32_t windowId, int32_t &windowPid);
 #if defined(OHOS_BUILD_ENABLE_INTERCEPTOR) || defined(OHOS_BUILD_ENABLE_MONITOR)
     int32_t CheckAddInput(int32_t pid, InputHandlerType handlerType, HandleEventType eventType,
         int32_t priority, uint32_t deviceTags);
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index f360cb6e83..935a40b10d 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -1319,14 +1319,28 @@ int32_t MMIService::SetMouseCaptureMode(int32_t windowId, bool isCaptureMode)
     return ret;
 }
 
-int32_t MMIService::GetWindowPid(int32_t windowId)
+int32_t MMIService::OnGetWindowPid(int32_t windowId, int32_t &windowPid)
 {
     CALL_DEBUG_ENTER;
-    int32_t ret = WinMgr->GetWindowPid(windowId);
-    if (ret == RET_ERR) {
+    windowPid = WinMgr->GetWindowPid(windowId);
+    if (windowPid == RET_ERR) {
         MMI_HILOGE("Get window pid failed");
     }
-    return ret;
+    MMI_HILOGD("windowpid is %{public}d", windowPid);
+    return RET_OK;
+}
+
+int32_t MMIService::GetWindowPid(int32_t windowId)
+{
+    CALL_DEBUG_ENTER;
+    int32_t windowPid = -1;
+    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&MMIService::OnGetWindowPid, this, windowId, std::ref(windowPid)));
+    if (ret != RET_OK) {
+        MMI_HILOGE("OnGetWindowPid failed, ret:%{public}d", ret);
+        return RET_ERR;
+    }
+    MMI_HILOGD("windowpid is %{public}d", windowPid);
+    return windowPid;
 }
 } // namespace MMI
 } // namespace OHOS
-- 
Gitee


From 081829728023d1b7b1acfff50482f6a236e6d0aa Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 27 Dec 2022 07:57:54 +0000
Subject: [PATCH 286/360] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 frameworks/proxy/event_handler/src/input_manager_impl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 850b29f5d2..8b91353826 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -718,7 +718,7 @@ void InputManagerImpl::ReAddInputEventFilter()
         int32_t ret = MultimodalInputConnMgr->AddInputEventFilter(service, filterId, priority, deviceTags);
         if (ret != RET_OK) {
             MMI_HILOGE("AddInputEventFilter has send to server failed, filterId:%{public}d, priority:%{public}d,"
-            "deviceTags:%{public}zu, ret:%{public}d", filterId, priority, deviceTags, ret);
+                "deviceTags:%{public}zu, ret:%{public}d", filterId, priority, deviceTags, ret);
         }
     }
 }
-- 
Gitee


From b53e2959a0dacdf11604fae4640b7b4011b942c8 Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Tue, 27 Dec 2022 08:12:48 +0000
Subject: [PATCH 287/360] Signed-off-by: mayunteng_1 <mayunteng@huawei.com>

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: I3529f34ccdf9e1a3fa716e2e23f568ed1008d617
---
 BUILD.gn                                      |  14 +-
 frameworks/napi/input_device/BUILD.gn         |   8 +-
 .../napi/input_device_cooperate/BUILD.gn      |   8 +-
 frameworks/napi/input_monitor/BUILD.gn        |   7 +-
 frameworks/proxy/BUILD.gn                     |  42 +----
 multimodalinput_mini.gni                      | 177 ++++++++++++++++++
 patch/diff_libinput_mmi/BUILD.gn              |  37 +---
 service/BUILD.gn                              |  33 +---
 tools/event_inject/BUILD.gn                   |  18 +-
 tools/vuinput/BUILD.gn                        |  29 +--
 util/BUILD.gn                                 |  26 +--
 11 files changed, 198 insertions(+), 201 deletions(-)
 mode change 100755 => 100644 frameworks/napi/input_device_cooperate/BUILD.gn
 mode change 100755 => 100644 frameworks/proxy/BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 965d38c173..bc0508b2ea 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -31,15 +31,7 @@ ohos_prebuilt_etc("multimodalinput.rc") {
 ohos_executable("uinput_inject") {
   install_enable = true
 
-  sources = [
-    "uinput/hdf_device_event_dispatch.cpp",
-    "uinput/hdf_device_event_manager.cpp",
-    "uinput/inject_thread.cpp",
-    "uinput/keyboard_inject.cpp",
-    "uinput/virtual_device.cpp",
-    "uinput/virtual_keyboard.cpp",
-    "uinput/virtual_touch_screen.cpp",
-  ]
+  sources = uinput_inject_sources
 
   include_dirs = [
     "//foundation/multimodalinput/input/util/common/include",
@@ -56,10 +48,6 @@ ohos_executable("uinput_inject") {
   subsystem_name = "multimodalinput"
 }
 
-config("multimodalinput_mmi_public_config") {
-  include_dirs = [ "util/common/include/" ]
-}
-
 group("multimodalinput_mmi_base") {
   deps = []
 }
diff --git a/frameworks/napi/input_device/BUILD.gn b/frameworks/napi/input_device/BUILD.gn
index 5cff3fbdd9..5376eabe48 100644
--- a/frameworks/napi/input_device/BUILD.gn
+++ b/frameworks/napi/input_device/BUILD.gn
@@ -27,13 +27,7 @@ config("inputdevice_config") {
 }
 
 ohos_shared_library("inputdevice") {
-  sources = [
-    "src/js_event_target.cpp",
-    "src/js_input_device_context.cpp",
-    "src/js_input_device_manager.cpp",
-    "src/js_util.cpp",
-    "src/native_register_module.cpp",
-  ]
+  sources = inputdevice_sources
 
   configs = [ ":inputdevice_config" ]
 
diff --git a/frameworks/napi/input_device_cooperate/BUILD.gn b/frameworks/napi/input_device_cooperate/BUILD.gn
old mode 100755
new mode 100644
index 2adaaed82b..764b3a8320
--- a/frameworks/napi/input_device_cooperate/BUILD.gn
+++ b/frameworks/napi/input_device_cooperate/BUILD.gn
@@ -20,13 +20,7 @@ config("inputdevicecooperate_config") {
 }
 
 ohos_shared_library("inputdevicecooperate") {
-  sources = [
-    "src/js_event_target.cpp",
-    "src/js_input_device_cooperate_context.cpp",
-    "src/js_input_device_cooperate_manager.cpp",
-    "src/js_util.cpp",
-    "src/native_register_module.cpp",
-  ]
+  sources = inputdevicecooperate_sources
 
   configs = [ ":inputdevicecooperate_config" ]
 
diff --git a/frameworks/napi/input_monitor/BUILD.gn b/frameworks/napi/input_monitor/BUILD.gn
index 0bbc2cf3d2..8fd04fbe98 100644
--- a/frameworks/napi/input_monitor/BUILD.gn
+++ b/frameworks/napi/input_monitor/BUILD.gn
@@ -26,12 +26,7 @@ config("inputmonitor_config") {
 }
 
 ohos_shared_library("inputmonitor") {
-  sources = [
-    "src/js_input_monitor.cpp",
-    "src/js_input_monitor_manager.cpp",
-    "src/js_input_monitor_module.cpp",
-    "src/js_input_monitor_util.cpp",
-  ]
+  sources = inputmonitor_sources
 
   configs = [ ":inputmonitor_config" ]
 
diff --git a/frameworks/proxy/BUILD.gn b/frameworks/proxy/BUILD.gn
old mode 100755
new mode 100644
index 2c63125ca5..c505866d83
--- a/frameworks/proxy/BUILD.gn
+++ b/frameworks/proxy/BUILD.gn
@@ -14,6 +14,9 @@
 import("//build/ohos.gni")
 import("//build/test.gni")
 import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
+
+defines = input_default_defines
+
 module_output_path = "multimodalinput/unit_out"
 
 config("libmmi_client_config") {
@@ -56,16 +59,7 @@ config("libmmi_test_util") {
 }
 
 ohos_source_set("libmmi-common") {
-  sources = [
-    "events/src/input_device.cpp",
-    "events/src/input_event.cpp",
-    "events/src/key_event.cpp",
-    "events/src/key_option.cpp",
-    "events/src/pointer_event.cpp",
-  ]
-
-  defines = input_default_defines
-
+  sources = libmmi_common_sources
   public_configs = [ ":libmmi_client_config" ]
 
   external_deps = [
@@ -78,25 +72,11 @@ ohos_source_set("libmmi-common") {
 }
 
 ohos_shared_library("libmmi-client") {
-  sources = [
-    "event_handler/src/anr_handler.cpp",
-    "event_handler/src/bytrace_adapter.cpp",
-    "event_handler/src/client_msg_handler.cpp",
-    "event_handler/src/input_device_impl.cpp",
-    "event_handler/src/input_handler_manager.cpp",
-    "event_handler/src/input_manager_impl.cpp",
-    "event_handler/src/multimodal_event_handler.cpp",
-    "events/src/axis_event.cpp",
-    "events/src/input_manager.cpp",
-    "module_loader/src/mmi_client.cpp",
-    "module_loader/src/mmi_fd_listener.cpp",
-  ]
+  sources = libmmi_client_sources
   if (input_feature_input_cooperation) {
     sources += [ "event_handler/src/input_device_cooperate_impl.cpp" ]
   }
 
-  defines = input_default_defines
-
   if (input_feature_interceptor) {
     sources += [ "event_handler/src/input_interceptor_manager.cpp" ]
   }
@@ -143,8 +123,6 @@ ohos_unittest("ut-mmi-proxy-out") {
     "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  defines = input_default_defines
-
   sources = [ "module_loader/test/mmi_client_test.cpp" ]
 
   configs = [ ":libmmi_test_util" ]
@@ -169,8 +147,6 @@ ohos_unittest("KeyEventTest") {
     "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  defines = input_default_defines
-
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/window_utils_test.cpp",
@@ -205,8 +181,6 @@ ohos_unittest("InputManagerTest") {
     "${mmi_path}/service/filter/include",
   ]
 
-  defines = input_default_defines
-
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/system_info.cpp",
@@ -238,8 +212,6 @@ ohos_unittest("InputManagerManualTest") {
   module_out_path = module_output_path
   include_dirs = [ "//commonlibrary/c_utils/base/include" ]
 
-  defines = input_default_defines
-
   sources = [ "events/test/input_manager_manual_test.cpp" ]
 
   configs = [ ":libmmi_test_util" ]
@@ -263,8 +235,6 @@ ohos_unittest("InputManagerFilterManualTest") {
   module_out_path = module_output_path
   include_dirs = [ "//commonlibrary/c_utils/base/include" ]
 
-  defines = input_default_defines
-
   sources = [ "events/test/input_manager_filter_manual_test.cpp" ]
 
   configs = [ ":libmmi_test_util" ]
@@ -288,8 +258,6 @@ ohos_unittest("PointerEventTest") {
   module_out_path = module_output_path
   include_dirs = [ "$root_out_dir/diff_libinput_mmi/export_include" ]
 
-  defines = input_default_defines
-
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/window_utils_test.cpp",
diff --git a/multimodalinput_mini.gni b/multimodalinput_mini.gni
index f843d2f016..91ba4a2243 100644
--- a/multimodalinput_mini.gni
+++ b/multimodalinput_mini.gni
@@ -34,6 +34,183 @@ declare_args() {
       defined(global_parts_info.resourceschedule_resource_schedule_service)) {
     resource_schedule_service_enabled = true
   }
+
+  uinput_inject_sources = [
+    "uinput/hdf_device_event_dispatch.cpp",
+    "uinput/hdf_device_event_manager.cpp",
+    "uinput/inject_thread.cpp",
+    "uinput/keyboard_inject.cpp",
+    "uinput/virtual_device.cpp",
+    "uinput/virtual_keyboard.cpp",
+    "uinput/virtual_touch_screen.cpp",
+  ]
+
+  libmmi_common_sources = [
+    "events/src/input_device.cpp",
+    "events/src/input_event.cpp",
+    "events/src/key_event.cpp",
+    "events/src/key_option.cpp",
+    "events/src/pointer_event.cpp",
+  ]
+
+  libmmi_client_sources = [
+    "event_handler/src/anr_handler.cpp",
+    "event_handler/src/bytrace_adapter.cpp",
+    "event_handler/src/client_msg_handler.cpp",
+    "event_handler/src/input_device_impl.cpp",
+    "event_handler/src/input_handler_manager.cpp",
+    "event_handler/src/input_manager_impl.cpp",
+    "event_handler/src/multimodal_event_handler.cpp",
+    "events/src/axis_event.cpp",
+    "events/src/input_manager.cpp",
+    "module_loader/src/mmi_client.cpp",
+    "module_loader/src/mmi_fd_listener.cpp",
+  ]
+
+  libmmi_service_sources = [
+    "//foundation/multimodalinput/input/frameworks/proxy/event_handler/src/bytrace_adapter.cpp",
+    "delegate_task/src/delegate_tasks.cpp",
+    "device_config/src/device_config_file_parser.cpp",
+    "device_manager/src/input_device_manager.cpp",
+    "dfx/src/dfx_hisysevent.cpp",
+    "event_dispatch/src/event_dispatch_handler.cpp",
+    "event_dump/src/event_dump.cpp",
+    "event_handler/src/anr_manager.cpp",
+    "event_handler/src/event_normalize_handler.cpp",
+    "event_handler/src/input_event_handler.cpp",
+    "event_handler/src/key_auto_repeat.cpp",
+    "event_handler/src/key_event_value_transformation.cpp",
+    "event_handler/src/key_map_manager.cpp",
+    "libinput_adapter/src/libinput_adapter.cpp",
+    "message_handle/src/server_msg_handler.cpp",
+    "module_loader/src/mmi_service.cpp",
+    "module_loader/src/uds_server.cpp",
+    "permission_helper/src/permission_helper.cpp",
+    "timer_manager/src/timer_manager.cpp",
+    "window_manager/src/input_display_bind_helper.cpp",
+    "window_manager/src/input_windows_manager.cpp",
+  ]
+
+  inputdevice_sources = [
+    "src/js_event_target.cpp",
+    "src/js_input_device_context.cpp",
+    "src/js_input_device_manager.cpp",
+    "src/js_util.cpp",
+    "src/native_register_module.cpp",
+  ]
+
+  inputdevicecooperate_sources = [
+    "src/js_event_target.cpp",
+    "src/js_input_device_cooperate_context.cpp",
+    "src/js_input_device_cooperate_manager.cpp",
+    "src/js_util.cpp",
+    "src/native_register_module.cpp",
+  ]
+
+  inputmonitor_sources = [
+    "src/js_input_monitor.cpp",
+    "src/js_input_monitor_manager.cpp",
+    "src/js_input_monitor_module.cpp",
+    "src/js_input_monitor_util.cpp",
+  ]
+
+  patch_gen_libinput_third_mmi_sources = [
+    root_out_dir + "/diff_libinput_mmi/src/evdev-debounce.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-fallback.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-joystick.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-middle-button.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-mt-touchpad-buttons.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-mt-touchpad-edge-scroll.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-mt-touchpad-gestures.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-mt-touchpad-tap.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-mt-touchpad-thumb.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-mt-touchpad.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-tablet-pad-leds.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-tablet-pad.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-tablet.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-totem.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-flat.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-low-dpi.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-mouse.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-tablet.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-touchpad-flat.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-touchpad-x230.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-touchpad.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-trackpoint.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter.c",
+    root_out_dir + "/diff_libinput_mmi/src/libinput-util.c",
+    root_out_dir + "/diff_libinput_mmi/src/libinput.c",
+    root_out_dir + "/diff_libinput_mmi/src/path-seat.c",
+    root_out_dir + "/diff_libinput_mmi/src/quirks.c",
+    root_out_dir + "/diff_libinput_mmi/src/timer.c",
+    root_out_dir + "/diff_libinput_mmi/src/udev-seat.c",
+    root_out_dir + "/diff_libinput_mmi/src/util-list.c",
+    root_out_dir + "/diff_libinput_mmi/src/util-prop-parsers.c",
+    root_out_dir + "/diff_libinput_mmi/src/util-ratelimit.c",
+    root_out_dir + "/diff_libinput_mmi/src/util-strings.c",
+  ]
+
+  event_injection_sources = [
+    "src/device_base.cpp",
+    "src/get_device_node.cpp",
+    "src/get_device_object.cpp",
+    "src/injection_event_dispatch.cpp",
+    "src/injection_tools_help_func.cpp",
+    "src/input_parse.cpp",
+    "src/manage_inject_device.cpp",
+    "src/processing_finger_device.cpp",
+    "src/processing_game_pad_device.cpp",
+    "src/processing_joystick_device.cpp",
+    "src/processing_keyboard_device.cpp",
+    "src/processing_mouse_device.cpp",
+    "src/processing_pad_device.cpp",
+    "src/processing_pen_device.cpp",
+    "src/processing_touch_screen_device.cpp",
+  ]
+
+  libmmi_virtual_device_sources = [
+    "src/virtual_device.cpp",
+    "src/virtual_finger.cpp",
+    "src/virtual_gamepad.cpp",
+    "src/virtual_joystick.cpp",
+    "src/virtual_keyboard.cpp",
+    "src/virtual_keyboard_consumer_ctrl.cpp",
+    "src/virtual_keyboard_ext.cpp",
+    "src/virtual_keyboard_sys_ctrl.cpp",
+    "src/virtual_knob.cpp",
+    "src/virtual_knob_consumer_ctrl.cpp",
+    "src/virtual_knob_mouse.cpp",
+    "src/virtual_knob_sys_ctrl.cpp",
+    "src/virtual_mouse.cpp",
+    "src/virtual_pen.cpp",
+    "src/virtual_pen_keyboard.cpp",
+    "src/virtual_pen_mouse.cpp",
+    "src/virtual_remote_control.cpp",
+    "src/virtual_single_finger.cpp",
+    "src/virtual_single_touchscreen.cpp",
+    "src/virtual_stylus.cpp",
+    "src/virtual_touchpad.cpp",
+    "src/virtual_touchscreen.cpp",
+    "src/virtual_trackball.cpp",
+    "src/virtual_trackpad.cpp",
+    "src/virtual_trackpad_mouse.cpp",
+    "src/virtual_trackpad_sys_ctrl.cpp",
+  ]
+
+  libmmi_util_sources = [
+    "common/src/input_event_data_transformation.cpp",
+    "common/src/klog.cpp",
+    "common/src/util.cpp",
+    "common/src/util_napi.cpp",
+    "common/src/util_napi_error.cpp",
+    "network/src/circle_stream_buffer.cpp",
+    "network/src/net_packet.cpp",
+    "network/src/stream_buffer.cpp",
+    "socket/src/uds_client.cpp",
+    "socket/src/uds_session.cpp",
+    "socket/src/uds_socket.cpp",
+  ]
 }
 
 if (input_feature_joystick) {
diff --git a/patch/diff_libinput_mmi/BUILD.gn b/patch/diff_libinput_mmi/BUILD.gn
index 35708afd30..adb6e77d6c 100644
--- a/patch/diff_libinput_mmi/BUILD.gn
+++ b/patch/diff_libinput_mmi/BUILD.gn
@@ -112,42 +112,7 @@ config("libinput-third_public_config") {
 ohos_source_set("patch_gen_libinput-third-mmi") {
   part_name = "input"
   subsystem_name = "multimodalinput"
-  sources = [
-    "$gen_dst_dir/src/evdev-debounce.c",
-    "$gen_dst_dir/src/evdev-fallback.c",
-    "$gen_dst_dir/src/evdev-joystick.c",
-    "$gen_dst_dir/src/evdev-middle-button.c",
-    "$gen_dst_dir/src/evdev-mt-touchpad-buttons.c",
-    "$gen_dst_dir/src/evdev-mt-touchpad-edge-scroll.c",
-    "$gen_dst_dir/src/evdev-mt-touchpad-gestures.c",
-    "$gen_dst_dir/src/evdev-mt-touchpad-tap.c",
-    "$gen_dst_dir/src/evdev-mt-touchpad-thumb.c",
-    "$gen_dst_dir/src/evdev-mt-touchpad.c",
-    "$gen_dst_dir/src/evdev-tablet-pad-leds.c",
-    "$gen_dst_dir/src/evdev-tablet-pad.c",
-    "$gen_dst_dir/src/evdev-tablet.c",
-    "$gen_dst_dir/src/evdev-totem.c",
-    "$gen_dst_dir/src/evdev.c",
-    "$gen_dst_dir/src/filter-flat.c",
-    "$gen_dst_dir/src/filter-low-dpi.c",
-    "$gen_dst_dir/src/filter-mouse.c",
-    "$gen_dst_dir/src/filter-tablet.c",
-    "$gen_dst_dir/src/filter-touchpad-flat.c",
-    "$gen_dst_dir/src/filter-touchpad-x230.c",
-    "$gen_dst_dir/src/filter-touchpad.c",
-    "$gen_dst_dir/src/filter-trackpoint.c",
-    "$gen_dst_dir/src/filter.c",
-    "$gen_dst_dir/src/libinput-util.c",
-    "$gen_dst_dir/src/libinput.c",
-    "$gen_dst_dir/src/path-seat.c",
-    "$gen_dst_dir/src/quirks.c",
-    "$gen_dst_dir/src/timer.c",
-    "$gen_dst_dir/src/udev-seat.c",
-    "$gen_dst_dir/src/util-list.c",
-    "$gen_dst_dir/src/util-prop-parsers.c",
-    "$gen_dst_dir/src/util-ratelimit.c",
-    "$gen_dst_dir/src/util-strings.c",
-  ]
+  sources = patch_gen_libinput_third_mmi_sources
 
   configs = [ ":libinput-third_config" ]
 
diff --git a/service/BUILD.gn b/service/BUILD.gn
index 7e920fea81..307284485d 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -14,6 +14,8 @@
 import("//build/ohos.gni")
 import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
 
+defines = input_default_defines
+
 mmi_service_path = "${mmi_path}/service"
 
 ohos_prebuilt_etc("mmi_device_config.ini") {
@@ -63,8 +65,6 @@ config("libmmi_server_config") {
     "//third_party/cJSON",
   ]
 
-  defines = input_default_defines
-
   if (input_feature_combination_key) {
     defines += [ "OHOS_BUILD_ENABLE_COMBINATION_KEY" ]
   }
@@ -83,29 +83,8 @@ config("libmmi_server_config") {
 }
 
 ohos_shared_library("libmmi-server") {
-  sources = [
-    "//foundation/multimodalinput/input/frameworks/proxy/event_handler/src/bytrace_adapter.cpp",
-    "delegate_task/src/delegate_tasks.cpp",
-    "device_config/src/device_config_file_parser.cpp",
-    "device_manager/src/input_device_manager.cpp",
-    "dfx/src/dfx_hisysevent.cpp",
-    "event_dispatch/src/event_dispatch_handler.cpp",
-    "event_dump/src/event_dump.cpp",
-    "event_handler/src/anr_manager.cpp",
-    "event_handler/src/event_normalize_handler.cpp",
-    "event_handler/src/input_event_handler.cpp",
-    "event_handler/src/key_auto_repeat.cpp",
-    "event_handler/src/key_event_value_transformation.cpp",
-    "event_handler/src/key_map_manager.cpp",
-    "libinput_adapter/src/libinput_adapter.cpp",
-    "message_handle/src/server_msg_handler.cpp",
-    "module_loader/src/mmi_service.cpp",
-    "module_loader/src/uds_server.cpp",
-    "permission_helper/src/permission_helper.cpp",
-    "timer_manager/src/timer_manager.cpp",
-    "window_manager/src/input_display_bind_helper.cpp",
-    "window_manager/src/input_windows_manager.cpp",
-  ]
+
+  sources = libmmi_service_sources
 
   if (input_feature_input_cooperation) {
     sources += [
@@ -270,8 +249,6 @@ ohos_unittest("ut-mmi-service-out") {
     "window_manager/test/input_windows_manager_test.cpp",
   ]
 
-  defines = input_default_defines
-
   configs = [ ":libmmi_server_config" ]
 
   deps = [
@@ -299,8 +276,6 @@ ohos_unittest("TransformPointTest") {
 
   sources = [ "touch_event_normalize/test/transform_point_test.cpp" ]
 
-  defines = input_default_defines
-
   deps = [
     "${mmi_path}/tools/vuinput:libmmi-virtual-device",
     "//third_party/googletest:gmock_main",
diff --git a/tools/event_inject/BUILD.gn b/tools/event_inject/BUILD.gn
index 38b43e63e8..62f53d354d 100644
--- a/tools/event_inject/BUILD.gn
+++ b/tools/event_inject/BUILD.gn
@@ -38,23 +38,7 @@ config("event_injection_public_config") {
 }
 
 ohos_source_set("event-injection") {
-  sources = [
-    "src/device_base.cpp",
-    "src/get_device_node.cpp",
-    "src/get_device_object.cpp",
-    "src/injection_event_dispatch.cpp",
-    "src/injection_tools_help_func.cpp",
-    "src/input_parse.cpp",
-    "src/manage_inject_device.cpp",
-    "src/processing_finger_device.cpp",
-    "src/processing_game_pad_device.cpp",
-    "src/processing_joystick_device.cpp",
-    "src/processing_keyboard_device.cpp",
-    "src/processing_mouse_device.cpp",
-    "src/processing_pad_device.cpp",
-    "src/processing_pen_device.cpp",
-    "src/processing_touch_screen_device.cpp",
-  ]
+  sources = event_injection_sources
 
   configs = [
     ":event_injection_config",
diff --git a/tools/vuinput/BUILD.gn b/tools/vuinput/BUILD.gn
index 7d1b6f0588..e5c2db31eb 100644
--- a/tools/vuinput/BUILD.gn
+++ b/tools/vuinput/BUILD.gn
@@ -33,34 +33,7 @@ config("virtual_device_public_config") {
 }
 
 ohos_source_set("libmmi-virtual-device") {
-  sources = [
-    "src/virtual_device.cpp",
-    "src/virtual_finger.cpp",
-    "src/virtual_gamepad.cpp",
-    "src/virtual_joystick.cpp",
-    "src/virtual_keyboard.cpp",
-    "src/virtual_keyboard_consumer_ctrl.cpp",
-    "src/virtual_keyboard_ext.cpp",
-    "src/virtual_keyboard_sys_ctrl.cpp",
-    "src/virtual_knob.cpp",
-    "src/virtual_knob_consumer_ctrl.cpp",
-    "src/virtual_knob_mouse.cpp",
-    "src/virtual_knob_sys_ctrl.cpp",
-    "src/virtual_mouse.cpp",
-    "src/virtual_pen.cpp",
-    "src/virtual_pen_keyboard.cpp",
-    "src/virtual_pen_mouse.cpp",
-    "src/virtual_remote_control.cpp",
-    "src/virtual_single_finger.cpp",
-    "src/virtual_single_touchscreen.cpp",
-    "src/virtual_stylus.cpp",
-    "src/virtual_touchpad.cpp",
-    "src/virtual_touchscreen.cpp",
-    "src/virtual_trackball.cpp",
-    "src/virtual_trackpad.cpp",
-    "src/virtual_trackpad_mouse.cpp",
-    "src/virtual_trackpad_sys_ctrl.cpp",
-  ]
+  sources = libmmi_virtual_device_sources
 
   configs = [ ":libmmi_virtual_device_config" ]
 
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 35702256a8..68daed33af 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -15,7 +15,10 @@ import("//build/ohos.gni")
 import("//build/test.gni")
 import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
 
+defines = input_default_defines
+
 module_output_path = "multimodalinput/unit_out"
+
 config("libmmi_util_public_config") {
   include_dirs = [
     "common/include",
@@ -24,29 +27,12 @@ config("libmmi_util_public_config") {
     "//foundation/multimodalinput/input/interfaces/native/innerkits/common/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
   ]
-
-  defines = input_default_defines
 }
 
 ohos_shared_library("libmmi-util") {
-  sources = [
-    "common/src/input_event_data_transformation.cpp",
-    "common/src/klog.cpp",
-    "common/src/util.cpp",
-    "common/src/util_napi.cpp",
-    "common/src/util_napi_error.cpp",
-    "network/src/circle_stream_buffer.cpp",
-    "network/src/net_packet.cpp",
-    "network/src/stream_buffer.cpp",
-    "socket/src/uds_client.cpp",
-    "socket/src/uds_session.cpp",
-    "socket/src/uds_socket.cpp",
-  ]
+  sources = libmmi_util_sources
 
-  configs = [
-    "//foundation/multimodalinput/input:multimodalinput_mmi_public_config",
-    ":libmmi_util_public_config",
-  ]
+  configs = [ ":libmmi_util_public_config" ]
 
   public_deps = [
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
@@ -85,8 +71,6 @@ ohos_unittest("ut-mmi-util-out") {
     "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  defines = input_default_defines
-
   sources = [
     "network/test/net_packet_test.cpp",
     "socket/test/stream_buffer_test.cpp",
-- 
Gitee


From 3eddcbb0c9f7820a9df4913bf6d34f290fc78952 Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Tue, 27 Dec 2022 08:12:48 +0000
Subject: [PATCH 288/360] Signed-off-by: mayunteng_1 <mayunteng@huawei.com>

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: I3529f34ccdf9e1a3fa716e2e23f568ed1008d617
---
 BUILD.gn                                      |  14 +-
 frameworks/napi/input_device/BUILD.gn         |   8 +-
 .../napi/input_device_cooperate/BUILD.gn      |   8 +-
 frameworks/napi/input_monitor/BUILD.gn        |   7 +-
 frameworks/proxy/BUILD.gn                     |  42 +----
 multimodalinput_mini.gni                      | 177 ++++++++++++++++++
 patch/diff_libinput_mmi/BUILD.gn              |  37 +---
 service/BUILD.gn                              |  33 +---
 tools/event_inject/BUILD.gn                   |  18 +-
 tools/vuinput/BUILD.gn                        |  29 +--
 util/BUILD.gn                                 |  26 +--
 11 files changed, 198 insertions(+), 201 deletions(-)
 mode change 100755 => 100644 frameworks/napi/input_device_cooperate/BUILD.gn
 mode change 100755 => 100644 frameworks/proxy/BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 965d38c173..bc0508b2ea 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -31,15 +31,7 @@ ohos_prebuilt_etc("multimodalinput.rc") {
 ohos_executable("uinput_inject") {
   install_enable = true
 
-  sources = [
-    "uinput/hdf_device_event_dispatch.cpp",
-    "uinput/hdf_device_event_manager.cpp",
-    "uinput/inject_thread.cpp",
-    "uinput/keyboard_inject.cpp",
-    "uinput/virtual_device.cpp",
-    "uinput/virtual_keyboard.cpp",
-    "uinput/virtual_touch_screen.cpp",
-  ]
+  sources = uinput_inject_sources
 
   include_dirs = [
     "//foundation/multimodalinput/input/util/common/include",
@@ -56,10 +48,6 @@ ohos_executable("uinput_inject") {
   subsystem_name = "multimodalinput"
 }
 
-config("multimodalinput_mmi_public_config") {
-  include_dirs = [ "util/common/include/" ]
-}
-
 group("multimodalinput_mmi_base") {
   deps = []
 }
diff --git a/frameworks/napi/input_device/BUILD.gn b/frameworks/napi/input_device/BUILD.gn
index 5cff3fbdd9..5376eabe48 100644
--- a/frameworks/napi/input_device/BUILD.gn
+++ b/frameworks/napi/input_device/BUILD.gn
@@ -27,13 +27,7 @@ config("inputdevice_config") {
 }
 
 ohos_shared_library("inputdevice") {
-  sources = [
-    "src/js_event_target.cpp",
-    "src/js_input_device_context.cpp",
-    "src/js_input_device_manager.cpp",
-    "src/js_util.cpp",
-    "src/native_register_module.cpp",
-  ]
+  sources = inputdevice_sources
 
   configs = [ ":inputdevice_config" ]
 
diff --git a/frameworks/napi/input_device_cooperate/BUILD.gn b/frameworks/napi/input_device_cooperate/BUILD.gn
old mode 100755
new mode 100644
index 2adaaed82b..764b3a8320
--- a/frameworks/napi/input_device_cooperate/BUILD.gn
+++ b/frameworks/napi/input_device_cooperate/BUILD.gn
@@ -20,13 +20,7 @@ config("inputdevicecooperate_config") {
 }
 
 ohos_shared_library("inputdevicecooperate") {
-  sources = [
-    "src/js_event_target.cpp",
-    "src/js_input_device_cooperate_context.cpp",
-    "src/js_input_device_cooperate_manager.cpp",
-    "src/js_util.cpp",
-    "src/native_register_module.cpp",
-  ]
+  sources = inputdevicecooperate_sources
 
   configs = [ ":inputdevicecooperate_config" ]
 
diff --git a/frameworks/napi/input_monitor/BUILD.gn b/frameworks/napi/input_monitor/BUILD.gn
index 0bbc2cf3d2..8fd04fbe98 100644
--- a/frameworks/napi/input_monitor/BUILD.gn
+++ b/frameworks/napi/input_monitor/BUILD.gn
@@ -26,12 +26,7 @@ config("inputmonitor_config") {
 }
 
 ohos_shared_library("inputmonitor") {
-  sources = [
-    "src/js_input_monitor.cpp",
-    "src/js_input_monitor_manager.cpp",
-    "src/js_input_monitor_module.cpp",
-    "src/js_input_monitor_util.cpp",
-  ]
+  sources = inputmonitor_sources
 
   configs = [ ":inputmonitor_config" ]
 
diff --git a/frameworks/proxy/BUILD.gn b/frameworks/proxy/BUILD.gn
old mode 100755
new mode 100644
index 2c63125ca5..c505866d83
--- a/frameworks/proxy/BUILD.gn
+++ b/frameworks/proxy/BUILD.gn
@@ -14,6 +14,9 @@
 import("//build/ohos.gni")
 import("//build/test.gni")
 import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
+
+defines = input_default_defines
+
 module_output_path = "multimodalinput/unit_out"
 
 config("libmmi_client_config") {
@@ -56,16 +59,7 @@ config("libmmi_test_util") {
 }
 
 ohos_source_set("libmmi-common") {
-  sources = [
-    "events/src/input_device.cpp",
-    "events/src/input_event.cpp",
-    "events/src/key_event.cpp",
-    "events/src/key_option.cpp",
-    "events/src/pointer_event.cpp",
-  ]
-
-  defines = input_default_defines
-
+  sources = libmmi_common_sources
   public_configs = [ ":libmmi_client_config" ]
 
   external_deps = [
@@ -78,25 +72,11 @@ ohos_source_set("libmmi-common") {
 }
 
 ohos_shared_library("libmmi-client") {
-  sources = [
-    "event_handler/src/anr_handler.cpp",
-    "event_handler/src/bytrace_adapter.cpp",
-    "event_handler/src/client_msg_handler.cpp",
-    "event_handler/src/input_device_impl.cpp",
-    "event_handler/src/input_handler_manager.cpp",
-    "event_handler/src/input_manager_impl.cpp",
-    "event_handler/src/multimodal_event_handler.cpp",
-    "events/src/axis_event.cpp",
-    "events/src/input_manager.cpp",
-    "module_loader/src/mmi_client.cpp",
-    "module_loader/src/mmi_fd_listener.cpp",
-  ]
+  sources = libmmi_client_sources
   if (input_feature_input_cooperation) {
     sources += [ "event_handler/src/input_device_cooperate_impl.cpp" ]
   }
 
-  defines = input_default_defines
-
   if (input_feature_interceptor) {
     sources += [ "event_handler/src/input_interceptor_manager.cpp" ]
   }
@@ -143,8 +123,6 @@ ohos_unittest("ut-mmi-proxy-out") {
     "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  defines = input_default_defines
-
   sources = [ "module_loader/test/mmi_client_test.cpp" ]
 
   configs = [ ":libmmi_test_util" ]
@@ -169,8 +147,6 @@ ohos_unittest("KeyEventTest") {
     "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  defines = input_default_defines
-
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/window_utils_test.cpp",
@@ -205,8 +181,6 @@ ohos_unittest("InputManagerTest") {
     "${mmi_path}/service/filter/include",
   ]
 
-  defines = input_default_defines
-
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/system_info.cpp",
@@ -238,8 +212,6 @@ ohos_unittest("InputManagerManualTest") {
   module_out_path = module_output_path
   include_dirs = [ "//commonlibrary/c_utils/base/include" ]
 
-  defines = input_default_defines
-
   sources = [ "events/test/input_manager_manual_test.cpp" ]
 
   configs = [ ":libmmi_test_util" ]
@@ -263,8 +235,6 @@ ohos_unittest("InputManagerFilterManualTest") {
   module_out_path = module_output_path
   include_dirs = [ "//commonlibrary/c_utils/base/include" ]
 
-  defines = input_default_defines
-
   sources = [ "events/test/input_manager_filter_manual_test.cpp" ]
 
   configs = [ ":libmmi_test_util" ]
@@ -288,8 +258,6 @@ ohos_unittest("PointerEventTest") {
   module_out_path = module_output_path
   include_dirs = [ "$root_out_dir/diff_libinput_mmi/export_include" ]
 
-  defines = input_default_defines
-
   sources = [
     "${mmi_path}/test/unittest/common/src/event_util_test.cpp",
     "${mmi_path}/test/unittest/common/src/window_utils_test.cpp",
diff --git a/multimodalinput_mini.gni b/multimodalinput_mini.gni
index f843d2f016..91ba4a2243 100644
--- a/multimodalinput_mini.gni
+++ b/multimodalinput_mini.gni
@@ -34,6 +34,183 @@ declare_args() {
       defined(global_parts_info.resourceschedule_resource_schedule_service)) {
     resource_schedule_service_enabled = true
   }
+
+  uinput_inject_sources = [
+    "uinput/hdf_device_event_dispatch.cpp",
+    "uinput/hdf_device_event_manager.cpp",
+    "uinput/inject_thread.cpp",
+    "uinput/keyboard_inject.cpp",
+    "uinput/virtual_device.cpp",
+    "uinput/virtual_keyboard.cpp",
+    "uinput/virtual_touch_screen.cpp",
+  ]
+
+  libmmi_common_sources = [
+    "events/src/input_device.cpp",
+    "events/src/input_event.cpp",
+    "events/src/key_event.cpp",
+    "events/src/key_option.cpp",
+    "events/src/pointer_event.cpp",
+  ]
+
+  libmmi_client_sources = [
+    "event_handler/src/anr_handler.cpp",
+    "event_handler/src/bytrace_adapter.cpp",
+    "event_handler/src/client_msg_handler.cpp",
+    "event_handler/src/input_device_impl.cpp",
+    "event_handler/src/input_handler_manager.cpp",
+    "event_handler/src/input_manager_impl.cpp",
+    "event_handler/src/multimodal_event_handler.cpp",
+    "events/src/axis_event.cpp",
+    "events/src/input_manager.cpp",
+    "module_loader/src/mmi_client.cpp",
+    "module_loader/src/mmi_fd_listener.cpp",
+  ]
+
+  libmmi_service_sources = [
+    "//foundation/multimodalinput/input/frameworks/proxy/event_handler/src/bytrace_adapter.cpp",
+    "delegate_task/src/delegate_tasks.cpp",
+    "device_config/src/device_config_file_parser.cpp",
+    "device_manager/src/input_device_manager.cpp",
+    "dfx/src/dfx_hisysevent.cpp",
+    "event_dispatch/src/event_dispatch_handler.cpp",
+    "event_dump/src/event_dump.cpp",
+    "event_handler/src/anr_manager.cpp",
+    "event_handler/src/event_normalize_handler.cpp",
+    "event_handler/src/input_event_handler.cpp",
+    "event_handler/src/key_auto_repeat.cpp",
+    "event_handler/src/key_event_value_transformation.cpp",
+    "event_handler/src/key_map_manager.cpp",
+    "libinput_adapter/src/libinput_adapter.cpp",
+    "message_handle/src/server_msg_handler.cpp",
+    "module_loader/src/mmi_service.cpp",
+    "module_loader/src/uds_server.cpp",
+    "permission_helper/src/permission_helper.cpp",
+    "timer_manager/src/timer_manager.cpp",
+    "window_manager/src/input_display_bind_helper.cpp",
+    "window_manager/src/input_windows_manager.cpp",
+  ]
+
+  inputdevice_sources = [
+    "src/js_event_target.cpp",
+    "src/js_input_device_context.cpp",
+    "src/js_input_device_manager.cpp",
+    "src/js_util.cpp",
+    "src/native_register_module.cpp",
+  ]
+
+  inputdevicecooperate_sources = [
+    "src/js_event_target.cpp",
+    "src/js_input_device_cooperate_context.cpp",
+    "src/js_input_device_cooperate_manager.cpp",
+    "src/js_util.cpp",
+    "src/native_register_module.cpp",
+  ]
+
+  inputmonitor_sources = [
+    "src/js_input_monitor.cpp",
+    "src/js_input_monitor_manager.cpp",
+    "src/js_input_monitor_module.cpp",
+    "src/js_input_monitor_util.cpp",
+  ]
+
+  patch_gen_libinput_third_mmi_sources = [
+    root_out_dir + "/diff_libinput_mmi/src/evdev-debounce.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-fallback.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-joystick.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-middle-button.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-mt-touchpad-buttons.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-mt-touchpad-edge-scroll.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-mt-touchpad-gestures.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-mt-touchpad-tap.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-mt-touchpad-thumb.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-mt-touchpad.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-tablet-pad-leds.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-tablet-pad.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-tablet.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev-totem.c",
+    root_out_dir + "/diff_libinput_mmi/src/evdev.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-flat.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-low-dpi.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-mouse.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-tablet.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-touchpad-flat.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-touchpad-x230.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-touchpad.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter-trackpoint.c",
+    root_out_dir + "/diff_libinput_mmi/src/filter.c",
+    root_out_dir + "/diff_libinput_mmi/src/libinput-util.c",
+    root_out_dir + "/diff_libinput_mmi/src/libinput.c",
+    root_out_dir + "/diff_libinput_mmi/src/path-seat.c",
+    root_out_dir + "/diff_libinput_mmi/src/quirks.c",
+    root_out_dir + "/diff_libinput_mmi/src/timer.c",
+    root_out_dir + "/diff_libinput_mmi/src/udev-seat.c",
+    root_out_dir + "/diff_libinput_mmi/src/util-list.c",
+    root_out_dir + "/diff_libinput_mmi/src/util-prop-parsers.c",
+    root_out_dir + "/diff_libinput_mmi/src/util-ratelimit.c",
+    root_out_dir + "/diff_libinput_mmi/src/util-strings.c",
+  ]
+
+  event_injection_sources = [
+    "src/device_base.cpp",
+    "src/get_device_node.cpp",
+    "src/get_device_object.cpp",
+    "src/injection_event_dispatch.cpp",
+    "src/injection_tools_help_func.cpp",
+    "src/input_parse.cpp",
+    "src/manage_inject_device.cpp",
+    "src/processing_finger_device.cpp",
+    "src/processing_game_pad_device.cpp",
+    "src/processing_joystick_device.cpp",
+    "src/processing_keyboard_device.cpp",
+    "src/processing_mouse_device.cpp",
+    "src/processing_pad_device.cpp",
+    "src/processing_pen_device.cpp",
+    "src/processing_touch_screen_device.cpp",
+  ]
+
+  libmmi_virtual_device_sources = [
+    "src/virtual_device.cpp",
+    "src/virtual_finger.cpp",
+    "src/virtual_gamepad.cpp",
+    "src/virtual_joystick.cpp",
+    "src/virtual_keyboard.cpp",
+    "src/virtual_keyboard_consumer_ctrl.cpp",
+    "src/virtual_keyboard_ext.cpp",
+    "src/virtual_keyboard_sys_ctrl.cpp",
+    "src/virtual_knob.cpp",
+    "src/virtual_knob_consumer_ctrl.cpp",
+    "src/virtual_knob_mouse.cpp",
+    "src/virtual_knob_sys_ctrl.cpp",
+    "src/virtual_mouse.cpp",
+    "src/virtual_pen.cpp",
+    "src/virtual_pen_keyboard.cpp",
+    "src/virtual_pen_mouse.cpp",
+    "src/virtual_remote_control.cpp",
+    "src/virtual_single_finger.cpp",
+    "src/virtual_single_touchscreen.cpp",
+    "src/virtual_stylus.cpp",
+    "src/virtual_touchpad.cpp",
+    "src/virtual_touchscreen.cpp",
+    "src/virtual_trackball.cpp",
+    "src/virtual_trackpad.cpp",
+    "src/virtual_trackpad_mouse.cpp",
+    "src/virtual_trackpad_sys_ctrl.cpp",
+  ]
+
+  libmmi_util_sources = [
+    "common/src/input_event_data_transformation.cpp",
+    "common/src/klog.cpp",
+    "common/src/util.cpp",
+    "common/src/util_napi.cpp",
+    "common/src/util_napi_error.cpp",
+    "network/src/circle_stream_buffer.cpp",
+    "network/src/net_packet.cpp",
+    "network/src/stream_buffer.cpp",
+    "socket/src/uds_client.cpp",
+    "socket/src/uds_session.cpp",
+    "socket/src/uds_socket.cpp",
+  ]
 }
 
 if (input_feature_joystick) {
diff --git a/patch/diff_libinput_mmi/BUILD.gn b/patch/diff_libinput_mmi/BUILD.gn
index 35708afd30..adb6e77d6c 100644
--- a/patch/diff_libinput_mmi/BUILD.gn
+++ b/patch/diff_libinput_mmi/BUILD.gn
@@ -112,42 +112,7 @@ config("libinput-third_public_config") {
 ohos_source_set("patch_gen_libinput-third-mmi") {
   part_name = "input"
   subsystem_name = "multimodalinput"
-  sources = [
-    "$gen_dst_dir/src/evdev-debounce.c",
-    "$gen_dst_dir/src/evdev-fallback.c",
-    "$gen_dst_dir/src/evdev-joystick.c",
-    "$gen_dst_dir/src/evdev-middle-button.c",
-    "$gen_dst_dir/src/evdev-mt-touchpad-buttons.c",
-    "$gen_dst_dir/src/evdev-mt-touchpad-edge-scroll.c",
-    "$gen_dst_dir/src/evdev-mt-touchpad-gestures.c",
-    "$gen_dst_dir/src/evdev-mt-touchpad-tap.c",
-    "$gen_dst_dir/src/evdev-mt-touchpad-thumb.c",
-    "$gen_dst_dir/src/evdev-mt-touchpad.c",
-    "$gen_dst_dir/src/evdev-tablet-pad-leds.c",
-    "$gen_dst_dir/src/evdev-tablet-pad.c",
-    "$gen_dst_dir/src/evdev-tablet.c",
-    "$gen_dst_dir/src/evdev-totem.c",
-    "$gen_dst_dir/src/evdev.c",
-    "$gen_dst_dir/src/filter-flat.c",
-    "$gen_dst_dir/src/filter-low-dpi.c",
-    "$gen_dst_dir/src/filter-mouse.c",
-    "$gen_dst_dir/src/filter-tablet.c",
-    "$gen_dst_dir/src/filter-touchpad-flat.c",
-    "$gen_dst_dir/src/filter-touchpad-x230.c",
-    "$gen_dst_dir/src/filter-touchpad.c",
-    "$gen_dst_dir/src/filter-trackpoint.c",
-    "$gen_dst_dir/src/filter.c",
-    "$gen_dst_dir/src/libinput-util.c",
-    "$gen_dst_dir/src/libinput.c",
-    "$gen_dst_dir/src/path-seat.c",
-    "$gen_dst_dir/src/quirks.c",
-    "$gen_dst_dir/src/timer.c",
-    "$gen_dst_dir/src/udev-seat.c",
-    "$gen_dst_dir/src/util-list.c",
-    "$gen_dst_dir/src/util-prop-parsers.c",
-    "$gen_dst_dir/src/util-ratelimit.c",
-    "$gen_dst_dir/src/util-strings.c",
-  ]
+  sources = patch_gen_libinput_third_mmi_sources
 
   configs = [ ":libinput-third_config" ]
 
diff --git a/service/BUILD.gn b/service/BUILD.gn
index 7e920fea81..307284485d 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -14,6 +14,8 @@
 import("//build/ohos.gni")
 import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
 
+defines = input_default_defines
+
 mmi_service_path = "${mmi_path}/service"
 
 ohos_prebuilt_etc("mmi_device_config.ini") {
@@ -63,8 +65,6 @@ config("libmmi_server_config") {
     "//third_party/cJSON",
   ]
 
-  defines = input_default_defines
-
   if (input_feature_combination_key) {
     defines += [ "OHOS_BUILD_ENABLE_COMBINATION_KEY" ]
   }
@@ -83,29 +83,8 @@ config("libmmi_server_config") {
 }
 
 ohos_shared_library("libmmi-server") {
-  sources = [
-    "//foundation/multimodalinput/input/frameworks/proxy/event_handler/src/bytrace_adapter.cpp",
-    "delegate_task/src/delegate_tasks.cpp",
-    "device_config/src/device_config_file_parser.cpp",
-    "device_manager/src/input_device_manager.cpp",
-    "dfx/src/dfx_hisysevent.cpp",
-    "event_dispatch/src/event_dispatch_handler.cpp",
-    "event_dump/src/event_dump.cpp",
-    "event_handler/src/anr_manager.cpp",
-    "event_handler/src/event_normalize_handler.cpp",
-    "event_handler/src/input_event_handler.cpp",
-    "event_handler/src/key_auto_repeat.cpp",
-    "event_handler/src/key_event_value_transformation.cpp",
-    "event_handler/src/key_map_manager.cpp",
-    "libinput_adapter/src/libinput_adapter.cpp",
-    "message_handle/src/server_msg_handler.cpp",
-    "module_loader/src/mmi_service.cpp",
-    "module_loader/src/uds_server.cpp",
-    "permission_helper/src/permission_helper.cpp",
-    "timer_manager/src/timer_manager.cpp",
-    "window_manager/src/input_display_bind_helper.cpp",
-    "window_manager/src/input_windows_manager.cpp",
-  ]
+
+  sources = libmmi_service_sources
 
   if (input_feature_input_cooperation) {
     sources += [
@@ -270,8 +249,6 @@ ohos_unittest("ut-mmi-service-out") {
     "window_manager/test/input_windows_manager_test.cpp",
   ]
 
-  defines = input_default_defines
-
   configs = [ ":libmmi_server_config" ]
 
   deps = [
@@ -299,8 +276,6 @@ ohos_unittest("TransformPointTest") {
 
   sources = [ "touch_event_normalize/test/transform_point_test.cpp" ]
 
-  defines = input_default_defines
-
   deps = [
     "${mmi_path}/tools/vuinput:libmmi-virtual-device",
     "//third_party/googletest:gmock_main",
diff --git a/tools/event_inject/BUILD.gn b/tools/event_inject/BUILD.gn
index 38b43e63e8..62f53d354d 100644
--- a/tools/event_inject/BUILD.gn
+++ b/tools/event_inject/BUILD.gn
@@ -38,23 +38,7 @@ config("event_injection_public_config") {
 }
 
 ohos_source_set("event-injection") {
-  sources = [
-    "src/device_base.cpp",
-    "src/get_device_node.cpp",
-    "src/get_device_object.cpp",
-    "src/injection_event_dispatch.cpp",
-    "src/injection_tools_help_func.cpp",
-    "src/input_parse.cpp",
-    "src/manage_inject_device.cpp",
-    "src/processing_finger_device.cpp",
-    "src/processing_game_pad_device.cpp",
-    "src/processing_joystick_device.cpp",
-    "src/processing_keyboard_device.cpp",
-    "src/processing_mouse_device.cpp",
-    "src/processing_pad_device.cpp",
-    "src/processing_pen_device.cpp",
-    "src/processing_touch_screen_device.cpp",
-  ]
+  sources = event_injection_sources
 
   configs = [
     ":event_injection_config",
diff --git a/tools/vuinput/BUILD.gn b/tools/vuinput/BUILD.gn
index 7d1b6f0588..e5c2db31eb 100644
--- a/tools/vuinput/BUILD.gn
+++ b/tools/vuinput/BUILD.gn
@@ -33,34 +33,7 @@ config("virtual_device_public_config") {
 }
 
 ohos_source_set("libmmi-virtual-device") {
-  sources = [
-    "src/virtual_device.cpp",
-    "src/virtual_finger.cpp",
-    "src/virtual_gamepad.cpp",
-    "src/virtual_joystick.cpp",
-    "src/virtual_keyboard.cpp",
-    "src/virtual_keyboard_consumer_ctrl.cpp",
-    "src/virtual_keyboard_ext.cpp",
-    "src/virtual_keyboard_sys_ctrl.cpp",
-    "src/virtual_knob.cpp",
-    "src/virtual_knob_consumer_ctrl.cpp",
-    "src/virtual_knob_mouse.cpp",
-    "src/virtual_knob_sys_ctrl.cpp",
-    "src/virtual_mouse.cpp",
-    "src/virtual_pen.cpp",
-    "src/virtual_pen_keyboard.cpp",
-    "src/virtual_pen_mouse.cpp",
-    "src/virtual_remote_control.cpp",
-    "src/virtual_single_finger.cpp",
-    "src/virtual_single_touchscreen.cpp",
-    "src/virtual_stylus.cpp",
-    "src/virtual_touchpad.cpp",
-    "src/virtual_touchscreen.cpp",
-    "src/virtual_trackball.cpp",
-    "src/virtual_trackpad.cpp",
-    "src/virtual_trackpad_mouse.cpp",
-    "src/virtual_trackpad_sys_ctrl.cpp",
-  ]
+  sources = libmmi_virtual_device_sources
 
   configs = [ ":libmmi_virtual_device_config" ]
 
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 35702256a8..68daed33af 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -15,7 +15,10 @@ import("//build/ohos.gni")
 import("//build/test.gni")
 import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
 
+defines = input_default_defines
+
 module_output_path = "multimodalinput/unit_out"
+
 config("libmmi_util_public_config") {
   include_dirs = [
     "common/include",
@@ -24,29 +27,12 @@ config("libmmi_util_public_config") {
     "//foundation/multimodalinput/input/interfaces/native/innerkits/common/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
   ]
-
-  defines = input_default_defines
 }
 
 ohos_shared_library("libmmi-util") {
-  sources = [
-    "common/src/input_event_data_transformation.cpp",
-    "common/src/klog.cpp",
-    "common/src/util.cpp",
-    "common/src/util_napi.cpp",
-    "common/src/util_napi_error.cpp",
-    "network/src/circle_stream_buffer.cpp",
-    "network/src/net_packet.cpp",
-    "network/src/stream_buffer.cpp",
-    "socket/src/uds_client.cpp",
-    "socket/src/uds_session.cpp",
-    "socket/src/uds_socket.cpp",
-  ]
+  sources = libmmi_util_sources
 
-  configs = [
-    "//foundation/multimodalinput/input:multimodalinput_mmi_public_config",
-    ":libmmi_util_public_config",
-  ]
+  configs = [ ":libmmi_util_public_config" ]
 
   public_deps = [
     "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
@@ -85,8 +71,6 @@ ohos_unittest("ut-mmi-util-out") {
     "$root_out_dir/diff_libinput_mmi/export_include",
   ]
 
-  defines = input_default_defines
-
   sources = [
     "network/test/net_packet_test.cpp",
     "socket/test/stream_buffer_test.cpp",
-- 
Gitee


From d8f917dafac818c6982c02dc07acd7d95275ede6 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 27 Dec 2022 18:10:35 +0800
Subject: [PATCH 289/360] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8D=95=E8=8E=B7?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=94=B9=E6=88=90=E5=A7=94=E6=89=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/module_loader/src/mmi_service.cpp                   | 6 ++++--
 .../mouse_event_normalize/src/mouse_transform_processor.cpp | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 935a40b10d..645a45d71c 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -1312,11 +1312,13 @@ int32_t MMIService::OnGetInputDeviceCooperateState(int32_t pid, int32_t userData
 int32_t MMIService::SetMouseCaptureMode(int32_t windowId, bool isCaptureMode)
 {
     CALL_DEBUG_ENTER;
-    int32_t ret = WinMgr->SetMouseCaptureMode(windowId, isCaptureMode);
+    int32_t ret = delegateTasks_.PostSyncTask(
+        std::bind(&InputWindowsManager::SetMouseCaptureMode, WinMgr, windowId, isCaptureMode));
     if (ret != RET_OK) {
         MMI_HILOGE("Set capture failed,return %{public}d", ret);
+        return RET_ERR;
     }
-    return ret;
+    return RET_OK;
 }
 
 int32_t MMIService::OnGetWindowPid(int32_t windowId, int32_t &windowPid)
diff --git a/service/mouse_event_normalize/src/mouse_transform_processor.cpp b/service/mouse_event_normalize/src/mouse_transform_processor.cpp
index cc9f0c024b..a57b48216d 100644
--- a/service/mouse_event_normalize/src/mouse_transform_processor.cpp
+++ b/service/mouse_event_normalize/src/mouse_transform_processor.cpp
@@ -115,8 +115,10 @@ int32_t MouseTransformProcessor::HandleMotionAccelerate(struct libinput_event_po
     MMI_HILOGD("Get and process the movement coordinates, dx:%{public}lf, dy:%{public}lf,"
                "correctionX:%{public}lf, correctionY:%{public}lf, gain:%{public}lf",
                dx, dy, correctionX, correctionY, gain);
-    absolutionX_ += correctionX;
-    absolutionY_ += correctionY;
+    if (!WinMgr->GetMouseIsCaptureMode()) {
+        absolutionX_ += correctionX;
+        absolutionY_ += correctionY;
+    }
     return RET_OK;
 }
 
-- 
Gitee


From 6707e3ba278a3d90583431d0ac0d96e3af5ac35c Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Wed, 28 Dec 2022 01:53:51 +0000
Subject: [PATCH 290/360] Signed-off-by: mayunteng_1 <mayunteng@huawei.com>

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: I45225af360036379e76b322953eaa7e5ba301323
---
 multimodalinput_mini.gni | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/multimodalinput_mini.gni b/multimodalinput_mini.gni
index 91ba4a2243..04755ae59d 100644
--- a/multimodalinput_mini.gni
+++ b/multimodalinput_mini.gni
@@ -68,7 +68,7 @@ declare_args() {
   ]
 
   libmmi_service_sources = [
-    "//foundation/multimodalinput/input/frameworks/proxy/event_handler/src/bytrace_adapter.cpp",
+    "$mmi_path/frameworks/proxy/event_handler/src/bytrace_adapter.cpp",
     "delegate_task/src/delegate_tasks.cpp",
     "device_config/src/device_config_file_parser.cpp",
     "device_manager/src/input_device_manager.cpp",
-- 
Gitee


From a0376bad9b9cf50c79358bce9c08533f4d9d1584 Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Wed, 28 Dec 2022 02:00:20 +0000
Subject: [PATCH 291/360] Signed-off-by: mayunteng_1 <mayunteng@huawei.com>

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: Ia8d4ac6a046bf47a56e0001e73c48067fe7b080b
---
 multimodalinput_mini.gni | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 multimodalinput_mini.gni

diff --git a/multimodalinput_mini.gni b/multimodalinput_mini.gni
old mode 100755
new mode 100644
-- 
Gitee


From 94d66e083b9aa79c0b2e4fa52aa265553a073900 Mon Sep 17 00:00:00 2001
From: mayunteng <mayunteng@huawei.com>
Date: Wed, 28 Dec 2022 02:14:49 +0000
Subject: [PATCH 292/360] Signed-off-by: mayunteng_1 <mayunteng@huawei.com>

Signed-off-by: mayunteng <mayunteng@huawei.com>
Change-Id: Id018c5b9525a9fc4f63d9c62f7c3687c7ba0432a
---
 service/BUILD.gn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/service/BUILD.gn b/service/BUILD.gn
index 307284485d..92bc13c16d 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -83,7 +83,6 @@ config("libmmi_server_config") {
 }
 
 ohos_shared_library("libmmi-server") {
-
   sources = libmmi_service_sources
 
   if (input_feature_input_cooperation) {
-- 
Gitee


From 3fd7a2bd0c68a590b5feb1a6fdd291ee4473fde0 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 28 Dec 2022 10:50:42 +0000
Subject: [PATCH 293/360] Rectify the problem that code synchronization in the
 yellow zone fails

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I44021e3ab87fe2037b30f8eb0b9b3dfc6e85df52
---
 frameworks/napi/input_device_cooperate/BUILD.gn             | 6 +++++-
 .../src/input_device_cooperate_sm.cpp                       | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/frameworks/napi/input_device_cooperate/BUILD.gn b/frameworks/napi/input_device_cooperate/BUILD.gn
index 2adaaed82b..23a60e7ef2 100755
--- a/frameworks/napi/input_device_cooperate/BUILD.gn
+++ b/frameworks/napi/input_device_cooperate/BUILD.gn
@@ -28,7 +28,11 @@ ohos_shared_library("inputdevicecooperate") {
     "src/native_register_module.cpp",
   ]
 
-  configs = [ ":inputdevicecooperate_config" ]
+  configs = [
+    ":inputdevicecooperate_config",
+    "//foundation/multimodalinput/input/util:libmmi_util_public_config",
+    "//foundation/multimodalinput/input/service/filter:mmi_event_filter_config",
+  ]
 
   deps = [
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index b59402ea18..e9d0798070 100644
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -32,6 +32,7 @@
 #include "input_device_cooperate_state_out.h"
 #include "input_device_cooperate_util.h"
 #include "input_device_manager.h"
+#include "input_windows_manager.h"
 #include "mouse_event_normalize.h"
 #include "timer_manager.h"
 #include "util_ex.h"
-- 
Gitee


From 14bc430875bf4bb1b1f8302dab53b449e7c751d7 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 29 Dec 2022 07:29:44 +0000
Subject: [PATCH 294/360] =?UTF-8?q?=E4=BF=AE=E6=94=B964=E4=BD=8D=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 frameworks/proxy/event_handler/src/input_manager_impl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 8b91353826..da560482c2 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -718,7 +718,7 @@ void InputManagerImpl::ReAddInputEventFilter()
         int32_t ret = MultimodalInputConnMgr->AddInputEventFilter(service, filterId, priority, deviceTags);
         if (ret != RET_OK) {
             MMI_HILOGE("AddInputEventFilter has send to server failed, filterId:%{public}d, priority:%{public}d,"
-                "deviceTags:%{public}zu, ret:%{public}d", filterId, priority, deviceTags, ret);
+                "deviceTags:%{public}u, ret:%{public}d", filterId, priority, deviceTags, ret);
         }
     }
 }
-- 
Gitee


From a0f3f473fb34feeade081db58265af072d4b649a Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 29 Dec 2022 16:20:19 +0800
Subject: [PATCH 295/360] Key-mouse crossing decoupling

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I011576996be102efa971e1566499961505ab013a
---
 .../event_handler/src/input_event_handler.cpp |  6 ++++-
 .../include/input_device_cooperate_sm.h       |  8 ++++--
 .../src/input_device_cooperate_sm.cpp         | 26 +++++++++++++++++--
 service/module_loader/src/mmi_service.cpp     |  4 +--
 .../include/pointer_drawing_manager.h         |  2 +-
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/service/event_handler/src/input_event_handler.cpp b/service/event_handler/src/input_event_handler.cpp
index 3ccec66910..06b980a2ef 100644
--- a/service/event_handler/src/input_event_handler.cpp
+++ b/service/event_handler/src/input_event_handler.cpp
@@ -69,7 +69,11 @@ void InputEventHandler::OnEvent(void *event)
                "beginTime:%{public}" PRId64, idSeed_, GetThisThreadId(), eventType, beginTime);
     CHKPV(eventNormalizeHandler_);
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
-    InputDevCooSM->HandleEvent(lpEvent);
+    if (InputDevCooSM->GetCooperateEnableState()) {
+        InputDevCooSM->HandleEvent(lpEvent);
+    } else {
+        eventNormalizeHandler_->HandleEvent(lpEvent);
+    }
 #else
     eventNormalizeHandler_->HandleEvent(lpEvent);
 #endif // OHOS_BUILD_ENABLE_COOPERATE
diff --git a/service/input_device_cooperate/include/input_device_cooperate_sm.h b/service/input_device_cooperate/include/input_device_cooperate_sm.h
index 1a81846bdf..f1277a991f 100755
--- a/service/input_device_cooperate/include/input_device_cooperate_sm.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_sm.h
@@ -63,8 +63,8 @@ class InputDeviceCooperateSM final {
 public:
     using DelegateTasksCallback = std::function<int32_t(std::function<int32_t()>)>;
     DISALLOW_COPY_AND_MOVE(InputDeviceCooperateSM);
-    void Init(DelegateTasksCallback delegateTasksCallback);
-    void EnableInputDeviceCooperate(bool enabled);
+    void Init(DelegateTasksCallback delegateTasksCallback, UDSServer &udsServer);
+    void EnableInputDeviceCooperate(bool enabled, int32_t pid);
     int32_t StartInputDeviceCooperate(const std::string &remoteNetworkId, int32_t startInputDeviceId);
     int32_t StopInputDeviceCooperate();
     void GetCooperateState(const std::string &deviceId);
@@ -91,8 +91,10 @@ public:
     bool IsStopping() const;
     void Reset(const std::string &networkId);
     void Dump(int32_t fd, const std::vector<std::string> &args);
+    bool GetCooperateEnableState() const;
 
 private:
+    void OnSessionLost(SessionPtr session);
     void Reset(bool adjustAbsolutionLocation = false);
     void CheckPointerEvent(struct libinput_event *event);
     void OnCloseCooperation(const std::string &networkId, bool isLocal);
@@ -113,6 +115,8 @@ private:
     std::atomic<bool> isStopping_ { false };
     std::pair<int32_t, int32_t> mouseLocation_ { std::make_pair(0, 0) };
     DelegateTasksCallback delegateTasksCallback_ { nullptr };
+    bool isEnable_ { false };
+    int32_t pid_ { -1 };
 };
 
 #define DisHardware DistributedHardware::DeviceManager::GetInstance()
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index e9d0798070..908facda7f 100644
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -50,11 +50,14 @@ constexpr int32_t MOUSE_ABS_LOCATION_Y = 50;
 InputDeviceCooperateSM::InputDeviceCooperateSM() {}
 InputDeviceCooperateSM::~InputDeviceCooperateSM() {}
 
-void InputDeviceCooperateSM::Init(DelegateTasksCallback delegateTasksCallback)
+void InputDeviceCooperateSM::Init(DelegateTasksCallback delegateTasksCallback, UDSServer &udsServer)
 {
+    CALL_INFO_TRACE;
     CHKPL(delegateTasksCallback);
     delegateTasksCallback_ = delegateTasksCallback;
     preparedNetworkId_ = std::make_pair("", "");
+    udsServer.AddSessionDeletedCallback(std::bind(
+        &InputDeviceCooperateSM::OnSessionLost, this, std::placeholders::_1));
     currentStateSM_ = std::make_shared<InputDeviceCooperateStateFree>();
     DevCooperateSoftbusAdapter->Init();
     TimerMgr->AddTimer(INTERVAL_MS, 1, [this]() {
@@ -62,6 +65,18 @@ void InputDeviceCooperateSM::Init(DelegateTasksCallback delegateTasksCallback)
     });
 }
 
+void InputDeviceCooperateSM::OnSessionLost(SessionPtr session)
+{
+    CALL_INFO_TRACE;
+    CHKPV(session);
+    int32_t pid = session->GetPid();
+    MMI_HILOGD("pid:%{public}d, pid_:%{public}d", pid, pid_);
+    if (pid == pid_) {
+        isEnable_ = false;
+        pid_ = -1;
+    }
+}
+
 void InputDeviceCooperateSM::Reset(const std::string &networkId)
 {
     CALL_INFO_TRACE;
@@ -149,7 +164,12 @@ void InputDeviceCooperateSM::GetCooperateState(const std::string &deviceId)
     CooperateEventMgr->OnGetState(state);
 }
 
-void InputDeviceCooperateSM::EnableInputDeviceCooperate(bool enabled)
+bool InputDeviceCooperateSM::GetCooperateEnableState() const
+{
+    return isEnable_;
+}
+
+void InputDeviceCooperateSM::EnableInputDeviceCooperate(bool enabled, int32_t pid)
 {
     CALL_INFO_TRACE;
     if (enabled) {
@@ -161,6 +181,8 @@ void InputDeviceCooperateSM::EnableInputDeviceCooperate(bool enabled)
         std::string localNetworkId = GetLocalDeviceId();
         OnCloseCooperation(localNetworkId, true);
     }
+    isEnable_ = enabled;
+    pid_ = pid;
 }
 
 int32_t InputDeviceCooperateSM::StartInputDeviceCooperate(
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 1cfd67fc73..91aa6dae60 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -262,7 +262,7 @@ int32_t MMIService::Init()
      * PostAsyncTask is used here to prevent InputDeviceCooperateSM:: StartRemoteCooperate() and
      * CheckPointerEvent() from holding locks, resulting in deadlocks
      */
-    InputDevCooSM->Init(std::bind(&DelegateTasks::PostAsyncTask, &delegateTasks_, std::placeholders::_1));
+    InputDevCooSM->Init(std::bind(&DelegateTasks::PostAsyncTask, &delegateTasks_, std::placeholders::_1), *this);
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     MMI_HILOGD("Input msg handler init");
     InputHandler->Init(*this);
@@ -1231,7 +1231,7 @@ int32_t MMIService::OnUnregisterCooperateListener(int32_t pid)
 int32_t MMIService::OnEnableInputDeviceCooperate(int32_t pid, int32_t userData, bool enabled)
 {
     CALL_DEBUG_ENTER;
-    InputDevCooSM->EnableInputDeviceCooperate(enabled);
+    InputDevCooSM->EnableInputDeviceCooperate(enabled, pid);
     std::string deviceId =  "";
     CooperationMessage msg =
         enabled ? CooperationMessage::OPEN_SUCCESS : CooperationMessage::CLOSE_SUCCESS;
diff --git a/service/window_manager/include/pointer_drawing_manager.h b/service/window_manager/include/pointer_drawing_manager.h
index 0b3bc83bb3..c7823729c5 100644
--- a/service/window_manager/include/pointer_drawing_manager.h
+++ b/service/window_manager/include/pointer_drawing_manager.h
@@ -85,7 +85,7 @@ private:
     bool hasPointerDevice_ { false };
     int32_t lastPhysicalX_ { -1 };
     int32_t lastPhysicalY_ { -1 };
-    int32_t lastMouseStyle_ { -1 };
+    int32_t lastMouseStyle_ { 0 };
     int32_t pid_ { 0 };
     int32_t windowId_ { 0 };
     int32_t imageWidth_ { 0 };
-- 
Gitee


From 54bd853bc2e48ab27338e92fa50cd0f79023a824 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 30 Dec 2022 01:22:09 +0000
Subject: [PATCH 296/360] mod innerrkit GetPointerStyle

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I6016bee74c3bca030f35359d63a61c55366919bd
---
 .../napi/pointer/include/js_pointer_manager.h |  1 +
 .../napi/pointer/src/js_pointer_manager.cpp   |  8 ++-
 .../include/input_manager_impl.h              |  5 +-
 .../event_handler/src/input_manager_impl.cpp  |  6 +-
 frameworks/proxy/events/src/input_manager.cpp |  4 +-
 .../innerkits/event/include/pointer_style.h   | 35 +++++++++++
 .../innerkits/proxy/include/input_manager.h   | 59 ++++++++++++++++++-
 .../include/i_multimodal_input_connect.h      |  5 +-
 .../multimodal_input_connect_manager.h        |  4 +-
 .../include/multimodal_input_connect_proxy.h  |  4 +-
 .../src/multimodal_input_connect_manager.cpp  |  4 +-
 .../src/multimodal_input_connect_proxy.cpp    | 16 +++--
 .../src/multimodal_input_connect_stub.cpp     | 20 +++++--
 service/module_loader/include/mmi_service.h   |  4 +-
 service/module_loader/src/mmi_service.cpp     |  4 +-
 .../include/i_pointer_drawing_manager.h       |  5 +-
 .../include/input_windows_manager.h           |  7 ++-
 .../include/pointer_drawing_manager.h         |  6 +-
 .../src/input_windows_manager.cpp             | 23 ++++----
 .../src/pointer_drawing_manager.cpp           | 50 ++++++++--------
 util/common/include/define_multimodal.h       | 16 +++++
 21 files changed, 209 insertions(+), 77 deletions(-)
 create mode 100644 interfaces/native/innerkits/event/include/pointer_style.h

diff --git a/frameworks/napi/pointer/include/js_pointer_manager.h b/frameworks/napi/pointer/include/js_pointer_manager.h
index 1f36e1a066..49632cb985 100644
--- a/frameworks/napi/pointer/include/js_pointer_manager.h
+++ b/frameworks/napi/pointer/include/js_pointer_manager.h
@@ -27,6 +27,7 @@
 #include "define_multimodal.h"
 #include "error_multimodal.h"
 #include "input_manager.h"
+#include "pointer_style.h"
 #include "stream_buffer.h"
 #include "util_napi.h"
 #include "util_napi_error.h"
diff --git a/frameworks/napi/pointer/src/js_pointer_manager.cpp b/frameworks/napi/pointer/src/js_pointer_manager.cpp
index 6bab563fca..7a58266548 100644
--- a/frameworks/napi/pointer/src/js_pointer_manager.cpp
+++ b/frameworks/napi/pointer/src/js_pointer_manager.cpp
@@ -223,7 +223,9 @@ napi_value JsPointerManager::SetPointerStyle(napi_env env, int32_t windowid, int
     CALL_DEBUG_ENTER;
     sptr<AsyncContext> asyncContext = new (std::nothrow) AsyncContext(env);
     CHKPP(asyncContext);
-    asyncContext->errorCode = InputManager::GetInstance()->SetPointerStyle(windowid, pointerStyle);
+    PointerStyle style;
+    style.id = pointerStyle;
+    asyncContext->errorCode = InputManager::GetInstance()->SetPointerStyle(windowid, style);
     asyncContext->reserve << ReturnType::VOID;
 
     napi_value promise = nullptr;
@@ -242,9 +244,9 @@ napi_value JsPointerManager::GetPointerStyle(napi_env env, int32_t windowid, nap
     CALL_DEBUG_ENTER;
     sptr<AsyncContext> asyncContext = new (std::nothrow) AsyncContext(env);
     CHKPP(asyncContext);
-    int32_t pointerStyle = 0;
+    PointerStyle pointerStyle;
     asyncContext->errorCode = InputManager::GetInstance()->GetPointerStyle(windowid, pointerStyle);
-    asyncContext->reserve << ReturnType::NUMBER << pointerStyle;
+    asyncContext->reserve << ReturnType::NUMBER << pointerStyle.id;
     napi_value promise = nullptr;
     if (handle != nullptr) {
         CHKRP(napi_create_reference(env, handle, 1, &asyncContext->callback), CREATE_REFERENCE);
diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index 18cadbcf04..8b44b193f5 100644
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -38,6 +38,7 @@
 #include "i_anr_observer.h"
 #include "key_option.h"
 #include "pointer_event.h"
+#include "pointer_style.h"
 
 namespace OHOS {
 namespace MMI {
@@ -100,8 +101,8 @@ public:
 
     int32_t SetPointerVisible(bool visible);
     bool IsPointerVisible();
-    int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle);
-    int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle);
+    int32_t SetPointerStyle(int32_t windowId, PointerStyle pointerStyle);
+    int32_t GetPointerStyle(int32_t windowId, PointerStyle &pointerStyle);
 
     int32_t SetPointerSpeed(int32_t speed);
     int32_t GetPointerSpeed(int32_t &speed);
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index da560482c2..412d72274b 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -643,10 +643,10 @@ int32_t InputManagerImpl::GetPointerSpeed(int32_t &speed)
 #endif // OHOS_BUILD_ENABLE_POINTER
 }
 
-int32_t InputManagerImpl::SetPointerStyle(int32_t windowId, int32_t pointerStyle)
+int32_t InputManagerImpl::SetPointerStyle(int32_t windowId, PointerStyle pointerStyle)
 {
     CALL_DEBUG_ENTER;
-    if (windowId < 0 || pointerStyle < 0) {
+    if (windowId < 0 || pointerStyle.id < 0) {
         MMI_HILOGE("The param is invalid");
         return RET_ERR;
     }
@@ -658,7 +658,7 @@ int32_t InputManagerImpl::SetPointerStyle(int32_t windowId, int32_t pointerStyle
     return RET_OK;
 }
 
-int32_t InputManagerImpl::GetPointerStyle(int32_t windowId, int32_t &pointerStyle)
+int32_t InputManagerImpl::GetPointerStyle(int32_t windowId, PointerStyle &pointerStyle)
 {
     CALL_DEBUG_ENTER;
     if (windowId < 0) {
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index 4fc3ee9b9a..b68f30c72b 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -204,12 +204,12 @@ void InputManager::SetAnrObserver(std::shared_ptr<IAnrObserver> observer)
     InputMgrImpl.SetAnrObserver(observer);
 }
 
-int32_t InputManager::SetPointerStyle(int32_t windowId, int32_t pointerStyle)
+int32_t InputManager::SetPointerStyle(int32_t windowId, PointerStyle pointerStyle)
 {
     return InputMgrImpl.SetPointerStyle(windowId, pointerStyle);
 }
 
-int32_t InputManager::GetPointerStyle(int32_t windowId, int32_t &pointerStyle)
+int32_t InputManager::GetPointerStyle(int32_t windowId, PointerStyle &pointerStyle)
 {
     return InputMgrImpl.GetPointerStyle(windowId, pointerStyle);
 }
diff --git a/interfaces/native/innerkits/event/include/pointer_style.h b/interfaces/native/innerkits/event/include/pointer_style.h
new file mode 100644
index 0000000000..d095f123f9
--- /dev/null
+++ b/interfaces/native/innerkits/event/include/pointer_style.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021-2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef POINTER_STYLE_H
+#define POINTER_STYLE_H
+#include <iostream>
+
+namespace OHOS {
+namespace MMI {
+struct PointerStyleColor {
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+};
+
+struct PointerStyle {
+    int32_t size { -1 };
+    PointerStyleColor color { 0 };
+    int32_t id { -1 };
+};
+} // namespace MMI
+} // namespace OHOS
+#endif // POINTER_STYLE_H
\ No newline at end of file
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index d69484a5b6..a7ade0be13 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -32,6 +32,7 @@
 #include "i_input_event_filter.h"
 #include "input_device.h"
 #include "key_option.h"
+#include "pointer_style.h"
 #include "window_info.h"
 
 namespace OHOS {
@@ -270,7 +271,7 @@ public:
      * @return Returns <b>0</b> if the operation is successful; returns an error code otherwise.
      * @since 9
      */
-    int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle);
+    int32_t SetPointerStyle(int32_t windowId, PointerStyle pointerStyle);
 
     /**
      * @brief Obtains the mouse pointer style.
@@ -279,7 +280,7 @@ public:
      * @return Returns <b>0</b> if the operation is successful; returns an error code otherwise.
      * @since 9
      */
-    int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle);
+    int32_t GetPointerStyle(int32_t windowId, PointerStyle &pointerStyle);
 
     /**
      * @brief Sets the mouse pointer speed, which ranges from 1 to 11.
@@ -322,6 +323,59 @@ public:
      */
     int32_t SetInputDevice(const std::string &dhid, const std::string &screenId);
 
+    /**
+     * @brief Registers a listener for screen hopping events of the mouse pointer.
+     * @param listener Indicates the listener for screen hopping events of the mouse pointer.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
+     * @since 9
+     */
+    int32_t RegisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener);
+
+    /**
+     * @brief Unregisters the listener for screen hopping events of the mouse pointer.
+     * @param listener Indicates the listener for screen hopping events of the mouse pointer.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
+     * @since 9
+     */
+    int32_t UnregisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener = nullptr);
+
+    /**
+     * @brief Enables or disables screen hopping for the mouse pointer.
+     * @param enabled Indicates whether to enable or disable screen hopping for the mouse pointer.
+     * @param callback Indicates the callback used to receive the result of enabling or disabling screen hopping.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
+     * @since 9
+     */
+    int32_t EnableInputDeviceCooperate(bool enabled, std::function<void(std::string, CooperationMessage)> callback);
+
+    /**
+     * @brief Starts screen hopping for the mouse pointer.
+     * @param sinkDeviceId Indicates the descriptor of the target input device (network ID) for screen hopping.
+     * @param srcInputDeviceId Indicates the ID of the source input device (device ID handle) for screen hopping.
+     * @param callback Indicates the callback used to receive the result of starting screen hopping.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
+     * @since 9
+     */
+    int32_t StartInputDeviceCooperate(const std::string &sinkDeviceId, int32_t srcInputDeviceId,
+        std::function<void(std::string, CooperationMessage)> callback);
+
+    /**
+     * @brief Stops screen hopping for the mouse pointer.
+     * @param callback Indicates the callback used to receive the result of stopping screen hopping.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
+     * @since 9
+     */
+    int32_t StopDeviceCooperate(std::function<void(std::string, CooperationMessage)> callback);
+
+    /**
+     * @brief Obtains the screen hopping status of a mouse pointer.
+     * @param deviceId Indicates the descriptor of the input device.
+     * @param callback Indicates the callback used to receive the screen hopping status.
+     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
+     * @since 9
+     */
+    int32_t GetInputDeviceCooperateState(const std::string &deviceId, std::function<void(bool)> callback);
+
     /**
      * @brief Obtains the enablement status of the specified function key on the keyboard.
      * @param funcKey Indicates the function key. Currently, the following function keys are supported:
@@ -376,4 +430,5 @@ private:
 };
 } // namespace MMI
 } // namespace OHOS
+#define InputMgr OHOS::MMI::InputManager::GetInstance()
 #endif // INPUT_MANAGER_H
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
index cb29e96953..a2aa8a4a3f 100644
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -25,6 +25,7 @@
 #include "key_event.h"
 #include "key_option.h"
 #include "pointer_event.h"
+#include "pointer_style.h"
 #include "system_ability_definition.h"
 #include "window_info.h"
 
@@ -91,8 +92,8 @@ public:
     virtual int32_t MarkProcessed(int32_t eventType, int32_t eventId) = 0;
     virtual int32_t SetPointerSpeed(int32_t speed) = 0;
     virtual int32_t GetPointerSpeed(int32_t &speed) = 0;
-    virtual int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle) = 0;
-    virtual int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle) = 0;
+    virtual int32_t SetPointerStyle(int32_t windowId, PointerStyle pointerStyle) = 0;
+    virtual int32_t GetPointerStyle(int32_t windowId, PointerStyle &pointerStyle) = 0;
     virtual int32_t SupportKeys(int32_t deviceId, std::vector<int32_t> &keys, std::vector<bool> &keystroke) = 0;
     virtual int32_t GetDeviceIds(std::vector<int32_t> &ids) = 0;
     virtual int32_t GetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice) = 0;
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
index d23cc29719..6cc62f5529 100644
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -46,8 +46,8 @@ public:
     int32_t MarkProcessed(int32_t eventType, int32_t eventId);
     int32_t SetPointerSpeed(int32_t speed);
     int32_t GetPointerSpeed(int32_t &speed);
-    int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle);
-    int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle);
+    int32_t SetPointerStyle(int32_t windowId, PointerStyle pointerStyle);
+    int32_t GetPointerStyle(int32_t windowId, PointerStyle &pointerStyle);
     int32_t SupportKeys(int32_t deviceId, std::vector<int32_t> &keys, std::vector<bool> &keystroke);
     int32_t GetDeviceIds(std::vector<int32_t> &ids);
     int32_t GetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice);
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
index b3ed55be6c..cdf27289f7 100644
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -40,8 +40,8 @@ public:
     int32_t MarkProcessed(int32_t eventType, int32_t eventId) override;
     int32_t SetPointerSpeed(int32_t speed) override;
     int32_t GetPointerSpeed(int32_t &speed) override;
-    int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle) override;
-    int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle) override;
+    int32_t SetPointerStyle(int32_t windowId, PointerStyle pointerStyle) override;
+    int32_t GetPointerStyle(int32_t windowId, PointerStyle &pointerStyle) override;
     int32_t SupportKeys(int32_t deviceId, std::vector<int32_t> &keys, std::vector<bool> &keystroke) override;
     int32_t GetDeviceIds(std::vector<int32_t> &ids) override;
     int32_t GetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice) override;
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
index 23ddd5ecb6..470845f5ed 100644
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -154,13 +154,13 @@ int32_t MultimodalInputConnectManager::GetPointerSpeed(int32_t &speed)
     return multimodalInputConnectService_->GetPointerSpeed(speed);
 }
 
-int32_t MultimodalInputConnectManager::SetPointerStyle(int32_t windowId, int32_t pointerStyle)
+int32_t MultimodalInputConnectManager::SetPointerStyle(int32_t windowId, PointerStyle pointerStyle)
 {
     CHKPR(multimodalInputConnectService_, RET_ERR);
     return multimodalInputConnectService_->SetPointerStyle(windowId, pointerStyle);
 }
 
-int32_t MultimodalInputConnectManager::GetPointerStyle(int32_t windowId, int32_t &pointerStyle)
+int32_t MultimodalInputConnectManager::GetPointerStyle(int32_t windowId, PointerStyle &pointerStyle)
 {
     CHKPR(multimodalInputConnectService_, RET_ERR);
     return multimodalInputConnectService_->GetPointerStyle(windowId, pointerStyle);
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index b3939ab28e..25a7d1f895 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -279,7 +279,7 @@ int32_t MultimodalInputConnectProxy::GetPointerSpeed(int32_t &speed)
     return RET_OK;
 }
 
-int32_t MultimodalInputConnectProxy::SetPointerStyle(int32_t windowId, int32_t pointerStyle)
+int32_t MultimodalInputConnectProxy::SetPointerStyle(int32_t windowId, PointerStyle pointerStyle)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -289,7 +289,11 @@ int32_t MultimodalInputConnectProxy::SetPointerStyle(int32_t windowId, int32_t p
     }
 
     WRITEINT32(data, windowId, RET_ERR);
-    WRITEINT32(data, pointerStyle, RET_ERR);
+    WRITEINT32(data, pointerStyle.size, RET_ERR);
+    WRITEUINT8(data, pointerStyle.color.r, RET_ERR);
+    WRITEUINT8(data, pointerStyle.color.g, RET_ERR);
+    WRITEUINT8(data, pointerStyle.color.b, RET_ERR);
+    WRITEINT32(data, pointerStyle.id, RET_ERR);
 
     MessageParcel reply;
     MessageOption option;
@@ -303,7 +307,7 @@ int32_t MultimodalInputConnectProxy::SetPointerStyle(int32_t windowId, int32_t p
     return RET_OK;
 }
 
-int32_t MultimodalInputConnectProxy::GetPointerStyle(int32_t windowId, int32_t &pointerStyle)
+int32_t MultimodalInputConnectProxy::GetPointerStyle(int32_t windowId, PointerStyle &pointerStyle)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;
@@ -321,7 +325,11 @@ int32_t MultimodalInputConnectProxy::GetPointerStyle(int32_t windowId, int32_t &
         MMI_HILOGE("Send request fail, ret:%{public}d", ret);
         return ret;
     }
-    READINT32(reply, pointerStyle, IPC_PROXY_DEAD_OBJECT_ERR);
+    READINT32(reply, pointerStyle.size, IPC_PROXY_DEAD_OBJECT_ERR);
+    READUINT8(reply, pointerStyle.color.r, IPC_PROXY_DEAD_OBJECT_ERR);
+    READUINT8(reply, pointerStyle.color.g, IPC_PROXY_DEAD_OBJECT_ERR);
+    READUINT8(reply, pointerStyle.color.b, IPC_PROXY_DEAD_OBJECT_ERR);
+    READINT32(reply, pointerStyle.id, IPC_PROXY_DEAD_OBJECT_ERR);
     return RET_OK;
 }
 
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 143e321818..37b7689423 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -265,14 +265,18 @@ int32_t MultimodalInputConnectStub::StubSetPointerStyle(MessageParcel& data, Mes
     CALL_DEBUG_ENTER;
     int32_t windowId;
     READINT32(data, windowId, RET_ERR);
-    int32_t pointerStyle;
-    READINT32(data, pointerStyle, RET_ERR);
+    PointerStyle pointerStyle;
+    READINT32(data, pointerStyle.size, RET_ERR);
+    READUINT8(data, pointerStyle.color.r, RET_ERR);
+    READUINT8(data, pointerStyle.color.g, RET_ERR);
+    READUINT8(data, pointerStyle.color.b, RET_ERR);
+    READINT32(data, pointerStyle.id, RET_ERR);
     int32_t ret = SetPointerStyle(windowId, pointerStyle);
     if (ret != RET_OK) {
         MMI_HILOGE("Call SetPointerStyle failed ret:%{public}d", ret);
         return ret;
     }
-    MMI_HILOGD("Successfully set window:%{public}d, icon:%{public}d", windowId, pointerStyle);
+    MMI_HILOGD("Successfully set window:%{public}d, icon:%{public}d", windowId, pointerStyle.id);
     return RET_OK;
 }
 
@@ -281,14 +285,18 @@ int32_t MultimodalInputConnectStub::StubGetPointerStyle(MessageParcel& data, Mes
     CALL_DEBUG_ENTER;
     int32_t windowId;
     READINT32(data, windowId, RET_ERR);
-    int32_t pointerStyle;
+    PointerStyle pointerStyle;
     int32_t ret = GetPointerStyle(windowId, pointerStyle);
     if (ret != RET_OK) {
         MMI_HILOGE("Call GetPointerStyle failed ret:%{public}d", ret);
         return ret;
     }
-    WRITEINT32(reply, pointerStyle, RET_ERR);
-    MMI_HILOGD("Successfully get window:%{public}d, icon:%{public}d", windowId, pointerStyle);
+    WRITEINT32(reply, pointerStyle.size, RET_ERR);
+    WRITEUINT8(reply, pointerStyle.color.r, RET_ERR);
+    WRITEUINT8(reply, pointerStyle.color.g, RET_ERR);
+    WRITEUINT8(reply, pointerStyle.color.b, RET_ERR);
+    WRITEINT32(reply, pointerStyle.id, RET_ERR);
+    MMI_HILOGD("Successfully get window:%{public}d, icon:%{public}d", windowId, pointerStyle.id);
     return RET_OK;
 }
 
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index d328e16ec5..3f1f1ee911 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -54,8 +54,8 @@ public:
     int32_t MarkProcessed(int32_t eventType, int32_t eventId) override;
     int32_t SetPointerSpeed(int32_t speed) override;
     int32_t GetPointerSpeed(int32_t &speed) override;
-    int32_t SetPointerStyle(int32_t windowId, int32_t pointerStyle) override;
-    int32_t GetPointerStyle(int32_t windowId, int32_t &pointerStyle) override;
+    int32_t SetPointerStyle(int32_t windowId, PointerStyle pointerStyle) override;
+    int32_t GetPointerStyle(int32_t windowId, PointerStyle &pointerStyle) override;
     int32_t SupportKeys(int32_t deviceId, std::vector<int32_t> &keys, std::vector<bool> &keystroke) override;
     int32_t GetDeviceIds(std::vector<int32_t> &ids) override;
     int32_t GetDevice(int32_t deviceId, std::shared_ptr<InputDevice> &inputDevice) override;
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 91aa6dae60..bd11a5ee69 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -500,7 +500,7 @@ int32_t MMIService::GetPointerSpeed(int32_t &speed)
     return RET_OK;
 }
 
-int32_t MMIService::SetPointerStyle(int32_t windowId, int32_t pointerStyle)
+int32_t MMIService::SetPointerStyle(int32_t windowId, PointerStyle pointerStyle)
 {
     CALL_DEBUG_ENTER;
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -514,7 +514,7 @@ int32_t MMIService::SetPointerStyle(int32_t windowId, int32_t pointerStyle)
     return RET_OK;
 }
 
-int32_t MMIService::GetPointerStyle(int32_t windowId, int32_t &pointerStyle)
+int32_t MMIService::GetPointerStyle(int32_t windowId, PointerStyle &pointerStyle)
 {
     CALL_DEBUG_ENTER;
 #ifdef OHOS_BUILD_ENABLE_POINTER
diff --git a/service/window_manager/include/i_pointer_drawing_manager.h b/service/window_manager/include/i_pointer_drawing_manager.h
index 2799c8fb9d..ec152ffd96 100644
--- a/service/window_manager/include/i_pointer_drawing_manager.h
+++ b/service/window_manager/include/i_pointer_drawing_manager.h
@@ -18,6 +18,7 @@
 
 #include <memory>
 
+#include "pointer_style.h"
 #include "window_info.h"
 #include "struct_multimodal.h"
 
@@ -43,11 +44,11 @@ public:
     {
         return 0;
     }
-    virtual int32_t SetPointerStyle(int32_t pid, int32_t windowId, int32_t pointerStyle)
+    virtual int32_t SetPointerStyle(int32_t pid, int32_t windowId, PointerStyle pointerStyle)
     {
         return 0;
     }
-    virtual int32_t GetPointerStyle(int32_t pid, int32_t windowId, int32_t &pointerStyle)
+    virtual int32_t GetPointerStyle(int32_t pid, int32_t windowId, PointerStyle &pointerStyle)
     {
         return 0;
     }
diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
index 14735f4b74..a4b2849445 100644
--- a/service/window_manager/include/input_windows_manager.h
+++ b/service/window_manager/include/input_windows_manager.h
@@ -27,6 +27,7 @@
 #include "input_event_data_transformation.h"
 #include "input_event.h"
 #include "pointer_event.h"
+#include "pointer_style.h"
 #include "uds_server.h"
 
 namespace OHOS {
@@ -72,8 +73,8 @@ public:
 #endif // OHOS_BUILD_ENABLE_TOUCH
 #ifdef OHOS_BUILD_ENABLE_POINTER
     const DisplayGroupInfo& GetDisplayGroupInfo();
-    int32_t SetPointerStyle(int32_t pid, int32_t windowId, int32_t pointerStyle);
-    int32_t GetPointerStyle(int32_t pid, int32_t windowId, int32_t &pointerStyle) const;
+    int32_t SetPointerStyle(int32_t pid, int32_t windowId, PointerStyle pointerStyle);
+    int32_t GetPointerStyle(int32_t pid, int32_t windowId, PointerStyle &pointerStyle) const;
 #ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
     bool IsNeedRefreshLayer(int32_t windowId);
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
@@ -145,7 +146,7 @@ private:
     int32_t lastLogicY_ { -1 };
     WindowInfo lastWindowInfo_;
     std::shared_ptr<PointerEvent> lastPointerEvent_ { nullptr };
-    std::map<int32_t, std::map<int32_t, int32_t>> pointerStyle_;
+    std::map<int32_t, std::map<int32_t, PointerStyle>> pointerStyle_;
     WindowInfo mouseDownInfo_;
 #endif // OHOS_BUILD_ENABLE_POINTER
     DisplayGroupInfo displayGroupInfo_;
diff --git a/service/window_manager/include/pointer_drawing_manager.h b/service/window_manager/include/pointer_drawing_manager.h
index c7823729c5..2a271980db 100644
--- a/service/window_manager/include/pointer_drawing_manager.h
+++ b/service/window_manager/include/pointer_drawing_manager.h
@@ -53,8 +53,8 @@ public:
     bool Init() override;
     void DeletePointerVisible(int32_t pid) override;
     int32_t SetPointerVisible(int32_t pid, bool visible) override;
-    int32_t SetPointerStyle(int32_t pid, int32_t windowId, int32_t pointerStyle) override;
-    int32_t GetPointerStyle(int32_t pid, int32_t windowId, int32_t &pointerStyle) override;
+    int32_t SetPointerStyle(int32_t pid, int32_t windowId, PointerStyle pointerStyle) override;
+    int32_t GetPointerStyle(int32_t pid, int32_t windowId, PointerStyle &pointerStyle) override;
     void DrawPointerStyle() override;
     bool IsPointerVisible() override;
     void SetPointerLocation(int32_t pid, int32_t x, int32_t y) override;
@@ -85,7 +85,7 @@ private:
     bool hasPointerDevice_ { false };
     int32_t lastPhysicalX_ { -1 };
     int32_t lastPhysicalY_ { -1 };
-    int32_t lastMouseStyle_ { 0 };
+    PointerStyle lastMouseStyle_ {};
     int32_t pid_ { 0 };
     int32_t windowId_ { 0 };
     int32_t imageWidth_ { 0 };
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index b0b0a530b6..fb5a31aafe 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -704,7 +704,7 @@ void InputWindowsManager::OnSessionLost(SessionPtr session)
     }
 }
 
-int32_t InputWindowsManager::SetPointerStyle(int32_t pid, int32_t windowId, int32_t pointerStyle)
+int32_t InputWindowsManager::SetPointerStyle(int32_t pid, int32_t windowId, PointerStyle pointerStyle)
 {
     CALL_DEBUG_ENTER;
     auto it = pointerStyle_.find(pid);
@@ -720,11 +720,11 @@ int32_t InputWindowsManager::SetPointerStyle(int32_t pid, int32_t windowId, int3
     }
     
     iter->second = pointerStyle;
-    MMI_HILOGD("Window id:%{public}d set pointer style:%{public}d success", windowId, pointerStyle);
+    MMI_HILOGD("Window id:%{public}d set pointer style:%{public}d success", windowId, pointerStyle.id);
     return RET_OK;
 }
 
-int32_t InputWindowsManager::GetPointerStyle(int32_t pid, int32_t windowId, int32_t &pointerStyle) const
+int32_t InputWindowsManager::GetPointerStyle(int32_t pid, int32_t windowId, PointerStyle &pointerStyle) const
 {
     CALL_DEBUG_ENTER;
     auto it = pointerStyle_.find(pid);
@@ -736,11 +736,11 @@ int32_t InputWindowsManager::GetPointerStyle(int32_t pid, int32_t windowId, int3
     auto iter = it->second.find(windowId);
     if (iter == it->second.end()) {
         MMI_HILOGW("The window id is invalid");
-        pointerStyle = DEFAULT_POINTER_STYLE;
+        pointerStyle.id = DEFAULT_POINTER_STYLE;
         return RET_OK;
     }
     
-    MMI_HILOGD("Window type:%{public}d get pointer style:%{public}d success", windowId, iter->second);
+    MMI_HILOGD("Window type:%{public}d get pointer style:%{public}d success", windowId, iter->second.id);
     pointerStyle = iter->second;
     return RET_OK;
 }
@@ -748,11 +748,13 @@ int32_t InputWindowsManager::GetPointerStyle(int32_t pid, int32_t windowId, int3
 void InputWindowsManager::UpdatePointerStyle()
 {
     CALL_DEBUG_ENTER;
+    PointerStyle pointerStyle;
+    pointerStyle.id = DEFAULT_POINTER_STYLE;
     for (const auto& windowItem : displayGroupInfo_.windowsInfo) {
         int32_t pid = windowItem.pid;
         auto it = pointerStyle_.find(pid);
         if (it == pointerStyle_.end()) {
-            std::map<int32_t, int32_t> tmpPointerStyle = { { windowItem.id, DEFAULT_POINTER_STYLE } };
+            std::map<int32_t, PointerStyle> tmpPointerStyle = { { windowItem.id, pointerStyle } };
             auto iter = pointerStyle_.insert(std::make_pair(pid, tmpPointerStyle));
             if (!iter.second) {
                 MMI_HILOGW("The pd is duplicated");
@@ -766,7 +768,8 @@ void InputWindowsManager::UpdatePointerStyle()
                 MMI_HILOGD("The window count:%{public}zu exceeds limit in same pd", it->second.size());
                 it->second.erase(it->second.begin());
             }
-            auto iter = it->second.insert(std::make_pair(windowItem.id, DEFAULT_POINTER_STYLE));
+
+            auto iter = it->second.insert(std::make_pair(windowItem.id, pointerStyle));
             if (!iter.second) {
                 MMI_HILOGW("The window type is duplicated");
             }
@@ -964,8 +967,8 @@ int32_t InputWindowsManager::UpdateMouseTarget(std::shared_ptr<PointerEvent> poi
         pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_CANCEL);
         MMI_HILOGD("mouse event send cancel, window:%{public}d", touchWindow->id);
     }
-    int32_t mouseStyle = -1;
-    int32_t ret = GetPointerStyle(touchWindow->pid, touchWindow->id, mouseStyle);
+    PointerStyle pointerStyle;
+    int32_t ret = GetPointerStyle(touchWindow->pid, touchWindow->id, pointerStyle);
     if (ret != RET_OK) {
         MMI_HILOGE("Get pointer style failed, pointerStyleInfo is nullptr");
         return ret;
@@ -978,7 +981,7 @@ int32_t InputWindowsManager::UpdateMouseTarget(std::shared_ptr<PointerEvent> poi
     WinInfo info = { .windowPid = touchWindow->pid, .windowId = touchWindow->id };
     IPointerDrawingManager::GetInstance()->OnWindowInfo(info);
     IPointerDrawingManager::GetInstance()->DrawPointer(displayId, pointerItem.GetDisplayX(),
-        pointerItem.GetDisplayY(), MOUSE_ICON(mouseStyle));
+        pointerItem.GetDisplayY(), MOUSE_ICON(pointerStyle.id));
     if (captureModeInfo_.isCaptureMode && (touchWindow->id != captureModeInfo_.windowId)) {
         captureModeInfo_.isCaptureMode = false;
     }
diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
index a619331fa3..50a220a443 100644
--- a/service/window_manager/src/pointer_drawing_manager.cpp
+++ b/service/window_manager/src/pointer_drawing_manager.cpp
@@ -59,11 +59,11 @@ void PointerDrawingManager::DrawPointer(int32_t displayId, int32_t physicalX, in
     if (pointerWindow_ != nullptr) {
         pointerWindow_->MoveTo(physicalX + displayInfo_.x, physicalY + displayInfo_.y);
         MMI_HILOGD("Pointer window move success");
-        if (lastMouseStyle_ == mouseStyle) {
+        if (lastMouseStyle_.id == mouseStyle) {
             MMI_HILOGD("The lastMouseStyle is equal with mouseStyle");
             return;
         }
-        lastMouseStyle_ = mouseStyle;
+        lastMouseStyle_.id = mouseStyle;
         int32_t ret = InitLayer(mouseStyle);
         if (ret != RET_OK) {
             MMI_HILOGE("Init layer failed");
@@ -157,7 +157,7 @@ void PointerDrawingManager::SetMouseDisplayState(bool state)
     if (mouseDisplayState_ != state) {
         mouseDisplayState_ = state;
         if (mouseDisplayState_) {
-            InitLayer(MOUSE_ICON(lastMouseStyle_));
+            InitLayer(MOUSE_ICON(lastMouseStyle_.id));
         }
         UpdatePointerVisible();
     }
@@ -365,19 +365,19 @@ void PointerDrawingManager::DrawManager()
 {
     if (hasDisplay_ && hasPointerDevice_ && pointerWindow_ == nullptr) {
         MMI_HILOGD("Draw pointer begin");
-        int32_t mouseStyle = -1;
-        int32_t ret = WinMgr->GetPointerStyle(pid_, windowId_, mouseStyle);
+        PointerStyle pointerStyle;
+        int32_t ret = WinMgr->GetPointerStyle(pid_, windowId_, pointerStyle);
         if (ret != RET_OK) {
             MMI_HILOGE("Get pointer style failed, pointerStyleInfo is nullptr");
             return;
         }
         if (lastPhysicalX_ == -1 || lastPhysicalY_ == -1) {
-            DrawPointer(displayInfo_.id, displayInfo_.width / 2, displayInfo_.height / 2, MOUSE_ICON(mouseStyle));
-            MMI_HILOGD("Draw manager, mouseStyle:%{public}d, last physical is initial value", mouseStyle);
+            DrawPointer(displayInfo_.id, displayInfo_.width / 2, displayInfo_.height / 2, MOUSE_ICON(pointerStyle.id));
+            MMI_HILOGD("Draw manager, mouseStyle:%{public}d, last physical is initial value", pointerStyle.id);
             return;
         }
-        DrawPointer(displayInfo_.id, lastPhysicalX_, lastPhysicalY_, MOUSE_ICON(mouseStyle));
-        MMI_HILOGD("Draw manager, mouseStyle:%{public}d", mouseStyle);
+        DrawPointer(displayInfo_.id, lastPhysicalX_, lastPhysicalY_, MOUSE_ICON(pointerStyle.id));
+        MMI_HILOGD("Draw manager, mouseStyle:%{public}d", pointerStyle.id);
         return;
     }
     if (!hasPointerDevice_ && pointerWindow_ != nullptr) {
@@ -441,7 +441,7 @@ void PointerDrawingManager::DeletePointerVisible(int32_t pid)
     }
     if (it != pidInfos_.end()) {
         if (IsPointerVisible()) {
-            InitLayer(MOUSE_ICON(lastMouseStyle_));
+            InitLayer(MOUSE_ICON(lastMouseStyle_.id));
         }
         UpdatePointerVisible();
     }
@@ -459,7 +459,7 @@ int32_t PointerDrawingManager::SetPointerVisible(int32_t pid, bool visible)
     PidInfo info = { .pid = pid, .visible = visible };
     pidInfos_.push_back(info);
     if (visible) {
-        InitLayer(MOUSE_ICON(lastMouseStyle_));
+        InitLayer(MOUSE_ICON(lastMouseStyle_.id));
     }
     UpdatePointerVisible();
     return RET_OK;
@@ -478,10 +478,10 @@ void PointerDrawingManager::SetPointerLocation(int32_t pid, int32_t x, int32_t y
     }
 }
 
-int32_t PointerDrawingManager::SetPointerStyle(int32_t pid, int32_t windowId, int32_t pointerStyle)
+int32_t PointerDrawingManager::SetPointerStyle(int32_t pid, int32_t windowId, PointerStyle pointerStyle)
 {
     CALL_DEBUG_ENTER;
-    auto it = mouseIcons_.find(MOUSE_ICON(pointerStyle));
+    auto it = mouseIcons_.find(MOUSE_ICON(pointerStyle.id));
     if (it == mouseIcons_.end()) {
         MMI_HILOGE("The param pointerStyle is invalid");
         return RET_ERR;
@@ -499,31 +499,31 @@ int32_t PointerDrawingManager::SetPointerStyle(int32_t pid, int32_t windowId, in
     }
 
     if (!WinMgr->IsNeedRefreshLayer(windowId)) {
-        MMI_HILOGD("Not need refresh layer, window type:%{public}d, pointer style:%{public}d", windowId, pointerStyle);
+        MMI_HILOGD("Not need refresh layer, window type:%{public}d, pointer style:%{public}d", windowId, pointerStyle.id);
         return RET_OK;
     }
 
     if (pointerWindow_ != nullptr) {
         int32_t physicalX = lastPhysicalX_;
         int32_t physicalY = lastPhysicalY_;
-        AdjustMouseFocus(ICON_TYPE(mouseIcons_[MOUSE_ICON(pointerStyle)].alignmentWay), physicalX, physicalY);
+        AdjustMouseFocus(ICON_TYPE(mouseIcons_[MOUSE_ICON(pointerStyle.id)].alignmentWay), physicalX, physicalY);
         MMI_HILOGD("Pointer window move start");
         pointerWindow_->MoveTo(physicalX + displayInfo_.x, physicalY + displayInfo_.y);
         MMI_HILOGD("Pointer window move success");
 
         lastMouseStyle_ = pointerStyle;
-        int32_t ret = InitLayer(MOUSE_ICON(pointerStyle));
+        int32_t ret = InitLayer(MOUSE_ICON(pointerStyle.id));
         if (ret != RET_OK) {
             MMI_HILOGE("Init layer failed");
             return RET_ERR;
         }
         UpdatePointerVisible();
     }
-    MMI_HILOGD("Window id:%{public}d set pointer style:%{public}d success", windowId, pointerStyle);
+    MMI_HILOGD("Window id:%{public}d set pointer style:%{public}d success", windowId, pointerStyle.id);
     return RET_OK;
 }
 
-int32_t PointerDrawingManager::GetPointerStyle(int32_t pid, int32_t windowId, int32_t &pointerStyle)
+int32_t PointerDrawingManager::GetPointerStyle(int32_t pid, int32_t windowId, PointerStyle &pointerStyle)
 {
     CALL_DEBUG_ENTER;
     int32_t ret = WinMgr->GetPointerStyle(pid, windowId, pointerStyle);
@@ -531,7 +531,7 @@ int32_t PointerDrawingManager::GetPointerStyle(int32_t pid, int32_t windowId, in
         MMI_HILOGE("Get pointer style failed, pointerStyleInfo is nullptr");
         return ret;
     }
-    MMI_HILOGD("Window id:%{public}d get pointer style:%{public}d success", windowId, pointerStyle);
+    MMI_HILOGD("Window id:%{public}d get pointer style:%{public}d success", windowId, pointerStyle.id);
     return RET_OK;
 }
 
@@ -539,20 +539,20 @@ void PointerDrawingManager::DrawPointerStyle()
 {
     CALL_DEBUG_ENTER;
     if (hasDisplay_ && hasPointerDevice_) {
-        int32_t mouseStyle = -1;
-        int32_t ret = WinMgr->GetPointerStyle(pid_, windowId_, mouseStyle);
+        PointerStyle pointerStyle;
+        int32_t ret = WinMgr->GetPointerStyle(pid_, windowId_, pointerStyle);
         if (ret != RET_OK) {
             MMI_HILOGE("Draw pointer style failed, pointerStyleInfo is nullptr");
             return;
         }
         if (lastPhysicalX_ == -1 || lastPhysicalY_ == -1) {
-            DrawPointer(displayInfo_.id, displayInfo_.width / 2, displayInfo_.height / 2, MOUSE_ICON(mouseStyle));
-            MMI_HILOGD("Draw pointer style, mouseStyle:%{public}d", mouseStyle);
+            DrawPointer(displayInfo_.id, displayInfo_.width / 2, displayInfo_.height / 2, MOUSE_ICON(pointerStyle.id));
+            MMI_HILOGD("Draw pointer style, mouseStyle:%{public}d", pointerStyle.id);
             return;
         }
 
-        DrawPointer(displayInfo_.id, lastPhysicalX_, lastPhysicalY_, MOUSE_ICON(mouseStyle));
-        MMI_HILOGD("Draw pointer style, mouseStyle:%{public}d", mouseStyle);
+        DrawPointer(displayInfo_.id, lastPhysicalX_, lastPhysicalY_, MOUSE_ICON(pointerStyle.id));
+        MMI_HILOGD("Draw pointer style, mouseStyle:%{public}d", pointerStyle.id);
     }
 }
 
diff --git a/util/common/include/define_multimodal.h b/util/common/include/define_multimodal.h
index 73fd959375..1250509277 100644
--- a/util/common/include/define_multimodal.h
+++ b/util/common/include/define_multimodal.h
@@ -243,6 +243,14 @@ inline constexpr int32_t INVALID_PID { -1 };
         } \
     } while (0)
 
+#define WRITEUINT8(parcel, data, ...) \
+    do { \
+        if (!(parcel).WriteUint8(data)) { \
+            MMI_HILOGE("WriteUint8 "#data" failed"); \
+            return DEFRET(false, ##__VA_ARGS__); \
+        } \
+    } while (0)
+
 #define WRITEUINT32(parcel, data, ...) \
     do { \
         if (!(parcel).WriteUint32(data)) { \
@@ -299,6 +307,14 @@ inline constexpr int32_t INVALID_PID { -1 };
         } \
     } while (0)
 
+#define READUINT8(parcel, data, ...) \
+    do { \
+        if (!(parcel).ReadUint8(data)) { \
+            MMI_HILOGE("ReadUint8 "#data" failed"); \
+            return DEFRET(false, ##__VA_ARGS__); \
+        } \
+    } while (0)
+
 #define READUINT32(parcel, data, ...) \
     do { \
         if (!(parcel).ReadUint32(data)) { \
-- 
Gitee


From c5583865d039899ef3bd4a2dca8d87a79aa3d228 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Mon, 26 Dec 2022 11:04:33 +0000
Subject: [PATCH 297/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I8666962d4eab180e43a19bf9fe86c3a5e23e0235
---
 .../include/input_manager_impl.h              |  2 +
 .../event_handler/src/input_manager_impl.cpp  | 14 +++++
 .../proxy/events/include/event_log_helper.h   | 12 +++-
 frameworks/proxy/events/src/input_manager.cpp |  5 ++
 frameworks/proxy/events/src/pointer_event.cpp | 17 +++++-
 .../proxy/events/test/input_manager_test.cpp  | 55 +++++++++++++++++++
 .../innerkits/event/include/pointer_event.h   | 24 ++++++++
 .../innerkits/proxy/include/extra_data.h      | 51 +++++++++++++++++
 .../innerkits/proxy/include/input_manager.h   |  9 +++
 .../include/i_multimodal_input_connect.h      |  3 +
 .../multimodal_input_connect_manager.h        |  2 +
 .../include/multimodal_input_connect_proxy.h  |  2 +
 .../include/multimodal_input_connect_stub.h   |  1 +
 .../src/multimodal_input_connect_manager.cpp  |  6 ++
 .../src/multimodal_input_connect_proxy.cpp    | 25 +++++++++
 .../src/multimodal_input_connect_stub.cpp     | 29 ++++++++++
 service/module_loader/include/mmi_service.h   |  2 +
 service/module_loader/src/mmi_service.cpp     | 11 ++++
 .../include/input_windows_manager.h           |  3 +
 .../src/input_windows_manager.cpp             | 49 ++++++++++++++++-
 test/unittest/common/src/event_util_test.cpp  | 10 +++-
 util/BUILD.gn                                 |  1 +
 util/common/include/define_multimodal.h       | 16 ++++++
 util/common/include/error_multimodal.h        |  2 +
 .../src/input_event_data_transformation.cpp   | 24 ++++++++
 25 files changed, 368 insertions(+), 7 deletions(-)
 create mode 100644 interfaces/native/innerkits/proxy/include/extra_data.h

diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index 18cadbcf04..017816f81c 100644
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -26,6 +26,7 @@
 #include "window_info.h"
 #include "event_filter_service.h"
 #include "event_handler.h"
+#include "extra_data.h"
 #include "if_mmi_client.h"
 #include "input_device_impl.h"
 #include "input_device_cooperate_impl.h"
@@ -124,6 +125,7 @@ public:
     void SetPointerLocation(int32_t x, int32_t y);
 
     EventHandlerPtr GetEventHandler() const;
+    void AppendExtraData(const ExtraData& extraData);
 private:
     int32_t PackWindowInfo(NetPacket &pkt);
     int32_t PackDisplayInfo(NetPacket &pkt);
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 8b91353826..c2c3db2664 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -1025,5 +1025,19 @@ int32_t InputManagerImpl::LeaveCaptureMode(int32_t windowId)
     return ERROR_UNSUPPORT;
 #endif // OHOS_BUILD_ENABLE_POINTER
 }
+
+void InputManagerImpl::AppendExtraData(const ExtraData& extraData)
+{
+    CALL_DEBUG_ENTER;
+    std::lock_guard<std::mutex> guard(mtx_);
+    if (extraData.buffer.size() > ExtraData::MAX_BUFFER_SIZE) {
+        MMI_HILOGE("Append extra data failed, buffer is oversize:%{public}d", extraData.buffer.size());
+        return;
+    }
+    int32_t ret = MultimodalInputConnMgr->AppendExtraData(extraData);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Append extra data failed:%{public}d", ret);
+    }
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/proxy/events/include/event_log_helper.h b/frameworks/proxy/events/include/event_log_helper.h
index ccde5874df..abd1c4c8c5 100644
--- a/frameworks/proxy/events/include/event_log_helper.h
+++ b/frameworks/proxy/events/include/event_log_helper.h
@@ -66,6 +66,11 @@ private:
     static void Print(const std::shared_ptr<PointerEvent> event)
     {
         std::vector<int32_t> pointerIds { event->GetPointerIds() };
+        std::string str;
+        std::vector<uint8_t> buffer = event->GetBuffer();
+        for (const auto& buff : buffer) {
+            str += std::to_string(buff);
+        }
         MMI_HILOGD("EventType:%{public}s,ActionTime:%{public}" PRId64 ",Action:%{public}d,"
             "ActionStartTime:%{public}" PRId64 ",Flag:%{public}d,PointerAction:%{public}s,"
             "SourceType:%{public}s,ButtonId:%{public}d,VerticalAxisValue:%{public}.2f,"
@@ -73,7 +78,8 @@ private:
             "XAbsValue:%{public}.2f,YAbsValue:%{public}.2f,ZAbsValue:%{public}.2f,"
             "RzAbsValue:%{public}.2f,GasAbsValue:%{public}.2f,BrakeAbsValue:%{public}.2f,"
             "Hat0xAbsValue:%{public}.2f,Hat0yAbsValue:%{public}.2f,ThrottleAbsValue:%{public}.2f,"
-            "PointerId:%{public}d,PointerCount:%{public}zu,EventNumber:%{public}d",
+            "PointerId:%{public}d,PointerCount:%{public}zu,EventNumber:%{public}d,"
+            "BufferCount:%{public}d,Buffer:%{public}s",
             InputEvent::EventTypeToString(event->GetEventType()), event->GetActionTime(),
             event->GetAction(), event->GetActionStartTime(), event->GetFlag(),
             event->DumpPointerAction(), event->DumpSourceType(), event->GetButtonId(),
@@ -89,8 +95,8 @@ private:
             event->GetAxisValue(PointerEvent::AXIS_TYPE_ABS_HAT0X),
             event->GetAxisValue(PointerEvent::AXIS_TYPE_ABS_HAT0Y),
             event->GetAxisValue(PointerEvent::AXIS_TYPE_ABS_THROTTLE),
-            event->GetPointerId(), pointerIds.size(), event->GetId());
-
+            event->GetPointerId(), pointerIds.size(), event->GetId(), buffer.size(), str.c_str());
+        
         for (const auto& pointerId : pointerIds) {
             PointerEvent::PointerItem item;
             if (!event->GetPointerItem(pointerId, item)) {
diff --git a/frameworks/proxy/events/src/input_manager.cpp b/frameworks/proxy/events/src/input_manager.cpp
index 4fc3ee9b9a..2c42f0ece4 100644
--- a/frameworks/proxy/events/src/input_manager.cpp
+++ b/frameworks/proxy/events/src/input_manager.cpp
@@ -243,5 +243,10 @@ int32_t InputManager::LeaveCaptureMode(int32_t windowId)
 {
     return InputMgrImpl.LeaveCaptureMode(windowId);
 }
+
+void InputManager::AppendExtraData(const ExtraData& extraData)
+{
+    InputMgrImpl.AppendExtraData(extraData);
+}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/frameworks/proxy/events/src/pointer_event.cpp b/frameworks/proxy/events/src/pointer_event.cpp
index ed03c6a6a8..0e43bf5699 100644
--- a/frameworks/proxy/events/src/pointer_event.cpp
+++ b/frameworks/proxy/events/src/pointer_event.cpp
@@ -355,7 +355,7 @@ PointerEvent::PointerEvent(const PointerEvent& other)
       pressedButtons_(other.pressedButtons_), sourceType_(other.sourceType_),
       pointerAction_(other.pointerAction_), buttonId_(other.buttonId_),
       axes_(other.axes_), axisValues_(other.axisValues_),
-      pressedKeys_(other.pressedKeys_) {}
+      pressedKeys_(other.pressedKeys_), buffer_(other.buffer_) {}
 
 PointerEvent::~PointerEvent() {}
 
@@ -891,5 +891,20 @@ bool PointerEvent::IsValid() const
     }
     return true;
 }
+
+void PointerEvent::SetBuffer(std::vector<uint8_t> buffer)
+{
+    buffer_ = buffer;
+}
+
+void PointerEvent::ClearBuffer()
+{
+    buffer_.clear();
+}
+
+std::vector<uint8_t> PointerEvent::GetBuffer() const
+{
+    return buffer_;
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 19e9f5828c..3fe769588a 100644
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -4167,5 +4167,60 @@ HWTEST_F(InputManagerTest, InputManagerTest_InterceptTabletToolEvent_001, TestSi
     }
 }
 #endif // OHOS_BUILD_ENABLE_INTERCEPTOR
+
+#ifdef OHOS_BUILD_ENABLE_TOUCH
+HWTEST_F(InputManagerTest, AppendExtraData_001, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    auto consumer = GetPtr<InputEventConsumer>();
+    ASSERT_TRUE(consumer != nullptr);
+    const std::string threadTest = "EventUtilTest";
+    auto runner = AppExecFwk::EventRunner::Create(threadTest);
+    ASSERT_TRUE(runner != nullptr);
+    auto eventHandler = std::make_shared<AppExecFwk::EventHandler>(runner);
+    MMI::InputManager::GetInstance()->SetWindowInputEventConsumer(consumer, eventHandler);
+    std::vector<uint8_t> buffer(512, 1);
+    ExtraData extraData;
+    extraData.appended = true;
+    extraData.buffer = buffer;
+    extraData.sourceType = PointerEvent::SOURCE_TYPE_TOUCHSCREEN;
+    InputManager::GetInstance()->AppendExtraData(extraData);
+    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    auto pointerEvent = SetupPointerEvent001();
+    ASSERT_TRUE(pointerEvent != nullptr);
+    TestSimulateInputEvent(pointerEvent, TestScene::EXCEPTION_TEST);
+
+    extraData.appended = false;
+    extraData.buffer.clear();
+    InputManager::GetInstance()->AppendExtraData(extraData);
+    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    ASSERT_TRUE(pointerEvent != nullptr);
+    TestSimulateInputEvent(pointerEvent);
+}
+#endif // OHOS_BUILD_ENABLE_TOUCH
+
+#ifdef OHOS_BUILD_ENABLE_POINTER
+HWTEST_F(InputManagerTest, AppendExtraData_002, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    std::vector<uint8_t> buffer(512, 1);
+    ExtraData extraData;
+    extraData.appended = true;
+    extraData.buffer = buffer;
+    extraData.sourceType = PointerEvent::SOURCE_TYPE_MOUSE;
+    InputManager::GetInstance()->AppendExtraData(extraData);
+    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    auto pointerEvent = SetupPointerEvent006();
+    ASSERT_TRUE(pointerEvent != nullptr);
+    TestSimulateInputEvent(pointerEvent, TestScene::EXCEPTION_TEST);
+
+    extraData.appended = false;
+    extraData.buffer.clear();
+    InputManager::GetInstance()->AppendExtraData(extraData);
+    std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
+    ASSERT_TRUE(pointerEvent != nullptr);
+    TestSimulateInputEvent(pointerEvent);
+}
+#endif // OHOS_BUILD_ENABLE_POINTER
 } // namespace MMI
 } // namespace OHOS
diff --git a/interfaces/native/innerkits/event/include/pointer_event.h b/interfaces/native/innerkits/event/include/pointer_event.h
index 982cdda64a..410888b634 100644
--- a/interfaces/native/innerkits/event/include/pointer_event.h
+++ b/interfaces/native/innerkits/event/include/pointer_event.h
@@ -1257,6 +1257,29 @@ public:
      * @since 9
      */
     bool IsValid() const;
+
+    /**
+     * @brief 设置buffer值.
+     * @param buffer 表示该事件所携带的buffer值.
+     * @return void.
+     * @since 9
+     */
+    void SetBuffer(std::vector<uint8_t> buffer);
+
+    /**
+     * @brief 清空buffer值.
+     * @param void.
+     * @return void.
+     * @since 9
+     */
+    void ClearBuffer();
+
+    /**
+     * @brief 获取buffer值.
+     * @return Returns buffer.
+     * @since 9
+     */
+    std::vector<uint8_t> GetBuffer() const;
 public:
     /**
      * @brief Checks whether the axes set represented by <b>axes</b> contains a specified type of axis.
@@ -1308,6 +1331,7 @@ private:
     uint32_t axes_ { 0U };
     std::array<double, AXIS_TYPE_MAX> axisValues_ {};
     std::vector<int32_t> pressedKeys_;
+    std::vector<uint8_t> buffer_;
 };
 
 inline bool PointerEvent::HasAxis(AxisType axis) const
diff --git a/interfaces/native/innerkits/proxy/include/extra_data.h b/interfaces/native/innerkits/proxy/include/extra_data.h
new file mode 100644
index 0000000000..739366c06f
--- /dev/null
+++ b/interfaces/native/innerkits/proxy/include/extra_data.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2022 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef EXTRA_DATA_H
+#define EXTRA_DATA_H
+
+#include <vector>
+
+namespace OHOS {
+namespace MMI {
+struct ExtraData {
+    /**
+     * buffer的最大个数
+     *
+     * @since 9
+     */
+    static constexpr int32_t MAX_BUFFER_SIZE = 1024;
+    /**
+     * 是否添加buffer信息
+     *
+     * @since 9
+     */
+    bool appended { false };
+    /**
+     * buffer信息
+     *
+     * @since 9
+     */
+    std::vector<uint8_t> buffer;
+    /**
+     * 事件类型
+     *
+     * @since 9
+     */
+    int32_t sourceType { -1 };
+};
+} // namespace MMI
+} // namespace OHOS
+#endif // EXTRA_DATA_H
\ No newline at end of file
diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index d69484a5b6..bbe59cfe88 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -25,6 +25,7 @@
 
 #include "cooperation_message.h"
 #include "error_multimodal.h"
+#include "extra_data.h"
 #include "i_anr_observer.h"
 #include "i_input_device_cooperate_listener.h"
 #include "i_input_device_listener.h"
@@ -369,6 +370,14 @@ public:
     int32_t LeaveCaptureMode(int32_t windowId);
 
     int32_t GetWindowPid(int32_t windowId);
+
+    /**
+     * @brief pointer event添加辅助信息
+     * @param extraData 添加的信息.
+     * @return void
+     * @since 9
+     */
+    void AppendExtraData(const ExtraData& extraData);
 private:
     InputManager() = default;
     DISALLOW_COPY_AND_MOVE(InputManager);
diff --git a/service/connect_manager/include/i_multimodal_input_connect.h b/service/connect_manager/include/i_multimodal_input_connect.h
index cb29e96953..bc39d0c68e 100644
--- a/service/connect_manager/include/i_multimodal_input_connect.h
+++ b/service/connect_manager/include/i_multimodal_input_connect.h
@@ -18,6 +18,7 @@
 
 #include "iremote_broker.h"
 
+#include "extra_data.h"
 #include "i_event_filter.h"
 #include "i_input_event_filter.h"
 #include "input_device.h"
@@ -72,6 +73,7 @@ public:
         SET_INPUT_DEVICE_TO_SCREEN = 50,
         SET_POINTER_LOCATION = 51,
         GET_WINDOW_PID = 52,
+        APPEND_EXTRA_DATA = 53,
     };
 
     enum {
@@ -125,6 +127,7 @@ public:
     virtual int32_t SetPointerLocation(int32_t x, int32_t y) = 0;
     virtual int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode) = 0;
     virtual int32_t GetWindowPid(int32_t windowId) = 0;
+    virtual int32_t AppendExtraData(const ExtraData& extraData) = 0;
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/include/multimodal_input_connect_manager.h b/service/connect_manager/include/multimodal_input_connect_manager.h
index d23cc29719..8a04fd23cd 100644
--- a/service/connect_manager/include/multimodal_input_connect_manager.h
+++ b/service/connect_manager/include/multimodal_input_connect_manager.h
@@ -77,6 +77,8 @@ public:
     int32_t SetPointerLocation(int32_t x, int32_t y);
     int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode);
     int32_t GetWindowPid(int32_t windowId);
+    int32_t AppendExtraData(const ExtraData& extraData);
+
 private:
     MultimodalInputConnectManager() = default;
     DISALLOW_COPY_AND_MOVE(MultimodalInputConnectManager);
diff --git a/service/connect_manager/include/multimodal_input_connect_proxy.h b/service/connect_manager/include/multimodal_input_connect_proxy.h
index b3ed55be6c..bcff542fa3 100644
--- a/service/connect_manager/include/multimodal_input_connect_proxy.h
+++ b/service/connect_manager/include/multimodal_input_connect_proxy.h
@@ -74,6 +74,8 @@ public:
     int32_t SetPointerLocation(int32_t x, int32_t y) override;
     virtual int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode) override;
     int32_t GetWindowPid(int32_t windowId) override;
+    int32_t AppendExtraData(const ExtraData& extraData) override;
+
 private:
     static inline BrokerDelegator<MultimodalInputConnectProxy> delegator_;
 };
diff --git a/service/connect_manager/include/multimodal_input_connect_stub.h b/service/connect_manager/include/multimodal_input_connect_stub.h
index e9856eaa04..ff114bada6 100644
--- a/service/connect_manager/include/multimodal_input_connect_stub.h
+++ b/service/connect_manager/include/multimodal_input_connect_stub.h
@@ -76,6 +76,7 @@ protected:
     int32_t StubSetPointerLocation(MessageParcel &data, MessageParcel &reply);
     int32_t StubSetMouseCaptureMode(MessageParcel& data, MessageParcel& reply);
     int32_t StubGetWindowPid(MessageParcel& data, MessageParcel& reply);
+    int32_t StubAppendExtraData(MessageParcel& data, MessageParcel& reply);
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/src/multimodal_input_connect_manager.cpp b/service/connect_manager/src/multimodal_input_connect_manager.cpp
index 23ddd5ecb6..77fad0be84 100644
--- a/service/connect_manager/src/multimodal_input_connect_manager.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_manager.cpp
@@ -399,5 +399,11 @@ int32_t MultimodalInputConnectManager::SetMouseCaptureMode(int32_t windowId, boo
     CHKPR(multimodalInputConnectService_, INVALID_HANDLER_ID);
     return multimodalInputConnectService_->SetMouseCaptureMode(windowId, isCaptureMode);
 }
+
+int32_t MultimodalInputConnectManager::AppendExtraData(const ExtraData& extraData)
+{
+    CHKPR(multimodalInputConnectService_, INVALID_HANDLER_ID);
+    return multimodalInputConnectService_->AppendExtraData(extraData);
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index b3939ab28e..26126bb253 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -995,5 +995,30 @@ int32_t MultimodalInputConnectProxy::SetMouseCaptureMode(int32_t windowId, bool
     }
     return ret;
 }
+
+int32_t MultimodalInputConnectProxy::AppendExtraData(const ExtraData& extraData)
+{
+    CALL_DEBUG_ENTER;
+    MessageParcel data;
+    if (!data.WriteInterfaceToken(MultimodalInputConnectProxy::GetDescriptor())) {
+        MMI_HILOGE("Failed to write descriptor");
+        return ERR_INVALID_VALUE;
+    }
+    WRITEBOOL(data, extraData.appended, ERR_INVALID_VALUE);
+    WRITEINT32(data, static_cast<int32_t>(extraData.buffer.size()));
+    for (const auto &item : extraData.buffer) {
+        WRITEUINT8(data, item);
+    }
+    WRITEINT32(data, extraData.sourceType, ERR_INVALID_VALUE);
+    MessageParcel reply;
+    MessageOption option;
+    sptr<IRemoteObject> remote = Remote();
+    CHKPR(remote, RET_ERR);
+    int32_t ret = remote->SendRequest(APPEND_EXTRA_DATA, data, reply, option);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Send request fail, ret:%{public}d", ret);
+    }
+    return ret;
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 143e321818..79a5f8f196 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -92,6 +92,7 @@ int32_t MultimodalInputConnectStub::OnRemoteRequest(uint32_t code, MessageParcel
         {IMultimodalInputConnect::SET_POINTER_LOCATION, &MultimodalInputConnectStub::StubSetPointerLocation},
         {IMultimodalInputConnect::SET_CAPTURE_MODE, &MultimodalInputConnectStub::StubSetMouseCaptureMode},
         {IMultimodalInputConnect::GET_WINDOW_PID, &MultimodalInputConnectStub::StubGetWindowPid},
+        {IMultimodalInputConnect::APPEND_EXTRA_DATA, &MultimodalInputConnectStub::StubAppendExtraData},
     };
     auto it = mapConnFunc.find(code);
     if (it != mapConnFunc.end()) {
@@ -944,5 +945,33 @@ int32_t MultimodalInputConnectStub::StubGetWindowPid(MessageParcel& data, Messag
     WRITEINT32(reply, ret, ERR_INVALID_VALUE);
     return RET_OK;
 }
+
+int32_t MultimodalInputConnectStub::StubAppendExtraData(MessageParcel& data, MessageParcel& reply)
+{
+    CALL_DEBUG_ENTER;
+    if (!IsRunning()) {
+        MMI_HILOGE("Service is not running");
+        return MMISERVICE_NOT_RUNNING;
+    }
+    ExtraData extraData;
+    READBOOL(data, extraData.appended, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t size = 0;
+    READINT32(data, size, IPC_PROXY_DEAD_OBJECT_ERR);
+    if (size > ExtraData::MAX_BUFFER_SIZE) {
+        MMI_HILOGE("Append extra data failed, buffer is oversize:%{public}d", size);
+        return ERROR_OVER_SIZE_BUFFER;
+    }
+    uint8_t buffer = 0;
+    for (int32_t i = 0; i < size; ++i) {
+        READUINT8(data, buffer, IPC_PROXY_DEAD_OBJECT_ERR);
+        extraData.buffer.push_back(buffer);
+    }
+    READINT32(data, extraData.sourceType, IPC_PROXY_DEAD_OBJECT_ERR);
+    int32_t ret = AppendExtraData(extraData);
+    if (ret != RET_OK) {
+        MMI_HILOGE("Fail to call AppendExtraData, ret:%{public}d", ret);
+    }
+    return ret;
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/module_loader/include/mmi_service.h b/service/module_loader/include/mmi_service.h
index d328e16ec5..74af4794dc 100644
--- a/service/module_loader/include/mmi_service.h
+++ b/service/module_loader/include/mmi_service.h
@@ -88,6 +88,8 @@ public:
     int32_t SetPointerLocation(int32_t x, int32_t y) override;
     virtual int32_t SetMouseCaptureMode(int32_t windowId, bool isCaptureMode) override;
     int32_t GetWindowPid(int32_t windowId) override;
+    int32_t AppendExtraData(const ExtraData& extraData) override;
+
 #ifdef OHOS_RSS_CLIENT
     void OnAddSystemAbility(int32_t systemAbilityId, const std::string& deviceId) override;
 #endif
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 1cfd67fc73..4008c38914 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -1345,5 +1345,16 @@ int32_t MMIService::GetWindowPid(int32_t windowId)
     MMI_HILOGD("windowpid is %{public}d", windowPid);
     return windowPid;
 }
+
+int32_t MMIService::AppendExtraData(const ExtraData& extraData)
+{
+    CALL_DEBUG_ENTER;
+    int32_t ret = delegateTasks_.PostSyncTask(std::bind(&InputWindowsManager::AppendExtraData,
+        WinMgr, extraData));
+    if (ret != RET_OK) {
+        MMI_HILOGE("Append extra data failed:%{public}d", ret);
+    }
+    return ret;
+}
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
index 14735f4b74..821d1a9008 100644
--- a/service/window_manager/include/input_windows_manager.h
+++ b/service/window_manager/include/input_windows_manager.h
@@ -17,6 +17,7 @@
 
 #include <vector>
 
+#include "extra_data.h"
 #include "libinput.h"
 #include "nocopyable.h"
 #include "singleton.h"
@@ -90,6 +91,7 @@ public:
     void DeviceStatusChanged(int32_t deviceId, const std::string &sysUid, const std::string devStatus);
     int32_t GetDisplayBindInfo(DisplayBindInfos &infos);
     int32_t SetDisplayBind(int32_t deviceId, int32_t displayId, std::string &msg);
+    int32_t AppendExtraData(const ExtraData& extraData);
 private:
 #if defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
     bool IsInHotArea(int32_t x, int32_t y, const std::vector<Rect> &rects) const;
@@ -156,6 +158,7 @@ private:
         int32_t windowId { -1 };
         bool isCaptureMode { false };
     } captureModeInfo_;
+    ExtraData extraData_;
 };
 
 #define WinMgr ::OHOS::DelayedSingleton<InputWindowsManager>::GetInstance()
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index b0b0a530b6..9e7a2bb1e2 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -363,6 +363,11 @@ void InputWindowsManager::SendPointerEvent(int32_t pointerAction)
     pointerEvent->SetActionTime(time);
     pointerEvent->SetActionStartTime(time);
     pointerEvent->UpdateId();
+    if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_MOUSE) {
+        pointerEvent->SetBuffer(extraData_.buffer);
+    } else {
+        pointerEvent->ClearBuffer();
+    }
 
     auto fd = udsServer_->GetClientFd(lastWindowInfo_.pid);
     auto sess = udsServer_->GetSession(fd);
@@ -434,7 +439,11 @@ void InputWindowsManager::DispatchPointer(int32_t pointerAction)
     pointerEvent->SetActionTime(time);
     pointerEvent->SetActionStartTime(time);
     pointerEvent->SetDeviceId(lastPointerEvent_->GetDeviceId());
-
+    if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_MOUSE) {
+        pointerEvent->SetBuffer(extraData_.buffer);
+    } else {
+        pointerEvent->ClearBuffer();
+    }
     auto fd = udsServer_->GetClientFd(lastWindowInfo_.pid);
     if (fd == RET_ERR) {
         auto windowInfo = GetWindowInfo(lastLogicX_, lastLogicY_);
@@ -857,13 +866,22 @@ std::optional<WindowInfo> InputWindowsManager::SelectWindowInfo(int32_t logicalX
     int32_t action = pointerEvent->GetPointerAction();
     if ((firstBtnDownWindowId_ == -1) ||
         ((action == PointerEvent::POINTER_ACTION_BUTTON_DOWN) && (pointerEvent->GetPressedButtons().size() == 1)) ||
-        ((action == PointerEvent::POINTER_ACTION_MOVE) && (pointerEvent->GetPressedButtons().empty()))) {
+        ((action == PointerEvent::POINTER_ACTION_MOVE) && (pointerEvent->GetPressedButtons().empty())) ||
+        (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_MOUSE)) {
         int32_t targetWindowId = pointerEvent->GetTargetWindowId();
         for (const auto &item : displayGroupInfo_.windowsInfo) {
             if ((item.flags & WindowInfo::FLAG_BIT_UNTOUCHABLE) == WindowInfo::FLAG_BIT_UNTOUCHABLE) {
                 MMI_HILOGD("Skip the untouchable window to continue searching, "
                            "window:%{public}d, flags:%{public}d", item.id, item.flags);
                 continue;
+            } else if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_MOUSE) {
+                if (IsInHotArea(logicalX, logicalY, item.pointerHotAreas)) {
+                    firstBtnDownWindowId_ = item.id;
+                    MMI_HILOGI("Mouse event select drag window, window:%{public}d", firstBtnDownWindowId_);
+                    break;
+                } else {
+                    continue;
+                }
             } else if ((targetWindowId < 0) && (IsInHotArea(logicalX, logicalY, item.pointerHotAreas))) {
                 firstBtnDownWindowId_ = item.id;
                 MMI_HILOGW("Find out the dispatch window of this pointer event when the targetWindowId "
@@ -989,6 +1007,11 @@ int32_t InputWindowsManager::UpdateMouseTarget(std::shared_ptr<PointerEvent> poi
     pointerItem.SetWindowX(windowX);
     pointerItem.SetWindowY(windowY);
     pointerEvent->UpdatePointerItem(pointerId, pointerItem);
+    if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_MOUSE) {
+        pointerEvent->SetBuffer(extraData_.buffer);
+    } else {
+        pointerEvent->ClearBuffer();
+    }
     CHKPR(udsServer_, ERROR_NULL_POINTER);
 #ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
     UpdatePointerEvent(logicalX, logicalY, pointerEvent, *touchWindow);
@@ -1073,6 +1096,14 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
                        "window:%{public}d, flags:%{public}d", item.id, item.flags);
             continue;
         }
+        if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_TOUCHSCREEN) {
+            if (IsInHotArea(logicalX, logicalY, item.defaultHotAreas)) {
+                touchWindow = &item;
+                break;
+            } else {
+                continue;
+            }
+        }
         if (targetWindowId >= 0) {
             if (item.id == targetWindowId) {
                 touchWindow = &item;
@@ -1107,6 +1138,11 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
     pointerItem.SetToolWindowY(pointerItem.GetToolDisplayY() + physicDisplayInfo->y - touchWindow->area.y);
     pointerItem.SetTargetWindowId(touchWindow->id);
     pointerEvent->UpdatePointerItem(pointerId, pointerItem);
+    if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_TOUCHSCREEN) {
+        pointerEvent->SetBuffer(extraData_.buffer);
+    } else {
+        pointerEvent->ClearBuffer();
+    }
     MMI_HILOGD("pid:%{public}d,logicalX:%{public}d,logicalY:%{public}d,"
                "physicalX:%{public}d,physicalY:%{public}d,windowX:%{public}d,windowY:%{public}d,"
                "displayId:%{public}d,TargetWindowId:%{public}d,AgentWindowId:%{public}d",
@@ -1291,6 +1327,15 @@ MouseLocation InputWindowsManager::GetMouseInfo()
 }
 #endif // OHOS_BUILD_ENABLE_POINTER
 
+int32_t InputWindowsManager::AppendExtraData(const ExtraData& extraData)
+{
+    CALL_DEBUG_ENTER;
+    extraData_.appended = extraData.appended;
+    extraData_.buffer = extraData.buffer;
+    extraData_.sourceType = extraData.sourceType;
+    return RET_OK;
+}
+
 void InputWindowsManager::Dump(int32_t fd, const std::vector<std::string> &args)
 {
     CALL_DEBUG_ENTER;
diff --git a/test/unittest/common/src/event_util_test.cpp b/test/unittest/common/src/event_util_test.cpp
index 138688991a..dfd86ae49e 100644
--- a/test/unittest/common/src/event_util_test.cpp
+++ b/test/unittest/common/src/event_util_test.cpp
@@ -188,6 +188,11 @@ std::string EventUtilTest::DumpInputEvent(const std::shared_ptr<PointerEvent>& p
     const int precision = 2;
     std::ostringstream ostream;
     std::vector<int32_t> pointerIds { pointerEvent->GetPointerIds() };
+    std::string str;
+    std::vector<uint8_t> buffer = pointerEvent->GetBuffer();
+    for (const auto& buff : buffer) {
+        str += std::to_string(buff);
+    }
     ostream << "ClientMsgHandler: in OnPointerEvent"
          << ",EventType:" << pointerEvent->GetEventType()
          << ",ActionTime:" << pointerEvent->GetActionTime()
@@ -201,7 +206,9 @@ std::string EventUtilTest::DumpInputEvent(const std::shared_ptr<PointerEvent>& p
          << ",VerticalAxisValue:" << std::fixed << std::setprecision(precision)
          << pointerEvent->GetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_VERTICAL)
          << ",HorizontalAxisValue:" << std::fixed << std::setprecision(precision)
-         << pointerEvent->GetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_HORIZONTAL);
+         << pointerEvent->GetAxisValue(PointerEvent::AXIS_TYPE_SCROLL_HORIZONTAL)
+         <<",BufferCount:" << buffer.size()
+         <<",Buffer:" << str.c_str();
     for (const auto &pointerId : pointerIds) {
         PointerEvent::PointerItem item;
         if (!pointerEvent->GetPointerItem(pointerId, item)) {
@@ -222,6 +229,7 @@ std::string EventUtilTest::DumpInputEvent(const std::shared_ptr<PointerEvent>& p
             << ",DeviceId:" << item.GetDeviceId() << ",RawDx:" << item.GetRawDx()
             << ",RawDy:" << item.GetRawDy();
     }
+
     return ostream.str();
 }
 
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 68daed33af..149b2ff64c 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -26,6 +26,7 @@ config("libmmi_util_public_config") {
     "socket/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/common/include",
     "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
+    "//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include",
   ]
 }
 
diff --git a/util/common/include/define_multimodal.h b/util/common/include/define_multimodal.h
index 73fd959375..1250509277 100644
--- a/util/common/include/define_multimodal.h
+++ b/util/common/include/define_multimodal.h
@@ -243,6 +243,14 @@ inline constexpr int32_t INVALID_PID { -1 };
         } \
     } while (0)
 
+#define WRITEUINT8(parcel, data, ...) \
+    do { \
+        if (!(parcel).WriteUint8(data)) { \
+            MMI_HILOGE("WriteUint8 "#data" failed"); \
+            return DEFRET(false, ##__VA_ARGS__); \
+        } \
+    } while (0)
+
 #define WRITEUINT32(parcel, data, ...) \
     do { \
         if (!(parcel).WriteUint32(data)) { \
@@ -299,6 +307,14 @@ inline constexpr int32_t INVALID_PID { -1 };
         } \
     } while (0)
 
+#define READUINT8(parcel, data, ...) \
+    do { \
+        if (!(parcel).ReadUint8(data)) { \
+            MMI_HILOGE("ReadUint8 "#data" failed"); \
+            return DEFRET(false, ##__VA_ARGS__); \
+        } \
+    } while (0)
+
 #define READUINT32(parcel, data, ...) \
     do { \
         if (!(parcel).ReadUint32(data)) { \
diff --git a/util/common/include/error_multimodal.h b/util/common/include/error_multimodal.h
index 7bf15af755..4b80adc521 100644
--- a/util/common/include/error_multimodal.h
+++ b/util/common/include/error_multimodal.h
@@ -96,6 +96,8 @@ enum {
     DUMP_PARAM_ERR,
     // 过滤器增加失败
     ERROR_FILTER_ADD_FAIL,
+    // buffer过长失败
+    ERROR_OVER_SIZE_BUFFER,
 };
 
 enum {
diff --git a/util/common/src/input_event_data_transformation.cpp b/util/common/src/input_event_data_transformation.cpp
index 6fa819f019..e913138ea2 100644
--- a/util/common/src/input_event_data_transformation.cpp
+++ b/util/common/src/input_event_data_transformation.cpp
@@ -16,6 +16,7 @@
 #include "input_event_data_transformation.h"
 
 #include "define_multimodal.h"
+#include "extra_data.h"
 
 namespace OHOS {
 namespace MMI {
@@ -194,6 +195,15 @@ int32_t InputEventDataTransformation::Marshalling(std::shared_ptr<PointerEvent>
     for (const auto &keyCode : pressedKeys) {
         pkt << keyCode;
     }
+    std::vector<uint8_t> buffer = event->GetBuffer();
+    if (buffer.size() > ExtraData::MAX_BUFFER_SIZE) {
+        MMI_HILOGE("buffer is oversize:%{public}d", buffer.size());
+        return RET_ERR;
+    }
+    pkt << buffer.size();
+    for (const auto &buf : buffer) {
+        pkt << buf;
+    }
     if (pkt.ChkRWError()) {
         MMI_HILOGE("Marshalling pointer event failed");
         return RET_ERR;
@@ -248,6 +258,20 @@ int32_t InputEventDataTransformation::Unmarshalling(NetPacket &pkt, std::shared_
         return RET_ERR;
     }
     event->SetPressedKeys(pressedKeys);
+    
+    std::vector<uint8_t> buffer;
+    std::vector<uint8_t>::size_type bufferSize;
+    pkt >> bufferSize;
+    uint8_t buff = 0;
+    while (bufferSize-- > 0) {
+        pkt >> buff;
+        buffer.push_back(buff);
+    }
+    if (pkt.ChkRWError()) {
+        MMI_HILOGE("Unmarshalling pointer event failed");
+        return RET_ERR;
+    }
+    event->SetBuffer(buffer);
     return RET_OK;
 }
 
-- 
Gitee


From d00925e1ae253d947a258192f75aa3c7a5e5b4f7 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 30 Dec 2022 02:22:06 +0000
Subject: [PATCH 298/360] mod innerrkit GetPointerStyle

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I63635276e47c1a04f303bb5ac6d281787c3163a9
---
 frameworks/proxy/events/test/input_manager_test.cpp       | 7 ++++---
 test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.cpp | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 19e9f5828c..cad9cfb4ea 100644
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -3576,10 +3576,11 @@ HWTEST_F(InputManagerTest, InputManagerTest_SetPointerStyle_001, TestSize.Level1
     CALL_TEST_DEBUG;
     auto window = WindowUtilsTest::GetInstance()->GetWindow();
     uint32_t windowId = window->GetWindowId();
-    int32_t pointerStyle;
-    if (InputManager::GetInstance()->SetPointerStyle(windowId, MOUSE_ICON::CROSS) == RET_OK) {
+    PointerStyle pointerStyle;
+    pointerStyle.id = MOUSE_ICON::CROSS;
+    if (InputManager::GetInstance()->SetPointerStyle(windowId, pointerStyle) == RET_OK) {
         ASSERT_TRUE(InputManager::GetInstance()->GetPointerStyle(windowId, pointerStyle) == RET_OK);
-        ASSERT_EQ(pointerStyle, MOUSE_ICON::CROSS);
+        ASSERT_EQ(pointerStyle.id, MOUSE_ICON::CROSS);
     }
 }
 
diff --git a/test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.cpp b/test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.cpp
index a5d6d8854a..41deaf5199 100644
--- a/test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.cpp
+++ b/test/fuzztest/pointerstyle_fuzzer/pointerstyle_fuzzer.cpp
@@ -117,8 +117,8 @@ void PointerStyleFuzzTest(const uint8_t* data, size_t size)
     size_t startPos = 0;
     startPos += GetObject<int32_t>(data + startPos, size - startPos, windowId);
     UpdateDisplayInfo(data, size, windowId);
-    int32_t pointerStyle;
-    GetObject<int32_t>(data + startPos, size - startPos, pointerStyle);
+    PointerStyle pointerStyle;
+    GetObject<int32_t>(data + startPos, size - startPos, pointerStyle.id);
     InputManager::GetInstance()->SetPointerStyle(windowId, pointerStyle);
     InputManager::GetInstance()->GetPointerStyle(windowId, pointerStyle);
 }
-- 
Gitee


From 4e7a60e4e18b21c615944e0783b3575e9fb5c461 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 30 Dec 2022 02:24:13 +0000
Subject: [PATCH 299/360] mod innerrkit GetPointerStyle

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Idf5ecffa6f368ffc6baa246bf98d48f0da5e8d6f
---
 .../innerkits/proxy/include/input_manager.h   | 53 -------------------
 1 file changed, 53 deletions(-)

diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index a7ade0be13..2cd3b376d6 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -323,59 +323,6 @@ public:
      */
     int32_t SetInputDevice(const std::string &dhid, const std::string &screenId);
 
-    /**
-     * @brief Registers a listener for screen hopping events of the mouse pointer.
-     * @param listener Indicates the listener for screen hopping events of the mouse pointer.
-     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
-     * @since 9
-     */
-    int32_t RegisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener);
-
-    /**
-     * @brief Unregisters the listener for screen hopping events of the mouse pointer.
-     * @param listener Indicates the listener for screen hopping events of the mouse pointer.
-     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
-     * @since 9
-     */
-    int32_t UnregisterCooperateListener(std::shared_ptr<IInputDeviceCooperateListener> listener = nullptr);
-
-    /**
-     * @brief Enables or disables screen hopping for the mouse pointer.
-     * @param enabled Indicates whether to enable or disable screen hopping for the mouse pointer.
-     * @param callback Indicates the callback used to receive the result of enabling or disabling screen hopping.
-     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
-     * @since 9
-     */
-    int32_t EnableInputDeviceCooperate(bool enabled, std::function<void(std::string, CooperationMessage)> callback);
-
-    /**
-     * @brief Starts screen hopping for the mouse pointer.
-     * @param sinkDeviceId Indicates the descriptor of the target input device (network ID) for screen hopping.
-     * @param srcInputDeviceId Indicates the ID of the source input device (device ID handle) for screen hopping.
-     * @param callback Indicates the callback used to receive the result of starting screen hopping.
-     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
-     * @since 9
-     */
-    int32_t StartInputDeviceCooperate(const std::string &sinkDeviceId, int32_t srcInputDeviceId,
-        std::function<void(std::string, CooperationMessage)> callback);
-
-    /**
-     * @brief Stops screen hopping for the mouse pointer.
-     * @param callback Indicates the callback used to receive the result of stopping screen hopping.
-     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
-     * @since 9
-     */
-    int32_t StopDeviceCooperate(std::function<void(std::string, CooperationMessage)> callback);
-
-    /**
-     * @brief Obtains the screen hopping status of a mouse pointer.
-     * @param deviceId Indicates the descriptor of the input device.
-     * @param callback Indicates the callback used to receive the screen hopping status.
-     * @return Returns <b>0</b> if success; returns a non-0 value otherwise.
-     * @since 9
-     */
-    int32_t GetInputDeviceCooperateState(const std::string &deviceId, std::function<void(bool)> callback);
-
     /**
      * @brief Obtains the enablement status of the specified function key on the keyboard.
      * @param funcKey Indicates the function key. Currently, the following function keys are supported:
-- 
Gitee


From 437290e1d8e06c420e5865af6c3b0dd77b14f996 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 30 Dec 2022 02:25:13 +0000
Subject: [PATCH 300/360] mod innerrkit GetPointerStyle

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ib596d2dedd2d63670e588b2b97f59fa2431aa388
---
 interfaces/native/innerkits/proxy/include/input_manager.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/interfaces/native/innerkits/proxy/include/input_manager.h b/interfaces/native/innerkits/proxy/include/input_manager.h
index 2cd3b376d6..7598e3cd52 100644
--- a/interfaces/native/innerkits/proxy/include/input_manager.h
+++ b/interfaces/native/innerkits/proxy/include/input_manager.h
@@ -377,5 +377,4 @@ private:
 };
 } // namespace MMI
 } // namespace OHOS
-#define InputMgr OHOS::MMI::InputManager::GetInstance()
 #endif // INPUT_MANAGER_H
-- 
Gitee


From f9f64b5432a4cc1ff21edf595cbce1691703d8b9 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 30 Dec 2022 02:37:55 +0000
Subject: [PATCH 301/360] mod innerrkit GetPointerStyle

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Idc6604a819192d143ebda7023d4e792292fd1ffe
---
 interfaces/native/innerkits/event/include/pointer_style.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interfaces/native/innerkits/event/include/pointer_style.h b/interfaces/native/innerkits/event/include/pointer_style.h
index d095f123f9..dfdce4659c 100644
--- a/interfaces/native/innerkits/event/include/pointer_style.h
+++ b/interfaces/native/innerkits/event/include/pointer_style.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
-- 
Gitee


From 9884411ba1435a6963a6ed64f8ec922ab8bc1797 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 30 Dec 2022 03:01:16 +0000
Subject: [PATCH 302/360] mod innerrkit GetPointerStyle

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I9256749fc881bd0575603ef6e507d13f8e750938
---
 service/window_manager/src/pointer_drawing_manager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
index 50a220a443..4039991199 100644
--- a/service/window_manager/src/pointer_drawing_manager.cpp
+++ b/service/window_manager/src/pointer_drawing_manager.cpp
@@ -499,7 +499,8 @@ int32_t PointerDrawingManager::SetPointerStyle(int32_t pid, int32_t windowId, Po
     }
 
     if (!WinMgr->IsNeedRefreshLayer(windowId)) {
-        MMI_HILOGD("Not need refresh layer, window type:%{public}d, pointer style:%{public}d", windowId, pointerStyle.id);
+        MMI_HILOGD("Not need refresh layer, window type:%{public}d, pointer style:%{public}d",
+            windowId, pointerStyle.id);
         return RET_OK;
     }
 
-- 
Gitee


From fb345de02c459318b15dcf129c67a4827ec742b5 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 30 Dec 2022 04:05:17 +0000
Subject: [PATCH 303/360] mod innerrkit GetPointerStyle

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I035c12863329d4cd5d2186ed732659b96def0dac
---
 frameworks/proxy/event_handler/include/input_manager_impl.h | 2 +-
 frameworks/proxy/event_handler/src/input_manager_impl.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frameworks/proxy/event_handler/include/input_manager_impl.h b/frameworks/proxy/event_handler/include/input_manager_impl.h
index 8b44b193f5..976bfa7ad5 100644
--- a/frameworks/proxy/event_handler/include/input_manager_impl.h
+++ b/frameworks/proxy/event_handler/include/input_manager_impl.h
@@ -101,7 +101,7 @@ public:
 
     int32_t SetPointerVisible(bool visible);
     bool IsPointerVisible();
-    int32_t SetPointerStyle(int32_t windowId, PointerStyle pointerStyle);
+    int32_t SetPointerStyle(int32_t windowId, const PointerStyle& pointerStyle);
     int32_t GetPointerStyle(int32_t windowId, PointerStyle &pointerStyle);
 
     int32_t SetPointerSpeed(int32_t speed);
diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 412d72274b..449618e6bd 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -643,7 +643,7 @@ int32_t InputManagerImpl::GetPointerSpeed(int32_t &speed)
 #endif // OHOS_BUILD_ENABLE_POINTER
 }
 
-int32_t InputManagerImpl::SetPointerStyle(int32_t windowId, PointerStyle pointerStyle)
+int32_t InputManagerImpl::SetPointerStyle(int32_t windowId, const PointerStyle& pointerStyle)
 {
     CALL_DEBUG_ENTER;
     if (windowId < 0 || pointerStyle.id < 0) {
-- 
Gitee


From af48694d0b177680dc47ba6d6191e3bf4ff8b3fb Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 30 Dec 2022 05:29:13 +0000
Subject: [PATCH 304/360] Rectify the problem that code synchronization in the
 yellow zone fails

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I56e1e4f7eb1fd82fd6920c208ace37653df496f1
---
 .../enableinputdevicecooperate_fuzzer/BUILD.gn        | 11 +++++++++--
 .../enableinputdevicecooperate_fuzzer.cpp             |  4 ++--
 .../getinputdevicecooperatestate_fuzzer/BUILD.gn      | 10 +++++++---
 .../registercooperatelistener_fuzzer/BUILD.gn         | 11 +++++++++--
 .../startinputdevicecooperate_fuzzer/BUILD.gn         | 11 +++++++++--
 .../startinputdevicecooperate_fuzzer.cpp              |  4 ++--
 test/fuzztest/stopdevicecooperate_fuzzer/BUILD.gn     | 11 +++++++++--
 .../stopdevicecooperate_fuzzer.cpp                    |  4 ++--
 8 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/test/fuzztest/enableinputdevicecooperate_fuzzer/BUILD.gn b/test/fuzztest/enableinputdevicecooperate_fuzzer/BUILD.gn
index 8496d9d183..e535e3e4eb 100644
--- a/test/fuzztest/enableinputdevicecooperate_fuzzer/BUILD.gn
+++ b/test/fuzztest/enableinputdevicecooperate_fuzzer/BUILD.gn
@@ -21,8 +21,11 @@ module_output_path = "multimodalinput/fuzz"
 ohos_fuzztest("EnableInputDeviceCooperateFuzzTest") {
   module_out_path = module_output_path
   fuzz_config_file = "//foundation/multimodalinput/input/test/fuzztest/enableinputdevicecooperate_fuzzer"
-  include_dirs =
-      [ "//foundation/multimodalinput/input/interfaces/util/common/include" ]
+  include_dirs = [
+    "//foundation/multimodalinput/input/interfaces/util/common/include",
+    "//foundation/multimodalinput/input/frameworks/proxy/event_handler/include",
+    "//foundation/multimodalinput/input/frameworks/proxy/module_loader/include",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -30,6 +33,10 @@ ohos_fuzztest("EnableInputDeviceCooperateFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "enableinputdevicecooperate_fuzzer.cpp" ]
+  configs = [
+    "//foundation/multimodalinput/input/util:libmmi_util_public_config",
+    "//foundation/multimodalinput/input/service/filter:mmi_event_filter_config",
+  ]
   deps = [ "${mmi_path}/frameworks/proxy:libmmi-client" ]
   external_deps = [
     "c_utils:utils",
diff --git a/test/fuzztest/enableinputdevicecooperate_fuzzer/enableinputdevicecooperate_fuzzer.cpp b/test/fuzztest/enableinputdevicecooperate_fuzzer/enableinputdevicecooperate_fuzzer.cpp
index c102d5a703..fb42e0da0a 100644
--- a/test/fuzztest/enableinputdevicecooperate_fuzzer/enableinputdevicecooperate_fuzzer.cpp
+++ b/test/fuzztest/enableinputdevicecooperate_fuzzer/enableinputdevicecooperate_fuzzer.cpp
@@ -15,7 +15,7 @@
 
 #include "enableinputdevicecooperate_fuzzer.h"
 #include "securec.h"
-#include "input_manager.h"
+#include "input_manager_impl.h"
 #include "mmi_log.h"
 
 namespace OHOS {
@@ -31,7 +31,7 @@ void EnableInputDeviceCooperateFuzzTest(const uint8_t* data, size_t size)
     auto fun = [](std::string listener, CooperationMessage cooperateMessages) {
         MMI_HILOGD("EnableInputDeviceCooperateFuzzTest");
     };
-    InputManager::GetInstance()->EnableInputDeviceCooperate(enabled, fun);
+    InputMgrImpl.EnableInputDeviceCooperate(enabled, fun);
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/test/fuzztest/getinputdevicecooperatestate_fuzzer/BUILD.gn b/test/fuzztest/getinputdevicecooperatestate_fuzzer/BUILD.gn
index 32a18c9864..adcc3ce218 100644
--- a/test/fuzztest/getinputdevicecooperatestate_fuzzer/BUILD.gn
+++ b/test/fuzztest/getinputdevicecooperatestate_fuzzer/BUILD.gn
@@ -22,9 +22,9 @@ ohos_fuzztest("GetInputDeviceCooperateStateFuzzTest") {
   module_out_path = module_output_path
   fuzz_config_file = "//foundation/multimodalinput/input/test/fuzztest/getinputdevicecooperatestate_fuzzer"
   include_dirs = [
-    "//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include",
-    "//foundation/window/window_manager/previewer/mock",
-    "//foundation/bundlemanager/bundle_framework/services/bundlemgr/test/mock/include",
+    "//foundation/multimodalinput/input/interfaces/util/common/include",
+    "//foundation/multimodalinput/input/frameworks/proxy/event_handler/include",
+    "//foundation/multimodalinput/input/frameworks/proxy/module_loader/include",
   ]
   cflags = [
     "-g",
@@ -33,6 +33,10 @@ ohos_fuzztest("GetInputDeviceCooperateStateFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "getinputdevicecooperatestate_fuzzer.cpp" ]
+  configs = [
+    "//foundation/multimodalinput/input/util:libmmi_util_public_config",
+    "//foundation/multimodalinput/input/service/filter:mmi_event_filter_config",
+  ]
   deps = [ "${mmi_path}/frameworks/proxy:libmmi-client" ]
   external_deps = [
     "c_utils:utils",
diff --git a/test/fuzztest/registercooperatelistener_fuzzer/BUILD.gn b/test/fuzztest/registercooperatelistener_fuzzer/BUILD.gn
index 494847ce24..1e4c738759 100644
--- a/test/fuzztest/registercooperatelistener_fuzzer/BUILD.gn
+++ b/test/fuzztest/registercooperatelistener_fuzzer/BUILD.gn
@@ -21,8 +21,11 @@ module_output_path = "multimodalinput/fuzz"
 ohos_fuzztest("RegisterCooperateListenerFuzzTest") {
   module_out_path = module_output_path
   fuzz_config_file = "//foundation/multimodalinput/input/test/fuzztest/registercooperatelistener_fuzzer"
-  include_dirs =
-      [ "//foundation/multimodalinput/input/interfaces/util/common/include" ]
+  include_dirs = [
+    "//foundation/multimodalinput/input/interfaces/util/common/include",
+    "//foundation/multimodalinput/input/frameworks/proxy/event_handler/include",
+    "//foundation/multimodalinput/input/frameworks/proxy/module_loader/include",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -30,6 +33,10 @@ ohos_fuzztest("RegisterCooperateListenerFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "registercooperatelistener_fuzzer.cpp" ]
+  configs = [
+    "//foundation/multimodalinput/input/util:libmmi_util_public_config",
+    "//foundation/multimodalinput/input/service/filter:mmi_event_filter_config",
+  ]
   deps = [ "${mmi_path}/frameworks/proxy:libmmi-client" ]
   external_deps = [
     "c_utils:utils",
diff --git a/test/fuzztest/startinputdevicecooperate_fuzzer/BUILD.gn b/test/fuzztest/startinputdevicecooperate_fuzzer/BUILD.gn
index 1dba1f443d..3c1418823f 100644
--- a/test/fuzztest/startinputdevicecooperate_fuzzer/BUILD.gn
+++ b/test/fuzztest/startinputdevicecooperate_fuzzer/BUILD.gn
@@ -21,8 +21,11 @@ module_output_path = "multimodalinput/fuzz"
 ohos_fuzztest("StartInputDeviceCooperateFuzzTest") {
   module_out_path = module_output_path
   fuzz_config_file = "//foundation/multimodalinput/input/test/fuzztest/startinputdevicecooperate_fuzzer"
-  include_dirs =
-      [ "//foundation/multimodalinput/input/interfaces/util/common/include" ]
+  include_dirs = [
+    "//foundation/multimodalinput/input/interfaces/util/common/include",
+    "//foundation/multimodalinput/input/frameworks/proxy/event_handler/include",
+    "//foundation/multimodalinput/input/frameworks/proxy/module_loader/include",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -30,6 +33,10 @@ ohos_fuzztest("StartInputDeviceCooperateFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "startinputdevicecooperate_fuzzer.cpp" ]
+  configs = [
+    "//foundation/multimodalinput/input/util:libmmi_util_public_config",
+    "//foundation/multimodalinput/input/service/filter:mmi_event_filter_config",
+  ]
   deps = [ "${mmi_path}/frameworks/proxy:libmmi-client" ]
   external_deps = [
     "c_utils:utils",
diff --git a/test/fuzztest/startinputdevicecooperate_fuzzer/startinputdevicecooperate_fuzzer.cpp b/test/fuzztest/startinputdevicecooperate_fuzzer/startinputdevicecooperate_fuzzer.cpp
index af0f89b5a8..27a2868509 100644
--- a/test/fuzztest/startinputdevicecooperate_fuzzer/startinputdevicecooperate_fuzzer.cpp
+++ b/test/fuzztest/startinputdevicecooperate_fuzzer/startinputdevicecooperate_fuzzer.cpp
@@ -15,7 +15,7 @@
 
 #include "startinputdevicecooperate_fuzzer.h"
 
-#include "input_manager.h"
+#include "input_manager_impl.h"
 #include "mmi_log.h"
 
 namespace OHOS {
@@ -34,7 +34,7 @@ void StartInputDeviceCooperateFuzzTest(const uint8_t* data, size_t  size)
     auto fun = [](std::string listener, CooperationMessage cooperateMessages) {
         MMI_HILOGD("StartInputDeviceCooperateFuzzTest");
     };
-    InputManager::GetInstance()->StartInputDeviceCooperate(sinkDeviceId, srcInputDeviceId, fun);
+    InputMgrImpl.StartInputDeviceCooperate(sinkDeviceId, srcInputDeviceId, fun);
 }
 } // MMI
 } // OHOS
diff --git a/test/fuzztest/stopdevicecooperate_fuzzer/BUILD.gn b/test/fuzztest/stopdevicecooperate_fuzzer/BUILD.gn
index 945145b25e..31eeff0d5a 100644
--- a/test/fuzztest/stopdevicecooperate_fuzzer/BUILD.gn
+++ b/test/fuzztest/stopdevicecooperate_fuzzer/BUILD.gn
@@ -21,8 +21,11 @@ module_output_path = "multimodalinput/fuzz"
 ohos_fuzztest("StopDeviceCooperateFuzzTest") {
   module_out_path = module_output_path
   fuzz_config_file = "//foundation/multimodalinput/input/test/fuzztest/stopdevicecooperate_fuzzer"
-  include_dirs =
-      [ "//foundation/multimodalinput/input/interfaces/util/common/include" ]
+  include_dirs = [
+    "//foundation/multimodalinput/input/interfaces/util/common/include",
+    "//foundation/multimodalinput/input/frameworks/proxy/event_handler/include",
+    "//foundation/multimodalinput/input/frameworks/proxy/module_loader/include",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -30,6 +33,10 @@ ohos_fuzztest("StopDeviceCooperateFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [ "stopdevicecooperate_fuzzer.cpp" ]
+  configs = [
+    "//foundation/multimodalinput/input/util:libmmi_util_public_config",
+    "//foundation/multimodalinput/input/service/filter:mmi_event_filter_config",
+  ]
   deps = [ "${mmi_path}/frameworks/proxy:libmmi-client" ]
   external_deps = [
     "c_utils:utils",
diff --git a/test/fuzztest/stopdevicecooperate_fuzzer/stopdevicecooperate_fuzzer.cpp b/test/fuzztest/stopdevicecooperate_fuzzer/stopdevicecooperate_fuzzer.cpp
index 62dbeeaa69..561829e890 100644
--- a/test/fuzztest/stopdevicecooperate_fuzzer/stopdevicecooperate_fuzzer.cpp
+++ b/test/fuzztest/stopdevicecooperate_fuzzer/stopdevicecooperate_fuzzer.cpp
@@ -15,7 +15,7 @@
 
 #include "stopdevicecooperate_fuzzer.h"
 
-#include "input_manager.h"
+#include "input_manager_impl.h"
 #include "mmi_log.h"
 
 namespace OHOS {
@@ -30,7 +30,7 @@ void StopDeviceCooperateFuzzTest(size_t  size)
         MMI_HILOGD("StopDeviceCooperateFuzzTest");
     };
 
-    InputManager::GetInstance()->StopDeviceCooperate(fun);
+    InputMgrImpl.StopDeviceCooperate(fun);
 }
 } // MMI
 } // OHOS
-- 
Gitee


From b8aa86f01da17c2c9331c41ec1bd0c708a7a6dd7 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Fri, 30 Dec 2022 06:45:02 +0000
Subject: [PATCH 305/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I1081f1c3517abbbb4c32c4bed5e5ba66ab0d7a1d
---
 frameworks/proxy/event_handler/src/input_manager_impl.cpp | 2 +-
 frameworks/proxy/events/include/event_log_helper.h        | 2 +-
 util/common/src/input_event_data_transformation.cpp       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 816b5d6470..8910db8faf 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -1031,7 +1031,7 @@ void InputManagerImpl::AppendExtraData(const ExtraData& extraData)
     CALL_DEBUG_ENTER;
     std::lock_guard<std::mutex> guard(mtx_);
     if (extraData.buffer.size() > ExtraData::MAX_BUFFER_SIZE) {
-        MMI_HILOGE("Append extra data failed, buffer is oversize:%{public}d", extraData.buffer.size());
+        MMI_HILOGE("Append extra data failed, buffer is oversize:%{public}zu", extraData.buffer.size());
         return;
     }
     int32_t ret = MultimodalInputConnMgr->AppendExtraData(extraData);
diff --git a/frameworks/proxy/events/include/event_log_helper.h b/frameworks/proxy/events/include/event_log_helper.h
index abd1c4c8c5..ab27d0318f 100644
--- a/frameworks/proxy/events/include/event_log_helper.h
+++ b/frameworks/proxy/events/include/event_log_helper.h
@@ -79,7 +79,7 @@ private:
             "RzAbsValue:%{public}.2f,GasAbsValue:%{public}.2f,BrakeAbsValue:%{public}.2f,"
             "Hat0xAbsValue:%{public}.2f,Hat0yAbsValue:%{public}.2f,ThrottleAbsValue:%{public}.2f,"
             "PointerId:%{public}d,PointerCount:%{public}zu,EventNumber:%{public}d,"
-            "BufferCount:%{public}d,Buffer:%{public}s",
+            "BufferCount:%{public}zu,Buffer:%{public}s",
             InputEvent::EventTypeToString(event->GetEventType()), event->GetActionTime(),
             event->GetAction(), event->GetActionStartTime(), event->GetFlag(),
             event->DumpPointerAction(), event->DumpSourceType(), event->GetButtonId(),
diff --git a/util/common/src/input_event_data_transformation.cpp b/util/common/src/input_event_data_transformation.cpp
index e913138ea2..99498991ea 100644
--- a/util/common/src/input_event_data_transformation.cpp
+++ b/util/common/src/input_event_data_transformation.cpp
@@ -197,7 +197,7 @@ int32_t InputEventDataTransformation::Marshalling(std::shared_ptr<PointerEvent>
     }
     std::vector<uint8_t> buffer = event->GetBuffer();
     if (buffer.size() > ExtraData::MAX_BUFFER_SIZE) {
-        MMI_HILOGE("buffer is oversize:%{public}d", buffer.size());
+        MMI_HILOGE("buffer is oversize:%{public}zu", buffer.size());
         return RET_ERR;
     }
     pkt << buffer.size();
-- 
Gitee


From 178fdf903e7b7755205db41e932c4675b7a8221d Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 30 Dec 2022 10:17:05 +0000
Subject: [PATCH 306/360] Fix registration logic

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ib573a528521522c2c6934ce97bf67296e5a6f0bd
---
 .../proxy/event_handler/src/input_device_impl.cpp  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_device_impl.cpp b/frameworks/proxy/event_handler/src/input_device_impl.cpp
index b3672d38fb..3beff89dee 100644
--- a/frameworks/proxy/event_handler/src/input_device_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_device_impl.cpp
@@ -50,6 +50,15 @@ int32_t InputDeviceImpl::RegisterDevListener(const std::string &type, InputDevLi
     }
     auto &listeners = iter->second;
 
+    if (!isListeningProcess_) {
+        MMI_HILOGI("Start monitoring");
+        isListeningProcess_ = true;
+        int32_t ret = MultimodalInputConnMgr->RegisterDevListener();
+        if (ret != RET_OK) {
+            MMI_HILOGE("Failed to register");
+            return ret;
+        }
+    }
     if (std::all_of(listeners.cbegin(), listeners.cend(),
                     [listener](InputDevListenerPtr tListener) {
                         return (tListener != listener);
@@ -59,11 +68,6 @@ int32_t InputDeviceImpl::RegisterDevListener(const std::string &type, InputDevLi
     } else {
         MMI_HILOGW("The listener already exists");
     }
-    if (!isListeningProcess_) {
-        MMI_HILOGI("Start monitoring");
-        isListeningProcess_ = true;
-        return MultimodalInputConnMgr->RegisterDevListener();
-    }
     return RET_OK;
 }
 
-- 
Gitee


From 5a020d4071bf4fcb03307ad94a6f8b68ac8100d8 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 30 Dec 2022 11:15:56 +0000
Subject: [PATCH 307/360] parse device id from sysname

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I55439f2ecd5051797aa106f086eb34a2f0e1a6c6
---
 .../include/input_device_manager.h            |  2 +-
 .../src/input_device_manager.cpp              | 41 ++++++++++++++-----
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/service/device_manager/include/input_device_manager.h b/service/device_manager/include/input_device_manager.h
index 4a342453e9..abdee84f69 100644
--- a/service/device_manager/include/input_device_manager.h
+++ b/service/device_manager/include/input_device_manager.h
@@ -87,6 +87,7 @@ public:
     VendorConfig GetVendorConfig(int32_t deviceId) const;
 
 private:
+    int32_t ParseDeviceId(const std::string &sysName);
     void MakeDeviceInfo(struct libinput_device *inputDevice, struct InputDeviceInfo& info);
     bool IsMatchKeys(struct libinput_device* device, const std::vector<int32_t> &keyCodes) const;
     void ScanPointerDevice();
@@ -100,7 +101,6 @@ private:
 private:
     std::map<int32_t, struct InputDeviceInfo> inputDevice_;
     std::map<std::string, std::string> inputDeviceScreens_;
-    int32_t nextId_ { 0 };
     std::list<std::shared_ptr<IDeviceObserver>> observers_;
     std::map<SessionPtr, std::function<void(int32_t, const std::string&)>> devListener_;
     inputDeviceCallback devCallbacks_ = { nullptr };
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 63f6e84fcb..da45b1258c 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -19,8 +19,8 @@
 #include <parameters.h>
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
 #include <openssl/sha.h>
-#include <regex>
 #endif // OHOS_BUILD_ENABLE_COOPERATE
+#include <regex>
 #include <unordered_map>
 
 #include "dfx_hisysevent.h"
@@ -74,6 +74,9 @@ std::vector<std::pair<enum libinput_device_capability, InputDeviceCapability>> d
     { LIBINPUT_DEVICE_CAP_SWITCH, InputDeviceCapability::INPUT_DEV_CAP_SWITCH },
     { LIBINPUT_DEVICE_CAP_JOYSTICK, InputDeviceCapability::INPUT_DEV_CAP_JOYSTICK },
 };
+
+constexpr size_t EXPECTED_N_SUBMATCHES { 2 };
+constexpr size_t EXPECTED_SUBMATCH { 1 };
 } // namespace
 
 InputDeviceManager::InputDeviceManager() {}
@@ -349,6 +352,20 @@ void InputDeviceManager::NotifyDevCallback(int32_t deviceId,  struct InputDevice
     }
 }
 
+int32_t InputDeviceManager::ParseDeviceId(const std::string &sysName)
+{
+    CALL_DEBUG_ENTER;
+    std::regex pattern("^event(\\d+)$");
+    std::smatch mr;
+
+    if (std::regex_match(sysName, mr, pattern)) {
+        if (mr.ready() && mr.size() == EXPECTED_N_SUBMATCHES) {
+            return std::stoi(mr[EXPECTED_SUBMATCH].str());
+        }
+    }
+    return -1;
+}
+
 void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
 {
     CALL_DEBUG_ENTER;
@@ -364,29 +381,33 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
             hasLocalPointer = true;
         }
     }
-    if (nextId_ == INT32_MAX) {
-        MMI_HILOGE("The nextId_ exceeded the upper limit");
-        DfxHisysevent::OnDeviceConnect(INT32_MAX, OHOS::HiviewDFX::HiSysEvent::EventType::FAULT);
+
+    const char *sysName = libinput_device_get_sysname(inputDevice);
+    CHKPV(sysName);
+    int32_t deviceId = ParseDeviceId(std::string(sysName));
+    if (deviceId < 0) {
+        MMI_HILOGE("Parsing sysname failed: \'%{public}s\'", sysName);
         return;
     }
+
     struct InputDeviceInfo info;
     MakeDeviceInfo(inputDevice, info);
-    inputDevice_[nextId_] = info;
+    inputDevice_[deviceId] = info;
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     if (!IsRemote(inputDevice) || InputDevCooSM->GetCurrentCooperateState() != CooperateState::STATE_FREE) {
         for (const auto &item : devListener_) {
             CHKPC(item.first);
-            item.second(nextId_, "add");
+            item.second(deviceId, "add");
         }
     }
 #else
     for (const auto &item : devListener_) {
         CHKPC(item.first);
-        item.second(nextId_, "add");
+        item.second(deviceId, "add");
     }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-    NotifyDevCallback(nextId_, info);
-    ++nextId_;
+    NotifyDevCallback(deviceId, info);
+
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     if (IsKeyboardDevice(inputDevice)) {
         InputDevCooSM->OnKeyboardOnline(info.dhid);
@@ -411,7 +432,7 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
 #endif // OHOS_BUILD_ENABLE_POINTER
     }
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
-    DfxHisysevent::OnDeviceConnect(nextId_ - 1, OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR);
+    DfxHisysevent::OnDeviceConnect(deviceId, OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR);
 }
 
 void InputDeviceManager::MakeDeviceInfo(struct libinput_device *inputDevice, struct InputDeviceInfo& info)
-- 
Gitee


From b29d7f9300269fc4a2ca1a0e0a4391e869e8bcc4 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Wed, 4 Jan 2023 06:31:39 +0000
Subject: [PATCH 308/360] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E9=94=AE=E6=8C=89=E4=B8=8B=E5=BB=B6=E6=97=B6=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E9=94=AE=E8=87=AA=E5=8A=A8=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=8F=8D=E5=A4=8D=E8=A7=A6=E5=8F=91=E7=BB=84=E5=90=88=E9=94=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I0cb16f52f9b197f7b3583bef1a3af10f7da7fca8
---
 frameworks/proxy/event_handler/src/input_manager_impl.cpp | 2 +-
 service/interceptor/src/event_interceptor_handler.cpp     | 2 +-
 service/subscriber/src/key_subscriber_handler.cpp         | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 961f70c358..7bf2692343 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -386,7 +386,7 @@ void InputManagerImpl::PrintDisplayInfo()
 
     MMI_HILOGD("displayInfos,num:%{public}zu", displayGroupInfo_.displaysInfo.size());
     for (const auto &item : displayGroupInfo_.displaysInfo) {
-        MMI_HILOGI("displayInfos,id:%{public}d,x:%{public}d,y:%{public}d,"
+        MMI_HILOGD("displayInfos,id:%{public}d,x:%{public}d,y:%{public}d,"
             "width:%{public}d,height:%{public}d,dpi:%{public}d,name:%{public}s,"
             "uniq:%{public}s,direction:%{public}d",
             item.id, item.x, item.y, item.width, item.height, item.dpi, item.name.c_str(),
diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp
index 72516a7123..e968878995 100644
--- a/service/interceptor/src/event_interceptor_handler.cpp
+++ b/service/interceptor/src/event_interceptor_handler.cpp
@@ -228,7 +228,7 @@ bool EventInterceptorHandler::InterceptorCollection::HandleEvent(std::shared_ptr
 {
     CHKPF(pointerEvent);
     if (interceptors_.empty()) {
-        MMI_HILOGI("Interceptors are empty");
+        MMI_HILOGD("Interceptors are empty");
         return false;
     }
     MMI_HILOGD("There are currently:%{public}zu interceptors", interceptors_.size());
diff --git a/service/subscriber/src/key_subscriber_handler.cpp b/service/subscriber/src/key_subscriber_handler.cpp
index b0c4773712..ec317bf77f 100644
--- a/service/subscriber/src/key_subscriber_handler.cpp
+++ b/service/subscriber/src/key_subscriber_handler.cpp
@@ -274,7 +274,6 @@ void KeySubscriberHandler::OnTimer(const std::shared_ptr<Subscriber> subscriber)
 {
     CALL_DEBUG_ENTER;
     CHKPV(subscriber);
-    hasEventExecuting_ = false;
     subscriber->timerId_ = -1;
     if (subscriber->keyEvent_ == nullptr) {
         MMI_HILOGE("Leave, subscriber->keyEvent is nullptr, subscribeId:%{public}d", subscriber->id_);
-- 
Gitee


From 86bc5b3e8e29714662602cd7dac33920a6f86b89 Mon Sep 17 00:00:00 2001
From: Yuanxinying <yuanxinying@huawei.com>
Date: Thu, 5 Jan 2023 10:20:11 +0800
Subject: [PATCH 309/360] fixed 5b5b4c9 from
 https://gitee.com/yuanxinying/multimodalinput_input/pulls/2250 solve anr
 problem when using cmd 'kill -9' to stop multimodalinput process
 Signed-off-by: Yuanxinying <yuanxinying@huawei.com>

---
 frameworks/proxy/event_handler/include/anr_handler.h | 1 +
 frameworks/proxy/event_handler/src/anr_handler.cpp   | 8 ++++++++
 frameworks/proxy/module_loader/src/mmi_client.cpp    | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/frameworks/proxy/event_handler/include/anr_handler.h b/frameworks/proxy/event_handler/include/anr_handler.h
index 27029e4199..7153e4da68 100644
--- a/frameworks/proxy/event_handler/include/anr_handler.h
+++ b/frameworks/proxy/event_handler/include/anr_handler.h
@@ -31,6 +31,7 @@ public:
 
     void SetLastProcessedEventId(int32_t eventType, int32_t eventId, uint64_t actionTime);
     void MarkProcessed(int32_t eventType);
+    void ResetAnrArray();
     std::mutex anrMtx_;
 
 private:
diff --git a/frameworks/proxy/event_handler/src/anr_handler.cpp b/frameworks/proxy/event_handler/src/anr_handler.cpp
index 4c6a94de4e..550ef4d381 100644
--- a/frameworks/proxy/event_handler/src/anr_handler.cpp
+++ b/frameworks/proxy/event_handler/src/anr_handler.cpp
@@ -123,5 +123,13 @@ void ANRHandler::SendEvent(int32_t eventType, int64_t delayTime)
         MMI_HILOGE("Send dispatch event failed");
     }
 }
+
+void ANRHandler::ResetAnrArray() {
+    for(int i = 0; i < ANR_EVENT_TYPE_NUM; i++) {
+        event_[i].sendStatus = false;
+        event_[i].lastEventId = -1;
+        event_[i].lastReportId = -1;
+    }
+}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/frameworks/proxy/module_loader/src/mmi_client.cpp b/frameworks/proxy/module_loader/src/mmi_client.cpp
index 2dc5098825..c8c66c4ad6 100755
--- a/frameworks/proxy/module_loader/src/mmi_client.cpp
+++ b/frameworks/proxy/module_loader/src/mmi_client.cpp
@@ -17,6 +17,7 @@
 #include <cinttypes>
 #include <condition_variable>
 
+#include "anr_handler.h"
 #include "mmi_log.h"
 #include "proto.h"
 #include "util.h"
@@ -223,6 +224,7 @@ void MMIClient::OnDisconnected()
     MMI_HILOGI("Disconnected from server, fd:%{public}d", fd_);
     isConnected_ = false;
     isListening_ = false;
+    ANRHdl->ResetAnrArray();
     if (funDisconnected_) {
         funDisconnected_(*this);
     }
-- 
Gitee


From 95527906c9abfbd59940c0a705c5667ebccf00e8 Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Thu, 5 Jan 2023 13:15:14 +0000
Subject: [PATCH 310/360] Fix the problem that the input device has multiple
 capabilities for hotplug

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 service/device_manager/src/input_device_manager.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index da45b1258c..b4cf66a77f 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -371,14 +371,18 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
     CALL_DEBUG_ENTER;
     CHKPV(inputDevice);
     bool hasLocalPointer = false;
+    bool hasPointer = false;
     for (const auto &item : inputDevice_) {
         if (item.second.inputDeviceOrigin == inputDevice) {
             MMI_HILOGI("The device is already existent");
             DfxHisysevent::OnDeviceConnect(item.first, OHOS::HiviewDFX::HiSysEvent::EventType::FAULT);
             return;
         }
-        if (!item.second.isRemote && item.second.isPointerDevice) {
-            hasLocalPointer = true;
+        if (item.second.isPointerDevice) {
+            hasPointer = true;
+            if (!item.second.isRemote) {
+                hasLocalPointer = true;
+            }
         }
     }
 
@@ -413,7 +417,7 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
         InputDevCooSM->OnKeyboardOnline(info.dhid);
     }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
-    if (info.isPointerDevice) {
+    if (!hasPointer && info.isPointerDevice) {
         bool visible = !info.isRemote || hasLocalPointer;
 #ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
         if (HasTouchDevice()) {
-- 
Gitee


From a6388d3acb340a2026c6fb791764b3a42a4033eb Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Mon, 9 Jan 2023 07:25:49 +0000
Subject: [PATCH 311/360] =?UTF-8?q?tools=E7=BC=96=E8=AF=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Id02cf6bbac39125e0314a96f1b143eedb91d61e2
Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
---
 service/event_dump/src/event_dump.cpp             | 15 ---------------
 .../src/input_device_cooperate_sm.cpp             | 13 -------------
 .../event_inject/src/mmi_event_simulate_main.cpp  |  4 +++-
 tools/vuinput/src/virtual_device.cpp              |  1 +
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/service/event_dump/src/event_dump.cpp b/service/event_dump/src/event_dump.cpp
index e01e59abda..bcfad7b03e 100644
--- a/service/event_dump/src/event_dump.cpp
+++ b/service/event_dump/src/event_dump.cpp
@@ -27,9 +27,6 @@
 
 #include "event_interceptor_handler.h"
 #include "event_monitor_handler.h"
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
-#include "input_device_cooperate_sm.h"
-#endif // OHOS_BUILD_ENABLE_COOPERATE
 #include "input_device_manager.h"
 #include "input_event_handler.h"
 #include "input_windows_manager.h"
@@ -88,9 +85,6 @@ void EventDump::ParseCommand(int32_t fd, const std::vector<std::string> &args)
         { "interceptor", no_argument, 0, 'i' },
         { "filter", no_argument, 0, 'f' },
         { "mouse", no_argument, 0, 'm' },
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
-        { "inputdevcoosm", no_argument, 0, 'k' },
-#endif // OHOS_BUILD_ENABLE_COOPERATE
         { NULL, 0, 0, 0 }
     };
     if (args.empty()) {
@@ -141,14 +135,6 @@ void EventDump::ParseCommand(int32_t fd, const std::vector<std::string> &args)
                 udsServer->Dump(fd, args);
                 break;
             }
-            case 'c': {
-#ifdef OHOS_BUILD_ENABLE_COOPERATE
-                InputDevCooSM->Dump(fd, args);
-#else
-                mprintf(fd, "Input device cooperate does not support");
-#endif // OHOS_BUILD_ENABLE_COOPERATE
-                break;
-            }
             case 's': {
 #ifdef OHOS_BUILD_ENABLE_KEYBOARD
                 auto subscriberHandler = InputHandler->GetSubscriberHandler();
@@ -227,7 +213,6 @@ void EventDump::DumpHelp(int32_t fd)
     mprintf(fd, "      -i, --interceptor: dump the interceptor information\t");
     mprintf(fd, "      -f, --filter: dump the filter information\t");
     mprintf(fd, "      -m, --mouse: dump the mouse information\t");
-    mprintf(fd, "      -c, --dump Keyboard and mouse crossing information\t");
 }
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index 908facda7f..5c96a8b78c 100644
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -35,7 +35,6 @@
 #include "input_windows_manager.h"
 #include "mouse_event_normalize.h"
 #include "timer_manager.h"
-#include "util_ex.h"
 
 namespace OHOS {
 namespace MMI {
@@ -611,18 +610,6 @@ void InputDeviceCooperateSM::OnDeviceOffline(const std::string &networkId)
     }
 }
 
-void InputDeviceCooperateSM::Dump(int32_t fd, const std::vector<std::string> &args)
-{
-    CALL_DEBUG_ENTER;
-    std::lock_guard<std::mutex> guard(mutex_);
-    mprintf(fd, "Keyboard and mouse crossing information:");
-    mprintf(fd, "State machine status: %d\t", cooperateState_);
-    mprintf(fd, "Peripheral keyboard and mouse information: startDhid_  srcNetworkId_:\t");
-    mprintf(fd, "%s", startDhid_.c_str());
-    mprintf(fd, "%s", srcNetworkId_.c_str());
-    mprintf(fd, "Run successfully");
-}
-
 void InputDeviceCooperateSM::DeviceInitCallBack::OnRemoteDied()
 {
     CALL_INFO_TRACE;
diff --git a/tools/event_inject/src/mmi_event_simulate_main.cpp b/tools/event_inject/src/mmi_event_simulate_main.cpp
index 9e2c6e2b3a..f936176904 100644
--- a/tools/event_inject/src/mmi_event_simulate_main.cpp
+++ b/tools/event_inject/src/mmi_event_simulate_main.cpp
@@ -13,8 +13,9 @@
  * limitations under the License.
  */
 
-#include "error_multimodal.h"
 #include "injection_event_dispatch.h"
+
+#include "error_multimodal.h"
 #include "mmi_log.h"
 
 namespace {
@@ -23,6 +24,7 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, OHOS::MMI::MMI_LOG_DOM
 
 int32_t main(int32_t argc, char* argv[])
 {
+    using namespace OHOS::MMI;
     do {
         SetThreadName("main");
         InjectionToolsHelpFunc helpFunc;
diff --git a/tools/vuinput/src/virtual_device.cpp b/tools/vuinput/src/virtual_device.cpp
index e1c1bd7682..4f78a2523e 100644
--- a/tools/vuinput/src/virtual_device.cpp
+++ b/tools/vuinput/src/virtual_device.cpp
@@ -15,6 +15,7 @@
 
 #include "virtual_device.h"
 
+#include <getopt.h>
 #include <sys/stat.h>
 
 #include "virtual_finger.h"
-- 
Gitee


From 92bdcabf0c2b7f1f1553f9a14901dc2a17fcf479 Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Mon, 9 Jan 2023 12:30:43 +0000
Subject: [PATCH 312/360] fix key repetition

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 service/event_handler/include/key_auto_repeat.h             | 1 +
 service/event_handler/src/key_auto_repeat.cpp               | 6 ++++++
 .../src/input_device_cooperate_sm.cpp                       | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/service/event_handler/include/key_auto_repeat.h b/service/event_handler/include/key_auto_repeat.h
index ac18da1a95..a128c1cd08 100644
--- a/service/event_handler/include/key_auto_repeat.h
+++ b/service/event_handler/include/key_auto_repeat.h
@@ -38,6 +38,7 @@ public:
     void RemoveDeviceConfig(struct libinput_device *device);
     int32_t GetIntervalTime(int32_t deviceId) const;
     std::map<int32_t, DeviceConfig> GetDeviceConfig() const;
+    void RemoveTimer();
 private:
     std::string GetTomlFilePath(const std::string &fileName) const;
     DeviceConfig GetAutoSwitch(int32_t deviceId);
diff --git a/service/event_handler/src/key_auto_repeat.cpp b/service/event_handler/src/key_auto_repeat.cpp
index 2cef59b4eb..c7569c03ce 100644
--- a/service/event_handler/src/key_auto_repeat.cpp
+++ b/service/event_handler/src/key_auto_repeat.cpp
@@ -152,5 +152,11 @@ void KeyAutoRepeat::RemoveDeviceConfig(struct libinput_device *device)
     }
     deviceConfig_.erase(iter);
 }
+
+void KeyAutoRepeat:: RemoveTimer()
+{
+    CALL_DEBUG_ENTER;
+    TimerMgr->RemoveTimer(timerId_);
+}
 } // namespace MMI
 } // namespace OHOS
\ No newline at end of file
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index 908facda7f..a5e59d1cec 100644
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -33,6 +33,7 @@
 #include "input_device_cooperate_util.h"
 #include "input_device_manager.h"
 #include "input_windows_manager.h"
+#include "key_auto_repeat.h"
 #include "mouse_event_normalize.h"
 #include "timer_manager.h"
 #include "util_ex.h"
@@ -296,6 +297,8 @@ void InputDeviceCooperateSM::StopRemoteCooperateResult(bool isSuccess)
     if (isSuccess) {
         Reset(true);
     }
+    KeyRepeat->RemoveTimer();
+    MMI_HILOGD("Remove key auto repeat timer");
     isStopping_ = false;
 }
 
@@ -331,6 +334,8 @@ void InputDeviceCooperateSM::OnStartFinish(bool isSuccess,
                 DevCooperateSoftbusAdapter->StartCooperateOtherResult(sink, remoteNetworkId);
             }
             UpdateState(CooperateState::STATE_FREE);
+            MMI_HILOGD("Remove key auto repeat timer");
+            KeyRepeat->RemoveTimer();
         } else {
             MMI_HILOGI("Current state is out");
         }
-- 
Gitee


From 3b098a0e983d62930bdef7544867096ccaf71ca1 Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Mon, 9 Jan 2023 12:35:10 +0000
Subject: [PATCH 313/360] delete redundant log

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 .../input_device_cooperate/src/input_device_cooperate_sm.cpp    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index a5e59d1cec..7f8cc17b07 100644
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -298,7 +298,6 @@ void InputDeviceCooperateSM::StopRemoteCooperateResult(bool isSuccess)
         Reset(true);
     }
     KeyRepeat->RemoveTimer();
-    MMI_HILOGD("Remove key auto repeat timer");
     isStopping_ = false;
 }
 
@@ -334,7 +333,6 @@ void InputDeviceCooperateSM::OnStartFinish(bool isSuccess,
                 DevCooperateSoftbusAdapter->StartCooperateOtherResult(sink, remoteNetworkId);
             }
             UpdateState(CooperateState::STATE_FREE);
-            MMI_HILOGD("Remove key auto repeat timer");
             KeyRepeat->RemoveTimer();
         } else {
             MMI_HILOGI("Current state is out");
-- 
Gitee


From 9c35455f79cd66590c6cb113ec8b4ccc0369fb8b Mon Sep 17 00:00:00 2001
From: Yuanxinying <yuanxinying@huawei.com>
Date: Mon, 9 Jan 2023 21:32:15 +0800
Subject: [PATCH 314/360] fixed 1e20eca from
 https://gitee.com/yuanxinying/multimodalinput_input/pulls/2257 reduce log by
 setting interval to 3 seconds. Signed-off-by: Yuanxinying
 <yuanxinying@huawei.com>

---
 service/event_dispatch/include/event_dispatch_handler.h | 2 ++
 service/event_dispatch/src/event_dispatch_handler.cpp   | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/service/event_dispatch/include/event_dispatch_handler.h b/service/event_dispatch/include/event_dispatch_handler.h
index c79ad2ab2d..b6e53142fd 100644
--- a/service/event_dispatch/include/event_dispatch_handler.h
+++ b/service/event_dispatch/include/event_dispatch_handler.h
@@ -63,6 +63,8 @@ private:
     std::mutex lock_;
     std::vector<DinputSimulateEvent> dinputSimulateEvent_;
 #endif // OHOS_BUILD_ENABLE_COOPERATE
+    int32_t eventTime_ { 0 };
+    int32_t currentTime_ { 0 };
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/event_dispatch/src/event_dispatch_handler.cpp b/service/event_dispatch/src/event_dispatch_handler.cpp
index 250794d45e..82514cadc8 100644
--- a/service/event_dispatch/src/event_dispatch_handler.cpp
+++ b/service/event_dispatch/src/event_dispatch_handler.cpp
@@ -41,6 +41,7 @@ namespace {
 #if defined(OHOS_BUILD_ENABLE_KEYBOARD) || defined(OHOS_BUILD_ENABLE_POINTER) || defined(OHOS_BUILD_ENABLE_TOUCH)
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "EventDispatchHandler" };
 #endif // OHOS_BUILD_ENABLE_KEYBOARD ||  OHOS_BUILD_ENABLE_POINTER || OHOS_BUILD_ENABLE_TOUCH
+constexpr int32_t INTERVAL_TIME = 3000; // log time interval is 3 seconds.
 } // namespace
 
 EventDispatchHandler::EventDispatchHandler()
@@ -83,7 +84,9 @@ void EventDispatchHandler::HandlePointerEventInner(const std::shared_ptr<Pointer
     CALL_DEBUG_ENTER;
     CHKPV(point);
     auto fd = WinMgr->GetClientFd(point);
-    if (fd < 0) {
+    currentTime_ = point->GetActionTime();
+    if (fd < 0 && currentTime_ - eventTime_ > INTERVAL_TIME) {
+        eventTime_ = currentTime_;
         MMI_HILOGE("The fd less than 0, fd:%{public}d", fd);
         DfxHisysevent::OnUpdateTargetPointer(point, fd, OHOS::HiviewDFX::HiSysEvent::EventType::FAULT);
         return;
@@ -136,7 +139,9 @@ int32_t EventDispatchHandler::DispatchKeyEventPid(UDSServer& udsServer, std::sha
     CALL_DEBUG_ENTER;
     CHKPR(key, PARAM_INPUT_INVALID);
     auto fd = WinMgr->UpdateTarget(key);
-    if (fd < 0) {
+    currentTime_ = point->GetActionTime();
+    if (fd < 0 && currentTime_ - eventTime_ > INTERVAL_TIME) {
+        eventTime_ = currentTime_;
         MMI_HILOGE("Invalid fd, fd:%{public}d", fd);
         DfxHisysevent::OnUpdateTargetKey(key, fd, OHOS::HiviewDFX::HiSysEvent::EventType::FAULT);
         return RET_ERR;
-- 
Gitee


From c9320c58bb1e5ff2398a8915262633d0a4c8e03f Mon Sep 17 00:00:00 2001
From: Justin_Hu <hugongcheng@huawei.com>
Date: Tue, 10 Jan 2023 01:09:22 +0000
Subject: [PATCH 315/360] delete extra spaces

Signed-off-by: Justin_Hu <hugongcheng@huawei.com>
---
 service/event_handler/src/key_auto_repeat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/event_handler/src/key_auto_repeat.cpp b/service/event_handler/src/key_auto_repeat.cpp
index c7569c03ce..054e61794e 100644
--- a/service/event_handler/src/key_auto_repeat.cpp
+++ b/service/event_handler/src/key_auto_repeat.cpp
@@ -153,7 +153,7 @@ void KeyAutoRepeat::RemoveDeviceConfig(struct libinput_device *device)
     deviceConfig_.erase(iter);
 }
 
-void KeyAutoRepeat:: RemoveTimer()
+void KeyAutoRepeat::RemoveTimer()
 {
     CALL_DEBUG_ENTER;
     TimerMgr->RemoveTimer(timerId_);
-- 
Gitee


From 1856549624afc4e0605115c7e87350aa7784ccf8 Mon Sep 17 00:00:00 2001
From: Yuanxinying <yuanxinying@huawei.com>
Date: Wed, 11 Jan 2023 06:59:40 +0000
Subject: [PATCH 316/360] update
 service/event_dispatch/src/event_dispatch_handler.cpp.

Signed-off-by: Yuanxinying <yuanxinying@huawei.com>
---
 service/event_dispatch/src/event_dispatch_handler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/event_dispatch/src/event_dispatch_handler.cpp b/service/event_dispatch/src/event_dispatch_handler.cpp
index 82514cadc8..6f7bacb2f3 100644
--- a/service/event_dispatch/src/event_dispatch_handler.cpp
+++ b/service/event_dispatch/src/event_dispatch_handler.cpp
@@ -139,7 +139,7 @@ int32_t EventDispatchHandler::DispatchKeyEventPid(UDSServer& udsServer, std::sha
     CALL_DEBUG_ENTER;
     CHKPR(key, PARAM_INPUT_INVALID);
     auto fd = WinMgr->UpdateTarget(key);
-    currentTime_ = point->GetActionTime();
+    currentTime_ = key->GetActionTime();
     if (fd < 0 && currentTime_ - eventTime_ > INTERVAL_TIME) {
         eventTime_ = currentTime_;
         MMI_HILOGE("Invalid fd, fd:%{public}d", fd);
-- 
Gitee


From f324b754c9d3d1dd3bcfc9002facc690fb017f94 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Wed, 4 Jan 2023 09:23:39 +0000
Subject: [PATCH 317/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I1e015fba312baa5ba315f7b3ab80adbe8f76296f
---
 frameworks/proxy/events/src/pointer_event.cpp |  15 ++
 .../innerkits/event/include/pointer_event.h   |  12 +-
 .../include/input_windows_manager.h           |  10 ++
 .../src/input_windows_manager.cpp             | 128 +++++++++++++++++-
 test/unittest/common/src/event_util_test.cpp  |   4 +-
 5 files changed, 166 insertions(+), 3 deletions(-)

diff --git a/frameworks/proxy/events/src/pointer_event.cpp b/frameworks/proxy/events/src/pointer_event.cpp
index 0e43bf5699..e1ae1cfa76 100644
--- a/frameworks/proxy/events/src/pointer_event.cpp
+++ b/frameworks/proxy/events/src/pointer_event.cpp
@@ -426,6 +426,21 @@ const char* PointerEvent::DumpPointerAction() const
         case PointerEvent::POINTER_ACTION_LEAVE_WINDOW: {
             return "leave-window";
         }
+        case PointerEvent::POINTER_ACTION_PULL_DOWN: {
+            return "pull-down";
+        }
+        case PointerEvent::POINTER_ACTION_PULL_MOVE: {
+            return "pull-move";
+        }
+        case PointerEvent::POINTER_ACTION_PULL_UP: {
+            return "pull-up";
+        }
+        case PointerEvent::POINTER_ACTION_PULL_IN_WINDOW: {
+            return "pull-in-window";
+        }
+        case PointerEvent::POINTER_ACTION_PULL_OUT_WINDOW: {
+            return "pull-out-window";
+        }
         default: {
             break;
         }
diff --git a/interfaces/native/innerkits/event/include/pointer_event.h b/interfaces/native/innerkits/event/include/pointer_event.h
index 410888b634..9780435611 100644
--- a/interfaces/native/innerkits/event/include/pointer_event.h
+++ b/interfaces/native/innerkits/event/include/pointer_event.h
@@ -116,6 +116,16 @@ public:
      */
     static constexpr int32_t POINTER_ACTION_LEAVE_WINDOW = 11;
 
+    static constexpr int32_t POINTER_ACTION_PULL_DOWN = 12;
+
+    static constexpr int32_t POINTER_ACTION_PULL_MOVE = 13;
+
+    static constexpr int32_t POINTER_ACTION_PULL_UP = 14;
+
+    static constexpr int32_t POINTER_ACTION_PULL_IN_WINDOW = 15;
+
+    static constexpr int32_t POINTER_ACTION_PULL_OUT_WINDOW = 16;
+
     enum AxisType {
         /**
          * Indicates an unknown axis type. It is generally used as the initial value.
@@ -1345,4 +1355,4 @@ inline uint32_t PointerEvent::GetAxes() const
 }
 } // namespace MMI
 } // namespace OHOS
-#endif // POINTER_EVENT_H
+#endif // POINTER_EVENT_H
\ No newline at end of file
diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
index 1756bd58e9..59d1fc16d2 100644
--- a/service/window_manager/include/input_windows_manager.h
+++ b/service/window_manager/include/input_windows_manager.h
@@ -111,6 +111,9 @@ private:
 #endif // OHOS_BUILD_ENABLE_JOYSTICK
 #ifdef OHOS_BUILD_ENABLE_TOUCH
     int32_t UpdateTouchScreenTarget(std::shared_ptr<PointerEvent> pointerEvent);
+    void PullEnterLeaveEvent(int32_t logicalX, int32_t logicalY,
+        const std::shared_ptr<PointerEvent> pointerEvent, const WindowInfo* touchWindow);
+    void DispatchTouch(int32_t pointerAction);
 #endif // OHOS_BUILD_ENABLE_TOUCH
 #ifdef OHOS_BUILD_ENABLE_POINTER
     int32_t UpdateTouchPadTarget(std::shared_ptr<PointerEvent> pointerEvent);
@@ -140,6 +143,7 @@ private:
     void CheckFocusWindowChange(const DisplayGroupInfo &displayGroupInfo);
     void CheckZorderWindowChange(const DisplayGroupInfo &displayGroupInfo);
     void UpdateDisplayIdAndName();
+    void UpdatePointerAction(std::shared_ptr<PointerEvent> pointerEvent);
 private:
     UDSServer* udsServer_ { nullptr };
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -150,6 +154,12 @@ private:
     std::shared_ptr<PointerEvent> lastPointerEvent_ { nullptr };
     std::map<int32_t, std::map<int32_t, PointerStyle>> pointerStyle_;
     WindowInfo mouseDownInfo_;
+#endif // OHOS_BUILD_ENABLE_POINTER
+#ifdef OHOS_BUILD_ENABLE_TOUCH
+    int32_t lastTouchLogicX_ { -1 };
+    int32_t lastTouchLogicY_ { -1 };
+    WindowInfo lastTouchWindowInfo_;
+    std::shared_ptr<PointerEvent> lastTouchEvent_ { nullptr };
 #endif // OHOS_BUILD_ENABLE_POINTER
     DisplayGroupInfo displayGroupInfo_;
     MouseLocation mouseLocation_ = { -1, -1 };
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index b733476360..29c62e0f26 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -365,6 +365,7 @@ void InputWindowsManager::SendPointerEvent(int32_t pointerAction)
     pointerEvent->UpdateId();
     if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_MOUSE) {
         pointerEvent->SetBuffer(extraData_.buffer);
+        UpdatePointerAction(pointerEvent);
     } else {
         pointerEvent->ClearBuffer();
     }
@@ -441,6 +442,7 @@ void InputWindowsManager::DispatchPointer(int32_t pointerAction)
     pointerEvent->SetDeviceId(lastPointerEvent_->GetDeviceId());
     if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_MOUSE) {
         pointerEvent->SetBuffer(extraData_.buffer);
+        UpdatePointerAction(pointerEvent);
     } else {
         pointerEvent->ClearBuffer();
     }
@@ -880,7 +882,7 @@ std::optional<WindowInfo> InputWindowsManager::SelectWindowInfo(int32_t logicalX
             } else if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_MOUSE) {
                 if (IsInHotArea(logicalX, logicalY, item.pointerHotAreas)) {
                     firstBtnDownWindowId_ = item.id;
-                    MMI_HILOGI("Mouse event select drag window, window:%{public}d", firstBtnDownWindowId_);
+                    MMI_HILOGI("Mouse event select pull window, window:%{public}d", firstBtnDownWindowId_);
                     break;
                 } else {
                     continue;
@@ -1012,6 +1014,7 @@ int32_t InputWindowsManager::UpdateMouseTarget(std::shared_ptr<PointerEvent> poi
     pointerEvent->UpdatePointerItem(pointerId, pointerItem);
     if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_MOUSE) {
         pointerEvent->SetBuffer(extraData_.buffer);
+        UpdatePointerAction(pointerEvent);
     } else {
         pointerEvent->ClearBuffer();
     }
@@ -1143,8 +1146,12 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
     pointerEvent->UpdatePointerItem(pointerId, pointerItem);
     if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_TOUCHSCREEN) {
         pointerEvent->SetBuffer(extraData_.buffer);
+        UpdatePointerAction(pointerEvent);
+        PullEnterLeaveEvent(logicalX, logicalY, pointerEvent, touchWindow);
     } else {
         pointerEvent->ClearBuffer();
+        lastTouchEvent_ = nullptr;
+        lastTouchWindowInfo_.id = -1;
     }
     MMI_HILOGD("pid:%{public}d,logicalX:%{public}d,logicalY:%{public}d,"
                "physicalX:%{public}d,physicalY:%{public}d,windowX:%{public}d,windowY:%{public}d,"
@@ -1169,6 +1176,96 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
     }
     return ERR_OK;
 }
+
+void InputWindowsManager::PullEnterLeaveEvent(int32_t logicalX, int32_t logicalY,
+    const std::shared_ptr<PointerEvent> pointerEvent, const WindowInfo* touchWindow)
+{
+    CHKPV(pointerEvent);
+    CHKPV(touchWindow);
+    MMI_HILOGD("LastTouchWindowInfo:%{public}d, touchWindow:%{public}d", lastTouchWindowInfo_.id, touchWindow->id);
+    if (lastTouchWindowInfo_.id != -1 && lastTouchWindowInfo_.id != touchWindow->id) {
+        DispatchTouch(PointerEvent::POINTER_ACTION_PULL_OUT_WINDOW);
+        lastTouchLogicX_ = logicalX;
+        lastTouchLogicY_ = logicalY;
+        lastTouchEvent_ = pointerEvent;
+        lastTouchWindowInfo_ = *touchWindow;
+        DispatchTouch(PointerEvent::POINTER_ACTION_PULL_IN_WINDOW);
+        return;
+    }
+    lastTouchLogicX_ = logicalX;
+    lastTouchLogicY_ = logicalY;
+    lastTouchEvent_ = pointerEvent;
+    lastTouchWindowInfo_ = *touchWindow;
+}
+
+void InputWindowsManager::DispatchTouch(int32_t pointerAction)
+{
+    CALL_INFO_TRACE;
+    CHKPV(udsServer_);
+    CHKPV(lastTouchEvent_);
+    if (pointerAction == PointerEvent::POINTER_ACTION_PULL_IN_WINDOW) {
+        WindowInfo *touchWindow = nullptr;
+        for (auto item : displayGroupInfo_.windowsInfo) {
+            if ((item.flags & WindowInfo::FLAG_BIT_UNTOUCHABLE) == WindowInfo::FLAG_BIT_UNTOUCHABLE) {
+                MMI_HILOGD("Skip the untouchable window to continue searching, "
+                    "window:%{public}d, flags:%{public}d", item.id, item.flags);
+                continue;
+            } 
+            if (IsInHotArea(lastTouchLogicX_, lastTouchLogicY_, item.defaultHotAreas)) {
+                touchWindow = &item;
+                break;
+            }
+        }
+        if (touchWindow == nullptr) {
+            MMI_HILOGE("touchWindow is nullptr");
+            return;
+        }
+        if (touchWindow->id != lastTouchWindowInfo_.id) {
+            lastTouchWindowInfo_ = *touchWindow;
+        }
+    }
+    auto pointerEvent = PointerEvent::Create();
+    CHKPV(pointerEvent);
+    PointerEvent::PointerItem lastPointerItem;
+    int32_t lastPointerId = lastTouchEvent_->GetPointerId();
+    if (!lastTouchEvent_->GetPointerItem(lastPointerId, lastPointerItem)) {
+        MMI_HILOGE("GetPointerItem:%{public}d fail", lastPointerId);
+        return;
+    }
+    PointerEvent::PointerItem currentPointerItem;
+    currentPointerItem.SetWindowX(lastTouchLogicX_ - lastTouchWindowInfo_.area.x);
+    currentPointerItem.SetWindowY(lastTouchLogicY_ - lastTouchWindowInfo_.area.y);
+    currentPointerItem.SetDisplayX(lastPointerItem.GetDisplayX());
+    currentPointerItem.SetDisplayY(lastPointerItem.GetDisplayY());
+    currentPointerItem.SetPointerId(lastPointerId);
+
+    pointerEvent->UpdateId();
+    pointerEvent->SetTargetDisplayId(lastTouchEvent_->GetTargetDisplayId());
+    pointerEvent->SetTargetWindowId(lastTouchWindowInfo_.id);
+    pointerEvent->SetAgentWindowId(lastTouchWindowInfo_.agentWindowId);
+    pointerEvent->SetPointerId(lastPointerId);
+    pointerEvent->AddPointerItem(currentPointerItem);
+    pointerEvent->SetPointerAction(pointerAction);
+    pointerEvent->SetBuffer(extraData_.buffer);
+    pointerEvent->SetSourceType(lastTouchEvent_->GetSourceType());
+    int64_t time = GetSysClockTime();
+    pointerEvent->SetActionTime(time);
+    pointerEvent->SetActionStartTime(time);
+    pointerEvent->SetDeviceId(lastTouchEvent_->GetDeviceId());
+    auto fd = udsServer_->GetClientFd(lastTouchWindowInfo_.pid);
+    auto sess = udsServer_->GetSession(fd);
+    if (sess == nullptr) {
+        MMI_HILOGI("The last window has disappeared");
+        return;
+    }
+
+    NetPacket pkt(MmiMessageId::ON_POINTER_EVENT);
+    InputEventDataTransformation::Marshalling(pointerEvent, pkt);
+    if (!sess->SendMsg(pkt)) {
+        MMI_HILOGE("Send message failed, errCode:%{public}d", MSG_SEND_FAIL);
+        return;
+    }
+}
 #endif // OHOS_BUILD_ENABLE_TOUCH
 
 #ifdef OHOS_BUILD_ENABLE_POINTER
@@ -1339,6 +1436,35 @@ int32_t InputWindowsManager::AppendExtraData(const ExtraData& extraData)
     return RET_OK;
 }
 
+void InputWindowsManager::UpdatePointerAction(std::shared_ptr<PointerEvent> pointerEvent)
+{
+    CALL_DEBUG_ENTER;
+    int32_t action = pointerEvent->GetPointerAction();
+    switch (action) {
+        case PointerEvent::POINTER_ACTION_MOVE: {
+            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_PULL_MOVE);
+            break;
+        }
+        case PointerEvent::POINTER_ACTION_BUTTON_UP:
+        case PointerEvent::POINTER_ACTION_UP: {
+            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_PULL_UP);
+            break;
+        }
+        case PointerEvent::POINTER_ACTION_ENTER_WINDOW: {
+            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_PULL_IN_WINDOW);
+            break;
+        }
+        case PointerEvent::POINTER_ACTION_LEAVE_WINDOW: {
+            pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_PULL_OUT_WINDOW);
+            break;
+        }
+        default: {
+            MMI_HILOGI("Action is:%{public}d, no need change", action);
+            break;
+        }
+    }
+}
+
 void InputWindowsManager::Dump(int32_t fd, const std::vector<std::string> &args)
 {
     CALL_DEBUG_ENTER;
diff --git a/test/unittest/common/src/event_util_test.cpp b/test/unittest/common/src/event_util_test.cpp
index dfd86ae49e..76c05e63cf 100644
--- a/test/unittest/common/src/event_util_test.cpp
+++ b/test/unittest/common/src/event_util_test.cpp
@@ -47,7 +47,9 @@ void InputEventConsumer::OnInputEvent(std::shared_ptr<PointerEvent> pointerEvent
         ASSERT_TRUE(pointerEvent != nullptr);
         auto pointerAction = pointerEvent->GetPointerAction();
         if (pointerAction != PointerEvent::POINTER_ACTION_ENTER_WINDOW &&
-            pointerAction != PointerEvent::POINTER_ACTION_LEAVE_WINDOW) {
+            pointerAction != PointerEvent::POINTER_ACTION_LEAVE_WINDOW &&
+            pointerAction != PointerEvent::POINTER_ACTION_PULL_IN_WINDOW &&
+            pointerAction != PointerEvent::POINTER_ACTION_PULL_OUT_WINDOW) {
             TestUtil->AddEventDump(TestUtil->DumpInputEvent(pointerEvent));
         }
     }
-- 
Gitee


From 0b1c6481da9b818c40eca912ccdae12c31bcb3cb Mon Sep 17 00:00:00 2001
From: houchengyu <303089883@qq.com>
Date: Thu, 12 Jan 2023 21:17:50 +0800
Subject: [PATCH 318/360] add lock for stl container access to keep thread
 safe. Signed-off-by: houchengyu2022 <303089883@qq.com>

---
 frameworks/proxy/event_handler/src/input_handler_manager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frameworks/proxy/event_handler/src/input_handler_manager.cpp b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
index 2d4c916d3f..467aabea1d 100644
--- a/frameworks/proxy/event_handler/src/input_handler_manager.cpp
+++ b/frameworks/proxy/event_handler/src/input_handler_manager.cpp
@@ -363,6 +363,7 @@ uint32_t InputHandlerManager::GetDeviceTags() const
 
 void InputHandlerManager::OnDispatchEventProcessed(int32_t eventId, int64_t actionTime)
 {
+    std::lock_guard<std::mutex> guard(mtxHandlers_);
     CALL_DEBUG_ENTER;
     MMIClientPtr client = MMIEventHdl.GetMMIClient();
     CHKPV(client);
-- 
Gitee


From f1bf1092fdab2a223f52693e6036407b0ffdb443 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 13 Jan 2023 06:12:18 +0000
Subject: [PATCH 319/360] add global style

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ic72b190d233cd8beef6302f6a037e3af2f8e0ce2
---
 .../event_handler/src/input_manager_impl.cpp  |  6 +-----
 .../proxy/events/test/input_manager_test.cpp  | 18 +++++++++++++++++
 .../innerkits/event/include/pointer_style.h   |  2 +-
 .../include/input_windows_manager.h           |  1 +
 .../src/input_windows_manager.cpp             | 20 ++++++++++++++++---
 .../src/pointer_drawing_manager.cpp           |  2 --
 6 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/frameworks/proxy/event_handler/src/input_manager_impl.cpp b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
index 7bf2692343..ab03247cd0 100644
--- a/frameworks/proxy/event_handler/src/input_manager_impl.cpp
+++ b/frameworks/proxy/event_handler/src/input_manager_impl.cpp
@@ -646,7 +646,7 @@ int32_t InputManagerImpl::GetPointerSpeed(int32_t &speed)
 int32_t InputManagerImpl::SetPointerStyle(int32_t windowId, const PointerStyle& pointerStyle)
 {
     CALL_DEBUG_ENTER;
-    if (windowId < 0 || pointerStyle.id < 0) {
+    if (pointerStyle.id < 0) {
         MMI_HILOGE("The param is invalid");
         return RET_ERR;
     }
@@ -661,10 +661,6 @@ int32_t InputManagerImpl::SetPointerStyle(int32_t windowId, const PointerStyle&
 int32_t InputManagerImpl::GetPointerStyle(int32_t windowId, PointerStyle &pointerStyle)
 {
     CALL_DEBUG_ENTER;
-    if (windowId < 0) {
-        MMI_HILOGE("The param is invalid");
-        return RET_ERR;
-    }
     int32_t ret = MultimodalInputConnMgr->GetPointerStyle(windowId, pointerStyle);
     if (ret != RET_OK) {
         MMI_HILOGE("Get pointer style failed, ret:%{public}d", ret);
diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index 96f7a85f8d..fc4d4afb2c 100644
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -3584,6 +3584,24 @@ HWTEST_F(InputManagerTest, InputManagerTest_SetPointerStyle_001, TestSize.Level1
     }
 }
 
+/**
+ * @tc.name: InputManagerTest_SetPointerStyle_002
+ * @tc.desc: Sets the pointer style of the window
+ * @tc.type: FUNC
+ * @tc.require: I530XS
+ */
+HWTEST_F(InputManagerTest, InputManagerTest_SetPointerStyle_002, TestSize.Level1)
+{
+    CALL_TEST_DEBUG;
+    uint32_t windowId = -1;
+    PointerStyle pointerStyle;
+    pointerStyle.id = MOUSE_ICON::CROSS;
+    if (InputManager::GetInstance()->SetPointerStyle(windowId, pointerStyle) == RET_OK) {
+        ASSERT_TRUE(InputManager::GetInstance()->GetPointerStyle(windowId, pointerStyle) == RET_OK);
+        ASSERT_EQ(pointerStyle.id, MOUSE_ICON::CROSS);
+    }
+}
+
 /**
  * @tc.name: InputManagerTest_FunctionKeyState_001
  * @tc.desc: Set NumLock for the keyboard enablement state to true
diff --git a/interfaces/native/innerkits/event/include/pointer_style.h b/interfaces/native/innerkits/event/include/pointer_style.h
index dfdce4659c..721b728f59 100644
--- a/interfaces/native/innerkits/event/include/pointer_style.h
+++ b/interfaces/native/innerkits/event/include/pointer_style.h
@@ -28,7 +28,7 @@ struct PointerStyleColor {
 struct PointerStyle {
     int32_t size { -1 };
     PointerStyleColor color { 0 };
-    int32_t id { -1 };
+    int32_t id { 0 };
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
index 1756bd58e9..bf4237f8c2 100644
--- a/service/window_manager/include/input_windows_manager.h
+++ b/service/window_manager/include/input_windows_manager.h
@@ -150,6 +150,7 @@ private:
     std::shared_ptr<PointerEvent> lastPointerEvent_ { nullptr };
     std::map<int32_t, std::map<int32_t, PointerStyle>> pointerStyle_;
     WindowInfo mouseDownInfo_;
+    PointerStyle globalStyle_;
 #endif // OHOS_BUILD_ENABLE_POINTER
     DisplayGroupInfo displayGroupInfo_;
     MouseLocation mouseLocation_ = { -1, -1 };
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index b733476360..804c17a67c 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -34,6 +34,7 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Input
 #ifdef OHOS_BUILD_ENABLE_POINTER
 constexpr int32_t DEFAULT_POINTER_STYLE = 0;
 constexpr size_t MAX_WINDOW_COUNT = 20;
+constexpr int32_t GLOBAL_WINDOWID = -1;
 #endif // OHOS_BUILD_ENABLE_POINTER
 const std::string bindCfgFileName = "/data/service/el1/public/multimodalinput/display_bind.cfg";
 } // namespace
@@ -674,6 +675,10 @@ const DisplayGroupInfo& InputWindowsManager::GetDisplayGroupInfo()
 bool InputWindowsManager::IsNeedRefreshLayer(int32_t windowId)
 {
     CALL_DEBUG_ENTER;
+    if (windowId == GLOBAL_WINDOWID) {
+        MMI_HILOGD("is setting global pointer style");
+        return true;
+    }
     MouseLocation mouseLocation = GetMouseInfo();
     int32_t displayId = MouseEventHdr->GetDisplayId();
     if (displayId < 0) {
@@ -716,12 +721,16 @@ void InputWindowsManager::OnSessionLost(SessionPtr session)
 int32_t InputWindowsManager::SetPointerStyle(int32_t pid, int32_t windowId, PointerStyle pointerStyle)
 {
     CALL_DEBUG_ENTER;
+    if (windowId == GLOBAL_WINDOWID) {
+        globalStyle_.id = pointerStyle.id;
+        MMI_HILOGD("is setting global pointer style");
+        return RET_OK;
+    }
     auto it = pointerStyle_.find(pid);
     if (it == pointerStyle_.end()) {
         MMI_HILOGE("The pointer style map is not include param pd:%{public}d", pid);
         return COMMON_PARAMETER_ERROR ;
     }
-    
     auto iter = it->second.find(windowId);
     if (iter == it->second.end()) {
         MMI_HILOGE("The window id is invalid");
@@ -741,11 +750,16 @@ int32_t InputWindowsManager::GetPointerStyle(int32_t pid, int32_t windowId, Poin
         MMI_HILOGE("The pointer style map is not include param pd, %{public}d", pid);
         return RET_ERR;
     }
-    
+    if (windowId == GLOBAL_WINDOWID) {
+         MMI_HILOGD("is getting global pointer style");
+        pointerStyle.id = globalStyle_.id;
+        return RET_OK;
+    }
+
     auto iter = it->second.find(windowId);
     if (iter == it->second.end()) {
         MMI_HILOGW("The window id is invalid");
-        pointerStyle.id = DEFAULT_POINTER_STYLE;
+        pointerStyle.id = globalStyle_.id;
         return RET_OK;
     }
     
diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
index 4039991199..84b8b9a2ee 100644
--- a/service/window_manager/src/pointer_drawing_manager.cpp
+++ b/service/window_manager/src/pointer_drawing_manager.cpp
@@ -486,13 +486,11 @@ int32_t PointerDrawingManager::SetPointerStyle(int32_t pid, int32_t windowId, Po
         MMI_HILOGE("The param pointerStyle is invalid");
         return RET_ERR;
     }
-
     int32_t ret = WinMgr->SetPointerStyle(pid, windowId, pointerStyle);
     if (ret != RET_OK) {
         MMI_HILOGE("Set pointer style failed");
         return ret;
     }
-
     if (!InputDevMgr->HasPointerDevice()) {
         MMI_HILOGD("The pointer device is not exist");
         return RET_OK;
-- 
Gitee


From bb80ff556bf974b6b789f1d3b2bc20c488bc1815 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 13 Jan 2023 08:00:35 +0000
Subject: [PATCH 320/360] add global style

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I2ed92b5024a470a81786ba80dfd2139f9e636b89
---
 service/window_manager/src/pointer_drawing_manager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/service/window_manager/src/pointer_drawing_manager.cpp b/service/window_manager/src/pointer_drawing_manager.cpp
index 84b8b9a2ee..4039991199 100644
--- a/service/window_manager/src/pointer_drawing_manager.cpp
+++ b/service/window_manager/src/pointer_drawing_manager.cpp
@@ -486,11 +486,13 @@ int32_t PointerDrawingManager::SetPointerStyle(int32_t pid, int32_t windowId, Po
         MMI_HILOGE("The param pointerStyle is invalid");
         return RET_ERR;
     }
+
     int32_t ret = WinMgr->SetPointerStyle(pid, windowId, pointerStyle);
     if (ret != RET_OK) {
         MMI_HILOGE("Set pointer style failed");
         return ret;
     }
+
     if (!InputDevMgr->HasPointerDevice()) {
         MMI_HILOGD("The pointer device is not exist");
         return RET_OK;
-- 
Gitee


From 133e896a69599a4408b0a2ac30d8fc2fc6714a92 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 13 Jan 2023 09:10:33 +0000
Subject: [PATCH 321/360] add global style

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ibc92e7a1468847c9e2cb6ac3b133325e99857874
---
 .../src/input_windows_manager.cpp             | 37 ++++++-------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 804c17a67c..95cad5897e 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -675,10 +675,6 @@ const DisplayGroupInfo& InputWindowsManager::GetDisplayGroupInfo()
 bool InputWindowsManager::IsNeedRefreshLayer(int32_t windowId)
 {
     CALL_DEBUG_ENTER;
-    if (windowId == GLOBAL_WINDOWID) {
-        MMI_HILOGD("is setting global pointer style");
-        return true;
-    }
     MouseLocation mouseLocation = GetMouseInfo();
     int32_t displayId = MouseEventHdr->GetDisplayId();
     if (displayId < 0) {
@@ -729,15 +725,19 @@ int32_t InputWindowsManager::SetPointerStyle(int32_t pid, int32_t windowId, Poin
     auto it = pointerStyle_.find(pid);
     if (it == pointerStyle_.end()) {
         MMI_HILOGE("The pointer style map is not include param pd:%{public}d", pid);
-        return COMMON_PARAMETER_ERROR ;
+        return COMMON_PARAMETER_ERROR;
     }
     auto iter = it->second.find(windowId);
-    if (iter == it->second.end()) {
-        MMI_HILOGE("The window id is invalid");
-        return COMMON_PARAMETER_ERROR ;
+    if (iter != it->second.end()) {
+        iter->second = pointerStyle;
+        return RET_OK;
+    }
+    for (const auto& windowInfo : displayGroupInfo_.windowsInfo) {
+        if (windowId == windowInfo.id && pid == windowInfo.pid) {
+            iter->second.insert(std::make_pair(windowId, pointerStyle));
+            return RET_OK;
+        }
     }
-    
-    iter->second = pointerStyle;
     MMI_HILOGD("Window id:%{public}d set pointer style:%{public}d success", windowId, pointerStyle.id);
     return RET_OK;
 }
@@ -758,7 +758,6 @@ int32_t InputWindowsManager::GetPointerStyle(int32_t pid, int32_t windowId, Poin
 
     auto iter = it->second.find(windowId);
     if (iter == it->second.end()) {
-        MMI_HILOGW("The window id is invalid");
         pointerStyle.id = globalStyle_.id;
         return RET_OK;
     }
@@ -777,28 +776,14 @@ void InputWindowsManager::UpdatePointerStyle()
         int32_t pid = windowItem.pid;
         auto it = pointerStyle_.find(pid);
         if (it == pointerStyle_.end()) {
-            std::map<int32_t, PointerStyle> tmpPointerStyle = { { windowItem.id, pointerStyle } };
+            std::map<int32_t, PointerStyle> tmpPointerStyle = {};
             auto iter = pointerStyle_.insert(std::make_pair(pid, tmpPointerStyle));
             if (!iter.second) {
                 MMI_HILOGW("The pd is duplicated");
             }
             continue;
         }
-
-        auto subIter = it->second.find(windowItem.id);
-        if (subIter == it->second.end()) {
-            if (it->second.size() == MAX_WINDOW_COUNT) {
-                MMI_HILOGD("The window count:%{public}zu exceeds limit in same pd", it->second.size());
-                it->second.erase(it->second.begin());
-            }
-
-            auto iter = it->second.insert(std::make_pair(windowItem.id, pointerStyle));
-            if (!iter.second) {
-                MMI_HILOGW("The window type is duplicated");
-            }
-        }
     }
-
     MMI_HILOGD("Number of pointer style:%{public}zu", pointerStyle_.size());
 }
 
-- 
Gitee


From ea8ab9999edc4ab96d4fbbe87a3899f8a9a35a07 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 13 Jan 2023 09:31:04 +0000
Subject: [PATCH 322/360] add global style

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Icfbfab1893f97606df1e4a869d5630377dcf3b93
---
 service/window_manager/src/input_windows_manager.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 95cad5897e..b5a6e20ca2 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -734,12 +734,15 @@ int32_t InputWindowsManager::SetPointerStyle(int32_t pid, int32_t windowId, Poin
     }
     for (const auto& windowInfo : displayGroupInfo_.windowsInfo) {
         if (windowId == windowInfo.id && pid == windowInfo.pid) {
-            iter->second.insert(std::make_pair(windowId, pointerStyle));
+            auto iter = it->second.insert(std::make_pair(windowId, pointerStyle));
+            if (!iter.second) {
+                MMI_HILOGW("The window type is duplicated");
+            }
             return RET_OK;
         }
     }
-    MMI_HILOGD("Window id:%{public}d set pointer style:%{public}d success", windowId, pointerStyle.id);
-    return RET_OK;
+    MMI_HILOGE("The window id is invalid");
+    return COMMON_PARAMETER_ERROR;
 }
 
 int32_t InputWindowsManager::GetPointerStyle(int32_t pid, int32_t windowId, PointerStyle &pointerStyle) const
-- 
Gitee


From 2da9e6e046d90ad52413dd32683c2040fea17b4d Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 13 Jan 2023 13:04:36 +0000
Subject: [PATCH 323/360] add global style

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I8c5d64a94bd954e5a0a8015c6c143af316cbffa0
---
 service/window_manager/src/input_windows_manager.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index b5a6e20ca2..34bcbe79a1 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -33,7 +33,6 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputWindowsManager" };
 #ifdef OHOS_BUILD_ENABLE_POINTER
 constexpr int32_t DEFAULT_POINTER_STYLE = 0;
-constexpr size_t MAX_WINDOW_COUNT = 20;
 constexpr int32_t GLOBAL_WINDOWID = -1;
 #endif // OHOS_BUILD_ENABLE_POINTER
 const std::string bindCfgFileName = "/data/service/el1/public/multimodalinput/display_bind.cfg";
-- 
Gitee


From 0349235c8f5ced9d8907133191f707916ad52d23 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Fri, 13 Jan 2023 13:12:25 +0000
Subject: [PATCH 324/360] add global style

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ia76fe199d363ebdb70b3cf542e072007a5438b17
---
 service/window_manager/src/input_windows_manager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 34bcbe79a1..cd77b3bb59 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -33,7 +33,7 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputWindowsManager" };
 #ifdef OHOS_BUILD_ENABLE_POINTER
 constexpr int32_t DEFAULT_POINTER_STYLE = 0;
-constexpr int32_t GLOBAL_WINDOWID = -1;
+constexpr int32_t GLOBAL_WINDOW_ID = -1;
 #endif // OHOS_BUILD_ENABLE_POINTER
 const std::string bindCfgFileName = "/data/service/el1/public/multimodalinput/display_bind.cfg";
 } // namespace
@@ -718,7 +718,7 @@ int32_t InputWindowsManager::SetPointerStyle(int32_t pid, int32_t windowId, Poin
     CALL_DEBUG_ENTER;
     if (windowId == GLOBAL_WINDOWID) {
         globalStyle_.id = pointerStyle.id;
-        MMI_HILOGD("is setting global pointer style");
+        MMI_HILOGD("setting global pointer style");
         return RET_OK;
     }
     auto it = pointerStyle_.find(pid);
@@ -753,7 +753,7 @@ int32_t InputWindowsManager::GetPointerStyle(int32_t pid, int32_t windowId, Poin
         return RET_ERR;
     }
     if (windowId == GLOBAL_WINDOWID) {
-         MMI_HILOGD("is getting global pointer style");
+         MMI_HILOGD("getting global pointer style");
         pointerStyle.id = globalStyle_.id;
         return RET_OK;
     }
-- 
Gitee


From 4490e6e431c93bb12f019dadc5bb67016fdc2f53 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Sat, 14 Jan 2023 01:23:00 +0000
Subject: [PATCH 325/360] add global style

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ie7754f374e0c1a230c71918926cc9d48ece45e32
---
 service/window_manager/src/input_windows_manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index cd77b3bb59..f02b7cb1f1 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -716,7 +716,7 @@ void InputWindowsManager::OnSessionLost(SessionPtr session)
 int32_t InputWindowsManager::SetPointerStyle(int32_t pid, int32_t windowId, PointerStyle pointerStyle)
 {
     CALL_DEBUG_ENTER;
-    if (windowId == GLOBAL_WINDOWID) {
+    if (windowId == GLOBAL_WINDOW_ID) {
         globalStyle_.id = pointerStyle.id;
         MMI_HILOGD("setting global pointer style");
         return RET_OK;
@@ -752,7 +752,7 @@ int32_t InputWindowsManager::GetPointerStyle(int32_t pid, int32_t windowId, Poin
         MMI_HILOGE("The pointer style map is not include param pd, %{public}d", pid);
         return RET_ERR;
     }
-    if (windowId == GLOBAL_WINDOWID) {
+    if (windowId == GLOBAL_WINDOW_ID) {
          MMI_HILOGD("getting global pointer style");
         pointerStyle.id = globalStyle_.id;
         return RET_OK;
-- 
Gitee


From 7955db2e206c1680b74b9ac3c3a2f1b3fbedec61 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Sat, 14 Jan 2023 01:31:58 +0000
Subject: [PATCH 326/360] add global style

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I877d9202cc17e8ea52584d537bf4c47e5c24510c
---
 service/window_manager/src/input_windows_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index f02b7cb1f1..108070b90a 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -753,7 +753,7 @@ int32_t InputWindowsManager::GetPointerStyle(int32_t pid, int32_t windowId, Poin
         return RET_ERR;
     }
     if (windowId == GLOBAL_WINDOW_ID) {
-         MMI_HILOGD("getting global pointer style");
+        MMI_HILOGD("Getting global pointer style");
         pointerStyle.id = globalStyle_.id;
         return RET_OK;
     }
-- 
Gitee


From 6f4051aaa2a6d862d0845a89c3a99aa182bf7567 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Sat, 14 Jan 2023 01:38:40 +0000
Subject: [PATCH 327/360] add global style

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I5fe8169cb4b789b41f913dde7f7e34c522bff031
---
 service/window_manager/src/input_windows_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 108070b90a..be82cd7a78 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -718,7 +718,7 @@ int32_t InputWindowsManager::SetPointerStyle(int32_t pid, int32_t windowId, Poin
     CALL_DEBUG_ENTER;
     if (windowId == GLOBAL_WINDOW_ID) {
         globalStyle_.id = pointerStyle.id;
-        MMI_HILOGD("setting global pointer style");
+        MMI_HILOGD("Setting global pointer style");
         return RET_OK;
     }
     auto it = pointerStyle_.find(pid);
-- 
Gitee


From 9cc9dd91eb93e493d4b2fb016f7ec7532cfde341 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Sat, 14 Jan 2023 02:37:29 +0000
Subject: [PATCH 328/360] add global style

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Ib4676800b09f1818cb109414cfef30d3374d079b
---
 interfaces/native/innerkits/proxy/include/window_info.h | 1 +
 service/window_manager/src/input_windows_manager.cpp    | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/interfaces/native/innerkits/proxy/include/window_info.h b/interfaces/native/innerkits/proxy/include/window_info.h
index 8117b4d966..544d6d69a6 100644
--- a/interfaces/native/innerkits/proxy/include/window_info.h
+++ b/interfaces/native/innerkits/proxy/include/window_info.h
@@ -21,6 +21,7 @@
 
 namespace OHOS {
 namespace MMI {
+inline constexpr int32_t GLOBAL_WINDOW_ID = -1;
 enum Direction {
     /**
      * Rotating the display clockwise by 0 degree
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index be82cd7a78..b2f2ad81c2 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -33,7 +33,6 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "InputWindowsManager" };
 #ifdef OHOS_BUILD_ENABLE_POINTER
 constexpr int32_t DEFAULT_POINTER_STYLE = 0;
-constexpr int32_t GLOBAL_WINDOW_ID = -1;
 #endif // OHOS_BUILD_ENABLE_POINTER
 const std::string bindCfgFileName = "/data/service/el1/public/multimodalinput/display_bind.cfg";
 } // namespace
-- 
Gitee


From 323b96fbd477b725bc229cdd3de34b6a15d6f805 Mon Sep 17 00:00:00 2001
From: wuyiwuyiwywy <wuyi64@huawei.com>
Date: Sun, 15 Jan 2023 19:32:36 +0800
Subject: [PATCH 329/360] modify input_windows_manager.cpp Signed-off-by:
 wuyiwuyiwywy <wuyi64@huawei.com>

---
 service/window_manager/src/input_windows_manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index fe9b25c12a..cf94a745dc 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -618,9 +618,9 @@ bool InputWindowsManager::TouchPointToDisplayPoint(int32_t deviceId, struct libi
     EventTouch& touchInfo, int32_t& physicalDisplayId)
 {
     CHKPF(touch);
-    const std::string screenId = bindInfo_.GetBindDisplayNameByInputDevice(deviceId);
+    std::string screenId = bindInfo_.GetBindDisplayNameByInputDevice(deviceId);
     if (screenId.empty()) {
-        return false;
+        screenId = "default0";
     }
     auto info = FindPhysicalDisplayInfo(screenId);
     CHKPF(info);
-- 
Gitee


From ca49440588f07bbae758dc230b3b2bc037e2a41b Mon Sep 17 00:00:00 2001
From: "zhangyafei.echo" <zhangyafei12@huawei.com>
Date: Sun, 29 Jan 2023 10:42:25 +0800
Subject: [PATCH 330/360] IssueNo:#I6BD8M Description:Remove redundent
 dependency. Sig:SIG_ApplicationFramework Feature or BugFix: Feature Binary
 Source: No

Signed-off-by: zhangyafei.echo <zhangyafei12@huawei.com>
Change-Id: I32928590849128544b0a9b588430bb9cd46c5924
---
 examples/mmi/BUILD.gn                   | 1 -
 frameworks/napi/input_consumer/BUILD.gn | 1 -
 frameworks/napi/input_monitor/BUILD.gn  | 1 -
 service/BUILD.gn                        | 1 -
 4 files changed, 4 deletions(-)

diff --git a/examples/mmi/BUILD.gn b/examples/mmi/BUILD.gn
index 47060335b4..c82c1c9c8e 100644
--- a/examples/mmi/BUILD.gn
+++ b/examples/mmi/BUILD.gn
@@ -17,7 +17,6 @@ import("//foundation/multimodalinput/input/multimodalinput_mini.gni")
 ohos_executable("mmi-server") {
   sources = [ "src/mmi_service_main.cpp" ]
   deps = [
-    "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
     "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//foundation/multimodalinput/input/service:libmmi-server",
     "//foundation/multimodalinput/input/util:libmmi-util",
diff --git a/frameworks/napi/input_consumer/BUILD.gn b/frameworks/napi/input_consumer/BUILD.gn
index 6416ac0b79..1be6c44a15 100644
--- a/frameworks/napi/input_consumer/BUILD.gn
+++ b/frameworks/napi/input_consumer/BUILD.gn
@@ -34,7 +34,6 @@ ohos_shared_library("inputconsumer") {
 
   deps = [
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
-    "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
     "//foundation/multimodalinput/input/util:libmmi-util",
   ]
 
diff --git a/frameworks/napi/input_monitor/BUILD.gn b/frameworks/napi/input_monitor/BUILD.gn
index 8fd04fbe98..e28274bdf1 100644
--- a/frameworks/napi/input_monitor/BUILD.gn
+++ b/frameworks/napi/input_monitor/BUILD.gn
@@ -32,7 +32,6 @@ ohos_shared_library("inputmonitor") {
 
   deps = [
     "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
-    "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
     "//foundation/multimodalinput/input/util:libmmi-util",
   ]
 
diff --git a/service/BUILD.gn b/service/BUILD.gn
index 92bc13c16d..f4b28fb771 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -153,7 +153,6 @@ ohos_shared_library("libmmi-server") {
     "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
     "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client",
     "//foundation/multimodalinput/input/etc/mouse_icon:input_mouse_icon",
-    "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
     "//foundation/multimodalinput/input/patch/diff_libinput_mmi:libinput-third-mmi",
     "//foundation/multimodalinput/input/service/connect_manager:mmi_connect_manager_service",
     "//foundation/multimodalinput/input/service/filter:mmi_event_filter_proxy",
-- 
Gitee


From 7997e0288724179ac1ac498d156dedba8a4ea999 Mon Sep 17 00:00:00 2001
From: 15855116365 <murui2@huawei.com>
Date: Sat, 28 Jan 2023 07:28:07 +0000
Subject: [PATCH 331/360] hdi dependency modify

Signed-off-by: 15855116365 <murui2@huawei.com>
---
 BUILD.gn                             |  3 +-
 uinput/hdf_device_event_dispatch.cpp | 31 ++++++++++---------
 uinput/hdf_device_event_dispatch.h   | 11 ++++---
 uinput/hdf_device_event_manager.cpp  | 46 ++++++++++++++++------------
 uinput/hdf_device_event_manager.h    | 10 +++---
 5 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index bc0508b2ea..8d493067ad 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -40,8 +40,9 @@ ohos_executable("uinput_inject") {
 
   external_deps = [
     "c_utils:utils",
-    "drivers_interface_input:hdi_input",
+    "drivers_interface_input:libinput_proxy_1.0",
     "hiviewdfx_hilog_native:libhilog",
+    "ipc:ipc_single",
   ]
 
   part_name = "input"
diff --git a/uinput/hdf_device_event_dispatch.cpp b/uinput/hdf_device_event_dispatch.cpp
index fab41a9ce7..86ca4994d0 100644
--- a/uinput/hdf_device_event_dispatch.cpp
+++ b/uinput/hdf_device_event_dispatch.cpp
@@ -37,29 +37,32 @@ HdfDeviceEventDispatch::HdfDeviceEventDispatch(const uint32_t maxX, const uint32
 
 HdfDeviceEventDispatch::~HdfDeviceEventDispatch() {}
 
-void HdfDeviceEventDispatch::GetEventCallbackDispatch(
-    const InputEventPackage **pkgs, uint32_t count, uint32_t devIndex)
+int32_t HdfDeviceEventDispatch::EventPkgCallback(const std::vector<EventPackage> &pkgs, uint32_t devIndex)
 {
-    if (pkgs == nullptr) {
-        MMI_HILOGE("The pkgs is nullptr");
-        return;
+    if (pkgs.empty()) {
+        MMI_HILOGE("The pkgs is empty");
+        return HDF_FAILURE;
     }
-    for (uint32_t i = 0; i < count; i++) {
-        if (pkgs[i] == nullptr) {
-            continue;
-        }
-        if ((pkgs[i]->type == 0) && (pkgs[i]->code == 0) && (pkgs[i]->value == 0)) {
+
+    for (const auto &item : pkgs) {
+        if ((item.type == 0) && (item.code == 0) && (item.value == 0)) {
             InjectInputEvent injectInputSync = { injectThread_.TOUCH_SCREEN_DEVICE_ID, 0, SYN_MT_REPORT, 0 };
             injectThread_.WaitFunc(injectInputSync);
         }
         InjectInputEvent injectInputEvent = {
             injectThread_.TOUCH_SCREEN_DEVICE_ID,
-            pkgs[i]->type,
-            pkgs[i]->code,
-            pkgs[i]->value
+            item.type,
+            item.code,
+            item.value
         };
         injectThread_.WaitFunc(injectInputEvent);
     }
+    return HDF_SUCCESS;
+}
+
+int32_t HdfDeviceEventDispatch::HotPlugCallback(const HotPlugEvent &event)
+{
+    return HDF_SUCCESS;
 }
 } // namespace MMI
-} // namespace OHOS
+} // namespace OHOS
\ No newline at end of file
diff --git a/uinput/hdf_device_event_dispatch.h b/uinput/hdf_device_event_dispatch.h
index ac4cc32b0a..b53225e334 100644
--- a/uinput/hdf_device_event_dispatch.h
+++ b/uinput/hdf_device_event_dispatch.h
@@ -19,21 +19,24 @@
 #include <cstdint>
 
 #include "inject_thread.h"
-#include "input_type.h"
 #include "nocopyable.h"
+#include "v1_0/iinput_interfaces.h"
 
 namespace OHOS {
 namespace MMI {
-class HdfDeviceEventDispatch {
+using namespace OHOS::HDI::Input::V1_0;
+class HdfDeviceEventDispatch : public IInputCallback {
 public:
-    static void GetEventCallbackDispatch(const InputEventPackage **pkgs, uint32_t count, uint32_t devIndex);
     HdfDeviceEventDispatch(const uint32_t maxX, const uint32_t maxY);
     DISALLOW_COPY_AND_MOVE(HdfDeviceEventDispatch);
     virtual ~HdfDeviceEventDispatch();
 
+    int32_t EventPkgCallback(const std::vector<EventPackage> &pkgs, uint32_t devIndex) override;
+    int32_t HotPlugCallback(const HotPlugEvent &event) override;
+
 private:
     static InjectThread injectThread_;
 };
 } // namespace MMI
 } // namespace OHOS
-#endif  // HDF_DEVICE_EVENT_DISPATCH_H
+#endif  // HDF_DEVICE_EVENT_DISPATCH_H
\ No newline at end of file
diff --git a/uinput/hdf_device_event_manager.cpp b/uinput/hdf_device_event_manager.cpp
index b3d16f15d2..9f01767b7b 100644
--- a/uinput/hdf_device_event_manager.cpp
+++ b/uinput/hdf_device_event_manager.cpp
@@ -25,6 +25,8 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "HdfDeviceEventManager" };
+constexpr int32_t SLEEP_TIME = 50000;
+constexpr int32_t CALL_NUMBER = 70;
 } // namespace
 
 HdfDeviceEventManager::HdfDeviceEventManager() {}
@@ -33,30 +35,34 @@ HdfDeviceEventManager::~HdfDeviceEventManager() {}
 
 void HdfDeviceEventManager::ConnectHDFInit()
 {
-    int32_t ret = GetInputInterface(&inputInterface_);
-    if (ret != 0) {
-        MMI_HILOGE("Initialize failed");
-        return;
-    }
-
-    if (inputInterface_ == nullptr || inputInterface_->iInputManager == nullptr) {
-        MMI_HILOGE("The inputInterface_ or iInputManager is nullptr");
-        return;
-    }
+    int32_t count = 0;
+    do {
+        inputInterface_ = IInputInterfaces::Get();
+        usleep(SLEEP_TIME);
+        if (++count > CALL_NUMBER) {
+            MMI_HILOGE("The inputInterface_ is nullptr");
+            return;
+        }
+    } while (inputInterface_ == nullptr);
 
     thread_ = std::thread(&InjectThread::InjectFunc, injectThread_);
-    ret = inputInterface_->iInputManager->OpenInputDevice(TOUCH_DEV_ID);
-    if ((ret == INPUT_SUCCESS) && (inputInterface_->iInputReporter != nullptr)) {
-        ret = inputInterface_->iInputManager->GetInputDevice(TOUCH_DEV_ID, &iDevInfo_);
-        if (ret != INPUT_SUCCESS) {
-            MMI_HILOGE("GetInputDevice error");
+    int32_t ret = inputInterface_->OpenInputDevice(TOUCH_DEV_ID);
+    if (ret == HDF_SUCCESS) {
+        ret = inputInterface_->GetInputDevice(TOUCH_DEV_ID, iDevInfo_);
+        if (ret != HDF_SUCCESS) {
+            MMI_HILOGE("Get input device failed");
+            return;
+        }
+        callback_ = new (std::nothrow) HdfDeviceEventDispatch(iDevInfo_.attrSet.axisInfo[ABS_MT_POSITION_X].max,
+            iDevInfo_.attrSet.axisInfo[ABS_MT_POSITION_Y].max);
+        if (callback_ == nullptr) {
+            MMI_HILOGE("The callback_ is nullptr");
             return;
         }
-        std::unique_ptr<HdfDeviceEventDispatch> hdf = std::make_unique<HdfDeviceEventDispatch>(\
-            iDevInfo_->attrSet.axisInfo[ABS_MT_POSITION_X].max, iDevInfo_->attrSet.axisInfo[ABS_MT_POSITION_Y].max);
-        callback_.EventPkgCallback = hdf->GetEventCallbackDispatch;
-        ret = inputInterface_->iInputReporter->RegisterReportCallback(TOUCH_DEV_ID, &callback_);
+        ret = inputInterface_->RegisterReportCallback(TOUCH_DEV_ID, callback_);
         MMI_HILOGD("RegisterReportCallback ret:%{public}d", ret);
+    } else {
+        MMI_HILOGE("Open input device failed");
     }
 }
 } // namespace MMI
@@ -72,4 +78,4 @@ int32_t main()
         usleep(usleepTime);
     }
     return 0;
-}
+}
\ No newline at end of file
diff --git a/uinput/hdf_device_event_manager.h b/uinput/hdf_device_event_manager.h
index 4be80dc40f..207fc324e8 100644
--- a/uinput/hdf_device_event_manager.h
+++ b/uinput/hdf_device_event_manager.h
@@ -20,11 +20,11 @@
 #include <thread>
 
 #include "inject_thread.h"
-#include "input_manager.h"
-#include "input_type.h"
+#include "v1_0/iinput_interfaces.h"
 
 namespace OHOS {
 namespace MMI {
+using namespace OHOS::HDI::Input::V1_0;
 class HdfDeviceEventManager {
 public:
     HdfDeviceEventManager();
@@ -34,9 +34,9 @@ public:
     std::thread thread_;
 
 private:
-    InputDeviceInfo *iDevInfo_ { nullptr };
-    IInputInterface *inputInterface_ { nullptr };
-    InputEventCb callback_ {};
+    DeviceInfo iDevInfo_;
+    sptr<IInputInterfaces> inputInterface_ { nullptr };
+    sptr<IInputCallback> callback_ { nullptr };
     const uint32_t TOUCH_DEV_ID { 1 };
 };
 } // namespace MMI
-- 
Gitee


From 33608a4128820520627cf0e146cb8590b0768252 Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Tue, 31 Jan 2023 11:39:54 +0000
Subject: [PATCH 332/360] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=83=AD=E6=8F=92=E6=97=B6=E6=A6=82=E7=8E=87=E4=B8=8D=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E6=A0=B7=E5=BC=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: Iab8d50798576db917c03fdd885369cd9fcc0da9d
---
 service/device_manager/src/input_device_manager.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index b4cf66a77f..b903cb3cdb 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -370,7 +370,6 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
 {
     CALL_DEBUG_ENTER;
     CHKPV(inputDevice);
-    bool hasLocalPointer = false;
     bool hasPointer = false;
     for (const auto &item : inputDevice_) {
         if (item.second.inputDeviceOrigin == inputDevice) {
@@ -380,9 +379,6 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
         }
         if (item.second.isPointerDevice) {
             hasPointer = true;
-            if (!item.second.isRemote) {
-                hasLocalPointer = true;
-            }
         }
     }
 
@@ -418,13 +414,12 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
     }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     if (!hasPointer && info.isPointerDevice) {
-        bool visible = !info.isRemote || hasLocalPointer;
 #ifdef OHOS_BUILD_ENABLE_POINTER_DRAWING
         if (HasTouchDevice()) {
             IPointerDrawingManager::GetInstance()->SetMouseDisplayState(false);
         }
 #endif // OHOS_BUILD_ENABLE_POINTER_DRAWING
-        NotifyPointerDevice(true, visible);
+        NotifyPointerDevice(true, true);
         OHOS::system::SetParameter(INPUT_POINTER_DEVICE, "true");
         MMI_HILOGI("Set para input.pointer.device true");
     }
-- 
Gitee


From 9333063d1017af292d67f846cf756510e5a1439c Mon Sep 17 00:00:00 2001
From: houchengyu2022 <houchengyu@huawei.com>
Date: Thu, 2 Feb 2023 15:11:22 +0800
Subject: [PATCH 333/360] fixed c22d114 from
 https://gitee.com/houchengyu2022/multimodalinput_input/pulls/2274 fixed
 6cbaeff from
 https://gitee.com/houchengyu2022/multimodalinput_input/pulls/2273 solve the
 multimodal input process crash by adding mutex to map Signed-off-by:
 houchengyu22 <houchengyu@huawei.com>

---
 frameworks/napi/input_consumer/include/js_register_module.h | 4 ++--
 frameworks/napi/input_consumer/src/js_register_module.cpp   | 1 +
 frameworks/napi/input_consumer/src/js_register_util.cpp     | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frameworks/napi/input_consumer/include/js_register_module.h b/frameworks/napi/input_consumer/include/js_register_module.h
index 147dab007f..43666703ec 100644
--- a/frameworks/napi/input_consumer/include/js_register_module.h
+++ b/frameworks/napi/input_consumer/include/js_register_module.h
@@ -51,11 +51,11 @@ struct KeyEventMonitorInfo {
     std::string name;
     napi_value handle { nullptr };
     std::shared_ptr<KeyEvent> keyEvent { nullptr };
-    napi_ref callback[1] {};
+    napi_ref callback[1] { nullptr };
     int32_t subscribeId { 0 };
     std::shared_ptr<KeyOption> keyOption { nullptr };
 };
-
+static std::mutex sCallBacksMutex_;
 typedef std::map<std::string, std::list<KeyEventMonitorInfo *>> Callbacks;
 } // namespace MMI
 } // namespace OHOS
diff --git a/frameworks/napi/input_consumer/src/js_register_module.cpp b/frameworks/napi/input_consumer/src/js_register_module.cpp
index 9daef7ac04..1200a31d12 100644
--- a/frameworks/napi/input_consumer/src/js_register_module.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_module.cpp
@@ -216,6 +216,7 @@ static void SubKeyEventCallback(std::shared_ptr<KeyEvent> keyEvent)
 {
     CALL_DEBUG_ENTER;
     CHKPV(keyEvent);
+    std::lock_guard guard(sCallBacksMutex_);
     auto iter = callbacks.begin();
     while (iter != callbacks.end()) {
         auto &list = iter->second;
diff --git a/frameworks/napi/input_consumer/src/js_register_util.cpp b/frameworks/napi/input_consumer/src/js_register_util.cpp
index d13d7ca269..667f02cf87 100644
--- a/frameworks/napi/input_consumer/src/js_register_util.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_util.cpp
@@ -135,6 +135,7 @@ int32_t AddEventCallback(const napi_env &env, Callbacks &callbacks, KeyEventMoni
 {
     CALL_DEBUG_ENTER;
     CHKPR(event, ERROR_NULL_POINTER);
+    std::lock_guard guard(sCallBacksMutex_);
     if (callbacks.find(event->eventType) == callbacks.end()) {
         MMI_HILOGD("No callback in %{public}s", event->eventType.c_str());
         callbacks[event->eventType] = {};
@@ -173,6 +174,7 @@ int32_t DelEventCallback(const napi_env &env, Callbacks &callbacks,
 {
     CALL_DEBUG_ENTER;
     CHKPR(event, ERROR_NULL_POINTER);
+    std::lock_guard guard(sCallBacksMutex_);
     if (callbacks.count(event->eventType) <= 0) {
         MMI_HILOGE("Callback doesn't exists");
         return JS_CALLBACK_EVENT_FAILED;
-- 
Gitee


From 6c8fb6dfca1f66b97d313c0c5294ac5dc5e7b011 Mon Sep 17 00:00:00 2001
From: 15855116365 <murui2@huawei.com>
Date: Mon, 6 Feb 2023 02:01:37 +0000
Subject: [PATCH 334/360] Switch to HDI Input pass-through mode

Signed-off-by: 15855116365 <murui2@huawei.com>
---
 BUILD.gn                            |  1 -
 uinput/hdf_device_event_manager.cpp | 19 ++++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 8d493067ad..3213fc6779 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -42,7 +42,6 @@ ohos_executable("uinput_inject") {
     "c_utils:utils",
     "drivers_interface_input:libinput_proxy_1.0",
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_single",
   ]
 
   part_name = "input"
diff --git a/uinput/hdf_device_event_manager.cpp b/uinput/hdf_device_event_manager.cpp
index 9f01767b7b..529e2ce0c3 100644
--- a/uinput/hdf_device_event_manager.cpp
+++ b/uinput/hdf_device_event_manager.cpp
@@ -25,8 +25,6 @@ namespace OHOS {
 namespace MMI {
 namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "HdfDeviceEventManager" };
-constexpr int32_t SLEEP_TIME = 50000;
-constexpr int32_t CALL_NUMBER = 70;
 } // namespace
 
 HdfDeviceEventManager::HdfDeviceEventManager() {}
@@ -35,16 +33,11 @@ HdfDeviceEventManager::~HdfDeviceEventManager() {}
 
 void HdfDeviceEventManager::ConnectHDFInit()
 {
-    int32_t count = 0;
-    do {
-        inputInterface_ = IInputInterfaces::Get();
-        usleep(SLEEP_TIME);
-        if (++count > CALL_NUMBER) {
-            MMI_HILOGE("The inputInterface_ is nullptr");
-            return;
-        }
-    } while (inputInterface_ == nullptr);
-
+    inputInterface_ = IInputInterfaces::Get(true);
+    if (inputInterface_ == nullptr) {
+        MMI_HILOGE("The inputInterface_ is nullptr");
+        return;
+    }
     thread_ = std::thread(&InjectThread::InjectFunc, injectThread_);
     int32_t ret = inputInterface_->OpenInputDevice(TOUCH_DEV_ID);
     if (ret == HDF_SUCCESS) {
@@ -78,4 +71,4 @@ int32_t main()
         usleep(usleepTime);
     }
     return 0;
-}
\ No newline at end of file
+}
-- 
Gitee


From 4b0f110e88df5f29892901edf19e9a17cdbe194e Mon Sep 17 00:00:00 2001
From: wuliangdong <wuliangdong1@huawei.com>
Date: Tue, 7 Feb 2023 08:22:06 +0000
Subject: [PATCH 335/360] fix bug for GetPointerStyle

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
Change-Id: I82b4fce79c87835bd09436cca20d897f95e7c579
---
 service/window_manager/src/input_windows_manager.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index cf94a745dc..26a189d1b0 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -748,17 +748,16 @@ int32_t InputWindowsManager::SetPointerStyle(int32_t pid, int32_t windowId, Poin
 int32_t InputWindowsManager::GetPointerStyle(int32_t pid, int32_t windowId, PointerStyle &pointerStyle) const
 {
     CALL_DEBUG_ENTER;
-    auto it = pointerStyle_.find(pid);
-    if (it == pointerStyle_.end()) {
-        MMI_HILOGE("The pointer style map is not include param pd, %{public}d", pid);
-        return RET_ERR;
-    }
     if (windowId == GLOBAL_WINDOW_ID) {
         MMI_HILOGD("Getting global pointer style");
         pointerStyle.id = globalStyle_.id;
         return RET_OK;
     }
-
+    auto it = pointerStyle_.find(pid);
+    if (it == pointerStyle_.end()) {
+        MMI_HILOGE("The pointer style map is not include param pd, %{public}d", pid);
+        return RET_ERR;
+    }
     auto iter = it->second.find(windowId);
     if (iter == it->second.end()) {
         pointerStyle.id = globalStyle_.id;
-- 
Gitee


From 17a6daf35b3518634bef4f304a6f7ec26ce0ff05 Mon Sep 17 00:00:00 2001
From: houchengyu2022 <houchengyu@huawei.com>
Date: Thu, 9 Feb 2023 14:46:49 +0800
Subject: [PATCH 336/360] Fix some message Signed-off-by: houchengyu2022
 <houchengyu@huawei.com>

---
 frameworks/napi/input_device/src/js_util.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frameworks/napi/input_device/src/js_util.cpp b/frameworks/napi/input_device/src/js_util.cpp
index 57920dae68..590eca1b4c 100644
--- a/frameworks/napi/input_device/src/js_util.cpp
+++ b/frameworks/napi/input_device/src/js_util.cpp
@@ -27,14 +27,14 @@ namespace {
 constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "JsUtil" };
 
 std::map<int32_t, std::string> axisType = {
-    { ABS_MT_TOUCH_MAJOR, "touchMajor" },
-    { ABS_MT_TOUCH_MINOR, "touchMinor" },
+    { ABS_MT_TOUCH_MAJOR, "touchmajor" },
+    { ABS_MT_TOUCH_MINOR, "touchminor" },
     { ABS_MT_ORIENTATION, "orientation" },
     { ABS_MT_POSITION_X, "x" },
     { ABS_MT_POSITION_Y, "y" },
     { ABS_MT_PRESSURE, "pressure" },
-    { ABS_MT_WIDTH_MAJOR, "toolMajor" },
-    { ABS_MT_WIDTH_MINOR, "toolMinor" },
+    { ABS_MT_WIDTH_MAJOR, "toolmajor" },
+    { ABS_MT_WIDTH_MINOR, "toolminor" },
 };
 
 constexpr uint32_t EVDEV_UDEV_TAG_TOUCHSCREEN = (1 << 4);
-- 
Gitee


From ef07b8e750c95a3f170d58011fbedb6cdbea07a5 Mon Sep 17 00:00:00 2001
From: houchengyu2022 <houchengyu@huawei.com>
Date: Sun, 12 Feb 2023 17:57:11 +0800
Subject: [PATCH 337/360] Fix bug in screenX,Y and windowX,Y Signed-off-by:
 houchengyu2022 <houchengyu@huawei.com>

---
 frameworks/napi/input_monitor/src/js_input_monitor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frameworks/napi/input_monitor/src/js_input_monitor.cpp b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
index 9b726d993c..72b94b4112 100644
--- a/frameworks/napi/input_monitor/src/js_input_monitor.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
@@ -349,10 +349,10 @@ MapFun JsInputMonitor::GetFuns(const std::shared_ptr<PointerEvent> pointerEvent,
     mapFun["screenId"] = std::bind(&PointerEvent::GetTargetDisplayId, pointerEvent);
     mapFun["windowId"] = std::bind(&PointerEvent::GetTargetWindowId, pointerEvent);
     mapFun["deviceId"] = std::bind(&PointerEvent::PointerItem::GetDeviceId, item);
-    mapFun["windowX"] = std::bind(&PointerEvent::PointerItem::GetDisplayX, item);
-    mapFun["windowY"] = std::bind(&PointerEvent::PointerItem::GetDisplayY, item);
-    mapFun["screenX"] = std::bind(&PointerEvent::PointerItem::GetWindowX, item);
-    mapFun["screenY"] = std::bind(&PointerEvent::PointerItem::GetWindowY, item);
+    mapFun["windowX"] = std::bind(&PointerEvent::PointerItem::GetWindowX, item);
+    mapFun["windowY"] = std::bind(&PointerEvent::PointerItem::GetWindowY, item);
+    mapFun["screenX"] = std::bind(&PointerEvent::PointerItem::GetDisplayX, item);
+    mapFun["screenY"] = std::bind(&PointerEvent::PointerItem::GetDisplayY, item);
     mapFun["rawDeltaX"] = std::bind(&PointerEvent::PointerItem::GetRawDx, item);
     mapFun["rawDeltaY"] = std::bind(&PointerEvent::PointerItem::GetRawDy, item);
     return mapFun;
-- 
Gitee


From bba208230e940992ed107efc297cdfb7932a609a Mon Sep 17 00:00:00 2001
From: Zhang Peng <zhangpeng280@huawei.com>
Date: Thu, 16 Feb 2023 12:00:42 +0800
Subject: [PATCH 338/360] fix compile error if locale is not en_US

Signed-off-by: Zhang Peng <zhangpeng280@huawei.com>
Change-Id: If4dcedd0068a86ad20ae2b92f137ad987ddf8463
---
 patch/apply_patch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patch/apply_patch.sh b/patch/apply_patch.sh
index 3a1a8e708f..9b934fcd07 100755
--- a/patch/apply_patch.sh
+++ b/patch/apply_patch.sh
@@ -60,7 +60,7 @@ if [ $? -ne 0 ]; then
     exit 0
 fi
 
-PATCH_FILE=$(realpath $(ls -l $path_file_dir/*.diff | tail -n 1 | awk '{print $9}'))
+PATCH_FILE=$(realpath $(ls $path_file_dir/*.diff | tail -n 1))
 
 echo "PATCH_FILE: $PATCH_FILE"
 
-- 
Gitee


From 024bb0c72a6a890e5d22e09169467f48893e40d6 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Mon, 20 Feb 2023 01:20:17 +0000
Subject: [PATCH 339/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: I004e34455b139cc5de725500a3ebc744e90cfacf
---
 .../innerkits/proxy/include/extra_data.h      |  6 +++++
 .../src/multimodal_input_connect_proxy.cpp    |  1 +
 .../src/multimodal_input_connect_stub.cpp     |  1 +
 .../include/input_windows_manager.h           |  1 +
 .../src/input_windows_manager.cpp             | 22 +++++++++++++++++--
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/interfaces/native/innerkits/proxy/include/extra_data.h b/interfaces/native/innerkits/proxy/include/extra_data.h
index 739366c06f..912e8060c1 100644
--- a/interfaces/native/innerkits/proxy/include/extra_data.h
+++ b/interfaces/native/innerkits/proxy/include/extra_data.h
@@ -45,6 +45,12 @@ struct ExtraData {
      * @since 9
      */
     int32_t sourceType { -1 };
+    /**
+     * 事件触发的pointer id
+     *
+     * @since 9
+     */
+    int32_t pointerId { -1 };
 };
 } // namespace MMI
 } // namespace OHOS
diff --git a/service/connect_manager/src/multimodal_input_connect_proxy.cpp b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
index d9b43e896f..441ed61930 100644
--- a/service/connect_manager/src/multimodal_input_connect_proxy.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_proxy.cpp
@@ -1018,6 +1018,7 @@ int32_t MultimodalInputConnectProxy::AppendExtraData(const ExtraData& extraData)
         WRITEUINT8(data, item);
     }
     WRITEINT32(data, extraData.sourceType, ERR_INVALID_VALUE);
+    WRITEINT32(data, extraData.pointerId, ERR_INVALID_VALUE);
     MessageParcel reply;
     MessageOption option;
     sptr<IRemoteObject> remote = Remote();
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 949fa33ec7..14769b9e8c 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -975,6 +975,7 @@ int32_t MultimodalInputConnectStub::StubAppendExtraData(MessageParcel& data, Mes
         extraData.buffer.push_back(buffer);
     }
     READINT32(data, extraData.sourceType, IPC_PROXY_DEAD_OBJECT_ERR);
+    READINT32(data, extraData.pointerId, IPC_PROXY_DEAD_OBJECT_ERR);
     int32_t ret = AppendExtraData(extraData);
     if (ret != RET_OK) {
         MMI_HILOGE("Fail to call AppendExtraData, ret:%{public}d", ret);
diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h
index b35fdee77b..277001af02 100644
--- a/service/window_manager/include/input_windows_manager.h
+++ b/service/window_manager/include/input_windows_manager.h
@@ -144,6 +144,7 @@ private:
     void CheckZorderWindowChange(const DisplayGroupInfo &displayGroupInfo);
     void UpdateDisplayIdAndName();
     void UpdatePointerAction(std::shared_ptr<PointerEvent> pointerEvent);
+    void ClearExtraData();
 private:
     UDSServer* udsServer_ { nullptr };
 #ifdef OHOS_BUILD_ENABLE_POINTER
diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 26a189d1b0..1ac1c81a2c 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -1029,6 +1029,9 @@ int32_t InputWindowsManager::UpdateMouseTarget(std::shared_ptr<PointerEvent> poi
         InitMouseDownInfo();
         MMI_HILOGD("Mouse up, clear mouse down info");
     }
+    if (action == PointerEvent::POINTER_ACTION_PULL_UP) {
+        ClearExtraData();
+    }
     MMI_HILOGD("pid:%{public}d,id:%{public}d,agentWindowId:%{public}d,"
                "logicalX:%{public}d,logicalY:%{public}d,"
                "displayX:%{public}d,displayY:%{public}d,windowX:%{public}d,windowY:%{public}d",
@@ -1101,7 +1104,8 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
                        "window:%{public}d, flags:%{public}d", item.id, item.flags);
             continue;
         }
-        if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_TOUCHSCREEN) {
+        if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_TOUCHSCREEN &&
+            extraData_.pointerId == pointerId) {
             if (IsInHotArea(logicalX, logicalY, item.defaultHotAreas)) {
                 touchWindow = &item;
                 break;
@@ -1143,7 +1147,8 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
     pointerItem.SetToolWindowY(pointerItem.GetToolDisplayY() + physicDisplayInfo->y - touchWindow->area.y);
     pointerItem.SetTargetWindowId(touchWindow->id);
     pointerEvent->UpdatePointerItem(pointerId, pointerItem);
-    if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_TOUCHSCREEN) {
+    if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_TOUCHSCREEN &&
+        extraData_.pointerId == pointerId) {
         pointerEvent->SetBuffer(extraData_.buffer);
         UpdatePointerAction(pointerEvent);
         PullEnterLeaveEvent(logicalX, logicalY, pointerEvent, touchWindow);
@@ -1173,6 +1178,9 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
             MMI_HILOGD("Clear the touch info, action is up, pointerid:%{public}d", pointerId);
         }
     }
+    if (pointerAction == PointerEvent::POINTER_ACTION_PULL_UP) {
+        ClearExtraData();
+    }
     return ERR_OK;
 }
 
@@ -1432,9 +1440,19 @@ int32_t InputWindowsManager::AppendExtraData(const ExtraData& extraData)
     extraData_.appended = extraData.appended;
     extraData_.buffer = extraData.buffer;
     extraData_.sourceType = extraData.sourceType;
+    extraData_.pointerId = extraData.pointerId;
     return RET_OK;
 }
 
+void InputWindowsManager::ClearExtraData()
+{
+    CALL_DEBUG_ENTER;
+    extraData_.appended = false;
+    extraData_.buffer.clear();
+    extraData_.sourceType = -1;
+    extraData_.pointerId = -1;
+}
+
 void InputWindowsManager::UpdatePointerAction(std::shared_ptr<PointerEvent> pointerEvent)
 {
     CALL_DEBUG_ENTER;
-- 
Gitee


From a88bfbc4f6660d85fc4d9771efeaf9a93fc09bdb Mon Sep 17 00:00:00 2001
From: yuanxinying <yuanxinying@huawei.com>
Date: Mon, 20 Feb 2023 15:10:45 +0800
Subject: [PATCH 340/360] fixed da40df9 from
 https://gitee.com/yuanxinying/multimodalinput_input/pulls/2312 notify input
 method when device B change from STATE_FREE to STATE_IN Signed-off-by:
 yuanxinying <yuanxinying@huawei.com>

---
 .../include/input_device_manager.h               |  1 +
 .../device_manager/src/input_device_manager.cpp  | 16 ++++++++++++++++
 .../include/input_device_cooperate_sm.h          |  3 +++
 .../src/input_device_cooperate_sm.cpp            | 11 +++++++++++
 4 files changed, 31 insertions(+)

diff --git a/service/device_manager/include/input_device_manager.h b/service/device_manager/include/input_device_manager.h
index abdee84f69..325aa9eac3 100644
--- a/service/device_manager/include/input_device_manager.h
+++ b/service/device_manager/include/input_device_manager.h
@@ -71,6 +71,7 @@ public:
     std::vector<std::string> GetCooperateDhids(int32_t deviceId);
     std::vector<std::string> GetCooperateDhids(const std::string &dhid);
     bool HasLocalPointerDevice() const;
+    void NotifyVirtualKeyBoardStatus(int32_t deviceId, bool isAvailable) const;
 #endif // OHOS_BUILD_ENABLE_COOPERATE
     bool IsKeyboardDevice(struct libinput_device* device) const;
     bool IsPointerDevice(struct libinput_device* device) const;
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index b903cb3cdb..ee924c8974 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -410,6 +410,9 @@ void InputDeviceManager::OnInputDeviceAdded(struct libinput_device *inputDevice)
 
 #ifdef OHOS_BUILD_ENABLE_COOPERATE
     if (IsKeyboardDevice(inputDevice)) {
+        if (IsRemote(inputDevice)) {
+            InputDevCooSM->SetVirtualKeyBoardDevId(deviceId);
+        }
         InputDevCooSM->OnKeyboardOnline(info.dhid);
     }
 #endif // OHOS_BUILD_ENABLE_COOPERATE
@@ -771,6 +774,19 @@ bool InputDeviceManager::HasLocalPointerDevice() const
     return false;
 }
 
+void InputDeviceManager::NotifyVirtualKeyBoardStatus(int32_t deviceId, bool isAvailable) const {
+    MMI_HILOGI("virtual keyboard device %{public}s", isAvailable ? "online" : "offline");
+    if (deviceId == -1) {
+        MMI_HILOGE("no virtual keyboard device for this device!");
+        return;
+    }
+
+    for (const auto &item : devListener_) {
+        CHKPC(item.first);
+        item.second(deviceId, isAvailable ? "add" : "remove");
+    }
+}
+
 std::string InputDeviceManager::MakeNetworkId(const char *phys) const
 {
     std::string networkId;
diff --git a/service/input_device_cooperate/include/input_device_cooperate_sm.h b/service/input_device_cooperate/include/input_device_cooperate_sm.h
index f1277a991f..76c24d48dc 100755
--- a/service/input_device_cooperate/include/input_device_cooperate_sm.h
+++ b/service/input_device_cooperate/include/input_device_cooperate_sm.h
@@ -68,6 +68,8 @@ public:
     int32_t StartInputDeviceCooperate(const std::string &remoteNetworkId, int32_t startInputDeviceId);
     int32_t StopInputDeviceCooperate();
     void GetCooperateState(const std::string &deviceId);
+    void SetVirtualKeyBoardDevId(int32_t deviceId);
+    int32_t GetVirtualKeyBoardDevId();
     void StartRemoteCooperate(const std::string &remoteNetworkId);
     void StartRemoteCooperateResult(bool isSuccess, const std::string &startDhid, int32_t xPercent, int32_t yPercent);
     void StopRemoteCooperate();
@@ -106,6 +108,7 @@ private:
     std::pair<std::string, std::string> preparedNetworkId_;
     std::string startDhid_ ;
     std::string srcNetworkId_;
+    int32_t virtualKeyBoardId_ { -1 };
     CooperateState cooperateState_ { CooperateState::STATE_FREE };
     std::shared_ptr<DistributedHardware::DmInitCallback> initCallback_ { nullptr };
     std::shared_ptr<DistributedHardware::DeviceStateCallback> stateCallback_ { nullptr };
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index 39c8f2aa97..8665250570 100644
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -157,6 +157,15 @@ void InputDeviceCooperateSM::OnCloseCooperation(const std::string &networkId, bo
     }
 }
 
+void InputDeviceCooperateSM::SetVirtualKeyBoardDevId(int32_t deviceId) {
+    virtualKeyBoardId_ = deviceId;
+    MMI_HILOGI("virtualKeyBoardId_ has been set to%{public}d", virtualKeyBoardId_);
+}
+
+int32_t InputDeviceCooperateSM::GetVirtualKeyBoardDevId() {
+    return virtualKeyBoardId_;
+}
+
 void InputDeviceCooperateSM::GetCooperateState(const std::string &deviceId)
 {
     CALL_INFO_TRACE;
@@ -270,6 +279,7 @@ void InputDeviceCooperateSM::StartRemoteCooperateResult(bool isSuccess,
     if (cooperateState_ == CooperateState::STATE_FREE) {
         MouseEventHdr->SetAbsolutionLocation(MOUSE_ABS_LOCATION - xPercent, yPercent);
         UpdateState(CooperateState::STATE_IN);
+        InputDevMgr->NotifyVirtualKeyBoardStatus(GetVirtualKeyBoardDevId(), true);
     }
     if (cooperateState_ == CooperateState::STATE_OUT) {
         MouseEventHdr->SetAbsolutionLocation(MOUSE_ABS_LOCATION - xPercent, yPercent);
@@ -332,6 +342,7 @@ void InputDeviceCooperateSM::OnStartFinish(bool isSuccess,
                 DevCooperateSoftbusAdapter->StartCooperateOtherResult(sink, remoteNetworkId);
             }
             UpdateState(CooperateState::STATE_FREE);
+            InputDevMgr->NotifyVirtualKeyBoardStatus(GetVirtualKeyBoardDevId(), false);
             KeyRepeat->RemoveTimer();
         } else {
             MMI_HILOGI("Current state is out");
-- 
Gitee


From 192c69403b38f3893b59397749aa8cd29121fe03 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Tue, 21 Feb 2023 01:57:16 +0000
Subject: [PATCH 341/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: Ifa03583ce8f773cc627b4e332754d27232d076a4
---
 frameworks/napi/input_monitor/src/js_input_monitor.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frameworks/napi/input_monitor/src/js_input_monitor.cpp b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
index 72b94b4112..f405a17344 100644
--- a/frameworks/napi/input_monitor/src/js_input_monitor.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
@@ -575,13 +575,15 @@ int32_t JsInputMonitor::TransformTsActionValue(int32_t pointerAction)
         case PointerEvent::POINTER_ACTION_CANCEL: {
             return CANCEL;
         }
-        case PointerEvent::POINTER_ACTION_MOVE: {
+        case PointerEvent::POINTER_ACTION_MOVE:
+        case PointerEvent::POINTER_ACTION_PULL_MOVE: {
             return MOVE;
         }
         case PointerEvent::POINTER_ACTION_BUTTON_DOWN: {
             return BUTTON_DOWN;
         }
-        case PointerEvent::POINTER_ACTION_BUTTON_UP: {
+        case PointerEvent::POINTER_ACTION_BUTTON_UP:
+        case PointerEvent::POINTER_ACTION_PULL_UP: {
             return BUTTON_UP;
         }
         case PointerEvent::POINTER_ACTION_AXIS_BEGIN: {
-- 
Gitee


From 334665b4a0e9c323d5dffdbbe7e38a4cf3b12830 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Tue, 21 Feb 2023 11:10:54 +0000
Subject: [PATCH 342/360] Signed-off-by:xueyuanzhao<zhaoxueyuan@huawei.com>

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: Ic9499cae95a610d5063b4b1df6f3324170646e43
---
 frameworks/proxy/events/test/input_manager_test.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frameworks/proxy/events/test/input_manager_test.cpp b/frameworks/proxy/events/test/input_manager_test.cpp
index fc4d4afb2c..b8379c456e 100644
--- a/frameworks/proxy/events/test/input_manager_test.cpp
+++ b/frameworks/proxy/events/test/input_manager_test.cpp
@@ -4203,6 +4203,7 @@ HWTEST_F(InputManagerTest, AppendExtraData_001, TestSize.Level1)
     extraData.appended = true;
     extraData.buffer = buffer;
     extraData.sourceType = PointerEvent::SOURCE_TYPE_TOUCHSCREEN;
+    extraData.pointerId = 1;
     InputManager::GetInstance()->AppendExtraData(extraData);
     std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
     auto pointerEvent = SetupPointerEvent001();
@@ -4211,6 +4212,7 @@ HWTEST_F(InputManagerTest, AppendExtraData_001, TestSize.Level1)
 
     extraData.appended = false;
     extraData.buffer.clear();
+    extraData.pointerId = -1;
     InputManager::GetInstance()->AppendExtraData(extraData);
     std::this_thread::sleep_for(std::chrono::milliseconds(TIME_WAIT_FOR_OP));
     ASSERT_TRUE(pointerEvent != nullptr);
-- 
Gitee


From c209a27693c7fbd5fa0068946e1146d35fc9cce7 Mon Sep 17 00:00:00 2001
From: yuanxinying <yuanxinying@huawei.com>
Date: Tue, 21 Feb 2023 20:29:54 +0800
Subject: [PATCH 343/360] fixed bfdf957 from
 https://gitee.com/yuanxinying/multimodalinput_input/pulls/2321 cherry-pick
 2298 change to master branch Signed-off-by:yuanxinying
 <yuanxinying@huawei.com>

---
 .../include/js_register_module.h              | 11 +++++++++
 .../input_consumer/src/js_register_module.cpp | 23 +++++++++++++++++--
 .../input_consumer/src/js_register_util.cpp   |  4 ++++
 .../event_handler/src/client_msg_handler.cpp  | 16 ++++++++++---
 .../proxy/events/include/event_log_helper.h   | 11 +++++----
 5 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/frameworks/napi/input_consumer/include/js_register_module.h b/frameworks/napi/input_consumer/include/js_register_module.h
index 43666703ec..124bc7feb7 100644
--- a/frameworks/napi/input_consumer/include/js_register_module.h
+++ b/frameworks/napi/input_consumer/include/js_register_module.h
@@ -21,6 +21,7 @@
 #include <iostream>
 #include <list>
 #include <map>
+#include <mutex>
 
 #include "napi/native_api.h"
 #include "napi/native_node_api.h"
@@ -54,6 +55,16 @@ struct KeyEventMonitorInfo {
     napi_ref callback[1] { nullptr };
     int32_t subscribeId { 0 };
     std::shared_ptr<KeyOption> keyOption { nullptr };
+    bool valid { true };
+    std::mutex refLock;
+    void SetValid(bool flag) {
+        std::lock_guard<std::mutex> lock(refLock);
+        valid = flag;
+    }
+    bool IsValid() {
+        std::lock_guard<std::mutex> lock(refLock);
+        return valid;
+    }
 };
 static std::mutex sCallBacksMutex_;
 typedef std::map<std::string, std::list<KeyEventMonitorInfo *>> Callbacks;
diff --git a/frameworks/napi/input_consumer/src/js_register_module.cpp b/frameworks/napi/input_consumer/src/js_register_module.cpp
index 1200a31d12..e5c0f9fa91 100644
--- a/frameworks/napi/input_consumer/src/js_register_module.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_module.cpp
@@ -239,11 +239,22 @@ static napi_value JsOn(napi_env env, napi_callback_info info)
     CALL_DEBUG_ENTER;
     size_t argc = 3;
     napi_value argv[3] = { 0 };
-    CHKRP(napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr), GET_CB_INFO);
+    napi_value thisArg = nullptr;
+    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, &thisArg, nullptr), GET_CB_INFO);
     if (argc < 3) {
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "parameter number error");
         return nullptr;
     }
+    if (thisArg == nullptr) {
+        MMI_HILOGE("%{public}s, This argument is nullptr.", __func__);
+        return nullptr;
+    }
+    napi_valuetype valueOfThis = napi_undefined;
+    CHKRP(env, napi_typeof(env, thisArg, &valueOfThis), TYPEOF);
+    if (valueOfThis == napi_undefined) {
+        MMI_HILOGE("%{public}s, Wrong value of this.", __func__);
+        return nullptr;
+    }
     KeyEventMonitorInfo *event = new (std::nothrow) KeyEventMonitorInfo {
         .env = env,
         .asyncWork = nullptr,
@@ -283,6 +294,14 @@ static napi_value JsOn(napi_env env, napi_callback_info info)
         MMI_HILOGE("AddEventCallback failed");
         return nullptr;
     }
+    std::shared_ptr<KeyEventMonitorInfo>* cbInfo = new std::shared_ptr<KeyEventMonitorInfo>(event);
+    napi_wrap(env, thisArg, (void*)cbInfo, [](napi_env env, void* data, void* hint) {
+        std::shared_ptr<KeyEventMonitorInfo>* cbInfo = static_cast<std::shared_ptr<KeyEventMonitorInfo>*>(data);
+        if (cbInfo != nullptr && *cbInfo != nullptr) {
+            (*cbInfo)->SetValid(false);
+            delete cbInfo;
+        }
+    }, nullptr, nullptr);
     return nullptr;
 }
 
@@ -358,4 +377,4 @@ extern "C" __attribute__((constructor)) void RegisterModule(void)
     napi_module_register(&mmiModule);
 }
 } // namespace MMI
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/frameworks/napi/input_consumer/src/js_register_util.cpp b/frameworks/napi/input_consumer/src/js_register_util.cpp
index 667f02cf87..84220e656c 100644
--- a/frameworks/napi/input_consumer/src/js_register_util.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_util.cpp
@@ -313,6 +313,10 @@ void EmitAsyncCallbackWork(KeyEventMonitorInfo *reportEvent)
 {
     CALL_DEBUG_ENTER;
     CHKPV(reportEvent);
+    if (!reportEvent->IsValid()) {
+        MMI_HILOGE("%{public}s, module exported object is invalid.", __func__);
+        return;
+    }
     uv_loop_s *loop = nullptr;
     CHKRV(napi_get_uv_event_loop(reportEvent->env, &loop), GET_UV_EVENT_LOOP);
     uv_work_t *work = new (std::nothrow) uv_work_t;
diff --git a/frameworks/proxy/event_handler/src/client_msg_handler.cpp b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
index 97a74d5a9b..22453bcfe3 100644
--- a/frameworks/proxy/event_handler/src/client_msg_handler.cpp
+++ b/frameworks/proxy/event_handler/src/client_msg_handler.cpp
@@ -182,12 +182,22 @@ int32_t ClientMsgHandler::OnSubscribeKeyEventCallback(const UDSClient &client, N
         MMI_HILOGE("Packet read fd failed");
         return PACKET_READ_FAIL;
     }
-    MMI_HILOGD("Subscribe:%{public}d,Fd:%{public}d,KeyEvent:%{public}d,"
-               "KeyCode:%{public}d,ActionTime:%{public}" PRId64 ",ActionStartTime:%{public}" PRId64 ","
-               "Action:%{public}d,KeyAction:%{public}d,EventType:%{public}d,Flag:%{public}u",
+    if (keyEvent->GetKeyCode() == KeyEvent::KEYCODE_POWER) {
+        MMI_HILOGI("Subscribe:%{public}d,Fd:%{public}d,KeyEvent:%{public}d,"
+            "KeyCode:%{public}d,ActionTime:%{public}" PRId64 ",ActionStartTime:%{public}" PRId64 ","
+            "Action:%{public}d,KeyAction:%{public}d,EventType:%{public}d,Flag:%{public}u",
         subscribeId, fd, keyEvent->GetId(), keyEvent->GetKeyCode(), keyEvent->GetActionTime(),
         keyEvent->GetActionStartTime(), keyEvent->GetAction(), keyEvent->GetKeyAction(),
         keyEvent->GetEventType(), keyEvent->GetFlag());
+    } else {
+        MMI_HILOGD("Subscribe:%{public}d,Fd:%{public}d,KeyEvent:%{public}d,"
+            "KeyCode:%{public}d,ActionTime:%{public}" PRId64 ",ActionStartTime:%{public}" PRId64 ","
+            "Action:%{public}d,KeyAction:%{public}d,EventType:%{public}d,Flag:%{public}u",
+        subscribeId, fd, keyEvent->GetId(), keyEvent->GetKeyCode(), keyEvent->GetActionTime(),
+        keyEvent->GetActionStartTime(), keyEvent->GetAction(), keyEvent->GetKeyAction(),
+        keyEvent->GetEventType(), keyEvent->GetFlag());
+    }
+
     BytraceAdapter::StartBytrace(keyEvent, BytraceAdapter::TRACE_START, BytraceAdapter::KEY_SUBSCRIBE_EVENT);
     return KeyEventInputSubscribeMgr.OnSubscribeKeyEventCallback(keyEvent, subscribeId);
 }
diff --git a/frameworks/proxy/events/include/event_log_helper.h b/frameworks/proxy/events/include/event_log_helper.h
index ab27d0318f..631c526f1d 100644
--- a/frameworks/proxy/events/include/event_log_helper.h
+++ b/frameworks/proxy/events/include/event_log_helper.h
@@ -37,6 +37,9 @@ public:
 private:
     static void Print(const std::shared_ptr<KeyEvent> event)
     {
+        if (!HiLogIsLoggable(OHOS::MMI::MMI_LOG_DOMAIN, LABEL.tag, LOG_DEBUG) && event->GetKeyCode() != KeyEvent::KEYCODE_POWER) {
+            return;
+        }
         std::vector<KeyEvent::KeyItem> eventItems { event->GetKeyItems() };
         MMI_HILOGD("KeyCode:%{public}d,KeyIntention:%{public}d,ActionTime:%{public}" PRId64 ",ActionStartTime:%{public}" PRId64
             ",EventType:%{public}s,Flag:%{public}d,KeyAction:%{public}s,NumLock:%{public}d,"
@@ -48,7 +51,7 @@ private:
             event->GetFunctionKey(KeyEvent::SCROLL_LOCK_FUNCTION_KEY),
             event->GetId(), eventItems.size());
         for (const auto &item : eventItems) {
-            MMI_HILOGD("DeviceNumber:%{public}d,KeyCode:%{public}d,DownTime:%{public}" PRId64 ",IsPressed:%{public}d,"
+            MMI_HILOGI("DeviceNumber:%{public}d,KeyCode:%{public}d,DownTime:%{public}" PRId64 ",IsPressed:%{public}d,"
                 "GetUnicode:%{public}d", item.GetDeviceId(), item.GetKeyCode(), item.GetDownTime(), item.IsPressed(),
                 item.GetUnicode());
         }
@@ -59,7 +62,7 @@ private:
             for (; cItr != pressedKeys.cend(); ++cItr) {
                 tmpStr += ("," + std::to_string(*cItr));
             }
-            MMI_HILOGD("%{public}s]", tmpStr.c_str());
+            MMI_HILOGI("%{public}s]", tmpStr.c_str());
         }
     }
 
@@ -153,10 +156,10 @@ template <class T>
 void EventLogHelper::PrintEventData(std::shared_ptr<T> event)
 {
     CHKPV(event);
-    if (HiLogIsLoggable(OHOS::MMI::MMI_LOG_DOMAIN, LABEL.tag, LOG_DEBUG)) {
+    if (HiLogIsLoggable(OHOS::MMI::MMI_LOG_DOMAIN, LABEL.tag, LOG_DEBUG) || (event->GetAction() == InputEvent::EVENT_TYPE_KEY)) {
         EventLogHelper::Print(event);
     }
 }
 } // namespace MMI
 } // namespace OHOS
-#endif // EVENT_LOG_HELPER_H
\ No newline at end of file
+#endif // EVENT_LOG_HELPER_H
-- 
Gitee


From d6e81124a5fe98bbe663a65805bcf91067172fd3 Mon Sep 17 00:00:00 2001
From: Yuanxinying <yuanxinying@huawei.com>
Date: Tue, 21 Feb 2023 12:58:35 +0000
Subject: [PATCH 344/360] update
 frameworks/napi/input_consumer/src/js_register_module.cpp. remove extra env
 from CHKRP

Signed-off-by: Yuanxinying <yuanxinying@huawei.com>
---
 frameworks/napi/input_consumer/src/js_register_module.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frameworks/napi/input_consumer/src/js_register_module.cpp b/frameworks/napi/input_consumer/src/js_register_module.cpp
index e5c0f9fa91..c657919b86 100644
--- a/frameworks/napi/input_consumer/src/js_register_module.cpp
+++ b/frameworks/napi/input_consumer/src/js_register_module.cpp
@@ -240,7 +240,7 @@ static napi_value JsOn(napi_env env, napi_callback_info info)
     size_t argc = 3;
     napi_value argv[3] = { 0 };
     napi_value thisArg = nullptr;
-    CHKRP(env, napi_get_cb_info(env, info, &argc, argv, &thisArg, nullptr), GET_CB_INFO);
+    CHKRP(napi_get_cb_info(env, info, &argc, argv, &thisArg, nullptr), GET_CB_INFO);
     if (argc < 3) {
         THROWERR_CUSTOM(env, COMMON_PARAMETER_ERROR, "parameter number error");
         return nullptr;
@@ -250,7 +250,7 @@ static napi_value JsOn(napi_env env, napi_callback_info info)
         return nullptr;
     }
     napi_valuetype valueOfThis = napi_undefined;
-    CHKRP(env, napi_typeof(env, thisArg, &valueOfThis), TYPEOF);
+    CHKRP(napi_typeof(env, thisArg, &valueOfThis), TYPEOF);
     if (valueOfThis == napi_undefined) {
         MMI_HILOGE("%{public}s, Wrong value of this.", __func__);
         return nullptr;
-- 
Gitee


From 5c0c95fe9a213a26eed4aa6f026d55549dc2d351 Mon Sep 17 00:00:00 2001
From: yuanxinying <yuanxinying@huawei.com>
Date: Wed, 1 Mar 2023 21:43:34 +0800
Subject: [PATCH 345/360] multimodalinput_system_API_verify Signed-off-by:
 Yuanxinying <yuanxinying@huawei.com>

---
 service/BUILD.gn                              |  1 +
 .../src/multimodal_input_connect_stub.cpp     | 55 +++++++++++++++++++
 .../include/permission_helper.h               |  3 +
 .../src/permission_helper.cpp                 | 26 +++++++++
 util/common/include/error_multimodal.h        |  1 +
 5 files changed, 86 insertions(+)

diff --git a/service/BUILD.gn b/service/BUILD.gn
index f4b28fb771..7712c9a4c8 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -185,6 +185,7 @@ ohos_shared_library("libmmi-server") {
     "ipc:ipc_core",
     "multimedia_image_framework:image_native",
     "safwk:system_ability_fwk",
+    "access_token:libtokenid_sdk",
   ]
 
   if (input_feature_input_cooperation) {
diff --git a/service/connect_manager/src/multimodal_input_connect_stub.cpp b/service/connect_manager/src/multimodal_input_connect_stub.cpp
index 14769b9e8c..fb4899d710 100644
--- a/service/connect_manager/src/multimodal_input_connect_stub.cpp
+++ b/service/connect_manager/src/multimodal_input_connect_stub.cpp
@@ -414,6 +414,11 @@ int32_t MultimodalInputConnectStub::StubGetKeyboardType(MessageParcel& data, Mes
 int32_t MultimodalInputConnectStub::StubAddInputHandler(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
+    if (!PerHelper->VerifySystemApp()) {
+        MMI_HILOGE("verify system APP failed");
+        return ERROR_NOT_SYSAPI;
+    }
+
     if (!IsRunning()) {
         MMI_HILOGE("Service is not running");
         return MMISERVICE_NOT_RUNNING;
@@ -447,6 +452,11 @@ int32_t MultimodalInputConnectStub::StubAddInputHandler(MessageParcel& data, Mes
 int32_t MultimodalInputConnectStub::StubRemoveInputHandler(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
+    if (!PerHelper->VerifySystemApp()) {
+        MMI_HILOGE("verify system APP failed");
+        return ERROR_NOT_SYSAPI;
+    }
+
     if (!IsRunning()) {
         MMI_HILOGE("Service is not running");
         return MMISERVICE_NOT_RUNNING;
@@ -502,6 +512,11 @@ int32_t MultimodalInputConnectStub::StubMarkEventConsumed(MessageParcel& data, M
 int32_t MultimodalInputConnectStub::StubSubscribeKeyEvent(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
+    if (!PerHelper->VerifySystemApp()) {
+        MMI_HILOGE("verify system APP failed");
+        return ERROR_NOT_SYSAPI;
+    }
+
     if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
         MMI_HILOGE("Permission check failed");
         return CHECK_PERMISSION_FAIL;
@@ -531,6 +546,11 @@ int32_t MultimodalInputConnectStub::StubSubscribeKeyEvent(MessageParcel& data, M
 int32_t MultimodalInputConnectStub::StubUnsubscribeKeyEvent(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
+    if (!PerHelper->VerifySystemApp()) {
+        MMI_HILOGE("verify system APP failed");
+        return ERROR_NOT_SYSAPI;
+    }
+
     if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
         MMI_HILOGE("Permission check failed");
         return CHECK_PERMISSION_FAIL;
@@ -580,6 +600,11 @@ int32_t MultimodalInputConnectStub::StubMoveMouseEvent(MessageParcel& data, Mess
 int32_t MultimodalInputConnectStub::StubInjectKeyEvent(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
+    if (!PerHelper->VerifySystemApp()) {
+        MMI_HILOGE("verify system APP failed");
+        return ERROR_NOT_SYSAPI;
+    }
+
     if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
         MMI_HILOGE("Permission check failed");
         return CHECK_PERMISSION_FAIL;
@@ -703,6 +728,11 @@ int32_t MultimodalInputConnectStub::StubSetDisplayBind(MessageParcel& data, Mess
 int32_t MultimodalInputConnectStub::StubRegisterCooperateMonitor(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
+    if (!PerHelper->VerifySystemApp()) {
+        MMI_HILOGE("verify system APP failed");
+        return ERROR_NOT_SYSAPI;
+    }
+
     if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
         MMI_HILOGE("Permission check failed");
         return CHECK_PERMISSION_FAIL;
@@ -721,6 +751,11 @@ int32_t MultimodalInputConnectStub::StubRegisterCooperateMonitor(MessageParcel&
 int32_t MultimodalInputConnectStub::StubUnregisterCooperateMonitor(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
+    if (!PerHelper->VerifySystemApp()) {
+        MMI_HILOGE("verify system APP failed");
+        return ERROR_NOT_SYSAPI;
+    }
+
     if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
         MMI_HILOGE("Permission check failed");
         return CHECK_PERMISSION_FAIL;
@@ -739,6 +774,11 @@ int32_t MultimodalInputConnectStub::StubUnregisterCooperateMonitor(MessageParcel
 int32_t MultimodalInputConnectStub::StubEnableInputDeviceCooperate(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
+    if (!PerHelper->VerifySystemApp()) {
+        MMI_HILOGE("verify system APP failed");
+        return ERROR_NOT_SYSAPI;
+    }
+
     if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
         MMI_HILOGE("Permission check failed");
         return CHECK_PERMISSION_FAIL;
@@ -761,6 +801,11 @@ int32_t MultimodalInputConnectStub::StubEnableInputDeviceCooperate(MessageParcel
 int32_t MultimodalInputConnectStub::StubStartInputDeviceCooperate(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
+    if (!PerHelper->VerifySystemApp()) {
+        MMI_HILOGE("verify system APP failed");
+        return ERROR_NOT_SYSAPI;
+    }
+
     if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
         MMI_HILOGE("Permission check failed");
         return CHECK_PERMISSION_FAIL;
@@ -785,6 +830,11 @@ int32_t MultimodalInputConnectStub::StubStartInputDeviceCooperate(MessageParcel&
 int32_t MultimodalInputConnectStub::StubStopDeviceCooperate(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
+    if (!PerHelper->VerifySystemApp()) {
+        MMI_HILOGE("verify system APP failed");
+        return ERROR_NOT_SYSAPI;
+    }
+
     if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
         MMI_HILOGE("Permission check failed");
         return CHECK_PERMISSION_FAIL;
@@ -805,6 +855,11 @@ int32_t MultimodalInputConnectStub::StubStopDeviceCooperate(MessageParcel& data,
 int32_t MultimodalInputConnectStub::StubGetInputDeviceCooperateState(MessageParcel& data, MessageParcel& reply)
 {
     CALL_DEBUG_ENTER;
+    if (!PerHelper->VerifySystemApp()) {
+        MMI_HILOGE("verify system APP failed");
+        return ERROR_NOT_SYSAPI;
+    }
+
     if (!PerHelper->CheckPermission(PermissionHelper::APL_SYSTEM_BASIC_CORE)) {
         MMI_HILOGE("Permission check failed");
         return CHECK_PERMISSION_FAIL;
diff --git a/service/permission_helper/include/permission_helper.h b/service/permission_helper/include/permission_helper.h
index a6f6a722ac..1f4771e4fd 100644
--- a/service/permission_helper/include/permission_helper.h
+++ b/service/permission_helper/include/permission_helper.h
@@ -28,6 +28,7 @@ public:
     static const uint32_t APL_SYSTEM_BASIC = 1 << OHOS::Security::AccessToken::APL_SYSTEM_BASIC;
     static const uint32_t APL_SYSTEM_CORE = 1 << OHOS::Security::AccessToken::APL_SYSTEM_CORE;
     static const uint32_t APL_SYSTEM_BASIC_CORE = APL_SYSTEM_BASIC + APL_SYSTEM_CORE;
+    static const uint32_t ROOT_UID = 0;
 
 public:
     DISALLOW_COPY_AND_MOVE(PermissionHelper);
@@ -35,6 +36,8 @@ public:
     bool CheckMonitor();
     int32_t GetTokenType();
 
+    bool VerifySystemApp();
+
 private:
     bool CheckHapPermission(uint32_t tokenId, uint32_t required);
     bool CheckMonitorPermission(uint32_t tokenId);
diff --git a/service/permission_helper/src/permission_helper.cpp b/service/permission_helper/src/permission_helper.cpp
index d0c5a4a3dd..9b848c9e6b 100644
--- a/service/permission_helper/src/permission_helper.cpp
+++ b/service/permission_helper/src/permission_helper.cpp
@@ -19,6 +19,10 @@
 
 #include "mmi_log.h"
 
+#include "tokenid_kit.h"
+
+using namespace OHOS::Security::AccessToken;
+
 namespace OHOS {
 namespace MMI {
 namespace {
@@ -28,6 +32,28 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "Permi
 PermissionHelper::PermissionHelper() {}
 PermissionHelper::~PermissionHelper() {}
 
+bool PermissionHelper::VerifySystemApp()
+{
+    MMI_HILOGI("verify system App");
+    Security::AccessToken::AccessTokenID callerToken = IPCSkeleton::GetCallingTokenID();
+    Security::AccessToken::ATokenTypeEnum tokenType =
+        Security::AccessToken::AccessTokenKit::GetTokenTypeFlag(callerToken);
+    MMI_HILOGD("token type is %{public}d", static_cast<int32_t>(tokenType));
+    int32_t callingUid = IPCSkeleton::GetCallingUid();
+    if (tokenType == Security::AccessToken::ATokenTypeEnum::TOKEN_NATIVE
+        || tokenType == Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL
+        || callingUid == ROOT_UID) {
+        MMI_HILOGD("called tokenType is native, verify success");
+        return true;
+    }
+    uint64_t accessTokenIdEx = IPCSkeleton::GetCallingFullTokenID();
+    if (!Security::AccessToken::TokenIdKit::IsSystemAppByFullTokenID(accessTokenIdEx)) {
+        MMI_HILOGE("system api is called by non-system app");
+        return false;
+    }
+    return true;
+}
+
 bool PermissionHelper::CheckPermission(uint32_t required)
 {
     CALL_DEBUG_ENTER;
diff --git a/util/common/include/error_multimodal.h b/util/common/include/error_multimodal.h
index 4b80adc521..7ad76b90e5 100644
--- a/util/common/include/error_multimodal.h
+++ b/util/common/include/error_multimodal.h
@@ -23,6 +23,7 @@ namespace MMI {
 inline constexpr int32_t ERROR_UNSUPPORT = -2;
 inline constexpr int32_t ARGV_VALID = 2;
 inline constexpr int32_t ERROR_NO_PERMISSION = -201;
+inline constexpr int32_t ERROR_NOT_SYSAPI = 202;
 
 enum {
     MODULE_CLIENT = 0x00,
-- 
Gitee


From b57eac304316c6253dad05db9c8018622ea24014 Mon Sep 17 00:00:00 2001
From: Yuanxinying <yuanxinying@huawei.com>
Date: Thu, 2 Mar 2023 02:18:31 +0000
Subject: [PATCH 346/360] update
 service/permission_helper/src/permission_helper.cpp.
 multimodalinput_system_API_verify

Signed-off-by: Yuanxinying <yuanxinying@huawei.com>
---
 service/permission_helper/src/permission_helper.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/service/permission_helper/src/permission_helper.cpp b/service/permission_helper/src/permission_helper.cpp
index 9b848c9e6b..d49c89febf 100644
--- a/service/permission_helper/src/permission_helper.cpp
+++ b/service/permission_helper/src/permission_helper.cpp
@@ -21,8 +21,6 @@
 
 #include "tokenid_kit.h"
 
-using namespace OHOS::Security::AccessToken;
-
 namespace OHOS {
 namespace MMI {
 namespace {
@@ -35,19 +33,18 @@ PermissionHelper::~PermissionHelper() {}
 bool PermissionHelper::VerifySystemApp()
 {
     MMI_HILOGI("verify system App");
-    Security::AccessToken::AccessTokenID callerToken = IPCSkeleton::GetCallingTokenID();
-    Security::AccessToken::ATokenTypeEnum tokenType =
-        Security::AccessToken::AccessTokenKit::GetTokenTypeFlag(callerToken);
+    auto callerToken = IPCSkeleton::GetCallingTokenID();
+    auto tokenType = OHOS::Security::AccessToken::AccessTokenKit::GetTokenTypeFlag(callerToken);
     MMI_HILOGD("token type is %{public}d", static_cast<int32_t>(tokenType));
     int32_t callingUid = IPCSkeleton::GetCallingUid();
-    if (tokenType == Security::AccessToken::ATokenTypeEnum::TOKEN_NATIVE
-        || tokenType == Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL
+    if (tokenType == OHOS::Security::AccessToken::ATokenTypeEnum::TOKEN_NATIVE
+        || tokenType == OHOS::Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL
         || callingUid == ROOT_UID) {
         MMI_HILOGD("called tokenType is native, verify success");
         return true;
     }
     uint64_t accessTokenIdEx = IPCSkeleton::GetCallingFullTokenID();
-    if (!Security::AccessToken::TokenIdKit::IsSystemAppByFullTokenID(accessTokenIdEx)) {
+    if (!OHOS::Security::AccessToken::TokenIdKit::IsSystemAppByFullTokenID(accessTokenIdEx)) {
         MMI_HILOGE("system api is called by non-system app");
         return false;
     }
-- 
Gitee


From ccc168b4843f352321d3047402b5baca17594e5d Mon Sep 17 00:00:00 2001
From: Yuanxinying <yuanxinying@huawei.com>
Date: Thu, 2 Mar 2023 02:56:41 +0000
Subject: [PATCH 347/360] update service/BUILD.gn.
 multimodalinput_system_API_verify

Signed-off-by: Yuanxinying <yuanxinying@huawei.com>
---
 service/BUILD.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/BUILD.gn b/service/BUILD.gn
index 7712c9a4c8..b7f82d1a66 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -176,6 +176,7 @@ ohos_shared_library("libmmi-server") {
     "ability_base:want",
     "ability_runtime:ability_manager",
     "access_token:libaccesstoken_sdk",
+    "access_token:libtokenid_sdk",
     "config_policy:configpolicy_util",
     "hicollie_native:libhicollie",
     "hisysevent_native:libhisysevent",
@@ -185,7 +186,6 @@ ohos_shared_library("libmmi-server") {
     "ipc:ipc_core",
     "multimedia_image_framework:image_native",
     "safwk:system_ability_fwk",
-    "access_token:libtokenid_sdk",
   ]
 
   if (input_feature_input_cooperation) {
-- 
Gitee


From 20f07ad78f81f147c73b655b13e77c7855a9f832 Mon Sep 17 00:00:00 2001
From: Yuanxinying <yuanxinying@huawei.com>
Date: Thu, 2 Mar 2023 03:26:38 +0000
Subject: [PATCH 348/360] update
 service/permission_helper/src/permission_helper.cpp.
 multimodalinput_system_API_verify

Signed-off-by: Yuanxinying <yuanxinying@huawei.com>
---
 service/permission_helper/src/permission_helper.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/permission_helper/src/permission_helper.cpp b/service/permission_helper/src/permission_helper.cpp
index d49c89febf..be8d54ce9f 100644
--- a/service/permission_helper/src/permission_helper.cpp
+++ b/service/permission_helper/src/permission_helper.cpp
@@ -32,7 +32,7 @@ PermissionHelper::~PermissionHelper() {}
 
 bool PermissionHelper::VerifySystemApp()
 {
-    MMI_HILOGI("verify system App");
+    MMI_HILOGD("verify system App");
     auto callerToken = IPCSkeleton::GetCallingTokenID();
     auto tokenType = OHOS::Security::AccessToken::AccessTokenKit::GetTokenTypeFlag(callerToken);
     MMI_HILOGD("token type is %{public}d", static_cast<int32_t>(tokenType));
-- 
Gitee


From 5a31262e53deec382a660a1791be2d3423bf6844 Mon Sep 17 00:00:00 2001
From: yuanxinying <yuanxinying@huawei.com>
Date: Thu, 2 Mar 2023 11:52:46 +0800
Subject: [PATCH 349/360] fixed d8867ce from
 https://gitee.com/yuanxinying/multimodalinput_input/pulls/2324
 multimodalinput:DTS2023022308059 Signed-off-by: Yuanxinying
 <yuanxinying@huawei.com>

---
 frameworks/napi/input_monitor/src/js_input_monitor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frameworks/napi/input_monitor/src/js_input_monitor.cpp b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
index f405a17344..87e1326604 100644
--- a/frameworks/napi/input_monitor/src/js_input_monitor.cpp
+++ b/frameworks/napi/input_monitor/src/js_input_monitor.cpp
@@ -808,6 +808,7 @@ void JsInputMonitor::OnPointerEventInJsThread(const std::string &typeName)
             bool retValue = false;
             status = napi_get_value_bool(jsEnv_, result, &retValue);
             if (status != napi_ok) {
+                napi_close_handle_scope(jsEnv_, scope);
                 return;
             }
             if (retValue) {
-- 
Gitee


From c578d35187d3da0d6dea19745291ee917015658d Mon Sep 17 00:00:00 2001
From: yuanxinying <yuanxinying@huawei.com>
Date: Sat, 4 Mar 2023 16:43:38 +0800
Subject: [PATCH 350/360] format inner api by rules Signed-off-by: yuanxinying
 <yuanxinying@huawei.com>

---
 examples/mmi/BUILD.gn                         |  2 +-
 frameworks/proxy/BUILD.gn                     | 17 ++++----
 interfaces/native/innerkits/libmmi-client-map | 40 +++++++++++++++++++
 service/BUILD.gn                              |  3 +-
 service/connect_manager/BUILD.gn              |  4 +-
 service/filter/BUILD.gn                       |  4 +-
 service/module_loader/src/mmi_service.cpp     |  2 +
 test/fuzztest/pointerstyle_fuzzer/BUILD.gn    |  2 +-
 tools/event_inject/BUILD.gn                   |  4 +-
 uinput/hdf_device_event_manager.cpp           |  2 +
 10 files changed, 63 insertions(+), 17 deletions(-)
 create mode 100644 interfaces/native/innerkits/libmmi-client-map

diff --git a/examples/mmi/BUILD.gn b/examples/mmi/BUILD.gn
index c82c1c9c8e..99a9153ae5 100644
--- a/examples/mmi/BUILD.gn
+++ b/examples/mmi/BUILD.gn
@@ -24,7 +24,7 @@ ohos_executable("mmi-server") {
 
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
diff --git a/frameworks/proxy/BUILD.gn b/frameworks/proxy/BUILD.gn
index c505866d83..df4d53592e 100644
--- a/frameworks/proxy/BUILD.gn
+++ b/frameworks/proxy/BUILD.gn
@@ -61,6 +61,7 @@ config("libmmi_test_util") {
 ohos_source_set("libmmi-common") {
   sources = libmmi_common_sources
   public_configs = [ ":libmmi_client_config" ]
+  visibility = [ "${mmi_path}/*" ]
 
   external_deps = [
     "c_utils:utils",
@@ -73,6 +74,8 @@ ohos_source_set("libmmi-common") {
 
 ohos_shared_library("libmmi-client") {
   sources = libmmi_client_sources
+  version_script = "${mmi_path}/interfaces/native/innerkits/libmmi-client-map"
+  innerapi_tags = [ "platformsdk" ]
   if (input_feature_input_cooperation) {
     sources += [ "event_handler/src/input_device_cooperate_impl.cpp" ]
   }
@@ -112,7 +115,7 @@ ohos_shared_library("libmmi-client") {
     "eventhandler:libeventhandler",
     "hitrace_native:hitrace_meter",
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
   ]
 }
 
@@ -136,7 +139,7 @@ ohos_unittest("ut-mmi-proxy-out") {
   external_deps = [
     "eventhandler:libeventhandler",
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
   ]
 }
 
@@ -167,7 +170,7 @@ ohos_unittest("KeyEventTest") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
     "window_manager:libwm",
   ]
 }
@@ -203,7 +206,7 @@ ohos_unittest("InputManagerTest") {
     "access_token:libtoken_setproc",
     "eventhandler:libeventhandler",
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
     "window_manager:libwm",
   ]
 }
@@ -227,7 +230,7 @@ ohos_unittest("InputManagerManualTest") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
   ]
 }
 
@@ -250,7 +253,7 @@ ohos_unittest("InputManagerFilterManualTest") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
   ]
 }
 
@@ -278,7 +281,7 @@ ohos_unittest("PointerEventTest") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
     "window_manager:libwm",
   ]
 }
diff --git a/interfaces/native/innerkits/libmmi-client-map b/interfaces/native/innerkits/libmmi-client-map
new file mode 100644
index 0000000000..479e5bc61b
--- /dev/null
+++ b/interfaces/native/innerkits/libmmi-client-map
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2023 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 1.0 {
+    global:
+        extern "C++" {
+            OHOS::MMI::AxisEvent*;
+            OHOS::MMI::BytraceAdapter*;
+            OHOS::MMI::CooperationMessage*;
+            OHOS::MMI::InputDevice*;
+            OHOS::MMI::InputDeviceCooperateImpl*;
+            OHOS::MMI::InputEvent*;
+            OHOS::MMI::InputInterceptorManager*;
+            OHOS::MMI::InputManager*;
+            OHOS::MMI::InputManagerImpl*;
+            OHOS::MMI::InputMonitorManager*;
+            OHOS::MMI::KeyEvent*;
+            OHOS::MMI::KeyEventInputSubscribeManager*;
+            OHOS::MMI::KeyOption*;
+            OHOS::MMI::PointerEvent*;
+            OHOS::MMI::PointerStyle*;
+            OHOS::MMI::PointerStyleColor*;
+            OHOS::MMI::MultimodalEventHandler*;
+            OHOS::MMI::MMIClient*;
+            "vtable for OHOS::MMI::MMIClient";
+        };
+    local:
+        *;
+};
\ No newline at end of file
diff --git a/service/BUILD.gn b/service/BUILD.gn
index b7f82d1a66..5e3ccd178d 100644
--- a/service/BUILD.gn
+++ b/service/BUILD.gn
@@ -84,7 +84,6 @@ config("libmmi_server_config") {
 
 ohos_shared_library("libmmi-server") {
   sources = libmmi_service_sources
-
   if (input_feature_input_cooperation) {
     sources += [
       "input_device_cooperate/src/cooperate_event_handler.cpp",
@@ -183,7 +182,7 @@ ohos_shared_library("libmmi-server") {
     "hitrace_native:hitrace_meter",
     "hiviewdfx_hilog_native:libhilog",
     "init:libbegetutil",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
     "multimedia_image_framework:image_native",
     "safwk:system_ability_fwk",
   ]
diff --git a/service/connect_manager/BUILD.gn b/service/connect_manager/BUILD.gn
index 71c4fad7bd..e332bba91f 100644
--- a/service/connect_manager/BUILD.gn
+++ b/service/connect_manager/BUILD.gn
@@ -45,7 +45,7 @@ ohos_source_set("mmi_connect_manager_service") {
   external_deps = [
     "access_token:libaccesstoken_sdk",
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
@@ -65,7 +65,7 @@ ohos_source_set("mmi_connect_manager_proxy") {
 
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
   ]
diff --git a/service/filter/BUILD.gn b/service/filter/BUILD.gn
index 74154603d3..6cce741dea 100644
--- a/service/filter/BUILD.gn
+++ b/service/filter/BUILD.gn
@@ -41,7 +41,7 @@ ohos_source_set("mmi_event_filter_service") {
 
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
     "safwk:system_ability_fwk",
   ]
 }
@@ -61,7 +61,7 @@ ohos_source_set("mmi_event_filter_proxy") {
 
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
     "safwk:system_ability_fwk",
   ]
 }
diff --git a/service/module_loader/src/mmi_service.cpp b/service/module_loader/src/mmi_service.cpp
index 4e155fedea..ecc00c6a5c 100644
--- a/service/module_loader/src/mmi_service.cpp
+++ b/service/module_loader/src/mmi_service.cpp
@@ -289,6 +289,7 @@ int32_t MMIService::Init()
 void MMIService::OnStart()
 {
     int sleepSeconds = 3;
+    std::string name = "mmi-service";
     sleep(sleepSeconds);
     CHK_PID_AND_TID();
     int32_t ret = Init();
@@ -300,6 +301,7 @@ void MMIService::OnStart()
     MMI_HILOGD("Started successfully");
     AddReloadDeviceTimer();
     t_ = std::thread(std::bind(&MMIService::OnThread, this));
+    pthread_setname_np(t_.native_handle(), name.c_str());
 #ifdef OHOS_RSS_CLIENT
     MMI_HILOGI("Add system ability listener start");
     AddSystemAbilityListener(RES_SCHED_SYS_ABILITY_ID);
diff --git a/test/fuzztest/pointerstyle_fuzzer/BUILD.gn b/test/fuzztest/pointerstyle_fuzzer/BUILD.gn
index 0a48767102..73c259758c 100644
--- a/test/fuzztest/pointerstyle_fuzzer/BUILD.gn
+++ b/test/fuzztest/pointerstyle_fuzzer/BUILD.gn
@@ -35,7 +35,7 @@ ohos_fuzztest("PointerStyleFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
   ]
 }
 
diff --git a/tools/event_inject/BUILD.gn b/tools/event_inject/BUILD.gn
index 62f53d354d..7d44cd28d1 100644
--- a/tools/event_inject/BUILD.gn
+++ b/tools/event_inject/BUILD.gn
@@ -53,7 +53,7 @@ ohos_source_set("event-injection") {
     "//third_party/cJSON:cjson",
   ]
 
-  external_deps = [ "ipc:ipc_core" ]
+  external_deps = [ "ipc:ipc_single" ]
 
   part_name = "input"
   subsystem_name = "multimodalinput"
@@ -126,7 +126,7 @@ ohos_unittest("ut-event-injection-out") {
   external_deps = [
     "c_utils:utils",
     "hiviewdfx_hilog_native:libhilog",
-    "ipc:ipc_core",
+    "ipc:ipc_single",
   ]
 }
 
diff --git a/uinput/hdf_device_event_manager.cpp b/uinput/hdf_device_event_manager.cpp
index 529e2ce0c3..6f5e5f5c1b 100644
--- a/uinput/hdf_device_event_manager.cpp
+++ b/uinput/hdf_device_event_manager.cpp
@@ -33,12 +33,14 @@ HdfDeviceEventManager::~HdfDeviceEventManager() {}
 
 void HdfDeviceEventManager::ConnectHDFInit()
 {
+    std::string name = "mmi-hdf";
     inputInterface_ = IInputInterfaces::Get(true);
     if (inputInterface_ == nullptr) {
         MMI_HILOGE("The inputInterface_ is nullptr");
         return;
     }
     thread_ = std::thread(&InjectThread::InjectFunc, injectThread_);
+    pthread_setname_np(thread_.native_handle(), name.c_str());
     int32_t ret = inputInterface_->OpenInputDevice(TOUCH_DEV_ID);
     if (ret == HDF_SUCCESS) {
         ret = inputInterface_->GetInputDevice(TOUCH_DEV_ID, iDevInfo_);
-- 
Gitee


From 0fe8e15c807d2f6f091b09f5e866d0d8fad1775b Mon Sep 17 00:00:00 2001
From: yuanxinying <yuanxinying@huawei.com>
Date: Mon, 6 Mar 2023 20:57:13 +0800
Subject: [PATCH 351/360] change name for mmi-hdf Signed-off-by: yuanxinying
 <yuanxinying@huawei.com>

---
 uinput/inject_thread.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/uinput/inject_thread.cpp b/uinput/inject_thread.cpp
index 20ba6f4176..7e89b9e27e 100644
--- a/uinput/inject_thread.cpp
+++ b/uinput/inject_thread.cpp
@@ -15,6 +15,7 @@
 
 #include "inject_thread.h"
 
+#include <sys/prctl.h>
 namespace OHOS {
 namespace MMI {
 std::mutex InjectThread::mutex_;
@@ -23,6 +24,7 @@ std::vector<InjectInputEvent> InjectThread::injectQueue_;
 
 void InjectThread::InjectFunc() const
 {
+    prctl(PR_SET_NAME, "mmi-inject");
     std::unique_lock<std::mutex> uniqueLock(mutex_);
     while (true) {
         conditionVariable_.wait(uniqueLock);
-- 
Gitee


From 875de8525660d3d6414ed4b3f38ad6566b72b598 Mon Sep 17 00:00:00 2001
From: xueyuanzhao <zhaoxueyuan@huawei.com>
Date: Mon, 6 Mar 2023 07:24:15 +0000
Subject: [PATCH 352/360] bug fix

Signed-off-by: xueyuanzhao <zhaoxueyuan@huawei.com>
Change-Id: If09fa04c62d1ccb2c41a8d6dfd7390a510326978
---
 service/interceptor/src/event_interceptor_handler.cpp | 4 ++--
 service/message_handle/src/server_msg_handler.cpp     | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/service/interceptor/src/event_interceptor_handler.cpp b/service/interceptor/src/event_interceptor_handler.cpp
index e968878995..6108c0ca2c 100644
--- a/service/interceptor/src/event_interceptor_handler.cpp
+++ b/service/interceptor/src/event_interceptor_handler.cpp
@@ -279,7 +279,7 @@ int32_t EventInterceptorHandler::InterceptorCollection::AddInterceptor(const Ses
     auto sIter = interceptors_.emplace(iterIndex, interceptor);
     if (sIter == interceptors_.end()) {
         MMI_HILOGE("Failed to add interceptor");
-        RET_ERR;
+        return RET_ERR;
     }
     return RET_OK;
 }
@@ -306,7 +306,7 @@ void EventInterceptorHandler::InterceptorCollection::RemoveInterceptor(const Ses
     auto sIter = interceptors_.emplace(iterIndex, interceptor);
     if (sIter == interceptors_.end()) {
         MMI_HILOGE("Internal error, interceptor has been removed");
-        RET_ERR;
+        return;
     }
     MMI_HILOGD("Event type is updated:%{public}u", interceptor.eventType_);
 }
diff --git a/service/message_handle/src/server_msg_handler.cpp b/service/message_handle/src/server_msg_handler.cpp
index df24d33c8d..87b28704b5 100644
--- a/service/message_handle/src/server_msg_handler.cpp
+++ b/service/message_handle/src/server_msg_handler.cpp
@@ -144,7 +144,9 @@ int32_t ServerMsgHandler::OnInjectPointerEvent(const std::shared_ptr<PointerEven
 #ifdef OHOS_BUILD_ENABLE_POINTER
             auto inputEventNormalizeHandler = InputHandler->GetEventNormalizeHandler();
             CHKPR(inputEventNormalizeHandler, ERROR_NULL_POINTER);
-            if (!IPointerDrawingManager::GetInstance()->IsPointerVisible()) {
+            if ((action < PointerEvent::POINTER_ACTION_PULL_DOWN ||
+                action > PointerEvent::POINTER_ACTION_PULL_OUT_WINDOW) &&
+                !IPointerDrawingManager::GetInstance()->IsPointerVisible()) {
                 IPointerDrawingManager::GetInstance()->SetPointerVisible(getpid(), true);
             }
             inputEventNormalizeHandler->HandlePointerEvent(pointerEvent);
-- 
Gitee


From 6149d6779aed5055438bbb37c3c90b91c4eacc57 Mon Sep 17 00:00:00 2001
From: yuanxinying <yuanxinying@huawei.com>
Date: Tue, 7 Mar 2023 19:46:48 +0800
Subject: [PATCH 353/360] downgrading the debug info to info which is same as
 double-framework Signed-off-by: yuanxinying <yuanxinying@huawei.com>

---
 .../src/input_windows_manager.cpp             | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 1ac1c81a2c..29647fcc39 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -875,26 +875,29 @@ std::optional<WindowInfo> InputWindowsManager::SelectWindowInfo(int32_t logicalX
         int32_t targetWindowId = pointerEvent->GetTargetWindowId();
         for (const auto &item : displayGroupInfo_.windowsInfo) {
             if ((item.flags & WindowInfo::FLAG_BIT_UNTOUCHABLE) == WindowInfo::FLAG_BIT_UNTOUCHABLE) {
-                MMI_HILOGD("Skip the untouchable window to continue searching, "
-                           "window:%{public}d, flags:%{public}d", item.id, item.flags);
+                MMI_HILOGI("Skip the untouchable window to continue searching, "
+                           "window:%{public}d, flags:%{public}d, pid:%{public}d", item.id, item.flags, item.pid);
                 continue;
             } else if (extraData_.appended && extraData_.sourceType == PointerEvent::SOURCE_TYPE_MOUSE) {
                 if (IsInHotArea(logicalX, logicalY, item.pointerHotAreas)) {
                     firstBtnDownWindowId_ = item.id;
-                    MMI_HILOGI("Mouse event select pull window, window:%{public}d", firstBtnDownWindowId_);
+                    MMI_HILOGI("Mouse event select pull window, window:%{public}d, pid:%{public}d",
+                        firstBtnDownWindowId_, item.pid);
                     break;
                 } else {
                     continue;
                 }
             } else if ((targetWindowId < 0) && (IsInHotArea(logicalX, logicalY, item.pointerHotAreas))) {
                 firstBtnDownWindowId_ = item.id;
-                MMI_HILOGW("Find out the dispatch window of this pointer event when the targetWindowId "
-                           "hasn't been set up yet, window:%{public}d", firstBtnDownWindowId_);
+                MMI_HILOGI("Find out the dispatch window of this pointer event when the targetWindowId "
+                           "hasn't been set up yet, window:%{public}d, pid:%{public}d",
+                           firstBtnDownWindowId_, item.pid);
                 break;
             } else if ((targetWindowId >= 0) && (targetWindowId == item.id)) {
                 firstBtnDownWindowId_ = targetWindowId;
-                MMI_HILOGW("Find out the dispatch window of this pointer event when the targetWindowId "
-                           "has been set up already, window:%{public}d", firstBtnDownWindowId_);
+                MMI_HILOGI("Find out the dispatch window of this pointer event when the targetWindowId "
+                           "has been set up already, window:%{public}d, pid:%{public}d",
+                           firstBtnDownWindowId_, item.pid);
                 break;
             } else {
                 MMI_HILOGW("Continue searching for the dispatch window of this pointer event");
@@ -984,7 +987,7 @@ int32_t InputWindowsManager::UpdateMouseTarget(std::shared_ptr<PointerEvent> poi
         }
         touchWindow = std::make_optional(mouseDownInfo_);
         pointerEvent->SetPointerAction(PointerEvent::POINTER_ACTION_CANCEL);
-        MMI_HILOGD("mouse event send cancel, window:%{public}d", touchWindow->id);
+        MMI_HILOGI("mouse event send cancel, window:%{public}d, pid:%{public}d", touchWindow->id, touchWindow->pid);
     }
     PointerStyle pointerStyle;
     int32_t ret = GetPointerStyle(touchWindow->pid, touchWindow->id, pointerStyle);
-- 
Gitee


From 588842fc76da5857d3a74e6b2aea990e4eff77af Mon Sep 17 00:00:00 2001
From: joe49 <liqiao49@huawei.com>
Date: Thu, 9 Mar 2023 14:53:00 +0800
Subject: [PATCH 354/360] fix ble mouse or keyboard can not through

Signed-off-by: joe49 <liqiao49@huawei.com>
---
 service/device_manager/src/input_device_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index ee924c8974..6404528a4a 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -848,7 +848,7 @@ std::string InputDeviceManager::GenerateDescriptor(struct libinput_device *input
     if (uniqueId != nullptr && uniqueId[0] != '\0') {
         rawDescriptor += "uniqueId:" + std::string(uniqueId);
     }
-    if (physicalPath != nullptr) {
+    if (physicalPath != nullptr && physicalPath[0] != '\0') {
         rawDescriptor += "physicalPath:" + std::string(physicalPath);
     }
     if (name != nullptr && name[0] != '\0') {
-- 
Gitee


From 83adb4d42f7ce2ce9c2b862c0d03bccc52ce0824 Mon Sep 17 00:00:00 2001
From: yuanxinying <yuanxinying@huawei.com>
Date: Fri, 10 Mar 2023 15:10:33 +0800
Subject: [PATCH 355/360] multimodalinput_powerKey_dot Signed-off-by:
 yuanxinying <yuanxinying@huawei.com>

---
 service/dfx/include/dfx_hisysevent.h          |  1 +
 service/dfx/src/dfx_hisysevent.cpp            | 23 +++++++++++++++++++
 service/hisysevent.yaml                       |  6 +++++
 .../subscriber/src/key_subscriber_handler.cpp |  4 ++++
 4 files changed, 34 insertions(+)

diff --git a/service/dfx/include/dfx_hisysevent.h b/service/dfx/include/dfx_hisysevent.h
index 019c1bea27..cf85026b2c 100644
--- a/service/dfx/include/dfx_hisysevent.h
+++ b/service/dfx/include/dfx_hisysevent.h
@@ -71,6 +71,7 @@ public:
     static void CalcComboStartTimes(int32_t keyDownDuration);
     static void ReportDispTimes();
     static void ReportComboStartTimes();
+    static void ReportPowerInfo(std::shared_ptr<KeyEvent> key, OHOS::HiviewDFX::HiSysEvent::EventType type);
     static inline void GetComboStartTime()
     {
         comboStartTime_ = GetSysClockTime();
diff --git a/service/dfx/src/dfx_hisysevent.cpp b/service/dfx/src/dfx_hisysevent.cpp
index 62b8887854..3520563ef2 100644
--- a/service/dfx/src/dfx_hisysevent.cpp
+++ b/service/dfx/src/dfx_hisysevent.cpp
@@ -396,6 +396,29 @@ void DfxHisysevent::ReportComboStartTimes()
         }
     }
 }
+
+void DfxHisysevent::ReportPowerInfo(std::shared_ptr<KeyEvent> key, OHOS::HiviewDFX::HiSysEvent::EventType type)
+{
+    if (key->GetKeyAction() == KeyEvent::KEY_ACTION_UP) {
+        int32_t ret = HiSysEventWrite(
+            OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
+            "INPUT_POWER_UP",
+            type);
+        if (ret != 0) {
+            MMI_HILOGE("HiviewDFX Write failed, ret:%{public}d", ret);
+        }
+    } else if (key->GetKeyAction() == KeyEvent::KEY_ACTION_DOWN) {
+        int32_t ret = HiSysEventWrite(
+            OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
+            "INPUT_POWER_DOWN",
+            type);
+        if (ret != 0) {
+            MMI_HILOGE("HiviewDFX Write failed, ret:%{public}d", ret);
+        }
+    } else {
+        MMI_HILOGE("press power key is error");
+    }
+}
 }
 }
 
diff --git a/service/hisysevent.yaml b/service/hisysevent.yaml
index 6af53d365c..41f91c31f7 100644
--- a/service/hisysevent.yaml
+++ b/service/hisysevent.yaml
@@ -176,3 +176,9 @@ COMBO_START_TIME:
   BELOW50MS: {type: UINT32, desc: times below 50ms}
   ABOVE50MS: {type: UINT32, desc: times above 50ms}
   MSG: {type: STRING, desc: message}
+
+INPUT_POWER_UP:
+  __BASE: {type: STATISTIC, level: CRITICAL, desc: power input up}
+
+INPUT_POWER_DOWN:
+  __BASE: {type: STATISTIC, level: CRITICAL, desc: power input down}
\ No newline at end of file
diff --git a/service/subscriber/src/key_subscriber_handler.cpp b/service/subscriber/src/key_subscriber_handler.cpp
index ec317bf77f..fd9cfe987b 100644
--- a/service/subscriber/src/key_subscriber_handler.cpp
+++ b/service/subscriber/src/key_subscriber_handler.cpp
@@ -17,6 +17,7 @@
 
 #include "bytrace_adapter.h"
 #include "define_multimodal.h"
+#include "dfx_hisysevent.h"
 #include "error_multimodal.h"
 #include "input_event_data_transformation.h"
 #include "input_event_handler.h"
@@ -193,6 +194,9 @@ void KeySubscriberHandler::NotifySubscriber(std::shared_ptr<KeyEvent> keyEvent,
     CHKPV(subscriber);
     auto udsServerPtr = InputHandler->GetUDSServer();
     CHKPV(udsServerPtr);
+    if (keyEvent->GetKeyCode() == KeyEvent::KEYCODE_POWER) {
+        DfxHisysevent::ReportPowerInfo(keyEvent, OHOS::HiviewDFX::HiSysEvent::EventType::STATISTIC);
+    }
     NetPacket pkt(MmiMessageId::ON_SUBSCRIBE_KEY);
     InputEventDataTransformation::KeyEventToNetPacket(keyEvent, pkt);
     int32_t fd = subscriber->sess_->GetFd();
-- 
Gitee


From 3389124957fc642261c92046b3cf0b6e5205b218 Mon Sep 17 00:00:00 2001
From: Yuanxinying <yuanxinying@huawei.com>
Date: Fri, 10 Mar 2023 08:31:01 +0000
Subject: [PATCH 356/360] update service/dfx/src/dfx_hisysevent.cpp.

Signed-off-by: Yuanxinying <yuanxinying@huawei.com>
---
 service/dfx/src/dfx_hisysevent.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/service/dfx/src/dfx_hisysevent.cpp b/service/dfx/src/dfx_hisysevent.cpp
index 3520563ef2..a979ae4c51 100644
--- a/service/dfx/src/dfx_hisysevent.cpp
+++ b/service/dfx/src/dfx_hisysevent.cpp
@@ -399,12 +399,16 @@ void DfxHisysevent::ReportComboStartTimes()
 
 void DfxHisysevent::ReportPowerInfo(std::shared_ptr<KeyEvent> key, OHOS::HiviewDFX::HiSysEvent::EventType type)
 {
+    if (key == nullptr) {
+        MMI_HILOGE("get key is failed");
+        return;
+    }
     if (key->GetKeyAction() == KeyEvent::KEY_ACTION_UP) {
         int32_t ret = HiSysEventWrite(
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             "INPUT_POWER_UP",
             type);
-        if (ret != 0) {
+        if (ret != RET_OK) {
             MMI_HILOGE("HiviewDFX Write failed, ret:%{public}d", ret);
         }
     } else if (key->GetKeyAction() == KeyEvent::KEY_ACTION_DOWN) {
@@ -412,11 +416,11 @@ void DfxHisysevent::ReportPowerInfo(std::shared_ptr<KeyEvent> key, OHOS::HiviewD
             OHOS::HiviewDFX::HiSysEvent::Domain::MULTI_MODAL_INPUT,
             "INPUT_POWER_DOWN",
             type);
-        if (ret != 0) {
+        if (ret != RET_OK) {
             MMI_HILOGE("HiviewDFX Write failed, ret:%{public}d", ret);
         }
     } else {
-        MMI_HILOGE("press power key is error");
+        MMI_HILOGW("press power key is error");
     }
 }
 }
-- 
Gitee


From 2829d111458a11988379d6a622de2541e5e875e0 Mon Sep 17 00:00:00 2001
From: yuanxinying <yuanxinying@huawei.com>
Date: Sat, 11 Mar 2023 18:45:03 +0800
Subject: [PATCH 357/360] =?UTF-8?q?=20=20=20=20=E4=BF=AE=E6=94=B9napi=5Fde?=
 =?UTF-8?q?lete=5Freference=E5=A4=9A=E7=BA=BF=E7=A8=8B=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=20=20=20=20Signed-off-by:=20houchengyu202?=
 =?UTF-8?q?2=20<houchengyu@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../input_device_cooperate/include/js_util.h  | 14 ++++++
 .../input_device_cooperate/src/js_util.cpp    | 45 +++++++++++++++++--
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/frameworks/napi/input_device_cooperate/include/js_util.h b/frameworks/napi/input_device_cooperate/include/js_util.h
index 9eca76ade6..5c66f48e9f 100644
--- a/frameworks/napi/input_device_cooperate/include/js_util.h
+++ b/frameworks/napi/input_device_cooperate/include/js_util.h
@@ -20,10 +20,12 @@
 #include <memory>
 #include <string>
 #include <vector>
+#include <uv.h>
 
 #include <napi/native_api.h>
 
 #include "cooperation_message.h"
+#include "napi_constants.h"
 
 #include "refbase.h"
 
@@ -59,6 +61,16 @@ public:
         UserData uData;
     };
 
+    struct CallbackReceiveInfoWorker {
+        napi_env env { nullptr };
+        napi_ref ref { nullptr };
+        napi_deferred deferred { nullptr };
+        int32_t errCode { 0 };
+        CallbackData data;
+        UserData uData;
+        std::unique_ptr<CallbackInfo> callback = nullptr;
+    };
+
     static napi_value GetEnableInfo(sptr<CallbackInfo> cb);
     static napi_value GetStartInfo(sptr<CallbackInfo> cb);
     static napi_value GetStopInfo(sptr<CallbackInfo> cb);
@@ -66,6 +78,8 @@ public:
     static napi_value GetStateResult(napi_env env, bool result);
     static napi_value GetResult(napi_env env, bool result, int32_t errCode);
     static bool IsSameHandle(napi_env env, napi_value handle, napi_ref ref);
+    static void DeleteNapiRef(napi_env env, napi_ref ref);
+    static void UvQueueWorkDeleteRef(uv_work_t *work, int32_t status);
 
     template <typename T>
     static void DeletePtr(T &ptr)
diff --git a/frameworks/napi/input_device_cooperate/src/js_util.cpp b/frameworks/napi/input_device_cooperate/src/js_util.cpp
index 53b069f359..42bb514f11 100644
--- a/frameworks/napi/input_device_cooperate/src/js_util.cpp
+++ b/frameworks/napi/input_device_cooperate/src/js_util.cpp
@@ -29,10 +29,49 @@ constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MMI_LOG_DOMAIN, "JsUti
 JsUtil::CallbackInfo::~CallbackInfo()
 {
     CALL_DEBUG_ENTER;
-    if (ref != nullptr && env != nullptr) {
-        CHKRV(napi_delete_reference(env, ref), DELETE_REFERENCE);
-        env = nullptr;
+    if (ref == nullptr || env == nullptr) {
+        return;
     }
+    DeleteNapiRef(env, ref);
+}
+
+void JsUtil::DeleteNapiRef(napi_env env, napi_ref ref)
+{
+    uv_loop_s *loop = nullptr;
+    CHKRV(napi_get_uv_event_loop(env, &loop), GET_UV_EVENT_LOOP);
+    CallbackReceiveInfoWorker *dataWorker = new (std::nothrow) CallbackReceiveInfoWorker();
+    if (dataWorker == nullptr) {
+        return;
+    }
+
+    dataWorker->env = env;
+    dataWorker->ref = ref;
+    uv_work_t *work = new (std::nothrow) uv_work_t;
+    if (work == nullptr) {
+        MMI_HILOGE("deleteNapiRef new work falied.");
+        DeletePtr(dataWorker);
+        return;
+    }
+    work->data = static_cast<void *>(dataWorker);
+    int32_t ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, UvQueueWorkDeleteRef);
+    if (ret != 0) {
+        MMI_HILOGE("uv_queue_work failed");
+        DeletePtr(dataWorker);
+        DeletePtr<uv_work_t*>(work);
+    }
+}
+
+void JsUtil::UvQueueWorkDeleteRef(uv_work_t *work, int32_t status)
+{
+    CHKPV(work);
+    CallbackReceiveInfoWorker *dataWorkerData = static_cast<CallbackReceiveInfoWorker *>(work->data);
+    if (dataWorkerData == nullptr) {
+        DeletePtr<uv_work_t*>(work);
+        return;
+    }
+    CHKRV(napi_delete_reference(dataWorkerData->env, dataWorkerData->ref), DELETE_REFERENCE);
+    DeletePtr(dataWorkerData);
+    DeletePtr<uv_work_t*>(work);
 }
 
 napi_value JsUtil::GetEnableInfo(sptr<CallbackInfo> cb)
-- 
Gitee


From fd07b32dce450127363d671c04b73dbf386aaf92 Mon Sep 17 00:00:00 2001
From: houchengyu <houchengyu@huawei.com>
Date: Tue, 14 Mar 2023 04:56:03 +0000
Subject: [PATCH 358/360] update
 service/window_manager/src/input_windows_manager.cpp. degrading the log file
 to info by changing CALL_DEBUG_INFO TO CALL_INFO_TRACE

Signed-off-by: houchengyu <houchengyu@huawei.com>
---
 service/window_manager/src/input_windows_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 29647fcc39..0b393915b7 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -866,7 +866,7 @@ bool InputWindowsManager::UpdateDisplayId(int32_t& displayId)
 std::optional<WindowInfo> InputWindowsManager::SelectWindowInfo(int32_t logicalX, int32_t logicalY,
     const std::shared_ptr<PointerEvent>& pointerEvent)
 {
-    CALL_DEBUG_ENTER;
+    CALL_INFO_TRACE;
     int32_t action = pointerEvent->GetPointerAction();
     if ((firstBtnDownWindowId_ == -1) ||
         ((action == PointerEvent::POINTER_ACTION_BUTTON_DOWN) && (pointerEvent->GetPressedButtons().size() == 1)) ||
-- 
Gitee


From 436b5063a6280bab8d31736f943ac7bbec886f68 Mon Sep 17 00:00:00 2001
From: houchengyu <houchengyu@huawei.com>
Date: Tue, 14 Mar 2023 08:39:49 +0000
Subject: [PATCH 359/360] update
 service/window_manager/src/input_windows_manager.cpp. update

Signed-off-by: houchengyu <houchengyu@huawei.com>
---
 service/window_manager/src/input_windows_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp
index 0b393915b7..f704b0cb54 100644
--- a/service/window_manager/src/input_windows_manager.cpp
+++ b/service/window_manager/src/input_windows_manager.cpp
@@ -1160,7 +1160,7 @@ int32_t InputWindowsManager::UpdateTouchScreenTarget(std::shared_ptr<PointerEven
         lastTouchEvent_ = nullptr;
         lastTouchWindowInfo_.id = -1;
     }
-    MMI_HILOGD("pid:%{public}d,logicalX:%{public}d,logicalY:%{public}d,"
+    MMI_HILOGI("pid:%{public}d,logicalX:%{public}d,logicalY:%{public}d,"
                "physicalX:%{public}d,physicalY:%{public}d,windowX:%{public}d,windowY:%{public}d,"
                "displayId:%{public}d,TargetWindowId:%{public}d,AgentWindowId:%{public}d",
                touchWindow->pid, logicalX, logicalY, physicalX, physicalY,
-- 
Gitee


From c63e414e3ac1eac60988f56dc25a55178bf98b0a Mon Sep 17 00:00:00 2001
From: houchengyu2022 <houchengyu@huawei.com>
Date: Wed, 15 Mar 2023 20:09:27 +0800
Subject: [PATCH 360/360] fix warning Signed-off-by: houchengyu2022
 <houchengyu@huawei.com>

---
 frameworks/napi/input_consumer/include/js_register_module.h | 6 ++++--
 frameworks/proxy/events/include/event_log_helper.h          | 6 ++++--
 service/device_manager/src/input_device_manager.cpp         | 3 ++-
 .../src/input_device_cooperate_sm.cpp                       | 6 ++++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/frameworks/napi/input_consumer/include/js_register_module.h b/frameworks/napi/input_consumer/include/js_register_module.h
index 124bc7feb7..bcc233cf2e 100644
--- a/frameworks/napi/input_consumer/include/js_register_module.h
+++ b/frameworks/napi/input_consumer/include/js_register_module.h
@@ -57,11 +57,13 @@ struct KeyEventMonitorInfo {
     std::shared_ptr<KeyOption> keyOption { nullptr };
     bool valid { true };
     std::mutex refLock;
-    void SetValid(bool flag) {
+    void SetValid(bool flag)
+    {
         std::lock_guard<std::mutex> lock(refLock);
         valid = flag;
     }
-    bool IsValid() {
+    bool IsValid()
+    {
         std::lock_guard<std::mutex> lock(refLock);
         return valid;
     }
diff --git a/frameworks/proxy/events/include/event_log_helper.h b/frameworks/proxy/events/include/event_log_helper.h
index 631c526f1d..6ad6c7499a 100644
--- a/frameworks/proxy/events/include/event_log_helper.h
+++ b/frameworks/proxy/events/include/event_log_helper.h
@@ -37,7 +37,8 @@ public:
 private:
     static void Print(const std::shared_ptr<KeyEvent> event)
     {
-        if (!HiLogIsLoggable(OHOS::MMI::MMI_LOG_DOMAIN, LABEL.tag, LOG_DEBUG) && event->GetKeyCode() != KeyEvent::KEYCODE_POWER) {
+        if (!HiLogIsLoggable(OHOS::MMI::MMI_LOG_DOMAIN, LABEL.tag, LOG_DEBUG)
+            && event->GetKeyCode() != KeyEvent::KEYCODE_POWER) {
             return;
         }
         std::vector<KeyEvent::KeyItem> eventItems { event->GetKeyItems() };
@@ -156,7 +157,8 @@ template <class T>
 void EventLogHelper::PrintEventData(std::shared_ptr<T> event)
 {
     CHKPV(event);
-    if (HiLogIsLoggable(OHOS::MMI::MMI_LOG_DOMAIN, LABEL.tag, LOG_DEBUG) || (event->GetAction() == InputEvent::EVENT_TYPE_KEY)) {
+    if (HiLogIsLoggable(OHOS::MMI::MMI_LOG_DOMAIN, LABEL.tag, LOG_DEBUG)
+        || (event->GetAction() == InputEvent::EVENT_TYPE_KEY)) {
         EventLogHelper::Print(event);
     }
 }
diff --git a/service/device_manager/src/input_device_manager.cpp b/service/device_manager/src/input_device_manager.cpp
index 6404528a4a..04ea13c85c 100644
--- a/service/device_manager/src/input_device_manager.cpp
+++ b/service/device_manager/src/input_device_manager.cpp
@@ -774,7 +774,8 @@ bool InputDeviceManager::HasLocalPointerDevice() const
     return false;
 }
 
-void InputDeviceManager::NotifyVirtualKeyBoardStatus(int32_t deviceId, bool isAvailable) const {
+void InputDeviceManager::NotifyVirtualKeyBoardStatus(int32_t deviceId, bool isAvailable) const
+{
     MMI_HILOGI("virtual keyboard device %{public}s", isAvailable ? "online" : "offline");
     if (deviceId == -1) {
         MMI_HILOGE("no virtual keyboard device for this device!");
diff --git a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
index 8665250570..3a013cb6cf 100644
--- a/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
+++ b/service/input_device_cooperate/src/input_device_cooperate_sm.cpp
@@ -157,12 +157,14 @@ void InputDeviceCooperateSM::OnCloseCooperation(const std::string &networkId, bo
     }
 }
 
-void InputDeviceCooperateSM::SetVirtualKeyBoardDevId(int32_t deviceId) {
+void InputDeviceCooperateSM::SetVirtualKeyBoardDevId(int32_t deviceId)
+{
     virtualKeyBoardId_ = deviceId;
     MMI_HILOGI("virtualKeyBoardId_ has been set to%{public}d", virtualKeyBoardId_);
 }
 
-int32_t InputDeviceCooperateSM::GetVirtualKeyBoardDevId() {
+int32_t InputDeviceCooperateSM::GetVirtualKeyBoardDevId()
+{
     return virtualKeyBoardId_;
 }
 
-- 
Gitee