From 784d4e7f17ee9328ec142bc04b8ade3772531ee1 Mon Sep 17 00:00:00 2001 From: chen Date: Fri, 23 Sep 2022 12:09:29 +0800 Subject: [PATCH 1/3] codex Signed-off-by: chen --- .../accesstoken/test/unittest/src/remote_token_kit_test.cpp | 3 +-- .../main/cpp/src/service/accesstoken_manager_stub.cpp | 2 +- .../tokensyncmanager/src/service/token_sync_manager_stub.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp index 53ceb84d9..53eda5dac 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp @@ -119,8 +119,7 @@ HapPolicyParams g_infoManagerTestPolicyPramsBak = { void NativeTokenGet() { - uint64_t tokenId; - tokenId = AccessTokenKit::GetNativeTokenId("token_sync_service"); + uint64_t tokenId = AccessTokenKit::GetNativeTokenId("token_sync_service"); ASSERT_NE(tokenId, 0); SetSelfTokenID(tokenId); } diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp index a9d6572b1..893b5b048 100644 --- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp +++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp @@ -552,7 +552,7 @@ bool AccessTokenManagerStub::IsFoundationCalling() const bool AccessTokenManagerStub::IsAccessTokenCalling() { - int tokenCaller = IPCSkeleton::GetCallingTokenID(); + int32_t tokenCaller = IPCSkeleton::GetCallingTokenID(); if (tokenSyncId_ == 0) { tokenSyncId_ = this->GetNativeTokenId("token_sync_service"); } diff --git a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp index fa1d7230e..efa754504 100644 --- a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp +++ b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp @@ -57,7 +57,7 @@ int32_t TokenSyncManagerStub::OnRemoteRequest( bool TokenSyncManagerStub::IsNativeProcessCalling() const { AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); - int type = (reinterpret_cast(&tokenCaller))->type; + int32_t type = (reinterpret_cast(&tokenCaller))->type; ACCESSTOKEN_LOG_DEBUG(LABEL, "Calling type: %{public}d", type); return type == TOKEN_NATIVE; } -- Gitee From d4b346a6082167b46ebd55c0f7c41421dbd0e1b9 Mon Sep 17 00:00:00 2001 From: chen Date: Fri, 23 Sep 2022 12:16:06 +0800 Subject: [PATCH 2/3] codex Signed-off-by: chen --- .../main/cpp/src/service/accesstoken_manager_stub.cpp | 2 +- .../tokensyncmanager/src/service/token_sync_manager_stub.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp index 893b5b048..dc3424362 100644 --- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp +++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp @@ -552,7 +552,7 @@ bool AccessTokenManagerStub::IsFoundationCalling() const bool AccessTokenManagerStub::IsAccessTokenCalling() { - int32_t tokenCaller = IPCSkeleton::GetCallingTokenID(); + uint32_t tokenCaller = IPCSkeleton::GetCallingTokenID(); if (tokenSyncId_ == 0) { tokenSyncId_ = this->GetNativeTokenId("token_sync_service"); } diff --git a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp index efa754504..814587a5b 100644 --- a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp +++ b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp @@ -57,7 +57,7 @@ int32_t TokenSyncManagerStub::OnRemoteRequest( bool TokenSyncManagerStub::IsNativeProcessCalling() const { AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); - int32_t type = (reinterpret_cast(&tokenCaller))->type; + uint32_t type = (reinterpret_cast(&tokenCaller))->type; ACCESSTOKEN_LOG_DEBUG(LABEL, "Calling type: %{public}d", type); return type == TOKEN_NATIVE; } -- Gitee From c799c3a81d13e990cd0ffad40f387f8bd787eeb8 Mon Sep 17 00:00:00 2001 From: chen Date: Fri, 23 Sep 2022 12:22:04 +0800 Subject: [PATCH 3/3] codex Signed-off-by: chen --- .../accesstoken/test/unittest/src/remote_token_kit_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp index 53eda5dac..a68800173 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp @@ -119,7 +119,7 @@ HapPolicyParams g_infoManagerTestPolicyPramsBak = { void NativeTokenGet() { - uint64_t tokenId = AccessTokenKit::GetNativeTokenId("token_sync_service"); + uint32_t tokenId = AccessTokenKit::GetNativeTokenId("token_sync_service"); ASSERT_NE(tokenId, 0); SetSelfTokenID(tokenId); } -- Gitee