From 91535a4f8e838c159fec0c64c830da2064a301eb Mon Sep 17 00:00:00 2001 From: LiangNuo Date: Mon, 16 Jun 2025 20:13:24 +0800 Subject: [PATCH 1/5] modify format Signed-off-by: LiangNuo --- test/unittest/mock/accesstoken_kit_mock.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unittest/mock/accesstoken_kit_mock.cpp b/test/unittest/mock/accesstoken_kit_mock.cpp index 8475fc5f3..31e987215 100644 --- a/test/unittest/mock/accesstoken_kit_mock.cpp +++ b/test/unittest/mock/accesstoken_kit_mock.cpp @@ -35,9 +35,9 @@ int AccessTokenKit::GetNativeTokenInfo(AccessTokenID tokenID, NativeTokenInfo &n return AccessTokenKitInterface::GetOrCreateAccessTokenKit()->GetNativeTokenInfo(tokenID, nativeTokenInfoRes); } -AccessTokenID AccessTokenKit::GetNativeTokenId(const std::string &GetNativeTokenId) +AccessTokenID AccessTokenKit::GetNativeTokenId(const std::string &nativeTokenId) { - return AccessTokenKitInterface::GetOrCreateAccessTokenKit()->GetNativeTokenId(GetNativeTokenId); + return AccessTokenKitInterface::GetOrCreateAccessTokenKit()->GetNativeTokenId(nativeTokenId); } AccessTokenID AccessTokenKit::GetHapTokenID(int32_t userID, const std::string &bundleName, int32_t instIndex) -- Gitee From 64170c1618df644091f9bd5fbc6d359566dbbd9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=9B=B7?= Date: Thu, 3 Jul 2025 14:03:49 +0800 Subject: [PATCH 2/5] pr modify MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张雷 --- utils/src/kvadapter/kv_adapter.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/src/kvadapter/kv_adapter.cpp b/utils/src/kvadapter/kv_adapter.cpp index b2affd783..f61f88ada 100644 --- a/utils/src/kvadapter/kv_adapter.cpp +++ b/utils/src/kvadapter/kv_adapter.cpp @@ -39,6 +39,9 @@ namespace { constexpr int32_t MAX_STRING_LEN = 4096; constexpr int32_t MAX_INIT_RETRY_TIMES = 20; constexpr int32_t INIT_RETRY_SLEEP_INTERVAL = 200 * 1000; // 200ms + const char* PEER_UDID = "peer_udid"; + const char* PEER_OSTYPE = "peer_os_type"; + const char* TIME_STAMP = "timestamp"; } int32_t KVAdapter::Init() -- Gitee From b7a32ba8195624e6f877032591456181815a89f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=9B=B7?= Date: Thu, 3 Jul 2025 06:09:48 +0000 Subject: [PATCH 3/5] Revert "pr modify" This reverts commit 64170c1618df644091f9bd5fbc6d359566dbbd9d. --- utils/src/kvadapter/kv_adapter.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/utils/src/kvadapter/kv_adapter.cpp b/utils/src/kvadapter/kv_adapter.cpp index f61f88ada..b2affd783 100644 --- a/utils/src/kvadapter/kv_adapter.cpp +++ b/utils/src/kvadapter/kv_adapter.cpp @@ -39,9 +39,6 @@ namespace { constexpr int32_t MAX_STRING_LEN = 4096; constexpr int32_t MAX_INIT_RETRY_TIMES = 20; constexpr int32_t INIT_RETRY_SLEEP_INTERVAL = 200 * 1000; // 200ms - const char* PEER_UDID = "peer_udid"; - const char* PEER_OSTYPE = "peer_os_type"; - const char* TIME_STAMP = "timestamp"; } int32_t KVAdapter::Init() -- Gitee From 870a5ac2c4e55347cdef331e81b272d3f25eee7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=9B=B7?= Date: Tue, 8 Jul 2025 14:35:30 +0800 Subject: [PATCH 4/5] add log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张雷 --- services/service/src/device_manager_service.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index c32ff62d2..804d0a733 100644 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -1591,6 +1591,7 @@ int32_t DeviceManagerService::StopAdvertising(const std::string &pkgName, int32_t DeviceManagerService::BindTarget(const std::string &pkgName, const PeerTargetId &targetId, const std::map &bindParam) { + LOGI("DeviceManagerService::BindTarget"); if (!PermissionManager::GetInstance().CheckNewPermission()) { LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; -- Gitee From 7a5585d2c4f8dbbf3a94fbd64e5da87723458de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=9B=B7?= Date: Tue, 8 Jul 2025 06:37:58 +0000 Subject: [PATCH 5/5] Revert "add log" This reverts commit 870a5ac2c4e55347cdef331e81b272d3f25eee7c. --- services/service/src/device_manager_service.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index 804d0a733..c32ff62d2 100644 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -1591,7 +1591,6 @@ int32_t DeviceManagerService::StopAdvertising(const std::string &pkgName, int32_t DeviceManagerService::BindTarget(const std::string &pkgName, const PeerTargetId &targetId, const std::map &bindParam) { - LOGI("DeviceManagerService::BindTarget"); if (!PermissionManager::GetInstance().CheckNewPermission()) { LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; -- Gitee