From c4add4e2d6eb5dcf2d5a4bdb1a051da82d657e54 Mon Sep 17 00:00:00 2001 From: guoyi Date: Wed, 25 Jun 2025 21:51:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=87=BD=E6=95=B0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guoyi --- .../native_cpp/include/idevice_manager_service_listener.h | 7 +------ .../implementation/src/authentication_v2/auth_manager.cpp | 2 +- .../src/authentication_v2/auth_stages/auth_negotiate.cpp | 2 +- services/service/include/device_manager_service_listener.h | 2 +- services/service/src/device_manager_service_listener.cpp | 2 +- test/unittest/UTTest_device_manager_service_listener.cpp | 4 ++-- test/unittest/UTTest_dm_pin_holder.h | 2 +- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/include/idevice_manager_service_listener.h b/interfaces/inner_kits/native_cpp/include/idevice_manager_service_listener.h index 27ca66104..cc7a97ace 100644 --- a/interfaces/inner_kits/native_cpp/include/idevice_manager_service_listener.h +++ b/interfaces/inner_kits/native_cpp/include/idevice_manager_service_listener.h @@ -175,12 +175,7 @@ public: const std::string &deviceName, int32_t code) = 0; virtual void SetExistPkgName(const std::set &pkgNameSet) = 0; - /** - * @brief Get the Local Display Device Name after privacy processed - * - * @return std::string the name without privacy info - */ - virtual std::string GetLocalDisplayDeviceNameForPrivacy() = 0; + virtual std::string GetLocalDisplayDeviceName() = 0; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/implementation/src/authentication_v2/auth_manager.cpp b/services/implementation/src/authentication_v2/auth_manager.cpp index d00418937..cc4aee16f 100644 --- a/services/implementation/src/authentication_v2/auth_manager.cpp +++ b/services/implementation/src/authentication_v2/auth_manager.cpp @@ -544,7 +544,7 @@ void AuthManager::GetAuthParam(const std::string &pkgName, int32_t authType, context_->accesser.deviceId = std::string(localDeviceId); context_->pkgName = pkgName; context_->authType = (DmAuthType)authType; - context_->accesser.deviceName = context_->listener->GetLocalDisplayDeviceNameForPrivacy(); + context_->accesser.deviceName = context_->listener->GetLocalDisplayDeviceName(); context_->accesser.deviceType = context_->softbusConnector->GetLocalDeviceTypeId(); context_->accesser.isOnline = false; diff --git a/services/implementation/src/authentication_v2/auth_stages/auth_negotiate.cpp b/services/implementation/src/authentication_v2/auth_stages/auth_negotiate.cpp index aef232c30..5d8a00729 100644 --- a/services/implementation/src/authentication_v2/auth_stages/auth_negotiate.cpp +++ b/services/implementation/src/authentication_v2/auth_stages/auth_negotiate.cpp @@ -161,7 +161,7 @@ int32_t AuthSinkNegotiateStateMachine::RespQueryAcceseeIds(std::shared_ptraccessee.tokenIdHash = Crypto::GetTokenIdHash(std::to_string(context->accessee.tokenId)); context->accesser.isOnline = context->softbusConnector->CheckIsOnline(context->accesser.deviceIdHash, true); context->accessee.language = DmLanguageManager::GetInstance().GetSystemLanguage(); - context->accessee.deviceName = context->listener->GetLocalDisplayDeviceNameForPrivacy(); + context->accessee.deviceName = context->listener->GetLocalDisplayDeviceName(); context->accessee.networkId = context->softbusConnector->GetLocalDeviceNetworkId(); return RespQueryProxyAcceseeIds(context); } diff --git a/services/service/include/device_manager_service_listener.h b/services/service/include/device_manager_service_listener.h index ea839b3c9..c6b9128b6 100644 --- a/services/service/include/device_manager_service_listener.h +++ b/services/service/include/device_manager_service_listener.h @@ -91,7 +91,7 @@ public: const std::string &deviceName, int32_t code) override; void SetExistPkgName(const std::set &pkgNameSet) override; - std::string GetLocalDisplayDeviceNameForPrivacy() override; + std::string GetLocalDisplayDeviceName() override; private: void ConvertDeviceInfoToDeviceBasicInfo(const std::string &pkgName, diff --git a/services/service/src/device_manager_service_listener.cpp b/services/service/src/device_manager_service_listener.cpp index 00260e3ed..7bf14c146 100644 --- a/services/service/src/device_manager_service_listener.cpp +++ b/services/service/src/device_manager_service_listener.cpp @@ -1031,7 +1031,7 @@ void DeviceManagerServiceListener::SetExistPkgName(const std::set & } } -std::string DeviceManagerServiceListener::GetLocalDisplayDeviceNameForPrivacy() +std::string DeviceManagerServiceListener::GetLocalDisplayDeviceName() { #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) std::string displayName = ""; diff --git a/test/unittest/UTTest_device_manager_service_listener.cpp b/test/unittest/UTTest_device_manager_service_listener.cpp index 23198a4e9..84d1bc6ff 100644 --- a/test/unittest/UTTest_device_manager_service_listener.cpp +++ b/test/unittest/UTTest_device_manager_service_listener.cpp @@ -1085,12 +1085,12 @@ HWTEST_F(DeviceManagerServiceListenerTest, SetDeviceInfo_001, testing::ext::Test EXPECT_EQ(listener_->alreadyOnlinePkgName_.empty(), false); } -HWTEST_F(DeviceManagerServiceListenerTest, GetLocalDisplayDeviceNameForPrivacy_001, testing::ext::TestSize.Level1) +HWTEST_F(DeviceManagerServiceListenerTest, GetLocalDisplayDeviceName_001, testing::ext::TestSize.Level1) { std::shared_ptr listener_ = std::make_shared(); EXPECT_NE(listener_, nullptr); std::string displayDeviceName = ""; - displayDeviceName = listener_->GetLocalDisplayDeviceNameForPrivacy(); + displayDeviceName = listener_->GetLocalDisplayDeviceName(); EXPECT_FALSE(displayDeviceName.empty()); } } // namespace diff --git a/test/unittest/UTTest_dm_pin_holder.h b/test/unittest/UTTest_dm_pin_holder.h index 917f1f6e5..7d38ad3ce 100644 --- a/test/unittest/UTTest_dm_pin_holder.h +++ b/test/unittest/UTTest_dm_pin_holder.h @@ -256,7 +256,7 @@ public: (void)code; } - virtual std::string GetLocalDisplayDeviceNameForPrivacy() + virtual std::string GetLocalDisplayDeviceName() { return ""; } -- Gitee