diff --git a/BUILD.gn b/BUILD.gn
index 5ec5d0389bae1650357da8e4587734dfcad6ac8f..c838065740a691f29ba3ce8032dea5234ae93843 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2022 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/access_token.gni b/access_token.gni
index a6a6a3bd984692328e8a83390fe1d1207a9731d4..3d92eff5c87b4dbb35f7b33bd5ac394102cbe37d 100644
--- a/access_token.gni
+++ b/access_token.gni
@@ -1,4 +1,4 @@
-# Copyright (C) 2022 Huawei Device Co., Ltd.
+# Copyright (c) 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
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 if (!defined(global_parts_info) ||
     defined(global_parts_info.distributedhardware_device_manager_base)) {
diff --git a/frameworks/accesstoken/include/hap_policy_parcel.h b/frameworks/accesstoken/include/hap_policy_parcel.h
index dc412e4776f3f1aacfea40da9506dfff5ce9608a..43562c09cefb46db268b65fa7e84019af4ace66f 100644
--- a/frameworks/accesstoken/include/hap_policy_parcel.h
+++ b/frameworks/accesstoken/include/hap_policy_parcel.h
@@ -20,7 +20,6 @@
 #include "permission_def_parcel.h"
 #include "permission_state_full_parcel.h"
 
-
 namespace OHOS {
 namespace Security {
 namespace AccessToken {
diff --git a/interfaces/innerkits/accesstoken/BUILD.gn b/interfaces/innerkits/accesstoken/BUILD.gn
index 17346a945f1e7e02f1c32b8a06340b53796eb804..dba0ef361891be52141a0121bbf152f00ae5f119 100644
--- a/interfaces/innerkits/accesstoken/BUILD.gn
+++ b/interfaces/innerkits/accesstoken/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2022 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/interfaces/innerkits/accesstoken/test/BUILD.gn b/interfaces/innerkits/accesstoken/test/BUILD.gn
index a64bae599dd1cfdbe182e2800b1ddbb02313b158..55ed6e19f592c64d3b1c4d9b7ba9d5f8862d35c8 100644
--- a/interfaces/innerkits/accesstoken/test/BUILD.gn
+++ b/interfaces/innerkits/accesstoken/test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2022 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/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
index f481a593ee24c16665374123fb280e86dae2537a..4e45faf9d6614caf4cc66f4e4f80ada3d8265e3a 100644
--- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
+++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
@@ -1855,7 +1855,7 @@ HWTEST_F(AccessTokenKitTest, UpdateHapToken007, TestSize.Level1)
     GTEST_LOG_(INFO) << "tokenID :" << tokenID;
 
     PermissionDef permDefResult;
-    /* check permission define befor update */
+    /* check permission define before update */
     ret = AccessTokenKit::GetDefPermission("ohos.permission.test3", permDefResult);
     ASSERT_EQ(RET_FAILED, ret);
 
@@ -1897,7 +1897,7 @@ HWTEST_F(AccessTokenKitTest, UpdateHapToken008, TestSize.Level1)
     GTEST_LOG_(INFO) << "tokenID :" << tokenID;
 
     PermissionDef permDefResult;
-    /* check permission define befor update */
+    /* check permission define before update */
     ret = AccessTokenKit::GetDefPermission(g_infoManagerTestPolicyPrams.permList[0].permissionName, permDefResult);
     ASSERT_EQ(g_infoManagerTestPolicyPrams.permList[0].permissionName, permDefResult.permissionName);
     ASSERT_EQ("label", permDefResult.label);
diff --git a/interfaces/innerkits/nativetoken/BUILD.gn b/interfaces/innerkits/nativetoken/BUILD.gn
index 58d197aea1de9f5a85529ef9e073de179dbac8ea..5ef3d0a76e324f2cdd8b2fc57c85c0b575aae56e 100644
--- a/interfaces/innerkits/nativetoken/BUILD.gn
+++ b/interfaces/innerkits/nativetoken/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2022 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/interfaces/innerkits/nativetoken/src/nativetoken.c b/interfaces/innerkits/nativetoken/src/nativetoken.c
index ba115e24dcfedff529ab7005804849183ae3c289..7ce4c8b8212dadea90b71adea9b49dab37a1c87e 100644
--- a/interfaces/innerkits/nativetoken/src/nativetoken.c
+++ b/interfaces/innerkits/nativetoken/src/nativetoken.c
@@ -241,6 +241,7 @@ static int32_t CreateCfgFile(void)
         return ATRET_FAILED;
     }
     close(fd);
+    fd = -1;
 
     struct stat buf;
     if (stat(TOKEN_ID_CFG_DIR_PATH, &buf) != 0) {
@@ -292,6 +293,7 @@ static int GetRandomTokenId(uint32_t *randNum)
     }
     len = read(fd, &random, sizeof(random));
     (void)close(fd);
+
     if (len != sizeof(random)) {
         ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:read failed.", __func__);
         return ATRET_FAILED;
diff --git a/interfaces/innerkits/nativetoken/test/BUILD.gn b/interfaces/innerkits/nativetoken/test/BUILD.gn
index 16f2b96b3170a369d3bd26ea9dbb74b1643418cc..ca884c8a06ef4bab390ee2d256e34d484f1c7dd3 100644
--- a/interfaces/innerkits/nativetoken/test/BUILD.gn
+++ b/interfaces/innerkits/nativetoken/test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2022 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/interfaces/innerkits/token_setproc/BUILD.gn b/interfaces/innerkits/token_setproc/BUILD.gn
index edbdb874b4bf76d6246b25a5b554b99045cbcf12..72adb4346a3042db59e215562da24c618310542b 100644
--- a/interfaces/innerkits/token_setproc/BUILD.gn
+++ b/interfaces/innerkits/token_setproc/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2022 Huawei Device Co., Ltd.
+# Copyright (c) 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/interfaces/innerkits/token_setproc/test/BUILD.gn b/interfaces/innerkits/token_setproc/test/BUILD.gn
index 50eeb5261ee22de007f3cd4d34360585c5823176..b6e11d2adb3e0c6c8d408b41e7f2908259da3981 100644
--- a/interfaces/innerkits/token_setproc/test/BUILD.gn
+++ b/interfaces/innerkits/token_setproc/test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2022 Huawei Device Co., Ltd.
+# Copyright (c) 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/interfaces/innerkits/tokensync/BUILD.gn b/interfaces/innerkits/tokensync/BUILD.gn
index 20df0ec3255ef896a951340304d1b213b6ebdcff..c4634b55f0151bd10216c02dc2b6ae589895401d 100644
--- a/interfaces/innerkits/tokensync/BUILD.gn
+++ b/interfaces/innerkits/tokensync/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2022 Huawei Device Co., Ltd.
+# Copyright (c) 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/interfaces/innerkits/tokensync/test/BUILD.gn b/interfaces/innerkits/tokensync/test/BUILD.gn
index fd5e262678ce2b168df126ed7234a84120c74dad..30d164b865ff7504f9b5a976503b01d3fb01d9c9 100644
--- a/interfaces/innerkits/tokensync/test/BUILD.gn
+++ b/interfaces/innerkits/tokensync/test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2022 Huawei Device Co., Ltd.
+# Copyright (c) 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
@@ -22,8 +22,6 @@ ohos_unittest("libtokensync_sdk_test") {
     "//utils/native/base/include",
     "//third_party/googletest/include",
     "//base/security/access_token/interfaces/innerkits/tokensync/include",
-
-    #"//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk/main/cpp/include/permission/",
     "//base/security/access_token/interfaces/innerkits/accesstoken/include",
   ]
 
diff --git a/services/accesstokenmanager/access_token.rc b/services/accesstokenmanager/access_token.rc
index 481f379ac48282dbf8c8d7cfdfecfefbde900fe4..2194d40d5d5ed0afc87aa12a0f1b730999bb5f9d 100644
--- a/services/accesstokenmanager/access_token.rc
+++ b/services/accesstokenmanager/access_token.rc
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2022 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/accesstokenmanager/main/cpp/include/token/native_token_info_inner.h b/services/accesstokenmanager/main/cpp/include/token/native_token_info_inner.h
index e6b1b793dc5880712ab37c90fe6d38fe12f2c108..72f5b2e7cdd505328e2bd6456e6b5ee7d2e97a42 100644
--- a/services/accesstokenmanager/main/cpp/include/token/native_token_info_inner.h
+++ b/services/accesstokenmanager/main/cpp/include/token/native_token_info_inner.h
@@ -31,6 +31,7 @@ static const std::string JSON_VERSION = "version";
 static const std::string JSON_TOKEN_ID = "tokenId";
 static const std::string JSON_TOKEN_ATTR = "tokenAttr";
 static const std::string JSON_DCAPS = "dcaps";
+static const int MAX_DCAPS_NUM = 32;
 
 class NativeTokenInfoInner final {
 public:
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 d0180f065ac4c267ee887c38f183beff485ccfa0..9917e5e57f3058b532ed1bd248441018a6af6dfe 100644
--- a/services/accesstokenmanager/main/cpp/include/token/native_token_receptor.h
+++ b/services/accesstokenmanager/main/cpp/include/token/native_token_receptor.h
@@ -42,7 +42,7 @@ private:
     int ReadCfgFile(std::string &nativeRawData);
     void FromJson(const nlohmann::json &jsonObject,
         std::vector<std::shared_ptr<NativeTokenInfoInner>>& tokenInfos);
-    void ParserNativeRawData(const std::string& nativeRawData,
+    int32_t ParserNativeRawData(const std::string& nativeRawData,
         std::vector<std::shared_ptr<NativeTokenInfoInner>>& tokenInfos);
     void from_json(const nlohmann::json& j, NativeTokenInfo& p);
 
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 094198a2bf7fde62dad3495d73d4b39df9d25a14..3d88bb7638af48a1d008101dbdc0dea26059828c 100644
--- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
+++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
@@ -144,7 +144,7 @@ void AccessTokenManagerStub::GetSelfPermissionsStateInner(MessageParcel& data, M
 void AccessTokenManagerStub::GetPermissionFlagInner(MessageParcel& data, MessageParcel& reply)
 {
     unsigned int callingTokenID = IPCSkeleton::GetCallingTokenID();
-    ACCESSTOKEN_LOG_INFO(LABEL, "callingTokenID: %{public}d", callingTokenID);
+    ACCESSTOKEN_LOG_INFO(LABEL, "callingTokenID: %{public}u", callingTokenID);
     AccessTokenID tokenID = data.ReadUint32();
     std::string permissionName = data.ReadString();
     if (!IsAuthorizedCalling() &&
diff --git a/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp b/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp
index 3810056789d2d5cad9cb693d19fb698b53450abe..7fef139d900a5b72fcce88d3e508050c38f809a1 100644
--- a/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp
+++ b/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp
@@ -83,22 +83,30 @@ void from_json(const nlohmann::json& j, std::shared_ptr<NativeTokenInfoInner>& p
 
     if (j.find(JSON_DCAPS) != j.end()) {
         native.dcap = j.at(JSON_DCAPS).get<std::vector<std::string>>();
+        if (native.dcap.size() > MAX_DCAPS_NUM) {
+            return;
+        }
     } else {
         return;
     }
     p = std::make_shared<NativeTokenInfoInner>(native);
 }
 
-void NativeTokenReceptor::ParserNativeRawData(const std::string& nativeRawData,
+int32_t NativeTokenReceptor::ParserNativeRawData(const std::string& nativeRawData,
     std::vector<std::shared_ptr<NativeTokenInfoInner>>& tokenInfos)
 {
     nlohmann::json jsonRes = nlohmann::json::parse(nativeRawData, nullptr, false);
+    if (jsonRes.is_discarded()) {
+        ACCESSTOKEN_LOG_ERROR(LABEL, "jsonRes is invalid.");
+        return RET_FAILED;
+    }
     for (auto it = jsonRes.begin(); it != jsonRes.end(); it++) {
         auto token = it->get<std::shared_ptr<NativeTokenInfoInner>>();
         if (token != nullptr) {
             tokenInfos.emplace_back(token);
         }
     }
+    return RET_SUCCESS;
 }
 
 int NativeTokenReceptor::ReadCfgFile(std::string& nativeRawData)
@@ -155,7 +163,11 @@ int NativeTokenReceptor::Init()
         return RET_FAILED;
     }
     std::vector<std::shared_ptr<NativeTokenInfoInner>> tokenInfos;
-    ParserNativeRawData(nativeRawData, tokenInfos);
+    ret = ParserNativeRawData(nativeRawData, tokenInfos);
+    if (ret != RET_SUCCESS) {
+        ACCESSTOKEN_LOG_ERROR(LABEL, "ParserNativeRawData failed.");
+        return RET_FAILED;
+    }
     AccessTokenInfoManager::GetInstance().ProcessNativeTokenInfos(tokenInfos);
 
     ready_ = true;
diff --git a/services/accesstokenmanager/main/sa_profile/3503.xml b/services/accesstokenmanager/main/sa_profile/3503.xml
index f1746070219d37110bd7d66ee23b38e63d6d03ce..b56ef03802610b5c99414eea9ea5d5d381556f79 100644
--- a/services/accesstokenmanager/main/sa_profile/3503.xml
+++ b/services/accesstokenmanager/main/sa_profile/3503.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021-2022 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/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp b/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp
index 0a4f579dbefad490b0156c4350c54490dc304906..28218f8f6cc6bb345cd6f125286ab58b5c5b1306 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
@@ -385,7 +385,7 @@ HWTEST_F(NativeTokenReceptorTest, ProcessNativeTokenInfos003, TestSize.Level1)
 
 /**
  * @tc.name: ProcessNativeTokenInfos004
- * @tc.desc: test add repeat id, but process doesnt
+ * @tc.desc: test add repeat id, but process doesn't
  * @tc.type: FUNC
  * @tc.require: Issue Number
  */
@@ -436,7 +436,7 @@ HWTEST_F(NativeTokenReceptorTest, ProcessNativeTokenInfos004, TestSize.Level1)
 
 /**
  * @tc.name: ProcessNativeTokenInfos005
- * @tc.desc: test add repeat process, but id doesnt
+ * @tc.desc: test add repeat process, but id doesn't
  * @tc.type: FUNC
  * @tc.require: Issue Number
  */
diff --git a/services/tokensyncmanager/include/command/sync_remote_hap_token_command.h b/services/tokensyncmanager/include/command/sync_remote_hap_token_command.h
index 3783c0c9c96b850c18cf5cef8b484a420faed172..14df3a21c9ca4d01f370ddd213ea300fa1692c76 100644
--- a/services/tokensyncmanager/include/command/sync_remote_hap_token_command.h
+++ b/services/tokensyncmanager/include/command/sync_remote_hap_token_command.h
@@ -40,7 +40,7 @@ public:
     std::string ToJsonPayload() override;
 
     SyncRemoteHapTokenCommand(const std::string &json);
-    SyncRemoteHapTokenCommand(    const std::string &srcDeviceId,
+    SyncRemoteHapTokenCommand(const std::string &srcDeviceId,
         const std::string &dstDeviceId, AccessTokenID id);
     virtual ~SyncRemoteHapTokenCommand() = default;
 
diff --git a/services/tokensyncmanager/include/device/device_info.h b/services/tokensyncmanager/include/device/device_info.h
index cfb567915fe40001b8c9d872b696b64e97e08166..a57c77fe43b04c68d5fb291846953ade37908782 100644
--- a/services/tokensyncmanager/include/device/device_info.h
+++ b/services/tokensyncmanager/include/device/device_info.h
@@ -31,7 +31,7 @@ enum DeviceIdType {
 struct DeviceId {
     std::string networkId;
     std::string universallyUniqueId;
-    std::string uniqueDisabilityId;
+    std::string uniqueDeviceId;
 };
 
 struct DeviceInfo {
diff --git a/services/tokensyncmanager/include/device/device_info_manager.h b/services/tokensyncmanager/include/device/device_info_manager.h
index 93cd63a4716a4ae0873aeb207ab0b43215b0e7ce..1008a1b0868a4d23e7ed1c0fd20687130eb573f6 100644
--- a/services/tokensyncmanager/include/device/device_info_manager.h
+++ b/services/tokensyncmanager/include/device/device_info_manager.h
@@ -37,7 +37,8 @@ public:
      *
      * @param nodeId Device id.
      * @param deviceIdType Device id type {@link DeviceIdType}
-     * @return Optional deviceInfo
+     * @param deviceInfo Optional deviceInfo.
+     * @return True for success, false otherwise.
      */
     bool GetDeviceInfo(const std::string &nodeId, DeviceIdType deviceIdType, DeviceInfo &deviceInfo) const;
 
@@ -55,12 +56,12 @@ public:
      *
      * @param networkId Device networkId.
      * @param universallyUniqueId Device uuid.
-     * @param uniqueDisabilityId Device udid.
+     * @param uniqueDeviceId Device udid.
      * @param deviceName Device name.
      * @param deviceType Device type.
      */
     void AddDeviceInfo(const std::string &networkId, const std::string &universallyUniqueId,
-        const std::string &uniqueDisabilityId, const std::string &deviceName, const std::string &deviceType);
+        const std::string &uniqueDeviceId, const std::string &deviceName, const std::string &deviceType);
 
     /**
      * Remote all device info.
@@ -71,6 +72,7 @@ public:
      * Remove one device info.
      *
      * @param nodeId Device id.
+     * @param deviceIdType Device id type {@link DeviceIdType}
      */
     void RemoveRemoteDeviceInfo(const std::string &nodeId, DeviceIdType deviceIdType);
 
@@ -88,7 +90,7 @@ public:
      * @param nodeId which is considered as indefinite id, maybe deviceId(UDID) or networkId.
      * @return The deviceId if local or device online, otherwise return empty string.
      */
-    std::string ConvertToUniqueDisabilityIdOrFetch(const std::string &nodeId) const;
+    std::string ConvertToUniqueDeviceIdOrFetch(const std::string &nodeId) const;
 
     /**
      * Check nodeId is uuid or not.
diff --git a/services/tokensyncmanager/include/device/device_info_repository.h b/services/tokensyncmanager/include/device/device_info_repository.h
index 74f9d17eabe29644e3e307202056699e4aae6bff..a617e757c6ebcceb56a0fc5cb39b10809d439aec 100644
--- a/services/tokensyncmanager/include/device/device_info_repository.h
+++ b/services/tokensyncmanager/include/device/device_info_repository.h
@@ -42,7 +42,7 @@ public:
     void SaveDeviceInfo(const DeviceId deviceId, const std::string &deviceName, const std::string &deviceType);
 
     void SaveDeviceInfo(const std::string &networkId, const std::string &universallyUniqueId,
-        const std::string &uniqueDisabilityId, const std::string &deviceName, const std::string &deviceType);
+        const std::string &uniqueDeviceId, const std::string &deviceName, const std::string &deviceType);
 
     void DeleteDeviceInfo(const std::string &nodeId, const DeviceIdType type);
 
@@ -57,7 +57,7 @@ private:
 
     bool FindDeviceIdByUniversallyUniqueIdLocked(const std::string &universallyUniqueId, DeviceId &deviceId) const;
 
-    bool FindDeviceIdByUniqueDisabilityIdLocked(const std::string &uniqueDisabilityId, DeviceId &deviceId) const;
+    bool FindDeviceIdByUniqueDeviceIdLocked(const std::string &uniqueDeviceId, DeviceId &deviceId) const;
 
     void DeleteDeviceInfoByDeviceIdLocked(const DeviceId deviceId);
 
@@ -65,7 +65,7 @@ private:
 
     std::map<std::string, DeviceId> deviceIdMapByUniversallyUniqueId_;
 
-    std::map<std::string, DeviceId> deviceIdMapByUniqueDisabilityId_;
+    std::map<std::string, DeviceId> deviceIdMapByUniqueDeviceId_;
 
     std::map<std::string, DeviceInfo> deviceInfoMap_;
 
diff --git a/services/tokensyncmanager/include/remote/remote_command_manager.h b/services/tokensyncmanager/include/remote/remote_command_manager.h
index b40619eda8fb6f8ee8de48946e8d6d2e5001ae26..c1249a76cb074f7fee6cd35d1ee254ea73272c62 100644
--- a/services/tokensyncmanager/include/remote/remote_command_manager.h
+++ b/services/tokensyncmanager/include/remote/remote_command_manager.h
@@ -149,7 +149,7 @@ private:
     std::mutex mutex_;
 
     /**
-     * @brief Fetch a executor from executors buffer. If not found, create one and cache it to buffer.
+     * @brief Fetch an executor from executors buffer. If not found, create one and cache it to buffer.
      *
      * @param nodeId The udid of a device which you want to get executor.
      * @see void
diff --git a/services/tokensyncmanager/include/remote/soft_bus_manager.h b/services/tokensyncmanager/include/remote/soft_bus_manager.h
index 0cbfd84eacdada87ed2137f1190069ce6ca3a2e8..4a4a5bc7736c7224477432b96748185a0de0b8e2 100644
--- a/services/tokensyncmanager/include/remote/soft_bus_manager.h
+++ b/services/tokensyncmanager/include/remote/soft_bus_manager.h
@@ -99,7 +99,7 @@ public:
      * @since 1.0
      * @version 1.0
      */
-    std::string GetUniqueDisabilityIdByNodeId(const std::string &deviceNodeId);
+    std::string GetUniqueDeviceIdByNodeId(const std::string &deviceNodeId);
 
 public:
     static const std::string SESSION_NAME;
diff --git a/services/tokensyncmanager/include/remote/soft_bus_session_listener.h b/services/tokensyncmanager/include/remote/soft_bus_session_listener.h
index 1b0a1f69a929dc7bf402ef14f89a7a39fa6e8dd7..9912d9077c7eb03019add734386fec8824d978a8 100644
--- a/services/tokensyncmanager/include/remote/soft_bus_session_listener.h
+++ b/services/tokensyncmanager/include/remote/soft_bus_session_listener.h
@@ -96,6 +96,7 @@ public:
 
     static const int64_t STATE_OPENING = -1;
     static const int64_t STATE_NOTFOUND = -2;
+    static const int64_t MAX_ONBYTES_RECEIVED_DATA_LEN = 1024 * 1024 * 10;
 
 private:
     /**
diff --git a/services/tokensyncmanager/include/service/token_sync_manager_service.h b/services/tokensyncmanager/include/service/token_sync_manager_service.h
index 6209899741352ea7a7de82393b619c05163bfaad..0a796dbaf40c26d5d95fbc419562bf7d95f31a7f 100644
--- a/services/tokensyncmanager/include/service/token_sync_manager_service.h
+++ b/services/tokensyncmanager/include/service/token_sync_manager_service.h
@@ -39,8 +39,8 @@ public:
     void OnStart() override;
     void OnStop() override;
 
-    std::shared_ptr<TokenSyncEventHandler> GetSendEventHandler();
-    std::shared_ptr<TokenSyncEventHandler> GetRecvEventHandler();
+    std::shared_ptr<TokenSyncEventHandler> GetSendEventHandler() const;
+    std::shared_ptr<TokenSyncEventHandler> GetRecvEventHandler() const;
     int GetRemoteHapTokenInfo(const std::string& deviceID, AccessTokenID tokenID) override;
     int DeleteRemoteHapTokenInfo(AccessTokenID tokenID) override;
     int UpdateRemoteHapTokenInfo(const HapTokenInfoForSync& tokenInfo) override;
diff --git a/services/tokensyncmanager/sa_profile/3504.xml b/services/tokensyncmanager/sa_profile/3504.xml
index 87a9f697daaad8301de366567b208d6937dfbc2d..4293f14528a95669adeaa0f2127cf87a50216c9b 100644
--- a/services/tokensyncmanager/sa_profile/3504.xml
+++ b/services/tokensyncmanager/sa_profile/3504.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021-2022 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/src/command/base_remote_command.cpp b/services/tokensyncmanager/src/command/base_remote_command.cpp
index 3b7cce5a4b4a29f789446437c9cec986d7db6166..8b66297cd023e576e7ba23cbeb16874f44047712 100644
--- a/services/tokensyncmanager/src/command/base_remote_command.cpp
+++ b/services/tokensyncmanager/src/command/base_remote_command.cpp
@@ -223,7 +223,7 @@ void BaseRemoteCommand::FromHapTokenInfoJson(const nlohmann::json& hapTokenJson,
 {
     FromHapTokenBasicInfoJson(hapTokenJson, hapTokenInfo.baseInfo);
     if (hapTokenInfo.baseInfo.tokenID == 0) {
-        ACCESSTOKEN_LOG_INFO(LABEL, "Hap token basic info is error.");
+        ACCESSTOKEN_LOG_ERROR(LABEL, "Hap token basic info is error.");
         return;
     }
     FromPermStateListJson(hapTokenJson, hapTokenInfo.permStateList);
diff --git a/services/tokensyncmanager/src/command/delete_remote_token_command.cpp b/services/tokensyncmanager/src/command/delete_remote_token_command.cpp
index 57808a7c6c258bea4599311aa4ff3ce3fcadc0e4..a64e5d95c287a8d28809ba0a61af558bf3541950 100644
--- a/services/tokensyncmanager/src/command/delete_remote_token_command.cpp
+++ b/services/tokensyncmanager/src/command/delete_remote_token_command.cpp
@@ -55,6 +55,10 @@ DeleteRemoteTokenCommand::DeleteRemoteTokenCommand(const std::string& json)
 std::string DeleteRemoteTokenCommand::ToJsonPayload()
 {
     nlohmann::json j = BaseRemoteCommand::ToRemoteProtocolJson();
+    if (j.is_discarded()) {
+        ACCESSTOKEN_LOG_ERROR(LABEL, "j is invalid.");
+        return "";
+    }
     j["tokenId"] = deleteTokenId_;
     return j.dump();
 }
@@ -63,7 +67,7 @@ void DeleteRemoteTokenCommand::Prepare()
 {
     remoteProtocol_.statusCode = Constant::SUCCESS;
     remoteProtocol_.message = Constant::COMMAND_RESULT_SUCCESS;
-    ACCESSTOKEN_LOG_DEBUG(LABEL, "end as: DeleteRemoteTokenCommand");
+    ACCESSTOKEN_LOG_INFO(LABEL, "end as: DeleteRemoteTokenCommand");
 }
 
 void DeleteRemoteTokenCommand::Execute()
diff --git a/services/tokensyncmanager/src/device/device_info_manager.cpp b/services/tokensyncmanager/src/device/device_info_manager.cpp
index e6c17ac4ba953f6f6646bc9e05c077b4d8952adf..2c21af2a1ce24ba2f21c355b735f18f9919144a2 100644
--- a/services/tokensyncmanager/src/device/device_info_manager.cpp
+++ b/services/tokensyncmanager/src/device/device_info_manager.cpp
@@ -40,15 +40,16 @@ bool DeviceInfoManager::ExistDeviceInfo(const std::string &nodeId, DeviceIdType
 }
 
 void DeviceInfoManager::AddDeviceInfo(const std::string &networkId, const std::string &universallyUniqueId,
-    const std::string &uniqueDisabilityId, const std::string &deviceName, const std::string &deviceType)
+    const std::string &uniqueDeviceId, const std::string &deviceName, const std::string &deviceType)
 {
     if (!DataValidator::IsDeviceIdValid(networkId) ||
         !DataValidator::IsDeviceIdValid(universallyUniqueId) ||
-        !DataValidator::IsDeviceIdValid(uniqueDisabilityId) || deviceName.empty() || deviceType.empty()) {
+        !DataValidator::IsDeviceIdValid(uniqueDeviceId) || deviceName.empty() || deviceType.empty()) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "addDeviceInfo: input param is invalid");
+        return;
     }
     DeviceInfoRepository::GetInstance().SaveDeviceInfo(
-        networkId, universallyUniqueId, uniqueDisabilityId, deviceName, deviceType);
+        networkId, universallyUniqueId, uniqueDeviceId, deviceName, deviceType);
 }
 
 void DeviceInfoManager::RemoveAllRemoteDeviceInfo()
@@ -71,7 +72,7 @@ void DeviceInfoManager::RemoveRemoteDeviceInfo(const std::string &nodeId, Device
         char deviceIdCharArray[Constant::DEVICE_UUID_LENGTH] = {0};
         GetDevUdid(deviceIdCharArray, Constant::DEVICE_UUID_LENGTH);
         if (DeviceInfoRepository::GetInstance().FindDeviceInfo(nodeId, deviceIdType, deviceInfo)) {
-            if (deviceInfo.deviceId.uniqueDisabilityId != deviceIdCharArray) {
+            if (deviceInfo.deviceId.uniqueDeviceId != deviceIdCharArray) {
                 DeviceInfoRepository::GetInstance().DeleteDeviceInfo(nodeId, deviceIdType);
             }
         }
@@ -86,32 +87,33 @@ std::string DeviceInfoManager::ConvertToUniversallyUniqueIdOrFetch(const std::st
         return result;
     }
     DeviceInfo deviceInfo;
-    if (DeviceInfoRepository::GetInstance().FindDeviceInfo(nodeId, DeviceIdType::UNKNOWN, deviceInfo)) {
-        std::string universallyUniqueId = deviceInfo.deviceId.universallyUniqueId;
-        if (universallyUniqueId.empty()) {
-            std::string udid = SoftBusManager::GetInstance().GetUniversallyUniqueIdByNodeId(nodeId);
-            if (!udid.empty()) {
-                result = udid;
-            }
-        } else {
-            result = universallyUniqueId;
-        }
+    if (!(DeviceInfoRepository::GetInstance().FindDeviceInfo(nodeId, DeviceIdType::UNKNOWN, deviceInfo))) {
+        return result;
+    }
+    std::string universallyUniqueId = deviceInfo.deviceId.universallyUniqueId;
+    if (!universallyUniqueId.empty()) {
+        result = universallyUniqueId;
+        return result;
+    }
+    std::string udid = SoftBusManager::GetInstance().GetUniversallyUniqueIdByNodeId(nodeId);
+    if (!udid.empty()) {
+        result = udid;
     }
     return result;
 }
 
-std::string DeviceInfoManager::ConvertToUniqueDisabilityIdOrFetch(const std::string &nodeId) const
+std::string DeviceInfoManager::ConvertToUniqueDeviceIdOrFetch(const std::string &nodeId) const
 {
     std::string result;
     if (!DataValidator::IsDeviceIdValid(nodeId)) {
-        ACCESSTOKEN_LOG_ERROR(LABEL, "ConvertToUniqueDisabilityIdOrFetch: nodeId is invalid.");
+        ACCESSTOKEN_LOG_ERROR(LABEL, "ConvertToUniqueDeviceIdOrFetch: nodeId is invalid.");
         return result;
     }
     DeviceInfo deviceInfo;
     if (DeviceInfoRepository::GetInstance().FindDeviceInfo(nodeId, DeviceIdType::UNKNOWN, deviceInfo)) {
-        std::string uniqueDisabilityId = deviceInfo.deviceId.uniqueDisabilityId;
-        if (uniqueDisabilityId.empty()) {
-            std::string udid = SoftBusManager::GetInstance().GetUniqueDisabilityIdByNodeId(nodeId);
+        std::string uniqueDeviceId = deviceInfo.deviceId.uniqueDeviceId;
+        if (uniqueDeviceId.empty()) {
+            std::string udid = SoftBusManager::GetInstance().GetUniqueDeviceIdByNodeId(nodeId);
             if (!udid.empty()) {
                 result = udid;
             } else {
@@ -123,7 +125,7 @@ std::string DeviceInfoManager::ConvertToUniqueDisabilityIdOrFetch(const std::str
             ACCESSTOKEN_LOG_DEBUG(LABEL,
                 "FindDeviceInfo succeed, udid is empty, nodeId(%{public}s) ",
                 Constant::EncryptDevId(nodeId).c_str());
-            result = uniqueDisabilityId;
+            result = uniqueDeviceId;
         }
     } else {
         ACCESSTOKEN_LOG_DEBUG(
@@ -141,7 +143,7 @@ std::string DeviceInfoManager::ConvertToUniqueDisabilityIdOrFetch(const std::str
                 Constant::EncryptDevId(info.deviceId.networkId).c_str());
             ACCESSTOKEN_LOG_DEBUG(LABEL,
                 ">>> DeviceInfoRepository device udid: %{public}s",
-                Constant::EncryptDevId(info.deviceId.uniqueDisabilityId).c_str());
+                Constant::EncryptDevId(info.deviceId.uniqueDeviceId).c_str());
             ACCESSTOKEN_LOG_DEBUG(LABEL,
                 ">>> DeviceInfoRepository device uuid: %{public}s",
                 Constant::EncryptDevId(info.deviceId.universallyUniqueId).c_str());
diff --git a/services/tokensyncmanager/src/device/device_info_repository.cpp b/services/tokensyncmanager/src/device/device_info_repository.cpp
index d1fd6297491b05427e110aac727b68698e8d50fe..e3c652cf4f49f3b52e35694298d4111aab71689b 100644
--- a/services/tokensyncmanager/src/device/device_info_repository.cpp
+++ b/services/tokensyncmanager/src/device/device_info_repository.cpp
@@ -58,13 +58,13 @@ bool DeviceInfoRepository::FindDeviceIdByNodeIdLocked(
     } else if (type == DeviceIdType::UNIVERSALLY_UNIQUE_ID) {
         return FindDeviceIdByUniversallyUniqueIdLocked(nodeId, deviceId);
     } else if (type == DeviceIdType::UNIQUE_DISABILITY_ID) {
-        return FindDeviceIdByUniqueDisabilityIdLocked(nodeId, deviceId);
+        return FindDeviceIdByUniqueDeviceIdLocked(nodeId, deviceId);
     } else if (type == DeviceIdType::UNKNOWN) {
         if (FindDeviceIdByNetworkIdLocked(nodeId, deviceId)) {
             return true;
         } else if (FindDeviceIdByUniversallyUniqueIdLocked(nodeId, deviceId)) {
             return true;
-        } else if (FindDeviceIdByUniqueDisabilityIdLocked(nodeId, deviceId)) {
+        } else if (FindDeviceIdByUniqueDeviceIdLocked(nodeId, deviceId)) {
             return true;
         }
         return false;
@@ -75,7 +75,7 @@ bool DeviceInfoRepository::FindDeviceIdByNodeIdLocked(
 
 bool DeviceInfoRepository::FindDeviceInfoByDeviceIdLocked(const DeviceId deviceId, DeviceInfo &deviceInfo) const
 {
-    std::string deviceInfoKey = deviceId.networkId + deviceId.universallyUniqueId + deviceId.uniqueDisabilityId;
+    std::string deviceInfoKey = deviceId.networkId + deviceId.universallyUniqueId + deviceId.uniqueDeviceId;
     if (deviceInfoMap_.count(deviceInfoKey) > 0) {
         deviceInfo = deviceInfoMap_.at(deviceInfoKey);
         return true;
@@ -102,11 +102,11 @@ bool DeviceInfoRepository::FindDeviceIdByUniversallyUniqueIdLocked(
     return false;
 }
 
-bool DeviceInfoRepository::FindDeviceIdByUniqueDisabilityIdLocked(
-    const std::string &uniqueDisabilityId, DeviceId &deviceId) const
+bool DeviceInfoRepository::FindDeviceIdByUniqueDeviceIdLocked(
+    const std::string &uniqueDeviceId, DeviceId &deviceId) const
 {
-    if (deviceIdMapByUniqueDisabilityId_.count(uniqueDisabilityId) > 0) {
-        deviceId = deviceIdMapByUniqueDisabilityId_.at(uniqueDisabilityId);
+    if (deviceIdMapByUniqueDeviceId_.count(uniqueDeviceId) > 0) {
+        deviceId = deviceIdMapByUniqueDeviceId_.at(uniqueDeviceId);
         return true;
     }
     return false;
@@ -117,7 +117,7 @@ void DeviceInfoRepository::DeleteAllDeviceInfoExceptOne(const DeviceInfo deviceI
     std::lock_guard<std::recursive_mutex> guard(stackLock_);
     deviceIdMapByNetworkId_.clear();
     deviceIdMapByUniversallyUniqueId_.clear();
-    deviceIdMapByUniqueDisabilityId_.clear();
+    deviceIdMapByUniqueDeviceId_.clear();
     deviceInfoMap_.clear();
     SaveDeviceInfo(deviceInfo);
 }
@@ -131,32 +131,32 @@ void DeviceInfoRepository::SaveDeviceInfo(
     const DeviceId deviceId, const std::string &deviceName, const std::string &deviceType)
 {
     SaveDeviceInfo(
-        deviceId.networkId, deviceId.universallyUniqueId, deviceId.uniqueDisabilityId, deviceName, deviceType);
+        deviceId.networkId, deviceId.universallyUniqueId, deviceId.uniqueDeviceId, deviceName, deviceType);
 }
 
 void DeviceInfoRepository::SaveDeviceInfo(const std::string &networkId, const std::string &universallyUniqueId,
-    const std::string &uniqueDisabilityId, const std::string &deviceName, const std::string &deviceType)
+    const std::string &uniqueDeviceId, const std::string &deviceName, const std::string &deviceType)
 {
     std::lock_guard<std::recursive_mutex> guard(stackLock_);
 
     DeleteDeviceInfo(networkId, DeviceIdType::NETWORK_ID);
     DeleteDeviceInfo(universallyUniqueId, DeviceIdType::UNIVERSALLY_UNIQUE_ID);
-    DeleteDeviceInfo(uniqueDisabilityId, DeviceIdType::UNIQUE_DISABILITY_ID);
+    DeleteDeviceInfo(uniqueDeviceId, DeviceIdType::UNIQUE_DISABILITY_ID);
 
     DeviceId deviceId;
     deviceId.networkId = networkId;
     deviceId.universallyUniqueId = universallyUniqueId;
-    deviceId.uniqueDisabilityId = uniqueDisabilityId;
+    deviceId.uniqueDeviceId = uniqueDeviceId;
 
     DeviceInfo deviceInfo;
     deviceInfo.deviceId = deviceId;
     deviceInfo.deviceName = deviceName;
     deviceInfo.deviceType = deviceType;
 
-    const std::string deviceInfoKey = networkId + universallyUniqueId + uniqueDisabilityId;
+    const std::string deviceInfoKey = networkId + universallyUniqueId + uniqueDeviceId;
     deviceIdMapByNetworkId_.insert(std::pair<std::string, DeviceId>(networkId, deviceId));
     deviceIdMapByUniversallyUniqueId_.insert(std::pair<std::string, DeviceId>(universallyUniqueId, deviceId));
-    deviceIdMapByUniqueDisabilityId_.insert(std::pair<std::string, DeviceId>(uniqueDisabilityId, deviceId));
+    deviceIdMapByUniqueDeviceId_.insert(std::pair<std::string, DeviceId>(uniqueDeviceId, deviceId));
     deviceInfoMap_.insert(std::pair<std::string, DeviceInfo>(deviceInfoKey, deviceInfo));
 }
 
@@ -173,8 +173,8 @@ void DeviceInfoRepository::DeleteDeviceInfoByDeviceIdLocked(const DeviceId devic
 {
     deviceIdMapByNetworkId_.erase(deviceId.networkId);
     deviceIdMapByUniversallyUniqueId_.erase(deviceId.universallyUniqueId);
-    deviceIdMapByUniqueDisabilityId_.erase(deviceId.uniqueDisabilityId);
-    const std::string deviceInfoKey = deviceId.networkId + deviceId.universallyUniqueId + deviceId.uniqueDisabilityId;
+    deviceIdMapByUniqueDeviceId_.erase(deviceId.uniqueDeviceId);
+    const std::string deviceInfoKey = deviceId.networkId + deviceId.universallyUniqueId + deviceId.uniqueDeviceId;
     deviceInfoMap_.erase(deviceInfoKey);
 }
 
@@ -183,7 +183,7 @@ void DeviceInfoRepository::Clear()
     std::lock_guard<std::recursive_mutex> guard(stackLock_);
     deviceIdMapByNetworkId_.clear();
     deviceIdMapByUniversallyUniqueId_.clear();
-    deviceIdMapByUniqueDisabilityId_.clear();
+    deviceIdMapByUniqueDeviceId_.clear();
     deviceInfoMap_.clear();
 }
 } // namespace AccessToken
diff --git a/services/tokensyncmanager/src/remote/remote_command_executor.cpp b/services/tokensyncmanager/src/remote/remote_command_executor.cpp
index 66e5e0d78fd135be2ceb4c7985ad416a99fbb915..4219bfe443a3a3bb39f6c1b47d4cf8e8eb631592 100644
--- a/services/tokensyncmanager/src/remote/remote_command_executor.cpp
+++ b/services/tokensyncmanager/src/remote/remote_command_executor.cpp
@@ -39,7 +39,6 @@ RemoteCommandExecutor::~RemoteCommandExecutor()
 {
     ACCESSTOKEN_LOG_DEBUG(LABEL, "~RemoteCommandExecutor() begin");
     running_ = false;
-    ACCESSTOKEN_LOG_DEBUG(LABEL, "~RemoteCommandExecutor() end");
 }
 
 const std::shared_ptr<RpcChannel> RemoteCommandExecutor::CreateChannel(const std::string &targetNodeId)
diff --git a/services/tokensyncmanager/src/remote/remote_command_factory.cpp b/services/tokensyncmanager/src/remote/remote_command_factory.cpp
index d467b26beb8a917fac894e076f1e80d5f80d528f..49f92804171144dca243b855732be490a36ae717 100644
--- a/services/tokensyncmanager/src/remote/remote_command_factory.cpp
+++ b/services/tokensyncmanager/src/remote/remote_command_factory.cpp
@@ -60,15 +60,17 @@ std::shared_ptr<BaseRemoteCommand> RemoteCommandFactory::NewRemoteCommandFromJso
 
     if (commandName == SYNC_HAP_COMMAND_NAME) {
         return std::make_shared<SyncRemoteHapTokenCommand>(commandJsonString);
-    } else if (commandName == DELETE_TOKEN_COMMAND_NAME) {
+    }
+    if (commandName == DELETE_TOKEN_COMMAND_NAME) {
         return std::make_shared<DeleteRemoteTokenCommand>(commandJsonString);
-    } else if (commandName == UPDATE_HAP_COMMAND_NAME) {
+    }
+    if (commandName == UPDATE_HAP_COMMAND_NAME) {
         return std::make_shared<UpdateRemoteHapTokenCommand>(commandJsonString);
-    } else if (commandName == SYNC_NATIVE_COMMAND_NAME) {
+    }
+    if (commandName == SYNC_NATIVE_COMMAND_NAME) {
         return std::make_shared<SyncRemoteNativeTokenCommand>(commandJsonString);
-    } else {
-        return nullptr;
     }
+    return nullptr;
 }
 }  // namespace AccessToken
 }  // namespace Security
diff --git a/services/tokensyncmanager/src/remote/remote_command_manager.cpp b/services/tokensyncmanager/src/remote/remote_command_manager.cpp
index 9d98fada78af5659d94592bfb878c85fc6115075..2cbf1bbb51fdb8d03233605e7f3671b45e553dcd 100644
--- a/services/tokensyncmanager/src/remote/remote_command_manager.cpp
+++ b/services/tokensyncmanager/src/remote/remote_command_manager.cpp
@@ -268,7 +268,7 @@ std::shared_ptr<RemoteCommandExecutor> RemoteCommandManager::GetOrCreateRemoteCo
 std::shared_ptr<RpcChannel> RemoteCommandManager::GetExecutorChannel(const std::string &nodeId)
 {
     ACCESSTOKEN_LOG_DEBUG(LABEL, "convert udid start, nodeId:%{public}s", nodeId.c_str());
-    std::string udid = DeviceInfoManager::GetInstance().ConvertToUniqueDisabilityIdOrFetch(nodeId);
+    std::string udid = DeviceInfoManager::GetInstance().ConvertToUniqueDeviceIdOrFetch(nodeId);
     ACCESSTOKEN_LOG_DEBUG(LABEL, "convert udid, nodeId:%{public}s, udid: %{public}s", nodeId.c_str(), udid.c_str());
     if (!DataValidator::IsDeviceIdValid(udid)) {
         ACCESSTOKEN_LOG_WARN(
diff --git a/services/tokensyncmanager/src/remote/soft_bus_device_connection_listener.cpp b/services/tokensyncmanager/src/remote/soft_bus_device_connection_listener.cpp
index f10ba7cfa0bfe09d18a7eaedb80fb633e14413b1..47143b362d9022cfd23dbbf96b161335699f8dc0 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_device_connection_listener.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_device_connection_listener.cpp
@@ -38,7 +38,7 @@ void SoftBusDeviceConnectionListener::OnDeviceOnline(const DmDeviceInfo &info)
 {
     std::string networkId = info.deviceId;
     std::string uuid = SoftBusManager::GetInstance().GetUniversallyUniqueIdByNodeId(networkId);
-    std::string udid = SoftBusManager::GetInstance().GetUniqueDisabilityIdByNodeId(networkId);
+    std::string udid = SoftBusManager::GetInstance().GetUniqueDeviceIdByNodeId(networkId);
 
     ACCESSTOKEN_LOG_INFO(LABEL,
         "networkId: %{public}s, uuid: %{public}s, udid: %{public}s",
@@ -60,7 +60,7 @@ void SoftBusDeviceConnectionListener::OnDeviceOffline(const DmDeviceInfo &info)
 {
     std::string networkId = info.deviceId;
     std::string uuid = DeviceInfoManager::GetInstance().ConvertToUniversallyUniqueIdOrFetch(networkId);
-    std::string udid = DeviceInfoManager::GetInstance().ConvertToUniqueDisabilityIdOrFetch(networkId);
+    std::string udid = DeviceInfoManager::GetInstance().ConvertToUniqueDeviceIdOrFetch(networkId);
 
     ACCESSTOKEN_LOG_INFO(LABEL,
         "networkId: %{public}s,  uuid: %{public}s, udid: %{public}s",
diff --git a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp
index 46b41a86ce98ad2ccd39cb84cc6d675aeaab985b..279c6c1d470a294ab981c8976d3fef40bcb7b6d8 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp
@@ -172,7 +172,7 @@ int32_t SoftBusManager::OpenSession(const std::string &deviceId)
         SESSION_GROUP_ID.c_str(), &SESSION_ATTR);
 
     ACCESSTOKEN_LOG_DEBUG(LABEL, "session info: sessionId: %{public}d, uuid: %{public}s, udid: %{public}s", sessionId,
-        info.deviceId.universallyUniqueId.c_str(), info.deviceId.uniqueDisabilityId.c_str());
+        info.deviceId.universallyUniqueId.c_str(), info.deviceId.uniqueDeviceId.c_str());
 
     // wait session opening
     int retryTimes = 0;
@@ -216,7 +216,6 @@ int SoftBusManager::CloseSession(int sessionId)
     return Constant::SUCCESS;
 }
 
-
 std::string SoftBusManager::GetUniversallyUniqueIdByNodeId(const std::string &nodeId)
 {
     if (!DataValidator::IsDeviceIdValid(nodeId)) {
@@ -247,7 +246,7 @@ std::string SoftBusManager::GetUniversallyUniqueIdByNodeId(const std::string &no
     return uuid;
 }
 
-std::string SoftBusManager::GetUniqueDisabilityIdByNodeId(const std::string &nodeId)
+std::string SoftBusManager::GetUniqueDeviceIdByNodeId(const std::string &nodeId)
 {
     if (!DataValidator::IsDeviceIdValid(nodeId)) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "invalid nodeId: %{public}s", nodeId.c_str());
diff --git a/services/tokensyncmanager/src/remote/soft_bus_session_listener.cpp b/services/tokensyncmanager/src/remote/soft_bus_session_listener.cpp
index f73d5d1d445462b7640dfb5db693140e2964c678..fb8829ecabfb0c3394f1251ff188baf6fccfddfa 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_session_listener.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_session_listener.cpp
@@ -88,8 +88,9 @@ void SoftBusSessionListener::OnMessageReceived(int32_t sessionId, const void *da
 
 void SoftBusSessionListener::OnBytesReceived(int32_t sessionId, const void *data, uint32_t dataLen)
 {
-    if (sessionId == Constant::INVALID_SESSION || dataLen == 0) {
-        ACCESSTOKEN_LOG_ERROR(LABEL, "params invalid, data length: %{public}d", dataLen);
+    if ((sessionId == Constant::INVALID_SESSION) || (dataLen == 0) ||
+        (dataLen > MAX_ONBYTES_RECEIVED_DATA_LEN) || (data == nullptr)) {
+        ACCESSTOKEN_LOG_ERROR(LABEL, "params invalid, data length: %{public}u", dataLen);
         return;
     }
 
@@ -118,7 +119,7 @@ int64_t SoftBusSessionListener::GetSessionState(int32_t sessionId)
     if (iter == g_SessionOpenedMap_.end()) {
         return STATE_NOTFOUND;
     }
-    return (iter->second);
+    return iter->second;
 }
 
 void SoftBusSessionListener::DeleteSessionIdFromMap(int32_t sessionID)
diff --git a/services/tokensyncmanager/src/service/token_sync_manager_service.cpp b/services/tokensyncmanager/src/service/token_sync_manager_service.cpp
index e318a95b016ef333382d6bcedbbf09f05490626e..adb43917b1679f51fc7a88b0101b72481dae2a1c 100644
--- a/services/tokensyncmanager/src/service/token_sync_manager_service.cpp
+++ b/services/tokensyncmanager/src/service/token_sync_manager_service.cpp
@@ -70,12 +70,12 @@ void TokenSyncManagerService::OnStop()
     state_ = ServiceRunningState::STATE_NOT_START;
 }
 
-std::shared_ptr<TokenSyncEventHandler> TokenSyncManagerService::GetSendEventHandler()
+std::shared_ptr<TokenSyncEventHandler> TokenSyncManagerService::GetSendEventHandler() const
 {
     return sendHandler_;
 }
 
-std::shared_ptr<TokenSyncEventHandler> TokenSyncManagerService::GetRecvEventHandler()
+std::shared_ptr<TokenSyncEventHandler> TokenSyncManagerService::GetRecvEventHandler() const
 {
     return recvHandler_;
 }
@@ -92,7 +92,7 @@ int TokenSyncManagerService::GetRemoteHapTokenInfo(const std::string& deviceID,
         ACCESSTOKEN_LOG_INFO(LABEL, "FindDeviceInfo failed");
         return Constant::FAILURE;
     }
-    std::string udid = devInfo.deviceId.uniqueDisabilityId;
+    std::string udid = devInfo.deviceId.uniqueDeviceId;
     const std::shared_ptr<SyncRemoteHapTokenCommand> syncRemoteHapTokenCommand =
         RemoteCommandFactory::GetInstance().NewSyncRemoteHapTokenCommand(Constant::GetLocalDeviceId(),
         deviceID, tokenID);
@@ -117,7 +117,7 @@ int TokenSyncManagerService::DeleteRemoteHapTokenInfo(AccessTokenID tokenID)
     std::vector<DeviceInfo> devices = DeviceInfoRepository::GetInstance().ListDeviceInfo();
     std::string localUdid = Constant::GetLocalDeviceId();
     for (DeviceInfo device : devices) {
-        if (device.deviceId.uniqueDisabilityId == localUdid) {
+        if (device.deviceId.uniqueDeviceId == localUdid) {
             ACCESSTOKEN_LOG_INFO(LABEL, "no need notify local device");
             continue;
         }
@@ -126,7 +126,7 @@ int TokenSyncManagerService::DeleteRemoteHapTokenInfo(AccessTokenID tokenID)
             device.deviceId.networkId, tokenID);
 
         const int32_t resultCode = RemoteCommandManager::GetInstance().ExecuteCommand(
-            device.deviceId.uniqueDisabilityId, deleteRemoteTokenCommand);
+            device.deviceId.uniqueDeviceId, deleteRemoteTokenCommand);
         if (resultCode != Constant::SUCCESS) {
             ACCESSTOKEN_LOG_INFO(LABEL,
                 "RemoteExecutorManager executeCommand DeleteRemoteTokenCommand failed, return %d", resultCode);
@@ -142,7 +142,7 @@ int TokenSyncManagerService::UpdateRemoteHapTokenInfo(const HapTokenInfoForSync&
     std::vector<DeviceInfo> devices = DeviceInfoRepository::GetInstance().ListDeviceInfo();
     std::string localUdid = Constant::GetLocalDeviceId();
     for (DeviceInfo device : devices) {
-        if (device.deviceId.uniqueDisabilityId == localUdid) {
+        if (device.deviceId.uniqueDeviceId == localUdid) {
             ACCESSTOKEN_LOG_INFO(LABEL, "no need notify local device");
             continue;
         }
@@ -152,7 +152,7 @@ int TokenSyncManagerService::UpdateRemoteHapTokenInfo(const HapTokenInfoForSync&
             device.deviceId.networkId, tokenInfo);
 
         const int32_t resultCode = RemoteCommandManager::GetInstance().ExecuteCommand(
-            device.deviceId.uniqueDisabilityId, updateRemoteHapTokenCommand);
+            device.deviceId.uniqueDeviceId, updateRemoteHapTokenCommand);
         if (resultCode != Constant::SUCCESS) {
             ACCESSTOKEN_LOG_INFO(LABEL,
                 "RemoteExecutorManager executeCommand updateRemoteHapTokenCommand failed, return %d", resultCode);
diff --git a/services/tokensyncmanager/token_sync.rc b/services/tokensyncmanager/token_sync.rc
index 804c898ad03e8caec661d2a7a360e343fb44ce98..28f9b0a06cf8a4c001c4f12a1af520d9aae7c20d 100644
--- a/services/tokensyncmanager/token_sync.rc
+++ b/services/tokensyncmanager/token_sync.rc
@@ -1,4 +1,4 @@
-# Copyright (C) 2022 Huawei Device Co., Ltd.
+# Copyright (c) 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