From 28a5f5ce25c2a76b0117e360b20e6180e2ddc067 Mon Sep 17 00:00:00 2001
From: lsq <linshuqing2@huawei.com>
Date: Wed, 23 Mar 2022 10:02:56 +0800
Subject: [PATCH] Signed-off-by: lsq <linshuqing2@huawei.com> Change-Id:
 If3c0de01c9547fe01d6b19cf9898cbb70143776a Change-Id:
 I1893828adb35572d7472d3ff8e3e6f37a4253404

Change-Id: I89072b512a5c92cec8a129c53e8e79f35fe9a704
Signed-off-by: lsq <linshuqing2@huawei.com>
---
 OAT.xml                                       |  1 -
 .../accesstoken/src/hap_policy_parcel.cpp     |  2 +-
 .../src/hap_token_info_for_sync_parcel.cpp    |  1 -
 .../accesstoken/src/hap_token_info_parcel.cpp |  2 +-
 .../src/native_token_info_parcel.cpp          |  2 +-
 .../src/permission_state_full_parcel.cpp      |  2 +-
 frameworks/common/include/data_validator.h    |  1 +
 frameworks/common/include/random_mbedtls.h    |  4 +--
 .../include/accesstoken_death_recipient.h     |  2 +-
 .../src/accesstoken_manager_proxy.h           |  1 +
 .../unittest/src/accesstoken_kit_test.cpp     | 32 +++++++++----------
 .../accesstoken/napi/include/napi_atmanager.h |  6 ++--
 .../permission/permission_policy_set.h        |  2 +-
 .../include/permission/permission_validator.h |  4 +--
 .../service/accesstoken_manager_service.h     |  1 +
 .../cpp/include/token/native_token_receptor.h |  2 +-
 .../cpp/include/token/token_modify_notifier.h |  1 -
 .../main/cpp/src/database/data_storage.cpp    |  2 +-
 .../main/cpp/src/database/generic_values.cpp  |  2 +-
 .../main/cpp/src/database/sqlite_helper.cpp   |  2 +-
 .../main/cpp/src/database/statement.cpp       |  2 +-
 .../main/cpp/src/database/variant_value.cpp   |  2 +-
 .../cpp/src/permission/permission_manager.cpp |  2 +-
 .../service/accesstoken_manager_service.cpp   |  2 +-
 .../src/service/accesstoken_manager_stub.cpp  |  2 +-
 .../accesstoken_remote_token_manager.cpp      |  1 -
 .../cpp/src/token/token_modify_notifier.cpp   |  1 -
 .../cpp/src/native_token_receptor_test.cpp    |  1 -
 .../include/common/constant.h                 |  2 +-
 .../include/device/device_info.h              |  2 +-
 .../include/device/device_info_manager.h      |  2 +-
 .../include/device/device_info_repository.h   |  2 +-
 .../include/remote/rpc_channel.h              |  2 +-
 .../src/device/device_info_manager.cpp        |  2 +-
 .../src/device/device_info_repository.cpp     |  2 +-
 .../src/remote/soft_bus_channel.cpp           |  7 ++--
 .../src/remote/soft_bus_session_listener.cpp  |  1 +
 .../service/token_sync_manager_service.cpp    |  2 +-
 .../test/unittest/token_sync_service/BUILD.gn |  2 +-
 .../token_sync_service_test.cpp               |  2 +-
 .../token_sync_service_test.h                 |  2 +-
 tools/accesstoken/include/atm_command.h       |  2 +-
 tools/accesstoken/include/atm_receiver_impl.h |  2 +-
 tools/accesstoken/src/atm_command.cpp         |  8 +----
 tools/accesstoken/src/atm_receiver_impl.cpp   |  2 +-
 45 files changed, 59 insertions(+), 70 deletions(-)

