openharmony/distributedhardware_distributed_input
1
0
Fork 0
mirror of https://github.com/openharmony/distributedhardware_distributed_input.git synced 2026-07-21 05:45:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

敏感信息排查整改

Browse Source 
Signed-off-by: li-tiangang4 <litiangang4@huawei.com>
This commit is contained in:
li-tiangang4
2024-02-18 16:21:04 +08:00
parent 12365371ba
commit 68428b4615
11 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/source/sourcemanager/src/distributed_input_source_manager.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
* Copyright (c) 2021-2024 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
@@ -174,7 +174,7 @@ int32_t DistributedInputSourceManager::Release()
DHLOGI("Release devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str());
int32_t ret = DistributedInputInject::GetInstance().UnregisterDistributedHardware(devId, dhId);
if (ret != DH_SUCCESS) {
DHLOGW("DinputSourceManager Release called, remove node fail.");
DHLOGE("DinputSourceManager Release called, remove node fail.");
}
}
DistributedInputSourceTransport::GetInstance().Release();
services/source/sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp
+7 -7
View File
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022-2023 Huawei Device Co., Ltd.
* Copyright (c) 2022-2024 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
@@ -65,7 +65,7 @@ sptr<IDistributedSourceInput> DInputSourceSACliMgr::GetRemoteCli(const std::stri
DHLOGE("DInputSourceSACliMgr::GetRemoteCli deviceId is empty");
return nullptr;
}
DHLOGI("DInputSourceSACliMgr::GetRemoteCli remote deviceid is %{public}s", GetAnonyString(deviceId).c_str());
DHLOGI("DInputSourceSACliMgr::GetRemoteCli remote deviceid is %s", GetAnonyString(deviceId).c_str());
auto remoteCli = GetRemoteCliFromCache(deviceId);
if (remoteCli != nullptr) {
DHLOGD("VirtualHardwareManager::GetRemoteCli get from cache!");
@@ -80,7 +80,7 @@ sptr<IDistributedSourceInput> DInputSourceSACliMgr::GetRemoteCli(const std::stri
auto object = samgr->CheckSystemAbility(DISTRIBUTED_HARDWARE_INPUT_SOURCE_SA_ID, deviceId);
if (object == nullptr) {
DHLOGE("GetRemoteCli failed get remote Cli %{public}s", GetAnonyString(deviceId).c_str());
DHLOGE("GetRemoteCli failed get remote Cli %s", GetAnonyString(deviceId).c_str());
return nullptr;
}
@@ -101,11 +101,11 @@ sptr<IDistributedSourceInput> DInputSourceSACliMgr::GetRemoteCliFromCache(const
void DInputSourceSACliMgr::AddRemoteCli(const std::string &devId, sptr<IRemoteObject> object)
{
if (devId.empty() || (object == nullptr)) {
DHLOGW("DInputSourceSACliMgr::AddRemoteCli param error! devId=%{public}s", GetAnonyString(devId).c_str());
DHLOGW("DInputSourceSACliMgr::AddRemoteCli param error! devId=%s", GetAnonyString(devId).c_str());
return;
}
DHLOGI("DInputSourceSACliMgr::AddRemoteCli devId=%{public}s", GetAnonyString(devId).c_str());
DHLOGI("DInputSourceSACliMgr::AddRemoteCli devId=%s", GetAnonyString(devId).c_str());
object->AddDeathRecipient(remoteCliDeathRcv);
std::lock_guard<std::mutex> lock(remoteCliLock);
@@ -118,7 +118,7 @@ void DInputSourceSACliMgr::AddRemoteCli(const std::string &devId, sptr<IRemoteOb
void DInputSourceSACliMgr::DeleteRemoteCli(const std::string &devId)
{
DHLOGI("DInputSourceSACliMgr::DeleteRemoteCli devId=%{public}s", GetAnonyString(devId).c_str());
DHLOGI("DInputSourceSACliMgr::DeleteRemoteCli devId=%s", GetAnonyString(devId).c_str());
std::lock_guard<std::mutex> lock(remoteCliLock);
auto item = remoteCliMap.find(devId);
if (item == remoteCliMap.end()) {
@@ -144,7 +144,7 @@ void DInputSourceSACliMgr::DeleteRemoteCli(const sptr<IRemoteObject> remote)
return;
}
DHLOGI("VirtualHardwareManager::DeleteRemoteCli remote.devId=%{public}s", GetAnonyString(iter->first).c_str());
DHLOGI("VirtualHardwareManager::DeleteRemoteCli remote.devId=%s", GetAnonyString(iter->first).c_str());
if (iter->second != nullptr) {
iter->second->AsObject()->RemoveDeathRecipient(remoteCliDeathRcv);
}