diff --git a/BUILD.gn b/BUILD.gn
index e95e76b20edbc2a48c59cf74edddacdb3a5e76f3..1d07fc45455e0697b75899158b1556cad9198de7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -51,13 +51,3 @@ group("accesstoken_build_module_test") {
     ]
   }
 }
-#group("distributed_permission") {
-#  if (is_standard_system) {
-#    deps = [
-#      "${distributed_permission_innerkits_distributed_path}:distributed_permission_innerkits",
-#      "${distributed_permission_record_database_path}:permission_standard_infrastructure_record_database",
-#      "${distributed_permission_services_path}:distributed_permission_services",
-#      "${distributed_permission_services_path}/main/sa_profile:distributed_permission_sa_profile_standard",
-#    ]
-#  }
-#}
diff --git a/LICENSE b/LICENSE
old mode 100755
new mode 100644
diff --git a/OAT.xml b/OAT.xml
index b11daf5274a1b8efb7d7851c97861d0d8bf5d059..e2f5a5ae9ea6cd9c38b4dc95360cbe942d6bf794 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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.
diff --git a/README.md b/README.md
index 9ef56a6a22cfc0cfc4d47ffe9665e77b01937d92..2593298c2aaa6d5702dd929a436bfafde8afd05e 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,74 @@
-An english translation is now being prepared.
\ No newline at end of file
+# Access Control<a name="EN-US_TOPIC_0000001101239136"></a>
+
+
+## Introduction<a name="section11660541593"></a>
+
+AccessTokenManager (ATM) provides unified app permission management based on access tokens on OpenHarmony.
+
+The access token information of an app includes the app identifier (**APPID**), user ID, app twin index, app Ability Privilege Level (APL), and permission information. The access token of each app is identified by a 32-bit token identity (**TokenID**) in the device.
+
+The ATM module provides the following functions:
+-   Verifying app permissions based on the token ID before an app accesses sensitive data or calls an API.
+-   Obtaining access token information (for example, APL) based on the token ID.
+
+## Directory Structure<a name="section161941989596"></a>
+
+```
+/base/security/access_token
+├── frameworks                  # Stores code of basic functionalities.
+│   ├── accesstoken             # Stores code of the ATM framework.
+│   ├── tokensync               # Stores code of the access token synchronization framework.
+│   └── common                  # Stores framework common code.
+├── interfaces                  # Stores the APIs.
+│   ├── innerkits               # Stores internal APIs.
+│       ├── accesstoken         # Stores code of access token internal APIs.
+│       ├── nativetoken         # Stores code of native token APIs.
+│       └── tokensync           # Stores code of the internal APIs for access token synchronization.
+└── services                    # Services
+    ├── accesstokenmanager      # Stores ATM service code.
+    └── tokensyncmanager        # Stores code of the access token synchronization service. 
+```
+
+## Usage<a name="section137768191623"></a>
+### Available APIs<a name="section1551164914237"></a>
+
+| **API**| **Description**|
+| --- | --- |
+| AccessTokenIDEx AllocHapToken(const HapInfoParams& info, const HapPolicyParams& policy); | Allocates a token ID to an app.|
+| AccessTokenID AllocLocalTokenID(const std::string& remoteDeviceID, AccessTokenID remoteTokenID); | Allocates a local token ID to the app of a remote device.|
+| int UpdateHapToken(AccessTokenID tokenID, const std::string& appIDDesc, const HapPolicyParams& policy); | Updates token information.|
+| int DeleteToken(AccessTokenID tokenID); | Deletes the app's token ID and information.|
+| int GetTokenType(AccessTokenID tokenID); | Obtains the type of an access token.|
+| int CheckNativeDCap(AccessTokenID tokenID, const std::string& dcap); | Checks whether the native process corresponding to the given token ID has the specified distributed capability.|
+| AccessTokenID GetHapTokenID(int userID, const std::string& bundleName, int instIndex); | Obtains the token ID of an app.|
+| int GetHapTokenInfo(AccessTokenID tokenID, HapTokenInfo& hapTokenInfoRes); | Obtains the token information about a HAP.|
+| int GetNativeTokenInfo(AccessTokenID tokenID, NativeTokenInfo& nativeTokenInfoRes); | Obtains information about a native token.|
+| int VerifyAccessToken(AccessTokenID tokenID, const std::string& permissionName); | Checks whether an access token has the specified permission.|
+| int GetDefPermission(const std::string& permissionName, PermissionDef& permissionDefResult); | Obtains definition information about the specified permission.|
+| int GetDefPermissions(AccessTokenID tokenID, std::vector<PermissionDef>& permList); | Obtains the permission definition set of a HAP.|
+| int GetReqPermissions(AccessTokenID tokenID, std::vector<PermissionStateFull>& reqPermList, bool isSystemGrant); | Obtains the status set of the permission requested by a HAP.|
+| int GetPermissionFlag(AccessTokenID tokenID, const std::string& permissionName); | Obtains the permissions of the app with the specified token ID.|
+| int GrantPermission(AccessTokenID tokenID, const std::string& permissionName, int flag); | Grants the specified permission to the app with the specified token ID.|
+| int RevokePermission(AccessTokenID tokenID, const std::string& permissionName, int flag); | Revokes the specified permission from the app with the specified token ID.|
+| int ClearUserGrantedPermissionState(AccessTokenID tokenID); | Clears the user_grant permission status of the app with the specified token ID.|
+| uint64_t GetAccessTokenId(const char *processname, const char **dcap, int32_t dacpNum, const char *aplStr); | Obtains the token ID of a native process.|
+
+### Usage Guidelines<a name="section129654513264"></a>
+ATM provides unified access control for apps and allows apps or service abilities to obtain and verify app permissions and APL. The ATM APIs can be called by a service ability started by a native process or an app HAP.
+
+#### Native Process
+-  Before a native process starts, it calls **GetAccessTokenId** to obtain a token ID, and then calls **SetSelfTokenID** to set the token ID to the kernel.
+-  During the running of a native process, it calls **GetNativeTokenInfo** or **CheckNativeDCap** to obtain the token information, including the distributed capability and APL.
+
+#### App HAP
+-  When an app is installed, **AllocHapToken** is called to obtain the token ID of the app.
+-  When an authentication is required during app running, **VerifyAccessToken** or **GetReqPermissions** is called to obtain and verify the app permissions and APL.
+-  When an app is uninstalled, **DeleteToken** is called to delete the related access token information.
+
+## Repositories Involved<a name="section1371113476307"></a>
+
+[startup\_init\_lite](https://gitee.com/openharmony/startup_init_lite/blob/master/README.md)
+
+[security\_deviceauth](https://gitee.com/openharmony/security_deviceauth/blob/master/README.md)
+
+[security\_access\_token](https://gitee.com/openharmony/security_access_token/blob/master/README.md)
diff --git a/README_zh.md b/README_zh.md
index 23be5b3aff107affb9e6cb468b095a4b833101ab..5b9c8162eb7f7208a93e9ed076e551df555929f1 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -72,10 +72,9 @@ ATM提供了统一的应用权限访问控制功能，支持应用程序或者SA
 -  在应用卸载时，需要调用DeleteToken函数删除系统中管理的对应Accesstoken信息。
 
 ## 相关仓<a name="section1371113476307"></a>
-安全子系统
 
-[startup\_init\_lite](https://gitee.com/openharmony/startup_init_lite/blob/master/README.md)
+[startup\_init\_lite](https://gitee.com/openharmony/startup_init_lite/blob/master/README_zh.md)
 
-[security\_deviceauth](https://gitee.com/openharmony/security_deviceauth/blob/master/README.md)
+[security\_deviceauth](https://gitee.com/openharmony/security_deviceauth/blob/master/README_zh.md)
 
-**[security\_access\_token](https://gitee.com/openharmony-sig/security_access_token/blob/master/README.md)**
\ No newline at end of file
+**[security\_access\_token](https://gitee.com/openharmony/security_access_token/blob/master/README_zh.md)**
\ No newline at end of file
diff --git a/bundle.json b/bundle.json
old mode 100755
new mode 100644
diff --git a/frameworks/accesstoken/BUILD.gn b/frameworks/accesstoken/BUILD.gn
index e7ebdac5b5212b28149b36109375b0c9fd5a5b40..6c3e6db17cf3b55323a5c8cf5d7e2ffd381464d4 100644
--- a/frameworks/accesstoken/BUILD.gn
+++ b/frameworks/accesstoken/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
@@ -13,9 +13,6 @@
 
 import("//build/ohos.gni")
 
-################################################################
-# C++, Main source file here.
-################################################################
 config("accesstoken_communication_adapter_cxx_public_config") {
   visibility = [ ":*" ]
   include_dirs = [
diff --git a/frameworks/accesstoken/include/hap_info_parcel.h b/frameworks/accesstoken/include/hap_info_parcel.h
index 8f496175e23d78cc314654838ab443d6dc91fa3c..ae027da484cd1b14ebd186a3cec7a01266655613 100644
--- a/frameworks/accesstoken/include/hap_info_parcel.h
+++ b/frameworks/accesstoken/include/hap_info_parcel.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/frameworks/accesstoken/include/hap_policy_parcel.h b/frameworks/accesstoken/include/hap_policy_parcel.h
index 7886bfbeb7fff89c01ecba7eb4a6a7f712221129..dc412e4776f3f1aacfea40da9506dfff5ce9608a 100644
--- a/frameworks/accesstoken/include/hap_policy_parcel.h
+++ b/frameworks/accesstoken/include/hap_policy_parcel.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/frameworks/accesstoken/include/hap_token_info_parcel.h b/frameworks/accesstoken/include/hap_token_info_parcel.h
index d13fda88a2ec7c89c5ab9be86f46f19db3d8841b..08e939f4e211cad2849e51861d6e838b2b2cae7b 100644
--- a/frameworks/accesstoken/include/hap_token_info_parcel.h
+++ b/frameworks/accesstoken/include/hap_token_info_parcel.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/frameworks/accesstoken/include/native_token_info_parcel.h b/frameworks/accesstoken/include/native_token_info_parcel.h
index 80bf8909cba6cc20826ab2b4276572fc058f91dc..c1ba0c4d0822fc2f2853f7c824c90a0077603103 100644
--- a/frameworks/accesstoken/include/native_token_info_parcel.h
+++ b/frameworks/accesstoken/include/native_token_info_parcel.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/frameworks/accesstoken/include/permission_def_parcel.h b/frameworks/accesstoken/include/permission_def_parcel.h
index 52e0a80c4197ea155f98ba126a7c13df22ac02f1..c509deb9167cc207010e5d44fd18c53477f889ec 100644
--- a/frameworks/accesstoken/include/permission_def_parcel.h
+++ b/frameworks/accesstoken/include/permission_def_parcel.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/frameworks/accesstoken/include/permission_state_full_parcel.h b/frameworks/accesstoken/include/permission_state_full_parcel.h
index f4b8714a7a832d6291adff4992eee953e60f8994..71e869ed1ef93fd7b1d968ee6e2dcc00bb30eb13 100644
--- a/frameworks/accesstoken/include/permission_state_full_parcel.h
+++ b/frameworks/accesstoken/include/permission_state_full_parcel.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/frameworks/accesstoken/src/hap_info_parcel.cpp b/frameworks/accesstoken/src/hap_info_parcel.cpp
index c0e3d984a4e0764e108080ab227cf5a97b3088c9..f167dda0c58ab1d2d849bc94de551c2f184fe11a 100644
--- a/frameworks/accesstoken/src/hap_info_parcel.cpp
+++ b/frameworks/accesstoken/src/hap_info_parcel.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/frameworks/accesstoken/src/hap_policy_parcel.cpp b/frameworks/accesstoken/src/hap_policy_parcel.cpp
index fe2a079ce567b4c73a33b60a68480c8a9c4487da..434c419038eac29b5d209312dfa9aa2f3adc3aaa 100644
--- a/frameworks/accesstoken/src/hap_policy_parcel.cpp
+++ b/frameworks/accesstoken/src/hap_policy_parcel.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/frameworks/accesstoken/src/hap_token_info_parcel.cpp b/frameworks/accesstoken/src/hap_token_info_parcel.cpp
index 4a349518c03b3bdb005f771d049d14a4c02b69f1..5c91760c505577a39114f596783c5113047df9db 100644
--- a/frameworks/accesstoken/src/hap_token_info_parcel.cpp
+++ b/frameworks/accesstoken/src/hap_token_info_parcel.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/frameworks/accesstoken/src/native_token_info_parcel.cpp b/frameworks/accesstoken/src/native_token_info_parcel.cpp
index 5b10bb77da1eea06a63a1289bf36addc48361a25..daca0e793beb954f9b2a6352e8e6f470a1d8196c 100644
--- a/frameworks/accesstoken/src/native_token_info_parcel.cpp
+++ b/frameworks/accesstoken/src/native_token_info_parcel.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/frameworks/accesstoken/src/permission_def_parcel.cpp b/frameworks/accesstoken/src/permission_def_parcel.cpp
index 09943e9a04725d43096c7aa1b2260d329927a320..f87b17cfabc9d88d6db768129bfadbf2208aa799 100644
--- a/frameworks/accesstoken/src/permission_def_parcel.cpp
+++ b/frameworks/accesstoken/src/permission_def_parcel.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/frameworks/accesstoken/src/permission_state_full_parcel.cpp b/frameworks/accesstoken/src/permission_state_full_parcel.cpp
index 2a5dd6fe5cdbf69db08a04302875af6572b34610..99735cf9a734bbd189276b2b658218a616fe2578 100644
--- a/frameworks/accesstoken/src/permission_state_full_parcel.cpp
+++ b/frameworks/accesstoken/src/permission_state_full_parcel.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/frameworks/com.ohos.permissionmanager/gradlew b/frameworks/com.ohos.permissionmanager/gradlew
index 120f1adf94a915f110fef9c186e9138ee25bcc97..aa815eb871dbc24ea7694bb6175ce525f3e1c6b6 100644
--- a/frameworks/com.ohos.permissionmanager/gradlew
+++ b/frameworks/com.ohos.permissionmanager/gradlew
@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 #
-# 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.
diff --git a/frameworks/com.ohos.permissionmanager/gradlew.bat b/frameworks/com.ohos.permissionmanager/gradlew.bat
index acdc32e2dae3e8e42e391878d96766acce16af0a..9db1ef2e26e3751925fdf8fb43fa8e532ed90376 100644
--- a/frameworks/com.ohos.permissionmanager/gradlew.bat
+++ b/frameworks/com.ohos.permissionmanager/gradlew.bat
@@ -1,5 +1,5 @@
 @rem
-@rem Copyright (c) 2021 Huawei Device Co., Ltd.
+@rem Copyright (c) 2021-2022 Huawei Device Co., Ltd.
 @rem
 @rem Licensed under the Apache License, Version 2.0 (the "License");
 @rem you may not use this file except in compliance with the License.
diff --git a/frameworks/common/BUILD.gn b/frameworks/common/BUILD.gn
index aad20da4291e8d3e68c8079673435811f72fdd02..e4c4118eb251c8e65509996ee390761a3725dcc9 100644
--- a/frameworks/common/BUILD.gn
+++ b/frameworks/common/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
@@ -13,9 +13,6 @@
 
 import("//build/ohos.gni")
 
-################################################################
-# C++, Main source file here.
-################################################################
 config("accesstoken_common_cxx_public_config") {
   visibility = [ ":*" ]
   include_dirs = [ "include" ]
diff --git a/frameworks/common/include/accesstoken_log.h b/frameworks/common/include/accesstoken_log.h
index ac4aaa1078074ddd2c51f119760664702c9ded3c..d90d3bf33b47cb04482d6d6ee7a1aa57f89d2876 100644
--- a/frameworks/common/include/accesstoken_log.h
+++ b/frameworks/common/include/accesstoken_log.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/frameworks/common/include/data_validator.h b/frameworks/common/include/data_validator.h
index b966799691eb40f4bfe5487598e1893e5e5a01da..9a146ba70facc8560327db79cd176bf1a5d79df2 100644
--- a/frameworks/common/include/data_validator.h
+++ b/frameworks/common/include/data_validator.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/frameworks/common/include/random.h b/frameworks/common/include/random.h
index 278cc24aa06bd33d3ea74a46ca9245c4ceee1689..29d2e637ff8e56ddeba6f5f1319e3df828a35593 100644
--- a/frameworks/common/include/random.h
+++ b/frameworks/common/include/random.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/frameworks/common/include/random_mbedtls.h b/frameworks/common/include/random_mbedtls.h
index ffd3ddd147ee2478af4cac6e74196d9c27f455ce..443993b135f5f3904497258a05b48b066decf82e 100644
--- a/frameworks/common/include/random_mbedtls.h
+++ b/frameworks/common/include/random_mbedtls.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/frameworks/common/src/data_validator.cpp b/frameworks/common/src/data_validator.cpp
index a28479e7e0286183b504d0b98ba539116d413fe9..e6acaaed25e484bbde06c8181d8f0c3720611803 100644
--- a/frameworks/common/src/data_validator.cpp
+++ b/frameworks/common/src/data_validator.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/frameworks/common/src/random_mbedtls.cpp b/frameworks/common/src/random_mbedtls.cpp
index 20d7dfbbcaf6e4d50df90e605e5ccdbbb1fec644..f7cf0f8f1bc43ea1d1d08f9f3413906822ab6da9 100644
--- a/frameworks/common/src/random_mbedtls.cpp
+++ b/frameworks/common/src/random_mbedtls.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/frameworks/tokensync/include/i_token_sync_manager.h b/frameworks/tokensync/include/i_token_sync_manager.h
index 8975482ce13dfad5d6b746852b3fe04c2a50f7c8..9736a6fe229de7bb0d09cd7af6eb8557dfed3ed8 100644
--- a/frameworks/tokensync/include/i_token_sync_manager.h
+++ b/frameworks/tokensync/include/i_token_sync_manager.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/interfaces/innerkits/accesstoken/BUILD.gn b/interfaces/innerkits/accesstoken/BUILD.gn
index ba7893f5d09e145c97f65252def48322e1529c94..5e59fdee8b8b3061d96fd95938828979f3261a3b 100644
--- a/interfaces/innerkits/accesstoken/BUILD.gn
+++ b/interfaces/innerkits/accesstoken/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
@@ -13,9 +13,6 @@
 
 import("//build/ohos.gni")
 
-################################################################
-# C++, Main, source file here.
-################################################################
 config("accesstoken") {
   visibility = [ ":*" ]
   include_dirs = [ "include" ]
diff --git a/interfaces/innerkits/accesstoken/include/access_token.h b/interfaces/innerkits/accesstoken/include/access_token.h
index 601120beabfcaec0a52a41fab56cb542454b8864..44130adeae4ca8f5dda9f505a22fbd991b37b5d7 100644
--- a/interfaces/innerkits/accesstoken/include/access_token.h
+++ b/interfaces/innerkits/accesstoken/include/access_token.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/interfaces/innerkits/accesstoken/include/accesstoken.h b/interfaces/innerkits/accesstoken/include/accesstoken.h
old mode 100755
new mode 100644
index f0084d34728248555694e1f359ed659f7a6f43b2..6257cc04661a92c28c1219e2b9528f97d26e2967
--- a/interfaces/innerkits/accesstoken/include/accesstoken.h
+++ b/interfaces/innerkits/accesstoken/include/accesstoken.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/interfaces/innerkits/accesstoken/include/hap_token_info.h b/interfaces/innerkits/accesstoken/include/hap_token_info.h
index 1d38ae6840fb11aa908edfbc1485e9d98f2fdfb1..f2fc23426fafd5925861245494720f287401ce6e 100644
--- a/interfaces/innerkits/accesstoken/include/hap_token_info.h
+++ b/interfaces/innerkits/accesstoken/include/hap_token_info.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/interfaces/innerkits/accesstoken/include/native_token_info.h b/interfaces/innerkits/accesstoken/include/native_token_info.h
index 60b427f3598d5fc059a3f4fa10ab15d185a01f0c..d02ef226bc3fa7b9a42122b147dd127e2bb42604 100644
--- a/interfaces/innerkits/accesstoken/include/native_token_info.h
+++ b/interfaces/innerkits/accesstoken/include/native_token_info.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/interfaces/innerkits/accesstoken/include/permission_def.h b/interfaces/innerkits/accesstoken/include/permission_def.h
index f3cc81b63cd1062be2c225b6de4bd4f71339805e..39352b4e582cbd8070741fe02ce6c75e3438d679 100644
--- a/interfaces/innerkits/accesstoken/include/permission_def.h
+++ b/interfaces/innerkits/accesstoken/include/permission_def.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/interfaces/innerkits/accesstoken/include/permission_state_full.h b/interfaces/innerkits/accesstoken/include/permission_state_full.h
index 7805a3d9e7ac5698ddc9325ff4910046668f5004..dc93022166c92cba2588a0cec945531bd22565ac 100644
--- a/interfaces/innerkits/accesstoken/include/permission_state_full.h
+++ b/interfaces/innerkits/accesstoken/include/permission_state_full.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/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
index 51e2d60b51881871a7da75d177b11a6394147e3b..9d419a67ae56e63787fd96c91b6d865eb0d2bf96 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
@@ -169,7 +169,7 @@ AccessTokenIDEx AccessTokenManagerClient::AllocHapToken(const HapInfoParams& inf
         return res;
     }
     HapInfoParcel hapInfoParcel;
-    HapPolicyParcel  hapPolicyParcel;
+    HapPolicyParcel hapPolicyParcel;
     hapInfoParcel.hapInfoParameter = info;
     hapPolicyParcel.hapPolicyParameter = policy;
 
diff --git a/interfaces/innerkits/accesstoken/test/BUILD.gn b/interfaces/innerkits/accesstoken/test/BUILD.gn
index e981ea0ecf5a727ad60cb44cee149ab70e44a03d..a4782cc9094234cfcc93c78bb0ac79f4258c7169 100644
--- a/interfaces/innerkits/accesstoken/test/BUILD.gn
+++ b/interfaces/innerkits/accesstoken/test/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/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
index 3aa4e9dc16860a90ae3bbcaadd5f072f15c8786e..34e30ce682e4e65ffd10ffd376b6a544c74a519a 100644
--- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
+++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_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
@@ -348,7 +348,7 @@ HWTEST_F(AccessTokenKitTest, GetDefPermissions004, TestSize.Level0)
     int ret = RET_FAILED;
     for (int i = 0; i < CYCLE_TIMES; i++) {
         std::vector<PermissionDef> permDefList;
-        ret = ret = AccessTokenKit::GetDefPermissions(tokenID, permDefList);
+        ret = AccessTokenKit::GetDefPermissions(tokenID, permDefList);
         ASSERT_EQ(RET_SUCCESS, ret);
         ASSERT_EQ(2, permDefList.size());
     }
@@ -464,7 +464,7 @@ HWTEST_F(AccessTokenKitTest, GetReqPermissions005, TestSize.Level0)
     int ret = RET_FAILED;
     for (int i = 0; i < CYCLE_TIMES; i++) {
         std::vector<PermissionStateFull> permStatList;
-        ret = ret = AccessTokenKit::GetReqPermissions(tokenID, permStatList, false);
+        ret = AccessTokenKit::GetReqPermissions(tokenID, permStatList, false);
         ASSERT_EQ(RET_SUCCESS, ret);
         ASSERT_EQ(1, permStatList.size());
         ASSERT_EQ(TEST_PERMISSION_NAME_ALPHA, permStatList[0].permissionName);
@@ -533,7 +533,7 @@ HWTEST_F(AccessTokenKitTest, GetPermissionFlag003, TestSize.Level0)
         ret = AccessTokenKit::GrantPermission(tokenID, TEST_PERMISSION_NAME_ALPHA, PERMISSION_USER_FIXED);
         ASSERT_EQ(RET_SUCCESS, ret);
 
-        ret = ret = AccessTokenKit::GetPermissionFlag(tokenID, TEST_PERMISSION_NAME_ALPHA);
+        ret = AccessTokenKit::GetPermissionFlag(tokenID, TEST_PERMISSION_NAME_ALPHA);
         ASSERT_EQ(PERMISSION_USER_FIXED, ret);
     }
 }
diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.h b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.h
index dfdd20e85dc3a510579e6cfac669ac0912a85a28..8464e5c8aa824d264eb8379f6cc325c3ec2f616c 100644
--- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.h
+++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_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/interfaces/innerkits/nativetoken/BUILD.gn b/interfaces/innerkits/nativetoken/BUILD.gn
index 5a4163d3be70cb500db2d82bf8630d4dc37d2c62..58d197aea1de9f5a85529ef9e073de179dbac8ea 100644
--- a/interfaces/innerkits/nativetoken/BUILD.gn
+++ b/interfaces/innerkits/nativetoken/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
@@ -13,9 +13,6 @@
 
 import("//build/ohos.gni")
 
-################################################################
-# C, Main, source file here.
-################################################################
 config("accesstokenlib") {
   visibility = [ ":*" ]
   include_dirs = [ "include" ]
diff --git a/interfaces/innerkits/nativetoken/include/nativetoken.h b/interfaces/innerkits/nativetoken/include/nativetoken.h
index 573c6517829157839e449a868cfb009a49a03893..d256589538076de295231ed900d9fa5403b88064 100644
--- a/interfaces/innerkits/nativetoken/include/nativetoken.h
+++ b/interfaces/innerkits/nativetoken/include/nativetoken.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
@@ -9,7 +9,7 @@
  * Unless required by applicable law or agreed to in writing, software
  * 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 ACCESSTOKENs and
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
diff --git a/interfaces/innerkits/nativetoken/include/nativetoken_kit.h b/interfaces/innerkits/nativetoken/include/nativetoken_kit.h
index 564dcb76fd6b5d07054417d374895fe459fc877e..8975df42a4a57cf9808d10613f2e16ba7839c175 100644
--- a/interfaces/innerkits/nativetoken/include/nativetoken_kit.h
+++ b/interfaces/innerkits/nativetoken/include/nativetoken_kit.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/interfaces/innerkits/nativetoken/include/nativetoken_log.h b/interfaces/innerkits/nativetoken/include/nativetoken_log.h
index a0338d25e7ee0b78321a60a69805dfbb1331d6ac..b161c996de611d88cfd3c9846661a019c83eb10f 100644
--- a/interfaces/innerkits/nativetoken/include/nativetoken_log.h
+++ b/interfaces/innerkits/nativetoken/include/nativetoken_log.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
@@ -9,7 +9,7 @@
  * Unless required by applicable law or agreed to in writing, software
  * 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 ACCESSTOKENs and
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
diff --git a/interfaces/innerkits/nativetoken/src/nativetoken.c b/interfaces/innerkits/nativetoken/src/nativetoken.c
index 4e09e88b15669942b452cb4cb7ac8ca41cd2cbc2..662ba98c19808949ae936c47cb9fe7b68e8f13cd 100644
--- a/interfaces/innerkits/nativetoken/src/nativetoken.c
+++ b/interfaces/innerkits/nativetoken/src/nativetoken.c
@@ -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
@@ -9,7 +9,7 @@
  * Unless required by applicable law or agreed to in writing, software
  * 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 ACCESSTOKENs and
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 #include "nativetoken.h"
@@ -43,7 +43,7 @@ int32_t GetFileBuff(const char *cfg, char **retBuff)
         return ATRET_FAILED;
     }
 
-    int32_t fileSize = (int32_t)fileStat.st_size;
+    size_t fileSize = fileStat.st_size;
 
     FILE *cfgFd = fopen(filePath, "r");
     if (cfgFd == NULL) {
@@ -84,7 +84,7 @@ void FreeDcaps(char *dcaps[MAX_DCAPS_NUM], int32_t num)
 uint32_t GetprocessNameFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
 {
     cJSON *processNameJson = cJSON_GetObjectItem(cjsonItem, PROCESS_KEY_NAME);
-    if (cJSON_IsString(processNameJson) == 0 || (strlen(processNameJson->valuestring) > MAX_PROCESS_NAME_LEN)) {
+    if (!cJSON_IsString(processNameJson) || (strlen(processNameJson->valuestring) > MAX_PROCESS_NAME_LEN)) {
         ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:processNameJson is invalid.", __func__);
         return ATRET_FAILED;
     }
@@ -99,7 +99,7 @@ uint32_t GetprocessNameFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
 uint32_t GetTokenIdFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
 {
     cJSON *tokenIdJson = cJSON_GetObjectItem(cjsonItem, TOKENID_KEY_NAME);
-    if ((cJSON_IsNumber(tokenIdJson) == 0) || (cJSON_GetNumberValue(tokenIdJson) <= 0)) {
+    if ((!cJSON_IsNumber(tokenIdJson)) || (cJSON_GetNumberValue(tokenIdJson) <= 0)) {
         ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:tokenIdJson is invalid.", __func__);
         return ATRET_FAILED;
     }
@@ -110,7 +110,7 @@ uint32_t GetTokenIdFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
 uint32_t GetAplFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
 {
     cJSON *aplJson = cJSON_GetObjectItem(cjsonItem, APL_KEY_NAME);
-    if (cJSON_IsNumber(aplJson) == 0) {
+    if (!cJSON_IsNumber(aplJson)) {
         ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:aplJson is invalid.", __func__);
         return ATRET_FAILED;
     }
@@ -136,7 +136,7 @@ uint32_t GetDcapsInfoFromJson(cJSON *cjsonItem, NativeTokenList *tokenNode)
             return ATRET_FAILED;
         }
         size_t length = strlen(dcapItem->valuestring);
-        if (cJSON_IsString(dcapItem) == 0 || (length > MAX_DCAP_LEN)) {
+        if (!cJSON_IsString(dcapItem) || (length > MAX_DCAP_LEN)) {
             ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:dcapItem is invalid.", __func__);
             return ATRET_FAILED;
         }
@@ -499,7 +499,7 @@ void SaveTokenIdToCfg(const NativeTokenList *curr)
 }
 
 uint32_t CheckProcessInfo(const char *processname, const char **dcaps,
-                          int32_t dacpNum, const char *aplStr, int32_t *aplRet)
+                          int32_t dcapNum, const char *aplStr, int32_t *aplRet)
 {
     if ((processname == NULL) || strlen(processname) > MAX_PROCESS_NAME_LEN
         || strlen(processname) == 0) {
@@ -507,11 +507,11 @@ uint32_t CheckProcessInfo(const char *processname, const char **dcaps,
         return ATRET_FAILED;
     }
 
-    if (((dcaps == NULL) && (dacpNum != 0)) || dacpNum > MAX_DCAPS_NUM || dacpNum < 0) {
-        ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:dcaps is null or dacpNum is invalid.", __func__);
+    if (((dcaps == NULL) && (dcapNum != 0)) || dcapNum > MAX_DCAPS_NUM || dcapNum < 0) {
+        ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:dcaps is null or dcapNum is invalid.", __func__);
         return ATRET_FAILED;
     }
-    for (int32_t i = 0; i < dacpNum; i++) {
+    for (int32_t i = 0; i < dcapNum; i++) {
         if (strlen(dcaps[i]) > MAX_DCAP_LEN) {
             ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:dcap length is invalid.", __func__);
             return ATRET_FAILED;
@@ -527,7 +527,7 @@ uint32_t CheckProcessInfo(const char *processname, const char **dcaps,
 }
 
 static uint32_t AddNewTokenToListAndCfgFile(const char *processname, const char **dcapsIn,
-                                            int32_t dacpNumIn, int32_t aplIn, NativeAtId *tokenId)
+                                            int32_t dcapNumIn, int32_t aplIn, NativeAtId *tokenId)
 {
     NativeTokenList *tokenNode;
     NativeAtId id;
@@ -549,9 +549,9 @@ static uint32_t AddNewTokenToListAndCfgFile(const char *processname, const char
         free(tokenNode);
         return ATRET_FAILED;
     }
-    tokenNode->dcapsNum = dacpNumIn;
+    tokenNode->dcapsNum = dcapNumIn;
 
-    for (int32_t i = 0; i < dacpNumIn; i++) {
+    for (int32_t i = 0; i < dcapNumIn; i++) {
         tokenNode->dcaps[i] = (char *)malloc(sizeof(char) * (strlen(dcapsIn[i]) + 1));
         if (tokenNode->dcaps[i] != NULL &&
             (strcpy_s(tokenNode->dcaps[i], strlen(dcapsIn[i]) + 1, dcapsIn[i]) != EOK)) {
@@ -570,15 +570,15 @@ static uint32_t AddNewTokenToListAndCfgFile(const char *processname, const char
     return ATRET_SUCCESS;
 }
 
-int32_t CompareProcessInfo(NativeTokenList *tokenNode, const char **dcapsIn, int32_t dacpNumIn, int32_t aplIn)
+int32_t CompareProcessInfo(NativeTokenList *tokenNode, const char **dcapsIn, int32_t dcapNumIn, int32_t aplIn)
 {
     if (tokenNode->apl != aplIn) {
         return 1;
     }
-    if (tokenNode->dcapsNum != dacpNumIn) {
+    if (tokenNode->dcapsNum != dcapNumIn) {
         return 1;
     }
-    for (int32_t i = 0; i < dacpNumIn; i++) {
+    for (int32_t i = 0; i < dcapNumIn; i++) {
         if (strcmp(tokenNode->dcaps[i], dcapsIn[i]) != 0) {
             return 1;
         }
@@ -586,7 +586,7 @@ int32_t CompareProcessInfo(NativeTokenList *tokenNode, const char **dcapsIn, int
     return 0;
 }
 
-uint32_t UpdateTokenInfoInList(NativeTokenList *tokenNode, const char **dcapsIn, int32_t dacpNumIn, int32_t aplIn)
+uint32_t UpdateTokenInfoInList(NativeTokenList *tokenNode, const char **dcapsIn, int32_t dcapNumIn, int32_t aplIn)
 {
     tokenNode->apl = aplIn;
 
@@ -595,8 +595,8 @@ uint32_t UpdateTokenInfoInList(NativeTokenList *tokenNode, const char **dcapsIn,
         tokenNode->dcaps[i] = NULL;
     }
 
-    tokenNode->dcapsNum = dacpNumIn;
-    for (int32_t i = 0; i < dacpNumIn; i++) {
+    tokenNode->dcapsNum = dcapNumIn;
+    for (int32_t i = 0; i < dcapNumIn; i++) {
         int32_t len = strlen(dcapsIn[i]) + 1;
         tokenNode->dcaps[i] = (char *)malloc(sizeof(char) * len);
         if (tokenNode->dcaps[i] != NULL && (strcpy_s(tokenNode->dcaps[i], len, dcapsIn[i]) != EOK)) {
@@ -702,7 +702,7 @@ uint32_t UpdateTokenInfoInCfgFile(NativeTokenList *tokenNode)
     return ATRET_SUCCESS;
 }
 
-uint64_t GetAccessTokenId(const char *processname, const char **dcaps, int32_t dacpNum, const char *aplStr)
+uint64_t GetAccessTokenId(const char *processname, const char **dcaps, int32_t dcapNum, const char *aplStr)
 {
     NativeAtId tokenId = 0;
     uint64_t result = 0;
@@ -710,15 +710,15 @@ uint64_t GetAccessTokenId(const char *processname, const char **dcaps, int32_t d
     NativeAtIdEx *atPoint = (NativeAtIdEx *)(&result);
 
     if ((g_isNativeTokenInited == 0) && (AtlibInit() != ATRET_SUCCESS)) {
-        return 0;
+        return INVALID_TOKEN_ID;
     }
 
-    uint32_t ret = CheckProcessInfo(processname, dcaps, dacpNum, aplStr, &apl);
+    uint32_t ret = CheckProcessInfo(processname, dcaps, dcapNum, aplStr, &apl);
     if (ret != ATRET_SUCCESS) {
-        return 0;
+        return INVALID_TOKEN_ID;
     }
 
-    NativeTokenList *tokenNode = g_tokenListHead;
+    NativeTokenList *tokenNode = g_tokenListHead->next;
     while (tokenNode != NULL) {
         if (strcmp(tokenNode->processName, processname) == 0) {
             tokenId = tokenNode->tokenId;
@@ -728,16 +728,16 @@ uint64_t GetAccessTokenId(const char *processname, const char **dcaps, int32_t d
     }
 
     if (tokenNode == NULL) {
-        ret = AddNewTokenToListAndCfgFile(processname, dcaps, dacpNum, apl, &tokenId);
+        ret = AddNewTokenToListAndCfgFile(processname, dcaps, dcapNum, apl, &tokenId);
     } else {
-        int32_t needUpdate = CompareProcessInfo(tokenNode, dcaps, dacpNum, apl);
+        int32_t needUpdate = CompareProcessInfo(tokenNode, dcaps, dcapNum, apl);
         if (needUpdate != 0) {
-            ret = UpdateTokenInfoInList(tokenNode, dcaps, dacpNum, apl);
+            ret = UpdateTokenInfoInList(tokenNode, dcaps, dcapNum, apl);
             ret |= UpdateTokenInfoInCfgFile(tokenNode);
         }
     }
     if (ret != ATRET_SUCCESS) {
-        return 0;
+        return INVALID_TOKEN_ID;
     }
 
     atPoint->tokenId = tokenId;
diff --git a/interfaces/innerkits/nativetoken/test/BUILD.gn b/interfaces/innerkits/nativetoken/test/BUILD.gn
index 6b14f56e06e729f142c5a50743ff54bd3571bd2a..16f2b96b3170a369d3bd26ea9dbb74b1643418cc 100644
--- a/interfaces/innerkits/nativetoken/test/BUILD.gn
+++ b/interfaces/innerkits/nativetoken/test/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/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp
index 74b986ccf4f3a00b781086cc0f6603b2d91bbc14..44eb5cc82026b8a0cba97c77314b22dae4cea7ad 100644
--- a/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp
+++ b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_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
@@ -49,13 +49,13 @@ void TokenLibKitTest::TearDown()
 int Start(const char *processName)
 {
     const char *processname = processName;
-    const char **dcaps = (const char **)malloc(sizeof(char *) * 2);
+    const char **dcaps = new const char *[2];
     dcaps[0] = "AT_CAP";
     dcaps[1] = "ST_CAP";
     int dcapNum = 2;
     uint64_t tokenId;
     tokenId = GetAccessTokenId(processname, dcaps, dcapNum, "system_core");
-    free(dcaps);
+    delete[] dcaps;
     return tokenId;
 }
 
@@ -67,7 +67,7 @@ int Start(const char *processName)
  */
 HWTEST_F(TokenLibKitTest, GetAccessTokenId001, TestSize.Level1)
 {
-    const char **dcaps = (const char **)malloc(sizeof(char *) * 2);
+    const char **dcaps = new const char *[2];
     dcaps[0] = "AT_CAP";
     dcaps[1] = "ST_CAP";
     int dcapNum = 2;
@@ -91,7 +91,7 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId001, TestSize.Level1)
     const std::string validProcName02 (256, 'x');
     tokenId = GetAccessTokenId(validProcName02.c_str(), dcaps, dcapNum, "system_core");
     ASSERT_NE(tokenId, 0);
-    free(dcaps);
+    delete[] dcaps;
 }
 
 /**
@@ -102,7 +102,7 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId001, TestSize.Level1)
  */
 HWTEST_F(TokenLibKitTest, GetAccessTokenId002, TestSize.Level1)
 {
-    const char **dcaps = (const char **)malloc(sizeof(char *) * 32);
+    const char **dcaps = new const char *[32];
     dcaps[0] = "AT_CAP";
     dcaps[1] = "ST_CAP";
     int dcapNum = -1;
@@ -127,8 +127,8 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId002, TestSize.Level1)
     dcapNum = 31;
     tokenId = GetAccessTokenId("GetAccessTokenId002_02", dcaps, dcapNum, "system_core");
     ASSERT_NE(tokenId, 0);
-    
-    free(dcaps);
+
+    delete[] dcaps;
 }
 
 /**
@@ -139,7 +139,7 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId002, TestSize.Level1)
  */
 HWTEST_F(TokenLibKitTest, GetAccessTokenId003, TestSize.Level1)
 {
-    const char **dcaps = (const char **)malloc(sizeof(char *) * 2);
+    const char **dcaps = new const char *[2];
     dcaps[0] = "AT_CAP";
     dcaps[1] = "ST_CAP";
     int dcapNum = 2;
@@ -170,7 +170,7 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId003, TestSize.Level1)
     tokenId = GetAccessTokenId("GetAccessTokenId003_04", dcaps, dcapNum, "system_core");
     ASSERT_NE(tokenId, 0);
 
-    free(dcaps);
+    delete[] dcaps;
 }
 
 /**
@@ -181,7 +181,7 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId003, TestSize.Level1)
  */
 HWTEST_F(TokenLibKitTest, GetAccessTokenId004, TestSize.Level1)
 {
-    const char **dcaps = (const char **)malloc(sizeof(char *) * 2);
+    const char **dcaps = new const char *[2];
     dcaps[0] = "AT_CAP";
     dcaps[1] = "ST_CAP";
     int dcapNum = 2;
@@ -192,7 +192,7 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId004, TestSize.Level1)
     tokenId = GetAccessTokenId("GetAccessTokenId003", dcaps, dcapNum, "system_invalid");
     ASSERT_EQ(tokenId, 0);
 
-    free(dcaps);
+    delete[] dcaps;
 }
 
 /**
diff --git a/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.h b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.h
index 8aa651750f1c4f3574a207244d2ab18b9748b7aa..59b315af49024cbb91f9cccdbf7fb956fcc1b130 100644
--- a/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.h
+++ b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_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/interfaces/innerkits/token_setproc/BUILD.gn b/interfaces/innerkits/token_setproc/BUILD.gn
index 1cdcc6f30fa29c6f692687978be72557a8d4818b..edbdb874b4bf76d6246b25a5b554b99045cbcf12 100644
--- a/interfaces/innerkits/token_setproc/BUILD.gn
+++ b/interfaces/innerkits/token_setproc/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 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
@@ -13,9 +13,6 @@
 
 import("//build/ohos.gni")
 
-################################################################
-# C, Main, source file here.
-################################################################
 config("token_setproc") {
   visibility = [ ":*" ]
   include_dirs = [ "include" ]
diff --git a/interfaces/innerkits/token_setproc/include/token_setproc.h b/interfaces/innerkits/token_setproc/include/token_setproc.h
index 81c75d92a8e3ee037873e1f005da985311305c72..aa1b77bd55e785d040247dd91eee8d333c37eae3 100644
--- a/interfaces/innerkits/token_setproc/include/token_setproc.h
+++ b/interfaces/innerkits/token_setproc/include/token_setproc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 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/src/token_setproc.c b/interfaces/innerkits/token_setproc/src/token_setproc.c
index b2d09dbef5e0e164992bdfe4069f57214e58b470..14363d5958545bc574a29c5913473d688be89518 100644
--- a/interfaces/innerkits/token_setproc/src/token_setproc.c
+++ b/interfaces/innerkits/token_setproc/src/token_setproc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 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 9cac0ef6575dff6f3bcef74c713cdd852941cc81..50eeb5261ee22de007f3cd4d34360585c5823176 100644
--- a/interfaces/innerkits/token_setproc/test/BUILD.gn
+++ b/interfaces/innerkits/token_setproc/test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 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/unittest/src/tokensetproc_kit_test.cpp b/interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.cpp
index 5fe3f833c5a6486f5b489479abf2c07136ba771e..c6f94bbc01d6061d8eb8017e9bf22f120f190570 100644
--- a/interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.cpp
+++ b/interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 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/unittest/src/tokensetproc_kit_test.h b/interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.h
index 29bef17d2590d7867c5693ac490d95bd9756d104..2da208d9baa67b1e1f9965a4370319774d10bd08 100644
--- a/interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.h
+++ b/interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 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 aa92f46a9d3d122da6b910c5c2a06944c21c525b..20df0ec3255ef896a951340304d1b213b6ebdcff 100644
--- a/interfaces/innerkits/tokensync/BUILD.gn
+++ b/interfaces/innerkits/tokensync/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 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
@@ -13,9 +13,6 @@
 
 import("//build/ohos.gni")
 
-################################################################
-# C++, Main, source file here.
-################################################################
 config("tokensync") {
   visibility = [ ":*" ]
   include_dirs = [ "include" ]
diff --git a/interfaces/innerkits/tokensync/test/BUILD.gn b/interfaces/innerkits/tokensync/test/BUILD.gn
index 87a14097bf1e6345aeb8597bb12132bcb2dcf9d3..fd5e262678ce2b168df126ed7234a84120c74dad 100644
--- a/interfaces/innerkits/tokensync/test/BUILD.gn
+++ b/interfaces/innerkits/tokensync/test/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 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/unittest/src/token_sync_kit_test.cpp b/interfaces/innerkits/tokensync/test/unittest/src/token_sync_kit_test.cpp
index f4587575b34f69b858bce6663c3dfac86978bd74..1c46de6b015a83aa15d2c7d21824dba24f1a82ed 100644
--- a/interfaces/innerkits/tokensync/test/unittest/src/token_sync_kit_test.cpp
+++ b/interfaces/innerkits/tokensync/test/unittest/src/token_sync_kit_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 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/unittest/src/token_sync_kit_test.h b/interfaces/innerkits/tokensync/test/unittest/src/token_sync_kit_test.h
index 1cb07f236b89a505565630b2bd89991f91a04f45..7f9e942d3e61d672c368e11bf77c566dad709dc2 100644
--- a/interfaces/innerkits/tokensync/test/unittest/src/token_sync_kit_test.h
+++ b/interfaces/innerkits/tokensync/test/unittest/src/token_sync_kit_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 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/kits/BUILD.gn b/interfaces/kits/BUILD.gn
index cf2e891f45c8dcb8c021206503fd70779de42fa1..39aa55613fbf4910372b0c60076471c61c2e8310 100644
--- a/interfaces/kits/BUILD.gn
+++ b/interfaces/kits/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/interfaces/kits/accesstoken/napi/include/napi_atmanager.h b/interfaces/kits/accesstoken/napi/include/napi_atmanager.h
index a9a0de9a73d1efafe1c926f14afc5410cba7bfb0..f6d444a7862469e8c1e4f752d2f747b16d17effc 100644
--- a/interfaces/kits/accesstoken/napi/include/napi_atmanager.h
+++ b/interfaces/kits/accesstoken/napi/include/napi_atmanager.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/services/accesstokenmanager/BUILD.gn b/services/accesstokenmanager/BUILD.gn
index 62358bea192b55648977a879be6d73c4eaa8efd6..9862a58ab5e450c64a83ea318a09c3b15c35e68d 100644
--- a/services/accesstokenmanager/BUILD.gn
+++ b/services/accesstokenmanager/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/accesstokenmanager/access_token.rc b/services/accesstokenmanager/access_token.rc
index 68b9f548b6f5f31b3fc30abc1da6be5c14c380d4..481f379ac48282dbf8c8d7cfdfecfefbde900fe4 100644
--- a/services/accesstokenmanager/access_token.rc
+++ b/services/accesstokenmanager/access_token.rc
@@ -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/accesstokenmanager/main/cpp/include/database/data_storage.h b/services/accesstokenmanager/main/cpp/include/database/data_storage.h
index 9233596bbb9931ea52eb3fb95d6d6a7f5a9bf01a..0d69fb9ddc1b4d3916529e669fefa11c45838562 100644
--- a/services/accesstokenmanager/main/cpp/include/database/data_storage.h
+++ b/services/accesstokenmanager/main/cpp/include/database/data_storage.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/services/accesstokenmanager/main/cpp/include/database/data_translator.h b/services/accesstokenmanager/main/cpp/include/database/data_translator.h
index 1be472818eab2de3bcd06bb96afd0ecceabfcb71..a731e9b2f60f72b4ec0ae9c6891da4815b795f7b 100644
--- a/services/accesstokenmanager/main/cpp/include/database/data_translator.h
+++ b/services/accesstokenmanager/main/cpp/include/database/data_translator.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/services/accesstokenmanager/main/cpp/include/database/field_const.h b/services/accesstokenmanager/main/cpp/include/database/field_const.h
index a73a3a9d314fda1c6c70ad8461ab5681645cf8b4..7e75ef13a76e59bcfa8c96057a336a4d8f8ad089 100644
--- a/services/accesstokenmanager/main/cpp/include/database/field_const.h
+++ b/services/accesstokenmanager/main/cpp/include/database/field_const.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/services/accesstokenmanager/main/cpp/include/database/generic_values.h b/services/accesstokenmanager/main/cpp/include/database/generic_values.h
index 55c6b7ba64fb1636c2585dde5000811bb9120ed8..6886d3c68911147ac11f5302e2a3132c31449696 100644
--- a/services/accesstokenmanager/main/cpp/include/database/generic_values.h
+++ b/services/accesstokenmanager/main/cpp/include/database/generic_values.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/services/accesstokenmanager/main/cpp/include/database/sqlite_helper.h b/services/accesstokenmanager/main/cpp/include/database/sqlite_helper.h
index 003859839211d37a85d318c30ef86e0b148ebe9a..0f0979ab42aac63353939a4a363f24b83a6c07c9 100644
--- a/services/accesstokenmanager/main/cpp/include/database/sqlite_helper.h
+++ b/services/accesstokenmanager/main/cpp/include/database/sqlite_helper.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/services/accesstokenmanager/main/cpp/include/database/sqlite_storage.h b/services/accesstokenmanager/main/cpp/include/database/sqlite_storage.h
index 5aeb7871341fbd0d0d4f0762a3ca69704a9d2885..95a04ab61b5534c3fd0f12f954184e09c4fb2db6 100644
--- a/services/accesstokenmanager/main/cpp/include/database/sqlite_storage.h
+++ b/services/accesstokenmanager/main/cpp/include/database/sqlite_storage.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/services/accesstokenmanager/main/cpp/include/database/statement.h b/services/accesstokenmanager/main/cpp/include/database/statement.h
index e84ec0b2fe71f814c82843855dbd9703d4626127..1f2f5c092c0425ab803c56b2fb304d7d6890a36e 100644
--- a/services/accesstokenmanager/main/cpp/include/database/statement.h
+++ b/services/accesstokenmanager/main/cpp/include/database/statement.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/services/accesstokenmanager/main/cpp/include/database/variant_value.h b/services/accesstokenmanager/main/cpp/include/database/variant_value.h
index cfb16f8e1648b814d8bf923d7582c5a36a5294b9..00a1e2a90bc144eedb7c3bbf0bb8982509df9364 100644
--- a/services/accesstokenmanager/main/cpp/include/database/variant_value.h
+++ b/services/accesstokenmanager/main/cpp/include/database/variant_value.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/services/accesstokenmanager/main/cpp/include/permission/permission_definition_cache.h b/services/accesstokenmanager/main/cpp/include/permission/permission_definition_cache.h
index 969509549fa13748ead6a52ffc47dce33b82ec83..76cb640fb5d39a58f43419724c56fba0c7148186 100644
--- a/services/accesstokenmanager/main/cpp/include/permission/permission_definition_cache.h
+++ b/services/accesstokenmanager/main/cpp/include/permission/permission_definition_cache.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/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h b/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h
index 683a8f611e56e41a30cfca5b0bd8b7f448b52c1a..cdc0881273febe641aae0d8df460731e9c24c1fb 100644
--- a/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h
+++ b/services/accesstokenmanager/main/cpp/include/permission/permission_manager.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/services/accesstokenmanager/main/cpp/include/permission/permission_policy_set.h b/services/accesstokenmanager/main/cpp/include/permission/permission_policy_set.h
index 3208b6f2072f86c1530b9f8fab7a650bee63499a..38eb71d560746089444e8eda7c97dfbdc8898610 100644
--- a/services/accesstokenmanager/main/cpp/include/permission/permission_policy_set.h
+++ b/services/accesstokenmanager/main/cpp/include/permission/permission_policy_set.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/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h b/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h
index 99dad5945bc90c0c8c5397c1af0c2e8b1f9a249d..97aa044f00503ce29d76ba86f5ab8d0ff7299bc8 100644
--- a/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h
+++ b/services/accesstokenmanager/main/cpp/include/permission/permission_validator.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/services/accesstokenmanager/main/cpp/include/token/accesstoken_id_manager.h b/services/accesstokenmanager/main/cpp/include/token/accesstoken_id_manager.h
index 4d4ac8ba468ff7e9b919fe274f75aa71f6e2d17e..d3ba10be73a14c33bef96055d9015e6d6e8d1473 100644
--- a/services/accesstokenmanager/main/cpp/include/token/accesstoken_id_manager.h
+++ b/services/accesstokenmanager/main/cpp/include/token/accesstoken_id_manager.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/services/accesstokenmanager/main/cpp/include/token/hap_token_info_inner.h b/services/accesstokenmanager/main/cpp/include/token/hap_token_info_inner.h
index 087d692ed52ce5f1ba527d31467d2c9f4e565808..c28b41298f9844068300b0e43d3559e17f740d09 100644
--- a/services/accesstokenmanager/main/cpp/include/token/hap_token_info_inner.h
+++ b/services/accesstokenmanager/main/cpp/include/token/hap_token_info_inner.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/services/accesstokenmanager/main/cpp/include/token/native_token_info_inner.h b/services/accesstokenmanager/main/cpp/include/token/native_token_info_inner.h
index f76e1ba0537a310b46723005146d0f374ffb59a7..e6b1b793dc5880712ab37c90fe6d38fe12f2c108 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
@@ -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/accesstokenmanager/main/cpp/include/token/native_token_receptor.h b/services/accesstokenmanager/main/cpp/include/token/native_token_receptor.h
index 53097f3fc8586c8ae1ea11da979e666766f081a6..e2cad901f4f815fcf70f4ff9b2183b1e9978a626 100644
--- a/services/accesstokenmanager/main/cpp/include/token/native_token_receptor.h
+++ b/services/accesstokenmanager/main/cpp/include/token/native_token_receptor.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/services/accesstokenmanager/main/cpp/src/database/data_storage.cpp b/services/accesstokenmanager/main/cpp/src/database/data_storage.cpp
index 90559c6c21a5eb387454fb2359357496a90e4558..01970dd1b23566270fff0e46bd4715c657a5c145 100644
--- a/services/accesstokenmanager/main/cpp/src/database/data_storage.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/data_storage.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/accesstokenmanager/main/cpp/src/database/data_translator.cpp b/services/accesstokenmanager/main/cpp/src/database/data_translator.cpp
index d601e0ed4af8dbcabedb8dbd783b753b19a9fa81..b341c78ca90b4ed8f875ac0501289d0b45451794 100644
--- a/services/accesstokenmanager/main/cpp/src/database/data_translator.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/data_translator.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/accesstokenmanager/main/cpp/src/database/generic_values.cpp b/services/accesstokenmanager/main/cpp/src/database/generic_values.cpp
index db130ace6e4fcbb6e28f8c6da1d7e68eceb220e1..cc4804a5ba611c856dc6d846c1c32a5473a76c6b 100644
--- a/services/accesstokenmanager/main/cpp/src/database/generic_values.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/generic_values.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/accesstokenmanager/main/cpp/src/database/sqlite_helper.cpp b/services/accesstokenmanager/main/cpp/src/database/sqlite_helper.cpp
index 0e878fd339a08c34691353f25aaed6dd234fa8af..edeabdbfd7e8c975c421bbc4018df9f308e0eccd 100644
--- a/services/accesstokenmanager/main/cpp/src/database/sqlite_helper.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/sqlite_helper.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/accesstokenmanager/main/cpp/src/database/sqlite_storage.cpp b/services/accesstokenmanager/main/cpp/src/database/sqlite_storage.cpp
index f929760e36b91c0a9bcef9432eee4156e0095efc..6ed9497a01868bf4e87ebd048c7afc2682968ad3 100644
--- a/services/accesstokenmanager/main/cpp/src/database/sqlite_storage.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/sqlite_storage.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/accesstokenmanager/main/cpp/src/database/statement.cpp b/services/accesstokenmanager/main/cpp/src/database/statement.cpp
index 42d2e3656cee9892ade9ef89d8f3ea5a3dcd3f4c..3871387423899716d7bf27b9d05378505628df09 100644
--- a/services/accesstokenmanager/main/cpp/src/database/statement.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/statement.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/accesstokenmanager/main/cpp/src/database/variant_value.cpp b/services/accesstokenmanager/main/cpp/src/database/variant_value.cpp
index 3dae3273105551fd698c8f270de4b0d8198d9802..f849bbcc7719e977366a7a5b2498025a766025cc 100644
--- a/services/accesstokenmanager/main/cpp/src/database/variant_value.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/variant_value.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/accesstokenmanager/main/cpp/src/permission/permission_definition_cache.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_cache.cpp
index 54917c49cc0c8236eef79fb02ba0289e38b44cc6..2f32086145d566e06455b1683ca4ae5e6ff4bbb1 100644
--- a/services/accesstokenmanager/main/cpp/src/permission/permission_definition_cache.cpp
+++ b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_cache.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/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
index cf795e7b321c88316f82ffd7219dce09ef0b0ae3..4f352d8b3c1307a4f08cc8ce29273170894af321 100644
--- a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
+++ b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.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/accesstokenmanager/main/cpp/src/permission/permission_validator.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_validator.cpp
index 848675ec4aa2680176826d7213cf931001967dfa..474be8e67ac3971050a8a05cdea39dcf2cdf1cce 100644
--- a/services/accesstokenmanager/main/cpp/src/permission/permission_validator.cpp
+++ b/services/accesstokenmanager/main/cpp/src/permission/permission_validator.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/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
index fe3f37809cb89040ca44a0b1468ced6f2efc9f2f..bf92f5464825380ea37c882f705f4fec5fc82d11 100644
--- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
+++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
@@ -230,7 +230,8 @@ void AccessTokenManagerStub::GetHapTokenIDInner(MessageParcel& data, MessageParc
 
 void AccessTokenManagerStub::AllocLocalTokenIDInner(MessageParcel& data, MessageParcel& reply)
 {
-    if (!IsAuthorizedCalling()) {
+    AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID();
+    if ((!IsAuthorizedCalling()) && (this->GetTokenType(tokenCaller) != TOKEN_NATIVE)) {
         ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called, permission denied", __func__);
         reply.WriteInt32(RET_FAILED);
         return;
@@ -272,7 +273,8 @@ void AccessTokenManagerStub::GetHapTokenInfoInner(MessageParcel& data, MessagePa
 
 void AccessTokenManagerStub::GetNativeTokenInfoInner(MessageParcel& data, MessageParcel& reply)
 {
-    if (!IsAuthorizedCalling()) {
+    AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID();
+    if ((!IsAuthorizedCalling()) && (this->GetTokenType(tokenCaller) != TOKEN_NATIVE)) {
         ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called, permission denied", __func__);
         reply.WriteInt32(RET_FAILED);
         return;
diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp
index 56d491df5380d9c6061b4fda32ef79d2ea9cbfe6..aacac14169da3811dd243acf65fcdcfde3c943dc 100644
--- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp
+++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.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/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp b/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp
index c6369f017d125f8b804171bd1302c99fb9c95ef1..de1ff1aaaa045b7585c178412091282f2cd609c1 100644
--- a/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.cpp
+++ b/services/accesstokenmanager/main/cpp/src/token/native_token_receptor.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/accesstokenmanager/main/sa_profile/3503.xml b/services/accesstokenmanager/main/sa_profile/3503.xml
index d20563c4603417e3bc8da37829532ecf5be110d3..f1746070219d37110bd7d66ee23b38e63d6d03ce 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 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/sa_profile/BUILD.gn b/services/accesstokenmanager/main/sa_profile/BUILD.gn
index c199a410c692bb3ecc713336c8f02718acf3731f..db9232f267cccbfd90e5875da53c080e98f914a4 100644
--- a/services/accesstokenmanager/main/sa_profile/BUILD.gn
+++ b/services/accesstokenmanager/main/sa_profile/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/accesstokenmanager/test/BUILD.gn b/services/accesstokenmanager/test/BUILD.gn
index 208ff66dde4913d96ed23f98b25b168c0d2905f4..ae4871cf07186c2cdccecdcdc4e6e1d579917b48 100644
--- a/services/accesstokenmanager/test/BUILD.gn
+++ b/services/accesstokenmanager/test/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/accesstokenmanager/test/unittest/cpp/src/accesstoken_info_manager_test.h b/services/accesstokenmanager/test/unittest/cpp/src/accesstoken_info_manager_test.h
index 3d92f465012463b0cae197e70846727999270286..03cbc7d1ca1a4d911f9b9e199085d3161cbf3e1c 100644
--- a/services/accesstokenmanager/test/unittest/cpp/src/accesstoken_info_manager_test.h
+++ b/services/accesstokenmanager/test/unittest/cpp/src/accesstoken_info_manager_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/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp b/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp
index 484ef456e8fdf110bb0d7cb5bd34a5ed656f81e4..3755b945125d4958d052503acee2b3b81735ea16 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
@@ -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
@@ -551,13 +551,13 @@ HWTEST_F(NativeTokenReceptorTest, init001, TestSize.Level1)
     ACCESSTOKEN_LOG_INFO(LABEL, "test init001!");
     std::vector<std::shared_ptr<NativeTokenInfoInner>> tokenInfos;
 
-    const char **dcaps = (const char **)malloc(sizeof(char *) * 1);
+    const char *dcaps[1];
     dcaps[0] = "AT_CAP_01";
     int dcapNum = 1;
     char processName[32];
-    strcpy(processName, "native_token_test7");
+    (void)strcpy_s(processName, sizeof(processName), "native_token_test7");
     char apl[32];
-    strcpy(apl, "system_core");
+    (void)strcpy_s(apl, sizeof(apl), "system_core");
 
     uint64_t tokenId = ::GetAccessTokenId(processName, dcaps, dcapNum, apl);
     ASSERT_NE(tokenId, 0);
@@ -582,16 +582,16 @@ HWTEST_F(NativeTokenReceptorTest, ProcessNativeTokenInfos007, TestSize.Level1)
 {
     ACCESSTOKEN_LOG_INFO(LABEL, "test ProcessNativeTokenInfos007!");
 
-    const char **dcaps = (const char **)malloc(sizeof(char *) * 1);
+    const char *dcaps[1];
     dcaps[0] = "AT_CAP_01";
     int dcapNum = 1;
 
     char apl3[32];
-    strcpy(apl3, "system_core");
+    (void)strcpy_s(apl3, sizeof(apl3), "system_core");
     char apl2[32];
-    strcpy(apl2, "system_basic");
+    (void)strcpy_s(apl2, sizeof(apl2), "system_basic");
     char apl1[32];
-    strcpy(apl1, "normal");
+    (void)strcpy_s(apl1, sizeof(apl1), "normal");
 
     uint64_t tokenIdApl3 = ::GetAccessTokenId("ProcessNativeTokenInfos007_003", dcaps, dcapNum, apl3);
     ASSERT_NE(tokenIdApl3, 0);
diff --git a/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.h b/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.h
index 1df01e7d45c2a77f575ca71b99762bf2b5ec7a14..f03f06442b5cfe201e4c301005a47b98675f0713 100644
--- a/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.h
+++ b/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_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/services/tokensyncmanager/BUILD.gn b/services/tokensyncmanager/BUILD.gn
index 3bc2dda6c645bf0b520ef4bf4fb50bfca10ebc2a..65e7b718ae1f82cb8d2ed40e0593634f8cd237f5 100644
--- a/services/tokensyncmanager/BUILD.gn
+++ b/services/tokensyncmanager/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/include/command/base_remote_command.h b/services/tokensyncmanager/include/command/base_remote_command.h
index 6af5f58a0b4508e138f89f2402d303932bdb81d7..2289251c243297abc9e56e770693a5fed981d1d2 100644
--- a/services/tokensyncmanager/include/command/base_remote_command.h
+++ b/services/tokensyncmanager/include/command/base_remote_command.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 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/services/tokensyncmanager/include/common/constant.h b/services/tokensyncmanager/include/common/constant.h
index be2191d963779e4dcdc75e1c0864734d2abbb62f..db8e50bf840537bc691087a68f474f1ece87db31 100644
--- a/services/tokensyncmanager/include/common/constant.h
+++ b/services/tokensyncmanager/include/common/constant.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 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/services/tokensyncmanager/sa_profile/3504.xml b/services/tokensyncmanager/sa_profile/3504.xml
index c8ea08efdfb27e807a890937bfe6083dc9c2664f..87a9f697daaad8301de366567b208d6937dfbc2d 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 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/sa_profile/BUILD.gn b/services/tokensyncmanager/sa_profile/BUILD.gn
index 4491128f6337573adf2d7c2af314ac1343fdb2c6..40f847501ee622406f73588ec2257b9b4f32ee4e 100644
--- a/services/tokensyncmanager/sa_profile/BUILD.gn
+++ b/services/tokensyncmanager/sa_profile/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/src/common/constant.cpp b/services/tokensyncmanager/src/common/constant.cpp
index dfa24e22ffc07e62457e6ddbd0b1da43d1829ead..ac90d7d1990ba4086a8691fc8d551320833f42d8 100644
--- a/services/tokensyncmanager/src/common/constant.cpp
+++ b/services/tokensyncmanager/src/common/constant.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/src/device/device_info_repository.cpp b/services/tokensyncmanager/src/device/device_info_repository.cpp
index 6bbff99c1cc81bdda4823b3e3831c85b8a9587bf..ed457b2956400141fc52096737d86363109a2a8a 100644
--- a/services/tokensyncmanager/src/device/device_info_repository.cpp
+++ b/services/tokensyncmanager/src/device/device_info_repository.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/src/remote/remote_command_executor.cpp b/services/tokensyncmanager/src/remote/remote_command_executor.cpp
index 553decea9ad2958ff24b4874000f68ca3b39ef32..66e5e0d78fd135be2ceb4c7985ad416a99fbb915 100644
--- a/services/tokensyncmanager/src/remote/remote_command_executor.cpp
+++ b/services/tokensyncmanager/src/remote/remote_command_executor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 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/services/tokensyncmanager/src/remote/remote_command_factory.cpp b/services/tokensyncmanager/src/remote/remote_command_factory.cpp
index 266ef585b83ca5e7df284e6c0cfaf11c2ec47c34..d467b26beb8a917fac894e076f1e80d5f80d528f 100644
--- a/services/tokensyncmanager/src/remote/remote_command_factory.cpp
+++ b/services/tokensyncmanager/src/remote/remote_command_factory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 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/services/tokensyncmanager/src/remote/soft_bus_channel.cpp b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
index 7fe78a6d14c5cd2437df24f9297e5ac2a8c2c9c2..a71a1f7d274e09b7c1ea19766080e6d055cb9046 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
@@ -134,15 +134,15 @@ std::string SoftBusChannel::ExecuteCommand(const std::string &commandName, const
     ACCESSTOKEN_LOG_DEBUG(LABEL, "generated message uuid: %{public}s", uuid.c_str());
 
     int len = RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length();
-    unsigned char *buf = (unsigned char *) malloc(len + 1);
+    unsigned char *buf = new unsigned char[len + 1];
     if (buf == nullptr) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "no enough memory: %{public}d", len);
         return "";
     }
-    memset_s(buf, len + 1, 0, len + 1);
+    (void)memset_s(buf, len + 1, 0, len + 1);
     int result = PrepareBytes(REQUEST_TYPE, uuid, commandName, jsonPayload, buf, len);
     if (result != Constant::SUCCESS) {
-        free(buf);
+        delete[] buf;
         return "";
     }
 
@@ -159,7 +159,7 @@ std::string SoftBusChannel::ExecuteCommand(const std::string &commandName, const
     lock.unlock();
 
     int retCode = SendRequestBytes(buf, len);
-    free(buf);
+    delete[] buf;
 
     std::unique_lock<std::mutex> lock2(sessionMutex_);
     if (retCode != Constant::SUCCESS) {
@@ -261,23 +261,23 @@ std::string SoftBusChannel::Decompress(const unsigned char *bytes, const int len
 {
     ACCESSTOKEN_LOG_DEBUG(LABEL, "input length: %{public}d", length);
     uLong len = RPC_TRANSFER_BYTES_MAX_LENGTH;
-    unsigned char *buf = (unsigned char *) malloc(len + 1);
+    unsigned char *buf = new unsigned char[len + 1];
     if (buf == nullptr) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "no enough memory!");
         return "";
     }
-    memset_s(buf, len + 1, 0, len + 1);
+    (void)memset_s(buf, len + 1, 0, len + 1);
     int result = uncompress(buf, &len, (unsigned char *) bytes, length);
     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);
-        free(buf);
+        delete[] buf;
         return "";
     }
     buf[len] = '\0';
     std::string str((char *) buf);
-    free(buf);
+    delete[] buf;
     ACCESSTOKEN_LOG_DEBUG(LABEL, "done, output: %{public}s", str.c_str());
     return str;
 }
@@ -353,19 +353,19 @@ void SoftBusChannel::HandleRequest(int session, const std::string &id, const std
             jsonPayload.c_str());
 
         int sendlen = RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length();
-        unsigned char *sendbuf = (unsigned char *) malloc(sendlen + 1);
+        unsigned char *sendbuf = new unsigned char[sendlen + 1];
         if (sendbuf == nullptr) {
             ACCESSTOKEN_LOG_ERROR(LABEL, "no enough memory: %{public}d", sendlen);
             return;
         }
-        memset_s(sendbuf, sendlen + 1, 0, sendlen + 1);
+        (void)memset_s(sendbuf, sendlen + 1, 0, sendlen + 1);
         int sendResult = PrepareBytes(RESPONSE_TYPE, id, commandName, jsonPayload, sendbuf, sendlen);
         if (sendResult != Constant::SUCCESS) {
-            free(sendbuf);
+            delete[] sendbuf;
             return;
         }
         int sendResultCode = SendResponseBytes(session, sendbuf, sendlen);
-        free(sendbuf);
+        delete[] sendbuf;
         ACCESSTOKEN_LOG_DEBUG(LABEL, "send response result= %{public}d ", sendResultCode);
         return;
     }
@@ -379,19 +379,19 @@ void SoftBusChannel::HandleRequest(int session, const std::string &id, const std
     // send result back
     std::string resultJsonPayload = command->ToJsonPayload();
     int len = RPC_TRANSFER_HEAD_BYTES_LENGTH + resultJsonPayload.length();
-    unsigned char *buf = (unsigned char *) malloc(len + 1);
+    unsigned char *buf = new unsigned char[len + 1];
     if (buf == nullptr) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "no enough memory: %{public}d", len);
         return;
     }
-    memset_s(buf, len + 1, 0, len + 1);
+    (void)memset_s(buf, len + 1, 0, len + 1);
     int result = PrepareBytes(RESPONSE_TYPE, id, commandName, resultJsonPayload, buf, len);
     if (result != Constant::SUCCESS) {
-        free(buf);
+        delete[] buf;
         return;
     }
     int retCode = SendResponseBytes(session, buf, len);
-    free(buf);
+    delete[] buf;
     ACCESSTOKEN_LOG_DEBUG(LABEL, "send response result= %{public}d", retCode);
 }
 
diff --git a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp
index fae3e97ddc76031a7dc971d6efa00cd4116480d0..46b41a86ce98ad2ccd39cb84cc6d675aeaab985b 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 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
@@ -271,21 +271,21 @@ std::string SoftBusManager::GetUniqueDisabilityIdByNodeId(const std::string &nod
 
 std::string SoftBusManager::GetUuidByNodeId(const std::string &nodeId) const
 {
-    uint8_t *info = (uint8_t *) malloc(UDID_MAX_LENGTH + 1);
+    uint8_t *info = new uint8_t[UDID_MAX_LENGTH + 1];
     if (info == nullptr) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "no enough memory: %{public}d", UDID_MAX_LENGTH);
         return "";
     }
-    memset_s(info, UDID_MAX_LENGTH + 1, 0, UDID_MAX_LENGTH + 1);
+    (void)memset_s(info, UDID_MAX_LENGTH + 1, 0, UDID_MAX_LENGTH + 1);
     int32_t ret = ::GetNodeKeyInfo(ACCESS_TOKEN_PACKAGE_NAME.c_str(), nodeId.c_str(),
         NodeDeviceInfoKey::NODE_KEY_UUID, info, UDID_MAX_LENGTH);
     if (ret != Constant::SUCCESS) {
-        free(info);
+        delete[] info;
         ACCESSTOKEN_LOG_WARN(LABEL, "GetNodeKeyInfo error, return code: %{public}d", ret);
         return "";
     }
     std::string uuid((char *) info);
-    free(info);
+    delete[] info;
     ACCESSTOKEN_LOG_DEBUG(LABEL, "call softbus finished. nodeId(in): %{public}s, uuid: %{public}s", nodeId.c_str(),
         uuid.c_str());
     return uuid;
@@ -293,21 +293,21 @@ std::string SoftBusManager::GetUuidByNodeId(const std::string &nodeId) const
 
 std::string SoftBusManager::GetUdidByNodeId(const std::string &nodeId) const
 {
-    uint8_t *info = (uint8_t *) malloc(UDID_MAX_LENGTH + 1);
+    uint8_t *info = new uint8_t[UDID_MAX_LENGTH + 1];
     if (info == nullptr) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "no enough memory: %{public}d", UDID_MAX_LENGTH);
         return "";
     }
-    memset_s(info, UDID_MAX_LENGTH + 1, 0, UDID_MAX_LENGTH + 1);
+    (void)memset_s(info, UDID_MAX_LENGTH + 1, 0, UDID_MAX_LENGTH + 1);
     int32_t ret = ::GetNodeKeyInfo(ACCESS_TOKEN_PACKAGE_NAME.c_str(), nodeId.c_str(),
         NodeDeviceInfoKey::NODE_KEY_UDID, info, UDID_MAX_LENGTH);
     if (ret != Constant::SUCCESS) {
-        free(info);
+        delete[] info;
         ACCESSTOKEN_LOG_WARN(LABEL, "GetNodeKeyInfo error, code: %{public}d", ret);
         return "";
     }
     std::string udid((char *) info);
-    free(info);
+    delete[] info;
     ACCESSTOKEN_LOG_DEBUG(LABEL, "call softbus finished: nodeId(in): %{public}s, udid: %{public}s", nodeId.c_str(),
         udid.c_str());
     return udid;
diff --git a/services/tokensyncmanager/test/mock/src/soft_bus_session_mock.cpp b/services/tokensyncmanager/test/mock/src/soft_bus_session_mock.cpp
index a79a402bf00fab673dfb9e9fde2b0a083bd0ff52..6cb349e4d20511c78b870693b0c13eafc6cf6602 100644
--- a/services/tokensyncmanager/test/mock/src/soft_bus_session_mock.cpp
+++ b/services/tokensyncmanager/test/mock/src/soft_bus_session_mock.cpp
@@ -160,7 +160,7 @@ void DecompressMock(const unsigned char *bytes, const int length)
         ACCESSTOKEN_LOG_ERROR(LABEL, "no enough memory!");
         return;
     }
-    memset_s(buf, len + 1, 0, len + 1);
+    (void)memset_s(buf, len + 1, 0, len + 1);
     int result = uncompress(buf, &len, (unsigned char *) bytes, length);
     if (result != Z_OK) {
         ACCESSTOKEN_LOG_ERROR(LABEL,