diff --git a/OAT.xml b/OAT.xml
index e2f5a5ae9..6433eb1d4 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright (c) 2021-2022 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
diff --git a/frameworks/accesstoken/src/hap_policy_parcel.cpp b/frameworks/accesstoken/src/hap_policy_parcel.cpp
index 434c41903..bbd333fc0 100644
--- a/frameworks/accesstoken/src/hap_policy_parcel.cpp
+++ b/frameworks/accesstoken/src/hap_policy_parcel.cpp
@@ -89,4 +89,4 @@ HapPolicyParcel* HapPolicyParcel::Unmarshalling(Parcel& in)
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/frameworks/accesstoken/src/hap_token_info_for_sync_parcel.cpp b/frameworks/accesstoken/src/hap_token_info_for_sync_parcel.cpp
index 1f3d64286..282939ccb 100644
--- a/frameworks/accesstoken/src/hap_token_info_for_sync_parcel.cpp
+++ b/frameworks/accesstoken/src/hap_token_info_for_sync_parcel.cpp
@@ -73,4 +73,3 @@ HapTokenInfoForSyncParcel* HapTokenInfoForSyncParcel::Unmarshalling(Parcel& in)
 } // namespace AccessToken
 } // namespace Security
 } // namespace OHOS
-
diff --git a/frameworks/accesstoken/src/hap_token_info_parcel.cpp b/frameworks/accesstoken/src/hap_token_info_parcel.cpp
index 5c91760c5..025d29a0a 100644
--- a/frameworks/accesstoken/src/hap_token_info_parcel.cpp
+++ b/frameworks/accesstoken/src/hap_token_info_parcel.cpp
@@ -65,4 +65,4 @@ HapTokenInfoParcel* HapTokenInfoParcel::Unmarshalling(Parcel& in)
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/frameworks/accesstoken/src/native_token_info_parcel.cpp b/frameworks/accesstoken/src/native_token_info_parcel.cpp
index daca0e793..bccd54204 100644
--- a/frameworks/accesstoken/src/native_token_info_parcel.cpp
+++ b/frameworks/accesstoken/src/native_token_info_parcel.cpp
@@ -79,4 +79,4 @@ NativeTokenInfoParcel* NativeTokenInfoParcel::Unmarshalling(Parcel& in)
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/frameworks/accesstoken/src/permission_state_full_parcel.cpp b/frameworks/accesstoken/src/permission_state_full_parcel.cpp
index 99735cf9a..642dbda7b 100644
--- a/frameworks/accesstoken/src/permission_state_full_parcel.cpp
+++ b/frameworks/accesstoken/src/permission_state_full_parcel.cpp
@@ -87,4 +87,4 @@ PermissionStateFullParcel* PermissionStateFullParcel::Unmarshalling(Parcel& in)
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/frameworks/common/include/data_validator.h b/frameworks/common/include/data_validator.h
index 9a146ba70..db08ee9aa 100644
--- a/frameworks/common/include/data_validator.h
+++ b/frameworks/common/include/data_validator.h
@@ -46,6 +46,7 @@ public:
     static bool IsPermissionFlagValid(int flag);
     static bool IsDcapValid(const std::string& dcap);
     static bool IsTokenIDValid(AccessTokenID id);
+
 private:
     const static int MAX_LENGTH = 256;
     const static int MAX_APPIDDESC_LENGTH = 10240;
