From eb0df4c02043c37ddaef0ce052779ed58956eca1 Mon Sep 17 00:00:00 2001 From: houchengyu2022 Date: Mon, 3 Apr 2023 22:04:44 +0800 Subject: [PATCH 1/4] fix hmos_trunk warning in TDD Signed-off-by: houchengyu2022 --- frameworks/napi/input_device/src/js_input_device_context.cpp | 3 +++ .../proxy/events/test/input_manager_filter_manual_test.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 01662caeb5..98f204223f 100644 --- a/frameworks/napi/input_device/src/js_input_device_context.cpp +++ b/frameworks/napi/input_device/src/js_input_device_context.cpp @@ -316,6 +316,9 @@ napi_value JsInputDeviceContext::SupportKeys(napi_env env, napi_callback_info in } JsInputDeviceContext *jsContext = JsInputDeviceContext::GetInstance(env); + if (jsContext == nullptr) { + MMI_HILOGE("jsContext is empty"); + } auto jsInputDeviceMgr = jsContext->GetJsInputDeviceMgr(); if (argc == 2) { return jsInputDeviceMgr->SupportKeys(env, deviceId, keyCodes); diff --git a/frameworks/proxy/events/test/input_manager_filter_manual_test.cpp b/frameworks/proxy/events/test/input_manager_filter_manual_test.cpp index 677c1e8092..8e3e1a1e7e 100644 --- a/frameworks/proxy/events/test/input_manager_filter_manual_test.cpp +++ b/frameworks/proxy/events/test/input_manager_filter_manual_test.cpp @@ -135,8 +135,8 @@ public: if (fgets(buf, 255, fp) != NULL) { pid = atoi(buf); } + pclose(fp); } - pclose(fp); return pid; } int32_t GetSelfHidumperFilterNum() const -- Gitee From 1875f736fe9ee9c6dfe4fa0516af49b1144222e8 Mon Sep 17 00:00:00 2001 From: houchengyu Date: Tue, 4 Apr 2023 06:39:33 +0000 Subject: [PATCH 2/4] update frameworks/napi/input_device/src/js_input_device_context.cpp. Signed-off-by: houchengyu --- frameworks/napi/input_device/src/js_input_device_context.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 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 98f204223f..8ad398fc8c 100644 --- a/frameworks/napi/input_device/src/js_input_device_context.cpp +++ b/frameworks/napi/input_device/src/js_input_device_context.cpp @@ -316,9 +316,7 @@ napi_value JsInputDeviceContext::SupportKeys(napi_env env, napi_callback_info in } JsInputDeviceContext *jsContext = JsInputDeviceContext::GetInstance(env); - if (jsContext == nullptr) { - MMI_HILOGE("jsContext is empty"); - } + CHKPR(jsContext); auto jsInputDeviceMgr = jsContext->GetJsInputDeviceMgr(); if (argc == 2) { return jsInputDeviceMgr->SupportKeys(env, deviceId, keyCodes); -- Gitee From 4560f4b0d71bf25a8bc8f9769b5cdb84ae5ae9c1 Mon Sep 17 00:00:00 2001 From: houchengyu Date: Thu, 6 Apr 2023 03:46:07 +0000 Subject: [PATCH 3/4] update frameworks/napi/input_device/src/js_input_device_context.cpp. Signed-off-by: houchengyu --- frameworks/napi/input_device/src/js_input_device_context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8ad398fc8c..4d0181c6e0 100644 --- a/frameworks/napi/input_device/src/js_input_device_context.cpp +++ b/frameworks/napi/input_device/src/js_input_device_context.cpp @@ -316,7 +316,7 @@ napi_value JsInputDeviceContext::SupportKeys(napi_env env, napi_callback_info in } JsInputDeviceContext *jsContext = JsInputDeviceContext::GetInstance(env); - CHKPR(jsContext); + CHKRP(jsContext); auto jsInputDeviceMgr = jsContext->GetJsInputDeviceMgr(); if (argc == 2) { return jsInputDeviceMgr->SupportKeys(env, deviceId, keyCodes); -- Gitee From bca57eb44ef5ef07f32e6fb03fbdd2b5b9a1e7bd Mon Sep 17 00:00:00 2001 From: houchengyu Date: Mon, 17 Apr 2023 08:59:54 +0000 Subject: [PATCH 4/4] update frameworks/napi/input_device/src/js_input_device_context.cpp. Signed-off-by: houchengyu --- frameworks/napi/input_device/src/js_input_device_context.cpp | 1 - 1 file changed, 1 deletion(-) 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 4d0181c6e0..01662caeb5 100644 --- a/frameworks/napi/input_device/src/js_input_device_context.cpp +++ b/frameworks/napi/input_device/src/js_input_device_context.cpp @@ -316,7 +316,6 @@ napi_value JsInputDeviceContext::SupportKeys(napi_env env, napi_callback_info in } JsInputDeviceContext *jsContext = JsInputDeviceContext::GetInstance(env); - CHKRP(jsContext); auto jsInputDeviceMgr = jsContext->GetJsInputDeviceMgr(); if (argc == 2) { return jsInputDeviceMgr->SupportKeys(env, deviceId, keyCodes); -- Gitee