From c3dd1cc784badf77e3ad701f633975af6934217e Mon Sep 17 00:00:00 2001 From: Nathan Yang Date: Wed, 20 Aug 2025 09:39:21 +0800 Subject: [PATCH] bugfix: typo and duplicate includes Signed-off-by: Nathan Yang --- .../ability/native/fa_ability_thread.cpp | 6 ++-- .../ability/native/ui_ability_thread.cpp | 8 ++--- .../ability_manager_ipc_interface_code.h | 2 +- .../native/ability/native/fa_ability_thread.h | 4 +-- .../native/ability/native/ui_ability_thread.h | 4 +-- .../include/ability_manager_service.h | 6 ++-- .../abilitymgr/src/ability_manager_proxy.cpp | 2 +- .../src/ability_manager_service.cpp | 31 ++++++++---------- .../abilitymgr/src/ability_manager_stub.cpp | 2 +- .../src/mission/mission_list_manager.cpp | 8 ++--- .../ui_ability_lifecycle_manager.cpp | 10 +++--- .../ability_manager_stub_second_test.cpp | 2 +- .../fa_ability_thread_test.cpp | 6 ++-- .../ui_ability_thread_test.cpp | 32 +++++++++---------- 14 files changed, 59 insertions(+), 64 deletions(-) diff --git a/frameworks/native/ability/native/fa_ability_thread.cpp b/frameworks/native/ability/native/fa_ability_thread.cpp index 86d32d4b101..0262f34b15e 100644 --- a/frameworks/native/ability/native/fa_ability_thread.cpp +++ b/frameworks/native/ability/native/fa_ability_thread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 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 @@ -891,7 +891,7 @@ bool FAAbilityThread::SchedulePrepareTerminateAbility() TAG_LOGE(AAFwkTag::FA, "null abilityThread"); return; } - abilityThread->HandlePrepareTermianteAbility(); + abilityThread->HandlePrepareTerminateAbility(); }; bool ret = abilityHandler_->PostTask(task, "FAAbilityThread:PrepareTerminateAbility"); if (!ret) { @@ -1465,7 +1465,7 @@ void FAAbilityThread::CallRequest() AbilityManagerClient::GetInstance()->CallRequestDone(token_, retval); } -void FAAbilityThread::HandlePrepareTermianteAbility() +void FAAbilityThread::HandlePrepareTerminateAbility() { std::unique_lock lock(mutex_); if (abilityImpl_ == nullptr) { diff --git a/frameworks/native/ability/native/ui_ability_thread.cpp b/frameworks/native/ability/native/ui_ability_thread.cpp index 98685a8a16a..00c0200617b 100644 --- a/frameworks/native/ability/native/ui_ability_thread.cpp +++ b/frameworks/native/ability/native/ui_ability_thread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 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 @@ -378,7 +378,7 @@ bool UIAbilityThread::SchedulePrepareTerminateAbility() } if (getpid() == gettid()) { TAG_LOGE(AAFwkTag::UIABILITY, "in app main thread"); - return HandlePrepareTermianteAbility(); + return HandlePrepareTerminateAbility(); } wptr weak = this; auto task = [weak]() { @@ -388,7 +388,7 @@ bool UIAbilityThread::SchedulePrepareTerminateAbility() TAG_LOGE(AAFwkTag::UIABILITY, "null abilityThread"); return; } - abilityThread->HandlePrepareTermianteAbility(); + abilityThread->HandlePrepareTerminateAbility(); }; bool ret = abilityHandler_->PostTask(task, "UIAbilityThread:PrepareTerminateAbility"); if (!ret) { @@ -398,7 +398,7 @@ bool UIAbilityThread::SchedulePrepareTerminateAbility() return true; } -bool UIAbilityThread::HandlePrepareTermianteAbility() +bool UIAbilityThread::HandlePrepareTerminateAbility() { wptr weak = this; auto callback = [weak, token = token_] (bool prepareTermination) { diff --git a/interfaces/inner_api/ability_manager/include/ability_manager_ipc_interface_code.h b/interfaces/inner_api/ability_manager/include/ability_manager_ipc_interface_code.h index 38921bbefa8..35e5e45d499 100644 --- a/interfaces/inner_api/ability_manager/include/ability_manager_ipc_interface_code.h +++ b/interfaces/inner_api/ability_manager/include/ability_manager_ipc_interface_code.h @@ -375,7 +375,7 @@ enum class AbilityManagerInterfaceCode { SEND_DIALOG_RESULT = 1055, // request modal UIExtension by want - REQUESET_MODAL_UIEXTENSION = 1056, + REQUEST_MODAL_UIEXTENSION = 1056, // get root host info of uiextension GET_UI_EXTENSION_ROOT_HOST_INFO = 1057, diff --git a/interfaces/kits/native/ability/native/fa_ability_thread.h b/interfaces/kits/native/ability/native/fa_ability_thread.h index 91854f19be8..eb08357f296 100644 --- a/interfaces/kits/native/ability/native/fa_ability_thread.h +++ b/interfaces/kits/native/ability/native/fa_ability_thread.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 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 @@ -524,7 +524,7 @@ private: /** * @brief Handle the scheduling prepare terminate ability. */ - void HandlePrepareTermianteAbility(); + void HandlePrepareTerminateAbility(); /** * @brief Provide operating system ShareData information to the observer diff --git a/interfaces/kits/native/ability/native/ui_ability_thread.h b/interfaces/kits/native/ability/native/ui_ability_thread.h index 8442e5271cf..b7917c8aaf5 100644 --- a/interfaces/kits/native/ability/native/ui_ability_thread.h +++ b/interfaces/kits/native/ability/native/ui_ability_thread.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 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 @@ -177,7 +177,7 @@ private: void HandleAbilityTransaction(const Want &want, const LifeCycleStateInfo &lifeCycleStateInfo, sptr sessionInfo = nullptr); void HandleShareData(const int32_t &requestCode); - bool HandlePrepareTermianteAbility(); + bool HandlePrepareTerminateAbility(); void HandleUpdateConfiguration(const AppExecFwk::Configuration &config); void AddLifecycleEvent(uint32_t state, std::string &methodName) const; diff --git a/services/abilitymgr/include/ability_manager_service.h b/services/abilitymgr/include/ability_manager_service.h index 2a291424e2d..6f775ac5653 100644 --- a/services/abilitymgr/include/ability_manager_service.h +++ b/services/abilitymgr/include/ability_manager_service.h @@ -53,7 +53,10 @@ #include "free_install_manager.h" #include "iacquire_share_data_callback_interface.h" #include "interceptor/ability_interceptor_executer.h" +#include "insight_intent_event_mgr.h" +#include "intent_exemption_info.h" #include "iremote_object.h" +#include "kiosk_manager.h" #include "mission_list_manager_interface.h" #include "parameter.h" #include "pending_want_manager.h" @@ -66,13 +69,10 @@ #include "task_handler_wrap.h" #include "uri.h" #include "user_controller.h" -#include "intent_exemption_info.h" #ifdef SUPPORT_GRAPHICS #include "implicit_start_processor.h" #include "system_dialog_scheduler.h" #endif -#include "insight_intent_event_mgr.h" -#include "kiosk_manager.h" namespace OHOS { namespace AbilityRuntime { diff --git a/services/abilitymgr/src/ability_manager_proxy.cpp b/services/abilitymgr/src/ability_manager_proxy.cpp index 8ab7a0ec36f..b00f2ff330f 100644 --- a/services/abilitymgr/src/ability_manager_proxy.cpp +++ b/services/abilitymgr/src/ability_manager_proxy.cpp @@ -820,7 +820,7 @@ int AbilityManagerProxy::RequestModalUIExtension(const Want &want) int error; MessageParcel reply; MessageOption option; - error = SendRequest(AbilityManagerInterfaceCode::REQUESET_MODAL_UIEXTENSION, data, reply, option); + error = SendRequest(AbilityManagerInterfaceCode::REQUEST_MODAL_UIEXTENSION, data, reply, option); if (error != NO_ERROR) { TAG_LOGE(AAFwkTag::ABILITYMGR, "request error:%{public}d", error); return error; diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index c831e1e41b1..5692fd53b7e 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -22,25 +22,24 @@ #include "ability_connect_manager.h" #include "ability_errors_util.h" #include "ability_manager_radar.h" +#include "ability_manager_xcollie.h" #include "ability_start_by_call_helper.h" #include "ability_start_with_wait_observer_utils.h" #include "ability_start_with_wait_observer_manager.h" #include "accesstoken_kit.h" -#include "ability_manager_xcollie.h" #include "app_utils.h" #include "app_exit_reason_data_manager.h" -#include "application_util.h" #include "app_mgr_constants.h" #include "app_mgr_util.h" -#include "recovery_info_timer.h" +#include "application_util.h" #include "assert_fault_callback_death_mgr.h" #include "concurrent_task_client.h" +#include "config_policy_utils.h" #include "connection_state_manager.h" #include "c/executor_task.h" #include "display_manager.h" #include "display_util.h" #include "distributed_client.h" -#include "ipc_skeleton.h" #ifdef WITH_DLP #include "dlp_utils.h" #endif // WITH_DLP @@ -49,6 +48,7 @@ #include "ffrt_inner.h" #include "freeze_util.h" #include "global_constant.h" +#include "hidden_start_observer_manager.h" #include "hitrace_meter.h" #include "insight_intent_execute_manager.h" #include "insight_intent_db_cache.h" @@ -60,9 +60,9 @@ #include "interceptor/disposed_rule_interceptor.h" #include "interceptor/ecological_rule_interceptor.h" #include "interceptor/extension_control_interceptor.h" +#include "interceptor/kiosk_interceptor.h" #include "interceptor/screen_unlock_interceptor.h" #include "interceptor/start_other_app_interceptor.h" -#include "interceptor/kiosk_interceptor.h" #include "int_wrapper.h" #include "ipc_skeleton.h" #include "iservice_registry.h" @@ -82,13 +82,14 @@ #include "preload_manager_service.h" #include "process_options.h" #include "rate_limiter.h" +#include "recovery_info_timer.h" #include "recovery_param.h" #include "report_data_partition_usage_manager.h" #include "res_sched_util.h" #include "restart_app_manager.h" +#include "sa_interceptor_manager.h" #include "scene_board_judgement.h" #include "server_constant.h" -#include "session_manager_lite.h" #include "softbus_bus_center.h" #include "start_ability_handler/start_ability_sandbox_savefile.h" #include "start_ability_utils.h" @@ -105,10 +106,6 @@ #include "uri_permission_manager_client.h" #endif // SUPPORT_UPMS #include "uri_utils.h" -#include "view_data.h" -#include "xcollie/watchdog.h" -#include "config_policy_utils.h" -#include "uri_utils.h" #include "utils/ability_permission_util.h" #include "utils/dump_utils.h" #include "utils/extension_permissions_util.h" @@ -116,12 +113,12 @@ #include "utils/update_caller_info_util.h" #include "utils/want_utils.h" #include "utils/window_options_utils.h" -#include "insight_intent_execute_manager.h" +#include "view_data.h" #ifdef SUPPORT_GRAPHICS -#include "dialog_session_manager.h" +#include "ability_first_frame_state_observer_manager.h" #include "application_anr_listener.h" +#include "dialog_session_manager.h" #include "input_manager.h" -#include "ability_first_frame_state_observer_manager.h" #include "session_manager_lite.h" #include "session/host/include/zidl/session_interface.h" #include "window_focus_changed_listener.h" @@ -132,9 +129,7 @@ #ifdef SUPPORT_SCREEN #include "utils/dms_util.h" #endif -#include "hidden_start_observer_manager.h" -#include "insight_intent_db_cache.h" -#include "sa_interceptor_manager.h" +#include "xcollie/watchdog.h" using OHOS::AppExecFwk::ElementName; using OHOS::Security::AccessToken::AccessTokenKit; @@ -10574,7 +10569,7 @@ int AbilityManagerService::PrepareTerminateAbility(const sptr &to } }; if (taskHandler_) { - taskHandler_->SubmitTask(timeoutTask, "PrepareTermiante_" + abilityRecordId, + taskHandler_->SubmitTask(timeoutTask, "PrepareTerminate_" + abilityRecordId, GlobalConstant::PREPARE_TERMINATE_TIMEOUT_TIME); } return ERR_OK; @@ -10609,7 +10604,7 @@ void AbilityManagerService::PrepareTerminateAbilityDone(const sptrCancelTask("PrepareTermiante_" + abilityRecordId); + taskHandler_->CancelTask("PrepareTerminate_" + abilityRecordId); } } diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp index e5d8a75a12e..8a29991ffe3 100644 --- a/services/abilitymgr/src/ability_manager_stub.cpp +++ b/services/abilitymgr/src/ability_manager_stub.cpp @@ -565,7 +565,7 @@ int AbilityManagerStub::OnRemoteRequestInnerFourteenth(uint32_t code, MessagePar if (interfaceCode == AbilityManagerInterfaceCode::PREPARE_TERMINATE_ABILITY_BY_SCB) { return PrepareTerminateAbilityBySCBInner(data, reply); } - if (interfaceCode == AbilityManagerInterfaceCode::REQUESET_MODAL_UIEXTENSION) { + if (interfaceCode == AbilityManagerInterfaceCode::REQUEST_MODAL_UIEXTENSION) { return RequestModalUIExtensionInner(data, reply); } if (interfaceCode == AbilityManagerInterfaceCode::GET_UI_EXTENSION_ROOT_HOST_INFO) { diff --git a/services/abilitymgr/src/mission/mission_list_manager.cpp b/services/abilitymgr/src/mission/mission_list_manager.cpp index 5613e33ca60..6bbb133322f 100644 --- a/services/abilitymgr/src/mission/mission_list_manager.cpp +++ b/services/abilitymgr/src/mission/mission_list_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2024 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 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 @@ -4252,17 +4252,17 @@ int MissionListManager::PrepareClearMissionLocked(int missionId, const std::shar int prepareTerminateTimeout = AmsConfigurationParameter::GetInstance().GetAppStartTimeoutTime() * PREPARE_TERMINATE_TIMEOUT_MULTIPLE; if (handler) { - handler->SubmitTask(terminateTask, "PrepareTermiante_" + std::to_string(abilityRecord->GetAbilityRecordId()), + handler->SubmitTask(terminateTask, "PrepareTerminate_" + std::to_string(abilityRecord->GetAbilityRecordId()), prepareTerminateTimeout); } bool res = abilityRecord->PrepareTerminateAbility(false); if (res) { TAG_LOGI(AAFwkTag::ABILITYMGR, "stop terminating"); - handler->CancelTask("PrepareTermiante_" + std::to_string(abilityRecord->GetAbilityRecordId())); + handler->CancelTask("PrepareTerminate_" + std::to_string(abilityRecord->GetAbilityRecordId())); return ERR_OK; } - handler->CancelTask("PrepareTermiante_" + std::to_string(abilityRecord->GetAbilityRecordId())); + handler->CancelTask("PrepareTerminate_" + std::to_string(abilityRecord->GetAbilityRecordId())); return ClearMissionLocked(missionId, mission); } diff --git a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp index 3d21143063c..57d8234205f 100644 --- a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp +++ b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp @@ -17,6 +17,7 @@ #include "ability_manager_service.h" #include "ability_permission_util.h" +#include "ability_stage_constant.h" #include "ability_start_with_wait_observer_manager.h" #include "ability_start_with_wait_observer_utils.h" #include "appfreeze_manager.h" @@ -26,23 +27,22 @@ #include "display_util.h" #include "ffrt.h" #include "global_constant.h" +#include "hidden_start_observer_manager.h" #include "hitrace_meter.h" #include "permission_constants.h" #include "process_options.h" -#include "server_constant.h" -#include "start_window_option.h" +#include "request_id_util.h" #include "scene_board/status_bar_delegate_manager.h" +#include "server_constant.h" #include "session_manager_lite.h" #include "session/host/include/zidl/session_interface.h" +#include "start_window_option.h" #include "startup_util.h" #include "timeout_state_utils.h" #include "ui_extension_utils.h" -#include "ability_stage_constant.h" #ifdef SUPPORT_GRAPHICS #include "ability_first_frame_state_observer_manager.h" #endif -#include "hidden_start_observer_manager.h" -#include "request_id_util.h" namespace OHOS { using AbilityRuntime::FreezeUtil; diff --git a/test/unittest/ability_manager_stub_second_test/ability_manager_stub_second_test.cpp b/test/unittest/ability_manager_stub_second_test/ability_manager_stub_second_test.cpp index 9cc9813d935..dffa0506883 100644 --- a/test/unittest/ability_manager_stub_second_test/ability_manager_stub_second_test.cpp +++ b/test/unittest/ability_manager_stub_second_test/ability_manager_stub_second_test.cpp @@ -555,7 +555,7 @@ HWTEST_F(AbilityManagerStubSecondTest, OnRemoteRequestInnerFourteenth_0100, Test uint32_t code[] = { static_cast(AbilityManagerInterfaceCode::SET_MISSION_CONTINUE_STATE), static_cast(AbilityManagerInterfaceCode::PREPARE_TERMINATE_ABILITY_BY_SCB), - static_cast(AbilityManagerInterfaceCode::REQUESET_MODAL_UIEXTENSION), + static_cast(AbilityManagerInterfaceCode::REQUEST_MODAL_UIEXTENSION), static_cast(AbilityManagerInterfaceCode::GET_UI_EXTENSION_ROOT_HOST_INFO), static_cast(AbilityManagerInterfaceCode::GET_UI_EXTENSION_SESSION_INFO), static_cast(AbilityManagerInterfaceCode::PRELOAD_UIEXTENSION_ABILITY), diff --git a/test/unittest/frameworks_kits_ability_native_test/fa_ability_thread_test.cpp b/test/unittest/frameworks_kits_ability_native_test/fa_ability_thread_test.cpp index d8eb82baa28..f63f41ecebd 100644 --- a/test/unittest/frameworks_kits_ability_native_test/fa_ability_thread_test.cpp +++ b/test/unittest/frameworks_kits_ability_native_test/fa_ability_thread_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 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 @@ -606,7 +606,7 @@ HWTEST_F(FaAbilityThreadTest, AaFwk_AbilityThread_SchedulePrepareTerminateAbilit abilitythread->abilityImpl_ = nullptr; bool ret = abilitythread->SchedulePrepareTerminateAbility(); - abilitythread->HandlePrepareTermianteAbility(); + abilitythread->HandlePrepareTerminateAbility(); EXPECT_EQ(ret, false); GTEST_LOG_(INFO) << "AaFwk_AbilityThread_SchedulePrepareTerminateAbility_0100 end"; } @@ -646,7 +646,7 @@ HWTEST_F(FaAbilityThreadTest, AaFwk_AbilityThread_SchedulePrepareTerminateAbilit EXPECT_NE(abilitythread->abilityImpl_, nullptr); abilitythread->abilityHandler_ = nullptr; bool ret = abilitythread->SchedulePrepareTerminateAbility(); - abilitythread->HandlePrepareTermianteAbility(); + abilitythread->HandlePrepareTerminateAbility(); EXPECT_EQ(ret, false); GTEST_LOG_(INFO) << "AaFwk_AbilityThread_SchedulePrepareTerminateAbility_0300 end"; } diff --git a/test/unittest/frameworks_kits_ability_native_test/ui_ability_thread_test.cpp b/test/unittest/frameworks_kits_ability_native_test/ui_ability_thread_test.cpp index 6596e1eb184..143310c1e5b 100644 --- a/test/unittest/frameworks_kits_ability_native_test/ui_ability_thread_test.cpp +++ b/test/unittest/frameworks_kits_ability_native_test/ui_ability_thread_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 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 @@ -21,8 +21,8 @@ #include "ui_ability_thread.h" #undef private #undef protected -#include "ability_handler.h" #include "ability_context.h" +#include "ability_handler.h" #include "ability_local_record.h" #include "mock_ability_token.h" #include "ohos_application.h" @@ -1236,34 +1236,34 @@ HWTEST_F(UIAbilityThreadTest, AbilityRuntime_OnExecuteIntent_0400, Function | Me } /** - * @tc.number: AbilityRuntime_HandlePrepareTermianteAbility_0100 - * @tc.name: HandlePrepareTermianteAbility - * @tc.desc: Test HandlePrepareTermianteAbility function + * @tc.number: AbilityRuntime_HandlePrepareTerminateAbility_0100 + * @tc.name: HandlePrepareTerminateAbility + * @tc.desc: Test HandlePrepareTerminateAbility function */ -HWTEST_F(UIAbilityThreadTest, AbilityRuntime_HandlePrepareTermianteAbility_0100, Function | MediumTest | Level1) +HWTEST_F(UIAbilityThreadTest, AbilityRuntime_HandlePrepareTerminateAbility_0100, Function | MediumTest | Level1) { - GTEST_LOG_(INFO) << "AbilityRuntime_HandlePrepareTermianteAbility_0100 start"; + GTEST_LOG_(INFO) << "AbilityRuntime_HandlePrepareTerminateAbility_0100 start"; AbilityRuntime::UIAbilityThread *abilitythread = new (std::nothrow) AbilityRuntime::UIAbilityThread(); EXPECT_NE(abilitythread, nullptr); EXPECT_EQ(abilitythread->abilityImpl_, nullptr); - abilitythread->HandlePrepareTermianteAbility(); - GTEST_LOG_(INFO) << "AbilityRuntime_HandlePrepareTermianteAbility_0100 end"; + abilitythread->HandlePrepareTerminateAbility(); + GTEST_LOG_(INFO) << "AbilityRuntime_HandlePrepareTerminateAbility_0100 end"; } /** - * @tc.number: AbilityRuntime_HandlePrepareTermianteAbility_0200 - * @tc.name: HandlePrepareTermianteAbility - * @tc.desc: Test HandlePrepareTermianteAbility function + * @tc.number: AbilityRuntime_HandlePrepareTerminateAbility_0200 + * @tc.name: HandlePrepareTerminateAbility + * @tc.desc: Test HandlePrepareTerminateAbility function */ -HWTEST_F(UIAbilityThreadTest, AbilityRuntime_HandlePrepareTermianteAbility_0200, Function | MediumTest | Level1) +HWTEST_F(UIAbilityThreadTest, AbilityRuntime_HandlePrepareTerminateAbility_0200, Function | MediumTest | Level1) { - GTEST_LOG_(INFO) << "AbilityRuntime_HandlePrepareTermianteAbility_0200 start"; + GTEST_LOG_(INFO) << "AbilityRuntime_HandlePrepareTerminateAbility_0200 start"; AbilityRuntime::UIAbilityThread *abilitythread = new (std::nothrow) AbilityRuntime::UIAbilityThread(); EXPECT_NE(abilitythread, nullptr); abilitythread->abilityImpl_ = std::make_shared(); EXPECT_NE(abilitythread->abilityImpl_, nullptr); - abilitythread->HandlePrepareTermianteAbility(); - GTEST_LOG_(INFO) << "AbilityRuntime_HandlePrepareTermianteAbility_0200 end"; + abilitythread->HandlePrepareTerminateAbility(); + GTEST_LOG_(INFO) << "AbilityRuntime_HandlePrepareTerminateAbility_0200 end"; } /** -- Gitee