From e6dd0762bdd906880f751afcd440e615fc815425 Mon Sep 17 00:00:00 2001 From: openharmony_ci <120357966@qq.com> Date: Thu, 28 Aug 2025 03:54:01 +0000 Subject: [PATCH] =?UTF-8?q?!1364=20=E4=BB=A3=E7=A0=81=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=20Merge=20pull=20request=20!1364=20from=20ch?= =?UTF-8?q?enbingbing/master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bundle.json | 2 +- .../native/source/system_ability_manager_proxy.cpp | 2 +- interfaces/innerkits/rust/BUILD.gn | 1 - .../samgr_proxy/include/if_local_ability_manager.h | 3 --- services/common/test/unittest/parse_util_test.cpp | 2 -- services/samgr/native/test/unittest/BUILD.gn | 12 +++--------- 6 files changed, 5 insertions(+), 17 deletions(-) diff --git a/bundle.json b/bundle.json index 523ce2b4..87fd99e6 100644 --- a/bundle.json +++ b/bundle.json @@ -46,10 +46,10 @@ "json", "libxml2", "preferences", - "rust_cxx", "safwk", "selinux_adapter", "config_policy", + "rust_cxx", "ylong_runtime" ] }, diff --git a/frameworks/native/source/system_ability_manager_proxy.cpp b/frameworks/native/source/system_ability_manager_proxy.cpp index 96ce040c..fbf1ec24 100644 --- a/frameworks/native/source/system_ability_manager_proxy.cpp +++ b/frameworks/native/source/system_ability_manager_proxy.cpp @@ -891,7 +891,7 @@ int32_t SystemAbilityManagerProxy::GetLruIdleSystemAbilityProc(std::vectorSendRequest( static_cast(SamgrInterfaceCode::GET_LRU_IDLE_SYSTEM_ABILITY_PROCESS_TRANSACTION), - data, reply, option); + data, reply, option); if (err != ERR_NONE) { HILOGE("GetLruIdleSystempAbilityProc SendRequest error:%{public}d", err); return err; diff --git a/interfaces/innerkits/rust/BUILD.gn b/interfaces/innerkits/rust/BUILD.gn index e847b7e1..ca2ffda5 100644 --- a/interfaces/innerkits/rust/BUILD.gn +++ b/interfaces/innerkits/rust/BUILD.gn @@ -64,7 +64,6 @@ ohos_rust_shared_library("samgr_rust") { ] deps = [ ":samgr_rust_cpp" ] - crate_name = "samgr" install_images = [ system_base_dir ] diff --git a/interfaces/innerkits/samgr_proxy/include/if_local_ability_manager.h b/interfaces/innerkits/samgr_proxy/include/if_local_ability_manager.h index bfd0749b..6b12809f 100755 --- a/interfaces/innerkits/samgr_proxy/include/if_local_ability_manager.h +++ b/interfaces/innerkits/samgr_proxy/include/if_local_ability_manager.h @@ -32,14 +32,12 @@ enum { IPC_STAT_CMD_GET = 2, IPC_STAT_CMD_MAX = 3 }; - enum { FFRT_STAT_CMD_START = 0, FFRT_STAT_CMD_STOP = 1, FFRT_STAT_CMD_GET = 2, FFRT_STAT_CMD_MAX = 3 }; - class SystemAbilityExtensionPara { public: SystemAbilityExtensionPara() @@ -62,7 +60,6 @@ public: return true; }; }; - class ILocalAbilityManager : public IRemoteBroker { public: virtual bool StartAbility(int32_t systemAbilityId, const std::string& eventStr) = 0; diff --git a/services/common/test/unittest/parse_util_test.cpp b/services/common/test/unittest/parse_util_test.cpp index 1ab7a859..f8fbdcd5 100644 --- a/services/common/test/unittest/parse_util_test.cpp +++ b/services/common/test/unittest/parse_util_test.cpp @@ -732,7 +732,6 @@ HWTEST_F(ParseUtilTest, GetOnDemandConditionsFromJson004, TestSize.Level3) DTEST_LOG << " GetOnDemandConditionsFromJson004 END" << std::endl; } - /** * @tc.name: GetOnDemandExtraMessagesFromJson001 * @tc.desc: parse OnDemandExtraMessages, ExtraMessages is empty. @@ -792,7 +791,6 @@ HWTEST_F(ParseUtilTest, GetOnDemandExtraMessagesFromJson003, TestSize.Level3) DTEST_LOG << " GetOnDemandExtraMessagesFromJson003 END" << std::endl; } - /** * @tc.name: ParseJsonFile001 * @tc.desc: parse json file using big json file diff --git a/services/samgr/native/test/unittest/BUILD.gn b/services/samgr/native/test/unittest/BUILD.gn index f5931c94..3fb7340f 100644 --- a/services/samgr/native/test/unittest/BUILD.gn +++ b/services/samgr/native/test/unittest/BUILD.gn @@ -158,7 +158,6 @@ ohos_unittest("SystemAbilityMgrTest") { } if (support_penglai_mode) { - external_deps += [ "penglai_mode_service:penglai_client" ] defines += [ "SUPPORT_PENGLAI_MODE" ] } defines += ["SAMGR_USE_FFRT"] @@ -298,7 +297,6 @@ ohos_unittest("SystemAbilityMgrCollectTest") { defines += [ "SUPPORT_DEVICE_MANAGER" ] } if (support_penglai_mode) { - external_deps += [ "penglai_mode_service:penglai_client" ] defines += [ "SUPPORT_PENGLAI_MODE" ] } defines += ["SAMGR_USE_FFRT"] @@ -407,7 +405,6 @@ ohos_unittest("SystemAbilityMgrDeviceNetworkingTest") { } if (support_penglai_mode) { - external_deps += [ "penglai_mode_service:penglai_client" ] defines += [ "SUPPORT_PENGLAI_MODE" ] } defines += ["SAMGR_USE_FFRT"] @@ -514,9 +511,6 @@ ohos_unittest("SystemAbilityMgrStubTest") { } if (support_penglai_mode) { - sources += - [ "${samgr_services_dir}/test/unittest/src/mock_penglai_service_client.cpp" ] - external_deps += [ "penglai_mode_service:penglai_client" ] defines += [ "SUPPORT_PENGLAI_MODE" ] } defines += ["SAMGR_USE_FFRT"] @@ -639,6 +633,7 @@ ohos_unittest("SystemAbilityStateSchedulerTest") { "${samgr_services_dir}/source/collect/icollect_plugin.cpp", "${samgr_services_dir}/source/ffrt_handler.cpp", "${samgr_services_dir}/source/memory_guard.cpp", + "${samgr_services_dir}/source/rpc_callback_imp.cpp", "${samgr_services_dir}/source/samgr_time_handler.cpp", "${samgr_services_dir}/source/schedule/system_ability_event_handler.cpp", "${samgr_services_dir}/source/schedule/system_ability_state_machine.cpp", @@ -647,7 +642,9 @@ ohos_unittest("SystemAbilityStateSchedulerTest") { "${samgr_services_dir}/source/system_ability_manager_dumper.cpp", "${samgr_services_dir}/source/system_ability_manager_stub.cpp", "${samgr_services_dir}/source/system_ability_manager_util.cpp", + "${samgr_services_dir}/test/unittest/src/itest_transaction_service.cpp", "${samgr_services_dir}/test/unittest/src/mock_accesstoken_kit.cpp", + "${samgr_services_dir}/test/unittest/src/mock_permission.cpp", "${samgr_services_dir}/test/unittest/src/sa_status_change_mock.cpp", "${samgr_services_dir}/test/unittest/src/system_ability_event_handler_test.cpp", "${samgr_services_dir}/test/unittest/src/system_ability_state_machine_test.cpp", @@ -712,7 +709,6 @@ ohos_unittest("SystemAbilityStateSchedulerTest") { } if (support_penglai_mode) { - external_deps += [ "penglai_mode_service:penglai_client" ] defines += [ "SUPPORT_PENGLAI_MODE" ] } defines += ["SAMGR_USE_FFRT"] @@ -792,7 +788,6 @@ ohos_unittest("SystemAbilityMgrDumperTest") { defines += [ "SUPPORT_ACCESS_TOKEN" ] } if (support_penglai_mode) { - external_deps += [ "penglai_mode_service:penglai_client" ] defines += [ "SUPPORT_PENGLAI_MODE" ] } defines += ["SAMGR_USE_FFRT"] @@ -1055,7 +1050,6 @@ ohos_executable("TestTool") { "samgr:dynamic_cache", ] if (support_penglai_mode) { - external_deps += [ "penglai_mode_service:penglai_client" ] defines += [ "SUPPORT_PENGLAI_MODE" ] } defines += ["SAMGR_USE_FFRT"] -- Gitee