From 507961d43c97fb2eb434f0d0e62ae465004826e8 Mon Sep 17 00:00:00 2001
From: l00520400 <linshuqing2@huawei.com>
Date: Wed, 2 Mar 2022 14:45:34 +0800
Subject: [PATCH] issue

Signed-off-by: l00520400 <linshuqing2@huawei.com>
Change-Id: I483b2927ee22d59fa43a2c786739faba1859ed88
Signed-off-by: l00520400 <linshuqing2@huawei.com>
---
 BUILD.gn                                      | 10 ----
 LICENSE                                       |  0
 OAT.xml                                       |  2 +-
 README_zh.md                                  |  7 +--
 bundle.json                                   |  0
 frameworks/accesstoken/BUILD.gn               |  5 +-
 .../accesstoken/include/hap_info_parcel.h     |  2 +-
 .../accesstoken/include/hap_policy_parcel.h   |  2 +-
 .../include/hap_token_info_parcel.h           |  2 +-
 .../include/native_token_info_parcel.h        |  2 +-
 .../include/permission_def_parcel.h           |  2 +-
 .../include/permission_state_full_parcel.h    |  2 +-
 .../accesstoken/src/hap_info_parcel.cpp       |  2 +-
 .../accesstoken/src/hap_policy_parcel.cpp     |  2 +-
 .../accesstoken/src/hap_token_info_parcel.cpp |  2 +-
 .../src/native_token_info_parcel.cpp          |  2 +-
 .../accesstoken/src/permission_def_parcel.cpp |  2 +-
 .../src/permission_state_full_parcel.cpp      |  2 +-
 frameworks/com.ohos.permissionmanager/gradlew |  2 +-
 .../com.ohos.permissionmanager/gradlew.bat    |  2 +-
 frameworks/common/BUILD.gn                    |  5 +-
 frameworks/common/include/accesstoken_log.h   |  2 +-
 frameworks/common/include/data_validator.h    |  2 +-
 frameworks/common/include/random.h            |  2 +-
 frameworks/common/include/random_mbedtls.h    |  2 +-
 frameworks/common/src/data_validator.cpp      |  2 +-
 frameworks/common/src/random_mbedtls.cpp      |  2 +-
 .../tokensync/include/i_token_sync_manager.h  |  2 +-
 interfaces/innerkits/accesstoken/BUILD.gn     |  5 +-
 .../accesstoken/include/access_token.h        |  2 +-
 .../accesstoken/include/accesstoken.h         |  2 +-
 .../accesstoken/include/hap_token_info.h      |  2 +-
 .../accesstoken/include/native_token_info.h   |  2 +-
 .../accesstoken/include/permission_def.h      |  2 +-
 .../include/permission_state_full.h           |  2 +-
 .../src/accesstoken_manager_client.cpp        |  2 +-
 .../innerkits/accesstoken/test/BUILD.gn       |  2 +-
 .../unittest/src/accesstoken_kit_test.cpp     |  8 +--
 .../test/unittest/src/accesstoken_kit_test.h  |  2 +-
 interfaces/innerkits/nativetoken/BUILD.gn     |  5 +-
 .../nativetoken/include/nativetoken.h         |  4 +-
 .../nativetoken/include/nativetoken_kit.h     |  2 +-
 .../nativetoken/include/nativetoken_log.h     |  4 +-
 .../innerkits/nativetoken/src/nativetoken.c   | 58 +++++++++----------
 .../innerkits/nativetoken/test/BUILD.gn       |  2 +-
 .../unittest/src/nativetoken_kit_test.cpp     | 24 ++++----
 .../test/unittest/src/nativetoken_kit_test.h  |  2 +-
 interfaces/innerkits/token_setproc/BUILD.gn   |  5 +-
 .../token_setproc/include/token_setproc.h     |  2 +-
 .../token_setproc/src/token_setproc.c         |  2 +-
 .../innerkits/token_setproc/test/BUILD.gn     |  2 +-
 .../unittest/src/tokensetproc_kit_test.cpp    |  2 +-
 .../test/unittest/src/tokensetproc_kit_test.h |  2 +-
 interfaces/innerkits/tokensync/BUILD.gn       |  5 +-
 interfaces/innerkits/tokensync/test/BUILD.gn  |  2 +-
 .../test/unittest/src/token_sync_kit_test.cpp |  2 +-
 .../test/unittest/src/token_sync_kit_test.h   |  2 +-
 interfaces/kits/BUILD.gn                      |  2 +-
 .../accesstoken/napi/include/napi_atmanager.h |  2 +-
 services/accesstokenmanager/BUILD.gn          |  2 +-
 services/accesstokenmanager/access_token.rc   |  2 +-
 .../main/cpp/include/database/data_storage.h  |  2 +-
 .../cpp/include/database/data_translator.h    |  2 +-
 .../main/cpp/include/database/field_const.h   |  2 +-
 .../cpp/include/database/generic_values.h     |  2 +-
 .../main/cpp/include/database/sqlite_helper.h |  2 +-
 .../cpp/include/database/sqlite_storage.h     |  2 +-
 .../main/cpp/include/database/statement.h     |  2 +-
 .../main/cpp/include/database/variant_value.h |  2 +-
 .../permission/permission_definition_cache.h  |  2 +-
 .../include/permission/permission_manager.h   |  2 +-
 .../permission/permission_policy_set.h        |  2 +-
 .../include/permission/permission_validator.h |  2 +-
 .../include/token/accesstoken_id_manager.h    |  2 +-
 .../cpp/include/token/hap_token_info_inner.h  |  2 +-
 .../include/token/native_token_info_inner.h   |  2 +-
 .../cpp/include/token/native_token_receptor.h |  2 +-
 .../main/cpp/src/database/data_storage.cpp    |  2 +-
 .../main/cpp/src/database/data_translator.cpp |  2 +-
 .../main/cpp/src/database/generic_values.cpp  |  2 +-
 .../main/cpp/src/database/sqlite_helper.cpp   |  2 +-
 .../main/cpp/src/database/sqlite_storage.cpp  |  2 +-
 .../main/cpp/src/database/statement.cpp       |  2 +-
 .../main/cpp/src/database/variant_value.cpp   |  2 +-
 .../permission_definition_cache.cpp           |  2 +-
 .../cpp/src/permission/permission_manager.cpp |  2 +-
 .../src/permission/permission_validator.cpp   |  2 +-
 .../cpp/src/token/accesstoken_id_manager.cpp  |  2 +-
 .../cpp/src/token/native_token_receptor.cpp   |  2 +-
 .../main/sa_profile/3503.xml                  |  2 +-
 .../main/sa_profile/BUILD.gn                  |  2 +-
 services/accesstokenmanager/test/BUILD.gn     |  2 +-
 .../cpp/src/accesstoken_info_manager_test.h   |  2 +-
 .../cpp/src/native_token_receptor_test.cpp    | 16 ++---
 .../cpp/src/native_token_receptor_test.h      |  2 +-
 services/tokensyncmanager/BUILD.gn            |  2 +-
 .../include/command/base_remote_command.h     |  2 +-
 .../include/common/constant.h                 |  2 +-
 services/tokensyncmanager/sa_profile/3504.xml |  2 +-
 services/tokensyncmanager/sa_profile/BUILD.gn |  2 +-
 .../tokensyncmanager/src/common/constant.cpp  |  2 +-
 .../src/device/device_info_repository.cpp     |  2 +-
 .../src/remote/remote_command_executor.cpp    |  2 +-
 .../src/remote/remote_command_factory.cpp     |  2 +-
 .../src/remote/soft_bus_channel.cpp           | 32 +++++-----
 .../src/remote/soft_bus_manager.cpp           | 18 +++---
 .../test/mock/src/soft_bus_session_mock.cpp   |  2 +-
 107 files changed, 180 insertions(+), 209 deletions(-)
 mode change 100755 => 100644 LICENSE
 mode change 100755 => 100644 bundle.json
 mode change 100755 => 100644 interfaces/innerkits/accesstoken/include/accesstoken.h