diff --git a/frameworks/common/include/random_mbedtls.h b/frameworks/common/include/random_mbedtls.h
index 443993b13..d9461c734 100644
--- a/frameworks/common/include/random_mbedtls.h
+++ b/frameworks/common/include/random_mbedtls.h
@@ -27,11 +27,11 @@ class RandomMbedtls {
 public:
     static RandomMbedtls& GetInstance();
     int GenerateRandomArray(unsigned char *randStr, unsigned int len);
-    ~RandomMbedtls() {};
+    ~RandomMbedtls() {}
     static unsigned int GetRandomUint32();
 
 private:
-    RandomMbedtls() : initFlag_(false) {};
+    RandomMbedtls() : initFlag_(false) {}
     mbedtls_entropy_context entropy_;
     mbedtls_ctr_drbg_context ctrDrbg_;
     OHOS::Utils::RWLock randomLock_;
diff --git a/interfaces/innerkits/accesstoken/include/accesstoken_death_recipient.h b/interfaces/innerkits/accesstoken/include/accesstoken_death_recipient.h
index a48cc7703..974bdb50d 100644
--- a/interfaces/innerkits/accesstoken/include/accesstoken_death_recipient.h
+++ b/interfaces/innerkits/accesstoken/include/accesstoken_death_recipient.h
@@ -24,7 +24,7 @@ namespace Security {
 namespace AccessToken {
 class AccessTokenDeathRecipient : public IRemoteObject::DeathRecipient {
 public:
-    AccessTokenDeathRecipient() {};
+    AccessTokenDeathRecipient() {}
     virtual ~AccessTokenDeathRecipient() = default;
     void OnRemoteDied(const wptr<IRemoteObject> &object) override;
 };
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
index 90c65cee8..6d99aa2e7 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
@@ -71,6 +71,7 @@ public:
 #endif
 
     void DumpTokenInfo(std::string& dumpInfo) override;
+
 private:
     static inline BrokerDelegator<AccessTokenManagerProxy> delegator_;
 };
diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
index 56a4ada18..788dbcd55 100644
--- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
+++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
@@ -2117,7 +2117,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo001, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2185,7 +2185,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo002, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = wrongBaseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2252,7 +2252,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo003, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2303,7 +2303,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo004, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2361,7 +2361,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo005, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2418,7 +2418,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo006, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2475,7 +2475,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo007, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2526,7 +2526,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo008, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2579,7 +2579,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo009, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2635,7 +2635,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo010, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2676,7 +2676,7 @@ HWTEST_F(AccessTokenKitTest, DeleteRemoteDeviceToken001, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2730,7 +2730,7 @@ HWTEST_F(AccessTokenKitTest, DeleteRemoteDeviceToken002, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2804,7 +2804,7 @@ HWTEST_F(AccessTokenKitTest, DeleteRemoteDeviceTokens001, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2866,7 +2866,7 @@ HWTEST_F(AccessTokenKitTest, DeleteRemoteDeviceTokens002, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2971,7 +2971,7 @@ HWTEST_F(AccessTokenKitTest, GetHapTokenInfoFromRemote002, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -3035,7 +3035,7 @@ HWTEST_F(AccessTokenKitTest, AllocLocalTokenID001, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
diff --git a/interfaces/kits/accesstoken/napi/include/napi_atmanager.h b/interfaces/kits/accesstoken/napi/include/napi_atmanager.h
index f6d444a78..04f07ca35 100644
--- a/interfaces/kits/accesstoken/napi/include/napi_atmanager.h
+++ b/interfaces/kits/accesstoken/napi/include/napi_atmanager.h
@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef NAPI_ATMANAGER_H_
-#define NAPI_ATMANAGER_H_
+#ifndef  INTERFACES_KITS_ACCESSTOKEN_NAPI_INCLUDE_NAPI_ATMANAGER_H_
+#define  INTERFACES_KITS_ACCESSTOKEN_NAPI_INCLUDE_NAPI_ATMANAGER_H_
 
 #include <pthread.h>
 #include <cstdio>
@@ -85,4 +85,4 @@ private:
  */
 static napi_value Init(napi_env env, napi_value exports);
 
-#endif /* NAPI_ATMANAGER_H_ */
+#endif /*  INTERFACES_KITS_ACCESSTOKEN_NAPI_INCLUDE_NAPI_ATMANAGER_H_ */
diff --git a/services/accesstokenmanager/main/cpp/include/permission/permission_policy_set.h b/services/accesstokenmanager/main/cpp/include/permission/permission_policy_set.h
index 38eb71d56..773153759 100644
--- a/services/accesstokenmanager/main/cpp/include/permission/permission_policy_set.h
+++ b/services/accesstokenmanager/main/cpp/include/permission/permission_policy_set.h
@@ -31,7 +31,7 @@ namespace Security {
 namespace AccessToken {
 struct PermissionPolicySet final {
 public:
-    PermissionPolicySet() : tokenId_(0) {};
+    PermissionPolicySet() : tokenId_(0) {}
     virtual ~PermissionPolicySet();
 
     static std::shared_ptr<PermissionPolicySet> BuildPermissionPolicySet(AccessTokenID tokenId,
diff --git a/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h b/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h
index 97aa044f0..0e7de0fb3 100644
--- a/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h
+++ b/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h
@@ -23,8 +23,8 @@ namespace Security {
 namespace AccessToken {
 struct PermissionValidator final {
 public:
-    PermissionValidator() {};
-    ~PermissionValidator() {};
+    PermissionValidator() {}
+    ~PermissionValidator() {}
 
     static bool IsPermissionNameValid(const std::string& permissionName);
     static bool IsPermissionFlagValid(int flag);
diff --git a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h
index e8ac7f2f8..0a379d044 100644
--- a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h
+++ b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h
@@ -72,6 +72,7 @@ public:
 #endif
 
     void DumpTokenInfo(std::string& dumpInfo) override;
+
 private:
     bool Initialize() const;
 
diff --git a/services/accesstokenmanager/main/cpp/include/token/native_token_receptor.h b/services/accesstokenmanager/main/cpp/include/token/native_token_receptor.h
index e2cad901f..d0180f065 100644
--- a/services/accesstokenmanager/main/cpp/include/token/native_token_receptor.h
+++ b/services/accesstokenmanager/main/cpp/include/token/native_token_receptor.h
@@ -37,7 +37,7 @@ public:
     int Init();
 
 private:
-    NativeTokenReceptor() : ready_(false) {};
+    NativeTokenReceptor() : ready_(false) {}
     DISALLOW_COPY_AND_MOVE(NativeTokenReceptor);
     int ReadCfgFile(std::string &nativeRawData);
     void FromJson(const nlohmann::json &jsonObject,
diff --git a/services/accesstokenmanager/main/cpp/include/token/token_modify_notifier.h b/services/accesstokenmanager/main/cpp/include/token/token_modify_notifier.h
index c884f37b2..1ad3aad4b 100644
--- a/services/accesstokenmanager/main/cpp/include/token/token_modify_notifier.h
+++ b/services/accesstokenmanager/main/cpp/include/token/token_modify_notifier.h
@@ -53,4 +53,3 @@ private:
 } // namespace Security
 } // namespace OHOS
 #endif // TOKEN_MODIFY_NOTIFIER_H
-
diff --git a/services/accesstokenmanager/main/cpp/src/database/data_storage.cpp b/services/accesstokenmanager/main/cpp/src/database/data_storage.cpp
index 01970dd1b..2d9f3e83e 100644
--- a/services/accesstokenmanager/main/cpp/src/database/data_storage.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/data_storage.cpp
@@ -26,4 +26,4 @@ DataStorage& DataStorage::GetRealDataStorage()
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/accesstokenmanager/main/cpp/src/database/generic_values.cpp b/services/accesstokenmanager/main/cpp/src/database/generic_values.cpp
index cc4804a5b..8ae83624a 100644
--- a/services/accesstokenmanager/main/cpp/src/database/generic_values.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/generic_values.cpp
@@ -70,4 +70,4 @@ std::vector<std::string> GenericValues::GetAllKeys() const
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/accesstokenmanager/main/cpp/src/database/sqlite_helper.cpp b/services/accesstokenmanager/main/cpp/src/database/sqlite_helper.cpp
index edeabdbfd..a01c5e5f6 100644
--- a/services/accesstokenmanager/main/cpp/src/database/sqlite_helper.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/sqlite_helper.cpp
@@ -185,4 +185,4 @@ std::string SqliteHelper::SpitError() const
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/accesstokenmanager/main/cpp/src/database/statement.cpp b/services/accesstokenmanager/main/cpp/src/database/statement.cpp
index 387138742..02b605afd 100644
--- a/services/accesstokenmanager/main/cpp/src/database/statement.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/statement.cpp
@@ -122,4 +122,4 @@ VariantValue Statement::GetValue(const int column) const
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/accesstokenmanager/main/cpp/src/database/variant_value.cpp b/services/accesstokenmanager/main/cpp/src/database/variant_value.cpp
index f849bbcc7..77f5c906e 100644
--- a/services/accesstokenmanager/main/cpp/src/database/variant_value.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/variant_value.cpp
@@ -58,4 +58,4 @@ std::string VariantValue::GetString() const
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
index eaf67ae7a..8d0efef89 100644
--- a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
+++ b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
@@ -334,4 +334,4 @@ std::string PermissionManager::TransferPermissionDefToString(const PermissionDef
 }
 } // namespace AccessToken
 } // namespace Security
-}
+} // namespace OHOS
diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
index 6eb08a9bd..0628e3370 100644
--- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
+++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
@@ -327,4 +327,4 @@ bool AccessTokenManagerService::Initialize() const
 }
 } // namespace AccessToken
 } // namespace Security
-}
+} // namespace OHOS
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 0d5c8916a..1bcbdda4f 100644
--- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
+++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
@@ -30,7 +30,7 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, SECURITY_DOMAIN_
 int32_t AccessTokenManagerStub::OnRemoteRequest(
     uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option)
 {
-    ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called, code: %{public}d", __func__, code);
+    ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called, code: %{public}u", __func__, code);
     std::u16string descriptor = data.ReadInterfaceToken();
     if (descriptor != IAccessTokenManager::GetDescriptor()) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "get unexpect descriptor: %{public}s", Str16ToStr8(descriptor).c_str());
diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp
index 1334c19ea..6310b3f34 100644
--- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp
+++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp
@@ -152,4 +152,3 @@ int AccessTokenRemoteTokenManager::RemoveDeviceMappingTokenID(const std::string&
 } // namespace AccessToken
 } // namespace Security
 } // namespace OHOS
-
diff --git a/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp b/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp
index 49ba60e8f..ca2c8c9b3 100644
--- a/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp
+++ b/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp
@@ -116,4 +116,3 @@ void TokenModifyNotifier::NotifyTokenChangedIfNeed()
 } // namespace AccessToken
 } // namespace Security
 } // namespace OHOS
