From 1eadfcddd4f948cf16de8b39b572792200779672 Mon Sep 17 00:00:00 2001 From: ry521 Date: Tue, 10 Oct 2023 11:45:46 +0000 Subject: [PATCH 1/6] update sinkhandler/include/distributed_input_sink_handler.h. Signed-off-by: ry521 --- sinkhandler/include/distributed_input_sink_handler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sinkhandler/include/distributed_input_sink_handler.h b/sinkhandler/include/distributed_input_sink_handler.h index 86090ee..d20ec32 100644 --- a/sinkhandler/include/distributed_input_sink_handler.h +++ b/sinkhandler/include/distributed_input_sink_handler.h @@ -69,7 +69,7 @@ private: public: void OnRemoteDied(const wptr &remote) override; }; - DistributedInputSinkHandler() = default; + DistributedInputSinkHandler(); ~DistributedInputSinkHandler(); OHOS::sptr sysSinkCallback = nullptr; -- Gitee From a0e34a5d7571fed2dfd628ccb68a87dd597c316a Mon Sep 17 00:00:00 2001 From: ry521 Date: Tue, 10 Oct 2023 11:58:52 +0000 Subject: [PATCH 2/6] update sinkhandler/src/distributed_input_sink_handler.cpp. Signed-off-by: ry521 --- sinkhandler/src/distributed_input_sink_handler.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sinkhandler/src/distributed_input_sink_handler.cpp b/sinkhandler/src/distributed_input_sink_handler.cpp index 20a5a13..13ff24f 100644 --- a/sinkhandler/src/distributed_input_sink_handler.cpp +++ b/sinkhandler/src/distributed_input_sink_handler.cpp @@ -26,6 +26,15 @@ namespace DistributedHardware { namespace DistributedInput { IMPLEMENT_SINGLE_INSTANCE(DistributedInputSinkHandler); +DistributedInputSinkHandler::DistributedInputSinkHandler() +{ + DHLOGI("DInputSinkHandler construct."); + std::lock_guard lock(proxyMutex_); + if (sinkSvrRecipient_ == nullptr) { + sinkSvrRecipient_ = new (std::nothrow) DInputSinkSvrRecipient(); + } +} + DistributedInputSinkHandler::~DistributedInputSinkHandler() { DHLOGI("~DistributedInputSinkHandler"); -- Gitee From 0edcb44695024d733543a199f8cadee90d9adaf6 Mon Sep 17 00:00:00 2001 From: ry521 Date: Tue, 10 Oct 2023 12:00:03 +0000 Subject: [PATCH 3/6] update sourcehandler/include/distributed_input_source_handler.h. Signed-off-by: ry521 --- sourcehandler/include/distributed_input_source_handler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sourcehandler/include/distributed_input_source_handler.h b/sourcehandler/include/distributed_input_source_handler.h index fb96f65..c496921 100644 --- a/sourcehandler/include/distributed_input_source_handler.h +++ b/sourcehandler/include/distributed_input_source_handler.h @@ -71,8 +71,8 @@ public: OHOS::sptr currRemoteObject; }; private: - DistributedInputSourceHandler() = default; - ~DistributedInputSourceHandler(); + DistributedInputSourceHandler(); + ~DistributedInputSourceHandler() = default; class DInputSourceSvrRecipient : public IRemoteObject::DeathRecipient { public: void OnRemoteDied(const wptr &remote) override; -- Gitee From 685faf99acfb66b71c180d89fe7c01d81f5005f1 Mon Sep 17 00:00:00 2001 From: ry521 Date: Tue, 10 Oct 2023 12:01:44 +0000 Subject: [PATCH 4/6] update sourcehandler/include/load_d_input_source_callback.h. Signed-off-by: ry521 --- sourcehandler/include/load_d_input_source_callback.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sourcehandler/include/load_d_input_source_callback.h b/sourcehandler/include/load_d_input_source_callback.h index befb9d9..5133351 100644 --- a/sourcehandler/include/load_d_input_source_callback.h +++ b/sourcehandler/include/load_d_input_source_callback.h @@ -23,6 +23,9 @@ namespace DistributedHardware { namespace DistributedInput { class LoadDInputSourceCallback : public SystemAbilityLoadCallbackStub { public: + LoadDInputSourceCallback() = default; + ~LoadDInputSourceCallback() override = default; + explicit LoadDInputSourceCallback(const std::string ¶ms); void OnLoadSystemAbilitySuccess(int32_t systemAbilityId, const sptr &remoteObject) override; void OnLoadSystemAbilityFail(int32_t systemAbilityId) override; -- Gitee From bb7d506e6382a6ec38b521d74b5176b5f7a77dfe Mon Sep 17 00:00:00 2001 From: ry521 Date: Tue, 10 Oct 2023 12:27:40 +0000 Subject: [PATCH 5/6] update sourcehandler/src/distributed_input_source_handler.cpp. Signed-off-by: ry521 --- sourcehandler/src/distributed_input_source_handler.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sourcehandler/src/distributed_input_source_handler.cpp b/sourcehandler/src/distributed_input_source_handler.cpp index b5b7c7c..47f7c67 100644 --- a/sourcehandler/src/distributed_input_source_handler.cpp +++ b/sourcehandler/src/distributed_input_source_handler.cpp @@ -28,6 +28,15 @@ IMPLEMENT_SINGLE_INSTANCE(DistributedInputSourceHandler); DistributedInputSourceHandler::~DistributedInputSourceHandler() { + DHLOGI("DInputSourceHandler construct."); + std::lock_guard lock(proxyMutex_); + if (sourceSvrRecipient_ == nullptr) { + sourceSvrRecipient_ = new (std::nothrow) DInputSourceSvrRecipient(); + } + + if (sourceSvrRecipient_ == nullptr) { + sourceSvrRecipient_ = new (std::nothrow) LoadDInputSourceCallback(); + } } int32_t DistributedInputSourceHandler::InitSource(const std::string ¶ms) -- Gitee From 53de105661bb9ac254e964d0647fb6023f874e22 Mon Sep 17 00:00:00 2001 From: ry521 Date: Tue, 10 Oct 2023 12:38:18 +0000 Subject: [PATCH 6/6] update sourcehandler/src/distributed_input_source_handler.cpp. Signed-off-by: ry521 --- sourcehandler/src/distributed_input_source_handler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sourcehandler/src/distributed_input_source_handler.cpp b/sourcehandler/src/distributed_input_source_handler.cpp index 47f7c67..e5e205b 100644 --- a/sourcehandler/src/distributed_input_source_handler.cpp +++ b/sourcehandler/src/distributed_input_source_handler.cpp @@ -26,7 +26,7 @@ namespace DistributedHardware { namespace DistributedInput { IMPLEMENT_SINGLE_INSTANCE(DistributedInputSourceHandler); -DistributedInputSourceHandler::~DistributedInputSourceHandler() +DistributedInputSourceHandler::DistributedInputSourceHandler() { DHLOGI("DInputSourceHandler construct."); std::lock_guard lock(proxyMutex_); @@ -34,8 +34,8 @@ DistributedInputSourceHandler::~DistributedInputSourceHandler() sourceSvrRecipient_ = new (std::nothrow) DInputSourceSvrRecipient(); } - if (sourceSvrRecipient_ == nullptr) { - sourceSvrRecipient_ = new (std::nothrow) LoadDInputSourceCallback(); + if (dInputSourceCallback_ == nullptr) { + dInputSourceCallback_ = new (std::nothrow) LoadDInputSourceCallback(); } } -- Gitee