diff --git a/BUILD.gn b/BUILD.gn
index e95e76b20..1d07fc454 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 b11daf527..e2f5a5ae9 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_zh.md b/README_zh.md
index 23be5b3af..5b9c8162e 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 e7ebdac5b..6c3e6db17 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 8f496175e..ae027da48 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 7886bfbeb..dc412e477 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 d13fda88a..08e939f4e 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 80bf8909c..c1ba0c4d0 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 52e0a80c4..c509deb91 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 f4b8714a7..71e869ed1 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 c0e3d984a..f167dda0c 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 fe2a079ce..434c41903 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 4a349518c..5c91760c5 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 5b10bb77d..daca0e793 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 09943e9a0..f87b17cfa 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 2a5dd6fe5..99735cf9a 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 120f1adf9..aa815eb87 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 acdc32e2d..9db1ef2e2 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 aad20da42..e4c4118eb 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 ac4aaa107..d90d3bf33 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 b96679969..9a146ba70 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 278cc24aa..29d2e637f 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 ffd3ddd14..443993b13 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 a28479e7e..e6acaaed2 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 20d7dfbbc..f7cf0f8f1 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 8975482ce..9736a6fe2 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 95c8b1f17..9d07f987a 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 601120bea..44130adea 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 f0084d347..6257cc046
--- 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 1d38ae684..f2fc23426 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 60b427f35..d02ef226b 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 f3cc81b63..39352b4e5 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 7805a3d9e..dc9302216 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 51e2d60b5..9d419a67a 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 e981ea0ec..a4782cc90 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 5761c17f3..81c6e4e5f 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 dfdd20e85..8464e5c8a 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 5a4163d3b..58d197aea 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 573c65178..d25658953 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 564dcb76f..8975df42a 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 a0338d25e..b161c996d 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 4e09e88b1..662ba98c1 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 6b14f56e0..16f2b96b3 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 74b986ccf..44eb5cc82 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 8aa651750..59b315af4 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 1cdcc6f30..edbdb874b 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 81c75d92a..aa1b77bd5 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 b2d09dbef..14363d595 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 9cac0ef65..50eeb5261 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 5fe3f833c..c6f94bbc0 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 29bef17d2..2da208d9b 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 aa92f46a9..20df0ec32 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 87a14097b..fd5e26267 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 f4587575b..1c46de6b0 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 1cb07f236..7f9e942d3 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 cf2e891f4..39aa55613 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 a9a0de9a7..f6d444a78 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 62358bea1..9862a58ab 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 68b9f548b..481f379ac 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 9233596bb..0d69fb9dd 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 1be472818..a731e9b2f 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 a73a3a9d3..7e75ef13a 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 55c6b7ba6..6886d3c68 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 003859839..0f0979ab4 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 5aeb78713..95a04ab61 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 e84ec0b2f..1f2f5c092 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 cfb16f8e1..00a1e2a90 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 969509549..76cb640fb 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 683a8f611..cdc088127 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 3208b6f20..38eb71d56 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 99dad5945..97aa044f0 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 4d4ac8ba4..d3ba10be7 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 087d692ed..c28b41298 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 f76e1ba05..e6b1b793d 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 53097f3fc..e2cad901f 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 90559c6c2..01970dd1b 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 d601e0ed4..b341c78ca 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 db130ace6..cc4804a5b 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 0e878fd33..edeabdbfd 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 f929760e3..6ed9497a0 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 42d2e3656..387138742 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 3dae32731..f849bbcc7 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 54917c49c..2f3208614 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 cf795e7b3..4f352d8b3 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 848675ec4..474be8e67 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/token/accesstoken_id_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp
index 56d491df5..aacac1416 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 c6369f017..de1ff1aaa 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 d20563c46..f17460702 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 c199a410c..db9232f26 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 208ff66dd..ae4871cf0 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 3d92f4650..03cbc7d1c 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 484ef456e..3755b9451 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 1df01e7d4..f03f06442 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 000a1b457..28d47cddb 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 6af5f58a0..2289251c2 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 be2191d96..db8e50bf8 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 c8ea08efd..87a9f697d 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 4491128f6..40f847501 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 dfa24e22f..ac90d7d19 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 6bbff99c1..ed457b295 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 553decea9..66e5e0d78 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 266ef585b..d467b26be 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 97e028db7..e88053eda 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) {
@@ -259,23 +259,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;
 }
@@ -348,19 +348,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;
     }
@@ -374,19 +374,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 33e22c8a4..419c4bc24 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
@@ -264,21 +264,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;
@@ -286,21 +286,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 a79a402bf..6cb349e4d 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,
-- 
Gitee