-
diff --git a/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp b/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp
index 3755b9451..0a4f579db 100644
--- a/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp
+++ b/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-
 #include "native_token_receptor_test.h"
 
 #include <fcntl.h>
diff --git a/services/tokensyncmanager/include/common/constant.h b/services/tokensyncmanager/include/common/constant.h
index db8e50bf8..3a7d0d5e6 100644
--- a/services/tokensyncmanager/include/common/constant.h
+++ b/services/tokensyncmanager/include/common/constant.h
@@ -92,4 +92,4 @@ public:
 } // namespace AccessToken
 } // namespace Security
 } // namespace OHOS
-#endif // CONSTANT_H
\ No newline at end of file
+#endif // CONSTANT_H
diff --git a/services/tokensyncmanager/include/device/device_info.h b/services/tokensyncmanager/include/device/device_info.h
index 958aa0803..cfb567915 100644
--- a/services/tokensyncmanager/include/device/device_info.h
+++ b/services/tokensyncmanager/include/device/device_info.h
@@ -43,4 +43,4 @@ struct DeviceInfo {
 } // namespace Security
 } // namespace OHOS
 
-#endif // DEVICE_INFO_H
\ No newline at end of file
+#endif // DEVICE_INFO_H
diff --git a/services/tokensyncmanager/include/device/device_info_manager.h b/services/tokensyncmanager/include/device/device_info_manager.h
index b5be6c827..93cd63a47 100644
--- a/services/tokensyncmanager/include/device/device_info_manager.h
+++ b/services/tokensyncmanager/include/device/device_info_manager.h
@@ -101,4 +101,4 @@ public:
 } // namespace AccessToken
 } // namespace Security
 } // namespace OHOS
