From 7b8ba2524226638f426869a79c49e024aab364ae Mon Sep 17 00:00:00 2001 From: 30059993 Date: Tue, 1 Jul 2025 10:20:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=99=9A=E6=8B=9F=E6=9C=BA?= =?UTF-8?q?=E4=BC=A0=E9=80=92=E7=BB=99arkui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 30059993 --- frameworks/native/runtime/sts_runtime.cpp | 10 +++++++++- .../multi_user_config_mgr_test.cpp | 14 +++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/frameworks/native/runtime/sts_runtime.cpp b/frameworks/native/runtime/sts_runtime.cpp index eabbdd9e851..4c101cc6410 100644 --- a/frameworks/native/runtime/sts_runtime.cpp +++ b/frameworks/native/runtime/sts_runtime.cpp @@ -63,6 +63,7 @@ #ifdef SUPPORT_SCREEN #include "ace_forward_compatibility.h" +#include "arkts_module_preloader.h" #include "declarative_module_preloader.h" #include "hot_reloader.h" #endif //SUPPORT_SCREEN @@ -370,7 +371,14 @@ bool STSRuntime::Initialize(const Options& options) TAG_LOGE(AAFwkTag::STSRUNTIME, "Init loop failed"); return false; } - +#ifdef SUPPORT_SCREEN + auto aniEngine = GetAniEnv(); + if (aniEngine == nullptr) { + TAG_LOGE(AAFwkTag::STSRUNTIME, "GetAniEnv failed"); + return false; + } + OHOS::Ace::ArkTSModulePreloader::Preload(aniEngine); +#endif return true; } diff --git a/test/unittest/multi_user_config_mgr_test/multi_user_config_mgr_test.cpp b/test/unittest/multi_user_config_mgr_test/multi_user_config_mgr_test.cpp index a7284cda9c3..e6168f98edb 100644 --- a/test/unittest/multi_user_config_mgr_test/multi_user_config_mgr_test.cpp +++ b/test/unittest/multi_user_config_mgr_test/multi_user_config_mgr_test.cpp @@ -297,5 +297,17 @@ HWTEST_F(MultiUserConfigMgrTest, GetConfigurationByUserId_0300, TestSize.Level1) EXPECT_EQ(multiUserConfigurationMgr->GetConfigurationByUserId(100), nullptr); } +/** +* @tc.name: GetConfigurationByUserId_0400 +* @tc.desc: GetConfigurationByUserId. +* @tc.type: FUNC +*/ +HWTEST_F(MultiUserConfigMgrTest, GetConfigurationByUserId_0400, TestSize.Level1) +{ + auto multiUserConfigurationMgr = std::make_shared(); + multiUserConfigurationMgr->globalConfiguration_ = std::make_shared(); + EXPECT_NE(multiUserConfigurationMgr->GetConfigurationByUserId(100), nullptr); +} + } // namespace AppExecFwk -} // namespace OHOS \ No newline at end of file +} // namespace OHOS -- Gitee