From afe48e741b4b170ea3380ebec6bd678f2fae8e37 Mon Sep 17 00:00:00 2001 From: jsjzju Date: Tue, 31 Oct 2023 15:54:40 +0800 Subject: [PATCH] =?UTF-8?q?NAPIDataAbilityHelperWrapper=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E5=8F=AF=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jsjzju Change-Id: Iba64815305fb0fddf585e8185d15377c83726042 --- .../napi/featureAbility/napi_data_ability_helper.h | 13 ------------- .../native/ability/native/data_ability_helper.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/frameworks/js/napi/featureAbility/napi_data_ability_helper.h b/frameworks/js/napi/featureAbility/napi_data_ability_helper.h index 4fcba9e607..6fcb25185f 100644 --- a/frameworks/js/napi/featureAbility/napi_data_ability_helper.h +++ b/frameworks/js/napi/featureAbility/napi_data_ability_helper.h @@ -41,19 +41,6 @@ private: std::mutex mutex_; }; -class NAPIDataAbilityHelperWrapper { -public: - explicit NAPIDataAbilityHelperWrapper(std::weak_ptr&& dataAbilityHelper) - : dataAbilityHelper_(dataAbilityHelper) {} - inline std::shared_ptr GetDataAbilityHelper() const - { - return dataAbilityHelper_.lock(); - } - -private: - std::weak_ptr dataAbilityHelper_; -}; - /** * @brief DataAbilityHelper NAPI module registration. * diff --git a/interfaces/kits/native/ability/native/data_ability_helper.h b/interfaces/kits/native/ability/native/data_ability_helper.h index 405b7f6baf..13b48510e7 100644 --- a/interfaces/kits/native/ability/native/data_ability_helper.h +++ b/interfaces/kits/native/ability/native/data_ability_helper.h @@ -315,6 +315,19 @@ private: bool callFromJs_ = false; // true: call from js, false: call from native }; + +class NAPIDataAbilityHelperWrapper { +public: + explicit NAPIDataAbilityHelperWrapper(std::weak_ptr&& dataAbilityHelper) + : dataAbilityHelper_(dataAbilityHelper) {} + inline std::shared_ptr GetDataAbilityHelper() const + { + return dataAbilityHelper_.lock(); + } + +private: + std::weak_ptr dataAbilityHelper_; +}; } // namespace AppExecFwk } // namespace OHOS #endif // OHOS_ABILITY_RUNTIME_DATA_ABILITY_HELPER_H