-#endif // DEVICE_INFO_MANAGER_H
\ No newline at end of file
+#endif // DEVICE_INFO_MANAGER_H
diff --git a/services/tokensyncmanager/include/device/device_info_repository.h b/services/tokensyncmanager/include/device/device_info_repository.h
index 319e76838..74f9d17ea 100644
--- a/services/tokensyncmanager/include/device/device_info_repository.h
+++ b/services/tokensyncmanager/include/device/device_info_repository.h
@@ -74,4 +74,4 @@ private:
 } // namespace AccessToken
 } // namespace Security
 } // namespace OHOS
-#endif // DEVICE_INFO_REPOSITORY_H
\ No newline at end of file
+#endif // DEVICE_INFO_REPOSITORY_H
diff --git a/services/tokensyncmanager/include/remote/rpc_channel.h b/services/tokensyncmanager/include/remote/rpc_channel.h
index c8f61456a..1fda21dfd 100644
--- a/services/tokensyncmanager/include/remote/rpc_channel.h
+++ b/services/tokensyncmanager/include/remote/rpc_channel.h
@@ -71,7 +71,7 @@ public:
      * @since 1.0
      * @version 1.0
      */
-    virtual void Release() {};
+    virtual void Release() {}
 };
 }  // namespace AccessToken
 }  // namespace Security
