From 7801af98db1b50a5b9f831346f05b2524e06de43 Mon Sep 17 00:00:00 2001 From: jsjzju Date: Wed, 10 Apr 2024 21:08:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=A4=9A=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jsjzju Change-Id: I08136ca387264dde5fc82c318cd7cd8650be95ed --- services/abilitymgr/abilitymgr.gni | 1 + .../include/ability_manager_service.h | 51 +- .../include/app_exit_reason_helper.h | 17 +- .../ui_ability_lifecycle_manager.h | 42 +- .../abilitymgr/include/sub_managers_helper.h | 96 ++ .../src/ability_manager_service.cpp | 1209 ++++++++--------- .../abilitymgr/src/app_exit_reason_helper.cpp | 68 +- .../ui_ability_lifecycle_manager.cpp | 144 +- .../abilitymgr/src/sub_managers_helper.cpp | 407 ++++++ .../abilitymanagerservicec_fuzzer.cpp | 7 +- .../abilitymanagerservicethird_fuzzer.cpp | 2 +- .../abilitystubabilityrecovery_fuzzer.cpp | 4 +- ...bilitystubabilityrecoveryenable_fuzzer.cpp | 4 +- ...bilitystubabilitytransitiondone_fuzzer.cpp | 4 +- .../abilitystubacquiredataability_fuzzer.cpp | 4 +- .../abilitystubacquiresharedata_fuzzer.cpp | 4 +- ...ilitystubaddfreeinstallobserver_fuzzer.cpp | 4 +- .../abilitystubattachabilitythread_fuzzer.cpp | 4 +- .../abilitystubcallrequestdone_fuzzer.cpp | 4 +- .../abilitystubcalluiabilitybyscb_fuzzer.cpp | 4 +- .../abilitystubcancelwantsender_fuzzer.cpp | 4 +- ...tystubcheckuiextensionisfocused_fuzzer.cpp | 4 +- .../abilitystubcleanallmissions_fuzzer.cpp | 4 +- .../abilitystubcleanmission_fuzzer.cpp | 4 +- ...ilitystubclearupapplicationdata_fuzzer.cpp | 4 +- .../abilitystubcloseuiabilitybyscb_fuzzer.cpp | 4 +- .../abilitystubcommandabilitydone_fuzzer.cpp | 4 +- ...itystubcommandabilitywindowdone_fuzzer.cpp | 4 +- ...tystubcompletefirstframedrawing_fuzzer.cpp | 4 +- .../abilitystubconnectability_fuzzer.cpp | 4 +- .../abilitystubconnectabilitydone_fuzzer.cpp | 4 +- ...ilitystubconnectabilitywithtype_fuzzer.cpp | 4 +- ...tystubconnectuiextensionability_fuzzer.cpp | 4 +- .../abilitystubcontinueability_fuzzer.cpp | 4 +- .../abilitystubcontinuemission_fuzzer.cpp | 4 +- ...stubcontinuemissionofbundlename_fuzzer.cpp | 4 +- ...tubdelegatordoabilitybackground_fuzzer.cpp | 4 +- ...tubdelegatordoabilityforeground_fuzzer.cpp | 4 +- .../abilitystubdisconnectability_fuzzer.cpp | 4 +- ...bilitystubdisconnectabilitydone_fuzzer.cpp | 4 +- .../abilitystubdoabilitybackground_fuzzer.cpp | 4 +- .../abilitystubdoabilityforeground_fuzzer.cpp | 4 +- .../abilitystubdumpabilityinfodone_fuzzer.cpp | 4 +- .../abilitystubdumpstate_fuzzer.cpp | 4 +- .../abilitystubdumpsysstate_fuzzer.cpp | 4 +- .../abilitystubfinishusertest_fuzzer.cpp | 4 +- .../abilitystubforceexitapp_fuzzer.cpp | 4 +- ...tubfreeinstallabilityfromremote_fuzzer.cpp | 4 +- ...bilitystubgetabilityrunninginfo_fuzzer.cpp | 4 +- .../abilitystubgetabilitytoken_fuzzer.cpp | 4 +- .../abilitystubgetappmemorysize_fuzzer.cpp | 4 +- ...bilitystubgetdlpconnectioninfos_fuzzer.cpp | 4 +- ...bilitystubgetelementnamebytoken_fuzzer.cpp | 4 +- ...litystubgetextensionrunninginfo_fuzzer.cpp | 4 +- .../abilitystubgetmissionidbytoken_fuzzer.cpp | 4 +- .../abilitystubgetmissioninfo_fuzzer.cpp | 4 +- .../abilitystubgetmissioninfos_fuzzer.cpp | 4 +- ...ilitystubgetmissionsnapshotinfo_fuzzer.cpp | 4 +- ...bilitystubgetpendingrequestwant_fuzzer.cpp | 4 +- ...itystubgetpendingwantbundlename_fuzzer.cpp | 4 +- .../abilitystubgetpendingwantcode_fuzzer.cpp | 4 +- .../abilitystubgetpendingwanttype_fuzzer.cpp | 4 +- .../abilitystubgetpendingwantuid_fuzzer.cpp | 4 +- ...abilitystubgetpendingwantuserid_fuzzer.cpp | 4 +- ...bilitystubgetprocessrunninginfo_fuzzer.cpp | 4 +- .../abilitystubgettopability_fuzzer.cpp | 4 +- .../abilitystubgettopabilitytoken_fuzzer.cpp | 4 +- .../abilitystubgetwantsender_fuzzer.cpp | 4 +- .../abilitystubgetwantsendinfo_fuzzer.cpp | 4 +- ...ilitystubisramconstraineddevice_fuzzer.cpp | 4 +- ...itystubisrunninginstabilitytest_fuzzer.cpp | 4 +- .../abilitystubkillprocess_fuzzer.cpp | 4 +- ...bilitystublockmissionforcleanup_fuzzer.cpp | 4 +- .../abilitystubminimizeability_fuzzer.cpp | 4 +- ...ilitystubminimizeuiabilitybyscb_fuzzer.cpp | 4 +- ...ystubminimizeuiextensionability_fuzzer.cpp | 4 +- ...litystubmoveabilitytobackground_fuzzer.cpp | 4 +- ...itystubmovemissionstobackground_fuzzer.cpp | 4 +- ...itystubmovemissionstoforeground_fuzzer.cpp | 4 +- .../abilitystubmovemissiontofront_fuzzer.cpp | 4 +- ...stubmovemissiontofrontbyoptions_fuzzer.cpp | 4 +- ...ystubnotifycompletecontinuation_fuzzer.cpp | 4 +- ...itystubnotifycontinuationresult_fuzzer.cpp | 4 +- .../abilitystubnotifysaveasresult_fuzzer.cpp | 4 +- ...litystubprepareterminateability_fuzzer.cpp | 4 +- .../abilitystubquerymissionvaild_fuzzer.cpp | 4 +- .../abilitystubrecordappexitreason_fuzzer.cpp | 4 +- ...ilitystubregistercancellistener_fuzzer.cpp | 4 +- ...abilitystubregistercollaborator_fuzzer.cpp | 4 +- ...ystubregisterconnectionobserver_fuzzer.cpp | 4 +- ...litystubregistermissionlistener_fuzzer.cpp | 4 +- ...ubregisterremotemissionlistener_fuzzer.cpp | 4 +- ...tystubregisterremoteofflistener_fuzzer.cpp | 4 +- ...itystubregisterremoteonlistener_fuzzer.cpp | 4 +- .../abilitystubregisterwmshandler_fuzzer.cpp | 4 +- .../abilitystubreleasecallability_fuzzer.cpp | 4 +- .../abilitystubreleasedataability_fuzzer.cpp | 4 +- ...abilitystubreportdrawncompleted_fuzzer.cpp | 4 +- ...abilitystubrequestdialogservice_fuzzer.cpp | 4 +- .../abilitystubsendanrprocessid_fuzzer.cpp | 4 +- .../abilitystubsendresulttoability_fuzzer.cpp | 4 +- .../abilitystubsendwantsender_fuzzer.cpp | 4 +- ...abilitystubsetabilitycontroller_fuzzer.cpp | 4 +- ...litystubsetmissioncontinuestate_fuzzer.cpp | 4 +- .../abilitystubsetmissionicon_fuzzer.cpp | 4 +- .../abilitystubsetmissionlabel_fuzzer.cpp | 4 +- .../abilitystubsetrootscenesession_fuzzer.cpp | 4 +- ...itystubsetsessionmanagerservice_fuzzer.cpp | 4 +- .../abilitystubsharedatadone_fuzzer.cpp | 4 +- .../abilitystubstartability_fuzzer.cpp | 4 +- ...bilitystubstartabilityaddcaller_fuzzer.cpp | 4 +- ...stubstartabilityascallerbytoken_fuzzer.cpp | 4 +- ...bstartabilityascallerforoptions_fuzzer.cpp | 4 +- .../abilitystubstartabilitybycall_fuzzer.cpp | 4 +- ...ilitystubstartabilityforoptions_fuzzer.cpp | 4 +- ...litystubstartabilityforsettings_fuzzer.cpp | 4 +- .../abilitystubstartcontinuation_fuzzer.cpp | 4 +- ...bilitystubstartextensionability_fuzzer.cpp | 4 +- ...ystubstartspecifiedabilitybyscb_fuzzer.cpp | 4 +- .../abilitystubstartsyncmissions_fuzzer.cpp | 4 +- .../abilitystubstartuiabilitybyscb_fuzzer.cpp | 4 +- ...litystubstartuiextensionability_fuzzer.cpp | 4 +- .../abilitystubstartuser_fuzzer.cpp | 4 +- .../abilitystubstartusertest_fuzzer.cpp | 4 +- ...abilitystubstopextensionability_fuzzer.cpp | 4 +- .../abilitystubstopserviceability_fuzzer.cpp | 4 +- .../abilitystubstopsyncmissions_fuzzer.cpp | 4 +- .../abilitystubstopuser_fuzzer.cpp | 4 +- .../abilitystubterminateability_fuzzer.cpp | 4 +- ...stubterminateuiextensionability_fuzzer.cpp | 4 +- .../abilitystubuninstallapp_fuzzer.cpp | 4 +- ...litystubunlockmissionforcleanup_fuzzer.cpp | 4 +- ...itystubunregistercancellistener_fuzzer.cpp | 4 +- ...ilitystubunregistercollaborator_fuzzer.cpp | 4 +- ...tubunregisterconnectionobserver_fuzzer.cpp | 4 +- ...tystubunregistermissionlistener_fuzzer.cpp | 4 +- ...unregisterremotemissionlistener_fuzzer.cpp | 4 +- ...tubupdatemissionsnapshotfromwms_fuzzer.cpp | 4 +- .../abilitystubverifypermission_fuzzer.cpp | 4 +- .../ability_manager_service_dump_test.cpp | 17 +- .../ability_timeout_module_test/BUILD.gn | 1 + .../ability_timeout_module_test.cpp | 200 ++- .../specified_ability_service_test.cpp | 7 +- .../running_infos_module_test/BUILD.gn | 1 + .../running_infos_module_test.cpp | 16 +- .../start_ability_implicit_module_test.cpp | 30 +- .../start_option_display_id_test.cpp | 2 +- test/unittest/BUILD.gn | 1 + .../ability_manager_service_account_test.cpp | 60 +- .../ability_manager_service_first_test.cpp | 53 +- .../ability_manager_service_second_test.cpp | 86 +- .../ability_manager_service_third_test.cpp | 99 +- .../ability_timeout_test.cpp | 72 +- .../call_container_test.cpp | 5 +- .../running_infos_test/running_infos_test.cpp | 41 +- .../start_option_display_id_test.cpp | 2 +- .../ui_ability_lifecycle_manager_test.cpp | 62 +- 157 files changed, 1941 insertions(+), 1370 deletions(-) create mode 100644 services/abilitymgr/include/sub_managers_helper.h create mode 100644 services/abilitymgr/src/sub_managers_helper.cpp diff --git a/services/abilitymgr/abilitymgr.gni b/services/abilitymgr/abilitymgr.gni index 8032977d4f7..e958d410d12 100644 --- a/services/abilitymgr/abilitymgr.gni +++ b/services/abilitymgr/abilitymgr.gni @@ -45,6 +45,7 @@ abilityms_files = [ "src/extension_running_info.cpp", "src/caller_info.cpp", "src/sender_info.cpp", + "src/sub_managers_helper.cpp", "src/wants_info.cpp", "src/want_sender_info.cpp", "src/pending_want_record.cpp", diff --git a/services/abilitymgr/include/ability_manager_service.h b/services/abilitymgr/include/ability_manager_service.h index be4460b8180..d881f041702 100644 --- a/services/abilitymgr/include/ability_manager_service.h +++ b/services/abilitymgr/include/ability_manager_service.h @@ -57,6 +57,7 @@ #include "resident_process_manager.h" #include "scene_board/ui_ability_lifecycle_manager.h" #include "start_ability_handler.h" +#include "sub_managers_helper.h" #include "system_ability.h" #include "task_handler_wrap.h" #include "uri.h" @@ -778,13 +779,6 @@ public: */ virtual int32_t UpgradeApp(const std::string &bundleName, const int32_t uid, const std::string &exitMsg) override; - /** - * InitMissionListManager, set the user id of mission list manager. - * - * @param userId, user id. - */ - void InitMissionListManager(int userId, bool switchUser); - virtual sptr GetWantSender( const WantSenderInfo &wantSenderInfo, const sptr &callerToken) override; @@ -1753,10 +1747,6 @@ private: void ShowIllegalInfomation(std::string& result); int Dump(const std::vector& args, std::string& result); - void InitConnectManager(int32_t userId, bool switchUser); - void InitDataAbilityManager(int32_t userId, bool switchUser); - void InitPendWantManager(int32_t userId, bool switchUser); - // multi user void StartFreezingScreen(); void StopFreezingScreen(); @@ -1771,19 +1761,26 @@ private: bool IsSystemUI(const std::string &bundleName) const; bool VerificationAllToken(const sptr &token); + std::shared_ptr GetCurrentDataAbilityManager(); std::shared_ptr GetDataAbilityManager(const sptr &scheduler); - std::shared_ptr GetListManagerByUserId(int32_t userId); - std::shared_ptr GetConnectManagerByUserId(int32_t userId); std::shared_ptr GetDataAbilityManagerByUserId(int32_t userId); - std::shared_ptr GetListManagerByToken(const sptr &token); - std::shared_ptr GetConnectManagerByToken(const sptr &token); std::shared_ptr GetDataAbilityManagerByToken(const sptr &token); + std::unordered_map> GetConnectManagers(); + std::shared_ptr GetCurrentConnectManager(); + std::shared_ptr GetConnectManagerByUserId(int32_t userId); + std::shared_ptr GetConnectManagerByToken(const sptr &token); + std::shared_ptr GetCurrentPendingWantManager(); + std::shared_ptr GetPendingWantManagerByUserId(int32_t userId); + std::unordered_map> GetMissionListManagers(); + std::shared_ptr GetCurrentMissionListManager(); + std::shared_ptr GetMissionListManagerByUserId(int32_t userId); + std::unordered_map> GetUIAbilityManagers(); + std::shared_ptr GetCurrentUIAbilityManager(); + std::shared_ptr GetUIAbilityManagerByUserId(int32_t userId); + std::shared_ptr GetUIAbilityManagerByUid(int32_t uid); bool JudgeSelfCalled(const std::shared_ptr &abilityRecord); bool IsAppSelfCalled(const std::shared_ptr &abilityRecord); - void SetConnectManager(std::shared_ptr connectManager); - std::shared_ptr GetConnectManager() const; - int32_t GetValidUserId(const int32_t userId); int DelegatorMoveMissionToFront(int32_t missionId); @@ -1940,7 +1937,7 @@ private: int32_t RequestDialogServiceInner(const Want &want, const sptr &callerToken, int requestCode, int32_t userId); - bool CheckCallingTokenId(const std::string &bundleName); + bool CheckCallingTokenId(const std::string &bundleName, int32_t userId = INVALID_USER_ID); void ReleaseAbilityTokenMap(const sptr &token); @@ -1950,7 +1947,7 @@ private: bool CheckUserIdActive(int32_t userId); - int32_t CheckProcessOptions(const Want &want, const StartOptions &startOptions); + int32_t CheckProcessOptions(const Want &want, const StartOptions &startOptions, int32_t userId); void GetConnectManagerAndUIExtensionBySessionInfo(const sptr &sessionInfo, std::shared_ptr &connectManager, std::shared_ptr &targetAbility); @@ -2031,33 +2028,21 @@ private: std::shared_ptr taskHandler_; std::shared_ptr eventHandler_; ServiceRunningState state_; - std::unordered_map> connectManagers_; - mutable std::mutex connectManagerMutex_; - std::shared_ptr connectManager_; sptr iBundleManager_; std::shared_ptr bundleMgrHelper_; sptr appMgr_ { nullptr }; - std::unordered_map> dataAbilityManagers_; - std::shared_ptr dataAbilityManager_; - std::shared_ptr systemDataAbilityManager_; - std::unordered_map> pendingWantManagers_; - std::shared_ptr pendingWantManager_; const static std::map dumpMap; const static std::map dumpsysMap; const static std::map windowModeMap; - std::unordered_map> missionListManagers_; - std::shared_ptr currentMissionListManager_; - std::shared_ptr freeInstallManager_; - std::shared_ptr uiAbilityLifecycleManager_; + std::shared_ptr subManagersHelper_; std::shared_ptr userController_; sptr abilityController_ = nullptr; bool controllerIsAStabilityTest_ = false; ffrt::mutex globalLock_; - ffrt::mutex managersMutex_; ffrt::mutex bgtaskObserverMutex_; ffrt::mutex abilityTokenLock_; diff --git a/services/abilitymgr/include/app_exit_reason_helper.h b/services/abilitymgr/include/app_exit_reason_helper.h index 89e9f7847fa..ea6b4f00efb 100644 --- a/services/abilitymgr/include/app_exit_reason_helper.h +++ b/services/abilitymgr/include/app_exit_reason_helper.h @@ -21,18 +21,15 @@ #include "bundle_info.h" #include "exit_reason.h" -#include "mission_list_manager.h" -#include "scene_board/ui_ability_lifecycle_manager.h" +#include "sub_managers_helper.h" namespace OHOS { namespace AAFwk { class AppExitReasonHelper { public: - AppExitReasonHelper(std::shared_ptr &uiAbilityLifecycleManager, - std::unordered_map> &missionListManagers, - ffrt::mutex &managersMutex); + explicit AppExitReasonHelper(std::shared_ptr subManagersHelper); + ~AppExitReasonHelper() = default; - void SetCurrentMissionListManager(const std::shared_ptr currentMissionListManager); int32_t RecordAppExitReason(const ExitReason &exitReason); int32_t RecordProcessExitReason(const int32_t pid, const ExitReason &exitReason); int32_t RecordProcessExitReason(const int32_t pid, const ExitReason &exitReason, const std::string bundleName, @@ -43,13 +40,11 @@ private: const int32_t pid); void GetActiveAbilityListByUser(const std::string bundleName, std::vector &abilityLists, const int32_t targetUserId, const int32_t pid); - std::shared_ptr GetListManagerByUserId(const int32_t userId); + void GetActiveAbilityListFromUIAabilityManager(const std::string bundleName, + std::vector &abilityLists, const int32_t targetUserId, const int32_t pid); bool IsExitReasonValid(const ExitReason &exitReason); - std::shared_ptr &uiAbilityLifecycleManager_; - std::unordered_map> &missionListManagers_; - std::shared_ptr currentMissionListManager_; - ffrt::mutex &managersMutex_; + std::shared_ptr subManagersHelper_; }; } // namespace AAFwk } // namespace OHOS diff --git a/services/abilitymgr/include/scene_board/ui_ability_lifecycle_manager.h b/services/abilitymgr/include/scene_board/ui_ability_lifecycle_manager.h index 48eaf4e87da..97ba01be88f 100644 --- a/services/abilitymgr/include/scene_board/ui_ability_lifecycle_manager.h +++ b/services/abilitymgr/include/scene_board/ui_ability_lifecycle_manager.h @@ -38,6 +38,7 @@ struct MissionValidResult; class UIAbilityLifecycleManager : public std::enable_shared_from_this { public: UIAbilityLifecycleManager() = default; + explicit UIAbilityLifecycleManager(int32_t userId); virtual ~UIAbilityLifecycleManager() = default; struct SpecifiedInfo { @@ -147,7 +148,7 @@ public: */ void SetRootSceneSession(const sptr &rootSceneSession); - int NotifySCBToStartUIAbility(const AbilityRequest &abilityRequest, int32_t userId); + int NotifySCBToStartUIAbility(const AbilityRequest &abilityRequest); /** * @brief handle time out event @@ -170,7 +171,7 @@ public: * * @param abilityRequest target ability request. */ - int ResolveLocked(const AbilityRequest &abilityRequest, int32_t userId); + int ResolveLocked(const AbilityRequest &abilityRequest); /** * Call UIAbility by SCB. @@ -214,9 +215,8 @@ public: * Start specified ability by SCB. * * @param want Want information. - * @param userId Use id. */ - void StartSpecifiedAbilityBySCB(const Want &want, int32_t userId); + void StartSpecifiedAbilityBySCB(const Want &want); /** * CallRequestDone, after invoke callRequest, ability will call this interface to return callee. @@ -263,14 +263,11 @@ public: */ std::shared_ptr GetAbilityRecordsById(int32_t sessionId) const; - void GetActiveAbilityList(const std::string &bundleName, std::vector &abilityList, - int32_t targetUserId, int32_t pid = NO_PID) const; - - void OnAppStateChanged(const AppInfo &info, int32_t targetUserId); + void OnAppStateChanged(const AppInfo &info); - void UninstallApp(const std::string &bundleName, int32_t uid, int32_t targetUserId); + void UninstallApp(const std::string &bundleName, int32_t uid); - void GetAbilityRunningInfos(std::vector &info, bool isPerm, int32_t userId) const; + void GetAbilityRunningInfos(std::vector &info, bool isPerm) const; #ifdef ABILITY_COMMAND_FOR_TEST /** @@ -279,7 +276,7 @@ public: * @param abilityRecordId The Ability Record Id. * @return Returns ERR_OK on success, others on failure. */ - int BlockAbility(int abilityRecordId, int32_t targetUserId) const; + int BlockAbility(int abilityRecordId) const; #endif /** @@ -294,7 +291,7 @@ public: * * @param info dump result. */ - void DumpMissionList(std::vector &info, bool isClient, int userId, const std::string &args = ""); + void DumpMissionList(std::vector &info, bool isClient, const std::string &args = ""); /** * @brief dump mission list by id with params @@ -303,19 +300,17 @@ public: * @param params dump params. */ void DumpMissionListByRecordId(std::vector& info, bool isClient, int32_t abilityRecordId, - const std::vector& params, int userId); + const std::vector& params); int MoveMissionToFront(int32_t sessionId, std::shared_ptr startOptions = nullptr); - bool IsAbilityStarted(AbilityRequest &abilityRequest, std::shared_ptr &targetRecord, - const int32_t oriValidUserId); + bool IsAbilityStarted(AbilityRequest &abilityRequest, std::shared_ptr &targetRecord); /** * @brief Update session info. * @param sessionInfos The vector of session info. */ - int32_t UpdateSessionInfoBySCB(std::list &sessionInfos, int32_t userId, - std::vector &sessionIds); + int32_t UpdateSessionInfoBySCB(std::list &sessionInfos, std::vector &sessionIds); int32_t RegisterStatusBarDelegate(sptr delegate); bool IsCallerInStatusBar(); @@ -335,9 +330,9 @@ public: void CompleteFirstFrameDrawing(int32_t sessionId) const; private: - int32_t GetPersistentIdByAbilityRequest(const AbilityRequest &abilityRequest, bool &reuse, int32_t userId) const; - int32_t GetReusedSpecifiedPersistentId(const AbilityRequest &abilityRequest, bool &reuse, int32_t userId) const; - int32_t GetReusedStandardPersistentId(const AbilityRequest &abilityRequest, bool &reuse, int32_t userId) const; + int32_t GetPersistentIdByAbilityRequest(const AbilityRequest &abilityRequest, bool &reuse) const; + int32_t GetReusedSpecifiedPersistentId(const AbilityRequest &abilityRequest, bool &reuse) const; + int32_t GetReusedStandardPersistentId(const AbilityRequest &abilityRequest, bool &reuse) const; int32_t GetReusedCollaboratorPersistentId(const AbilityRequest &abilityRequest, bool &reuse) const; void UpdateProcessName(const AbilityRequest &abilityRequest, std::shared_ptr &abilityRecord); void UpdateAbilityRecordLaunchReason(const AbilityRequest &abilityRequest, @@ -362,13 +357,13 @@ private: void CompleteTerminate(const std::shared_ptr &abilityRecord); bool IsContainsAbilityInner(const sptr &token) const; bool CheckProperties(const std::shared_ptr &abilityRecord, const AbilityRequest &abilityRequest, - AppExecFwk::LaunchMode launchMode, int32_t userId) const; + AppExecFwk::LaunchMode launchMode) const; void NotifyAbilityToken(const sptr &token, const AbilityRequest &abilityRequest) const; int CloseUIAbilityInner(std::shared_ptr abilityRecord, int resultCode, const Want *resultWant, bool isClearSession); // byCall - int CallAbilityLocked(const AbilityRequest &abilityRequest, int32_t userId); + int CallAbilityLocked(const AbilityRequest &abilityRequest); sptr CreateSessionInfo(const AbilityRequest &abilityRequest) const; int NotifySCBPendingActivation(sptr &sessionInfo, const AbilityRequest &abilityRequest) const; int ResolveAbility(const std::shared_ptr &targetAbility, const AbilityRequest &abilityRequest) const; @@ -401,8 +396,9 @@ private: std::shared_ptr GetStatusBarDelegateManager(); int32_t DoProcessAttachment(std::shared_ptr abilityRecord); void BatchCloseUIAbility(std::unordered_set>& abilitySet); - int StartWithPersistentIdByDistributed(const AbilityRequest &abilityRequest, int32_t userId, int32_t persistentId); + int StartWithPersistentIdByDistributed(const AbilityRequest &abilityRequest, int32_t persistentId); + int32_t userId_ = -1; mutable ffrt::mutex sessionLock_; std::unordered_map> sessionAbilityMap_; std::unordered_map> tmpAbilityMap_; diff --git a/services/abilitymgr/include/sub_managers_helper.h b/services/abilitymgr/include/sub_managers_helper.h new file mode 100644 index 00000000000..ba725821ae8 --- /dev/null +++ b/services/abilitymgr/include/sub_managers_helper.h @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2024 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_ABILITY_RUNTIME_SUB_MANAGERS_HELPER_H +#define OHOS_ABILITY_RUNTIME_SUB_MANAGERS_HELPER_H + +#include +#include +#include + +#include "ability_connect_manager.h" +#include "ability_event_handler.h" +#include "cpp/mutex.h" +#include "data_ability_manager.h" +#include "mission_list_manager.h" +#include "nocopyable.h" +#include "pending_want_manager.h" +#include "scene_board/ui_ability_lifecycle_manager.h" +#include "task_handler_wrap.h" + +namespace OHOS { +namespace AAFwk { +class SubManagersHelper { +public: + SubManagersHelper(std::shared_ptr taskHandler, std::shared_ptr eventHandler); + virtual ~SubManagersHelper() = default; + + void InitSubManagers(int userId, bool switchUser); + void InitMissionListManager(int userId, bool switchUser); + void InitUIAbilityManager(int userId, bool switchUser); + void InitConnectManager(int32_t userId, bool switchUser); + void InitDataAbilityManager(int32_t userId, bool switchUser); + void InitPendWantManager(int32_t userId, bool switchUser); + + void ClearSubManagers(int userId); + + std::shared_ptr GetCurrentDataAbilityManager(); + std::shared_ptr GetDataAbilityManager(const sptr &scheduler); + std::shared_ptr GetDataAbilityManagerByUserId(int32_t userId); + std::shared_ptr GetDataAbilityManagerByToken(const sptr &token); + + std::unordered_map> GetConnectManagers(); + std::shared_ptr GetCurrentConnectManager(); + std::shared_ptr GetConnectManagerByUserId(int32_t userId); + std::shared_ptr GetConnectManagerByToken(const sptr &token); + + std::shared_ptr GetCurrentPendingWantManager(); + std::shared_ptr GetPendingWantManagerByUserId(int32_t userId); + + std::unordered_map> GetMissionListManagers(); + std::shared_ptr GetCurrentMissionListManager(); + std::shared_ptr GetMissionListManagerByUserId(int32_t userId); + + std::unordered_map> GetUIAbilityManagers(); + std::shared_ptr GetCurrentUIAbilityManager(); + std::shared_ptr GetUIAbilityManagerByUserId(int32_t userId); + std::shared_ptr GetUIAbilityManagerByUid(int32_t uid); + + void UninstallApp(const std::string &bundleName, int32_t uid); + void UninstallAppInUIAbilityManagers(int32_t userId, const std::string &bundleName, int32_t uid); + void UninstallAppInMissionListManagers(int32_t userId, const std::string &bundleName, int32_t uid); + bool VerificationAllToken(const sptr &token); + +private: + DISALLOW_COPY_AND_MOVE(SubManagersHelper); + + std::shared_ptr taskHandler_; + std::shared_ptr eventHandler_; + + ffrt::mutex managersMutex_; + std::unordered_map> connectManagers_; + std::shared_ptr currentConnectManager_; + std::unordered_map> dataAbilityManagers_; + std::shared_ptr currentDataAbilityManager_; + std::unordered_map> pendingWantManagers_; + std::shared_ptr currentPendingWantManager_; + std::unordered_map> missionListManagers_; + std::shared_ptr currentMissionListManager_; + std::unordered_map> uiAbilityManagers_; + std::shared_ptr currentUIAbilityManager_; +}; +} // namespace AAFwk +} // namespace OHOS +#endif // OHOS_ABILITY_RUNTIME_SUB_MANAGERS_HELPER_H diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 6dc943c6746..6bdb5cc55bd 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -61,6 +61,7 @@ #include "in_process_call_wrapper.h" #include "insight_intent_execute_callback_proxy.h" #include "insight_intent_execute_manager.h" +#include "int_wrapper.h" #include "interceptor/ability_jump_interceptor.h" #include "interceptor/control_interceptor.h" #include "interceptor/crowd_test_interceptor.h" @@ -92,7 +93,6 @@ #include "status_bar_delegate_interface.h" #include "string_ex.h" #include "string_wrapper.h" -#include "int_wrapper.h" #include "system_ability_definition.h" #include "system_ability_token_callback.h" #include "extension_record_manager.h" @@ -371,21 +371,12 @@ bool AbilityManagerService::Init() // init user controller. userController_ = std::make_shared(); userController_->Init(); - - InitConnectManager(MAIN_USER_ID, true); - InitDataAbilityManager(MAIN_USER_ID, true); - InitPendWantManager(MAIN_USER_ID, true); - systemDataAbilityManager_ = std::make_shared(); - AmsConfigurationParameter::GetInstance().Parse(); TAG_LOGI(AAFwkTag::ABILITYMGR, "Ability manager service config parse"); - std::string deviceType = OHOS::system::GetDeviceType(); - if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_ = std::make_shared(); - } else { - InitMissionListManager(MAIN_USER_ID, true); - } + subManagersHelper_ = std::make_shared(taskHandler_, eventHandler_); + subManagersHelper_->InitSubManagers(MAIN_USER_ID, true); SwitchManagers(U0_USER_ID, false); + std::string deviceType = OHOS::system::GetDeviceType(); #ifdef SUPPORT_GRAPHICS auto anrListenerTask = []() { auto anrListener = std::make_shared(); @@ -412,8 +403,7 @@ bool AbilityManagerService::Init() InitPushTask(); SubscribeScreenUnlockedEvent(); - appExitReasonHelper_ = std::make_shared(uiAbilityLifecycleManager_, missionListManagers_, - managersMutex_); + appExitReasonHelper_ = std::make_shared(subManagersHelper_); TAG_LOGI(AAFwkTag::ABILITYMGR, "Init success."); return true; } @@ -1096,9 +1086,11 @@ int AbilityManagerService::StartAbilityInner(const Want &want, const sptrNotifySCBToStartUIAbility(abilityRequest, oriValidUserId); + auto uiAbilityManager = GetUIAbilityManagerByUserId(oriValidUserId); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->NotifySCBToStartUIAbility(abilityRequest); } - auto missionListManager = GetListManagerByUserId(oriValidUserId); + auto missionListManager = GetMissionListManagerByUserId(oriValidUserId); if (missionListManager == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListManager is nullptr. userId=%{public}d", validUserId); return ERR_INVALID_VALUE; @@ -1277,9 +1269,11 @@ int AbilityManagerService::StartAbility(const Want &want, const AbilityStartSett UpdateCallerInfo(abilityRequest.want, callerToken); abilityRequest.userId = oriValidUserId; abilityRequest.want.SetParam(IS_CALL_BY_SCB, false); - return uiAbilityLifecycleManager_->NotifySCBToStartUIAbility(abilityRequest, oriValidUserId); + auto uiAbilityManager = GetUIAbilityManagerByUserId(oriValidUserId); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->NotifySCBToStartUIAbility(abilityRequest); } - auto missionListManager = GetListManagerByUserId(oriValidUserId); + auto missionListManager = GetMissionListManagerByUserId(oriValidUserId); if (missionListManager == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListManager is Null. userId=%{public}d", validUserId); eventInfo.errCode = ERR_INVALID_VALUE; @@ -1306,7 +1300,7 @@ int AbilityManagerService::StartAbility(const Want &want, const StartOptions &st int AbilityManagerService::StartUIAbilityForOptionWrap(const Want &want, const StartOptions &options, sptr callerToken, int32_t userId, int requestCode) { - auto ret = CheckProcessOptions(want, options); + auto ret = CheckProcessOptions(want, options, userId); if (ret != ERR_OK) { return ret; } @@ -1338,7 +1332,7 @@ int AbilityManagerService::StartAbilityForResultAsCaller( AbilityUtil::RemoveShowModeKey(const_cast(want)); AAFwk::Want newWant = want; - auto connectManager = GetConnectManager(); + auto connectManager = GetCurrentConnectManager(); CHECK_POINTER_AND_RETURN(connectManager, ERR_NO_INIT); auto asCallerSourceToken = connectManager->GetUIExtensionSourceToken(callerToken); if (asCallerSourceToken != nullptr) { @@ -1356,7 +1350,7 @@ int AbilityManagerService::StartAbilityForResultAsCaller(const Want &want, const CHECK_CALLER_IS_SYSTEM_APP; AAFwk::Want newWant = want; - auto connectManager = GetConnectManager(); + auto connectManager = GetCurrentConnectManager(); CHECK_POINTER_AND_RETURN(connectManager, ERR_NO_INIT); auto asCallerSourceToken = connectManager->GetUIExtensionSourceToken(callerToken); if (asCallerSourceToken != nullptr) { @@ -1615,9 +1609,11 @@ int AbilityManagerService::StartAbilityForOptionInner(const Want &want, const St abilityRequest.userId = oriValidUserId; abilityRequest.want.SetParam(IS_CALL_BY_SCB, false); abilityRequest.processOptions = startOptions.processOptions; - return uiAbilityLifecycleManager_->NotifySCBToStartUIAbility(abilityRequest, oriValidUserId); + auto uiAbilityManager = GetUIAbilityManagerByUserId(oriValidUserId); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->NotifySCBToStartUIAbility(abilityRequest); } - auto missionListManager = GetListManagerByUserId(oriValidUserId); + auto missionListManager = GetMissionListManagerByUserId(oriValidUserId); if (missionListManager == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListManager is Null. userId=%{public}d", oriValidUserId); eventInfo.errCode = ERR_INVALID_VALUE; @@ -1868,17 +1864,15 @@ int AbilityManagerService::StartUIAbilityBySCB(sptr sessionInfo) } } - if (uiAbilityLifecycleManager_ == nullptr) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "uiAbilityLifecycleManager_ is nullptr"); - return ERR_INVALID_VALUE; - } ReportAbilitStartInfoToRSS(abilityInfo); ReportAbilitAssociatedStartInfoToRSS(abilityInfo, static_cast( ResourceSchedule::ResType::AssociatedStartType::SCB_START_ABILITY), sessionInfo->callerToken); - return uiAbilityLifecycleManager_->StartUIAbility(abilityRequest, sessionInfo); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->StartUIAbility(abilityRequest, sessionInfo); } -bool AbilityManagerService::CheckCallingTokenId(const std::string &bundleName) +bool AbilityManagerService::CheckCallingTokenId(const std::string &bundleName, int32_t userId) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); auto bms = GetBundleManager(); @@ -1886,9 +1880,10 @@ bool AbilityManagerService::CheckCallingTokenId(const std::string &bundleName) TAG_LOGE(AAFwkTag::ABILITYMGR, "bms is invalid."); return false; } + auto validUserId = GetValidUserId(userId); AppExecFwk::ApplicationInfo appInfo; IN_PROCESS_CALL_WITHOUT_RET(bms->GetApplicationInfo(bundleName, - AppExecFwk::BundleFlag::GET_BUNDLE_DEFAULT, GetUserId(), appInfo)); + AppExecFwk::BundleFlag::GET_BUNDLE_DEFAULT, validUserId, appInfo)); auto accessTokenId = IPCSkeleton::GetCallingTokenID(); if (accessTokenId != appInfo.accessTokenId) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Permission verification failed"); @@ -2319,8 +2314,9 @@ int AbilityManagerService::ChangeAbilityVisibility(sptr token, bo TAG_LOGE(AAFwkTag::ABILITYMGR, "Capability not support."); return ERR_CAPABILITY_NOT_SUPPORT; } - CHECK_POINTER_AND_RETURN(uiAbilityLifecycleManager_, ERR_INVALID_VALUE); - return uiAbilityLifecycleManager_->ChangeAbilityVisibility(token, isShow); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->ChangeAbilityVisibility(token, isShow); } int AbilityManagerService::ChangeUIAbilityVisibilityBySCB(sptr sessionInfo, bool isShow) @@ -2329,8 +2325,9 @@ int AbilityManagerService::ChangeUIAbilityVisibilityBySCB(sptr sess TAG_LOGE(AAFwkTag::ABILITYMGR, "Not sceneboard called, not allowed."); return ERR_WRONG_INTERFACE_CALL; } - CHECK_POINTER_AND_RETURN(uiAbilityLifecycleManager_, ERR_INVALID_VALUE); - return uiAbilityLifecycleManager_->ChangeUIAbilityVisibilityBySCB(sessionInfo, isShow); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->ChangeUIAbilityVisibilityBySCB(sessionInfo, isShow); } int AbilityManagerService::StartExtensionAbilityInner(const Want &want, const sptr &callerToken, @@ -2853,7 +2850,7 @@ int AbilityManagerService::MoveAbilityToBackground(const sptr &to } auto ownerUserId = abilityRecord->GetOwnerMissionUserId(); - auto missionListManager = GetListManagerByUserId(ownerUserId); + auto missionListManager = GetMissionListManagerByUserId(ownerUserId); if (!missionListManager) { TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListManager is Null. ownerUserId=%{public}d", ownerUserId); return ERR_INVALID_VALUE; @@ -2888,13 +2885,14 @@ int32_t AbilityManagerService::MoveUIAbilityToBackground(const sptrGetOwnerMissionUserId(); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - CHECK_POINTER_AND_RETURN(abilityRecord, ERR_NULL_OBJECT); - return uiAbilityLifecycleManager_->NotifySCBToMinimizeUIAbility(abilityRecord, token); + auto uiAbilityManager = GetUIAbilityManagerByUserId(ownerUserId); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->NotifySCBToMinimizeUIAbility(abilityRecord, token); } - auto ownerUserId = abilityRecord->GetOwnerMissionUserId(); - auto missionListManager = GetListManagerByUserId(ownerUserId); + auto missionListManager = GetMissionListManagerByUserId(ownerUserId); CHECK_POINTER_AND_RETURN(missionListManager, ERR_INVALID_VALUE); return missionListManager->MoveAbilityToBackground(abilityRecord); } @@ -2958,13 +2956,15 @@ int AbilityManagerService::TerminateAbilityWithFlag(const sptr &t } auto ownerUserId = abilityRecord->GetOwnerMissionUserId(); - auto missionListManager = GetListManagerByUserId(ownerUserId); + auto missionListManager = GetMissionListManagerByUserId(ownerUserId); if (missionListManager) { return missionListManager->TerminateAbility(abilityRecord, resultCode, resultWant, flag); } TAG_LOGW(AAFwkTag::ABILITYMGR, "missionListManager is Null. ownerUserId=%{public}d", ownerUserId); - if (uiAbilityLifecycleManager_ && Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - return uiAbilityLifecycleManager_->CloseUIAbility(abilityRecord, resultCode, resultWant, false); + if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { + auto uiAbilityManager = GetUIAbilityManagerByUserId(ownerUserId); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->CloseUIAbility(abilityRecord, resultCode, resultWant, false); } return ERR_INVALID_VALUE; } @@ -3019,13 +3019,11 @@ int AbilityManagerService::CloseUIAbilityBySCB(const sptr &sessionI return ERR_WRONG_INTERFACE_CALL; } - if (!uiAbilityLifecycleManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "failed, uiAbilityLifecycleManager is nullptr"); - return ERR_INVALID_VALUE; - } + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); TAG_LOGI(AAFwkTag::ABILITYMGR, "close session: %{public}d, resultCode: %{public}d", sessionInfo->persistentId, sessionInfo->resultCode); - auto abilityRecord = uiAbilityLifecycleManager_->GetUIAbilityRecordBySessionInfo(sessionInfo); + auto abilityRecord = uiAbilityManager->GetUIAbilityRecordBySessionInfo(sessionInfo); CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); if (!IsAbilityControllerForeground(abilityRecord->GetAbilityInfo().bundleName)) { return ERR_WOULD_BLOCK; @@ -3041,7 +3039,7 @@ int AbilityManagerService::CloseUIAbilityBySCB(const sptr &sessionI eventInfo.bundleName = abilityRecord->GetAbilityInfo().bundleName; eventInfo.abilityName = abilityRecord->GetAbilityInfo().name; EventReport::SendAbilityEvent(EventName::CLOSE_UI_ABILITY_BY_SCB, HiSysEventType::BEHAVIOR, eventInfo); - eventInfo.errCode = uiAbilityLifecycleManager_->CloseUIAbility(abilityRecord, sessionInfo->resultCode, + eventInfo.errCode = uiAbilityManager->CloseUIAbility(abilityRecord, sessionInfo->resultCode, &(sessionInfo->want), sessionInfo->isClearSession); if (eventInfo.errCode != ERR_OK) { EventReport::SendAbilityEvent(EventName::CLOSE_UI_ABILITY_BY_SCB_ERROR, HiSysEventType::FAULT, eventInfo); @@ -3064,7 +3062,9 @@ int AbilityManagerService::SendResultToAbility(int32_t requestCode, int32_t resu } std::shared_ptr abilityRecord = nullptr; if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - abilityRecord = uiAbilityLifecycleManager_->GetAbilityRecordsById(missionId); + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + abilityRecord = uiAbilityManager->GetAbilityRecordsById(missionId); } else { sptr abilityToken = GetAbilityTokenByMissionId(missionId); CHECK_POINTER_AND_RETURN(abilityToken, ERR_INVALID_VALUE); @@ -3094,7 +3094,7 @@ int AbilityManagerService::StartRemoteAbility(const Want &want, int requestCode, TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s: try to StartAbilityForResult", __func__); int32_t missionId = -1; if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - missionId = uiAbilityLifecycleManager_->GetSessionIdByAbilityToken(callerToken); + missionId = GetMissionIdByAbilityTokenInner(callerToken); if (!missionId) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Invalid missionId id."); return ERR_INVALID_VALUE; @@ -3202,7 +3202,7 @@ int AbilityManagerService::MinimizeAbility(const sptr &token, boo return ERR_WOULD_BLOCK; } - auto missionListManager = GetListManagerByUserId(abilityRecord->GetOwnerMissionUserId()); + auto missionListManager = GetMissionListManagerByUserId(abilityRecord->GetOwnerMissionUserId()); if (!missionListManager) { TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListManager is Null."); return ERR_INVALID_VALUE; @@ -3261,17 +3261,15 @@ int AbilityManagerService::MinimizeUIAbilityBySCB(const sptr &sessi return ERR_WRONG_INTERFACE_CALL; } - if (!uiAbilityLifecycleManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "failed, uiAbilityLifecycleManager is nullptr"); - return ERR_INVALID_VALUE; - } - auto abilityRecord = uiAbilityLifecycleManager_->GetUIAbilityRecordBySessionInfo(sessionInfo); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + auto abilityRecord = uiAbilityManager->GetUIAbilityRecordBySessionInfo(sessionInfo); CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); if (!IsAbilityControllerForeground(abilityRecord->GetAbilityInfo().bundleName)) { return ERR_WOULD_BLOCK; } - return uiAbilityLifecycleManager_->MinimizeUIAbility(abilityRecord, fromUser); + return uiAbilityManager->MinimizeUIAbility(abilityRecord, fromUser); } int AbilityManagerService::ConnectAbility( @@ -3620,13 +3618,13 @@ int AbilityManagerService::ConnectRemoteAbility(Want &want, const sptr &connect) { TAG_LOGD(AAFwkTag::ABILITYMGR, "called."); - auto connectManager = GetConnectManager(); - CHECK_POINTER_AND_RETURN(connectManager, ERR_NO_INIT); - if (connectManager->DisconnectAbilityLocked(connect) == ERR_OK) { + auto currentConnectManager = GetCurrentConnectManager(); + CHECK_POINTER_AND_RETURN(currentConnectManager, ERR_NO_INIT); + if (currentConnectManager->DisconnectAbilityLocked(connect) == ERR_OK) { return ERR_OK; } - // If current connectManager_ does not exist connect, then try connectManagerU0 - connectManager = GetConnectManagerByUserId(U0_USER_ID); + // If current connectManager does not exist connect, then try connectManagerU0 + auto connectManager = GetConnectManagerByUserId(U0_USER_ID); CHECK_POINTER_AND_RETURN(connectManager, ERR_NO_INIT); if (connectManager->DisconnectAbilityLocked(connect) == ERR_OK) { return ERR_OK; @@ -3686,7 +3684,9 @@ int AbilityManagerService::ContinueAbility(const std::string &deviceId, int32_t std::shared_ptr abilityRecord = nullptr; if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - abilityRecord = uiAbilityLifecycleManager_->GetAbilityRecordsById(missionId); + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + abilityRecord = uiAbilityManager->GetAbilityRecordsById(missionId); } else { sptr abilityToken = GetAbilityTokenByMissionId(missionId); CHECK_POINTER_AND_RETURN(abilityToken, ERR_INVALID_VALUE); @@ -3713,7 +3713,7 @@ int AbilityManagerService::StartContinuation(const Want &want, const sptrGetSessionIdByAbilityToken(abilityToken); + missionId = GetMissionIdByAbilityTokenInner(abilityToken); if (!missionId) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Invalid missionId id."); return ERR_INVALID_VALUE; @@ -3750,7 +3750,9 @@ int AbilityManagerService::NotifyContinuationResult(int32_t missionId, int32_t r std::shared_ptr abilityRecord = nullptr; if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - abilityRecord = uiAbilityLifecycleManager_->GetAbilityRecordsById(missionId); + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + abilityRecord = uiAbilityManager->GetAbilityRecordsById(missionId); } else { sptr abilityToken = GetAbilityTokenByMissionId(missionId); CHECK_POINTER_AND_RETURN(abilityToken, ERR_INVALID_VALUE); @@ -3888,7 +3890,8 @@ sptr AbilityManagerService::GetWantSender( const WantSenderInfo &wantSenderInfo, const sptr &callerToken) { TAG_LOGD(AAFwkTag::ABILITYMGR, "called"); - CHECK_POINTER_AND_RETURN(pendingWantManager_, nullptr); + auto pendingWantManager = GetCurrentPendingWantManager(); + CHECK_POINTER_AND_RETURN(pendingWantManager, nullptr); auto bms = GetBundleManager(); CHECK_POINTER_AND_RETURN(bms, nullptr); @@ -3931,21 +3934,23 @@ sptr AbilityManagerService::GetWantSender( } TAG_LOGD(AAFwkTag::ABILITYMGR, "bundleName = %{public}s", wantSenderInfo.bundleName.c_str()); - return pendingWantManager_->GetWantSender(callerUid, appUid, isSystemApp, wantSenderInfo, callerToken); + return pendingWantManager->GetWantSender(callerUid, appUid, isSystemApp, wantSenderInfo, callerToken); } int AbilityManagerService::SendWantSender(sptr target, const SenderInfo &senderInfo) { TAG_LOGI(AAFwkTag::ABILITYMGR, "Send want sender."); - CHECK_POINTER_AND_RETURN(pendingWantManager_, ERR_INVALID_VALUE); + auto pendingWantManager = GetCurrentPendingWantManager(); + CHECK_POINTER_AND_RETURN(pendingWantManager, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(target, ERR_INVALID_VALUE); - return pendingWantManager_->SendWantSender(target, senderInfo); + return pendingWantManager->SendWantSender(target, senderInfo); } void AbilityManagerService::CancelWantSender(const sptr &sender) { TAG_LOGD(AAFwkTag::ABILITYMGR, "called."); - CHECK_POINTER(pendingWantManager_); + auto pendingWantManager = GetCurrentPendingWantManager(); + CHECK_POINTER(pendingWantManager); CHECK_POINTER(sender); sptr obj = sender->AsObject(); @@ -3978,131 +3983,125 @@ void AbilityManagerService::CancelWantSender(const sptr &sender) isSystemApp = bundleInfo.applicationInfo.isSystemApp; } - pendingWantManager_->CancelWantSender(isSystemApp, sender); + pendingWantManager->CancelWantSender(isSystemApp, sender); } int AbilityManagerService::GetPendingWantUid(const sptr &target) { TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s:begin.", __func__); - - if (pendingWantManager_ == nullptr) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "%s, pendingWantManager_ is nullptr", __func__); - return -1; - } + auto pendingWantManager = GetCurrentPendingWantManager(); + CHECK_POINTER_AND_RETURN(pendingWantManager, -1); if (target == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "%s, target is nullptr", __func__); return -1; } - return pendingWantManager_->GetPendingWantUid(target); + return pendingWantManager->GetPendingWantUid(target); } int AbilityManagerService::GetPendingWantUserId(const sptr &target) { TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s:begin.", __func__); - - if (pendingWantManager_ == nullptr) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "%s, pendingWantManager_ is nullptr", __func__); - return -1; - } + auto pendingWantManager = GetCurrentPendingWantManager(); + CHECK_POINTER_AND_RETURN(pendingWantManager, -1); if (target == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "%s, target is nullptr", __func__); return -1; } - return pendingWantManager_->GetPendingWantUserId(target); + return pendingWantManager->GetPendingWantUserId(target); } std::string AbilityManagerService::GetPendingWantBundleName(const sptr &target) { TAG_LOGI(AAFwkTag::ABILITYMGR, "Get pending want bundle name."); - CHECK_POINTER_AND_RETURN(pendingWantManager_, ""); + auto pendingWantManager = GetCurrentPendingWantManager(); + CHECK_POINTER_AND_RETURN(pendingWantManager, ""); CHECK_POINTER_AND_RETURN(target, ""); - return pendingWantManager_->GetPendingWantBundleName(target); + return pendingWantManager->GetPendingWantBundleName(target); } int AbilityManagerService::GetPendingWantCode(const sptr &target) { TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s:begin.", __func__); - - if (pendingWantManager_ == nullptr) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "%s, pendingWantManager_ is nullptr", __func__); - return -1; - } + auto pendingWantManager = GetCurrentPendingWantManager(); + CHECK_POINTER_AND_RETURN(pendingWantManager, -1); if (target == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "%s, target is nullptr", __func__); return -1; } - return pendingWantManager_->GetPendingWantCode(target); + return pendingWantManager->GetPendingWantCode(target); } int AbilityManagerService::GetPendingWantType(const sptr &target) { TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s:begin.", __func__); - - if (pendingWantManager_ == nullptr) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "%s, pendingWantManager_ is nullptr", __func__); - return -1; - } + auto pendingWantManager = GetCurrentPendingWantManager(); + CHECK_POINTER_AND_RETURN(pendingWantManager, -1); if (target == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "%s, target is nullptr", __func__); return -1; } - return pendingWantManager_->GetPendingWantType(target); + return pendingWantManager->GetPendingWantType(target); } void AbilityManagerService::RegisterCancelListener(const sptr &sender, const sptr &receiver) { TAG_LOGI(AAFwkTag::ABILITYMGR, "Register cancel listener."); - CHECK_POINTER(pendingWantManager_); + auto pendingWantManager = GetCurrentPendingWantManager(); + CHECK_POINTER(pendingWantManager); CHECK_POINTER(sender); CHECK_POINTER(receiver); - pendingWantManager_->RegisterCancelListener(sender, receiver); + pendingWantManager->RegisterCancelListener(sender, receiver); } void AbilityManagerService::UnregisterCancelListener( const sptr &sender, const sptr &receiver) { TAG_LOGI(AAFwkTag::ABILITYMGR, "Unregister cancel listener."); - CHECK_POINTER(pendingWantManager_); + auto pendingWantManager = GetCurrentPendingWantManager(); + CHECK_POINTER(pendingWantManager); CHECK_POINTER(sender); CHECK_POINTER(receiver); - pendingWantManager_->UnregisterCancelListener(sender, receiver); + pendingWantManager->UnregisterCancelListener(sender, receiver); } int AbilityManagerService::GetPendingRequestWant(const sptr &target, std::shared_ptr &want) { TAG_LOGD(AAFwkTag::ABILITYMGR, "Get pending request want."); - CHECK_POINTER_AND_RETURN(pendingWantManager_, ERR_INVALID_VALUE); + auto pendingWantManager = GetCurrentPendingWantManager(); + CHECK_POINTER_AND_RETURN(pendingWantManager, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(target, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(want, ERR_INVALID_VALUE); CHECK_CALLER_IS_SYSTEM_APP; - return pendingWantManager_->GetPendingRequestWant(target, want); + return pendingWantManager->GetPendingRequestWant(target, want); } int AbilityManagerService::LockMissionForCleanup(int32_t missionId) { TAG_LOGI(AAFwkTag::ABILITYMGR, "request unlock mission for clean up all, id :%{public}d", missionId); - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); CHECK_CALLER_IS_SYSTEM_APP; if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) { TAG_LOGE(AAFwkTag::ABILITYMGR, "%{public}s: Permission verification failed", __func__); return CHECK_PERMISSION_FAILED; } - return currentMissionListManager_->SetMissionLockedState(missionId, true); + return missionListManager->SetMissionLockedState(missionId, true); } int AbilityManagerService::UnlockMissionForCleanup(int32_t missionId) { TAG_LOGI(AAFwkTag::ABILITYMGR, "request unlock mission for clean up all, id :%{public}d", missionId); - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); CHECK_CALLER_IS_SYSTEM_APP; if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) { TAG_LOGE(AAFwkTag::ABILITYMGR, "%{public}s: Permission verification failed", __func__); return CHECK_PERMISSION_FAILED; } - return currentMissionListManager_->SetMissionLockedState(missionId, false); + return missionListManager->SetMissionLockedState(missionId, false); } void AbilityManagerService::SetLockedState(int32_t sessionId, bool lockedState) @@ -4112,7 +4111,9 @@ void AbilityManagerService::SetLockedState(int32_t sessionId, bool lockedState) TAG_LOGE(AAFwkTag::ABILITYMGR, "Not sceneboard called, not allowed."); return; } - auto abilityRecord = uiAbilityLifecycleManager_->GetAbilityRecordsById(sessionId); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER(uiAbilityManager); + auto abilityRecord = uiAbilityManager->GetAbilityRecordsById(sessionId); if (!abilityRecord) { TAG_LOGE(AAFwkTag::ABILITYMGR, "abilityRecord is null."); return; @@ -4123,34 +4124,37 @@ void AbilityManagerService::SetLockedState(int32_t sessionId, bool lockedState) int AbilityManagerService::RegisterMissionListener(const sptr &listener) { TAG_LOGI(AAFwkTag::ABILITYMGR, "request RegisterMissionListener "); - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); CHECK_CALLER_IS_SYSTEM_APP; if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) { TAG_LOGE(AAFwkTag::ABILITYMGR, "%{public}s: Permission verification failed", __func__); return CHECK_PERMISSION_FAILED; } - return currentMissionListManager_->RegisterMissionListener(listener); + return missionListManager->RegisterMissionListener(listener); } int AbilityManagerService::UnRegisterMissionListener(const sptr &listener) { TAG_LOGI(AAFwkTag::ABILITYMGR, "request RegisterMissionListener "); - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); CHECK_CALLER_IS_SYSTEM_APP; if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) { TAG_LOGE(AAFwkTag::ABILITYMGR, "%{public}s: Permission verification failed", __func__); return CHECK_PERMISSION_FAILED; } - return currentMissionListManager_->UnRegisterMissionListener(listener); + return missionListManager->UnRegisterMissionListener(listener); } int AbilityManagerService::GetMissionInfos(const std::string& deviceId, int32_t numMax, std::vector &missionInfos) { TAG_LOGI(AAFwkTag::ABILITYMGR, "request GetMissionInfos."); - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); CHECK_CALLER_IS_SYSTEM_APP; if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) { @@ -4162,7 +4166,7 @@ int AbilityManagerService::GetMissionInfos(const std::string& deviceId, int32_t return GetRemoteMissionInfos(deviceId, numMax, missionInfos); } - return currentMissionListManager_->GetMissionInfos(numMax, missionInfos); + return missionListManager->GetMissionInfos(numMax, missionInfos); } int AbilityManagerService::GetRemoteMissionInfos(const std::string& deviceId, int32_t numMax, @@ -4182,7 +4186,8 @@ int AbilityManagerService::GetMissionInfo(const std::string& deviceId, int32_t m MissionInfo &missionInfo) { TAG_LOGI(AAFwkTag::ABILITYMGR, "request GetMissionInfo, missionId:%{public}d", missionId); - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); CHECK_CALLER_IS_SYSTEM_APP; if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) { @@ -4194,7 +4199,7 @@ int AbilityManagerService::GetMissionInfo(const std::string& deviceId, int32_t m return GetRemoteMissionInfo(deviceId, missionId, missionInfo); } - return currentMissionListManager_->GetMissionInfo(missionId, missionInfo); + return missionListManager->GetMissionInfo(missionId, missionInfo); } int AbilityManagerService::GetRemoteMissionInfo(const std::string& deviceId, int32_t missionId, @@ -4219,7 +4224,8 @@ int AbilityManagerService::GetRemoteMissionInfo(const std::string& deviceId, int int AbilityManagerService::CleanMission(int32_t missionId) { TAG_LOGI(AAFwkTag::ABILITYMGR, "request CleanMission, missionId:%{public}d", missionId); - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); CHECK_CALLER_IS_SYSTEM_APP; if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) { @@ -4227,13 +4233,14 @@ int AbilityManagerService::CleanMission(int32_t missionId) return CHECK_PERMISSION_FAILED; } - return currentMissionListManager_->ClearMission(missionId); + return missionListManager->ClearMission(missionId); } int AbilityManagerService::CleanAllMissions() { TAG_LOGI(AAFwkTag::ABILITYMGR, "request CleanAllMissions "); - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); CHECK_CALLER_IS_SYSTEM_APP; if (!PermissionVerification::GetInstance()->VerifyMissionPermission()) { @@ -4248,7 +4255,7 @@ int AbilityManagerService::CleanAllMissions() return ERR_WOULD_BLOCK; } - return currentMissionListManager_->ClearAllMissions(); + return missionListManager->ClearAllMissions(); } int AbilityManagerService::MoveMissionToFront(int32_t missionId) @@ -4266,16 +4273,14 @@ int AbilityManagerService::MoveMissionToFront(int32_t missionId) } if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - if (!uiAbilityLifecycleManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "failed, uiAbilityLifecycleManager is nullptr"); - return ERR_INVALID_VALUE; - } - return uiAbilityLifecycleManager_->MoveMissionToFront(missionId); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->MoveMissionToFront(missionId); } - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); - - return currentMissionListManager_->MoveMissionToFront(missionId); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); + return missionListManager->MoveMissionToFront(missionId); } int AbilityManagerService::MoveMissionToFront(int32_t missionId, const StartOptions &startOptions) @@ -4294,15 +4299,14 @@ int AbilityManagerService::MoveMissionToFront(int32_t missionId, const StartOpti auto options = std::make_shared(startOptions); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - if (!uiAbilityLifecycleManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "failed, uiAbilityLifecycleManager is nullptr"); - return ERR_INVALID_VALUE; - } - return uiAbilityLifecycleManager_->MoveMissionToFront(missionId, options); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->MoveMissionToFront(missionId, options); } - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); - return currentMissionListManager_->MoveMissionToFront(missionId, options); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); + return missionListManager->MoveMissionToFront(missionId, options); } int AbilityManagerService::MoveMissionsToForeground(const std::vector& missionIds, int32_t topMissionId) @@ -4379,23 +4383,16 @@ bool AbilityManagerService::IsAbilityControllerStartById(int32_t missionId) std::shared_ptr AbilityManagerService::GetServiceRecordByElementName(const std::string &element) { - auto connectManager = GetConnectManager(); - if (!connectManager) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Connect manager is nullptr."); - return nullptr; - } + auto connectManager = GetCurrentConnectManager(); + CHECK_POINTER_AND_RETURN(connectManager, nullptr); return connectManager->GetServiceRecordByElementName(element); } std::list> AbilityManagerService::GetConnectRecordListByCallback( sptr callback) { - auto connectManager = GetConnectManager(); - if (!connectManager) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Connect manager is nullptr."); - std::list> connectList; - return connectList; - } + auto connectManager = GetCurrentConnectManager(); + CHECK_POINTER_AND_RETURN(connectManager, std::list>()); return connectManager->GetConnectRecordListByCallback(callback); } @@ -4523,15 +4520,14 @@ int AbilityManagerService::AttachAbilityThread( auto entry = std::to_string(AbilityUtil::SystemTimeMillis()) + "; AbilityManagerService::AttachAbilityThread;" + " the end of load lifecycle."; FreezeUtil::GetInstance().AddLifecycleEvent(flow, entry); - if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - return uiAbilityLifecycleManager_->AttachAbilityThread(scheduler, token); - } int32_t ownerMissionUserId = abilityRecord->GetOwnerMissionUserId(); - auto missionListManager = GetListManagerByUserId(ownerMissionUserId); - if (!missionListManager) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListManager is Null. userId=%{public}d", ownerMissionUserId); - return ERR_INVALID_VALUE; + if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { + auto uiAbilityManager = GetUIAbilityManagerByUserId(ownerMissionUserId); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->AttachAbilityThread(scheduler, token); } + auto missionListManager = GetMissionListManagerByUserId(ownerMissionUserId); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_INVALID_VALUE); return missionListManager->AttachAbilityThread(scheduler, token); } } @@ -4583,15 +4579,14 @@ void AbilityManagerService::DumpSysMissionListInner( } std::shared_ptr targetManager; if (isUserID) { - std::lock_guard lock(managersMutex_); - auto it = missionListManagers_.find(userId); - if (it == missionListManagers_.end()) { + auto missionListManager = GetMissionListManagerByUserId(userId); + if (missionListManager == nullptr) { info.push_back("error: No user found."); return; } - targetManager = it->second; + targetManager = missionListManager; } else { - targetManager = currentMissionListManager_; + targetManager = GetCurrentMissionListManager(); } CHECK_POINTER(targetManager); @@ -4614,12 +4609,7 @@ void AbilityManagerService::DumpSysMissionListInner( void AbilityManagerService::DumpSysMissionListInnerBySCB( const std::string &args, std::vector &info, bool isClient, bool isUserID, int userId) { - if (isUserID) { - if (!CheckUserIdActive(userId)) { - info.push_back("error: No user found."); - return; - } - } else { + if (!isUserID) { userId = GetUserId(); } @@ -4629,15 +4619,12 @@ void AbilityManagerService::DumpSysMissionListInnerBySCB( return; } - if (!uiAbilityLifecycleManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "failed, uiAbilityLifecycleManager is nullptr"); - return; - } - + auto uiAbilityManager = GetUIAbilityManagerByUserId(userId); + CHECK_POINTER(uiAbilityManager); if (argList.size() == MIN_DUMP_ARGUMENT_NUM) { - uiAbilityLifecycleManager_->DumpMissionList(info, isClient, userId, argList[1]); + uiAbilityManager->DumpMissionList(info, isClient, argList[1]); } else if (argList.size() < MIN_DUMP_ARGUMENT_NUM) { - uiAbilityLifecycleManager_->DumpMissionList(info, isClient, userId); + uiAbilityManager->DumpMissionList(info, isClient); } else { info.emplace_back("error: invalid argument, please see 'hidumper -s AbilityManagerService -a '-h''."); } @@ -4652,15 +4639,14 @@ void AbilityManagerService::DumpSysAbilityInner( } std::shared_ptr targetManager; if (isUserID) { - std::lock_guard lock(managersMutex_); - auto it = missionListManagers_.find(userId); - if (it == missionListManagers_.end()) { + auto missionListManager = GetMissionListManagerByUserId(userId); + if (missionListManager == nullptr) { info.push_back("error: No user found."); return; } - targetManager = it->second; + targetManager = missionListManager; } else { - targetManager = currentMissionListManager_; + targetManager = GetCurrentMissionListManager(); } CHECK_POINTER(targetManager); @@ -4688,12 +4674,7 @@ void AbilityManagerService::DumpSysAbilityInner( void AbilityManagerService::DumpSysAbilityInnerBySCB( const std::string &args, std::vector &info, bool isClient, bool isUserID, int userId) { - if (isUserID) { - if (!CheckUserIdActive(userId)) { - info.push_back("error: No user found."); - return; - } - } else { + if (!isUserID) { userId = GetUserId(); } @@ -4707,12 +4688,9 @@ void AbilityManagerService::DumpSysAbilityInnerBySCB( std::vector params(argList.begin() + MIN_DUMP_ARGUMENT_NUM, argList.end()); try { auto abilityId = static_cast(std::stoi(argList[1])); - - if (!uiAbilityLifecycleManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "failed, uiAbilityLifecycleManager is nullptr"); - return; - } - uiAbilityLifecycleManager_->DumpMissionListByRecordId(info, isClient, abilityId, params, userId); + auto uiAbilityManager = GetUIAbilityManagerByUserId(userId); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->DumpMissionListByRecordId(info, isClient, abilityId, params); } catch (...) { TAG_LOGW(AAFwkTag::ABILITYMGR, "stoi(%{public}s) failed", argList[1].c_str()); info.emplace_back("error: invalid argument, please see 'hidumper -s AbilityManagerService -a '-h''."); @@ -4729,15 +4707,14 @@ void AbilityManagerService::DumpSysStateInner( std::shared_ptr targetManager; if (isUserID) { - std::lock_guard lock(managersMutex_); - auto it = connectManagers_.find(userId); - if (it == connectManagers_.end()) { + auto connectManager = GetConnectManagerByUserId(userId); + if (connectManager == nullptr) { info.push_back("error: No user found."); return; } - targetManager = it->second; + targetManager = connectManager; } else { - targetManager = GetConnectManager(); + targetManager = GetCurrentConnectManager(); } CHECK_POINTER(targetManager); @@ -4764,15 +4741,14 @@ void AbilityManagerService::DumpSysPendingInner( { std::shared_ptr targetManager; if (isUserID) { - std::lock_guard lock(managersMutex_); - auto it = pendingWantManagers_.find(userId); - if (it == pendingWantManagers_.end()) { + auto pendingWantManager = GetPendingWantManagerByUserId(userId); + if (pendingWantManager == nullptr) { info.push_back("error: No user found."); return; } - targetManager = it->second; + targetManager = pendingWantManager; } else { - targetManager = pendingWantManager_; + targetManager = GetCurrentPendingWantManager(); } CHECK_POINTER(targetManager); @@ -4900,15 +4876,14 @@ void AbilityManagerService::DataDumpSysStateInner( { std::shared_ptr targetManager; if (isUserID) { - std::lock_guard lock(managersMutex_); - auto it = dataAbilityManagers_.find(userId); - if (it == dataAbilityManagers_.end()) { + auto dataAbilityManager = GetDataAbilityManagerByUserId(userId); + if (dataAbilityManager == nullptr) { info.push_back("error: No user found."); return; } - targetManager = it->second; + targetManager = dataAbilityManager; } else { - targetManager = dataAbilityManager_; + targetManager = GetCurrentDataAbilityManager(); } CHECK_POINTER(targetManager); @@ -4930,31 +4905,29 @@ void AbilityManagerService::DataDumpSysStateInner( void AbilityManagerService::DumpInner(const std::string &args, std::vector &info) { if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - if (!uiAbilityLifecycleManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "failed, uiAbilityLifecycleManager is nullptr"); - return; - } - uiAbilityLifecycleManager_->Dump(info); + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->Dump(info); return; } - if (currentMissionListManager_) { - currentMissionListManager_->Dump(info); + auto missionListManager = GetCurrentMissionListManager(); + if (missionListManager) { + missionListManager->Dump(info); } } void AbilityManagerService::DumpMissionListInner(const std::string &args, std::vector &info) { if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - if (!uiAbilityLifecycleManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "failed, uiAbilityLifecycleManager is nullptr"); - return; - } - uiAbilityLifecycleManager_->DumpMissionList(info, false, GetUserId(), " "); + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->DumpMissionList(info, false, " "); return; } - if (currentMissionListManager_) { - currentMissionListManager_->DumpMissionList(info, false, ""); + auto missionListManager = GetCurrentMissionListManager(); + if (missionListManager) { + missionListManager->DumpMissionList(info, false, ""); } } @@ -4965,8 +4938,9 @@ void AbilityManagerService::DumpMissionInfosInner(const std::string &args, std:: Rosen::WindowManager::GetInstance().DumpSessionAll(info); return; } - if (currentMissionListManager_) { - currentMissionListManager_->DumpMissionInfos(info); + auto missionListManager = GetCurrentMissionListManager(); + if (missionListManager) { + missionListManager->DumpMissionInfos(info); } } @@ -4990,13 +4964,14 @@ void AbilityManagerService::DumpMissionInner(const std::string &args, std::vecto return; } - CHECK_POINTER_LOG(currentMissionListManager_, "Current mission manager not init."); - currentMissionListManager_->DumpMission(missionId, info); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_LOG(missionListManager, "Current mission manager not init."); + missionListManager->DumpMission(missionId, info); } void AbilityManagerService::DumpStateInner(const std::string &args, std::vector &info) { - auto connectManager = GetConnectManager(); + auto connectManager = GetCurrentConnectManager(); CHECK_POINTER_LOG(connectManager, "Current mission manager not init."); std::vector argList; SplitStr(args, " ", argList); @@ -5014,15 +4989,17 @@ void AbilityManagerService::DumpStateInner(const std::string &args, std::vector< void AbilityManagerService::DataDumpStateInner(const std::string &args, std::vector &info) { + auto dataAbilityManager = GetCurrentDataAbilityManager(); + CHECK_POINTER(dataAbilityManager); std::vector argList; SplitStr(args, " ", argList); if (argList.empty()) { return; } if (argList.size() == MIN_DUMP_ARGUMENT_NUM) { - dataAbilityManager_->DumpState(info, argList[1]); + dataAbilityManager->DumpState(info, argList[1]); } else if (argList.size() < MIN_DUMP_ARGUMENT_NUM) { - dataAbilityManager_->DumpState(info); + dataAbilityManager->DumpState(info); } else { info.emplace_back("error: invalid argument, please see 'ability dump -h'."); } @@ -5146,11 +5123,13 @@ int AbilityManagerService::AbilityTransitionDone(const sptr &toke FreezeUtil::GetInstance().AddLifecycleEvent(flow, entry); } + int32_t ownerMissionUserId = abilityRecord->GetOwnerMissionUserId(); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - return uiAbilityLifecycleManager_->AbilityTransactionDone(token, state, saveData); + auto uiAbilityManager = GetUIAbilityManagerByUserId(ownerMissionUserId); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->AbilityTransactionDone(token, state, saveData); } else { - int32_t ownerMissionUserId = abilityRecord->GetOwnerMissionUserId(); - auto missionListManager = GetListManagerByUserId(ownerMissionUserId); + auto missionListManager = GetMissionListManagerByUserId(ownerMissionUserId); if (!missionListManager) { TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListManager is Null. userId=%{public}d", ownerMissionUserId); return ERR_INVALID_VALUE; @@ -5311,13 +5290,15 @@ void AbilityManagerService::OnAbilityRequestDone(const sptr &toke break; } default: { + int32_t ownerUserId = abilityRecord->GetOwnerMissionUserId(); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->OnAbilityRequestDone(token, state); + auto uiAbilityManager = GetUIAbilityManagerByUserId(ownerUserId); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->OnAbilityRequestDone(token, state); } else { - int32_t ownerMissionUserId = abilityRecord->GetOwnerMissionUserId(); - auto missionListManager = GetListManagerByUserId(ownerMissionUserId); + auto missionListManager = GetMissionListManagerByUserId(ownerUserId); if (!missionListManager) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListManager is Null. userId=%{public}d", ownerMissionUserId); + TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListManager is Null. userId=%{public}d", ownerUserId); return; } missionListManager->OnAbilityRequestDone(token, state); @@ -5330,18 +5311,21 @@ void AbilityManagerService::OnAbilityRequestDone(const sptr &toke void AbilityManagerService::OnAppStateChanged(const AppInfo &info) { TAG_LOGD(AAFwkTag::ABILITYMGR, "called"); - auto connectManager = GetConnectManager(); + auto connectManager = GetCurrentConnectManager(); CHECK_POINTER_LOG(connectManager, "Connect manager not init."); - if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - CHECK_POINTER_LOG(currentMissionListManager_, "Current mission list manager not init."); - } connectManager->OnAppStateChanged(info); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->OnAppStateChanged(info, GetUserId()); + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->OnAppStateChanged(info); } else { - currentMissionListManager_->OnAppStateChanged(info); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_LOG(missionListManager, "Current mission list manager not init."); + missionListManager->OnAppStateChanged(info); } - dataAbilityManager_->OnAppStateChanged(info); + auto dataAbilityManager = GetCurrentDataAbilityManager(); + CHECK_POINTER(dataAbilityManager); + dataAbilityManager->OnAppStateChanged(info); } std::shared_ptr AbilityManagerService::GetEventHandler() @@ -5349,37 +5333,6 @@ std::shared_ptr AbilityManagerService::GetEventHandler() return eventHandler_; } -void AbilityManagerService::InitMissionListManager(int userId, bool switchUser) -{ - bool find = false; - { - std::lock_guard lock(managersMutex_); - auto iterator = missionListManagers_.find(userId); - find = (iterator != missionListManagers_.end()); - if (find) { - if (switchUser) { - DelayedSingleton::GetInstance()->Init(userId); - currentMissionListManager_ = iterator->second; - if (appExitReasonHelper_) { - appExitReasonHelper_->SetCurrentMissionListManager(currentMissionListManager_); - } - } - } - } - if (!find) { - auto manager = std::make_shared(userId); - manager->Init(); - std::unique_lock lock(managersMutex_); - missionListManagers_.emplace(userId, manager); - if (switchUser) { - currentMissionListManager_ = manager; - if (appExitReasonHelper_) { - appExitReasonHelper_->SetCurrentMissionListManager(currentMissionListManager_); - } - } - } -} - // multi user scene int32_t AbilityManagerService::GetUserId() const { @@ -5653,11 +5606,13 @@ void AbilityManagerService::OnAbilityDied(std::shared_ptr ability CHECK_POINTER(abilityRecord); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { if (abilityRecord->GetAbilityInfo().type == AbilityType::PAGE) { - uiAbilityLifecycleManager_->OnAbilityDied(abilityRecord); + auto uiAbilityManager = GetUIAbilityManagerByUserId(abilityRecord->GetOwnerMissionUserId()); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->OnAbilityDied(abilityRecord); return; } } else { - auto manager = GetListManagerByUserId(abilityRecord->GetOwnerMissionUserId()); + auto manager = GetMissionListManagerByUserId(abilityRecord->GetOwnerMissionUserId()); if (manager && abilityRecord->GetAbilityInfo().type == AbilityType::PAGE) { ReleaseAbilityTokenMap(abilityRecord->GetToken()); manager->OnAbilityDied(abilityRecord, GetUserId()); @@ -5681,11 +5636,14 @@ void AbilityManagerService::OnCallConnectDied(std::shared_ptr callRe { CHECK_POINTER(callRecord); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->OnCallConnectDied(callRecord); + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->OnCallConnectDied(callRecord); return; } - if (currentMissionListManager_) { - currentMissionListManager_->OnCallConnectDied(callRecord); + auto missionListManager = GetCurrentMissionListManager(); + if (missionListManager) { + missionListManager->OnCallConnectDied(callRecord); } } @@ -5767,26 +5725,8 @@ int32_t AbilityManagerService::UninstallAppInner(const std::string &bundleName, appExitReasonHelper_->RecordProcessExitReason(NO_PID, exitReason, bundleName, uid); } - int32_t targetUserId = uid / BASE_USER_RANGE; - if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->UninstallApp(bundleName, uid, targetUserId); - } else if (targetUserId == U0_USER_ID) { - std::lock_guard lock(managersMutex_); - for (auto item: missionListManagers_) { - if (item.second) { - item.second->UninstallApp(bundleName, uid); - } - } - } else { - auto listManager = GetListManagerByUserId(targetUserId); - if (listManager) { - listManager->UninstallApp(bundleName, uid); - } - } - - if (pendingWantManager_) { - pendingWantManager_->ClearPendingWantRecord(bundleName, uid); - } + CHECK_POINTER_AND_RETURN(subManagersHelper_, ERR_NULL_OBJECT); + subManagersHelper_->UninstallApp(bundleName, uid); int ret = DelayedSingleton::GetInstance()->KillApplicationByUid(bundleName, uid); if (ret != ERR_OK) { return UNINSTALL_APP_FAILED; @@ -5895,22 +5835,27 @@ void AbilityManagerService::HandleLoadTimeOut(int64_t abilityRecordId, bool isHa { TAG_LOGD(AAFwkTag::ABILITYMGR, "Handle load timeout."); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->OnTimeOut(AbilityManagerService::LOAD_TIMEOUT_MSG, abilityRecordId, isHalf); + auto uiAbilityManagers = GetUIAbilityManagers(); + for (auto& item : uiAbilityManagers) { + if (item.second) { + item.second->OnTimeOut(AbilityManagerService::LOAD_TIMEOUT_MSG, abilityRecordId, isHalf); + } + } return; } - std::lock_guard lock(managersMutex_); - for (auto& item : missionListManagers_) { + auto missionListManagers = GetMissionListManagers(); + for (auto& item : missionListManagers) { if (item.second) { item.second->OnTimeOut(AbilityManagerService::LOAD_TIMEOUT_MSG, abilityRecordId, isHalf); - } +} } } void AbilityManagerService::HandleActiveTimeOut(int64_t abilityRecordId) { TAG_LOGD(AAFwkTag::ABILITYMGR, "Handle active timeout."); - std::lock_guard lock(managersMutex_); - for (auto& item : missionListManagers_) { + auto missionListManagers = GetMissionListManagers(); + for (auto& item : missionListManagers) { if (item.second) { item.second->OnTimeOut(AbilityManagerService::ACTIVE_TIMEOUT_MSG, abilityRecordId); } @@ -5920,14 +5865,14 @@ void AbilityManagerService::HandleActiveTimeOut(int64_t abilityRecordId) void AbilityManagerService::HandleInactiveTimeOut(int64_t abilityRecordId) { TAG_LOGD(AAFwkTag::ABILITYMGR, "Handle inactive timeout."); - std::lock_guard lock(managersMutex_); - for (auto& item : missionListManagers_) { + auto missionListManagers = GetMissionListManagers(); + for (auto& item : missionListManagers) { if (item.second) { item.second->OnTimeOut(AbilityManagerService::INACTIVE_TIMEOUT_MSG, abilityRecordId); } } - - for (auto& item : connectManagers_) { + auto connectManagers = GetConnectManagers(); + for (auto& item : connectManagers) { if (item.second) { item.second->OnTimeOut(AbilityManagerService::INACTIVE_TIMEOUT_MSG, abilityRecordId); } @@ -5938,14 +5883,19 @@ void AbilityManagerService::HandleForegroundTimeOut(int64_t abilityRecordId, boo { TAG_LOGD(AAFwkTag::ABILITYMGR, "Handle foreground timeout."); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->OnTimeOut(AbilityManagerService::FOREGROUND_TIMEOUT_MSG, abilityRecordId, isHalf); + auto uiAbilityManagers = GetUIAbilityManagers(); + for (auto& item : uiAbilityManagers) { + if (item.second) { + item.second->OnTimeOut(AbilityManagerService::FOREGROUND_TIMEOUT_MSG, abilityRecordId, isHalf); + } + } return; } - std::lock_guard lock(managersMutex_); - for (auto& item : missionListManagers_) { + auto missionListManagers = GetMissionListManagers(); + for (auto& item : missionListManagers) { if (item.second) { item.second->OnTimeOut(AbilityManagerService::FOREGROUND_TIMEOUT_MSG, abilityRecordId, isHalf); - } +} } } @@ -5986,19 +5936,21 @@ int32_t AbilityManagerService::GetShareDataPairAndReturnData(std::shared_ptr &token) { TAG_LOGI(AAFwkTag::ABILITYMGR, "Verification token."); - CHECK_POINTER_RETURN_BOOL(dataAbilityManager_); - auto connectManager = GetConnectManager(); + auto dataAbilityManager = GetCurrentDataAbilityManager(); + CHECK_POINTER_RETURN_BOOL(dataAbilityManager); + auto connectManager = GetCurrentConnectManager(); CHECK_POINTER_RETURN_BOOL(connectManager); - CHECK_POINTER_RETURN_BOOL(currentMissionListManager_); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_RETURN_BOOL(missionListManager); - if (currentMissionListManager_->GetAbilityRecordByToken(token)) { + if (missionListManager->GetAbilityRecordByToken(token)) { return true; } - if (currentMissionListManager_->GetAbilityFromTerminateList(token)) { + if (missionListManager->GetAbilityFromTerminateList(token)) { return true; } - if (dataAbilityManager_->GetAbilityRecordByToken(token)) { + if (dataAbilityManager->GetAbilityRecordByToken(token)) { TAG_LOGI(AAFwkTag::ABILITYMGR, "Verification token4."); return true; } @@ -6019,140 +5971,122 @@ bool AbilityManagerService::VerificationToken(const sptr &token) bool AbilityManagerService::VerificationAllToken(const sptr &token) { - HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::ABILITYMGR, "VerificationAllToken."); - std::lock_guard lock(managersMutex_); - if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - if (uiAbilityLifecycleManager_ != nullptr && uiAbilityLifecycleManager_->IsContainsAbility(token)) { - return true; - } - } else { - HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, "VerificationAllToken::SearchMissionListManagers"); - for (auto item: missionListManagers_) { - if (item.second && item.second->GetAbilityRecordByToken(token)) { - return true; - } - - if (item.second && item.second->GetAbilityFromTerminateList(token)) { - return true; - } - } - } - - { - HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, "VerificationAllToken::SearchDataAbilityManagers_"); - for (auto item: dataAbilityManagers_) { - if (item.second && item.second->GetAbilityRecordByToken(token)) { - return true; - } - } - } + CHECK_POINTER_AND_RETURN(subManagersHelper_, false); + return subManagersHelper_->VerificationAllToken(token); +} - { - HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, "VerificationAllToken::SearchConnectManagers_"); - for (auto item: connectManagers_) { - if (item.second && item.second->GetExtensionByTokenFromServiceMap(token)) { - return true; - } - if (item.second && item.second->GetExtensionByTokenFromTerminatingMap(token)) { - return true; - } - } - } - TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to verify all token."); - return false; +std::shared_ptr AbilityManagerService::GetCurrentDataAbilityManager() +{ + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetCurrentDataAbilityManager(); } std::shared_ptr AbilityManagerService::GetDataAbilityManager( const sptr &scheduler) { - if (scheduler == nullptr) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "the param ability scheduler is nullptr"); - return nullptr; - } + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetDataAbilityManager(scheduler); +} - std::lock_guard lock(managersMutex_); - for (auto& item: dataAbilityManagers_) { - if (item.second && item.second->ContainsDataAbility(scheduler)) { - return item.second; - } - } +std::shared_ptr AbilityManagerService::GetDataAbilityManagerByUserId(int32_t userId) +{ + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetDataAbilityManagerByUserId(userId); +} - return nullptr; +std::shared_ptr AbilityManagerService::GetDataAbilityManagerByToken( + const sptr &token) +{ + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetDataAbilityManagerByToken(token); } -std::shared_ptr AbilityManagerService::GetListManagerByUserId(int32_t userId) +std::unordered_map> AbilityManagerService::GetConnectManagers() { - std::lock_guard lock(managersMutex_); - auto it = missionListManagers_.find(userId); - if (it != missionListManagers_.end()) { - return it->second; + if (subManagersHelper_ == nullptr) { + TAG_LOGE(AAFwkTag::ABILITYMGR, "pointer is nullptr."); + return std::unordered_map>(); } - TAG_LOGE(AAFwkTag::ABILITYMGR, "%{public}s, Failed to get Manager. UserId = %{public}d", __func__, userId); - return nullptr; + return subManagersHelper_->GetConnectManagers(); +} + +std::shared_ptr AbilityManagerService::GetCurrentConnectManager() +{ + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetCurrentConnectManager(); } std::shared_ptr AbilityManagerService::GetConnectManagerByUserId(int32_t userId) { - std::lock_guard lock(managersMutex_); - auto it = connectManagers_.find(userId); - if (it != connectManagers_.end()) { - return it->second; - } - TAG_LOGE(AAFwkTag::ABILITYMGR, "%{public}s, Failed to get Manager. UserId = %{public}d", __func__, userId); - return nullptr; + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetConnectManagerByUserId(userId); } -void AbilityManagerService::SetConnectManager(std::shared_ptr connectManager) +std::shared_ptr AbilityManagerService::GetConnectManagerByToken( + const sptr &token) { - std::lock_guard guard(connectManagerMutex_); - connectManager_ = connectManager; + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetConnectManagerByToken(token); } -std::shared_ptr AbilityManagerService::GetConnectManager() const +std::shared_ptr AbilityManagerService::GetCurrentPendingWantManager() { - std::lock_guard guard(connectManagerMutex_); - return connectManager_; + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetCurrentPendingWantManager(); } -std::shared_ptr AbilityManagerService::GetDataAbilityManagerByUserId(int32_t userId) +std::shared_ptr AbilityManagerService::GetPendingWantManagerByUserId(int32_t userId) { - std::lock_guard lock(managersMutex_); - auto it = dataAbilityManagers_.find(userId); - if (it != dataAbilityManagers_.end()) { - return it->second; - } - TAG_LOGE(AAFwkTag::ABILITYMGR, "%{public}s, Failed to get Manager. UserId = %{public}d", __func__, userId); - return nullptr; + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetPendingWantManagerByUserId(userId); } -std::shared_ptr AbilityManagerService::GetConnectManagerByToken( - const sptr &token) +std::unordered_map> AbilityManagerService::GetMissionListManagers() { - std::lock_guard lock(managersMutex_); - for (auto item: connectManagers_) { - if (item.second && item.second->GetExtensionByTokenFromServiceMap(token)) { - return item.second; - } - if (item.second && item.second->GetExtensionByTokenFromTerminatingMap(token)) { - return item.second; - } + if (subManagersHelper_ == nullptr) { + TAG_LOGE(AAFwkTag::ABILITYMGR, "pointer is nullptr."); + return std::unordered_map>(); } + return subManagersHelper_->GetMissionListManagers(); +} - return nullptr; +std::shared_ptr AbilityManagerService::GetCurrentMissionListManager() +{ + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetCurrentMissionListManager(); } -std::shared_ptr AbilityManagerService::GetDataAbilityManagerByToken( - const sptr &token) +std::shared_ptr AbilityManagerService::GetMissionListManagerByUserId(int32_t userId) { - std::lock_guard lock(managersMutex_); - for (auto item: dataAbilityManagers_) { - if (item.second && item.second->GetAbilityRecordByToken(token)) { - return item.second; - } + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetMissionListManagerByUserId(userId); +} + +std::unordered_map> AbilityManagerService::GetUIAbilityManagers() +{ + if (subManagersHelper_ == nullptr) { + TAG_LOGE(AAFwkTag::ABILITYMGR, "pointer is nullptr."); + return std::unordered_map>(); } + return subManagersHelper_->GetUIAbilityManagers(); +} - return nullptr; +std::shared_ptr AbilityManagerService::GetCurrentUIAbilityManager() +{ + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetCurrentUIAbilityManager(); +} + +std::shared_ptr AbilityManagerService::GetUIAbilityManagerByUserId(int32_t userId) +{ + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetUIAbilityManagerByUserId(userId); +} + +std::shared_ptr AbilityManagerService::GetUIAbilityManagerByUid(int32_t uid) +{ + CHECK_POINTER_AND_RETURN(subManagersHelper_, nullptr); + return subManagersHelper_->GetUIAbilityManagerByUid(uid); } void AbilityManagerService::StartResidentApps() @@ -6326,10 +6260,11 @@ void AbilityManagerService::ConnectBmsService() int AbilityManagerService::GetWantSenderInfo(const sptr &target, std::shared_ptr &info) { TAG_LOGI(AAFwkTag::ABILITYMGR, "Get pending request info."); - CHECK_POINTER_AND_RETURN(pendingWantManager_, ERR_INVALID_VALUE); + auto pendingWantManager = GetCurrentPendingWantManager(); + CHECK_POINTER_AND_RETURN(pendingWantManager, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(target, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(info, ERR_INVALID_VALUE); - return pendingWantManager_->GetWantSenderInfo(target, info); + return pendingWantManager->GetWantSenderInfo(target, info); } int AbilityManagerService::GetAppMemorySize() @@ -6399,11 +6334,13 @@ int32_t AbilityManagerService::GetMissionIdByAbilityTokenInner(const sptrGetOwnerMissionUserId(); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - return uiAbilityLifecycleManager_->GetSessionIdByAbilityToken(token); + auto uiAbilityManager = GetUIAbilityManagerByUserId(userId); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->GetSessionIdByAbilityToken(token); } - auto userId = abilityRecord->GetOwnerMissionUserId(); - auto missionListManager = GetListManagerByUserId(userId); + auto missionListManager = GetMissionListManagerByUserId(userId); if (!missionListManager) { TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListManager is Null. owner mission userId=%{public}d", userId); return -1; @@ -6413,10 +6350,11 @@ int32_t AbilityManagerService::GetMissionIdByAbilityTokenInner(const sptr AbilityManagerService::GetAbilityTokenByMissionId(int32_t missionId) { - if (!currentMissionListManager_) { + auto missionListManager = GetCurrentMissionListManager(); + if (!missionListManager) { return nullptr; } - return currentMissionListManager_->GetAbilityTokenByMissionId(missionId); + return missionListManager->GetAbilityTokenByMissionId(missionId); } int AbilityManagerService::StartRemoteAbilityByCall(const Want &want, const sptr &callerToken, @@ -6430,14 +6368,14 @@ int AbilityManagerService::StartRemoteAbilityByCall(const Want &want, const sptr } int32_t missionId = -1; if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - missionId = uiAbilityLifecycleManager_->GetSessionIdByAbilityToken(callerToken); + missionId = GetMissionIdByAbilityTokenInner(callerToken); if (!missionId) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Invalid missionId id."); return ERR_INVALID_VALUE; } } else { missionId = GetMissionIdByAbilityToken(callerToken); - } +} if (missionId < 0) { return ERR_INVALID_VALUE; } @@ -6529,10 +6467,12 @@ int AbilityManagerService::StartAbilityByCall(const Want &want, const sptrResolveLocked(abilityRequest, oriValidUserId); + auto uiAbilityManager = GetUIAbilityManagerByUserId(oriValidUserId); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->ResolveLocked(abilityRequest); } - auto missionListMgr = GetListManagerByUserId(oriValidUserId); + auto missionListMgr = GetMissionListManagerByUserId(oriValidUserId); if (missionListMgr == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListMgr is Null. Designated User Id=%{public}d", oriValidUserId); return ERR_INVALID_VALUE; @@ -6553,10 +6493,12 @@ int AbilityManagerService::StartAbilityJust(AbilityRequest &abilityRequest, int3 UpdateCallerInfo(abilityRequest.want, abilityRequest.callerToken); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { ReportEventToSuspendManager(abilityRequest.abilityInfo); - return uiAbilityLifecycleManager_->ResolveLocked(abilityRequest, validUserId); + auto uiAbilityManager = GetUIAbilityManagerByUserId(validUserId); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->ResolveLocked(abilityRequest); } - auto missionListMgr = GetListManagerByUserId(validUserId); + auto missionListMgr = GetMissionListManagerByUserId(validUserId); if (missionListMgr == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListMgr is Null. Designated User Id=%{public}d", validUserId); return ERR_INVALID_VALUE; @@ -6573,9 +6515,6 @@ int AbilityManagerService::ReleaseCall( CHECK_POINTER_AND_RETURN(connect, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(connect->AsObject(), ERR_INVALID_VALUE); - if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); - } std::string elementName = element.GetURI(); TAG_LOGD(AAFwkTag::ABILITYMGR, "try to release called ability, name: %{public}s.", elementName.c_str()); @@ -6586,10 +6525,13 @@ int AbilityManagerService::ReleaseCall( } if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - return uiAbilityLifecycleManager_->ReleaseCallLocked(connect, element); + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->ReleaseCallLocked(connect, element); } - - return currentMissionListManager_->ReleaseCallLocked(connect, element); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); + return missionListManager->ReleaseCallLocked(connect, element); } int AbilityManagerService::JudgeAbilityVisibleControl(const AppExecFwk::AbilityInfo &abilityInfo) @@ -6670,34 +6612,42 @@ void AbilityManagerService::OnAcceptWantResponse( const AAFwk::Want &want, const std::string &flag) { TAG_LOGD(AAFwkTag::ABILITYMGR, "On accept want response"); - if (uiAbilityLifecycleManager_ && Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->OnAcceptWantResponse(want, flag); + if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->OnAcceptWantResponse(want, flag); return; } - if (!currentMissionListManager_) { + auto missionListManager = GetCurrentMissionListManager(); + if (!missionListManager) { return; } - currentMissionListManager_->OnAcceptWantResponse(want, flag); + missionListManager->OnAcceptWantResponse(want, flag); } void AbilityManagerService::OnStartSpecifiedAbilityTimeoutResponse(const AAFwk::Want &want) { TAG_LOGD(AAFwkTag::ABILITYMGR, "%{public}s called.", __func__); - if (uiAbilityLifecycleManager_ && Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->OnStartSpecifiedAbilityTimeoutResponse(want); + if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->OnStartSpecifiedAbilityTimeoutResponse(want); return; } - if (!currentMissionListManager_) { + auto missionListManager = GetCurrentMissionListManager(); + if (!missionListManager) { return; } - currentMissionListManager_->OnStartSpecifiedAbilityTimeoutResponse(want); + missionListManager->OnStartSpecifiedAbilityTimeoutResponse(want); } void AbilityManagerService::OnStartSpecifiedProcessResponse(const AAFwk::Want &want, const std::string &flag) { TAG_LOGD(AAFwkTag::ABILITYMGR, "flag = %{public}s", flag.c_str()); - if (uiAbilityLifecycleManager_ && Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->OnStartSpecifiedProcessResponse(want, flag); + if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->OnStartSpecifiedProcessResponse(want, flag); return; } } @@ -6705,8 +6655,10 @@ void AbilityManagerService::OnStartSpecifiedProcessResponse(const AAFwk::Want &w void AbilityManagerService::OnStartSpecifiedProcessTimeoutResponse(const AAFwk::Want &want) { TAG_LOGD(AAFwkTag::ABILITYMGR, "%{public}s called.", __func__); - if (uiAbilityLifecycleManager_ && Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->OnStartSpecifiedAbilityTimeoutResponse(want); + if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->OnStartSpecifiedAbilityTimeoutResponse(want); return; } } @@ -6717,12 +6669,13 @@ int AbilityManagerService::GetAbilityRunningInfos(std::vectorVerifyRunningInfoPerm(); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->GetAbilityRunningInfos(info, isPerm, GetUserId()); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + uiAbilityManager->GetAbilityRunningInfos(info, isPerm); } else { - if (!currentMissionListManager_) { - return ERR_INVALID_VALUE; - } - currentMissionListManager_->GetAbilityRunningInfos(info, isPerm); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_INVALID_VALUE); + missionListManager->GetAbilityRunningInfos(info, isPerm); } UpdateFocusState(info); @@ -6764,11 +6717,8 @@ int AbilityManagerService::GetExtensionRunningInfos(int upperLimit, std::vector< TAG_LOGD(AAFwkTag::ABILITYMGR, "Get extension infos, upperLimit : %{public}d", upperLimit); CHECK_CALLER_IS_SYSTEM_APP; auto isPerm = AAFwk::PermissionVerification::GetInstance()->VerifyRunningInfoPerm(); - auto connectManager = GetConnectManager(); - if (!connectManager) { - return ERR_INVALID_VALUE; - } - + auto connectManager = GetCurrentConnectManager(); + CHECK_POINTER_AND_RETURN(connectManager, ERR_INVALID_VALUE); connectManager->GetExtensionRunningInfos(upperLimit, info, GetUserId(), isPerm); return ERR_OK; } @@ -6787,13 +6737,8 @@ int AbilityManagerService::GetProcessRunningInfosByUserId( void AbilityManagerService::ClearUserData(int32_t userId) { TAG_LOGD(AAFwkTag::ABILITYMGR, "%{public}s", __func__); - std::unique_lock lock(managersMutex_); - if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - missionListManagers_.erase(userId); - } - connectManagers_.erase(userId); - dataAbilityManagers_.erase(userId); - pendingWantManagers_.erase(userId); + CHECK_POINTER(subManagersHelper_); + subManagersHelper_->ClearSubManagers(userId); } int AbilityManagerService::RegisterSnapshotHandler(const sptr& handler) @@ -6804,11 +6749,9 @@ int AbilityManagerService::RegisterSnapshotHandler(const sptr& return 0; } - if (!currentMissionListManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "snapshot: currentMissionListManager_ is nullptr."); - return INNER_ERR; - } - currentMissionListManager_->RegisterSnapshotHandler(handler); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, INNER_ERR); + missionListManager->RegisterSnapshotHandler(handler); TAG_LOGI(AAFwkTag::ABILITYMGR, "snapshot: AbilityManagerService register snapshot handler success."); return ERR_OK; } @@ -6827,12 +6770,10 @@ int32_t AbilityManagerService::GetMissionSnapshot(const std::string& deviceId, i return GetRemoteMissionSnapshotInfo(deviceId, missionId, missionSnapshot); } TAG_LOGI(AAFwkTag::ABILITYMGR, "get local mission snapshot."); - if (!currentMissionListManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "snapshot: currentMissionListManager_ is nullptr."); - return INNER_ERR; - } + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, INNER_ERR); auto token = GetAbilityTokenByMissionId(missionId); - bool result = currentMissionListManager_->GetMissionSnapshot(missionId, token, missionSnapshot, isLowResolution); + bool result = missionListManager->GetMissionSnapshot(missionId, token, missionSnapshot, isLowResolution); if (!result) { return INNER_ERR; } @@ -6845,8 +6786,9 @@ void AbilityManagerService::UpdateMissionSnapShot(const sptr &tok if (!PermissionVerification::GetInstance()->CheckSpecificSystemAbilityAccessPermission(FOUNDATION_PROCESS_NAME)) { return; } - if (currentMissionListManager_) { - currentMissionListManager_->UpdateSnapShot(token, pixelMap); + auto missionListManager = GetCurrentMissionListManager(); + if (missionListManager) { + missionListManager->UpdateSnapShot(token, pixelMap); } } @@ -6874,15 +6816,16 @@ void AbilityManagerService::EnableRecoverAbility(const sptr& toke appRecoveryHistory_.emplace(record->GetUid(), 0); } } - + auto userId = record->GetOwnerMissionUserId(); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { + auto uiAbilityManager = GetUIAbilityManagerByUserId(userId); + CHECK_POINTER(uiAbilityManager); const auto& abilityInfo = record->GetAbilityInfo(); (void)DelayedSingleton::GetInstance()->AddAbilityRecoverInfo( abilityInfo.bundleName, abilityInfo.moduleName, abilityInfo.name, - uiAbilityLifecycleManager_->GetSessionIdByAbilityToken(token)); + uiAbilityManager->GetSessionIdByAbilityToken(token)); } else { - auto userId = record->GetOwnerMissionUserId(); - auto missionListMgr = GetListManagerByUserId(userId); + auto missionListMgr = GetMissionListManagerByUserId(userId); if (missionListMgr == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListMgr is nullptr"); return; @@ -7108,7 +7051,8 @@ void AbilityManagerService::StartSwitchUserDialogInner(const Want &want, int32_t auto connectManager = GetConnectManagerByUserId(startUserId); if (connectManager == nullptr) { - InitConnectManager(startUserId, false); + CHECK_POINTER(subManagersHelper_); + subManagersHelper_->InitConnectManager(startUserId, false); connectManager = GetConnectManagerByUserId(startUserId); if (connectManager == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "ConnectManager is nullptr. userId=%{public}d", startUserId); @@ -7148,12 +7092,8 @@ void AbilityManagerService::StopFreezingScreen() void AbilityManagerService::UserStarted(int32_t userId) { TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s", __func__); - InitConnectManager(userId, false); - if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - InitMissionListManager(userId, false); - } - InitDataAbilityManager(userId, false); - InitPendWantManager(userId, false); + CHECK_POINTER(subManagersHelper_); + subManagersHelper_->InitSubManagers(userId, false); } void AbilityManagerService::SwitchToUser(int32_t oldUserId, int32_t userId, sptr callback) @@ -7176,12 +7116,8 @@ void AbilityManagerService::SwitchToUser(int32_t oldUserId, int32_t userId, sptr void AbilityManagerService::SwitchManagers(int32_t userId, bool switchUser) { TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s, SwitchManagers:%{public}d-----begin", __func__, userId); - InitConnectManager(userId, switchUser); - if (userId != U0_USER_ID && !Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - InitMissionListManager(userId, switchUser); - } - InitDataAbilityManager(userId, switchUser); - InitPendWantManager(userId, switchUser); + CHECK_POINTER(subManagersHelper_); + subManagersHelper_->InitSubManagers(userId, switchUser); TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s, SwitchManagers:%{public}d-----end", __func__, userId); } @@ -7195,17 +7131,8 @@ void AbilityManagerService::PauseOldUser(int32_t userId) void AbilityManagerService::PauseOldMissionListManager(int32_t userId) { TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s, PauseOldMissionListManager:%{public}d-----begin", __func__, userId); - std::lock_guard lock(managersMutex_); - auto it = missionListManagers_.find(userId); - if (it == missionListManagers_.end()) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s, PauseOldMissionListManager:%{public}d-----end1", __func__, userId); - return; - } - auto manager = it->second; - if (!manager) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s, PauseOldMissionListManager:%{public}d-----end2", __func__, userId); - return; - } + auto manager = GetMissionListManagerByUserId(userId); + CHECK_POINTER(manager); manager->PauseManager(); TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s, PauseOldMissionListManager:%{public}d-----end", __func__, userId); } @@ -7218,97 +7145,18 @@ void AbilityManagerService::PauseOldConnectManager(int32_t userId) return; } - std::lock_guard lock(managersMutex_); - auto it = connectManagers_.find(userId); - if (it == connectManagers_.end()) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s, PauseOldConnectManager:%{public}d-----no user", __func__, userId); - return; - } - auto manager = it->second; - if (!manager) { - TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s, PauseOldConnectManager:%{public}d-----nullptr", __func__, userId); - return; - } + auto manager = GetConnectManagerByUserId(userId); + CHECK_POINTER(manager); manager->PauseExtensions(); TAG_LOGI(AAFwkTag::ABILITYMGR, "%{public}s, PauseOldConnectManager:%{public}d-----end", __func__, userId); } void AbilityManagerService::StartUserApps() { - if (currentMissionListManager_ && currentMissionListManager_->IsStarted()) { + auto missionListManager = GetCurrentMissionListManager(); + if (missionListManager && missionListManager->IsStarted()) { TAG_LOGI(AAFwkTag::ABILITYMGR, "missionListManager ResumeManager"); - currentMissionListManager_->ResumeManager(); - } -} - -void AbilityManagerService::InitConnectManager(int32_t userId, bool switchUser) -{ - bool find = false; - { - std::lock_guard lock(managersMutex_); - auto it = connectManagers_.find(userId); - find = (it != connectManagers_.end()); - if (find) { - if (switchUser) { - SetConnectManager(it->second); - } - } - } - if (!find) { - auto manager = std::make_shared(userId); - manager->SetTaskHandler(taskHandler_); - manager->SetEventHandler(eventHandler_); - std::unique_lock lock(managersMutex_); - connectManagers_.emplace(userId, manager); - if (switchUser) { - SetConnectManager(manager); - } - } -} - -void AbilityManagerService::InitDataAbilityManager(int32_t userId, bool switchUser) -{ - bool find = false; - { - std::lock_guard lock(managersMutex_); - auto it = dataAbilityManagers_.find(userId); - find = (it != dataAbilityManagers_.end()); - if (find) { - if (switchUser) { - dataAbilityManager_ = it->second; - } - } - } - if (!find) { - auto manager = std::make_shared(); - std::unique_lock lock(managersMutex_); - dataAbilityManagers_.emplace(userId, manager); - if (switchUser) { - dataAbilityManager_ = manager; - } - } -} - -void AbilityManagerService::InitPendWantManager(int32_t userId, bool switchUser) -{ - bool find = false; - { - std::lock_guard lock(managersMutex_); - auto it = pendingWantManagers_.find(userId); - find = (it != pendingWantManagers_.end()); - if (find) { - if (switchUser) { - pendingWantManager_ = it->second; - } - } - } - if (!find) { - auto manager = std::make_shared(); - std::unique_lock lock(managersMutex_); - pendingWantManagers_.emplace(userId, manager); - if (switchUser) { - pendingWantManager_ = manager; - } + missionListManager->ResumeManager(); } } @@ -7467,7 +7315,7 @@ int AbilityManagerService::DelegatorDoAbilityForeground(const sptrGetSessionIdByAbilityToken(token); + auto sessionId = GetMissionIdByAbilityTokenInner(token); if (!sessionId) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Invalid session id."); return ERR_INVALID_VALUE; @@ -7526,8 +7374,9 @@ int AbilityManagerService::DoAbilityForeground(const sptr &token, return ERR_WOULD_BLOCK; } - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); - return currentMissionListManager_->DoAbilityForeground(abilityRecord, flag); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); + return missionListManager->DoAbilityForeground(abilityRecord, flag); } int AbilityManagerService::DoAbilityBackground(const sptr &token, uint32_t flag) @@ -7547,14 +7396,15 @@ int AbilityManagerService::DoAbilityBackground(const sptr &token, int AbilityManagerService::DelegatorMoveMissionToFront(int32_t missionId) { TAG_LOGI(AAFwkTag::ABILITYMGR, "enter missionId : %{public}d", missionId); - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); if (!IsAbilityControllerStartById(missionId)) { TAG_LOGE(AAFwkTag::ABILITYMGR, "IsAbilityControllerStart false"); return ERR_WOULD_BLOCK; } - return currentMissionListManager_->MoveMissionToFront(missionId); + return missionListManager->MoveMissionToFront(missionId); } void AbilityManagerService::UpdateCallerInfo(Want& want, const sptr &callerToken) @@ -7858,10 +7708,13 @@ int AbilityManagerService::BlockAbility(int32_t abilityRecordId) return ERR_PERMISSION_DENIED; } if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - return uiAbilityLifecycleManager_->BlockAbility(abilityRecordId, GetUserId()); + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->BlockAbility(abilityRecordId); } - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); - return currentMissionListManager_->BlockAbility(abilityRecordId); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NO_INIT); + return missionListManager->BlockAbility(abilityRecordId); } int AbilityManagerService::BlockAppService() @@ -8104,7 +7957,7 @@ int AbilityManagerService::SetMissionContinueState(const sptr &to } auto userId = abilityRecord->GetOwnerMissionUserId(); - auto missionListManager = GetListManagerByUserId(userId); + auto missionListManager = GetMissionListManagerByUserId(userId); if (!missionListManager) { TAG_LOGE(AAFwkTag::ABILITYMGR, "failed to find mission list manager. Mission id: %{public}d, state: %{public}d", missionId, state); @@ -8150,7 +8003,7 @@ int AbilityManagerService::SetMissionLabel(const sptr &token, con } auto userId = abilityRecord->GetOwnerMissionUserId(); - auto missionListManager = GetListManagerByUserId(userId); + auto missionListManager = GetMissionListManagerByUserId(userId); if (!missionListManager) { TAG_LOGE(AAFwkTag::ABILITYMGR, "failed to find mission list manager when set mission label."); return -1; @@ -8178,7 +8031,7 @@ int AbilityManagerService::SetMissionIcon(const sptr &token, } auto userId = abilityRecord->GetOwnerMissionUserId(); - auto missionListManager = GetListManagerByUserId(userId); + auto missionListManager = GetMissionListManagerByUserId(userId); if (!missionListManager) { TAG_LOGE(AAFwkTag::ABILITYMGR, "failed to find mission list manager."); return -1; @@ -8207,17 +8060,19 @@ sptr AbilityManagerService::GetWMSHandler() const void AbilityManagerService::CompleteFirstFrameDrawing(const sptr &abilityToken) { TAG_LOGD(AAFwkTag::ABILITYMGR, "%{public}s is called.", __func__); + auto abilityRecord = Token::GetAbilityRecordByToken(abilityToken); + CHECK_POINTER(abilityRecord); + auto ownerUserId = abilityRecord->GetOwnerMissionUserId(); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->CompleteFirstFrameDrawing(abilityToken); + auto uiAbilityManager = GetUIAbilityManagerByUserId(ownerUserId); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->CompleteFirstFrameDrawing(abilityToken); return; } - std::lock_guard lock(managersMutex_); - for (auto& item : missionListManagers_) { - if (item.second) { - item.second->CompleteFirstFrameDrawing(abilityToken); - } - } + auto missionListManager = GetMissionListManagerByUserId(ownerUserId); + CHECK_POINTER(missionListManager); + missionListManager->CompleteFirstFrameDrawing(abilityToken); } void AbilityManagerService::CompleteFirstFrameDrawing(int32_t sessionId) @@ -8227,7 +8082,9 @@ void AbilityManagerService::CompleteFirstFrameDrawing(int32_t sessionId) TAG_LOGE(AAFwkTag::ABILITYMGR, "Not sceneboard called, not allowed."); return; } - uiAbilityLifecycleManager_->CompleteFirstFrameDrawing(sessionId); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->CompleteFirstFrameDrawing(sessionId); } int32_t AbilityManagerService::ShowPickerDialog( @@ -8320,25 +8177,21 @@ int AbilityManagerService::PrepareTerminateAbility(const sptr &to void AbilityManagerService::HandleFocused(const sptr &focusChangeInfo) { TAG_LOGI(AAFwkTag::ABILITYMGR, "handle focused event"); - if (!currentMissionListManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "current mission manager is null"); - return; - } + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER(missionListManager); int32_t missionId = GetMissionIdByAbilityToken(focusChangeInfo->abilityToken_); - currentMissionListManager_->NotifyMissionFocused(missionId); + missionListManager->NotifyMissionFocused(missionId); } void AbilityManagerService::HandleUnfocused(const sptr &focusChangeInfo) { TAG_LOGI(AAFwkTag::ABILITYMGR, "handle unfocused event"); - if (!currentMissionListManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "current mission manager is null"); - return; - } + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER(missionListManager); int32_t missionId = GetMissionIdByAbilityToken(focusChangeInfo->abilityToken_); - currentMissionListManager_->NotifyMissionUnfocused(missionId); + missionListManager->NotifyMissionUnfocused(missionId); } void AbilityManagerService::InitFocusListener() @@ -8759,15 +8612,15 @@ void AbilityManagerService::CallRequestDone(const sptr &token, co } if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->CallRequestDone(abilityRecord, callStub); + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->CallRequestDone(abilityRecord, callStub); return; } - if (!currentMissionListManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "currentMissionListManager_ is null."); - return; - } - currentMissionListManager_->CallRequestDone(abilityRecord, callStub); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER(missionListManager); + missionListManager->CallRequestDone(abilityRecord, callStub); } void AbilityManagerService::GetAbilityTokenByCalleeObj(const sptr &callStub, sptr &token) @@ -8926,7 +8779,7 @@ int32_t AbilityManagerService::IsValidMissionIds( const std::vector &missionIds, std::vector &results) { auto userId = IPCSkeleton::GetCallingUid() / BASE_USER_RANGE; - auto missionlistMgr = GetListManagerByUserId(userId); + auto missionlistMgr = GetMissionListManagerByUserId(userId); if (missionlistMgr == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "missionlistMgr is nullptr."); return ERR_INVALID_VALUE; @@ -8980,13 +8833,13 @@ int32_t AbilityManagerService::AcquireShareData( CHECK_CALLER_IS_SYSTEM_APP; std::shared_ptr abilityRecord = nullptr; if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - abilityRecord = uiAbilityLifecycleManager_->GetAbilityRecordsById(missionId); + auto uiAbilityManager = GetCurrentUIAbilityManager(); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + abilityRecord = uiAbilityManager->GetAbilityRecordsById(missionId); } else { - if (!currentMissionListManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "currentMissionListManager_ is null."); - return ERR_INVALID_VALUE; - } - std::shared_ptr mission = currentMissionListManager_->GetMissionById(missionId); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_INVALID_VALUE); + std::shared_ptr mission = missionListManager->GetMissionById(missionId); if (!mission) { TAG_LOGE(AAFwkTag::ABILITYMGR, "mission is null."); return ERR_INVALID_VALUE; @@ -9048,7 +8901,9 @@ void AbilityManagerService::SetRootSceneSession(const sptr &rootS TAG_LOGE(AAFwkTag::ABILITYMGR, "Not sceneboard called, not allowed."); return; } - uiAbilityLifecycleManager_->SetRootSceneSession(rootSceneSession); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->SetRootSceneSession(rootSceneSession); } void AbilityManagerService::CallUIAbilityBySCB(const sptr &sessionInfo) @@ -9057,7 +8912,9 @@ void AbilityManagerService::CallUIAbilityBySCB(const sptr &sessionI TAG_LOGE(AAFwkTag::ABILITYMGR, "Not sceneboard called, not allowed."); return; } - uiAbilityLifecycleManager_->CallUIAbilityBySCB(sessionInfo); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->CallUIAbilityBySCB(sessionInfo); } int32_t AbilityManagerService::SetSessionManagerService(const sptr &sessionManagerService) @@ -9096,8 +8953,9 @@ void AbilityManagerService::StartSpecifiedAbilityBySCB(const Want &want) TAG_LOGE(AAFwkTag::ABILITYMGR, "Not sceneboard called, not allowed."); return; } - int32_t userId = GetUserId(); - uiAbilityLifecycleManager_->StartSpecifiedAbilityBySCB(want, userId); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->StartSpecifiedAbilityBySCB(want); } int32_t AbilityManagerService::RegisterIAbilityManagerCollaborator( @@ -9191,11 +9049,9 @@ int32_t AbilityManagerService::RegisterStatusBarDelegate(sptrRegisterStatusBarDelegate(delegate); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->RegisterStatusBarDelegate(delegate); } int32_t AbilityManagerService::KillProcessWithPrepareTerminate(const std::vector& pids) @@ -9204,11 +9060,9 @@ int32_t AbilityManagerService::KillProcessWithPrepareTerminate(const std::vector TAG_LOGE(AAFwkTag::ABILITYMGR, "Not sceneboard called, not allowed."); return ERR_WRONG_INTERFACE_CALL; } - if (uiAbilityLifecycleManager_ == nullptr) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "uiAbilityLifecycleManager is nullptr"); - return ERR_INVALID_VALUE; - } - return uiAbilityLifecycleManager_->KillProcessWithPrepareTerminate(pids); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->KillProcessWithPrepareTerminate(pids); } int32_t AbilityManagerService::RegisterAutoStartupSystemCallback(const sptr &callback) @@ -9270,13 +9124,10 @@ int AbilityManagerService::PrepareTerminateAbilityBySCB(const sptr return ERR_WRONG_INTERFACE_CALL; } - if (!uiAbilityLifecycleManager_) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "failed, uiAbilityLifecycleManager is nullptr"); - return ERR_INVALID_VALUE; - } - - auto abilityRecord = uiAbilityLifecycleManager_->GetUIAbilityRecordBySessionInfo(sessionInfo); - isTerminate = uiAbilityLifecycleManager_->PrepareTerminateAbility(abilityRecord); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + auto abilityRecord = uiAbilityManager->GetUIAbilityRecordBySessionInfo(sessionInfo); + isTerminate = uiAbilityManager->PrepareTerminateAbility(abilityRecord); return ERR_OK; } @@ -9284,13 +9135,14 @@ int AbilityManagerService::PrepareTerminateAbilityBySCB(const sptr int AbilityManagerService::RegisterSessionHandler(const sptr &object) { TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); - CHECK_POINTER_AND_RETURN(uiAbilityLifecycleManager_, ERR_NO_INIT); if (!CheckCallingTokenId(BUNDLE_NAME_SCENEBOARD)) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Not sceneboard called, not allowed."); return ERR_WRONG_INTERFACE_CALL; } + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); sptr handler = iface_cast(object); - uiAbilityLifecycleManager_->SetSessionHandler(handler); + uiAbilityManager->SetSessionHandler(handler); return ERR_OK; } @@ -9314,7 +9166,7 @@ bool AbilityManagerService::CheckUserIdActive(int32_t userId) return true; } -int32_t AbilityManagerService::CheckProcessOptions(const Want &want, const StartOptions &startOptions) +int32_t AbilityManagerService::CheckProcessOptions(const Want &want, const StartOptions &startOptions, int32_t userId) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (startOptions.processOptions == nullptr || @@ -9335,23 +9187,21 @@ int32_t AbilityManagerService::CheckProcessOptions(const Want &want, const Start return ERR_NOT_ALLOW_IMPLICIT_START; } - if (!CheckCallingTokenId(element.GetBundleName())) { + if (!CheckCallingTokenId(element.GetBundleName(), userId)) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Not self application."); return ERR_NOT_SELF_APPLICATION; } - if (uiAbilityLifecycleManager_ == nullptr) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "uiAbilityLifecycleManager_ is nullptr"); - return ERR_INVALID_VALUE; - } + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); if (startOptions.processOptions->processMode == ProcessMode::NEW_PROCESS_ATTACH_TO_STATUS_BAR_ITEM && - !uiAbilityLifecycleManager_->IsCallerInStatusBar()) { + !uiAbilityManager->IsCallerInStatusBar()) { TAG_LOGE(AAFwkTag::ABILITYMGR, "Caller is not in status bar in NEW_PROCESS_ATTACH_TO_STATUS_BAR_ITEM mode."); return ERR_START_OPTIONS_CHECK_FAILED; } - auto abilityRecords = uiAbilityLifecycleManager_->GetAbilityRecordsByName(element); + auto abilityRecords = uiAbilityManager->GetAbilityRecordsByName(element); if (!abilityRecords.empty() && abilityRecords[0] && abilityRecords[0]->GetAbilityInfo().launchMode != AppExecFwk::LaunchMode::STANDARD) { TAG_LOGE(AAFwkTag::ABILITYMGR, "If it is not in STANDARD mode, repeated starts are not allowed"); @@ -9490,13 +9340,12 @@ bool AbilityManagerService::IsAbilityStarted(AbilityRequest &abilityRequest, { if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { TAG_LOGI(AAFwkTag::ABILITYMGR, "scene board is enable"); - if (uiAbilityLifecycleManager_ == nullptr) { - return false; - } - return uiAbilityLifecycleManager_->IsAbilityStarted(abilityRequest, targetRecord, oriValidUserId); + auto uiAbilityManager = GetUIAbilityManagerByUserId(oriValidUserId); + CHECK_POINTER_AND_RETURN(uiAbilityManager, false); + return uiAbilityManager->IsAbilityStarted(abilityRequest, targetRecord); } - auto missionListMgr = GetListManagerByUserId(oriValidUserId); + auto missionListMgr = GetMissionListManagerByUserId(oriValidUserId); if (missionListMgr == nullptr) { return false; } @@ -9566,7 +9415,7 @@ int32_t AbilityManagerService::StartAbilityByCallWithInsightIntent(const Want &w } std::shared_ptr targetRecord; int32_t oriValidUserId = GetValidUserId(DEFAULT_INVAL_VALUE); - auto missionListMgr = GetListManagerByUserId(oriValidUserId); + auto missionListMgr = GetMissionListManagerByUserId(oriValidUserId); if (IsAbilityStarted(abilityRequest, targetRecord, oriValidUserId)) { TAG_LOGI(AAFwkTag::ABILITYMGR, "ability has already started"); UpdateCallerInfo(abilityRequest.want, callerToken); @@ -9649,13 +9498,13 @@ int32_t AbilityManagerService::GetForegroundUIAbilities(std::vector abilityRunningInfos; if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->GetAbilityRunningInfos(abilityRunningInfos, isPerm, GetUserId()); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + uiAbilityManager->GetAbilityRunningInfos(abilityRunningInfos, isPerm); } else { - if (currentMissionListManager_ == nullptr) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "Current mission list manager is nullptr."); - return ERR_NULL_OBJECT; - } - currentMissionListManager_->GetAbilityRunningInfos(abilityRunningInfos, isPerm); + auto missionListManager = GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(missionListManager, ERR_NULL_OBJECT); + missionListManager->GetAbilityRunningInfos(abilityRunningInfos, isPerm); } for (auto &info : abilityRunningInfos) { @@ -9957,7 +9806,9 @@ int32_t AbilityManagerService::UpdateSessionInfoBySCB(std::list &se return ERR_WRONG_INTERFACE_CALL; } TAG_LOGI(AAFwkTag::ABILITYMGR, "The sceneboard is being restored."); - return uiAbilityLifecycleManager_->UpdateSessionInfoBySCB(sessionInfos, userId, sessionIds); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + return uiAbilityManager->UpdateSessionInfoBySCB(sessionInfos, sessionIds); } bool AbilityManagerService::CheckSenderWantInfo(int32_t callerUid, const WantSenderInfo &wantSenderInfo) @@ -10133,10 +9984,12 @@ int32_t AbilityManagerService::SignRestartAppFlag(int32_t userId, const std::str auto connectManager = GetConnectManagerByUserId(userId); connectManager->SignRestartAppFlag(bundleName); if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - uiAbilityLifecycleManager_->SignRestartAppFlag(bundleName); + auto uiAbilityManager = GetUIAbilityManagerByUserId(userId); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + uiAbilityManager->SignRestartAppFlag(bundleName); return ERR_OK; } - auto missionListManager = GetListManagerByUserId(userId); + auto missionListManager = GetMissionListManagerByUserId(userId); if (missionListManager == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "missionListManager is nullptr. userId:%{public}d", userId); return ERR_INVALID_VALUE; @@ -10158,11 +10011,9 @@ bool AbilityManagerService::IsEmbeddedOpenAllowed(sptr callerToke TAG_LOGE(AAFwkTag::ABILITYMGR, "The caller is not hap."); return false; } - if (uiAbilityLifecycleManager_ == nullptr) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "The SceneBoard not enabled."); - return false; - } - auto callerAbility = uiAbilityLifecycleManager_->GetAbilityRecordByToken(callerToken); + auto uiAbilityManager = GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_INVALID_VALUE); + auto callerAbility = uiAbilityManager->GetAbilityRecordByToken(callerToken); if (callerAbility == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "The caller is invalid."); return false; diff --git a/services/abilitymgr/src/app_exit_reason_helper.cpp b/services/abilitymgr/src/app_exit_reason_helper.cpp index 122b97e461d..328e96b0040 100644 --- a/services/abilitymgr/src/app_exit_reason_helper.cpp +++ b/services/abilitymgr/src/app_exit_reason_helper.cpp @@ -29,24 +29,16 @@ #include "ipc_skeleton.h" #include "scene_board_judgement.h" #include "singleton.h" +#include "sub_managers_helper.h" namespace OHOS { namespace AAFwk { namespace { constexpr int32_t U0_USER_ID = 0; } -AppExitReasonHelper::AppExitReasonHelper( - std::shared_ptr &uiAbilityLifecycleManager, - std::unordered_map> &missionListManagers, - ffrt::mutex &managersMutex) : uiAbilityLifecycleManager_(uiAbilityLifecycleManager), - missionListManagers_(missionListManagers), - managersMutex_(managersMutex) {} - -void AppExitReasonHelper::SetCurrentMissionListManager( - const std::shared_ptr currentMissionListManager) -{ - currentMissionListManager_ = currentMissionListManager; -} + +AppExitReasonHelper::AppExitReasonHelper(std::shared_ptr subManagersHelper) + : subManagersHelper_(subManagersHelper) {} int32_t AppExitReasonHelper::RecordAppExitReason(const ExitReason &exitReason) { @@ -63,14 +55,16 @@ int32_t AppExitReasonHelper::RecordAppExitReason(const ExitReason &exitReason) TAG_LOGE(AAFwkTag::ABILITYMGR, "Get Bundle Name failed."); return GET_BUNDLE_INFO_FAILED; } - + CHECK_POINTER_AND_RETURN(subManagersHelper_, ERR_NULL_OBJECT); std::vector abilityList; if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - CHECK_POINTER_AND_RETURN(uiAbilityLifecycleManager_, ERR_NULL_OBJECT); - uiAbilityLifecycleManager_->GetActiveAbilityList(bundleName, abilityList); + auto uiAbilityManager = subManagersHelper_->GetUIAbilityManagerByUid(IPCSkeleton::GetCallingUid()); + CHECK_POINTER_AND_RETURN(uiAbilityManager, ERR_NULL_OBJECT); + uiAbilityManager->GetActiveAbilityList(bundleName, abilityList); } else { - CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NULL_OBJECT); - currentMissionListManager_->GetActiveAbilityList(bundleName, abilityList); + auto currentMissionListManager = subManagersHelper_->GetCurrentMissionListManager(); + CHECK_POINTER_AND_RETURN(currentMissionListManager, ERR_NULL_OBJECT); + currentMissionListManager->GetActiveAbilityList(bundleName, abilityList); } if (abilityList.empty()) { @@ -105,8 +99,7 @@ int32_t AppExitReasonHelper::RecordProcessExitReason(const int32_t pid, const Ex int32_t targetUserId = uid / AppExecFwk::Constants::BASE_USER_RANGE; std::vector abilityLists; if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - CHECK_POINTER_AND_RETURN(uiAbilityLifecycleManager_, ERR_NULL_OBJECT); - uiAbilityLifecycleManager_->GetActiveAbilityList(bundleName, abilityLists, targetUserId, pid); + GetActiveAbilityListFromUIAabilityManager(bundleName, abilityLists, targetUserId, pid); } else if (targetUserId == U0_USER_ID) { GetActiveAbilityListByU0(bundleName, abilityLists, pid); } else { @@ -124,8 +117,9 @@ int32_t AppExitReasonHelper::RecordProcessExitReason(const int32_t pid, const Ex void AppExitReasonHelper::GetActiveAbilityListByU0(const std::string bundleName, std::vector &abilityLists, const int32_t pid) { - std::lock_guard lock(managersMutex_); - for (auto item: missionListManagers_) { + CHECK_POINTER(subManagersHelper_); + auto missionListManagers = subManagersHelper_->GetMissionListManagers(); + for (auto& item: missionListManagers) { if (!item.second) { continue; } @@ -140,27 +134,35 @@ void AppExitReasonHelper::GetActiveAbilityListByU0(const std::string bundleName, void AppExitReasonHelper::GetActiveAbilityListByUser(const std::string bundleName, std::vector &abilityLists, const int32_t targetUserId, const int32_t pid) { - auto listManager = GetListManagerByUserId(targetUserId); + CHECK_POINTER(subManagersHelper_); + auto listManager = subManagersHelper_->GetMissionListManagerByUserId(targetUserId); if (listManager) { listManager->GetActiveAbilityList(bundleName, abilityLists, pid); } } -std::shared_ptr AppExitReasonHelper::GetListManagerByUserId(int32_t userId) -{ - std::lock_guard lock(managersMutex_); - auto it = missionListManagers_.find(userId); - if (it != missionListManagers_.end()) { - return it->second; - } - TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to get MissionListManager. UserId = %{public}d", userId); - return nullptr; -} - bool AppExitReasonHelper::IsExitReasonValid(const ExitReason &exitReason) { const Reason reason = exitReason.reason; return reason >= REASON_MIN || reason <= REASON_MAX; } + +void AppExitReasonHelper::GetActiveAbilityListFromUIAabilityManager(const std::string bundleName, + std::vector &abilityLists, const int32_t targetUserId, const int32_t pid) +{ + CHECK_POINTER(subManagersHelper_); + if (targetUserId == U0_USER_ID) { + auto uiAbilityManagers = subManagersHelper_->GetUIAbilityManagers(); + for (auto& item: uiAbilityManagers) { + if (item.second) { + item.second->GetActiveAbilityList(bundleName, abilityLists, pid); + } + } + } else { + auto uiAbilityManager = subManagersHelper_->GetUIAbilityManagerByUserId(targetUserId); + CHECK_POINTER(uiAbilityManager); + uiAbilityManager->GetActiveAbilityList(bundleName, abilityLists, pid); + } +} } // namespace AppExecFwk } // namespace OHOS 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 33356f63a91..0739ac96376 100644 --- a/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp +++ b/services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp @@ -76,6 +76,8 @@ auto g_deleteLifecycleEventTask = [](const sptr &token, FreezeUtil::Timeo }; } +UIAbilityLifecycleManager::UIAbilityLifecycleManager(int32_t userId): userId_(userId) {} + int UIAbilityLifecycleManager::StartUIAbility(AbilityRequest &abilityRequest, sptr sessionInfo) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); @@ -159,7 +161,7 @@ std::shared_ptr UIAbilityLifecycleManager::CreateAbilityRecord(Ab return nullptr; } TAG_LOGD(AAFwkTag::ABILITYMGR, "user id: %{public}d.", sessionInfo->userId); - uiAbilityRecord->SetOwnerMissionUserId(sessionInfo->userId); + uiAbilityRecord->SetOwnerMissionUserId(userId_); SetRevicerInfo(abilityRequest, uiAbilityRecord); SetLastExitReason(uiAbilityRecord); return uiAbilityRecord; @@ -292,7 +294,7 @@ int UIAbilityLifecycleManager::AbilityTransactionDone(const sptr return DispatchState(abilityRecord, targetState); } -int UIAbilityLifecycleManager::NotifySCBToStartUIAbility(const AbilityRequest &abilityRequest, int32_t userId) +int UIAbilityLifecycleManager::NotifySCBToStartUIAbility(const AbilityRequest &abilityRequest) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); std::lock_guard guard(sessionLock_); @@ -301,7 +303,7 @@ int UIAbilityLifecycleManager::NotifySCBToStartUIAbility(const AbilityRequest &a TAG_LOGD(AAFwkTag::ABILITYMGR, "NotifySCBToStartUIAbility, want with persistentId: %{public}d.", persistentId); if (persistentId != 0 && AAFwk::PermissionVerification::GetInstance()->CheckSpecificSystemAbilityAccessPermission(DMS_PROCESS_NAME)) { - return StartWithPersistentIdByDistributed(abilityRequest, userId, persistentId); + return StartWithPersistentIdByDistributed(abilityRequest, persistentId); } auto abilityInfo = abilityRequest.abilityInfo; @@ -321,11 +323,11 @@ int UIAbilityLifecycleManager::NotifySCBToStartUIAbility(const AbilityRequest &a } auto sessionInfo = CreateSessionInfo(abilityRequest); sessionInfo->requestCode = abilityRequest.requestCode; - sessionInfo->persistentId = GetPersistentIdByAbilityRequest(abilityRequest, sessionInfo->reuse, userId); - sessionInfo->userId = userId; + sessionInfo->persistentId = GetPersistentIdByAbilityRequest(abilityRequest, sessionInfo->reuse); + sessionInfo->userId = userId_; sessionInfo->processOptions = abilityRequest.processOptions; TAG_LOGI( - AAFwkTag::ABILITYMGR, "Reused sessionId: %{public}d, userId: %{public}d.", sessionInfo->persistentId, userId); + AAFwkTag::ABILITYMGR, "Reused sessionId: %{public}d, userId: %{public}d.", sessionInfo->persistentId, userId_); return NotifySCBPendingActivation(sessionInfo, abilityRequest); } @@ -718,7 +720,7 @@ void UIAbilityLifecycleManager::MoveToBackground(const std::shared_ptrBackgroundAbility(task); } -int UIAbilityLifecycleManager::ResolveLocked(const AbilityRequest &abilityRequest, int32_t userId) +int UIAbilityLifecycleManager::ResolveLocked(const AbilityRequest &abilityRequest) { TAG_LOGI(AAFwkTag::ABILITYMGR, "ability_name:%{public}s", abilityRequest.want.GetElement().GetURI().c_str()); @@ -727,16 +729,16 @@ int UIAbilityLifecycleManager::ResolveLocked(const AbilityRequest &abilityReques return RESOLVE_CALL_ABILITY_INNER_ERR; } - return CallAbilityLocked(abilityRequest, userId); + return CallAbilityLocked(abilityRequest); } bool UIAbilityLifecycleManager::IsAbilityStarted(AbilityRequest &abilityRequest, - std::shared_ptr &targetRecord, const int32_t oriValidUserId) + std::shared_ptr &targetRecord) { TAG_LOGD(AAFwkTag::ABILITYMGR, "Call."); std::lock_guard guard(sessionLock_); bool reuse = false; - auto persistentId = GetPersistentIdByAbilityRequest(abilityRequest, reuse, oriValidUserId); + auto persistentId = GetPersistentIdByAbilityRequest(abilityRequest, reuse); if (persistentId == 0) { return false; } @@ -748,7 +750,7 @@ bool UIAbilityLifecycleManager::IsAbilityStarted(AbilityRequest &abilityRequest, return true; } -int UIAbilityLifecycleManager::CallAbilityLocked(const AbilityRequest &abilityRequest, int32_t userId) +int UIAbilityLifecycleManager::CallAbilityLocked(const AbilityRequest &abilityRequest) { TAG_LOGD(AAFwkTag::ABILITYMGR, "Call."); HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); @@ -757,10 +759,10 @@ int UIAbilityLifecycleManager::CallAbilityLocked(const AbilityRequest &abilityRe // Get target uiAbility record. std::shared_ptr uiAbilityRecord; bool reuse = false; - auto persistentId = GetPersistentIdByAbilityRequest(abilityRequest, reuse, userId); + auto persistentId = GetPersistentIdByAbilityRequest(abilityRequest, reuse); if (persistentId == 0) { uiAbilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); - uiAbilityRecord->SetOwnerMissionUserId(DelayedSingleton::GetInstance()->GetUserId()); + uiAbilityRecord->SetOwnerMissionUserId(userId_); SetRevicerInfo(abilityRequest, uiAbilityRecord); SetLastExitReason(uiAbilityRecord); } else { @@ -1142,18 +1144,18 @@ void UIAbilityLifecycleManager::CompleteTerminate(const std::shared_ptrGetSpecifiedFlag() == abilityRequest.specifiedFlag && - CheckProperties(second, abilityRequest, AppExecFwk::LaunchMode::SPECIFIED, userId)) { + CheckProperties(second, abilityRequest, AppExecFwk::LaunchMode::SPECIFIED)) { TAG_LOGD(AAFwkTag::ABILITYMGR, "SPECIFIED: find."); return first; } @@ -1195,7 +1197,7 @@ int32_t UIAbilityLifecycleManager::GetReusedSpecifiedPersistentId(const AbilityR } int32_t UIAbilityLifecycleManager::GetReusedStandardPersistentId(const AbilityRequest &abilityRequest, - bool &reuse, int32_t userId) const + bool &reuse) const { TAG_LOGD(AAFwkTag::ABILITYMGR, "Call."); if (abilityRequest.abilityInfo.launchMode != AppExecFwk::LaunchMode::STANDARD) { @@ -1212,7 +1214,7 @@ int32_t UIAbilityLifecycleManager::GetReusedStandardPersistentId(const AbilityRe int64_t sessionTime = 0; int32_t persistentId = 0; for (const auto& [first, second] : sessionAbilityMap_) { - if (CheckProperties(second, abilityRequest, AppExecFwk::LaunchMode::STANDARD, userId) && + if (CheckProperties(second, abilityRequest, AppExecFwk::LaunchMode::STANDARD) && second->GetRestartTime() >= sessionTime) { persistentId = first; sessionTime = second->GetRestartTime(); @@ -1242,13 +1244,8 @@ int32_t UIAbilityLifecycleManager::GetReusedCollaboratorPersistentId(const Abili } bool UIAbilityLifecycleManager::CheckProperties(const std::shared_ptr &abilityRecord, - const AbilityRequest &abilityRequest, AppExecFwk::LaunchMode launchMode, int32_t userId) const + const AbilityRequest &abilityRequest, AppExecFwk::LaunchMode launchMode) const { - if (userId != abilityRecord->GetOwnerMissionUserId()) { - TAG_LOGW(AAFwkTag::ABILITYMGR, "userId: %{public}d, ability's userId: %{public}d", userId, - abilityRecord->GetOwnerMissionUserId()); - return false; - } const auto& abilityInfo = abilityRecord->GetAbilityInfo(); return abilityInfo.launchMode == launchMode && abilityRequest.abilityInfo.name == abilityInfo.name && abilityRequest.abilityInfo.bundleName == abilityInfo.bundleName && @@ -1408,8 +1405,7 @@ void UIAbilityLifecycleManager::OnAcceptWantResponse(const AAFwk::Want &want, co if (!flag.empty()) { abilityRequest.specifiedFlag = flag; bool reuse = false; - auto currentAccountId = DelayedSingleton::GetInstance()->GetUserId(); - auto persistentId = GetReusedSpecifiedPersistentId(abilityRequest, reuse, currentAccountId); + auto persistentId = GetReusedSpecifiedPersistentId(abilityRequest, reuse); if (persistentId != 0) { auto abilityRecord = GetReusedSpecifiedAbility(want, flag); if (!abilityRecord) { @@ -1458,8 +1454,7 @@ void UIAbilityLifecycleManager::OnStartSpecifiedProcessResponse(const AAFwk::Wan } auto sessionInfo = CreateSessionInfo(abilityRequest); sessionInfo->requestCode = abilityRequest.requestCode; - sessionInfo->persistentId = GetPersistentIdByAbilityRequest(abilityRequest, sessionInfo->reuse, - abilityRequest.userId); + sessionInfo->persistentId = GetPersistentIdByAbilityRequest(abilityRequest, sessionInfo->reuse); sessionInfo->userId = abilityRequest.userId; TAG_LOGI(AAFwkTag::ABILITYMGR, "Reused sessionId: %{public}d, userId: %{public}d.", sessionInfo->persistentId, abilityRequest.userId); @@ -1477,12 +1472,12 @@ void UIAbilityLifecycleManager::OnStartSpecifiedProcessTimeoutResponse(const AAF abilityQueue_.pop(); } -void UIAbilityLifecycleManager::StartSpecifiedAbilityBySCB(const Want &want, int32_t userId) +void UIAbilityLifecycleManager::StartSpecifiedAbilityBySCB(const Want &want) { TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); AbilityRequest abilityRequest; int result = DelayedSingleton::GetInstance()->GenerateAbilityRequest( - want, DEFAULT_INVAL_VALUE, abilityRequest, nullptr, userId); + want, DEFAULT_INVAL_VALUE, abilityRequest, nullptr, userId_); if (result != ERR_OK) { TAG_LOGE(AAFwkTag::ABILITYMGR, "cannot find generate ability request"); return; @@ -1717,27 +1712,6 @@ int32_t UIAbilityLifecycleManager::GetSessionIdByAbilityToken(const sptr &abilityList, int32_t pid) -{ - HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - auto currentAccountId = DelayedSingleton::GetInstance()->GetUserId(); - std::lock_guard guard(sessionLock_); - for (const auto& [sessionId, abilityRecord] : sessionAbilityMap_) { - CHECK_POINTER_CONTINUE(abilityRecord); - if (!CheckPid(abilityRecord, pid)) { - continue; - } - if (abilityRecord->GetOwnerMissionUserId() == currentAccountId) { - const auto &abilityInfo = abilityRecord->GetAbilityInfo(); - if (abilityInfo.bundleName == bundleName && !abilityInfo.name.empty()) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "find ability name is %{public}s", abilityInfo.name.c_str()); - abilityList.push_back(abilityInfo.name); - } - } - } -} - void UIAbilityLifecycleManager::SetRevicerInfo(const AbilityRequest &abilityRequest, std::shared_ptr &abilityRecord) const { @@ -1848,7 +1822,7 @@ std::shared_ptr UIAbilityLifecycleManager::GetAbilityRecordsById( } void UIAbilityLifecycleManager::GetActiveAbilityList(const std::string &bundleName, - std::vector &abilityList, int32_t targetUserId, int32_t pid) const + std::vector &abilityList, int32_t pid) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); std::lock_guard guard(sessionLock_); @@ -1862,8 +1836,7 @@ void UIAbilityLifecycleManager::GetActiveAbilityList(const std::string &bundleNa continue; } const auto &abilityInfo = abilityRecord->GetAbilityInfo(); - if (abilityInfo.bundleName == bundleName && !abilityInfo.name.empty() && - (targetUserId == DEFAULT_USER_ID || abilityRecord->GetOwnerMissionUserId() == targetUserId)) { + if (abilityInfo.bundleName == bundleName && !abilityInfo.name.empty()) { TAG_LOGD(AAFwkTag::ABILITYMGR, "find ability name is %{public}s", abilityInfo.name.c_str()); abilityList.push_back(abilityInfo.name); } @@ -1880,7 +1853,7 @@ bool UIAbilityLifecycleManager::CheckPid(const std::shared_ptr ab return pid == NO_PID || abilityRecord->GetPid() == pid; } -void UIAbilityLifecycleManager::OnAppStateChanged(const AppInfo &info, int32_t targetUserId) +void UIAbilityLifecycleManager::OnAppStateChanged(const AppInfo &info) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); std::lock_guard guard(sessionLock_); @@ -1891,9 +1864,8 @@ void UIAbilityLifecycleManager::OnAppStateChanged(const AppInfo &info, int32_t t TAG_LOGW(AAFwkTag::ABILITYMGR, "the abilityRecord is nullptr."); continue; } - if ((info.processName == abilityRecord->GetAbilityInfo().process || - info.processName == abilityRecord->GetApplicationInfo().bundleName) && - targetUserId == abilityRecord->GetOwnerMissionUserId()) { + if (info.processName == abilityRecord->GetAbilityInfo().process || + info.processName == abilityRecord->GetApplicationInfo().bundleName) { abilityRecord->SetAppState(info.state); } } @@ -1905,9 +1877,8 @@ void UIAbilityLifecycleManager::OnAppStateChanged(const AppInfo &info, int32_t t TAG_LOGW(AAFwkTag::ABILITYMGR, "abilityRecord is nullptr."); continue; } - if ((info.processName == abilityRecord->GetAbilityInfo().process || - info.processName == abilityRecord->GetApplicationInfo().bundleName) && - targetUserId == abilityRecord->GetOwnerMissionUserId()) { + if (info.processName == abilityRecord->GetAbilityInfo().process || + info.processName == abilityRecord->GetApplicationInfo().bundleName) { abilityRecord->SetColdStartFlag(true); break; } @@ -1919,15 +1890,14 @@ void UIAbilityLifecycleManager::OnAppStateChanged(const AppInfo &info, int32_t t TAG_LOGW(AAFwkTag::ABILITYMGR, "abilityRecord is nullptr."); continue; } - if ((info.processName == abilityRecord->GetAbilityInfo().process || - info.processName == abilityRecord->GetApplicationInfo().bundleName) && - targetUserId == abilityRecord->GetOwnerMissionUserId()) { + if (info.processName == abilityRecord->GetAbilityInfo().process || + info.processName == abilityRecord->GetApplicationInfo().bundleName) { abilityRecord->SetAppState(info.state); } } } -void UIAbilityLifecycleManager::UninstallApp(const std::string &bundleName, int32_t uid, int32_t targetUserId) +void UIAbilityLifecycleManager::UninstallApp(const std::string &bundleName, int32_t uid) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); std::lock_guard guard(sessionLock_); @@ -1938,8 +1908,7 @@ void UIAbilityLifecycleManager::UninstallApp(const std::string &bundleName, int3 continue; } auto &abilityInfo = it->second->GetAbilityInfo(); - if (abilityInfo.bundleName == bundleName && it->second->GetUid() == uid && - (targetUserId == DEFAULT_USER_ID || it->second->GetOwnerMissionUserId() == targetUserId)) { + if (abilityInfo.bundleName == bundleName && it->second->GetUid() == uid) { (void)DelayedSingleton::GetInstance()-> DeleteAbilityRecoverInfo(abilityInfo.bundleName, abilityInfo.moduleName, abilityInfo.name); } @@ -1947,14 +1916,13 @@ void UIAbilityLifecycleManager::UninstallApp(const std::string &bundleName, int3 } } -void UIAbilityLifecycleManager::GetAbilityRunningInfos(std::vector &info, bool isPerm, - int32_t userId) const +void UIAbilityLifecycleManager::GetAbilityRunningInfos(std::vector &info, bool isPerm) const { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); std::lock_guard guard(sessionLock_); TAG_LOGD(AAFwkTag::ABILITYMGR, "Call."); for (auto [sessionId, abilityRecord] : sessionAbilityMap_) { - if (abilityRecord == nullptr || userId != abilityRecord->GetOwnerMissionUserId()) { + if (abilityRecord == nullptr) { TAG_LOGW(AAFwkTag::ABILITYMGR, "abilityRecord is nullptr."); continue; } @@ -1971,7 +1939,7 @@ void UIAbilityLifecycleManager::GetAbilityRunningInfos(std::vector guard(sessionLock_); @@ -1981,7 +1949,7 @@ int UIAbilityLifecycleManager::BlockAbility(int32_t abilityRecordId, int32_t tar TAG_LOGW(AAFwkTag::ABILITYMGR, "abilityRecord is nullptr."); continue; } - if (second->GetRecordId() == abilityRecordId && targetUserId == abilityRecord->GetOwnerMissionUserId()) { + if (second->GetRecordId() == abilityRecordId) { TAG_LOGI(AAFwkTag::ABILITYMGR, "Call BlockAbility."); return second->BlockAbility(); } @@ -2003,8 +1971,7 @@ void UIAbilityLifecycleManager::Dump(std::vector &info) } } - int userId = DelayedSingleton::GetInstance()->GetUserId(); - std::string dumpInfo = "User ID #" + std::to_string(userId); + std::string dumpInfo = "User ID #" + std::to_string(userId_); info.push_back(dumpInfo); dumpInfo = " current mission lists:{"; info.push_back(dumpInfo); @@ -2014,9 +1981,6 @@ void UIAbilityLifecycleManager::Dump(std::vector &info) TAG_LOGW(AAFwkTag::ABILITYMGR, "abilityRecord is nullptr."); continue; } - if (abilityRecord->GetOwnerMissionUserId() != userId) { - continue; - } sptr sessionInfo = abilityRecord->GetSessionInfo(); dumpInfo = " Mission ID #" + std::to_string(sessionId); @@ -2035,7 +1999,7 @@ void UIAbilityLifecycleManager::Dump(std::vector &info) } void UIAbilityLifecycleManager::DumpMissionList( - std::vector &info, bool isClient, int userId, const std::string &args) + std::vector &info, bool isClient, const std::string &args) { TAG_LOGI(AAFwkTag::ABILITYMGR, "Call start."); std::unordered_map> sessionAbilityMapLocked; @@ -2046,7 +2010,7 @@ void UIAbilityLifecycleManager::DumpMissionList( sessionAbilityMapLocked[sessionId] = abilityRecord; } } - std::string dumpInfo = "User ID #" + std::to_string(userId); + std::string dumpInfo = "User ID #" + std::to_string(userId_); info.push_back(dumpInfo); dumpInfo = " current mission lists:{"; info.push_back(dumpInfo); @@ -2056,9 +2020,6 @@ void UIAbilityLifecycleManager::DumpMissionList( TAG_LOGW(AAFwkTag::ABILITYMGR, "abilityRecord is nullptr."); continue; } - if (abilityRecord->GetOwnerMissionUserId() != userId) { - continue; - } sptr sessionInfo = abilityRecord->GetSessionInfo(); dumpInfo = " Mission ID #" + std::to_string(sessionId); if (sessionInfo) { @@ -2077,7 +2038,7 @@ void UIAbilityLifecycleManager::DumpMissionList( } void UIAbilityLifecycleManager::DumpMissionListByRecordId(std::vector &info, bool isClient, - int32_t abilityRecordId, const std::vector ¶ms, int userId) + int32_t abilityRecordId, const std::vector ¶ms) { TAG_LOGI(AAFwkTag::ABILITYMGR, "Call."); std::unordered_map> sessionAbilityMapLocked; @@ -2088,7 +2049,7 @@ void UIAbilityLifecycleManager::DumpMissionListByRecordId(std::vector return ERR_OK; } -int32_t UIAbilityLifecycleManager::UpdateSessionInfoBySCB(std::list &sessionInfos, int32_t userId, +int32_t UIAbilityLifecycleManager::UpdateSessionInfoBySCB(std::list &sessionInfos, std::vector &sessionIds) { std::unordered_set> abilitySet; { std::lock_guard guard(sessionLock_); for (auto [sessionId, abilityRecord] : sessionAbilityMap_) { - if (abilityRecord->GetOwnerMissionUserId() != userId) { - continue; - } bool isFind = false; for (auto iter = sessionInfos.begin(); iter != sessionInfos.end(); iter++) { if (iter->persistentId == sessionId) { @@ -2326,14 +2284,14 @@ void UIAbilityLifecycleManager::CompleteFirstFrameDrawing(int32_t sessionId) con HandleOnFirstFrameState(abilityRecord); } -int UIAbilityLifecycleManager::StartWithPersistentIdByDistributed(const AbilityRequest &abilityRequest, int32_t userId, +int UIAbilityLifecycleManager::StartWithPersistentIdByDistributed(const AbilityRequest &abilityRequest, int32_t persistentId) { TAG_LOGD(AAFwkTag::ABILITYMGR, "StartWithPersistentIdByDistributed, called"); auto sessionInfo = CreateSessionInfo(abilityRequest); sessionInfo->requestCode = abilityRequest.requestCode; sessionInfo->persistentId = persistentId; - sessionInfo->userId = userId; + sessionInfo->userId = userId_; sessionInfo->processOptions = abilityRequest.processOptions; return NotifySCBPendingActivation(sessionInfo, abilityRequest); } diff --git a/services/abilitymgr/src/sub_managers_helper.cpp b/services/abilitymgr/src/sub_managers_helper.cpp new file mode 100644 index 00000000000..29669d11a72 --- /dev/null +++ b/services/abilitymgr/src/sub_managers_helper.cpp @@ -0,0 +1,407 @@ +/* + * Copyright (c) 2024 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "sub_managers_helper.h" + +#include "hilog_tag_wrapper.h" +#include "hitrace_meter.h" +#include "mission_info_mgr.h" +#include "scene_board_judgement.h" +#include "os_account_manager_wrapper.h" + +namespace OHOS { +namespace AAFwk { +constexpr int32_t U0_USER_ID = 0; +constexpr int32_t INVALID_USER_ID = -1; + +SubManagersHelper::SubManagersHelper( + std::shared_ptr taskHandler, std::shared_ptr eventHandler) + : taskHandler_(taskHandler), eventHandler_(eventHandler) {} + +void SubManagersHelper::InitSubManagers(int userId, bool switchUser) +{ + InitConnectManager(userId, switchUser); + InitDataAbilityManager(userId, switchUser); + InitPendWantManager(userId, switchUser); + if (userId != U0_USER_ID) { + if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { + InitUIAbilityManager(userId, switchUser); + } else { + InitMissionListManager(userId, switchUser); + } + } +} + +void SubManagersHelper::InitConnectManager(int32_t userId, bool switchUser) +{ + std::lock_guard lock(managersMutex_); + auto it = connectManagers_.find(userId); + if (it != connectManagers_.end()) { + if (switchUser) { + currentConnectManager_ = it->second; + } + return; + } + auto manager = std::make_shared(userId); + manager->SetTaskHandler(taskHandler_); + manager->SetEventHandler(eventHandler_); + connectManagers_.emplace(userId, manager); + if (switchUser) { + currentConnectManager_ = manager; + } +} + +void SubManagersHelper::InitDataAbilityManager(int32_t userId, bool switchUser) +{ + std::lock_guard lock(managersMutex_); + auto it = dataAbilityManagers_.find(userId); + if (it != dataAbilityManagers_.end()) { + if (switchUser) { + currentDataAbilityManager_ = it->second; + } + return; + } + auto manager = std::make_shared(); + dataAbilityManagers_.emplace(userId, manager); + if (switchUser) { + currentDataAbilityManager_ = manager; + } +} + +void SubManagersHelper::InitPendWantManager(int32_t userId, bool switchUser) +{ + std::lock_guard lock(managersMutex_); + auto it = pendingWantManagers_.find(userId); + if (it != pendingWantManagers_.end()) { + if (switchUser) { + currentPendingWantManager_ = it->second; + } + return; + } + auto manager = std::make_shared(); + pendingWantManagers_.emplace(userId, manager); + if (switchUser) { + currentPendingWantManager_ = manager; + } +} + +void SubManagersHelper::InitMissionListManager(int userId, bool switchUser) +{ + std::lock_guard lock(managersMutex_); + auto it = missionListManagers_.find(userId); + if (it != missionListManagers_.end()) { + if (switchUser) { + DelayedSingleton::GetInstance()->Init(userId); + currentMissionListManager_ = it->second; + } + return; + } + auto manager = std::make_shared(userId); + manager->Init(); + missionListManagers_.emplace(userId, manager); + if (switchUser) { + currentMissionListManager_ = manager; + } +} + +void SubManagersHelper::InitUIAbilityManager(int userId, bool switchUser) +{ + std::lock_guard lock(managersMutex_); + auto it = uiAbilityManagers_.find(userId); + if (it != uiAbilityManagers_.end()) { + if (switchUser) { + currentUIAbilityManager_ = it->second; + } + return; + } + auto manager = std::make_shared(userId); + uiAbilityManagers_.emplace(userId, manager); + if (switchUser) { + currentUIAbilityManager_ = manager; + } +} + +void SubManagersHelper::ClearSubManagers(int userId) +{ + std::lock_guard lock(managersMutex_); + if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { + uiAbilityManagers_.erase(userId); + } else { + missionListManagers_.erase(userId); + } + connectManagers_.erase(userId); + dataAbilityManagers_.erase(userId); + pendingWantManagers_.erase(userId); +} + +std::shared_ptr SubManagersHelper::GetCurrentDataAbilityManager() +{ + std::lock_guard lock(managersMutex_); + return currentDataAbilityManager_; +} + +std::shared_ptr SubManagersHelper::GetDataAbilityManager(const sptr &scheduler) +{ + if (scheduler == nullptr) { + TAG_LOGE(AAFwkTag::ABILITYMGR, "the param ability scheduler is nullptr"); + return nullptr; + } + + std::lock_guard lock(managersMutex_); + for (auto& item: dataAbilityManagers_) { + if (item.second && item.second->ContainsDataAbility(scheduler)) { + return item.second; + } + } + + return nullptr; +} +std::shared_ptr SubManagersHelper::GetDataAbilityManagerByUserId(int32_t userId) +{ + std::lock_guard lock(managersMutex_); + auto it = dataAbilityManagers_.find(userId); + if (it != dataAbilityManagers_.end()) { + return it->second; + } + TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to get Manager. UserId = %{public}d", userId); + return nullptr; +} + +std::shared_ptr SubManagersHelper::GetDataAbilityManagerByToken(const sptr &token) +{ + std::lock_guard lock(managersMutex_); + for (auto& item: dataAbilityManagers_) { + if (item.second && item.second->GetAbilityRecordByToken(token)) { + return item.second; + } + } + + return nullptr; +} + +std::unordered_map> SubManagersHelper::GetConnectManagers() +{ + std::lock_guard lock(managersMutex_); + return connectManagers_; +} + +std::shared_ptr SubManagersHelper::GetCurrentConnectManager() +{ + std::lock_guard lock(managersMutex_); + return currentConnectManager_; +} + +std::shared_ptr SubManagersHelper::GetConnectManagerByUserId(int32_t userId) +{ + std::lock_guard lock(managersMutex_); + auto it = connectManagers_.find(userId); + if (it != connectManagers_.end()) { + return it->second; + } + TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to get Manager. UserId = %{public}d", userId); + return nullptr; +} + +std::shared_ptr SubManagersHelper::GetConnectManagerByToken(const sptr &token) +{ + std::lock_guard lock(managersMutex_); + for (auto& item: connectManagers_) { + if (item.second && item.second->GetExtensionByTokenFromServiceMap(token)) { + return item.second; + } + if (item.second && item.second->GetExtensionByTokenFromTerminatingMap(token)) { + return item.second; + } + } + + return nullptr; +} + +std::shared_ptr SubManagersHelper::GetCurrentPendingWantManager() +{ + std::lock_guard lock(managersMutex_); + return currentPendingWantManager_; +} + +std::shared_ptr SubManagersHelper::GetPendingWantManagerByUserId(int32_t userId) +{ + std::lock_guard lock(managersMutex_); + auto it = pendingWantManagers_.find(userId); + if (it != pendingWantManagers_.end()) { + return it->second; + } + TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to get Manager. UserId = %{public}d", userId); + return nullptr; +} + +std::unordered_map> SubManagersHelper::GetMissionListManagers() +{ + std::lock_guard lock(managersMutex_); + return missionListManagers_; +} + +std::shared_ptr SubManagersHelper::GetCurrentMissionListManager() +{ + std::lock_guard lock(managersMutex_); + return currentMissionListManager_; +} + +std::shared_ptr SubManagersHelper::GetMissionListManagerByUserId(int32_t userId) +{ + std::lock_guard lock(managersMutex_); + auto it = missionListManagers_.find(userId); + if (it != missionListManagers_.end()) { + return it->second; + } + TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to get Manager. UserId = %{public}d", userId); + return nullptr; +} + +std::unordered_map> SubManagersHelper::GetUIAbilityManagers() +{ + std::lock_guard lock(managersMutex_); + return uiAbilityManagers_; +} + +std::shared_ptr SubManagersHelper::GetCurrentUIAbilityManager() +{ + std::lock_guard lock(managersMutex_); + return currentUIAbilityManager_; +} + +std::shared_ptr SubManagersHelper::GetUIAbilityManagerByUserId(int32_t userId) +{ + std::lock_guard lock(managersMutex_); + auto it = uiAbilityManagers_.find(userId); + if (it != uiAbilityManagers_.end()) { + return it->second; + } + TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to get Manager. UserId = %{public}d", userId); + return nullptr; +} + +std::shared_ptr SubManagersHelper::GetUIAbilityManagerByUid(int32_t uid) +{ + int32_t userId = INVALID_USER_ID; + if (DelayedSingleton::GetInstance()->GetOsAccountLocalIdFromUid( + uid, userId) != 0) { + return nullptr; + } + if (userId == U0_USER_ID) { + std::lock_guard lock(managersMutex_); + return currentUIAbilityManager_; + } + return GetUIAbilityManagerByUserId(userId); +} + +void SubManagersHelper::UninstallApp(const std::string &bundleName, int32_t uid) +{ + int32_t userId = INVALID_USER_ID; + if (DelayedSingleton::GetInstance()->GetOsAccountLocalIdFromUid( + uid, userId) != 0) { + return; + } + if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { + UninstallAppInUIAbilityManagers(userId, bundleName, uid); + } else { + UninstallAppInMissionListManagers(userId, bundleName, uid); + } + + auto currentPendingWantManager = GetCurrentPendingWantManager(); + if (currentPendingWantManager) { + currentPendingWantManager->ClearPendingWantRecord(bundleName, uid); + } +} + +void SubManagersHelper::UninstallAppInUIAbilityManagers(int32_t userId, const std::string &bundleName, int32_t uid) +{ + if (userId == U0_USER_ID) { + auto uiAbilityManagers = GetUIAbilityManagers(); + for (auto& item : uiAbilityManagers) { + if (item.second) { + item.second->UninstallApp(bundleName, uid); + } + } + } else { + auto manager = GetUIAbilityManagerByUserId(userId); + if (manager) { + manager->UninstallApp(bundleName, uid); + } + } +} + +void SubManagersHelper::UninstallAppInMissionListManagers(int32_t userId, const std::string &bundleName, int32_t uid) +{ + if (userId == U0_USER_ID) { + auto missionListManagers = GetMissionListManagers(); + for (auto& item : missionListManagers) { + if (item.second) { + item.second->UninstallApp(bundleName, uid); + } + } + } else { + auto listManager = GetMissionListManagerByUserId(userId); + if (listManager) { + listManager->UninstallApp(bundleName, uid); + } + } +} + +bool SubManagersHelper::VerificationAllToken(const sptr &token) +{ + HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); + TAG_LOGD(AAFwkTag::ABILITYMGR, "VerificationAllToken."); + std::lock_guard lock(managersMutex_); + if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { + for (auto& item: uiAbilityManagers_) { + if (item.second && item.second->IsContainsAbility(token)) { + return true; + } + } + } else { + HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, "VerificationAllToken::SearchMissionListManagers"); + for (auto& item: missionListManagers_) { + if (item.second && item.second->GetAbilityRecordByToken(token)) { + return true; + } + if (item.second && item.second->GetAbilityFromTerminateList(token)) { + return true; + } + } + } + { + HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, "VerificationAllToken::SearchDataAbilityManagers_"); + for (auto& item: dataAbilityManagers_) { + if (item.second && item.second->GetAbilityRecordByToken(token)) { + return true; + } + } + } + { + HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, "VerificationAllToken::SearchConnectManagers_"); + for (auto& item: connectManagers_) { + if (item.second && item.second->GetExtensionByTokenFromServiceMap(token)) { + return true; + } + if (item.second && item.second->GetExtensionByTokenFromTerminatingMap(token)) { + return true; + } + } + } + TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to verify all token."); + return false; +} +} // namespace AAFwk +} // namespace OHOS \ No newline at end of file diff --git a/test/fuzztest/abilitymanagerservicec_fuzzer/abilitymanagerservicec_fuzzer.cpp b/test/fuzztest/abilitymanagerservicec_fuzzer/abilitymanagerservicec_fuzzer.cpp index 64f81c14f7e..0631fc3eef7 100755 --- a/test/fuzztest/abilitymanagerservicec_fuzzer/abilitymanagerservicec_fuzzer.cpp +++ b/test/fuzztest/abilitymanagerservicec_fuzzer/abilitymanagerservicec_fuzzer.cpp @@ -82,10 +82,11 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) // fuzz for AbilityManagerService auto abilityms = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); abilityms->PauseOldConnectManager(int32Param); - abilityms->InitConnectManager(int32Param, boolParam); - abilityms->InitDataAbilityManager(int32Param, boolParam); - abilityms->InitPendWantManager(int32Param, boolParam); + abilityms->subManagersHelper_->InitConnectManager(int32Param, boolParam); + abilityms->subManagersHelper_->InitDataAbilityManager(int32Param, boolParam); + abilityms->subManagersHelper_->InitPendWantManager(int32Param, boolParam); abilityms->GetValidUserId(int32Param); sptr abilityController; abilityms->SetAbilityController(abilityController, boolParam); diff --git a/test/fuzztest/abilitymanagerservicethird_fuzzer/abilitymanagerservicethird_fuzzer.cpp b/test/fuzztest/abilitymanagerservicethird_fuzzer/abilitymanagerservicethird_fuzzer.cpp index 6e7a3c4c095..db741cc5c05 100755 --- a/test/fuzztest/abilitymanagerservicethird_fuzzer/abilitymanagerservicethird_fuzzer.cpp +++ b/test/fuzztest/abilitymanagerservicethird_fuzzer/abilitymanagerservicethird_fuzzer.cpp @@ -80,7 +80,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) abilityms->VerificationAllToken(token); sptr scheduler; abilityms->GetDataAbilityManager(scheduler); - abilityms->GetListManagerByUserId(int32Param); + abilityms->GetMissionListManagerByUserId(int32Param); abilityms->GetConnectManagerByUserId(int32Param); abilityms->GetDataAbilityManagerByUserId(int32Param); abilityms->GetConnectManagerByToken(token); diff --git a/test/fuzztest/abilitystubabilityrecovery_fuzzer/abilitystubabilityrecovery_fuzzer.cpp b/test/fuzztest/abilitystubabilityrecovery_fuzzer/abilitystubabilityrecovery_fuzzer.cpp index 40fdc805f33..0536894492f 100644 --- a/test/fuzztest/abilitystubabilityrecovery_fuzzer/abilitystubabilityrecovery_fuzzer.cpp +++ b/test/fuzztest/abilitystubabilityrecovery_fuzzer/abilitystubabilityrecovery_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubabilityrecoveryenable_fuzzer/abilitystubabilityrecoveryenable_fuzzer.cpp b/test/fuzztest/abilitystubabilityrecoveryenable_fuzzer/abilitystubabilityrecoveryenable_fuzzer.cpp index 7b9e9e425bd..b230b13b54b 100644 --- a/test/fuzztest/abilitystubabilityrecoveryenable_fuzzer/abilitystubabilityrecoveryenable_fuzzer.cpp +++ b/test/fuzztest/abilitystubabilityrecoveryenable_fuzzer/abilitystubabilityrecoveryenable_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubabilitytransitiondone_fuzzer/abilitystubabilitytransitiondone_fuzzer.cpp b/test/fuzztest/abilitystubabilitytransitiondone_fuzzer/abilitystubabilitytransitiondone_fuzzer.cpp index 62b5e51218d..af8a421e412 100644 --- a/test/fuzztest/abilitystubabilitytransitiondone_fuzzer/abilitystubabilitytransitiondone_fuzzer.cpp +++ b/test/fuzztest/abilitystubabilitytransitiondone_fuzzer/abilitystubabilitytransitiondone_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubacquiredataability_fuzzer/abilitystubacquiredataability_fuzzer.cpp b/test/fuzztest/abilitystubacquiredataability_fuzzer/abilitystubacquiredataability_fuzzer.cpp index 2499b037ff8..84521a68b55 100644 --- a/test/fuzztest/abilitystubacquiredataability_fuzzer/abilitystubacquiredataability_fuzzer.cpp +++ b/test/fuzztest/abilitystubacquiredataability_fuzzer/abilitystubacquiredataability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubacquiresharedata_fuzzer/abilitystubacquiresharedata_fuzzer.cpp b/test/fuzztest/abilitystubacquiresharedata_fuzzer/abilitystubacquiresharedata_fuzzer.cpp index 57379dafbaf..b03987c4865 100644 --- a/test/fuzztest/abilitystubacquiresharedata_fuzzer/abilitystubacquiresharedata_fuzzer.cpp +++ b/test/fuzztest/abilitystubacquiresharedata_fuzzer/abilitystubacquiresharedata_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubaddfreeinstallobserver_fuzzer/abilitystubaddfreeinstallobserver_fuzzer.cpp b/test/fuzztest/abilitystubaddfreeinstallobserver_fuzzer/abilitystubaddfreeinstallobserver_fuzzer.cpp index d4514ef78c2..87aa6ccc135 100644 --- a/test/fuzztest/abilitystubaddfreeinstallobserver_fuzzer/abilitystubaddfreeinstallobserver_fuzzer.cpp +++ b/test/fuzztest/abilitystubaddfreeinstallobserver_fuzzer/abilitystubaddfreeinstallobserver_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubattachabilitythread_fuzzer/abilitystubattachabilitythread_fuzzer.cpp b/test/fuzztest/abilitystubattachabilitythread_fuzzer/abilitystubattachabilitythread_fuzzer.cpp index 7b1f5b558ed..e207d66b51a 100644 --- a/test/fuzztest/abilitystubattachabilitythread_fuzzer/abilitystubattachabilitythread_fuzzer.cpp +++ b/test/fuzztest/abilitystubattachabilitythread_fuzzer/abilitystubattachabilitythread_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubcallrequestdone_fuzzer/abilitystubcallrequestdone_fuzzer.cpp b/test/fuzztest/abilitystubcallrequestdone_fuzzer/abilitystubcallrequestdone_fuzzer.cpp index 581c083bd11..77e0d7cfc12 100644 --- a/test/fuzztest/abilitystubcallrequestdone_fuzzer/abilitystubcallrequestdone_fuzzer.cpp +++ b/test/fuzztest/abilitystubcallrequestdone_fuzzer/abilitystubcallrequestdone_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubcalluiabilitybyscb_fuzzer/abilitystubcalluiabilitybyscb_fuzzer.cpp b/test/fuzztest/abilitystubcalluiabilitybyscb_fuzzer/abilitystubcalluiabilitybyscb_fuzzer.cpp index d94a5a28790..d6224b65ab7 100644 --- a/test/fuzztest/abilitystubcalluiabilitybyscb_fuzzer/abilitystubcalluiabilitybyscb_fuzzer.cpp +++ b/test/fuzztest/abilitystubcalluiabilitybyscb_fuzzer/abilitystubcalluiabilitybyscb_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubcancelwantsender_fuzzer/abilitystubcancelwantsender_fuzzer.cpp b/test/fuzztest/abilitystubcancelwantsender_fuzzer/abilitystubcancelwantsender_fuzzer.cpp index 9a194c4ab03..68a8b8600ab 100644 --- a/test/fuzztest/abilitystubcancelwantsender_fuzzer/abilitystubcancelwantsender_fuzzer.cpp +++ b/test/fuzztest/abilitystubcancelwantsender_fuzzer/abilitystubcancelwantsender_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubcheckuiextensionisfocused_fuzzer/abilitystubcheckuiextensionisfocused_fuzzer.cpp b/test/fuzztest/abilitystubcheckuiextensionisfocused_fuzzer/abilitystubcheckuiextensionisfocused_fuzzer.cpp index 2ebc2f0b575..0d2a0baaf73 100644 --- a/test/fuzztest/abilitystubcheckuiextensionisfocused_fuzzer/abilitystubcheckuiextensionisfocused_fuzzer.cpp +++ b/test/fuzztest/abilitystubcheckuiextensionisfocused_fuzzer/abilitystubcheckuiextensionisfocused_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubcleanallmissions_fuzzer/abilitystubcleanallmissions_fuzzer.cpp b/test/fuzztest/abilitystubcleanallmissions_fuzzer/abilitystubcleanallmissions_fuzzer.cpp index e9372f33d0e..5a8f0e3ca8f 100644 --- a/test/fuzztest/abilitystubcleanallmissions_fuzzer/abilitystubcleanallmissions_fuzzer.cpp +++ b/test/fuzztest/abilitystubcleanallmissions_fuzzer/abilitystubcleanallmissions_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubcleanmission_fuzzer/abilitystubcleanmission_fuzzer.cpp b/test/fuzztest/abilitystubcleanmission_fuzzer/abilitystubcleanmission_fuzzer.cpp index 55ac2a5e457..eb416684841 100644 --- a/test/fuzztest/abilitystubcleanmission_fuzzer/abilitystubcleanmission_fuzzer.cpp +++ b/test/fuzztest/abilitystubcleanmission_fuzzer/abilitystubcleanmission_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubclearupapplicationdata_fuzzer/abilitystubclearupapplicationdata_fuzzer.cpp b/test/fuzztest/abilitystubclearupapplicationdata_fuzzer/abilitystubclearupapplicationdata_fuzzer.cpp index ba05cfbc97d..c3ccb029873 100644 --- a/test/fuzztest/abilitystubclearupapplicationdata_fuzzer/abilitystubclearupapplicationdata_fuzzer.cpp +++ b/test/fuzztest/abilitystubclearupapplicationdata_fuzzer/abilitystubclearupapplicationdata_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubcloseuiabilitybyscb_fuzzer/abilitystubcloseuiabilitybyscb_fuzzer.cpp b/test/fuzztest/abilitystubcloseuiabilitybyscb_fuzzer/abilitystubcloseuiabilitybyscb_fuzzer.cpp index 4a70af88042..37eab5acba9 100644 --- a/test/fuzztest/abilitystubcloseuiabilitybyscb_fuzzer/abilitystubcloseuiabilitybyscb_fuzzer.cpp +++ b/test/fuzztest/abilitystubcloseuiabilitybyscb_fuzzer/abilitystubcloseuiabilitybyscb_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubcommandabilitydone_fuzzer/abilitystubcommandabilitydone_fuzzer.cpp b/test/fuzztest/abilitystubcommandabilitydone_fuzzer/abilitystubcommandabilitydone_fuzzer.cpp index 7e1e7bb4b94..35d00b90a6d 100644 --- a/test/fuzztest/abilitystubcommandabilitydone_fuzzer/abilitystubcommandabilitydone_fuzzer.cpp +++ b/test/fuzztest/abilitystubcommandabilitydone_fuzzer/abilitystubcommandabilitydone_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubcommandabilitywindowdone_fuzzer/abilitystubcommandabilitywindowdone_fuzzer.cpp b/test/fuzztest/abilitystubcommandabilitywindowdone_fuzzer/abilitystubcommandabilitywindowdone_fuzzer.cpp index 61e46e2acee..051e62b5a54 100644 --- a/test/fuzztest/abilitystubcommandabilitywindowdone_fuzzer/abilitystubcommandabilitywindowdone_fuzzer.cpp +++ b/test/fuzztest/abilitystubcommandabilitywindowdone_fuzzer/abilitystubcommandabilitywindowdone_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubcompletefirstframedrawing_fuzzer/abilitystubcompletefirstframedrawing_fuzzer.cpp b/test/fuzztest/abilitystubcompletefirstframedrawing_fuzzer/abilitystubcompletefirstframedrawing_fuzzer.cpp index 352b9cbaa3f..17a87f4bbd0 100644 --- a/test/fuzztest/abilitystubcompletefirstframedrawing_fuzzer/abilitystubcompletefirstframedrawing_fuzzer.cpp +++ b/test/fuzztest/abilitystubcompletefirstframedrawing_fuzzer/abilitystubcompletefirstframedrawing_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubconnectability_fuzzer/abilitystubconnectability_fuzzer.cpp b/test/fuzztest/abilitystubconnectability_fuzzer/abilitystubconnectability_fuzzer.cpp index 7e319d8be8f..330fc2488e5 100644 --- a/test/fuzztest/abilitystubconnectability_fuzzer/abilitystubconnectability_fuzzer.cpp +++ b/test/fuzztest/abilitystubconnectability_fuzzer/abilitystubconnectability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubconnectabilitydone_fuzzer/abilitystubconnectabilitydone_fuzzer.cpp b/test/fuzztest/abilitystubconnectabilitydone_fuzzer/abilitystubconnectabilitydone_fuzzer.cpp index cb0f4038e4c..a248d259e13 100644 --- a/test/fuzztest/abilitystubconnectabilitydone_fuzzer/abilitystubconnectabilitydone_fuzzer.cpp +++ b/test/fuzztest/abilitystubconnectabilitydone_fuzzer/abilitystubconnectabilitydone_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubconnectabilitywithtype_fuzzer/abilitystubconnectabilitywithtype_fuzzer.cpp b/test/fuzztest/abilitystubconnectabilitywithtype_fuzzer/abilitystubconnectabilitywithtype_fuzzer.cpp index 281fbfbb299..d87d323fed6 100644 --- a/test/fuzztest/abilitystubconnectabilitywithtype_fuzzer/abilitystubconnectabilitywithtype_fuzzer.cpp +++ b/test/fuzztest/abilitystubconnectabilitywithtype_fuzzer/abilitystubconnectabilitywithtype_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubconnectuiextensionability_fuzzer/abilitystubconnectuiextensionability_fuzzer.cpp b/test/fuzztest/abilitystubconnectuiextensionability_fuzzer/abilitystubconnectuiextensionability_fuzzer.cpp index 63f81529004..1054845b4cc 100644 --- a/test/fuzztest/abilitystubconnectuiextensionability_fuzzer/abilitystubconnectuiextensionability_fuzzer.cpp +++ b/test/fuzztest/abilitystubconnectuiextensionability_fuzzer/abilitystubconnectuiextensionability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubcontinueability_fuzzer/abilitystubcontinueability_fuzzer.cpp b/test/fuzztest/abilitystubcontinueability_fuzzer/abilitystubcontinueability_fuzzer.cpp index e73199d20c6..223674ab470 100644 --- a/test/fuzztest/abilitystubcontinueability_fuzzer/abilitystubcontinueability_fuzzer.cpp +++ b/test/fuzztest/abilitystubcontinueability_fuzzer/abilitystubcontinueability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubcontinuemission_fuzzer/abilitystubcontinuemission_fuzzer.cpp b/test/fuzztest/abilitystubcontinuemission_fuzzer/abilitystubcontinuemission_fuzzer.cpp index 1ae16ab2ec8..54100dbfdf1 100644 --- a/test/fuzztest/abilitystubcontinuemission_fuzzer/abilitystubcontinuemission_fuzzer.cpp +++ b/test/fuzztest/abilitystubcontinuemission_fuzzer/abilitystubcontinuemission_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubcontinuemissionofbundlename_fuzzer/abilitystubcontinuemissionofbundlename_fuzzer.cpp b/test/fuzztest/abilitystubcontinuemissionofbundlename_fuzzer/abilitystubcontinuemissionofbundlename_fuzzer.cpp index e052ea65f84..f23267263d5 100644 --- a/test/fuzztest/abilitystubcontinuemissionofbundlename_fuzzer/abilitystubcontinuemissionofbundlename_fuzzer.cpp +++ b/test/fuzztest/abilitystubcontinuemissionofbundlename_fuzzer/abilitystubcontinuemissionofbundlename_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubdelegatordoabilitybackground_fuzzer/abilitystubdelegatordoabilitybackground_fuzzer.cpp b/test/fuzztest/abilitystubdelegatordoabilitybackground_fuzzer/abilitystubdelegatordoabilitybackground_fuzzer.cpp index c73484d7eef..d7942c267cf 100644 --- a/test/fuzztest/abilitystubdelegatordoabilitybackground_fuzzer/abilitystubdelegatordoabilitybackground_fuzzer.cpp +++ b/test/fuzztest/abilitystubdelegatordoabilitybackground_fuzzer/abilitystubdelegatordoabilitybackground_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubdelegatordoabilityforeground_fuzzer/abilitystubdelegatordoabilityforeground_fuzzer.cpp b/test/fuzztest/abilitystubdelegatordoabilityforeground_fuzzer/abilitystubdelegatordoabilityforeground_fuzzer.cpp index b12aaafd69b..ff92f8f093f 100644 --- a/test/fuzztest/abilitystubdelegatordoabilityforeground_fuzzer/abilitystubdelegatordoabilityforeground_fuzzer.cpp +++ b/test/fuzztest/abilitystubdelegatordoabilityforeground_fuzzer/abilitystubdelegatordoabilityforeground_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubdisconnectability_fuzzer/abilitystubdisconnectability_fuzzer.cpp b/test/fuzztest/abilitystubdisconnectability_fuzzer/abilitystubdisconnectability_fuzzer.cpp index 34cb791f95c..88bc1256867 100644 --- a/test/fuzztest/abilitystubdisconnectability_fuzzer/abilitystubdisconnectability_fuzzer.cpp +++ b/test/fuzztest/abilitystubdisconnectability_fuzzer/abilitystubdisconnectability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubdisconnectabilitydone_fuzzer/abilitystubdisconnectabilitydone_fuzzer.cpp b/test/fuzztest/abilitystubdisconnectabilitydone_fuzzer/abilitystubdisconnectabilitydone_fuzzer.cpp index 6bc62bb79c7..b23c1d53220 100644 --- a/test/fuzztest/abilitystubdisconnectabilitydone_fuzzer/abilitystubdisconnectabilitydone_fuzzer.cpp +++ b/test/fuzztest/abilitystubdisconnectabilitydone_fuzzer/abilitystubdisconnectabilitydone_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubdoabilitybackground_fuzzer/abilitystubdoabilitybackground_fuzzer.cpp b/test/fuzztest/abilitystubdoabilitybackground_fuzzer/abilitystubdoabilitybackground_fuzzer.cpp index 5b7e9a1ceea..7ecb7e571c8 100644 --- a/test/fuzztest/abilitystubdoabilitybackground_fuzzer/abilitystubdoabilitybackground_fuzzer.cpp +++ b/test/fuzztest/abilitystubdoabilitybackground_fuzzer/abilitystubdoabilitybackground_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubdoabilityforeground_fuzzer/abilitystubdoabilityforeground_fuzzer.cpp b/test/fuzztest/abilitystubdoabilityforeground_fuzzer/abilitystubdoabilityforeground_fuzzer.cpp index 436dc0113c7..9b39bc96914 100644 --- a/test/fuzztest/abilitystubdoabilityforeground_fuzzer/abilitystubdoabilityforeground_fuzzer.cpp +++ b/test/fuzztest/abilitystubdoabilityforeground_fuzzer/abilitystubdoabilityforeground_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubdumpabilityinfodone_fuzzer/abilitystubdumpabilityinfodone_fuzzer.cpp b/test/fuzztest/abilitystubdumpabilityinfodone_fuzzer/abilitystubdumpabilityinfodone_fuzzer.cpp index 07c8acbaca2..46f5a45a82f 100644 --- a/test/fuzztest/abilitystubdumpabilityinfodone_fuzzer/abilitystubdumpabilityinfodone_fuzzer.cpp +++ b/test/fuzztest/abilitystubdumpabilityinfodone_fuzzer/abilitystubdumpabilityinfodone_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubdumpstate_fuzzer/abilitystubdumpstate_fuzzer.cpp b/test/fuzztest/abilitystubdumpstate_fuzzer/abilitystubdumpstate_fuzzer.cpp index f22fe81710f..1c7e8d2bb24 100644 --- a/test/fuzztest/abilitystubdumpstate_fuzzer/abilitystubdumpstate_fuzzer.cpp +++ b/test/fuzztest/abilitystubdumpstate_fuzzer/abilitystubdumpstate_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubdumpsysstate_fuzzer/abilitystubdumpsysstate_fuzzer.cpp b/test/fuzztest/abilitystubdumpsysstate_fuzzer/abilitystubdumpsysstate_fuzzer.cpp index 41493ab21f1..224e38f043a 100644 --- a/test/fuzztest/abilitystubdumpsysstate_fuzzer/abilitystubdumpsysstate_fuzzer.cpp +++ b/test/fuzztest/abilitystubdumpsysstate_fuzzer/abilitystubdumpsysstate_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubfinishusertest_fuzzer/abilitystubfinishusertest_fuzzer.cpp b/test/fuzztest/abilitystubfinishusertest_fuzzer/abilitystubfinishusertest_fuzzer.cpp index 8ac4d582d6c..d066cb42abd 100644 --- a/test/fuzztest/abilitystubfinishusertest_fuzzer/abilitystubfinishusertest_fuzzer.cpp +++ b/test/fuzztest/abilitystubfinishusertest_fuzzer/abilitystubfinishusertest_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubforceexitapp_fuzzer/abilitystubforceexitapp_fuzzer.cpp b/test/fuzztest/abilitystubforceexitapp_fuzzer/abilitystubforceexitapp_fuzzer.cpp index abd4fafa000..ac3236a5ad4 100644 --- a/test/fuzztest/abilitystubforceexitapp_fuzzer/abilitystubforceexitapp_fuzzer.cpp +++ b/test/fuzztest/abilitystubforceexitapp_fuzzer/abilitystubforceexitapp_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubfreeinstallabilityfromremote_fuzzer/abilitystubfreeinstallabilityfromremote_fuzzer.cpp b/test/fuzztest/abilitystubfreeinstallabilityfromremote_fuzzer/abilitystubfreeinstallabilityfromremote_fuzzer.cpp index 33476a23267..a85902fe556 100644 --- a/test/fuzztest/abilitystubfreeinstallabilityfromremote_fuzzer/abilitystubfreeinstallabilityfromremote_fuzzer.cpp +++ b/test/fuzztest/abilitystubfreeinstallabilityfromremote_fuzzer/abilitystubfreeinstallabilityfromremote_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetabilityrunninginfo_fuzzer/abilitystubgetabilityrunninginfo_fuzzer.cpp b/test/fuzztest/abilitystubgetabilityrunninginfo_fuzzer/abilitystubgetabilityrunninginfo_fuzzer.cpp index 7ece3129e61..45d7432f4ce 100644 --- a/test/fuzztest/abilitystubgetabilityrunninginfo_fuzzer/abilitystubgetabilityrunninginfo_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetabilityrunninginfo_fuzzer/abilitystubgetabilityrunninginfo_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetabilitytoken_fuzzer/abilitystubgetabilitytoken_fuzzer.cpp b/test/fuzztest/abilitystubgetabilitytoken_fuzzer/abilitystubgetabilitytoken_fuzzer.cpp index 7d5e26740c9..25b3f49de18 100644 --- a/test/fuzztest/abilitystubgetabilitytoken_fuzzer/abilitystubgetabilitytoken_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetabilitytoken_fuzzer/abilitystubgetabilitytoken_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetappmemorysize_fuzzer/abilitystubgetappmemorysize_fuzzer.cpp b/test/fuzztest/abilitystubgetappmemorysize_fuzzer/abilitystubgetappmemorysize_fuzzer.cpp index 4893ac46baf..9b449284433 100644 --- a/test/fuzztest/abilitystubgetappmemorysize_fuzzer/abilitystubgetappmemorysize_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetappmemorysize_fuzzer/abilitystubgetappmemorysize_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetdlpconnectioninfos_fuzzer/abilitystubgetdlpconnectioninfos_fuzzer.cpp b/test/fuzztest/abilitystubgetdlpconnectioninfos_fuzzer/abilitystubgetdlpconnectioninfos_fuzzer.cpp index 24b46080435..d197bff817e 100644 --- a/test/fuzztest/abilitystubgetdlpconnectioninfos_fuzzer/abilitystubgetdlpconnectioninfos_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetdlpconnectioninfos_fuzzer/abilitystubgetdlpconnectioninfos_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetelementnamebytoken_fuzzer/abilitystubgetelementnamebytoken_fuzzer.cpp b/test/fuzztest/abilitystubgetelementnamebytoken_fuzzer/abilitystubgetelementnamebytoken_fuzzer.cpp index e505ed2c903..4cbd2eb0206 100644 --- a/test/fuzztest/abilitystubgetelementnamebytoken_fuzzer/abilitystubgetelementnamebytoken_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetelementnamebytoken_fuzzer/abilitystubgetelementnamebytoken_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetextensionrunninginfo_fuzzer/abilitystubgetextensionrunninginfo_fuzzer.cpp b/test/fuzztest/abilitystubgetextensionrunninginfo_fuzzer/abilitystubgetextensionrunninginfo_fuzzer.cpp index e01b07b377d..e7ddcb37d28 100644 --- a/test/fuzztest/abilitystubgetextensionrunninginfo_fuzzer/abilitystubgetextensionrunninginfo_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetextensionrunninginfo_fuzzer/abilitystubgetextensionrunninginfo_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetmissionidbytoken_fuzzer/abilitystubgetmissionidbytoken_fuzzer.cpp b/test/fuzztest/abilitystubgetmissionidbytoken_fuzzer/abilitystubgetmissionidbytoken_fuzzer.cpp index 0fd6ac4294b..743376663dc 100644 --- a/test/fuzztest/abilitystubgetmissionidbytoken_fuzzer/abilitystubgetmissionidbytoken_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetmissionidbytoken_fuzzer/abilitystubgetmissionidbytoken_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetmissioninfo_fuzzer/abilitystubgetmissioninfo_fuzzer.cpp b/test/fuzztest/abilitystubgetmissioninfo_fuzzer/abilitystubgetmissioninfo_fuzzer.cpp index e445f658f81..95402837c4c 100644 --- a/test/fuzztest/abilitystubgetmissioninfo_fuzzer/abilitystubgetmissioninfo_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetmissioninfo_fuzzer/abilitystubgetmissioninfo_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetmissioninfos_fuzzer/abilitystubgetmissioninfos_fuzzer.cpp b/test/fuzztest/abilitystubgetmissioninfos_fuzzer/abilitystubgetmissioninfos_fuzzer.cpp index bda5004c68f..da4db4cf07b 100644 --- a/test/fuzztest/abilitystubgetmissioninfos_fuzzer/abilitystubgetmissioninfos_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetmissioninfos_fuzzer/abilitystubgetmissioninfos_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetmissionsnapshotinfo_fuzzer/abilitystubgetmissionsnapshotinfo_fuzzer.cpp b/test/fuzztest/abilitystubgetmissionsnapshotinfo_fuzzer/abilitystubgetmissionsnapshotinfo_fuzzer.cpp index 45e5a5e5562..4dbc0be4f1d 100644 --- a/test/fuzztest/abilitystubgetmissionsnapshotinfo_fuzzer/abilitystubgetmissionsnapshotinfo_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetmissionsnapshotinfo_fuzzer/abilitystubgetmissionsnapshotinfo_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetpendingrequestwant_fuzzer/abilitystubgetpendingrequestwant_fuzzer.cpp b/test/fuzztest/abilitystubgetpendingrequestwant_fuzzer/abilitystubgetpendingrequestwant_fuzzer.cpp index f4263a3752c..90796cb9eaa 100644 --- a/test/fuzztest/abilitystubgetpendingrequestwant_fuzzer/abilitystubgetpendingrequestwant_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetpendingrequestwant_fuzzer/abilitystubgetpendingrequestwant_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetpendingwantbundlename_fuzzer/abilitystubgetpendingwantbundlename_fuzzer.cpp b/test/fuzztest/abilitystubgetpendingwantbundlename_fuzzer/abilitystubgetpendingwantbundlename_fuzzer.cpp index 3534fc486a8..09a80e22463 100644 --- a/test/fuzztest/abilitystubgetpendingwantbundlename_fuzzer/abilitystubgetpendingwantbundlename_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetpendingwantbundlename_fuzzer/abilitystubgetpendingwantbundlename_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetpendingwantcode_fuzzer/abilitystubgetpendingwantcode_fuzzer.cpp b/test/fuzztest/abilitystubgetpendingwantcode_fuzzer/abilitystubgetpendingwantcode_fuzzer.cpp index fd45935ce15..4fdc2c1975a 100644 --- a/test/fuzztest/abilitystubgetpendingwantcode_fuzzer/abilitystubgetpendingwantcode_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetpendingwantcode_fuzzer/abilitystubgetpendingwantcode_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetpendingwanttype_fuzzer/abilitystubgetpendingwanttype_fuzzer.cpp b/test/fuzztest/abilitystubgetpendingwanttype_fuzzer/abilitystubgetpendingwanttype_fuzzer.cpp index 3504e5be7e1..b521853d4f6 100644 --- a/test/fuzztest/abilitystubgetpendingwanttype_fuzzer/abilitystubgetpendingwanttype_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetpendingwanttype_fuzzer/abilitystubgetpendingwanttype_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetpendingwantuid_fuzzer/abilitystubgetpendingwantuid_fuzzer.cpp b/test/fuzztest/abilitystubgetpendingwantuid_fuzzer/abilitystubgetpendingwantuid_fuzzer.cpp index d4bf75f2a66..02c97c3a248 100644 --- a/test/fuzztest/abilitystubgetpendingwantuid_fuzzer/abilitystubgetpendingwantuid_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetpendingwantuid_fuzzer/abilitystubgetpendingwantuid_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetpendingwantuserid_fuzzer/abilitystubgetpendingwantuserid_fuzzer.cpp b/test/fuzztest/abilitystubgetpendingwantuserid_fuzzer/abilitystubgetpendingwantuserid_fuzzer.cpp index ba21c39665f..4fbd0d836f6 100644 --- a/test/fuzztest/abilitystubgetpendingwantuserid_fuzzer/abilitystubgetpendingwantuserid_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetpendingwantuserid_fuzzer/abilitystubgetpendingwantuserid_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetprocessrunninginfo_fuzzer/abilitystubgetprocessrunninginfo_fuzzer.cpp b/test/fuzztest/abilitystubgetprocessrunninginfo_fuzzer/abilitystubgetprocessrunninginfo_fuzzer.cpp index 03a8affce68..795fa37c3d7 100644 --- a/test/fuzztest/abilitystubgetprocessrunninginfo_fuzzer/abilitystubgetprocessrunninginfo_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetprocessrunninginfo_fuzzer/abilitystubgetprocessrunninginfo_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgettopability_fuzzer/abilitystubgettopability_fuzzer.cpp b/test/fuzztest/abilitystubgettopability_fuzzer/abilitystubgettopability_fuzzer.cpp index 66def0681d1..49e2cc2237b 100644 --- a/test/fuzztest/abilitystubgettopability_fuzzer/abilitystubgettopability_fuzzer.cpp +++ b/test/fuzztest/abilitystubgettopability_fuzzer/abilitystubgettopability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgettopabilitytoken_fuzzer/abilitystubgettopabilitytoken_fuzzer.cpp b/test/fuzztest/abilitystubgettopabilitytoken_fuzzer/abilitystubgettopabilitytoken_fuzzer.cpp index ac137f4a719..23042e08304 100644 --- a/test/fuzztest/abilitystubgettopabilitytoken_fuzzer/abilitystubgettopabilitytoken_fuzzer.cpp +++ b/test/fuzztest/abilitystubgettopabilitytoken_fuzzer/abilitystubgettopabilitytoken_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetwantsender_fuzzer/abilitystubgetwantsender_fuzzer.cpp b/test/fuzztest/abilitystubgetwantsender_fuzzer/abilitystubgetwantsender_fuzzer.cpp index de77ec0686f..941eecb22ca 100644 --- a/test/fuzztest/abilitystubgetwantsender_fuzzer/abilitystubgetwantsender_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetwantsender_fuzzer/abilitystubgetwantsender_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubgetwantsendinfo_fuzzer/abilitystubgetwantsendinfo_fuzzer.cpp b/test/fuzztest/abilitystubgetwantsendinfo_fuzzer/abilitystubgetwantsendinfo_fuzzer.cpp index 9d44caeef44..a5848d13dc6 100644 --- a/test/fuzztest/abilitystubgetwantsendinfo_fuzzer/abilitystubgetwantsendinfo_fuzzer.cpp +++ b/test/fuzztest/abilitystubgetwantsendinfo_fuzzer/abilitystubgetwantsendinfo_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubisramconstraineddevice_fuzzer/abilitystubisramconstraineddevice_fuzzer.cpp b/test/fuzztest/abilitystubisramconstraineddevice_fuzzer/abilitystubisramconstraineddevice_fuzzer.cpp index d9f3203331e..188164fdfdf 100644 --- a/test/fuzztest/abilitystubisramconstraineddevice_fuzzer/abilitystubisramconstraineddevice_fuzzer.cpp +++ b/test/fuzztest/abilitystubisramconstraineddevice_fuzzer/abilitystubisramconstraineddevice_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubisrunninginstabilitytest_fuzzer/abilitystubisrunninginstabilitytest_fuzzer.cpp b/test/fuzztest/abilitystubisrunninginstabilitytest_fuzzer/abilitystubisrunninginstabilitytest_fuzzer.cpp index 7d1eecc53cd..1a389d7fefe 100644 --- a/test/fuzztest/abilitystubisrunninginstabilitytest_fuzzer/abilitystubisrunninginstabilitytest_fuzzer.cpp +++ b/test/fuzztest/abilitystubisrunninginstabilitytest_fuzzer/abilitystubisrunninginstabilitytest_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubkillprocess_fuzzer/abilitystubkillprocess_fuzzer.cpp b/test/fuzztest/abilitystubkillprocess_fuzzer/abilitystubkillprocess_fuzzer.cpp index 63b8f046caa..5a4825e0511 100644 --- a/test/fuzztest/abilitystubkillprocess_fuzzer/abilitystubkillprocess_fuzzer.cpp +++ b/test/fuzztest/abilitystubkillprocess_fuzzer/abilitystubkillprocess_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystublockmissionforcleanup_fuzzer/abilitystublockmissionforcleanup_fuzzer.cpp b/test/fuzztest/abilitystublockmissionforcleanup_fuzzer/abilitystublockmissionforcleanup_fuzzer.cpp index 217ccaaf11f..3b67acaa55b 100644 --- a/test/fuzztest/abilitystublockmissionforcleanup_fuzzer/abilitystublockmissionforcleanup_fuzzer.cpp +++ b/test/fuzztest/abilitystublockmissionforcleanup_fuzzer/abilitystublockmissionforcleanup_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubminimizeability_fuzzer/abilitystubminimizeability_fuzzer.cpp b/test/fuzztest/abilitystubminimizeability_fuzzer/abilitystubminimizeability_fuzzer.cpp index fc8f185a10e..e03a560450d 100644 --- a/test/fuzztest/abilitystubminimizeability_fuzzer/abilitystubminimizeability_fuzzer.cpp +++ b/test/fuzztest/abilitystubminimizeability_fuzzer/abilitystubminimizeability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubminimizeuiabilitybyscb_fuzzer/abilitystubminimizeuiabilitybyscb_fuzzer.cpp b/test/fuzztest/abilitystubminimizeuiabilitybyscb_fuzzer/abilitystubminimizeuiabilitybyscb_fuzzer.cpp index 9f59b710d36..8dcf3e7fdc8 100644 --- a/test/fuzztest/abilitystubminimizeuiabilitybyscb_fuzzer/abilitystubminimizeuiabilitybyscb_fuzzer.cpp +++ b/test/fuzztest/abilitystubminimizeuiabilitybyscb_fuzzer/abilitystubminimizeuiabilitybyscb_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubminimizeuiextensionability_fuzzer/abilitystubminimizeuiextensionability_fuzzer.cpp b/test/fuzztest/abilitystubminimizeuiextensionability_fuzzer/abilitystubminimizeuiextensionability_fuzzer.cpp index 5e51fc7fd70..2b747240029 100644 --- a/test/fuzztest/abilitystubminimizeuiextensionability_fuzzer/abilitystubminimizeuiextensionability_fuzzer.cpp +++ b/test/fuzztest/abilitystubminimizeuiextensionability_fuzzer/abilitystubminimizeuiextensionability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubmoveabilitytobackground_fuzzer/abilitystubmoveabilitytobackground_fuzzer.cpp b/test/fuzztest/abilitystubmoveabilitytobackground_fuzzer/abilitystubmoveabilitytobackground_fuzzer.cpp index aa16b29be26..abbc8a9dcfe 100644 --- a/test/fuzztest/abilitystubmoveabilitytobackground_fuzzer/abilitystubmoveabilitytobackground_fuzzer.cpp +++ b/test/fuzztest/abilitystubmoveabilitytobackground_fuzzer/abilitystubmoveabilitytobackground_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubmovemissionstobackground_fuzzer/abilitystubmovemissionstobackground_fuzzer.cpp b/test/fuzztest/abilitystubmovemissionstobackground_fuzzer/abilitystubmovemissionstobackground_fuzzer.cpp index 4e668d542d0..3f1c9d7b236 100644 --- a/test/fuzztest/abilitystubmovemissionstobackground_fuzzer/abilitystubmovemissionstobackground_fuzzer.cpp +++ b/test/fuzztest/abilitystubmovemissionstobackground_fuzzer/abilitystubmovemissionstobackground_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubmovemissionstoforeground_fuzzer/abilitystubmovemissionstoforeground_fuzzer.cpp b/test/fuzztest/abilitystubmovemissionstoforeground_fuzzer/abilitystubmovemissionstoforeground_fuzzer.cpp index 8ea60a6bc39..5ca710ff859 100644 --- a/test/fuzztest/abilitystubmovemissionstoforeground_fuzzer/abilitystubmovemissionstoforeground_fuzzer.cpp +++ b/test/fuzztest/abilitystubmovemissionstoforeground_fuzzer/abilitystubmovemissionstoforeground_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubmovemissiontofront_fuzzer/abilitystubmovemissiontofront_fuzzer.cpp b/test/fuzztest/abilitystubmovemissiontofront_fuzzer/abilitystubmovemissiontofront_fuzzer.cpp index 7972e2349d9..96795adef86 100644 --- a/test/fuzztest/abilitystubmovemissiontofront_fuzzer/abilitystubmovemissiontofront_fuzzer.cpp +++ b/test/fuzztest/abilitystubmovemissiontofront_fuzzer/abilitystubmovemissiontofront_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubmovemissiontofrontbyoptions_fuzzer/abilitystubmovemissiontofrontbyoptions_fuzzer.cpp b/test/fuzztest/abilitystubmovemissiontofrontbyoptions_fuzzer/abilitystubmovemissiontofrontbyoptions_fuzzer.cpp index 74c4efecacc..6a9a4cd9683 100644 --- a/test/fuzztest/abilitystubmovemissiontofrontbyoptions_fuzzer/abilitystubmovemissiontofrontbyoptions_fuzzer.cpp +++ b/test/fuzztest/abilitystubmovemissiontofrontbyoptions_fuzzer/abilitystubmovemissiontofrontbyoptions_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubnotifycompletecontinuation_fuzzer/abilitystubnotifycompletecontinuation_fuzzer.cpp b/test/fuzztest/abilitystubnotifycompletecontinuation_fuzzer/abilitystubnotifycompletecontinuation_fuzzer.cpp index bf57f822a8d..22c8b86db04 100644 --- a/test/fuzztest/abilitystubnotifycompletecontinuation_fuzzer/abilitystubnotifycompletecontinuation_fuzzer.cpp +++ b/test/fuzztest/abilitystubnotifycompletecontinuation_fuzzer/abilitystubnotifycompletecontinuation_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubnotifycontinuationresult_fuzzer/abilitystubnotifycontinuationresult_fuzzer.cpp b/test/fuzztest/abilitystubnotifycontinuationresult_fuzzer/abilitystubnotifycontinuationresult_fuzzer.cpp index 16958cb5958..ef687bba094 100644 --- a/test/fuzztest/abilitystubnotifycontinuationresult_fuzzer/abilitystubnotifycontinuationresult_fuzzer.cpp +++ b/test/fuzztest/abilitystubnotifycontinuationresult_fuzzer/abilitystubnotifycontinuationresult_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubnotifysaveasresult_fuzzer/abilitystubnotifysaveasresult_fuzzer.cpp b/test/fuzztest/abilitystubnotifysaveasresult_fuzzer/abilitystubnotifysaveasresult_fuzzer.cpp index 24a77229e4b..f897bcc760b 100644 --- a/test/fuzztest/abilitystubnotifysaveasresult_fuzzer/abilitystubnotifysaveasresult_fuzzer.cpp +++ b/test/fuzztest/abilitystubnotifysaveasresult_fuzzer/abilitystubnotifysaveasresult_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubprepareterminateability_fuzzer/abilitystubprepareterminateability_fuzzer.cpp b/test/fuzztest/abilitystubprepareterminateability_fuzzer/abilitystubprepareterminateability_fuzzer.cpp index ba092ca659a..bc8b92b527a 100644 --- a/test/fuzztest/abilitystubprepareterminateability_fuzzer/abilitystubprepareterminateability_fuzzer.cpp +++ b/test/fuzztest/abilitystubprepareterminateability_fuzzer/abilitystubprepareterminateability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubquerymissionvaild_fuzzer/abilitystubquerymissionvaild_fuzzer.cpp b/test/fuzztest/abilitystubquerymissionvaild_fuzzer/abilitystubquerymissionvaild_fuzzer.cpp index b7b6c29caee..7d6fa7559f1 100644 --- a/test/fuzztest/abilitystubquerymissionvaild_fuzzer/abilitystubquerymissionvaild_fuzzer.cpp +++ b/test/fuzztest/abilitystubquerymissionvaild_fuzzer/abilitystubquerymissionvaild_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubrecordappexitreason_fuzzer/abilitystubrecordappexitreason_fuzzer.cpp b/test/fuzztest/abilitystubrecordappexitreason_fuzzer/abilitystubrecordappexitreason_fuzzer.cpp index dc2197fbe1a..f2411ff9e47 100644 --- a/test/fuzztest/abilitystubrecordappexitreason_fuzzer/abilitystubrecordappexitreason_fuzzer.cpp +++ b/test/fuzztest/abilitystubrecordappexitreason_fuzzer/abilitystubrecordappexitreason_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubregistercancellistener_fuzzer/abilitystubregistercancellistener_fuzzer.cpp b/test/fuzztest/abilitystubregistercancellistener_fuzzer/abilitystubregistercancellistener_fuzzer.cpp index 79efd95e268..92b32a47172 100644 --- a/test/fuzztest/abilitystubregistercancellistener_fuzzer/abilitystubregistercancellistener_fuzzer.cpp +++ b/test/fuzztest/abilitystubregistercancellistener_fuzzer/abilitystubregistercancellistener_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubregistercollaborator_fuzzer/abilitystubregistercollaborator_fuzzer.cpp b/test/fuzztest/abilitystubregistercollaborator_fuzzer/abilitystubregistercollaborator_fuzzer.cpp index f655f8d4410..88a5bdb9509 100644 --- a/test/fuzztest/abilitystubregistercollaborator_fuzzer/abilitystubregistercollaborator_fuzzer.cpp +++ b/test/fuzztest/abilitystubregistercollaborator_fuzzer/abilitystubregistercollaborator_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubregisterconnectionobserver_fuzzer/abilitystubregisterconnectionobserver_fuzzer.cpp b/test/fuzztest/abilitystubregisterconnectionobserver_fuzzer/abilitystubregisterconnectionobserver_fuzzer.cpp index e9eb084faaf..80f32a48a96 100644 --- a/test/fuzztest/abilitystubregisterconnectionobserver_fuzzer/abilitystubregisterconnectionobserver_fuzzer.cpp +++ b/test/fuzztest/abilitystubregisterconnectionobserver_fuzzer/abilitystubregisterconnectionobserver_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubregistermissionlistener_fuzzer/abilitystubregistermissionlistener_fuzzer.cpp b/test/fuzztest/abilitystubregistermissionlistener_fuzzer/abilitystubregistermissionlistener_fuzzer.cpp index 0e234b499cd..aef2a793e45 100644 --- a/test/fuzztest/abilitystubregistermissionlistener_fuzzer/abilitystubregistermissionlistener_fuzzer.cpp +++ b/test/fuzztest/abilitystubregistermissionlistener_fuzzer/abilitystubregistermissionlistener_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubregisterremotemissionlistener_fuzzer/abilitystubregisterremotemissionlistener_fuzzer.cpp b/test/fuzztest/abilitystubregisterremotemissionlistener_fuzzer/abilitystubregisterremotemissionlistener_fuzzer.cpp index 8097b3c3955..00b19fadb23 100644 --- a/test/fuzztest/abilitystubregisterremotemissionlistener_fuzzer/abilitystubregisterremotemissionlistener_fuzzer.cpp +++ b/test/fuzztest/abilitystubregisterremotemissionlistener_fuzzer/abilitystubregisterremotemissionlistener_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubregisterremoteofflistener_fuzzer/abilitystubregisterremoteofflistener_fuzzer.cpp b/test/fuzztest/abilitystubregisterremoteofflistener_fuzzer/abilitystubregisterremoteofflistener_fuzzer.cpp index 671684c2789..5d4173d43db 100644 --- a/test/fuzztest/abilitystubregisterremoteofflistener_fuzzer/abilitystubregisterremoteofflistener_fuzzer.cpp +++ b/test/fuzztest/abilitystubregisterremoteofflistener_fuzzer/abilitystubregisterremoteofflistener_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubregisterremoteonlistener_fuzzer/abilitystubregisterremoteonlistener_fuzzer.cpp b/test/fuzztest/abilitystubregisterremoteonlistener_fuzzer/abilitystubregisterremoteonlistener_fuzzer.cpp index e0f58a033cf..48b2a0339fb 100644 --- a/test/fuzztest/abilitystubregisterremoteonlistener_fuzzer/abilitystubregisterremoteonlistener_fuzzer.cpp +++ b/test/fuzztest/abilitystubregisterremoteonlistener_fuzzer/abilitystubregisterremoteonlistener_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubregisterwmshandler_fuzzer/abilitystubregisterwmshandler_fuzzer.cpp b/test/fuzztest/abilitystubregisterwmshandler_fuzzer/abilitystubregisterwmshandler_fuzzer.cpp index 28dec573382..6b9e24f7c67 100644 --- a/test/fuzztest/abilitystubregisterwmshandler_fuzzer/abilitystubregisterwmshandler_fuzzer.cpp +++ b/test/fuzztest/abilitystubregisterwmshandler_fuzzer/abilitystubregisterwmshandler_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubreleasecallability_fuzzer/abilitystubreleasecallability_fuzzer.cpp b/test/fuzztest/abilitystubreleasecallability_fuzzer/abilitystubreleasecallability_fuzzer.cpp index 9d41acac454..ea99e372817 100644 --- a/test/fuzztest/abilitystubreleasecallability_fuzzer/abilitystubreleasecallability_fuzzer.cpp +++ b/test/fuzztest/abilitystubreleasecallability_fuzzer/abilitystubreleasecallability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubreleasedataability_fuzzer/abilitystubreleasedataability_fuzzer.cpp b/test/fuzztest/abilitystubreleasedataability_fuzzer/abilitystubreleasedataability_fuzzer.cpp index 34410d65fd1..5db26f09d7b 100644 --- a/test/fuzztest/abilitystubreleasedataability_fuzzer/abilitystubreleasedataability_fuzzer.cpp +++ b/test/fuzztest/abilitystubreleasedataability_fuzzer/abilitystubreleasedataability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubreportdrawncompleted_fuzzer/abilitystubreportdrawncompleted_fuzzer.cpp b/test/fuzztest/abilitystubreportdrawncompleted_fuzzer/abilitystubreportdrawncompleted_fuzzer.cpp index 06ed535cdcc..0fc3cc15706 100644 --- a/test/fuzztest/abilitystubreportdrawncompleted_fuzzer/abilitystubreportdrawncompleted_fuzzer.cpp +++ b/test/fuzztest/abilitystubreportdrawncompleted_fuzzer/abilitystubreportdrawncompleted_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubrequestdialogservice_fuzzer/abilitystubrequestdialogservice_fuzzer.cpp b/test/fuzztest/abilitystubrequestdialogservice_fuzzer/abilitystubrequestdialogservice_fuzzer.cpp index 310893450dc..1ad1d7f8bef 100644 --- a/test/fuzztest/abilitystubrequestdialogservice_fuzzer/abilitystubrequestdialogservice_fuzzer.cpp +++ b/test/fuzztest/abilitystubrequestdialogservice_fuzzer/abilitystubrequestdialogservice_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubsendanrprocessid_fuzzer/abilitystubsendanrprocessid_fuzzer.cpp b/test/fuzztest/abilitystubsendanrprocessid_fuzzer/abilitystubsendanrprocessid_fuzzer.cpp index abd248158ce..4a60dcd78f2 100644 --- a/test/fuzztest/abilitystubsendanrprocessid_fuzzer/abilitystubsendanrprocessid_fuzzer.cpp +++ b/test/fuzztest/abilitystubsendanrprocessid_fuzzer/abilitystubsendanrprocessid_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubsendresulttoability_fuzzer/abilitystubsendresulttoability_fuzzer.cpp b/test/fuzztest/abilitystubsendresulttoability_fuzzer/abilitystubsendresulttoability_fuzzer.cpp index a3e7004f486..95b2a7323c8 100644 --- a/test/fuzztest/abilitystubsendresulttoability_fuzzer/abilitystubsendresulttoability_fuzzer.cpp +++ b/test/fuzztest/abilitystubsendresulttoability_fuzzer/abilitystubsendresulttoability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubsendwantsender_fuzzer/abilitystubsendwantsender_fuzzer.cpp b/test/fuzztest/abilitystubsendwantsender_fuzzer/abilitystubsendwantsender_fuzzer.cpp index ef99ce46260..2f8251dc045 100644 --- a/test/fuzztest/abilitystubsendwantsender_fuzzer/abilitystubsendwantsender_fuzzer.cpp +++ b/test/fuzztest/abilitystubsendwantsender_fuzzer/abilitystubsendwantsender_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubsetabilitycontroller_fuzzer/abilitystubsetabilitycontroller_fuzzer.cpp b/test/fuzztest/abilitystubsetabilitycontroller_fuzzer/abilitystubsetabilitycontroller_fuzzer.cpp index e82d51094ae..3dabb8c0539 100644 --- a/test/fuzztest/abilitystubsetabilitycontroller_fuzzer/abilitystubsetabilitycontroller_fuzzer.cpp +++ b/test/fuzztest/abilitystubsetabilitycontroller_fuzzer/abilitystubsetabilitycontroller_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubsetmissioncontinuestate_fuzzer/abilitystubsetmissioncontinuestate_fuzzer.cpp b/test/fuzztest/abilitystubsetmissioncontinuestate_fuzzer/abilitystubsetmissioncontinuestate_fuzzer.cpp index 56a1b20f9fa..26f6ff572ce 100644 --- a/test/fuzztest/abilitystubsetmissioncontinuestate_fuzzer/abilitystubsetmissioncontinuestate_fuzzer.cpp +++ b/test/fuzztest/abilitystubsetmissioncontinuestate_fuzzer/abilitystubsetmissioncontinuestate_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubsetmissionicon_fuzzer/abilitystubsetmissionicon_fuzzer.cpp b/test/fuzztest/abilitystubsetmissionicon_fuzzer/abilitystubsetmissionicon_fuzzer.cpp index cc1e0e22c31..7e531baceb0 100644 --- a/test/fuzztest/abilitystubsetmissionicon_fuzzer/abilitystubsetmissionicon_fuzzer.cpp +++ b/test/fuzztest/abilitystubsetmissionicon_fuzzer/abilitystubsetmissionicon_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubsetmissionlabel_fuzzer/abilitystubsetmissionlabel_fuzzer.cpp b/test/fuzztest/abilitystubsetmissionlabel_fuzzer/abilitystubsetmissionlabel_fuzzer.cpp index f3d231ed8fb..f85bdaed1c3 100644 --- a/test/fuzztest/abilitystubsetmissionlabel_fuzzer/abilitystubsetmissionlabel_fuzzer.cpp +++ b/test/fuzztest/abilitystubsetmissionlabel_fuzzer/abilitystubsetmissionlabel_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubsetrootscenesession_fuzzer/abilitystubsetrootscenesession_fuzzer.cpp b/test/fuzztest/abilitystubsetrootscenesession_fuzzer/abilitystubsetrootscenesession_fuzzer.cpp index 7db9f3ce4f2..469abe7efbd 100644 --- a/test/fuzztest/abilitystubsetrootscenesession_fuzzer/abilitystubsetrootscenesession_fuzzer.cpp +++ b/test/fuzztest/abilitystubsetrootscenesession_fuzzer/abilitystubsetrootscenesession_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubsetsessionmanagerservice_fuzzer/abilitystubsetsessionmanagerservice_fuzzer.cpp b/test/fuzztest/abilitystubsetsessionmanagerservice_fuzzer/abilitystubsetsessionmanagerservice_fuzzer.cpp index e4979718598..8f477ed7f61 100644 --- a/test/fuzztest/abilitystubsetsessionmanagerservice_fuzzer/abilitystubsetsessionmanagerservice_fuzzer.cpp +++ b/test/fuzztest/abilitystubsetsessionmanagerservice_fuzzer/abilitystubsetsessionmanagerservice_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubsharedatadone_fuzzer/abilitystubsharedatadone_fuzzer.cpp b/test/fuzztest/abilitystubsharedatadone_fuzzer/abilitystubsharedatadone_fuzzer.cpp index 7ac85fc83e4..050f93b4c11 100644 --- a/test/fuzztest/abilitystubsharedatadone_fuzzer/abilitystubsharedatadone_fuzzer.cpp +++ b/test/fuzztest/abilitystubsharedatadone_fuzzer/abilitystubsharedatadone_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartability_fuzzer/abilitystubstartability_fuzzer.cpp b/test/fuzztest/abilitystubstartability_fuzzer/abilitystubstartability_fuzzer.cpp index a5fff492363..d3a82052534 100644 --- a/test/fuzztest/abilitystubstartability_fuzzer/abilitystubstartability_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartability_fuzzer/abilitystubstartability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartabilityaddcaller_fuzzer/abilitystubstartabilityaddcaller_fuzzer.cpp b/test/fuzztest/abilitystubstartabilityaddcaller_fuzzer/abilitystubstartabilityaddcaller_fuzzer.cpp index bc58038310d..fe020d8b5d9 100644 --- a/test/fuzztest/abilitystubstartabilityaddcaller_fuzzer/abilitystubstartabilityaddcaller_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartabilityaddcaller_fuzzer/abilitystubstartabilityaddcaller_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartabilityascallerbytoken_fuzzer/abilitystubstartabilityascallerbytoken_fuzzer.cpp b/test/fuzztest/abilitystubstartabilityascallerbytoken_fuzzer/abilitystubstartabilityascallerbytoken_fuzzer.cpp index eac3a9aab54..66b4510fe70 100644 --- a/test/fuzztest/abilitystubstartabilityascallerbytoken_fuzzer/abilitystubstartabilityascallerbytoken_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartabilityascallerbytoken_fuzzer/abilitystubstartabilityascallerbytoken_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartabilityascallerforoptions_fuzzer/abilitystubstartabilityascallerforoptions_fuzzer.cpp b/test/fuzztest/abilitystubstartabilityascallerforoptions_fuzzer/abilitystubstartabilityascallerforoptions_fuzzer.cpp index 023ec788ced..a04cb640929 100644 --- a/test/fuzztest/abilitystubstartabilityascallerforoptions_fuzzer/abilitystubstartabilityascallerforoptions_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartabilityascallerforoptions_fuzzer/abilitystubstartabilityascallerforoptions_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartabilitybycall_fuzzer/abilitystubstartabilitybycall_fuzzer.cpp b/test/fuzztest/abilitystubstartabilitybycall_fuzzer/abilitystubstartabilitybycall_fuzzer.cpp index 551c5a1bab5..fe90e48ca23 100644 --- a/test/fuzztest/abilitystubstartabilitybycall_fuzzer/abilitystubstartabilitybycall_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartabilitybycall_fuzzer/abilitystubstartabilitybycall_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartabilityforoptions_fuzzer/abilitystubstartabilityforoptions_fuzzer.cpp b/test/fuzztest/abilitystubstartabilityforoptions_fuzzer/abilitystubstartabilityforoptions_fuzzer.cpp index 1e58f913e96..e7a8d92ec21 100644 --- a/test/fuzztest/abilitystubstartabilityforoptions_fuzzer/abilitystubstartabilityforoptions_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartabilityforoptions_fuzzer/abilitystubstartabilityforoptions_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartabilityforsettings_fuzzer/abilitystubstartabilityforsettings_fuzzer.cpp b/test/fuzztest/abilitystubstartabilityforsettings_fuzzer/abilitystubstartabilityforsettings_fuzzer.cpp index 7eceb06f210..e8eee772e5a 100644 --- a/test/fuzztest/abilitystubstartabilityforsettings_fuzzer/abilitystubstartabilityforsettings_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartabilityforsettings_fuzzer/abilitystubstartabilityforsettings_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartcontinuation_fuzzer/abilitystubstartcontinuation_fuzzer.cpp b/test/fuzztest/abilitystubstartcontinuation_fuzzer/abilitystubstartcontinuation_fuzzer.cpp index c1f1ef9bd8b..c7be959814c 100644 --- a/test/fuzztest/abilitystubstartcontinuation_fuzzer/abilitystubstartcontinuation_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartcontinuation_fuzzer/abilitystubstartcontinuation_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartextensionability_fuzzer/abilitystubstartextensionability_fuzzer.cpp b/test/fuzztest/abilitystubstartextensionability_fuzzer/abilitystubstartextensionability_fuzzer.cpp index 6f79af1b59e..cc8fab04fc7 100644 --- a/test/fuzztest/abilitystubstartextensionability_fuzzer/abilitystubstartextensionability_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartextensionability_fuzzer/abilitystubstartextensionability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartspecifiedabilitybyscb_fuzzer/abilitystubstartspecifiedabilitybyscb_fuzzer.cpp b/test/fuzztest/abilitystubstartspecifiedabilitybyscb_fuzzer/abilitystubstartspecifiedabilitybyscb_fuzzer.cpp index c16857410b9..b502aac251d 100644 --- a/test/fuzztest/abilitystubstartspecifiedabilitybyscb_fuzzer/abilitystubstartspecifiedabilitybyscb_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartspecifiedabilitybyscb_fuzzer/abilitystubstartspecifiedabilitybyscb_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartsyncmissions_fuzzer/abilitystubstartsyncmissions_fuzzer.cpp b/test/fuzztest/abilitystubstartsyncmissions_fuzzer/abilitystubstartsyncmissions_fuzzer.cpp index 214cc6e17c9..dba5d14cdbc 100644 --- a/test/fuzztest/abilitystubstartsyncmissions_fuzzer/abilitystubstartsyncmissions_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartsyncmissions_fuzzer/abilitystubstartsyncmissions_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartuiabilitybyscb_fuzzer/abilitystubstartuiabilitybyscb_fuzzer.cpp b/test/fuzztest/abilitystubstartuiabilitybyscb_fuzzer/abilitystubstartuiabilitybyscb_fuzzer.cpp index dc93eff3329..5d9a814a8f0 100644 --- a/test/fuzztest/abilitystubstartuiabilitybyscb_fuzzer/abilitystubstartuiabilitybyscb_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartuiabilitybyscb_fuzzer/abilitystubstartuiabilitybyscb_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartuiextensionability_fuzzer/abilitystubstartuiextensionability_fuzzer.cpp b/test/fuzztest/abilitystubstartuiextensionability_fuzzer/abilitystubstartuiextensionability_fuzzer.cpp index 434093cdf17..2699865283a 100644 --- a/test/fuzztest/abilitystubstartuiextensionability_fuzzer/abilitystubstartuiextensionability_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartuiextensionability_fuzzer/abilitystubstartuiextensionability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartuser_fuzzer/abilitystubstartuser_fuzzer.cpp b/test/fuzztest/abilitystubstartuser_fuzzer/abilitystubstartuser_fuzzer.cpp index a89eb867282..c3a9a940525 100644 --- a/test/fuzztest/abilitystubstartuser_fuzzer/abilitystubstartuser_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartuser_fuzzer/abilitystubstartuser_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstartusertest_fuzzer/abilitystubstartusertest_fuzzer.cpp b/test/fuzztest/abilitystubstartusertest_fuzzer/abilitystubstartusertest_fuzzer.cpp index 5deec072390..cc31b54a819 100644 --- a/test/fuzztest/abilitystubstartusertest_fuzzer/abilitystubstartusertest_fuzzer.cpp +++ b/test/fuzztest/abilitystubstartusertest_fuzzer/abilitystubstartusertest_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstopextensionability_fuzzer/abilitystubstopextensionability_fuzzer.cpp b/test/fuzztest/abilitystubstopextensionability_fuzzer/abilitystubstopextensionability_fuzzer.cpp index 4a42c647f9f..a85f7e75b6f 100644 --- a/test/fuzztest/abilitystubstopextensionability_fuzzer/abilitystubstopextensionability_fuzzer.cpp +++ b/test/fuzztest/abilitystubstopextensionability_fuzzer/abilitystubstopextensionability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstopserviceability_fuzzer/abilitystubstopserviceability_fuzzer.cpp b/test/fuzztest/abilitystubstopserviceability_fuzzer/abilitystubstopserviceability_fuzzer.cpp index 53fa2e662f6..c70eb0aa6e0 100644 --- a/test/fuzztest/abilitystubstopserviceability_fuzzer/abilitystubstopserviceability_fuzzer.cpp +++ b/test/fuzztest/abilitystubstopserviceability_fuzzer/abilitystubstopserviceability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstopsyncmissions_fuzzer/abilitystubstopsyncmissions_fuzzer.cpp b/test/fuzztest/abilitystubstopsyncmissions_fuzzer/abilitystubstopsyncmissions_fuzzer.cpp index e082d87fdb5..e9c430180ce 100644 --- a/test/fuzztest/abilitystubstopsyncmissions_fuzzer/abilitystubstopsyncmissions_fuzzer.cpp +++ b/test/fuzztest/abilitystubstopsyncmissions_fuzzer/abilitystubstopsyncmissions_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubstopuser_fuzzer/abilitystubstopuser_fuzzer.cpp b/test/fuzztest/abilitystubstopuser_fuzzer/abilitystubstopuser_fuzzer.cpp index f9322163967..5edb45dd8f2 100644 --- a/test/fuzztest/abilitystubstopuser_fuzzer/abilitystubstopuser_fuzzer.cpp +++ b/test/fuzztest/abilitystubstopuser_fuzzer/abilitystubstopuser_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubterminateability_fuzzer/abilitystubterminateability_fuzzer.cpp b/test/fuzztest/abilitystubterminateability_fuzzer/abilitystubterminateability_fuzzer.cpp index 35ed14640bf..89e94163eff 100644 --- a/test/fuzztest/abilitystubterminateability_fuzzer/abilitystubterminateability_fuzzer.cpp +++ b/test/fuzztest/abilitystubterminateability_fuzzer/abilitystubterminateability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubterminateuiextensionability_fuzzer/abilitystubterminateuiextensionability_fuzzer.cpp b/test/fuzztest/abilitystubterminateuiextensionability_fuzzer/abilitystubterminateuiextensionability_fuzzer.cpp index dafd47a9a05..e5960096afb 100644 --- a/test/fuzztest/abilitystubterminateuiextensionability_fuzzer/abilitystubterminateuiextensionability_fuzzer.cpp +++ b/test/fuzztest/abilitystubterminateuiextensionability_fuzzer/abilitystubterminateuiextensionability_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubuninstallapp_fuzzer/abilitystubuninstallapp_fuzzer.cpp b/test/fuzztest/abilitystubuninstallapp_fuzzer/abilitystubuninstallapp_fuzzer.cpp index c9cd340beb2..aff1d481c1b 100644 --- a/test/fuzztest/abilitystubuninstallapp_fuzzer/abilitystubuninstallapp_fuzzer.cpp +++ b/test/fuzztest/abilitystubuninstallapp_fuzzer/abilitystubuninstallapp_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubunlockmissionforcleanup_fuzzer/abilitystubunlockmissionforcleanup_fuzzer.cpp b/test/fuzztest/abilitystubunlockmissionforcleanup_fuzzer/abilitystubunlockmissionforcleanup_fuzzer.cpp index af0968d6ea8..7bf61d2be9c 100644 --- a/test/fuzztest/abilitystubunlockmissionforcleanup_fuzzer/abilitystubunlockmissionforcleanup_fuzzer.cpp +++ b/test/fuzztest/abilitystubunlockmissionforcleanup_fuzzer/abilitystubunlockmissionforcleanup_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubunregistercancellistener_fuzzer/abilitystubunregistercancellistener_fuzzer.cpp b/test/fuzztest/abilitystubunregistercancellistener_fuzzer/abilitystubunregistercancellistener_fuzzer.cpp index e74044433c3..7c5feb425a0 100644 --- a/test/fuzztest/abilitystubunregistercancellistener_fuzzer/abilitystubunregistercancellistener_fuzzer.cpp +++ b/test/fuzztest/abilitystubunregistercancellistener_fuzzer/abilitystubunregistercancellistener_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubunregistercollaborator_fuzzer/abilitystubunregistercollaborator_fuzzer.cpp b/test/fuzztest/abilitystubunregistercollaborator_fuzzer/abilitystubunregistercollaborator_fuzzer.cpp index d69c905fed0..8f7fe985e75 100644 --- a/test/fuzztest/abilitystubunregistercollaborator_fuzzer/abilitystubunregistercollaborator_fuzzer.cpp +++ b/test/fuzztest/abilitystubunregistercollaborator_fuzzer/abilitystubunregistercollaborator_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubunregisterconnectionobserver_fuzzer/abilitystubunregisterconnectionobserver_fuzzer.cpp b/test/fuzztest/abilitystubunregisterconnectionobserver_fuzzer/abilitystubunregisterconnectionobserver_fuzzer.cpp index 0ad868a77a4..134525879fe 100644 --- a/test/fuzztest/abilitystubunregisterconnectionobserver_fuzzer/abilitystubunregisterconnectionobserver_fuzzer.cpp +++ b/test/fuzztest/abilitystubunregisterconnectionobserver_fuzzer/abilitystubunregisterconnectionobserver_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubunregistermissionlistener_fuzzer/abilitystubunregistermissionlistener_fuzzer.cpp b/test/fuzztest/abilitystubunregistermissionlistener_fuzzer/abilitystubunregistermissionlistener_fuzzer.cpp index 3ba4de6435a..3c4b7ae6df2 100644 --- a/test/fuzztest/abilitystubunregistermissionlistener_fuzzer/abilitystubunregistermissionlistener_fuzzer.cpp +++ b/test/fuzztest/abilitystubunregistermissionlistener_fuzzer/abilitystubunregistermissionlistener_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubunregisterremotemissionlistener_fuzzer/abilitystubunregisterremotemissionlistener_fuzzer.cpp b/test/fuzztest/abilitystubunregisterremotemissionlistener_fuzzer/abilitystubunregisterremotemissionlistener_fuzzer.cpp index ed5049e9242..f5e0edaa388 100644 --- a/test/fuzztest/abilitystubunregisterremotemissionlistener_fuzzer/abilitystubunregisterremotemissionlistener_fuzzer.cpp +++ b/test/fuzztest/abilitystubunregisterremotemissionlistener_fuzzer/abilitystubunregisterremotemissionlistener_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubupdatemissionsnapshotfromwms_fuzzer/abilitystubupdatemissionsnapshotfromwms_fuzzer.cpp b/test/fuzztest/abilitystubupdatemissionsnapshotfromwms_fuzzer/abilitystubupdatemissionsnapshotfromwms_fuzzer.cpp index c293fb3507b..d7ee92c0cf7 100644 --- a/test/fuzztest/abilitystubupdatemissionsnapshotfromwms_fuzzer/abilitystubupdatemissionsnapshotfromwms_fuzzer.cpp +++ b/test/fuzztest/abilitystubupdatemissionsnapshotfromwms_fuzzer/abilitystubupdatemissionsnapshotfromwms_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/fuzztest/abilitystubverifypermission_fuzzer/abilitystubverifypermission_fuzzer.cpp b/test/fuzztest/abilitystubverifypermission_fuzzer/abilitystubverifypermission_fuzzer.cpp index 3f1d9d360eb..8acbd36b8f5 100644 --- a/test/fuzztest/abilitystubverifypermission_fuzzer/abilitystubverifypermission_fuzzer.cpp +++ b/test/fuzztest/abilitystubverifypermission_fuzzer/abilitystubverifypermission_fuzzer.cpp @@ -43,7 +43,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) parcel.RewindRead(0); MessageParcel reply; MessageOption option; - DelayedSingleton::GetInstance()->uiAbilityLifecycleManager_ = + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); DelayedSingleton::GetInstance()->OnRemoteRequest(code, parcel, reply, option); diff --git a/test/moduletest/ability_manager_service_dump_test/ability_manager_service_dump_test.cpp b/test/moduletest/ability_manager_service_dump_test/ability_manager_service_dump_test.cpp index aa534ceb1de..26f64516b1b 100644 --- a/test/moduletest/ability_manager_service_dump_test/ability_manager_service_dump_test.cpp +++ b/test/moduletest/ability_manager_service_dump_test/ability_manager_service_dump_test.cpp @@ -213,8 +213,9 @@ HWTEST_F(AbilityManagerServiceDumpTest, AbilityManagerService_DataDumpSysStateIn HWTEST_F(AbilityManagerServiceDumpTest, AbilityManagerService_OnAppStateChanged_0100, TestSize.Level1) { auto abilityMs_ = std::make_shared(); - abilityMs_->connectManager_ = std::make_shared(0); - EXPECT_NE(abilityMs_->connectManager_, nullptr); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentConnectManager_ = std::make_shared(0); + EXPECT_NE(abilityMs_->subManagersHelper_->currentConnectManager_, nullptr); Want want; OHOS::AppExecFwk::AbilityInfo abilityInfo; @@ -224,19 +225,19 @@ HWTEST_F(AbilityManagerServiceDumpTest, AbilityManagerService_OnAppStateChanged_ EXPECT_NE(abilityRecord, nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - abilityMs_->currentMissionListManager_ = std::make_shared(USER_ID); - EXPECT_NE(abilityMs_->currentMissionListManager_, nullptr); - abilityMs_->currentMissionListManager_->terminateAbilityList_.push_back(abilityRecord); + abilityMs_->subManagersHelper_->currentMissionListManager_ = std::make_shared(USER_ID); + EXPECT_NE(abilityMs_->subManagersHelper_->currentMissionListManager_, nullptr); + abilityMs_->subManagersHelper_->currentMissionListManager_->terminateAbilityList_.push_back(abilityRecord); - abilityMs_->dataAbilityManager_ = std::make_shared(); - EXPECT_NE(abilityMs_->dataAbilityManager_, nullptr); + abilityMs_->subManagersHelper_->currentDataAbilityManager_ = std::make_shared(); + EXPECT_NE(abilityMs_->subManagersHelper_->currentDataAbilityManager_, nullptr); AppInfo info; info.processName = STRING_PROCESS_NAME; info.state = AppState::TERMINATED; abilityMs_->OnAppStateChanged(info); - abilityRecord = abilityMs_->currentMissionListManager_->terminateAbilityList_.front(); + abilityRecord = abilityMs_->subManagersHelper_->currentMissionListManager_->terminateAbilityList_.front(); EXPECT_NE(abilityRecord, nullptr); EXPECT_EQ(abilityRecord->GetAppState(), AppState::TERMINATED); } diff --git a/test/moduletest/ability_timeout_module_test/BUILD.gn b/test/moduletest/ability_timeout_module_test/BUILD.gn index 96edea943be..b7231896062 100644 --- a/test/moduletest/ability_timeout_module_test/BUILD.gn +++ b/test/moduletest/ability_timeout_module_test/BUILD.gn @@ -38,6 +38,7 @@ ohos_moduletest("ability_timeout_module_test") { "${ability_runtime_services_path}/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler.cpp", "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp", + "${ability_runtime_services_path}/abilitymgr/src/sub_managers_helper.cpp", "${ability_runtime_services_path}/abilitymgr/src/window_focus_changed_listener.cpp", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/sa_mgr/src/sa_mgr_client_mock.cpp", "${ability_runtime_test_path}/moduletest/mock/src/mock_app_mgr_client.cpp", diff --git a/test/moduletest/ability_timeout_module_test/ability_timeout_module_test.cpp b/test/moduletest/ability_timeout_module_test/ability_timeout_module_test.cpp index 908c8560885..2f728a33d82 100644 --- a/test/moduletest/ability_timeout_module_test/ability_timeout_module_test.cpp +++ b/test/moduletest/ability_timeout_module_test/ability_timeout_module_test.cpp @@ -121,13 +121,13 @@ void AbilityTimeoutModuleTest::SetUp() void AbilityTimeoutModuleTest::TearDown() { WaitUntilTaskFinishedByTimer(); - abilityMs_->currentMissionListManager_->terminateAbilityList_.clear(); - abilityMs_->currentMissionListManager_->launcherList_->missions_.clear(); - abilityMs_->currentMissionListManager_->defaultStandardList_->missions_.clear(); - abilityMs_->currentMissionListManager_->defaultSingleList_->missions_.clear(); - abilityMs_->currentMissionListManager_->currentMissionLists_.clear(); - abilityMs_->currentMissionListManager_->currentMissionLists_ - .push_front(abilityMs_->currentMissionListManager_->launcherList_); + abilityMs_->subManagersHelper_->currentMissionListManager_->terminateAbilityList_.clear(); + abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_->missions_.clear(); + abilityMs_->subManagersHelper_->currentMissionListManager_->defaultStandardList_->missions_.clear(); + abilityMs_->subManagersHelper_->currentMissionListManager_->defaultSingleList_->missions_.clear(); + abilityMs_->subManagersHelper_->currentMissionListManager_->currentMissionLists_.clear(); + abilityMs_->subManagersHelper_->currentMissionListManager_->currentMissionLists_ + .push_front(abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_); } void AbilityTimeoutModuleTest::MockOnStart() @@ -146,17 +146,10 @@ void AbilityTimeoutModuleTest::MockOnStart() abilityMs_->userController_ = std::make_shared(); EXPECT_TRUE(abilityMs_->userController_); abilityMs_->userController_->Init(); - int userId = MOCK_MAIN_USER_ID; - - abilityMs_->InitConnectManager(userId, true); - abilityMs_->InitDataAbilityManager(userId, true); - abilityMs_->InitPendWantManager(userId, true); - abilityMs_->systemDataAbilityManager_ = std::make_shared(); - EXPECT_TRUE(abilityMs_->systemDataAbilityManager_); AmsConfigurationParameter::GetInstance().Parse(); - - abilityMs_->InitMissionListManager(userId, true); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->InitSubManagers(MOCK_MAIN_USER_ID, true); abilityMs_->SwitchManagers(MOCK_U0_USER_ID, false); abilityMs_->userController_->SetCurrentUserId(MOCK_MAIN_USER_ID); @@ -176,16 +169,15 @@ void AbilityTimeoutModuleTest::MockOnStop() return; } - abilityMs_->connectManagers_.clear(); - abilityMs_->connectManager_.reset(); + abilityMs_->subManagersHelper_->connectManagers_.clear(); + abilityMs_->subManagersHelper_->currentConnectManager_.reset(); abilityMs_->iBundleManager_.clear(); - abilityMs_->dataAbilityManagers_.clear(); - abilityMs_->dataAbilityManager_.reset(); - abilityMs_->systemDataAbilityManager_.reset(); - abilityMs_->pendingWantManagers_.clear(); - abilityMs_->pendingWantManager_.reset(); - abilityMs_->missionListManagers_.clear(); - abilityMs_->currentMissionListManager_.reset(); + abilityMs_->subManagersHelper_->dataAbilityManagers_.clear(); + abilityMs_->subManagersHelper_->currentDataAbilityManager_.reset(); + abilityMs_->subManagersHelper_->pendingWantManagers_.clear(); + abilityMs_->subManagersHelper_->currentPendingWantManager_.reset(); + abilityMs_->subManagersHelper_->missionListManagers_.clear(); + abilityMs_->subManagersHelper_->currentMissionListManager_.reset(); abilityMs_->userController_.reset(); abilityMs_->abilityController_.clear(); abilityMs_->OnStop(); @@ -193,10 +185,11 @@ void AbilityTimeoutModuleTest::MockOnStop() std::shared_ptr AbilityTimeoutModuleTest::CreateRootLauncher() { - if (!abilityMs_->currentMissionListManager_ || !abilityMs_->currentMissionListManager_->launcherList_) { + if (!abilityMs_->subManagersHelper_->currentMissionListManager_ || + !abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_) { return nullptr; } - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; AbilityRequest abilityRequest; abilityRequest.abilityInfo.type = AbilityType::PAGE; abilityRequest.abilityInfo.name = AbilityConfig::LAUNCHER_ABILITY_NAME; @@ -216,10 +209,11 @@ std::shared_ptr AbilityTimeoutModuleTest::CreateRootLauncher() std::shared_ptr AbilityTimeoutModuleTest::CreateLauncherAbility() { - if (!abilityMs_->currentMissionListManager_ || !abilityMs_->currentMissionListManager_->launcherList_) { + if (!abilityMs_->subManagersHelper_->currentMissionListManager_ || + !abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_) { return nullptr; } - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; AbilityRequest abilityRequest; abilityRequest.abilityInfo.type = AbilityType::PAGE; abilityRequest.abilityInfo.name = "com.ix.hiworld.SecAbility"; @@ -238,7 +232,7 @@ std::shared_ptr AbilityTimeoutModuleTest::CreateLauncherAbility() std::shared_ptr AbilityTimeoutModuleTest::CreateServiceAbility() { - auto curListManager = abilityMs_->currentMissionListManager_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; if (!curListManager) { return nullptr; } @@ -255,7 +249,7 @@ std::shared_ptr AbilityTimeoutModuleTest::CreateServiceAbility() std::shared_ptr AbilityTimeoutModuleTest::CreateExtensionAbility() { - auto curListManager = abilityMs_->currentMissionListManager_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; if (!curListManager) { return nullptr; } @@ -273,7 +267,7 @@ std::shared_ptr AbilityTimeoutModuleTest::CreateExtensionAbility( std::shared_ptr AbilityTimeoutModuleTest::CreateCommonAbility() { - auto curListManager = abilityMs_->currentMissionListManager_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; if (!curListManager) { return nullptr; } @@ -310,8 +304,8 @@ HWTEST_F(AbilityTimeoutModuleTest, OnAbilityDied_001, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(lauList != nullptr); int maxRestart = -1; @@ -325,7 +319,7 @@ HWTEST_F(AbilityTimeoutModuleTest, OnAbilityDied_001, TestSize.Level1) EXPECT_TRUE(rootLauncher->IsLauncherRoot()); GTEST_LOG_(INFO) << "userId:" << abilityMs_->GetUserId(); - GTEST_LOG_(INFO) << "currentmanager userId" << abilityMs_->currentMissionListManager_->userId_; + GTEST_LOG_(INFO) << "currentmanager userId" << abilityMs_->subManagersHelper_->currentMissionListManager_->userId_; // died rootlauncher ability rootLauncher->SetAbilityState(AbilityState::FOREGROUND); @@ -350,8 +344,8 @@ HWTEST_F(AbilityTimeoutModuleTest, OnAbilityDied_002, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(lauList != nullptr); int maxRestart = -1; @@ -368,14 +362,14 @@ HWTEST_F(AbilityTimeoutModuleTest, OnAbilityDied_002, TestSize.Level1) // add common ability to abilityMs auto commonAbility = CreateCommonAbility(); - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, commonAbility); topAbility->SetAbilityState(AbilityState::FOREGROUND); // died rootlauncher ability abilityMs_->OnAbilityDied(rootLauncher); WaitUntilTaskFinishedByTimer(); - topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_TRUE(topAbility != nullptr); EXPECT_EQ(topAbility, rootLauncher); EXPECT_TRUE(lauList->GetAbilityRecordByToken(rootLauncher->GetToken()) != nullptr); @@ -395,8 +389,8 @@ HWTEST_F(AbilityTimeoutModuleTest, OnAbilityDied_003, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(lauList != nullptr); int maxRestart = -1; @@ -436,9 +430,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleLoadTimeOut_001, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(lauList != nullptr); @@ -466,9 +460,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleLoadTimeOut_002, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; - auto curListManager = abilityMs_->currentMissionListManager_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; EXPECT_TRUE(lauList != nullptr); // add rootlauncher to abilityMs. @@ -480,7 +474,7 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleLoadTimeOut_002, TestSize.Level1) // add common ability to abilityMs auto commonAbility = CreateCommonAbility(); - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, commonAbility); // rootlauncher load timeout @@ -502,9 +496,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleLoadTimeOut_003, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; - auto curListManager = abilityMs_->currentMissionListManager_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; EXPECT_TRUE(lauList != nullptr); // add rootlauncher to abilityMs. @@ -516,14 +510,14 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleLoadTimeOut_003, TestSize.Level1) // add common ability to abilityMs as caller auto callerAbility = CreateCommonAbility(); - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, callerAbility); callerAbility->SetAbilityState(AbilityState::FOREGROUND); // add common ability to abilityMs auto commonAbility = CreateCommonAbility(); commonAbility->AddCallerRecord(callerAbility->GetToken(), -1); - topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, commonAbility); // rootlauncher load timeout @@ -545,9 +539,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleLoadTimeOut_004, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; - auto curListManager = abilityMs_->currentMissionListManager_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; EXPECT_TRUE(lauList != nullptr); // add rootlauncher to abilityMs. @@ -559,14 +553,14 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleLoadTimeOut_004, TestSize.Level1) // add launcher ability to abilityMs as caller auto callerAbility = CreateLauncherAbility(); - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, callerAbility); callerAbility->SetAbilityState(AbilityState::FOREGROUND); // add common ability to abilityMs auto commonAbility = CreateCommonAbility(); commonAbility->AddCallerRecord(callerAbility->GetToken(), -1); - topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, commonAbility); // rootlauncher load timeout @@ -588,9 +582,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleLoadTimeOut_005, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; - auto curListManager = abilityMs_->currentMissionListManager_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; EXPECT_TRUE(lauList != nullptr); // add rootlauncher to abilityMs. @@ -606,8 +600,8 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleLoadTimeOut_005, TestSize.Level1) // add common ability to abilityMs auto commonAbility = CreateCommonAbility(); commonAbility->AddCallerRecord(callerAbility->GetToken(), -1); - auto currentList = abilityMs_->currentMissionListManager_->currentMissionLists_; - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto currentList = abilityMs_->subManagersHelper_->currentMissionListManager_->currentMissionLists_; + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, commonAbility); // rootlauncher load timeout @@ -629,9 +623,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleLoadTimeOut_006, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; - auto curListManager = abilityMs_->currentMissionListManager_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; EXPECT_TRUE(lauList != nullptr); // add rootlauncher to abilityMs. @@ -647,8 +641,8 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleLoadTimeOut_006, TestSize.Level1) // add common ability to abilityMs auto commonAbility = CreateCommonAbility(); commonAbility->AddCallerRecord(callerAbility->GetToken(), -1); - auto currentList = abilityMs_->currentMissionListManager_->currentMissionLists_; - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto currentList = abilityMs_->subManagersHelper_->currentMissionListManager_->currentMissionLists_; + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, commonAbility); // rootlauncher load timeout @@ -670,9 +664,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleLoadTimeOut_007, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; - auto curListManager = abilityMs_->currentMissionListManager_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; EXPECT_TRUE(lauList != nullptr); // add rootlauncher to abilityMs. @@ -684,7 +678,7 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleLoadTimeOut_007, TestSize.Level1) // add common laucher ability to abilityMs auto commonLauncherAbility = CreateLauncherAbility(); - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, commonLauncherAbility); // rootlauncher load timeout @@ -706,9 +700,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleForegroundTimeOut_001, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(lauList != nullptr); @@ -737,9 +731,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleForegroundTimeOut_002, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; - auto curListManager = abilityMs_->currentMissionListManager_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; EXPECT_TRUE(lauList != nullptr); // add rootlauncher to abilityMs. @@ -751,7 +745,7 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleForegroundTimeOut_002, TestSize.Level1) // add common ability to abilityMs auto commonAbility = CreateCommonAbility(); - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, commonAbility); commonAbility->SetAbilityState(AbilityState::FOREGROUNDING); @@ -774,9 +768,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleForegroundTimeOut_003, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; - auto curListManager = abilityMs_->currentMissionListManager_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; EXPECT_TRUE(lauList != nullptr); // add rootlauncher to abilityMs. @@ -788,14 +782,14 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleForegroundTimeOut_003, TestSize.Level1) // add common ability to abilityMs as caller auto callerAbility = CreateCommonAbility(); - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, callerAbility); callerAbility->SetAbilityState(AbilityState::FOREGROUND); // add common ability to abilityMs auto commonAbility = CreateCommonAbility(); commonAbility->AddCallerRecord(callerAbility->GetToken(), -1); - topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, commonAbility); commonAbility->SetAbilityState(AbilityState::FOREGROUNDING); @@ -818,9 +812,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleForegroundTimeOut_004, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; - auto curListManager = abilityMs_->currentMissionListManager_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; EXPECT_TRUE(lauList != nullptr); // add rootlauncher to abilityMs. @@ -832,14 +826,14 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleForegroundTimeOut_004, TestSize.Level1) // add launcher ability to abilityMs as caller auto callerAbility = CreateLauncherAbility(); - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, callerAbility); callerAbility->SetAbilityState(AbilityState::FOREGROUND); // add common ability to abilityMs auto commonAbility = CreateCommonAbility(); commonAbility->AddCallerRecord(callerAbility->GetToken(), -1); - topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, commonAbility); commonAbility->SetAbilityState(AbilityState::FOREGROUNDING); @@ -862,9 +856,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleForegroundTimeOut_005, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; - auto curListManager = abilityMs_->currentMissionListManager_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; EXPECT_TRUE(lauList != nullptr); // add rootlauncher to abilityMs. @@ -880,8 +874,8 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleForegroundTimeOut_005, TestSize.Level1) // add common ability to abilityMs auto commonAbility = CreateCommonAbility(); commonAbility->AddCallerRecord(callerAbility->GetToken(), -1); - auto currentList = abilityMs_->currentMissionListManager_->currentMissionLists_; - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto currentList = abilityMs_->subManagersHelper_->currentMissionListManager_->currentMissionLists_; + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, commonAbility); commonAbility->SetAbilityState(AbilityState::FOREGROUNDING); @@ -904,9 +898,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleForegroundTimeOut_006, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; - auto curListManager = abilityMs_->currentMissionListManager_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; EXPECT_TRUE(lauList != nullptr); // add rootlauncher to abilityMs. @@ -922,8 +916,8 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleForegroundTimeOut_006, TestSize.Level1) // add common ability to abilityMs auto commonAbility = CreateCommonAbility(); commonAbility->AddCallerRecord(callerAbility->GetToken(), -1); - auto currentList = abilityMs_->currentMissionListManager_->currentMissionLists_; - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto currentList = abilityMs_->subManagersHelper_->currentMissionListManager_->currentMissionLists_; + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, commonAbility); commonAbility->SetAbilityState(AbilityState::FOREGROUNDING); @@ -946,9 +940,9 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleForegroundTimeOut_007, TestSize.Level1) { // test config is success. EXPECT_TRUE(abilityMs_ != nullptr); - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; - auto curListManager = abilityMs_->currentMissionListManager_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; EXPECT_TRUE(lauList != nullptr); // add rootlauncher to abilityMs. @@ -960,7 +954,7 @@ HWTEST_F(AbilityTimeoutModuleTest, HandleForegroundTimeOut_007, TestSize.Level1) // add common laucher ability to abilityMs auto commonLauncherAbility = CreateLauncherAbility(); - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_EQ(topAbility, commonLauncherAbility); commonLauncherAbility->SetAbilityState(AbilityState::FOREGROUNDING); diff --git a/test/moduletest/common/ams/specified_ability_service_test/specified_ability_service_test.cpp b/test/moduletest/common/ams/specified_ability_service_test/specified_ability_service_test.cpp index 3f560c66e97..156caf1fbc2 100644 --- a/test/moduletest/common/ams/specified_ability_service_test/specified_ability_service_test.cpp +++ b/test/moduletest/common/ams/specified_ability_service_test/specified_ability_service_test.cpp @@ -96,6 +96,7 @@ void SpecifiedAbilityServiceTest::TearDown(void) {} HWTEST_F(SpecifiedAbilityServiceTest, OnAcceptWantResponse_001, TestSize.Level1) { auto abilityMgrServ_ = std::make_shared(); + abilityMgrServ_->subManagersHelper_ = std::make_shared(nullptr, nullptr); std::string abilityName = "MusicAbility"; std::string appName = "test_app"; std::string bundleName = "com.ix.hiMusic"; @@ -108,11 +109,11 @@ HWTEST_F(SpecifiedAbilityServiceTest, OnAcceptWantResponse_001, TestSize.Level1) std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); abilityRecord->SetAbilityState(OHOS::AAFwk::AbilityState::FOREGROUND); - abilityMgrServ_->InitMissionListManager(11, true); + abilityMgrServ_->subManagersHelper_->InitMissionListManager(11, true); Want want; want.SetElementName("DemoDeviceId", "DemoBundleName", "DemoAbilityName"); - EXPECT_TRUE(abilityMgrServ_->currentMissionListManager_); - abilityMgrServ_->currentMissionListManager_->EnqueueWaitingAbility(abilityRequest); + EXPECT_TRUE(abilityMgrServ_->subManagersHelper_->currentMissionListManager_); + abilityMgrServ_->subManagersHelper_->currentMissionListManager_->EnqueueWaitingAbility(abilityRequest); abilityMgrServ_->OnAcceptWantResponse(want, "flag"); EXPECT_EQ(false, abilityRecord->IsNewWant()); diff --git a/test/moduletest/running_infos_module_test/BUILD.gn b/test/moduletest/running_infos_module_test/BUILD.gn index 554cd9bcdc3..f06c6c1fe61 100644 --- a/test/moduletest/running_infos_module_test/BUILD.gn +++ b/test/moduletest/running_infos_module_test/BUILD.gn @@ -39,6 +39,7 @@ ohos_moduletest("running_infos_module_test") { "${ability_runtime_services_path}/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler.cpp", "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp", + "${ability_runtime_services_path}/abilitymgr/src/sub_managers_helper.cpp", "${ability_runtime_services_path}/abilitymgr/src/window_focus_changed_listener.cpp", "${ability_runtime_test_path}/mock/common/src/mock_native_token.cpp", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/sa_mgr/src/sa_mgr_client_mock.cpp", diff --git a/test/moduletest/running_infos_module_test/running_infos_module_test.cpp b/test/moduletest/running_infos_module_test/running_infos_module_test.cpp index 0c8fe1e95f3..d592a23433e 100644 --- a/test/moduletest/running_infos_module_test/running_infos_module_test.cpp +++ b/test/moduletest/running_infos_module_test/running_infos_module_test.cpp @@ -121,20 +121,16 @@ void RunningInfosModuleTest::OnStartAms() abilityMgrServ_->userController_->Init(); int userId = MOCK_MAIN_USER_ID; abilityMgrServ_->userController_->SetCurrentUserId(userId); - abilityMgrServ_->InitConnectManager(userId, true); - abilityMgrServ_->InitDataAbilityManager(userId, true); - abilityMgrServ_->InitPendWantManager(userId, true); - abilityMgrServ_->systemDataAbilityManager_ = std::make_shared(); - EXPECT_TRUE(abilityMgrServ_->systemDataAbilityManager_); AmsConfigurationParameter::GetInstance().Parse(); abilityMgrServ_->interceptorExecuter_ = std::make_shared(); EXPECT_TRUE(abilityMgrServ_->interceptorExecuter_); - abilityMgrServ_->InitMissionListManager(userId, true); - abilityMgrServ_->connectManager_->SetTaskHandler(abilityMgrServ_->taskHandler_); - auto topAbility = abilityMgrServ_->GetListManagerByUserId(MOCK_MAIN_USER_ID)->GetCurrentTopAbilityLocked(); + abilityMgrServ_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMgrServ_->subManagersHelper_->InitSubManagers(userId, true); + abilityMgrServ_->subManagersHelper_->currentConnectManager_->SetTaskHandler(abilityMgrServ_->taskHandler_); + auto topAbility = abilityMgrServ_->GetMissionListManagerByUserId(userId)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -285,7 +281,7 @@ HWTEST_F(RunningInfosModuleTest, GetAbilityRunningInfos_004, TestSize.Level1) auto result = abilityMgrServ_->StartAbility(want); EXPECT_EQ(OHOS::ERR_OK, result); - auto topAbility = abilityMgrServ_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMgrServ_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_TRUE(topAbility); topAbility->SetAbilityState(AbilityState::FOREGROUND); @@ -361,7 +357,7 @@ HWTEST_F(RunningInfosModuleTest, GetAbilityRunningInfos_006, TestSize.Level1) auto result = abilityMgrServ_->StartAbility(want); EXPECT_EQ(OHOS::ERR_OK, result); - auto topAbility = abilityMgrServ_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMgrServ_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_TRUE(topAbility); topAbility->SetAbilityState(AbilityState::FOREGROUND); diff --git a/test/moduletest/start_ability_implicit_module_test/start_ability_implicit_module_test.cpp b/test/moduletest/start_ability_implicit_module_test/start_ability_implicit_module_test.cpp index 441385b28ff..222165305d7 100644 --- a/test/moduletest/start_ability_implicit_module_test/start_ability_implicit_module_test.cpp +++ b/test/moduletest/start_ability_implicit_module_test/start_ability_implicit_module_test.cpp @@ -90,17 +90,10 @@ void StartAbilityImplicitModuleTest::OnStartAms() const abilityMs_->userController_ = std::make_shared(); EXPECT_TRUE(abilityMs_->userController_); abilityMs_->userController_->Init(); - int userId = MOCK_MAIN_USER_ID; - abilityMs_->InitConnectManager(userId, true); - abilityMs_->InitDataAbilityManager(userId, true); - abilityMs_->InitPendWantManager(userId, true); - - abilityMs_->dataAbilityManager_ = std::make_shared(); - abilityMs_->dataAbilityManagers_.emplace(0, abilityMs_->dataAbilityManager_); - EXPECT_TRUE(abilityMs_->dataAbilityManager_); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->InitSubManagers(MOCK_MAIN_USER_ID, true); + AmsConfigurationParameter::GetInstance().Parse(); - abilityMs_->pendingWantManager_ = std::make_shared(); - EXPECT_TRUE(abilityMs_->pendingWantManager_); abilityMs_->iBundleManager_ = new BundleMgrService(); EXPECT_TRUE(abilityMs_->iBundleManager_); @@ -110,7 +103,6 @@ void StartAbilityImplicitModuleTest::OnStartAms() const EXPECT_TRUE(abilityMs_->implicitStartProcessor_->iBundleManager_); DelayedSingleton::GetInstance()->SetDeviceType("phone"); - abilityMs_->InitMissionListManager(userId, true); abilityMs_->SwitchManagers(0, false); abilityMs_->userController_->SetCurrentUserId(MOCK_MAIN_USER_ID); return; @@ -121,10 +113,10 @@ void StartAbilityImplicitModuleTest::OnStartAms() const void StartAbilityImplicitModuleTest::OnStopAms() const { - abilityMs_->currentMissionListManager_->launcherList_->missions_.clear(); - abilityMs_->currentMissionListManager_->defaultStandardList_->missions_.clear(); - abilityMs_->currentMissionListManager_->defaultSingleList_->missions_.clear(); - abilityMs_->currentMissionListManager_->currentMissionLists_.clear(); + abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_->missions_.clear(); + abilityMs_->subManagersHelper_->currentMissionListManager_->defaultStandardList_->missions_.clear(); + abilityMs_->subManagersHelper_->currentMissionListManager_->defaultSingleList_->missions_.clear(); + abilityMs_->subManagersHelper_->currentMissionListManager_->currentMissionLists_.clear(); abilityMs_->OnStop(); } @@ -169,7 +161,7 @@ HWTEST_F(StartAbilityImplicitModuleTest, StartAbility_001, TestSize.Level1) EXPECT_TRUE(!params.empty()); EXPECT_TRUE(isCallBack); - auto abilityRecord = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto abilityRecord = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_TRUE(abilityRecord != nullptr); GTEST_LOG_(INFO) << "ability:" << abilityRecord->GetAbilityInfo().name; @@ -201,7 +193,7 @@ HWTEST_F(StartAbilityImplicitModuleTest, StartAbility_002, TestSize.Level1) EXPECT_TRUE(!params.empty()); EXPECT_TRUE(isCallBack); - auto abilityRecord = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto abilityRecord = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_TRUE(abilityRecord == nullptr); } @@ -230,7 +222,7 @@ HWTEST_F(StartAbilityImplicitModuleTest, StartAbility_003, TestSize.Level1) EXPECT_TRUE(params.empty()); EXPECT_TRUE(!isCallBack); - auto abilityRecord = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto abilityRecord = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_TRUE(abilityRecord != nullptr); } @@ -259,7 +251,7 @@ HWTEST_F(StartAbilityImplicitModuleTest, StartAbility_004, TestSize.Level1) EXPECT_TRUE(!params.empty()); EXPECT_TRUE(isCallBack); - auto abilityRecord = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto abilityRecord = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_TRUE(abilityRecord == nullptr); } diff --git a/test/moduletest/start_option_display_id_test/start_option_display_id_test.cpp b/test/moduletest/start_option_display_id_test/start_option_display_id_test.cpp index 6f4f6c1cbb6..a05d584e9c9 100644 --- a/test/moduletest/start_option_display_id_test/start_option_display_id_test.cpp +++ b/test/moduletest/start_option_display_id_test/start_option_display_id_test.cpp @@ -64,7 +64,7 @@ HWTEST_F(StartOptionDisplayIdTest, start_option_001, TestSize.Level1) option.SetDisplayID(DISPLAY_ID); auto result = abilityMgrServ_->StartAbility(want, option, nullptr, USER_ID_U100, 0); if (result == OHOS::ERR_OK) { - auto topAbility = abilityMgrServ_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMgrServ_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { auto defualtDisplayId = 0; auto displayId = topAbility->GetWant().GetIntParam(Want::PARAM_RESV_DISPLAY_ID, defualtDisplayId); diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index e9ec86bb37a..eef613a14ca 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -172,6 +172,7 @@ ohos_source_set("abilityms_test_source") { "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler.cpp", "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp", "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp", + "${ability_runtime_services_path}/abilitymgr/src/sub_managers_helper.cpp", "${ability_runtime_services_path}/abilitymgr/src/task_data_persistence_mgr.cpp", "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record.cpp", "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record_factory.cpp", diff --git a/test/unittest/ability_manager_service_account_test/ability_manager_service_account_test.cpp b/test/unittest/ability_manager_service_account_test/ability_manager_service_account_test.cpp index b98788e32b6..c9bd1777869 100644 --- a/test/unittest/ability_manager_service_account_test/ability_manager_service_account_test.cpp +++ b/test/unittest/ability_manager_service_account_test/ability_manager_service_account_test.cpp @@ -112,7 +112,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_StartAbility_001, TestSize.Le { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_StartAbility_001 start"; abilityMs_->StartUser(USER_ID_U100, nullptr); - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -124,7 +124,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_StartAbility_001, TestSize.Le EXPECT_EQ(OHOS::ERR_OK, result); abilityMs_->StartUser(newUserId, nullptr); - topAbility = abilityMs_->GetListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -147,7 +147,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_StartAbility_001, TestSize.Le HWTEST_F(AbilityManagerServiceAccountTest, Account_StartAbility_002, TestSize.Level1) { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_StartAbility_002 start"; - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -158,7 +158,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_StartAbility_002, TestSize.Le WaitUntilTaskFinished(); EXPECT_EQ(OHOS::ERR_OK, result); - topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); sptr token = nullptr; if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); @@ -186,7 +186,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_StartAbility_003, TestSize.Le GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_StartAbility_003 start"; AbilityStartSetting abilityStartSetting; // default user - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -198,7 +198,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_StartAbility_003, TestSize.Le EXPECT_EQ(OHOS::ERR_OK, result); abilityMs_->StartUser(newUserId, nullptr); - topAbility = abilityMs_->GetListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -222,7 +222,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_StartAbility_004, TestSize.Le GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_StartAbility_004 start"; StartOptions abilityStartOptions; // default user - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -234,7 +234,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_StartAbility_004, TestSize.Le EXPECT_EQ(OHOS::ERR_OK, result); abilityMs_->StartUser(newUserId, nullptr); - topAbility = abilityMs_->GetListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -386,7 +386,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_StartAbility_011, TestSize.Le { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_StartAbility_011 start"; abilityMs_->StartUser(USER_ID_U100, nullptr); - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -410,7 +410,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_StartAbility_011, TestSize.Le HWTEST_F(AbilityManagerServiceAccountTest, Account_TerminateAbility_001, TestSize.Level1) { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_TerminateAbility_001 start"; - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -421,7 +421,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_TerminateAbility_001, TestSiz WaitUntilTaskFinished(); EXPECT_EQ(OHOS::ERR_OK, result); - topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); sptr token = nullptr; if (topAbility) { @@ -761,7 +761,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleConnectAbilityDone_00 HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleConnectAbilityDone_002, TestSize.Level1) { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_ScheduleConnectAbilityDone_002 start"; - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -772,7 +772,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleConnectAbilityDone_00 WaitUntilTaskFinished(); EXPECT_EQ(OHOS::ERR_OK, result); - topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); sptr token = nullptr; if (topAbility) { @@ -843,7 +843,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleConnectAbilityDone_00 { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_ScheduleConnectAbilityDone_004 start"; abilityMs_->StartUser(newUserId, nullptr); - auto topAbility = abilityMs_->GetListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -854,7 +854,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleConnectAbilityDone_00 WaitUntilTaskFinished(); EXPECT_EQ(OHOS::ERR_OK, result); - topAbility = abilityMs_->GetListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); sptr token = nullptr; if (topAbility) { @@ -923,7 +923,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleDisconnectAbilityDone HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleDisconnectAbilityDone_002, TestSize.Level1) { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_ScheduleDisconnectAbilityDone_002 start"; - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -934,7 +934,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleDisconnectAbilityDone WaitUntilTaskFinished(); EXPECT_EQ(OHOS::ERR_OK, result); - topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); sptr token = nullptr; if (topAbility) { @@ -961,7 +961,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleDisconnectAbilityDone { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_ScheduleDisconnectAbilityDone_003 start"; abilityMs_->StartUser(newUserId, nullptr); - auto topAbility = abilityMs_->GetListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -972,7 +972,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleDisconnectAbilityDone WaitUntilTaskFinished(); EXPECT_EQ(OHOS::ERR_OK, result); - topAbility = abilityMs_->GetListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); sptr token = nullptr; if (topAbility) { @@ -1041,7 +1041,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleCommandAbilityDone_00 HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleCommandAbilityDone_002, TestSize.Level1) { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_ScheduleCommandAbilityDone_002 start"; - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -1052,7 +1052,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleCommandAbilityDone_00 WaitUntilTaskFinished(); EXPECT_EQ(OHOS::ERR_OK, result); - topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); sptr token = nullptr; if (topAbility) { @@ -1123,7 +1123,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleCommandAbilityDone_00 { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_ScheduleCommandAbilityDone_004 start"; abilityMs_->StartUser(newUserId, nullptr); - auto topAbility = abilityMs_->GetListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -1134,7 +1134,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_ScheduleCommandAbilityDone_00 WaitUntilTaskFinished(); EXPECT_EQ(OHOS::ERR_OK, result); - topAbility = abilityMs_->GetListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(newUserId)->GetCurrentTopAbilityLocked(); sptr token = nullptr; if (topAbility) { @@ -1306,7 +1306,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_MinimizeAbility_001, TestSize { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_MinimizeAbility_001 start"; // default user - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -1317,7 +1317,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_MinimizeAbility_001, TestSize WaitUntilTaskFinished(); EXPECT_EQ(ERR_OK, result); - topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); sptr token = nullptr; if (topAbility) { @@ -1340,7 +1340,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_AttachAbilityThread_001, Test { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_AttachAbilityThread_001 start"; // default user - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -1351,7 +1351,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_AttachAbilityThread_001, Test WaitUntilTaskFinished(); EXPECT_EQ(OHOS::ERR_OK, result); OHOS::sptr scheduler = new AbilityScheduler(); - topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); sptr token = nullptr; if (topAbility) { token = topAbility->GetToken(); @@ -1372,7 +1372,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_OnAbilityRequestDone_001, Tes { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_OnAbilityRequestDone_001 start"; // default user - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } @@ -1382,7 +1382,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_OnAbilityRequestDone_001, Tes auto result = abilityMs_->StartAbility(want, USER_ID_U100, -1); WaitUntilTaskFinished(); EXPECT_EQ(ERR_OK, result); - topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); sptr token = nullptr; if (topAbility) { token = topAbility->GetToken(); @@ -1403,7 +1403,7 @@ HWTEST_F(AbilityManagerServiceAccountTest, Account_KillProcess_001, TestSize.Lev { GTEST_LOG_(INFO) << "AbilityManagerServiceAccountTest Account_KillProcess_001 start"; // default user - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { topAbility->SetAbilityState(AAFwk::AbilityState::FOREGROUND); } diff --git a/test/unittest/ability_manager_service_first_test/ability_manager_service_first_test.cpp b/test/unittest/ability_manager_service_first_test/ability_manager_service_first_test.cpp index cc8f39075cd..ff57d318455 100644 --- a/test/unittest/ability_manager_service_first_test/ability_manager_service_first_test.cpp +++ b/test/unittest/ability_manager_service_first_test/ability_manager_service_first_test.cpp @@ -265,10 +265,11 @@ HWTEST_F(AbilityManagerServiceFirstTest, RegisterSnapshotHandler_001, TestSize.L { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest RegisterSnapshotHandler_001 start"); auto abilityMs_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); EXPECT_EQ(abilityMs_->RegisterSnapshotHandler(nullptr), 0); - auto temp = abilityMs_->currentMissionListManager_; - abilityMs_->currentMissionListManager_.reset(); + auto temp = abilityMs_->subManagersHelper_->currentMissionListManager_; + abilityMs_->subManagersHelper_->currentMissionListManager_.reset(); EXPECT_EQ(abilityMs_->RegisterSnapshotHandler(nullptr), ERR_OK); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest RegisterSnapshotHandler_001 end"); } @@ -283,14 +284,15 @@ HWTEST_F(AbilityManagerServiceFirstTest, GetMissionSnapshot_001, TestSize.Level1 { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest GetMissionSnapshot_001 start"); auto abilityMs_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); MissionSnapshot missionSnapshot; EXPECT_EQ(abilityMs_->GetMissionSnapshot("", 1, missionSnapshot, true), CHECK_PERMISSION_FAILED); MyFlag::flag_ = 1; - auto temp = abilityMs_->currentMissionListManager_; - abilityMs_->currentMissionListManager_.reset(); + auto temp = abilityMs_->subManagersHelper_->currentMissionListManager_; + abilityMs_->subManagersHelper_->currentMissionListManager_.reset(); EXPECT_EQ(abilityMs_->GetMissionSnapshot("", 1, missionSnapshot, true), INNER_ERR); - abilityMs_->currentMissionListManager_ = temp; + abilityMs_->subManagersHelper_->currentMissionListManager_ = temp; EXPECT_EQ(abilityMs_->GetMissionSnapshot("", 1, missionSnapshot, true), INNER_ERR); MyFlag::flag_ = 0; @@ -450,7 +452,8 @@ HWTEST_F(AbilityManagerServiceFirstTest, StartRemoteAbility_001, TestSize.Level1 { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest StartRemoteAbility_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); Want want; // AddStartControlParam sptr callerToken = MockToken(AbilityType::PAGE); @@ -468,7 +471,8 @@ HWTEST_F(AbilityManagerServiceFirstTest, StartRemoteAbility_002, TestSize.Level1 { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest StartRemoteAbility_002 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); Want want; // AddStartControlParam EXPECT_EQ(abilityMs_->StartRemoteAbility(want, 1, 1, nullptr), ERR_INVALID_VALUE); @@ -485,7 +489,8 @@ HWTEST_F(AbilityManagerServiceFirstTest, StartRemoteAbility_003, TestSize.Level1 { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest StartRemoteAbility_003 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); Want want; MyFlag::flag_ = 1; unsigned int flag = 0x00000800; @@ -506,7 +511,8 @@ HWTEST_F(AbilityManagerServiceFirstTest, StartRemoteAbility_004, TestSize.Level1 { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest StartRemoteAbility_004 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); Want want; want.SetFlags(0); want.SetParam("ohos.aafwk.param.startAbilityForResult", true); @@ -539,7 +545,8 @@ HWTEST_F(AbilityManagerServiceFirstTest, MinimizeUIAbilityBySCB_001, TestSize.Le { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest MinimizeUIAbilityBySCB_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); EXPECT_EQ(abilityMs_->MinimizeUIAbilityBySCB(nullptr), ERR_INVALID_VALUE); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest MinimizeUIAbilityBySCB_001 end"); } @@ -554,7 +561,8 @@ HWTEST_F(AbilityManagerServiceFirstTest, MinimizeUIAbilityBySCB_002, TestSize.Le { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest MinimizeUIAbilityBySCB_002 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); sptr sessionInfo = new (std::nothrow) SessionInfo(); EXPECT_EQ(abilityMs_->MinimizeUIAbilityBySCB(sessionInfo), ERR_INVALID_VALUE); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest MinimizeUIAbilityBySCB_002 end"); @@ -588,8 +596,10 @@ HWTEST_F(AbilityManagerServiceFirstTest, GetServiceRecordByElementName_001, Test TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest GetServiceRecordByElementName_001 start"); auto abilityMs_ = std::make_shared(); EXPECT_EQ(abilityMs_->GetServiceRecordByElementName(""), nullptr); - abilityMs_->connectManager_ = std::make_shared(100); - abilityMs_->connectManager_->serviceMap_.insert({"test", MockAbilityRecord(AbilityType::PAGE)}); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentConnectManager_ = std::make_shared(100); + abilityMs_->subManagersHelper_->currentConnectManager_->serviceMap_.insert( + {"test", MockAbilityRecord(AbilityType::PAGE)}); EXPECT_NE(abilityMs_->GetServiceRecordByElementName("test"), nullptr); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest GetServiceRecordByElementName_001 end"); } @@ -634,7 +644,8 @@ HWTEST_F(AbilityManagerServiceFirstTest, OnAbilityRequestDone_001, TestSize.Leve { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest OnAbilityRequestDone_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); ASSERT_NE(abilityMs_, nullptr); abilityMs_->OnAbilityRequestDone(nullptr, 1); abilityMs_->OnAbilityRequestDone(MockToken(AbilityType::DATA), 1); @@ -652,7 +663,8 @@ HWTEST_F(AbilityManagerServiceFirstTest, GetMissionIdByAbilityToken_001, TestSiz { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest GetMissionIdByAbilityToken_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); EXPECT_EQ(abilityMs_->GetMissionIdByAbilityToken(nullptr), -1); EXPECT_EQ(abilityMs_->GetMissionIdByAbilityToken(MockToken(AbilityType::PAGE)), -1); @@ -669,7 +681,8 @@ HWTEST_F(AbilityManagerServiceFirstTest, EnableRecoverAbility_001, TestSize.Leve { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest EnableRecoverAbility_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); ASSERT_NE(abilityMs_, nullptr); abilityMs_->EnableRecoverAbility(nullptr); abilityMs_->EnableRecoverAbility(MockToken(AbilityType::PAGE)); @@ -735,7 +748,8 @@ HWTEST_F(AbilityManagerServiceFirstTest, DelegatorDoAbilityForeground_001, TestS { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest DelegatorDoAbilityForeground_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); EXPECT_EQ(abilityMs_->DelegatorDoAbilityForeground(nullptr), ERR_INVALID_VALUE); EXPECT_EQ(abilityMs_->DelegatorDoAbilityForeground(MockToken(AbilityType::PAGE)), ERR_INVALID_VALUE); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest DelegatorDoAbilityForeground_001 end"); @@ -868,8 +882,9 @@ HWTEST_F(AbilityManagerServiceFirstTest, DelegatorMoveMissionToFront_001, TestSi { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest DelegatorMoveMissionToFront_001 start"); auto abilityMs_ = std::make_shared(); - auto temp = abilityMs_->currentMissionListManager_; - abilityMs_->currentMissionListManager_.reset(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + auto temp = abilityMs_->subManagersHelper_->currentMissionListManager_; + abilityMs_->subManagersHelper_->currentMissionListManager_.reset(); EXPECT_EQ(abilityMs_->DelegatorMoveMissionToFront(1), ERR_NO_INIT); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFirstTest DelegatorMoveMissionToFront_001 end"); } diff --git a/test/unittest/ability_manager_service_second_test/ability_manager_service_second_test.cpp b/test/unittest/ability_manager_service_second_test/ability_manager_service_second_test.cpp index 7b6026d31e1..4da8ed13cff 100644 --- a/test/unittest/ability_manager_service_second_test/ability_manager_service_second_test.cpp +++ b/test/unittest/ability_manager_service_second_test/ability_manager_service_second_test.cpp @@ -541,7 +541,8 @@ HWTEST_F(AbilityManagerServiceSecondTest, CloseUIAbilityBySCB_001, TestSize.Leve { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest CloseUIAbilityBySCB_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); EXPECT_EQ(abilityMs_->CloseUIAbilityBySCB(nullptr), ERR_INVALID_VALUE); sptr sessionInfo = new (std::nothrow) SessionInfo(); @@ -669,7 +670,8 @@ HWTEST_F(AbilityManagerServiceSecondTest, ContinueAbility_001, TestSize.Level1) { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest ContinueAbility_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); std::string deviceId = "test"; EXPECT_EQ(abilityMs_->ContinueAbility(deviceId, 1, 1), ERR_INVALID_VALUE); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest ContinueAbility_001 end"); @@ -685,7 +687,8 @@ HWTEST_F(AbilityManagerServiceSecondTest, StartContinuation_001, TestSize.Level1 { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest StartContinuation_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); Want want; EXPECT_EQ(abilityMs_->StartContinuation(want, nullptr, 1), ERR_INVALID_VALUE); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest StartContinuation_001 end"); @@ -717,7 +720,8 @@ HWTEST_F(AbilityManagerServiceSecondTest, NotifyContinuationResult_001, TestSize { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest NotifyContinuationResult_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); EXPECT_EQ(abilityMs_->NotifyContinuationResult(1, 1), ERR_INVALID_VALUE); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest NotifyContinuationResult_001 end"); } @@ -809,8 +813,9 @@ HWTEST_F(AbilityManagerServiceSecondTest, RegisterMissionListener_002, TestSize. { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest RegisterMissionListener_002 start"); auto abilityMs_ = std::make_shared(); - auto temp_ = abilityMs_->currentMissionListManager_; - abilityMs_->currentMissionListManager_ = nullptr; + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + auto temp_ = abilityMs_->subManagersHelper_->currentMissionListManager_; + abilityMs_->subManagersHelper_->currentMissionListManager_ = nullptr; EXPECT_EQ(abilityMs_->RegisterMissionListener(nullptr), ERR_NO_INIT); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest RegisterMissionListener_002 end"); } @@ -840,8 +845,9 @@ HWTEST_F(AbilityManagerServiceSecondTest, UnRegisterMissionListener_002, TestSiz { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest UnRegisterMissionListener_002 start"); auto abilityMs_ = std::make_shared(); - auto temp_ = abilityMs_->currentMissionListManager_; - abilityMs_->currentMissionListManager_ = nullptr; + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + auto temp_ = abilityMs_->subManagersHelper_->currentMissionListManager_; + abilityMs_->subManagersHelper_->currentMissionListManager_ = nullptr; EXPECT_EQ(abilityMs_->UnRegisterMissionListener(nullptr), ERR_NO_INIT); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest UnRegisterMissionListener_002 end"); } @@ -856,9 +862,10 @@ HWTEST_F(AbilityManagerServiceSecondTest, GetWantSender_001, TestSize.Level1) { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest GetWantSender_001 start"); auto abilityMs_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); WantSenderInfo wantSenderInfo; - auto temp = abilityMs_->pendingWantManager_; - abilityMs_->pendingWantManager_ = nullptr; + auto temp = abilityMs_->subManagersHelper_->currentPendingWantManager_; + abilityMs_->subManagersHelper_->currentPendingWantManager_ = nullptr; EXPECT_EQ(abilityMs_->GetWantSender(wantSenderInfo, nullptr), nullptr); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest GetWantSender_001 end"); } @@ -903,11 +910,12 @@ HWTEST_F(AbilityManagerServiceSecondTest, GetPendingWantUid_001, TestSize.Level1 { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest GetPendingWantUid_001 start"); auto abilityMs_ = std::make_shared(); - auto temp = abilityMs_->pendingWantManager_; - abilityMs_->pendingWantManager_.reset(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + auto temp = abilityMs_->subManagersHelper_->currentPendingWantManager_; + abilityMs_->subManagersHelper_->currentPendingWantManager_.reset(); EXPECT_EQ(abilityMs_->GetPendingWantUid(nullptr), -1); - abilityMs_->pendingWantManager_ = temp; + abilityMs_->subManagersHelper_->currentPendingWantManager_ = temp; EXPECT_EQ(abilityMs_->GetPendingWantUid(nullptr), -1); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest GetPendingWantUid_001 end"); } @@ -922,11 +930,12 @@ HWTEST_F(AbilityManagerServiceSecondTest, GetPendingWantUserId_001, TestSize.Lev { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest GetPendingWantUserId_001 start"); auto abilityMs_ = std::make_shared(); - auto temp = abilityMs_->pendingWantManager_; - abilityMs_->pendingWantManager_.reset(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + auto temp = abilityMs_->subManagersHelper_->currentPendingWantManager_; + abilityMs_->subManagersHelper_->currentPendingWantManager_.reset(); EXPECT_EQ(abilityMs_->GetPendingWantUserId(nullptr), -1); - abilityMs_->pendingWantManager_ = temp; + abilityMs_->subManagersHelper_->currentPendingWantManager_ = temp; EXPECT_EQ(abilityMs_->GetPendingWantUserId(nullptr), -1); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest GetPendingWantUserId_001 end"); } @@ -955,11 +964,12 @@ HWTEST_F(AbilityManagerServiceSecondTest, GetPendingWantCode_001, TestSize.Level { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest GetPendingWantCode_001 start"); auto abilityMs_ = std::make_shared(); - auto temp = abilityMs_->pendingWantManager_; - abilityMs_->pendingWantManager_.reset(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + auto temp = abilityMs_->subManagersHelper_->currentPendingWantManager_; + abilityMs_->subManagersHelper_->currentPendingWantManager_.reset(); EXPECT_EQ(abilityMs_->GetPendingWantCode(nullptr), -1); - abilityMs_->pendingWantManager_ = temp; + abilityMs_->subManagersHelper_->currentPendingWantManager_ = temp; EXPECT_EQ(abilityMs_->GetPendingWantCode(nullptr), -1); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest GetPendingWantCode_001 end"); } @@ -974,11 +984,12 @@ HWTEST_F(AbilityManagerServiceSecondTest, GetPendingWantType_001, TestSize.Level { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest GetPendingWantType_001 start"); auto abilityMs_ = std::make_shared(); - auto temp = abilityMs_->pendingWantManager_; - abilityMs_->pendingWantManager_.reset(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + auto temp = abilityMs_->subManagersHelper_->currentPendingWantManager_; + abilityMs_->subManagersHelper_->currentPendingWantManager_.reset(); EXPECT_EQ(abilityMs_->GetPendingWantType(nullptr), -1); - abilityMs_->pendingWantManager_ = temp; + abilityMs_->subManagersHelper_->currentPendingWantManager_ = temp; EXPECT_EQ(abilityMs_->GetPendingWantType(nullptr), -1); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest GetPendingWantType_001 end"); } @@ -1231,11 +1242,12 @@ HWTEST_F(AbilityManagerServiceSecondTest, GetConnectRecordListByCallback_001, Te { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest GetConnectRecordListByCallback_001 start"); auto abilityMs_ = std::make_shared(); - auto temp = abilityMs_->connectManager_; - abilityMs_->connectManager_.reset(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + auto temp = abilityMs_->subManagersHelper_->currentConnectManager_; + abilityMs_->subManagersHelper_->currentConnectManager_.reset(); std::list> connectList; EXPECT_EQ(abilityMs_->GetConnectRecordListByCallback(nullptr), connectList); - abilityMs_->connectManager_ = temp; + abilityMs_->subManagersHelper_->currentConnectManager_ = temp; TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest GetConnectRecordListByCallback_001 end"); } @@ -1278,7 +1290,8 @@ HWTEST_F(AbilityManagerServiceSecondTest, AttachAbilityThread_001, TestSize.Leve { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest AttachAbilityThread_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); EXPECT_EQ(abilityMs_->AttachAbilityThread(nullptr, nullptr), ERR_INVALID_VALUE); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest AttachAbilityThread_001 end"); } @@ -1293,7 +1306,8 @@ HWTEST_F(AbilityManagerServiceSecondTest, DumpInner_001, TestSize.Level1) { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest DumpInner_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); std::vector info; ASSERT_NE(abilityMs_, nullptr); abilityMs_->DumpInner("", info); @@ -1310,7 +1324,8 @@ HWTEST_F(AbilityManagerServiceSecondTest, DumpMissionListInner_001, TestSize.Lev { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest DumpMissionListInner_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); std::vector info; ASSERT_NE(abilityMs_, nullptr); abilityMs_->DumpMissionListInner("", info); @@ -1327,7 +1342,8 @@ HWTEST_F(AbilityManagerServiceSecondTest, DumpMissionInfosInner_001, TestSize.Le { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest DumpMissionInfosInner_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); std::vector info; ASSERT_NE(abilityMs_, nullptr); abilityMs_->DumpMissionInfosInner("", info); @@ -1344,7 +1360,8 @@ HWTEST_F(AbilityManagerServiceSecondTest, DumpMissionInner_001, TestSize.Level1) { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest DumpMissionInner_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); std::vector info; ASSERT_NE(abilityMs_, nullptr); abilityMs_->DumpMissionInner("", info); @@ -1361,7 +1378,8 @@ HWTEST_F(AbilityManagerServiceSecondTest, DumpStateInner_001, TestSize.Level1) { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest DumpStateInner_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); std::vector info; ASSERT_NE(abilityMs_, nullptr); abilityMs_->DumpStateInner("", info); @@ -1426,7 +1444,8 @@ HWTEST_F(AbilityManagerServiceSecondTest, AbilityTransitionDone_001, TestSize.Le { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest AbilityTransitionDone_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); PacMap saveData; EXPECT_EQ(abilityMs_->AbilityTransitionDone(nullptr, 1, saveData), ERR_INVALID_VALUE); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest AbilityTransitionDone_001 end"); @@ -1442,7 +1461,8 @@ HWTEST_F(AbilityManagerServiceSecondTest, OnAppStateChanged_001, TestSize.Level1 { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceSecondTest OnAppStateChanged_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); AppInfo info; ASSERT_NE(abilityMs_, nullptr); abilityMs_->OnAppStateChanged(info); diff --git a/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp b/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp index 706f979175b..fdef2b0b449 100644 --- a/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp +++ b/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp @@ -146,7 +146,8 @@ HWTEST_F(AbilityManagerServiceThirdTest, VerificationAllToken_001, TestSize.Leve { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest VerificationAllToken_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); EXPECT_FALSE(abilityMs_->VerificationAllToken(nullptr)); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest VerificationAllToken_001 end"); } @@ -167,20 +168,21 @@ HWTEST_F(AbilityManagerServiceThirdTest, GetDataAbilityManager_001, TestSize.Lev /* * Feature: AbilityManagerService - * Function: GetListManagerByUserId + * Function: GetMissionListManagerByUserId * SubFunction: NA - * FunctionPoints: AbilityManagerService GetListManagerByUserId + * FunctionPoints: AbilityManagerService GetMissionListManagerByUserId */ HWTEST_F(AbilityManagerServiceThirdTest, GetListManagerByUserId_001, TestSize.Level1) { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest GetListManagerByUserId_001 start"); auto abilityMs_ = std::make_shared(); - EXPECT_EQ(abilityMs_->GetListManagerByUserId(100), nullptr); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + EXPECT_EQ(abilityMs_->GetMissionListManagerByUserId(100), nullptr); - auto temp = abilityMs_->missionListManagers_; - abilityMs_->missionListManagers_.clear(); - EXPECT_EQ(abilityMs_->GetListManagerByUserId(100).get(), nullptr); - abilityMs_->missionListManagers_ = temp; + auto temp = abilityMs_->subManagersHelper_->missionListManagers_; + abilityMs_->subManagersHelper_->missionListManagers_.clear(); + EXPECT_EQ(abilityMs_->GetMissionListManagerByUserId(100).get(), nullptr); + abilityMs_->subManagersHelper_->missionListManagers_ = temp; TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest GetListManagerByUserId_001 end"); } @@ -194,12 +196,13 @@ HWTEST_F(AbilityManagerServiceThirdTest, GetDataAbilityManagerByUserId_001, Test { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest GetDataAbilityManagerByUserId_001 start"); auto abilityMs_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); EXPECT_EQ(abilityMs_->GetDataAbilityManagerByUserId(100), nullptr); - auto temp = abilityMs_->dataAbilityManagers_; - abilityMs_->dataAbilityManagers_.clear(); + auto temp = abilityMs_->subManagersHelper_->dataAbilityManagers_; + abilityMs_->subManagersHelper_->dataAbilityManagers_.clear(); EXPECT_EQ(abilityMs_->GetDataAbilityManagerByUserId(100).get(), nullptr); - abilityMs_->dataAbilityManagers_ = temp; + abilityMs_->subManagersHelper_->dataAbilityManagers_ = temp; TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest GetDataAbilityManagerByUserId_001 end"); } @@ -313,12 +316,13 @@ HWTEST_F(AbilityManagerServiceThirdTest, GetAbilityTokenByMissionId_001, TestSiz { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest GetAbilityTokenByMissionId_001 start"); auto abilityMs_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); EXPECT_EQ(abilityMs_->GetAbilityTokenByMissionId(100), nullptr); - auto temp = abilityMs_->currentMissionListManager_; - abilityMs_->currentMissionListManager_.reset(); + auto temp = abilityMs_->subManagersHelper_->currentMissionListManager_; + abilityMs_->subManagersHelper_->currentMissionListManager_.reset(); EXPECT_EQ(abilityMs_->GetAbilityTokenByMissionId(100), nullptr); - abilityMs_->currentMissionListManager_ = temp; + abilityMs_->subManagersHelper_->currentMissionListManager_ = temp; TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest GetAbilityTokenByMissionId_001 end"); } @@ -332,7 +336,8 @@ HWTEST_F(AbilityManagerServiceThirdTest, StartRemoteAbilityByCall_001, TestSize. { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest StartRemoteAbilityByCall_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); Want want; EXPECT_EQ(abilityMs_->StartRemoteAbilityByCall(want, nullptr, nullptr), ERR_INVALID_VALUE); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest StartRemoteAbilityByCall_001 end"); @@ -363,7 +368,8 @@ HWTEST_F(AbilityManagerServiceThirdTest, ReleaseCall_001, TestSize.Level1) { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest ReleaseCall_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); AppExecFwk::ElementName element; EXPECT_EQ(abilityMs_->ReleaseCall(nullptr, element), ERR_INVALID_VALUE); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest ReleaseCall_001 end"); @@ -402,15 +408,16 @@ HWTEST_F(AbilityManagerServiceThirdTest, OnAcceptWantResponse_001, TestSize.Leve { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest OnAcceptWantResponse_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); AAFwk::Want want; ASSERT_NE(abilityMs_, nullptr); abilityMs_->OnAcceptWantResponse(want, "test"); - auto temp = abilityMs_->currentMissionListManager_; - abilityMs_->currentMissionListManager_.reset(); + auto temp = abilityMs_->subManagersHelper_->currentMissionListManager_; + abilityMs_->subManagersHelper_->currentMissionListManager_.reset(); abilityMs_->OnAcceptWantResponse(want, "test"); - abilityMs_->currentMissionListManager_ = temp; + abilityMs_->subManagersHelper_->currentMissionListManager_ = temp; TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest OnAcceptWantResponse_001 end"); } @@ -424,14 +431,15 @@ HWTEST_F(AbilityManagerServiceThirdTest, OnStartSpecifiedAbilityTimeoutResponse_ { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest OnStartSpecifiedAbilityTimeoutResponse_001 start"); auto abilityMs_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); AAFwk::Want want; ASSERT_NE(abilityMs_, nullptr); abilityMs_->OnStartSpecifiedAbilityTimeoutResponse(want); - auto temp = abilityMs_->currentMissionListManager_; - abilityMs_->currentMissionListManager_.reset(); + auto temp = abilityMs_->subManagersHelper_->currentMissionListManager_; + abilityMs_->subManagersHelper_->currentMissionListManager_.reset(); abilityMs_->OnStartSpecifiedAbilityTimeoutResponse(want); - abilityMs_->currentMissionListManager_ = temp; + abilityMs_->subManagersHelper_->currentMissionListManager_ = temp; TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest OnStartSpecifiedAbilityTimeoutResponse_001 end"); } @@ -445,25 +453,26 @@ HWTEST_F(AbilityManagerServiceThirdTest, GetAbilityRunningInfos_001, TestSize.Le { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest GetAbilityRunningInfos_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); std::vector info; if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { EXPECT_NE(abilityMs_->GetAbilityRunningInfos(info), ERR_OK); - auto temp1 = abilityMs_->currentMissionListManager_; - abilityMs_->currentMissionListManager_.reset(); + auto temp1 = abilityMs_->subManagersHelper_->currentMissionListManager_; + abilityMs_->subManagersHelper_->currentMissionListManager_.reset(); EXPECT_EQ(abilityMs_->GetAbilityRunningInfos(info), ERR_INVALID_VALUE); - abilityMs_->currentMissionListManager_ = temp1; + abilityMs_->subManagersHelper_->currentMissionListManager_ = temp1; - auto temp2 = abilityMs_->connectManager_; - abilityMs_->connectManager_.reset(); + auto temp2 = abilityMs_->subManagersHelper_->currentConnectManager_; + abilityMs_->subManagersHelper_->currentConnectManager_.reset(); EXPECT_NE(abilityMs_->GetAbilityRunningInfos(info), ERR_OK); - abilityMs_->connectManager_ = temp2; + abilityMs_->subManagersHelper_->currentConnectManager_ = temp2; - auto temp3 = abilityMs_->dataAbilityManager_; - abilityMs_->dataAbilityManager_.reset(); + auto temp3 = abilityMs_->subManagersHelper_->currentDataAbilityManager_; + abilityMs_->subManagersHelper_->currentDataAbilityManager_.reset(); EXPECT_NE(abilityMs_->GetAbilityRunningInfos(info), ERR_OK); - abilityMs_->dataAbilityManager_ = temp3; + abilityMs_->subManagersHelper_->currentDataAbilityManager_ = temp3; } TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest GetAbilityRunningInfos_001 end"); } @@ -478,13 +487,14 @@ HWTEST_F(AbilityManagerServiceThirdTest, GetExtensionRunningInfos_001, TestSize. { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest GetExtensionRunningInfos_001 start"); auto abilityMs_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); std::vector extensionRunningInfo; EXPECT_NE(abilityMs_->GetExtensionRunningInfos(10, extensionRunningInfo), ERR_OK); - auto temp = abilityMs_->connectManager_; - abilityMs_->connectManager_.reset(); + auto temp = abilityMs_->subManagersHelper_->currentConnectManager_; + abilityMs_->subManagersHelper_->currentConnectManager_.reset(); EXPECT_EQ(abilityMs_->GetExtensionRunningInfos(10, extensionRunningInfo), ERR_INVALID_VALUE); - abilityMs_->connectManager_ = temp; + abilityMs_->subManagersHelper_->currentConnectManager_ = temp; TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest GetExtensionRunningInfos_001 end"); } @@ -543,7 +553,8 @@ HWTEST_F(AbilityManagerServiceThirdTest, CallRequestDone_001, TestSize.Level1) { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest CallRequestDone_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); sptr token = nullptr; sptr callStub = nullptr; ASSERT_NE(abilityMs_, nullptr); @@ -779,12 +790,13 @@ HWTEST_F(AbilityManagerServiceThirdTest, BlockAbility_001, TestSize.Level1) { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest BlockAbility_001 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); - auto temp = abilityMs_->currentMissionListManager_; - abilityMs_->currentMissionListManager_ = nullptr; + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); + auto temp = abilityMs_->subManagersHelper_->currentMissionListManager_; + abilityMs_->subManagersHelper_->currentMissionListManager_ = nullptr; EXPECT_EQ(abilityMs_->BlockAbility(1), ERR_OK); - abilityMs_->currentMissionListManager_ = temp; + abilityMs_->subManagersHelper_->currentMissionListManager_ = temp; EXPECT_EQ(abilityMs_->BlockAbility(1), ERR_OK); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest BlockAbility_001 end"); } @@ -973,7 +985,7 @@ HWTEST_F(AbilityManagerServiceThirdTest, RegisterSessionHandler_001, TestSize.Le { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest RegisterSessionHandler_001 start"); auto abilityMs_ = std::make_shared(); - EXPECT_EQ(abilityMs_->RegisterSessionHandler(nullptr), ERR_NO_INIT); + EXPECT_EQ(abilityMs_->RegisterSessionHandler(nullptr), ERR_WRONG_INTERFACE_CALL); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest RegisterSessionHandler_001 end"); } @@ -1000,7 +1012,8 @@ HWTEST_F(AbilityManagerServiceThirdTest, RegisterSessionHandler_002, TestSize.Le { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest RegisterSessionHandler_002 start"); auto abilityMs_ = std::make_shared(); - abilityMs_->uiAbilityLifecycleManager_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); + abilityMs_->subManagersHelper_->currentUIAbilityManager_ = std::make_shared(); EXPECT_EQ(abilityMs_->RegisterSessionHandler(nullptr), ERR_WRONG_INTERFACE_CALL); TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceThirdTest RegisterSessionHandler_002 end"); } diff --git a/test/unittest/ability_timeout_test/ability_timeout_test.cpp b/test/unittest/ability_timeout_test/ability_timeout_test.cpp index 09041338840..f8798a05fd8 100644 --- a/test/unittest/ability_timeout_test/ability_timeout_test.cpp +++ b/test/unittest/ability_timeout_test/ability_timeout_test.cpp @@ -92,8 +92,8 @@ HWTEST_F(AbilityTimeoutTest, OnAbilityDied_001, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto defList = abilityMs_->currentMissionListManager_->defaultStandardList_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto defList = abilityMs_->subManagersHelper_->currentMissionListManager_->defaultStandardList_; EXPECT_TRUE(defList != nullptr); AbilityRequest abilityRequest; @@ -130,10 +130,10 @@ HWTEST_F(AbilityTimeoutTest, OnAbilityDied_002, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(lauList != nullptr); - EXPECT_EQ((int)(abilityMs_->currentMissionListManager_->currentMissionLists_.size()), 1); + EXPECT_EQ((int)(abilityMs_->subManagersHelper_->currentMissionListManager_->currentMissionLists_.size()), 1); AbilityRequest abilityRequest; abilityRequest.abilityInfo.type = AbilityType::PAGE; @@ -173,10 +173,10 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_001, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - EXPECT_TRUE(abilityMs_->currentMissionListManager_ != nullptr); - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + EXPECT_TRUE(abilityMs_->subManagersHelper_->currentMissionListManager_ != nullptr); + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(lauList != nullptr); - EXPECT_EQ((int)(abilityMs_->currentMissionListManager_->currentMissionLists_.size()), 1); + EXPECT_EQ((int)(abilityMs_->subManagersHelper_->currentMissionListManager_->currentMissionLists_.size()), 1); // root launcher ability load timeout AbilityRequest abilityRequest; @@ -218,11 +218,11 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_002, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(curListManager != nullptr); EXPECT_TRUE(lauList != nullptr); - EXPECT_EQ((int)(abilityMs_->currentMissionListManager_->currentMissionLists_.size()), 1); + EXPECT_EQ((int)(abilityMs_->subManagersHelper_->currentMissionListManager_->currentMissionLists_.size()), 1); AbilityRequest abilityRequest; abilityRequest.abilityInfo.type = AbilityType::PAGE; @@ -279,11 +279,11 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_003, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(curListManager != nullptr); EXPECT_TRUE(lauList != nullptr); - EXPECT_EQ((int)(abilityMs_->currentMissionListManager_->currentMissionLists_.size()), 1); + EXPECT_EQ((int)(abilityMs_->subManagersHelper_->currentMissionListManager_->currentMissionLists_.size()), 1); AbilityRequest abilityRequest; abilityRequest.abilityInfo.type = AbilityType::PAGE; abilityRequest.abilityInfo.name = "com.test.rootLauncher"; @@ -347,8 +347,8 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_004, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(curListManager != nullptr); EXPECT_TRUE(lauList != nullptr); @@ -416,8 +416,8 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_005, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(curListManager != nullptr); EXPECT_TRUE(lauList != nullptr); @@ -485,8 +485,8 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_006, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(curListManager != nullptr); EXPECT_TRUE(lauList != nullptr); @@ -552,8 +552,8 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_007, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(curListManager != nullptr); EXPECT_TRUE(lauList != nullptr); @@ -621,8 +621,8 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_001, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(curListManager != nullptr); EXPECT_TRUE(lauList != nullptr); @@ -667,8 +667,8 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_002, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(curListManager != nullptr); EXPECT_TRUE(lauList != nullptr); @@ -726,8 +726,8 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_003, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(curListManager != nullptr); EXPECT_TRUE(lauList != nullptr); AbilityRequest abilityRequest; @@ -795,8 +795,8 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_004, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(curListManager != nullptr); EXPECT_TRUE(lauList != nullptr); @@ -864,8 +864,8 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_005, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(curListManager != nullptr); EXPECT_TRUE(lauList != nullptr); @@ -934,8 +934,8 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_006, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(curListManager != nullptr); EXPECT_TRUE(lauList != nullptr); @@ -1004,8 +1004,8 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_007, TestSize.Level1) abilityMs_->OnStart(); EXPECT_TRUE(abilityMs_ != nullptr); if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { - auto curListManager = abilityMs_->currentMissionListManager_; - auto lauList = abilityMs_->currentMissionListManager_->launcherList_; + auto curListManager = abilityMs_->subManagersHelper_->currentMissionListManager_; + auto lauList = abilityMs_->subManagersHelper_->currentMissionListManager_->launcherList_; EXPECT_TRUE(curListManager != nullptr); EXPECT_TRUE(lauList != nullptr); diff --git a/test/unittest/call_container_test/call_container_test.cpp b/test/unittest/call_container_test/call_container_test.cpp index 96b7b1059e1..df0794abb34 100644 --- a/test/unittest/call_container_test/call_container_test.cpp +++ b/test/unittest/call_container_test/call_container_test.cpp @@ -368,7 +368,10 @@ HWTEST_F(CallContainerTest, Call_Container_On_Connect_Died_001, TestSize.Level1) std::shared_ptr missionListMgr = std::make_shared(0); missionListMgr->currentMissionLists_.push_front(missionList); - DelayedSingleton::GetInstance()->currentMissionListManager_ = missionListMgr; + DelayedSingleton::GetInstance()->subManagersHelper_ = + std::make_shared(nullptr, nullptr); + DelayedSingleton::GetInstance()->subManagersHelper_->currentMissionListManager_ = + missionListMgr; callContainer->OnConnectionDied(abilityRequest.connect->AsObject()); EXPECT_EQ(callContainer->callRecordMap_.size(), 1); diff --git a/test/unittest/running_infos_test/running_infos_test.cpp b/test/unittest/running_infos_test/running_infos_test.cpp index 58a7b474d97..ce25a097e5d 100644 --- a/test/unittest/running_infos_test/running_infos_test.cpp +++ b/test/unittest/running_infos_test/running_infos_test.cpp @@ -141,13 +141,14 @@ HWTEST_F(RunningInfosTest, GetAbilityRunningInfos_003, TestSize.Level1) HWTEST_F(RunningInfosTest, GetAbilityRunningInfos_004, TestSize.Level1) { auto abilityMs_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); Want want; ElementName element("device", "com.ix.hiMusic", "MusicAbility"); want.SetElement(element); auto result = abilityMs_->StartAbility(want); if (result == OHOS::ERR_OK) { - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_TRUE(topAbility); topAbility->SetAbilityState(AbilityState::FOREGROUND); } @@ -215,13 +216,14 @@ HWTEST_F(RunningInfosTest, GetAbilityRunningInfos_005, TestSize.Level1) HWTEST_F(RunningInfosTest, GetAbilityRunningInfos_006, TestSize.Level1) { auto abilityMs_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); Want want; ElementName element("device", "com.ohos.launcher", "com.ohos.launcher.MainAbility"); want.SetElement(element); auto result = abilityMs_->StartAbility(want); if (result == OHOS::ERR_OK) { - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_TRUE(topAbility); topAbility->SetAbilityState(AbilityState::FOREGROUND); } @@ -253,13 +255,14 @@ HWTEST_F(RunningInfosTest, GetAbilityRunningInfos_006, TestSize.Level1) HWTEST_F(RunningInfosTest, GetAbilityRunningInfos_007, TestSize.Level1) { auto abilityMs_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); Want want; ElementName element("device", "com.ix.hiMusic", "MusicAbility"); want.SetElement(element); auto result = abilityMs_->StartAbility(want); if (result == OHOS::ERR_OK) { - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_TRUE(topAbility); topAbility->SetAbilityState(AbilityState::ACTIVE); @@ -375,7 +378,7 @@ HWTEST_F(RunningInfosTest, ConnectManagerGetAbilityRunningInfos_001, TestSize.Le if (result == OHOS::ERR_OK) { std::vector infos; - abilityMs_->connectManager_->GetAbilityRunningInfos(infos, true); + abilityMs_->subManagersHelper_->currentConnectManager_->GetAbilityRunningInfos(infos, true); size_t infoCount{ 1 }; EXPECT_TRUE(infos.size() == infoCount); if (infos.size() == infoCount) { @@ -407,7 +410,7 @@ HWTEST_F(RunningInfosTest, ConnectManagerGetAbilityRunningInfos_002, TestSize.Le if (result2 == OHOS::ERR_OK) { std::vector infos; - abilityMs_->connectManager_->GetAbilityRunningInfos(infos, true); + abilityMs_->subManagersHelper_->currentConnectManager_->GetAbilityRunningInfos(infos, true); size_t infoCount{ 2 }; EXPECT_TRUE(infos.size() == infoCount); @@ -441,7 +444,8 @@ HWTEST_F(RunningInfosTest, ConnectManagerGetExtensionRunningInfos_001, TestSize. int upperLimit = 10; int userId = 100; size_t infoCount{ 1 }; - abilityMs_->connectManager_->GetExtensionRunningInfos(upperLimit, infos, userId, true); + abilityMs_->subManagersHelper_->currentConnectManager_->GetExtensionRunningInfos( + upperLimit, infos, userId, true); EXPECT_TRUE(infos.size() == infoCount); if (infos.size() == infoCount) { EXPECT_TRUE(infos[0].extension.GetAbilityName() == element.GetAbilityName()); @@ -474,7 +478,8 @@ HWTEST_F(RunningInfosTest, ConnectManagerGetExtensionRunningInfos_002, TestSize. int upperLimit = 10; int userId = 100; size_t infoCount{ 2 }; - abilityMs_->connectManager_->GetExtensionRunningInfos(upperLimit, infos, userId, true); + abilityMs_->subManagersHelper_->currentConnectManager_->GetExtensionRunningInfos( + upperLimit, infos, userId, true); EXPECT_TRUE(infos.size() == infoCount); if (infos.size() == infoCount) { EXPECT_TRUE(infos[0].extension.GetAbilityName() == element.GetAbilityName()); @@ -494,6 +499,7 @@ HWTEST_F(RunningInfosTest, ConnectManagerGetExtensionRunningInfos_002, TestSize. HWTEST_F(RunningInfosTest, MissionGetAbilityRunningInfos_001, TestSize.Level1) { auto abilityMs_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); Want want; ElementName element("device", "com.ix.hiMusic", "MusicAbility"); want.SetElement(element); @@ -501,7 +507,7 @@ HWTEST_F(RunningInfosTest, MissionGetAbilityRunningInfos_001, TestSize.Level1) if (result == OHOS::ERR_OK) { std::vector infos; - abilityMs_->currentMissionListManager_->GetAbilityRunningInfos(infos, true); + abilityMs_->subManagersHelper_->currentMissionListManager_->GetAbilityRunningInfos(infos, true); size_t infoCount{ 1 }; EXPECT_TRUE(infos.size() == infoCount); if (infos.size() == infoCount) { @@ -522,13 +528,14 @@ HWTEST_F(RunningInfosTest, MissionGetAbilityRunningInfos_001, TestSize.Level1) HWTEST_F(RunningInfosTest, MissionGetAbilityRunningInfos_002, TestSize.Level1) { auto abilityMs_ = std::make_shared(); + abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); Want want; ElementName element("device", "com.ix.hiMusic", "MusicAbility"); want.SetElement(element); auto result = abilityMs_->StartAbility(want); if (result == OHOS::ERR_OK) { - auto topAbility = abilityMs_->currentMissionListManager_->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->subManagersHelper_->currentMissionListManager_->GetCurrentTopAbilityLocked(); EXPECT_TRUE(topAbility); topAbility->SetAbilityState(AbilityState::FOREGROUND); } @@ -539,7 +546,7 @@ HWTEST_F(RunningInfosTest, MissionGetAbilityRunningInfos_002, TestSize.Level1) if (result2 == OHOS::ERR_OK) { std::vector infos; - abilityMs_->currentMissionListManager_->GetAbilityRunningInfos(infos, true); + abilityMs_->subManagersHelper_->currentMissionListManager_->GetAbilityRunningInfos(infos, true); size_t infoCount{ 2 }; EXPECT_TRUE(infos.size() == infoCount); @@ -579,11 +586,11 @@ HWTEST_F(RunningInfosTest, DataGetAbilityRunningInfos_001, TestSize.Level1) abilityRequest.requestCode); dataAbilityRecord->ability_ = abilityRecord; const std::string dataAbilityName(abilityRequest.abilityInfo.bundleName + '.' + abilityRequest.abilityInfo.name); - abilityMs_->dataAbilityManager_->dataAbilityRecordsLoading_.insert( + abilityMs_->subManagersHelper_->currentDataAbilityManager_->dataAbilityRecordsLoading_.insert( std::pair>(dataAbilityName, dataAbilityRecord)); std::vector infos; - abilityMs_->dataAbilityManager_->GetAbilityRunningInfos(infos, true); + abilityMs_->subManagersHelper_->currentDataAbilityManager_->GetAbilityRunningInfos(infos, true); size_t infoCount{ 1 }; EXPECT_TRUE(infos.size() == infoCount); if (infos.size() == infoCount) { @@ -619,11 +626,11 @@ HWTEST_F(RunningInfosTest, DataGetAbilityRunningInfos_002, TestSize.Level1) abilityRequest.requestCode); dataAbilityRecord->ability_ = abilityRecord; const std::string dataAbilityName(abilityRequest.abilityInfo.bundleName + '.' + abilityRequest.abilityInfo.name); - abilityMs_->dataAbilityManager_->dataAbilityRecordsLoaded_.insert( + abilityMs_->subManagersHelper_->currentDataAbilityManager_->dataAbilityRecordsLoaded_.insert( std::pair>(dataAbilityName, dataAbilityRecord)); std::vector infos; - abilityMs_->dataAbilityManager_->GetAbilityRunningInfos(infos, true); + abilityMs_->subManagersHelper_->currentDataAbilityManager_->GetAbilityRunningInfos(infos, true); size_t infoCount{ 1 }; EXPECT_TRUE(infos.size() == infoCount); if (infos.size() == infoCount) { @@ -659,7 +666,7 @@ HWTEST_F(RunningInfosTest, DataGetAbilityRunningInfos_003, TestSize.Level1) abilityRequest.requestCode); dataAbilityRecord->ability_ = abilityRecord; const std::string dataAbilityName(abilityRequest.abilityInfo.bundleName + '.' + abilityRequest.abilityInfo.name); - abilityMs_->dataAbilityManager_->dataAbilityRecordsLoading_.insert( + abilityMs_->subManagersHelper_->currentDataAbilityManager_->dataAbilityRecordsLoading_.insert( std::pair>(dataAbilityName, dataAbilityRecord)); ElementName element2("device", "com.ix.hiMusic", "MusicAbilityOther"); @@ -674,11 +681,11 @@ HWTEST_F(RunningInfosTest, DataGetAbilityRunningInfos_003, TestSize.Level1) abilityRequest2.requestCode); dataAbilityRecord2->ability_ = abilityRecord2; const std::string dataAbilityName2(abilityRequest2.abilityInfo.bundleName + '.' + abilityRequest2.abilityInfo.name); - abilityMs_->dataAbilityManager_->dataAbilityRecordsLoaded_.insert( + abilityMs_->subManagersHelper_->currentDataAbilityManager_->dataAbilityRecordsLoaded_.insert( std::pair>(dataAbilityName2, dataAbilityRecord2)); std::vector infos; - abilityMs_->dataAbilityManager_->GetAbilityRunningInfos(infos, true); + abilityMs_->subManagersHelper_->currentDataAbilityManager_->GetAbilityRunningInfos(infos, true); size_t infoCount{ 2 }; EXPECT_TRUE(infos.size() == infoCount); if (infos.size() == infoCount) { diff --git a/test/unittest/start_option_display_id_test/start_option_display_id_test.cpp b/test/unittest/start_option_display_id_test/start_option_display_id_test.cpp index c28463dbd66..5f779ba2e92 100644 --- a/test/unittest/start_option_display_id_test/start_option_display_id_test.cpp +++ b/test/unittest/start_option_display_id_test/start_option_display_id_test.cpp @@ -67,7 +67,7 @@ HWTEST_F(StartOptionDisplayIdTest, start_option_display_id_001, TestSize.Level1) option.SetDisplayID(DISPLAY_ID); auto result = abilityMs_->StartAbility(want, option, nullptr); if (result == OHOS::ERR_OK) { - auto topAbility = abilityMs_->GetListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); + auto topAbility = abilityMs_->GetMissionListManagerByUserId(USER_ID_U100)->GetCurrentTopAbilityLocked(); if (topAbility) { auto defualtDisplayId = 0; auto displayId = topAbility->GetWant().GetIntParam(Want::PARAM_RESV_DISPLAY_ID, defualtDisplayId); diff --git a/test/unittest/ui_ability_lifecycle_manager_test/ui_ability_lifecycle_manager_test.cpp b/test/unittest/ui_ability_lifecycle_manager_test/ui_ability_lifecycle_manager_test.cpp index 600809ac543..27369d8f03f 100644 --- a/test/unittest/ui_ability_lifecycle_manager_test/ui_ability_lifecycle_manager_test.cpp +++ b/test/unittest/ui_ability_lifecycle_manager_test/ui_ability_lifecycle_manager_test.cpp @@ -1596,8 +1596,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, NotifySCBToStartUIAbility_001, TestSize. auto uiAbilityLifecycleManager = std::make_unique(); EXPECT_NE(uiAbilityLifecycleManager, nullptr); AbilityRequest abilityRequest; - int32_t userId = 100; - uiAbilityLifecycleManager->NotifySCBToStartUIAbility(abilityRequest, userId); + uiAbilityLifecycleManager->NotifySCBToStartUIAbility(abilityRequest); EXPECT_NE(uiAbilityLifecycleManager, nullptr); } @@ -1613,8 +1612,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, GetPersistentIdByAbilityRequest_001, Tes AbilityRequest abilityRequest; abilityRequest.abilityInfo.launchMode = AppExecFwk::LaunchMode::SPECIFIED; bool reuse = false; - int32_t userId = 100; - EXPECT_EQ(uiAbilityLifecycleManager->GetPersistentIdByAbilityRequest(abilityRequest, reuse, userId), 0); + EXPECT_EQ(uiAbilityLifecycleManager->GetPersistentIdByAbilityRequest(abilityRequest, reuse), 0); } /** @@ -1629,8 +1627,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, GetPersistentIdByAbilityRequest_002, Tes AbilityRequest abilityRequest; abilityRequest.abilityInfo.launchMode = AppExecFwk::LaunchMode::STANDARD; bool reuse = false; - int32_t userId = 100; - EXPECT_EQ(uiAbilityLifecycleManager->GetPersistentIdByAbilityRequest(abilityRequest, reuse, userId), 0); + EXPECT_EQ(uiAbilityLifecycleManager->GetPersistentIdByAbilityRequest(abilityRequest, reuse), 0); } /** @@ -1654,11 +1651,9 @@ HWTEST_F(UIAbilityLifecycleManagerTest, GetPersistentIdByAbilityRequest_003, Tes sessionInfo->persistentId = 1; abilityRequest.sessionInfo = sessionInfo; auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); - int32_t userId = 100; - abilityRecord->SetOwnerMissionUserId(userId); uiAbilityLifecycleManager->sessionAbilityMap_.emplace(sessionInfo->persistentId, abilityRecord); bool reuse = false; - EXPECT_EQ(uiAbilityLifecycleManager->GetPersistentIdByAbilityRequest(abilityRequest, reuse, userId), + EXPECT_EQ(uiAbilityLifecycleManager->GetPersistentIdByAbilityRequest(abilityRequest, reuse), sessionInfo->persistentId); } @@ -1684,8 +1679,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, GetPersistentIdByAbilityRequest_004, Tes auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); uiAbilityLifecycleManager->sessionAbilityMap_.emplace(sessionInfo->persistentId, abilityRecord); bool reuse = false; - int32_t userId = 100; - EXPECT_EQ(uiAbilityLifecycleManager->GetPersistentIdByAbilityRequest(abilityRequest1, reuse, userId), 0); + EXPECT_EQ(uiAbilityLifecycleManager->GetPersistentIdByAbilityRequest(abilityRequest1, reuse), 0); } /** @@ -1699,8 +1693,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, GetReusedSpecifiedPersistentId_001, Test EXPECT_NE(uiAbilityLifecycleManager, nullptr); AbilityRequest abilityRequest; bool reuse = false; - int32_t userId = 100; - EXPECT_EQ(uiAbilityLifecycleManager->GetReusedSpecifiedPersistentId(abilityRequest, reuse, userId), 0); + EXPECT_EQ(uiAbilityLifecycleManager->GetReusedSpecifiedPersistentId(abilityRequest, reuse), 0); } /** @@ -1728,11 +1721,9 @@ HWTEST_F(UIAbilityLifecycleManagerTest, GetReusedSpecifiedPersistentId_002, Test abilityRequest.sessionInfo = sessionInfo; auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); abilityRecord->SetSpecifiedFlag(flag); - int32_t userId = 100; - abilityRecord->SetOwnerMissionUserId(userId); uiAbilityLifecycleManager->sessionAbilityMap_.emplace(sessionInfo->persistentId, abilityRecord); bool reuse = false; - EXPECT_EQ(uiAbilityLifecycleManager->GetReusedSpecifiedPersistentId(abilityRequest, reuse, userId), + EXPECT_EQ(uiAbilityLifecycleManager->GetReusedSpecifiedPersistentId(abilityRequest, reuse), sessionInfo->persistentId); } @@ -1749,6 +1740,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, GetReusedSpecifiedPersistentId_003, Test abilityRequest.abilityInfo.launchMode = AppExecFwk::LaunchMode::SPECIFIED; abilityRequest.startRecent = true; std::string flag = "specified"; + abilityRequest.specifiedFlag = flag; Rosen::SessionInfo info; sptr sessionInfo(new SessionInfo()); @@ -1756,11 +1748,9 @@ HWTEST_F(UIAbilityLifecycleManagerTest, GetReusedSpecifiedPersistentId_003, Test sessionInfo->persistentId = 1; abilityRequest.sessionInfo = sessionInfo; auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); - abilityRecord->SetSpecifiedFlag(flag); uiAbilityLifecycleManager->sessionAbilityMap_.emplace(sessionInfo->persistentId, abilityRecord); bool reuse = false; - int32_t userId = 100; - EXPECT_EQ(uiAbilityLifecycleManager->GetReusedSpecifiedPersistentId(abilityRequest, reuse, userId), 0); + EXPECT_EQ(uiAbilityLifecycleManager->GetReusedSpecifiedPersistentId(abilityRequest, reuse), 0); } /** @@ -1774,8 +1764,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, GetReusedStandardPersistentId_001, TestS EXPECT_NE(uiAbilityLifecycleManager, nullptr); AbilityRequest abilityRequest; bool reuse = false; - int32_t userId = 100; - EXPECT_EQ(uiAbilityLifecycleManager->GetReusedStandardPersistentId(abilityRequest, reuse, userId), 0); + EXPECT_EQ(uiAbilityLifecycleManager->GetReusedStandardPersistentId(abilityRequest, reuse), 0); } /** @@ -1802,9 +1791,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, GetReusedStandardPersistentId_002, TestS auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); uiAbilityLifecycleManager->sessionAbilityMap_.emplace(sessionInfo->persistentId, abilityRecord); bool reuse = false; - int32_t userId = 100; - abilityRecord->SetOwnerMissionUserId(userId); - EXPECT_EQ(uiAbilityLifecycleManager->GetReusedStandardPersistentId(abilityRequest, reuse, userId), + EXPECT_EQ(uiAbilityLifecycleManager->GetReusedStandardPersistentId(abilityRequest, reuse), sessionInfo->persistentId); } @@ -1842,8 +1829,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, ResolveLocked_001, TestSize.Level1) auto uiAbilityLifecycleManager = std::make_unique(); EXPECT_NE(uiAbilityLifecycleManager, nullptr); AbilityRequest abilityRequest; - int32_t userId = 100; - EXPECT_EQ(uiAbilityLifecycleManager->ResolveLocked(abilityRequest, userId), RESOLVE_CALL_ABILITY_INNER_ERR); + EXPECT_EQ(uiAbilityLifecycleManager->ResolveLocked(abilityRequest), RESOLVE_CALL_ABILITY_INNER_ERR); } /** @@ -1857,8 +1843,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, ResolveLocked_002, TestSize.Level1) EXPECT_NE(uiAbilityLifecycleManager, nullptr); AbilityRequest abilityRequest; abilityRequest.callType = AbilityCallType::CALL_REQUEST_TYPE; - int32_t userId = 100; - EXPECT_EQ(uiAbilityLifecycleManager->ResolveLocked(abilityRequest, userId), RESOLVE_CALL_ABILITY_INNER_ERR); + EXPECT_EQ(uiAbilityLifecycleManager->ResolveLocked(abilityRequest), RESOLVE_CALL_ABILITY_INNER_ERR); } /** @@ -1885,8 +1870,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, CallAbilityLocked_001, TestSize.Level1) uiAbilityLifecycleManager->sessionAbilityMap_.emplace(sessionInfo->persistentId, abilityRecord); abilityRecord->isReady_ = true; - int32_t userId = 100; - uiAbilityLifecycleManager->CallAbilityLocked(abilityRequest, userId); + uiAbilityLifecycleManager->CallAbilityLocked(abilityRequest); EXPECT_NE(uiAbilityLifecycleManager, nullptr); } @@ -1904,8 +1888,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, CallAbilityLocked_002, TestSize.Level1) Want want; want.SetParam(Want::PARAM_RESV_CALL_TO_FOREGROUND, true); abilityRequest.want = want; - int32_t userId = 100; - uiAbilityLifecycleManager->CallAbilityLocked(abilityRequest, userId); + uiAbilityLifecycleManager->CallAbilityLocked(abilityRequest); EXPECT_NE(uiAbilityLifecycleManager, nullptr); } @@ -2152,9 +2135,8 @@ HWTEST_F(UIAbilityLifecycleManagerTest, DumpMissionList_001, TestSize.Level1) uiAbilityLifecycleManager->sessionAbilityMap_.emplace(1, abilityRecord); std::vector info; bool isClient = false; - int userId = -1; std::string args; - uiAbilityLifecycleManager->DumpMissionList(info, isClient, userId, args); + uiAbilityLifecycleManager->DumpMissionList(info, isClient, args); } /** @@ -2171,9 +2153,8 @@ HWTEST_F(UIAbilityLifecycleManagerTest, DumpMissionList_002, TestSize.Level1) uiAbilityLifecycleManager->sessionAbilityMap_.emplace(1, abilityRecord); std::vector info; bool isClient = false; - int userId = 100; std::string args; - uiAbilityLifecycleManager->DumpMissionList(info, isClient, userId, args); + uiAbilityLifecycleManager->DumpMissionList(info, isClient, args); } /** @@ -2192,9 +2173,8 @@ HWTEST_F(UIAbilityLifecycleManagerTest, DumpMissionListByRecordId_001, TestSize. std::vector info; bool isClient = false; int32_t abilityRecordId = 0; - int userId = 100; std::vector params; - uiAbilityLifecycleManager->DumpMissionListByRecordId(info, isClient, abilityRecordId, params, userId); + uiAbilityLifecycleManager->DumpMissionListByRecordId(info, isClient, abilityRecordId, params); } /** @@ -2212,9 +2192,8 @@ HWTEST_F(UIAbilityLifecycleManagerTest, DumpMissionListByRecordId_002, TestSize. std::vector info; bool isClient = false; int32_t abilityRecordId = 1; - int userId = 100; std::vector params; - uiAbilityLifecycleManager->DumpMissionListByRecordId(info, isClient, abilityRecordId, params, userId); + uiAbilityLifecycleManager->DumpMissionListByRecordId(info, isClient, abilityRecordId, params); } /** @@ -2333,8 +2312,7 @@ HWTEST_F(UIAbilityLifecycleManagerTest, StartSpecifiedAbilityBySCB_001, TestSize auto uiAbilityLifecycleManager = std::make_shared(); EXPECT_NE(uiAbilityLifecycleManager, nullptr); Want want; - int32_t userId = 0; - uiAbilityLifecycleManager->StartSpecifiedAbilityBySCB(want, userId); + uiAbilityLifecycleManager->StartSpecifiedAbilityBySCB(want); uiAbilityLifecycleManager.reset(); } -- Gitee