From 84d528e8a3f692e2acb3e9aeb0ca6a653dd2d77e Mon Sep 17 00:00:00 2001 From: zhaochaoyan Date: Wed, 13 Aug 2025 15:15:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=B7=AE=E5=BC=82=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: zhaochaoyan --- .../native_cpp/src/ipc/standard/ipc_client_manager.cpp | 6 +----- .../implementation/include/attest/dm_auth_attest_common.h | 4 ---- test/unittest/UTTest_ipc_server_stub.cpp | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp index efe7b17aa..db37b19cb 100644 --- a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp +++ b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp @@ -86,11 +86,7 @@ int32_t IpcClientManager::Init(const std::string &pkgName) LOGE("InitDeviceManager Failed with ret %{public}d", ret); return ret; } - if (dmListener_.size() >= MAX_CONTAINER_SIZE) { - LOGE("dmListener_ size is more than max size"); - return ERR_DM_FAILED; - } - + CHECK_SIZE_RETURN(dmListener_, ERR_DM_FAILED); sptr listener = sptr(new IpcClientStub()); std::shared_ptr req = std::make_shared(); std::shared_ptr rsp = std::make_shared(); diff --git a/services/implementation/include/attest/dm_auth_attest_common.h b/services/implementation/include/attest/dm_auth_attest_common.h index 00c949930..21d5f6296 100644 --- a/services/implementation/include/attest/dm_auth_attest_common.h +++ b/services/implementation/include/attest/dm_auth_attest_common.h @@ -16,10 +16,6 @@ #ifndef OHOS_DM_AUTH_ATTEST_COMMON_H #define OHOS_DM_AUTH_ATTEST_COMMON_H -#define DM_CERTS_COUNT 4 -#define UDID_BUF_LEN 65 -#define DM_CERTIFICATE_SIZE 8192 - #include #include diff --git a/test/unittest/UTTest_ipc_server_stub.cpp b/test/unittest/UTTest_ipc_server_stub.cpp index adc33ab53..875eb58d9 100644 --- a/test/unittest/UTTest_ipc_server_stub.cpp +++ b/test/unittest/UTTest_ipc_server_stub.cpp @@ -647,7 +647,6 @@ HWTEST_F(IpcServerStubTest, OnAddSystemAbility_002, testing::ext::TestSize.Level int32_t systemAbilityId = 9999; std::string deviceId; IpcServerStub::GetInstance().OnAddSystemAbility(systemAbilityId, deviceId); - EXPECT_EQ(DeviceManagerService::GetInstance().softbusListener_, nullptr); systemAbilityId = SOFTBUS_SERVER_SA_ID; IpcServerStub::GetInstance().registerToService_ = false; -- Gitee