diff --git a/services/tokensyncmanager/src/device/device_info_manager.cpp b/services/tokensyncmanager/src/device/device_info_manager.cpp
index 1066ad455..e6c17ac4b 100644
--- a/services/tokensyncmanager/src/device/device_info_manager.cpp
+++ b/services/tokensyncmanager/src/device/device_info_manager.cpp
@@ -164,4 +164,4 @@ bool DeviceInfoManager::IsDeviceUniversallyUniqueId(const std::string &nodeId) c
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/tokensyncmanager/src/device/device_info_repository.cpp b/services/tokensyncmanager/src/device/device_info_repository.cpp
index ed457b295..d1fd62974 100644
--- a/services/tokensyncmanager/src/device/device_info_repository.cpp
+++ b/services/tokensyncmanager/src/device/device_info_repository.cpp
@@ -188,4 +188,4 @@ void DeviceInfoRepository::Clear()
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
index a71a1f7d2..21650d63f 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
@@ -252,7 +252,7 @@ int SoftBusChannel::Compress(const std::string &json, const unsigned char *compr
         return result;
     }
     ACCESSTOKEN_LOG_DEBUG(LABEL, "compress complete. compress %{public}d bytes to %{public}d", compressedLength,
-        (int) len);
+        (int)len);
     compressedLength = len;
     return Constant::SUCCESS;
 }
@@ -271,7 +271,7 @@ std::string SoftBusChannel::Decompress(const unsigned char *bytes, const int len
     if (result != Z_OK) {
         ACCESSTOKEN_LOG_ERROR(LABEL,
             "uncompress failed, error code: %{public}d, bound length: %{public}d, buffer length: %{public}d", result,
-            (int) len, length);
+            (int)len, length);
         delete[] buf;
         return "";
     }
@@ -324,9 +324,6 @@ int SoftBusChannel::CheckSessionMayReopenLocked()
 
 bool SoftBusChannel::IsSessionAvailable()
 {
-    if (session_ == Constant::INVALID_SESSION) {
-        return false;
-    }
     return session_ > Constant::INVALID_SESSION;
 }
 
