From 9cad9f8ae18233ea2c5be099dd26ce138871b0c5 Mon Sep 17 00:00:00 2001 From: GaoShuo Date: Fri, 25 Jul 2025 11:38:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8D=E5=90=88=E7=90=86=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../innerkits/accesstoken/src/accesstoken_manager_client.h | 3 --- interfaces/innerkits/privacy/BUILD.gn | 2 ++ .../privacy/include/i_perm_active_status_callback.h | 0 .../innerkits}/privacy/include/i_state_change_callback.h | 0 .../innerkits/privacy/src/privacy_manager_client.cpp | 4 ++-- interfaces/innerkits/privacy/src/privacy_manager_client.h | 7 ++++--- interfaces/innerkits/privacy/test/BUILD.gn | 2 ++ interfaces/innerkits/privacy/test/tool/BUILD.gn | 1 + .../innerkits}/proxy_death/include/proxy_death_callback.h | 0 .../innerkits}/tokensync/include/i_token_sync_manager.h | 0 .../kits/js/napi/accesstoken/include/napi_context_common.h | 1 - .../kits/js/napi/privacy/include/napi_context_common.h | 1 - services/common/proxy_death/BUILD.gn | 5 ++++- services/privacymanager/test/unittest/BUILD.gn | 1 + services/tokensyncmanager/BUILD.gn | 1 + services/tokensyncmanager/test/coverage/BUILD.gn | 1 + services/tokensyncmanager/test/unittest/BUILD.gn | 1 + 17 files changed, 19 insertions(+), 11 deletions(-) rename {frameworks => interfaces/innerkits}/privacy/include/i_perm_active_status_callback.h (100%) rename {frameworks => interfaces/innerkits}/privacy/include/i_state_change_callback.h (100%) rename {services/common => interfaces/innerkits}/proxy_death/include/proxy_death_callback.h (100%) rename {frameworks => interfaces/innerkits}/tokensync/include/i_token_sync_manager.h (100%) diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h index 685019059..c3c9efd34 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h +++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h @@ -25,9 +25,6 @@ #include "access_token.h" #include "atm_tools_param_info.h" #include "accesstoken_death_recipient.h" -#include "hap_base_info_parcel.h" -#include "hap_info_parcel.h" -#include "hap_policy_parcel.h" #include "hap_token_info.h" #include "iaccess_token_manager.h" #include "nocopyable.h" diff --git a/interfaces/innerkits/privacy/BUILD.gn b/interfaces/innerkits/privacy/BUILD.gn index d1ae53460..fcfb032b9 100644 --- a/interfaces/innerkits/privacy/BUILD.gn +++ b/interfaces/innerkits/privacy/BUILD.gn @@ -45,6 +45,8 @@ if (is_standard_system) { "${access_token_path}/frameworks/privacy/include", "${access_token_path}/frameworks/common/include", "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/innerkits/privacy/include", + "${access_token_path}/interfaces/innerkits/proxy_death/include", "include", "src", ] diff --git a/frameworks/privacy/include/i_perm_active_status_callback.h b/interfaces/innerkits/privacy/include/i_perm_active_status_callback.h similarity index 100% rename from frameworks/privacy/include/i_perm_active_status_callback.h rename to interfaces/innerkits/privacy/include/i_perm_active_status_callback.h diff --git a/frameworks/privacy/include/i_state_change_callback.h b/interfaces/innerkits/privacy/include/i_state_change_callback.h similarity index 100% rename from frameworks/privacy/include/i_state_change_callback.h rename to interfaces/innerkits/privacy/include/i_state_change_callback.h diff --git a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp index 252571abf..b2d451578 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_client.cpp +++ b/interfaces/innerkits/privacy/src/privacy_manager_client.cpp @@ -448,11 +448,11 @@ void PrivacyManagerClient::ReleaseProxy() serviceDeathObserver_ = nullptr; } -sptr PrivacyManagerClient::GetAnonyStub() +sptr> PrivacyManagerClient::GetAnonyStub() { std::lock_guard lock(stubMutex_); if (anonyStub_ == nullptr) { - anonyStub_ = sptr::MakeSptr(); + anonyStub_ = sptr>::MakeSptr(); } return anonyStub_; } diff --git a/interfaces/innerkits/privacy/src/privacy_manager_client.h b/interfaces/innerkits/privacy/src/privacy_manager_client.h index 0a652cb51..e9682a5f8 100644 --- a/interfaces/innerkits/privacy/src/privacy_manager_client.h +++ b/interfaces/innerkits/privacy/src/privacy_manager_client.h @@ -21,11 +21,12 @@ #include #include +#include "iremote_stub.h" #include "iprivacy_manager.h" #include "perm_active_status_change_callback.h" #include "perm_active_status_customized_cbk.h" #include "privacy_death_recipient.h" -#include "proxy_death_callback_stub.h" +#include "proxy_death_callback.h" #include "state_change_callback.h" #include "state_customized_cbk.h" @@ -75,7 +76,7 @@ private: sptr GetProxy(); void ReleaseProxy(); uint64_t GetUniqueId(uint32_t tokenId, int32_t pid) const; - sptr GetAnonyStub(); + sptr> GetAnonyStub(); private: std::mutex activeCbkMutex_; @@ -83,7 +84,7 @@ private: std::mutex stateCbkMutex_; std::map> stateChangeCallbackMap_; std::mutex stubMutex_; - sptr anonyStub_ = nullptr; + sptr> anonyStub_ = nullptr; }; } // namespace AccessToken } // namespace Security diff --git a/interfaces/innerkits/privacy/test/BUILD.gn b/interfaces/innerkits/privacy/test/BUILD.gn index 048837383..89a865651 100644 --- a/interfaces/innerkits/privacy/test/BUILD.gn +++ b/interfaces/innerkits/privacy/test/BUILD.gn @@ -33,6 +33,7 @@ ohos_unittest("libprivacy_sdk_test") { "${access_token_path}/interfaces/innerkits/accesstoken/include", "${access_token_path}/interfaces/innerkits/nativetoken/include", "${access_token_path}/interfaces/innerkits/privacy/include", + "${access_token_path}/interfaces/innerkits/proxy_death/include", "${access_token_path}/interfaces/innerkits/token_setproc/include", ] @@ -92,6 +93,7 @@ ohos_unittest("libprivacy_mock_test") { "${access_token_path}/interfaces/innerkits/accesstoken/include", "${access_token_path}/interfaces/innerkits/nativetoken/include", "${access_token_path}/interfaces/innerkits/privacy/include", + "${access_token_path}/interfaces/innerkits/proxy_death/include", ] sources = [ diff --git a/interfaces/innerkits/privacy/test/tool/BUILD.gn b/interfaces/innerkits/privacy/test/tool/BUILD.gn index 6e97cb8e5..e04c7b59e 100644 --- a/interfaces/innerkits/privacy/test/tool/BUILD.gn +++ b/interfaces/innerkits/privacy/test/tool/BUILD.gn @@ -29,6 +29,7 @@ ohos_executable("AddPermissionUsedRecord") { "${access_token_path}/interfaces/innerkits/nativetoken/include", "${access_token_path}/interfaces/innerkits/token_setproc/include", "${access_token_path}/interfaces/innerkits/privacy/include", + "${access_token_path}/interfaces/innerkits/proxy_death/include", ] deps = [ diff --git a/services/common/proxy_death/include/proxy_death_callback.h b/interfaces/innerkits/proxy_death/include/proxy_death_callback.h similarity index 100% rename from services/common/proxy_death/include/proxy_death_callback.h rename to interfaces/innerkits/proxy_death/include/proxy_death_callback.h diff --git a/frameworks/tokensync/include/i_token_sync_manager.h b/interfaces/innerkits/tokensync/include/i_token_sync_manager.h similarity index 100% rename from frameworks/tokensync/include/i_token_sync_manager.h rename to interfaces/innerkits/tokensync/include/i_token_sync_manager.h diff --git a/interfaces/kits/js/napi/accesstoken/include/napi_context_common.h b/interfaces/kits/js/napi/accesstoken/include/napi_context_common.h index c784ec2be..4992ac9ef 100644 --- a/interfaces/kits/js/napi/accesstoken/include/napi_context_common.h +++ b/interfaces/kits/js/napi/accesstoken/include/napi_context_common.h @@ -16,7 +16,6 @@ #define INTERFACES_ACCESSTOKEN_KITS_NAPI_CONTEXT_COMMON_H #include -#include "accesstoken_log.h" #include "access_token_error.h" #include "napi_error.h" #include "napi_common.h" diff --git a/interfaces/kits/js/napi/privacy/include/napi_context_common.h b/interfaces/kits/js/napi/privacy/include/napi_context_common.h index 59772dc47..ebf6b484b 100644 --- a/interfaces/kits/js/napi/privacy/include/napi_context_common.h +++ b/interfaces/kits/js/napi/privacy/include/napi_context_common.h @@ -17,7 +17,6 @@ #include #include -#include "accesstoken_log.h" #include "active_change_response_info.h" #include "napi/native_api.h" #include "napi/native_node_api.h" diff --git a/services/common/proxy_death/BUILD.gn b/services/common/proxy_death/BUILD.gn index d78510021..f1950e278 100644 --- a/services/common/proxy_death/BUILD.gn +++ b/services/common/proxy_death/BUILD.gn @@ -29,7 +29,10 @@ ohos_source_set("proxy_death_stub") { } branch_protector_ret = "pac_ret" - include_dirs = [ "include" ] + include_dirs = [ + "include", + "${access_token_path}/interfaces/innerkits/proxy_death/include", + ] sources = [ "src/proxy_death_callback_stub.cpp" ] diff --git a/services/privacymanager/test/unittest/BUILD.gn b/services/privacymanager/test/unittest/BUILD.gn index 5083c857d..9a552a107 100644 --- a/services/privacymanager/test/unittest/BUILD.gn +++ b/services/privacymanager/test/unittest/BUILD.gn @@ -33,6 +33,7 @@ if (is_standard_system && ability_base_enable == true) { "${access_token_path}/interfaces/innerkits/nativetoken/include", "${access_token_path}/interfaces/innerkits/privacy/test/unittest/src", "${access_token_path}/interfaces/innerkits/privacy/src", + "${access_token_path}/interfaces/innerkits/proxy_death/include", "${access_token_path}/services/common/app_manager/include", "${access_token_path}/services/common/json_parse/include", "${access_token_path}/services/common/database/include", diff --git a/services/tokensyncmanager/BUILD.gn b/services/tokensyncmanager/BUILD.gn index 263815cf5..5edcf8ffb 100644 --- a/services/tokensyncmanager/BUILD.gn +++ b/services/tokensyncmanager/BUILD.gn @@ -57,6 +57,7 @@ if (token_sync_enable == true) { "${access_token_path}/frameworks/accesstoken/include", "${access_token_path}/frameworks/tokensync/include", "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/innerkits/tokensync/include", "${access_token_path}/services/accesstokenmanager/main/cpp/include/token", "${access_token_path}/services/common/json_parse/include", "${access_token_path}/services/common/handler/include", diff --git a/services/tokensyncmanager/test/coverage/BUILD.gn b/services/tokensyncmanager/test/coverage/BUILD.gn index 1dcf26ef9..947c108c4 100644 --- a/services/tokensyncmanager/test/coverage/BUILD.gn +++ b/services/tokensyncmanager/test/coverage/BUILD.gn @@ -64,6 +64,7 @@ ohos_unittest("libtoken_sync_service_coverage_test") { "${access_token_path}/services/common/json_parse/include", "${access_token_path}/services/common/handler/include", "${access_token_path}/interfaces/innerkits/accesstoken/test/unittest/common/", + "${access_token_path}/interfaces/innerkits/tokensync/include", ] deps = [ diff --git a/services/tokensyncmanager/test/unittest/BUILD.gn b/services/tokensyncmanager/test/unittest/BUILD.gn index 9a8e2dc27..8e65906c5 100644 --- a/services/tokensyncmanager/test/unittest/BUILD.gn +++ b/services/tokensyncmanager/test/unittest/BUILD.gn @@ -64,6 +64,7 @@ ohos_unittest("libtoken_sync_service_standard_test") { "${access_token_path}/services/common/json_parse/include", "${access_token_path}/services/common/handler/include", "${access_token_path}/interfaces/innerkits/accesstoken/test/unittest/common/", + "${access_token_path}/interfaces/innerkits/tokensync/include", ] deps = [ -- Gitee