diff --git a/services/tokensyncmanager/src/remote/soft_bus_session_listener.cpp b/services/tokensyncmanager/src/remote/soft_bus_session_listener.cpp
index e138da60a..f73d5d1d4 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_session_listener.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_session_listener.cpp
@@ -82,6 +82,7 @@ void SoftBusSessionListener::OnSessionClosed(int32_t session)
 
 void SoftBusSessionListener::OnMessageReceived(int32_t sessionId, const void *data, uint32_t dataLen)
 {
+    (void)data;
     ACCESSTOKEN_LOG_DEBUG(LABEL, "OnMessageReceived: data length = %{public}u", dataLen);
 }
 
diff --git a/services/tokensyncmanager/src/service/token_sync_manager_service.cpp b/services/tokensyncmanager/src/service/token_sync_manager_service.cpp
index 5a3c034b8..e318a95b0 100644
--- a/services/tokensyncmanager/src/service/token_sync_manager_service.cpp
+++ b/services/tokensyncmanager/src/service/token_sync_manager_service.cpp
@@ -195,4 +195,4 @@ bool TokenSyncManagerService::Initialize()
 }
 } // namespace AccessToken
 } // namespace Security
-}
+} // namespace OHOS
diff --git a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn
index 1a7ca56bf..34989d34b 100644
--- a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn
+++ b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp b/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp
index 51c4aa2aa..391402cb8 100644
--- a/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp
+++ b/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.h b/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.h
index 06e60116d..4fc0ebdbd 100644
--- a/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.h
+++ b/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/tools/accesstoken/include/atm_command.h b/tools/accesstoken/include/atm_command.h
index 922429d5a..d8617b51a 100644
--- a/tools/accesstoken/include/atm_command.h
+++ b/tools/accesstoken/include/atm_command.h
@@ -45,4 +45,4 @@ private:
 } // namespace Security
 } // namespace OHOS
 
-#endif // ACCESSTOKENMANAGER_COMMAND_H
\ No newline at end of file
+#endif // ACCESSTOKENMANAGER_COMMAND_H
diff --git a/tools/accesstoken/include/atm_receiver_impl.h b/tools/accesstoken/include/atm_receiver_impl.h
index 7bacf3f57..346830f75 100644
--- a/tools/accesstoken/include/atm_receiver_impl.h
+++ b/tools/accesstoken/include/atm_receiver_impl.h
@@ -40,4 +40,4 @@ private:
 } // namespace Security
 } // namespace OHOS
 
-#endif // ACCESSTOKENMANAGER_RECEIVER_IMPL_H
\ No newline at end of file
+#endif // ACCESSTOKENMANAGER_RECEIVER_IMPL_H
diff --git a/tools/accesstoken/src/atm_command.cpp b/tools/accesstoken/src/atm_command.cpp
index d5b1556ae..24a0a7eb2 100644
--- a/tools/accesstoken/src/atm_command.cpp
+++ b/tools/accesstoken/src/atm_command.cpp
@@ -37,12 +37,6 @@ ErrCode AtmCommand::CreateCommandMap()
 ErrCode AtmCommand::CreateMessageMap()
 {
     messageMap_ = {
-        // error + message
-        // currently there is no error to use
-        // {
-        //     AppExecFwk::IStatusReceiver::ERR_USER_REMOVE_FALIED,
-        //     "error: user remove failed.",
-        // },
     };
 
     return OHOS::ERR_OK;
@@ -76,4 +70,4 @@ ErrCode AtmCommand::RunAsDumpCommand()
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/tools/accesstoken/src/atm_receiver_impl.cpp b/tools/accesstoken/src/atm_receiver_impl.cpp
index 7d7333b96..3666b22d7 100644
--- a/tools/accesstoken/src/atm_receiver_impl.cpp
+++ b/tools/accesstoken/src/atm_receiver_impl.cpp
@@ -56,4 +56,4 @@ int32_t AtmReceiverImpl::GetResultCode() const
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
-- 
Gitee