From 4d198965e24488896787c58df93f7534087330cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E5=97=A3=E9=92=8A?= Date: Sun, 29 Jun 2025 11:01:47 +0000 Subject: [PATCH 1/2] update services/abilitymgr/src/deeplink_reserve/deeplink_reserve_config.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 段嗣钊 --- .../abilitymgr/src/deeplink_reserve/deeplink_reserve_config.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/abilitymgr/src/deeplink_reserve/deeplink_reserve_config.cpp b/services/abilitymgr/src/deeplink_reserve/deeplink_reserve_config.cpp index f7cb86395c3..216f5c95bbb 100644 --- a/services/abilitymgr/src/deeplink_reserve/deeplink_reserve_config.cpp +++ b/services/abilitymgr/src/deeplink_reserve/deeplink_reserve_config.cpp @@ -15,6 +15,8 @@ #include "deeplink_reserve/deeplink_reserve_config.h" + + #include #include #include -- Gitee From b993c140fb912a017ef7bce06416d93e04d96333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E5=97=A3=E9=92=8A?= Date: Sun, 29 Jun 2025 11:26:31 +0000 Subject: [PATCH 2/2] update services/appmgr/src/ability_running_record.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 段嗣钊 --- .../appmgr/src/ability_running_record.cpp | 343 ++++++++++++++++++ 1 file changed, 343 insertions(+) diff --git a/services/appmgr/src/ability_running_record.cpp b/services/appmgr/src/ability_running_record.cpp index 7de17bb7650..e65560b3b75 100644 --- a/services/appmgr/src/ability_running_record.cpp +++ b/services/appmgr/src/ability_running_record.cpp @@ -183,3 +183,346 @@ int32_t AbilityRunningRecord::GetUIExtensionBindAbilityId() const } } // namespace AppExecFwk } // namespace OHOS + + +// #include "ability_running_record.h" +// #include "hilog_tag_wrapper.h" + +// namespace OHOS { +// namespace AppExecFwk { +// namespace { +// constexpr const char* BUNDLE_NAME_SCENEBOARD = "com.ohos.sceneboard"; +// constexpr const char* SCENEBOARD_ABILITY_NAME = "com.ohos.sceneboard.MainAbility"; +// constexpr const char* IS_HOOK = "ohos.ability_runtime.is_hook"; +// static const std::string EMPTY_NAME; +// } +// AbilityRunningRecord::AbilityRunningRecord(std::shared_ptr info, +// sptr token, int32_t abilityRecordId) +// : abilityRecordId_(abilityRecordId), info_(info), token_(token) +// {} + +// AbilityRunningRecord::~AbilityRunningRecord() +// {} + +// const std::string &AbilityRunningRecord::GetName() const +// { +// if (info_ == nullptr) { +// TAG_LOGE(AAFwkTag::APPMGR, "GetName info_ nullptr"); +// return EMPTY_NAME; +// } +// return info_->name; +// } + +// const std::string &AbilityRunningRecord::GetBundleName() const +// { +// if (info_ == nullptr) { +// TAG_LOGE(AAFwkTag::APPMGR, "GetBundleName info_ nullptr"); +// return EMPTY_NAME; +// } +// return info_->bundleName; +// } + +// const std::string &AbilityRunningRecord::GetModuleName() const +// { +// if (info_ == nullptr) { +// TAG_LOGE(AAFwkTag::APPMGR, "GetModuleName info_ nullptr"); +// return EMPTY_NAME; +// } +// return info_->moduleName; +// } + +// const std::shared_ptr &AbilityRunningRecord::GetAbilityInfo() const +// { +// return info_; +// } + +// const std::shared_ptr &AbilityRunningRecord::GetWant() const +// { +// return want_; +// } + +// void AbilityRunningRecord::SetWant(const std::shared_ptr &want) +// { +// want_ = want; +// } + +// const sptr &AbilityRunningRecord::GetToken() const +// { +// return token_; +// } + +// void AbilityRunningRecord::SetState(const AbilityState state) +// { +// state_ = state; +// } + +// AbilityState AbilityRunningRecord::GetState() const +// { +// return state_; +// } + +// void AbilityRunningRecord::SetEventId(const int64_t eventId) +// { +// eventId_ = eventId; +// } + +// int64_t AbilityRunningRecord::GetEventId() const +// { +// return eventId_; +// } + +// void AbilityRunningRecord::SetTerminating() +// { +// isTerminating_ = true; +// } + +// bool AbilityRunningRecord::IsTerminating() const +// { +// return isTerminating_; +// } + +// void AbilityRunningRecord::SetOwnerUserId(int32_t ownerUserId) +// { +// ownerUserId_ = ownerUserId; +// } + +// int32_t AbilityRunningRecord::GetOwnerUserId() const +// { +// return ownerUserId_; +// } + +// void AbilityRunningRecord::SetIsSingleUser(bool flag) +// { +// isSingleUser_ = flag; +// } + +// bool AbilityRunningRecord::IsSingleUser() const +// { +// return isSingleUser_; +// } + +// void AbilityRunningRecord::UpdateFocusState(bool isFocus) +// { +// isFocused_ = isFocus; +// } + +// bool AbilityRunningRecord::GetFocusFlag() const +// { +// return isFocused_; +// } + +// void AbilityRunningRecord::SetUIExtensionAbilityId(const int32_t uiExtensionAbilityId) +// { +// uiExtensionAbilityId_ = uiExtensionAbilityId; +// } + +// int32_t AbilityRunningRecord::GetUIExtensionAbilityId() const +// { +// return uiExtensionAbilityId_; +// } + +// void AbilityRunningRecord::SetUserRequestCleaningStatus() +// { +// isUserRequestCleaning_ = true; +// } + +// bool AbilityRunningRecord::IsUserRequestCleaning() const +// { +// return isUserRequestCleaning_; +// } + +// bool AbilityRunningRecord::IsSceneBoard() const +// { +// if (info_ == nullptr) { +// return false; +// } +// return info_->name == SCENEBOARD_ABILITY_NAME && info_->bundleName == BUNDLE_NAME_SCENEBOARD; +// } + +// bool AbilityRunningRecord::IsHook() const +// { +// return want_ && want_->GetBoolParam(IS_HOOK, false); +// } + +// void AbilityRunningRecord::SetUIExtensionBindAbilityId(const int32_t uiExtensionBindAbilityId) +// { +// uiExtensionBindAbilityId_ = uiExtensionBindAbilityId; +// } + +// int32_t AbilityRunningRecord::GetUIExtensionBindAbilityId() const +// { +// return uiExtensionBindAbilityId_; +// } +// } // namespace AppExecFwk +// } // namespace OHOS + +// #include "ability_running_record.h" +// #include "hilog_tag_wrapper.h" + +// namespace OHOS { +// namespace AppExecFwk { +// namespace { +// constexpr const char* BUNDLE_NAME_SCENEBOARD = "com.ohos.sceneboard"; +// constexpr const char* SCENEBOARD_ABILITY_NAME = "com.ohos.sceneboard.MainAbility"; +// constexpr const char* IS_HOOK = "ohos.ability_runtime.is_hook"; +// static const std::string EMPTY_NAME; +// } +// AbilityRunningRecord::AbilityRunningRecord(std::shared_ptr info, +// sptr token, int32_t abilityRecordId) +// : abilityRecordId_(abilityRecordId), info_(info), token_(token) +// {} + +// AbilityRunningRecord::~AbilityRunningRecord() +// {} + +// const std::string &AbilityRunningRecord::GetName() const +// { +// if (info_ == nullptr) { +// TAG_LOGE(AAFwkTag::APPMGR, "GetName info_ nullptr"); +// return EMPTY_NAME; +// } +// return info_->name; +// } + +// const std::string &AbilityRunningRecord::GetBundleName() const +// { +// if (info_ == nullptr) { +// TAG_LOGE(AAFwkTag::APPMGR, "GetBundleName info_ nullptr"); +// return EMPTY_NAME; +// } +// return info_->bundleName; +// } + +// const std::string &AbilityRunningRecord::GetModuleName() const +// { +// if (info_ == nullptr) { +// TAG_LOGE(AAFwkTag::APPMGR, "GetModuleName info_ nullptr"); +// return EMPTY_NAME; +// } +// return info_->moduleName; +// } + +// const std::shared_ptr &AbilityRunningRecord::GetAbilityInfo() const +// { +// return info_; +// } + +// const std::shared_ptr &AbilityRunningRecord::GetWant() const +// { +// return want_; +// } + +// void AbilityRunningRecord::SetWant(const std::shared_ptr &want) +// { +// want_ = want; +// } + +// const sptr &AbilityRunningRecord::GetToken() const +// { +// return token_; +// } + +// void AbilityRunningRecord::SetState(const AbilityState state) +// { +// state_ = state; +// } + +// AbilityState AbilityRunningRecord::GetState() const +// { +// return state_; +// } + +// void AbilityRunningRecord::SetEventId(const int64_t eventId) +// { +// eventId_ = eventId; +// } + +// int64_t AbilityRunningRecord::GetEventId() const +// { +// return eventId_; +// } + +// void AbilityRunningRecord::SetTerminating() +// { +// isTerminating_ = true; +// } + +// bool AbilityRunningRecord::IsTerminating() const +// { +// return isTerminating_; +// } + +// void AbilityRunningRecord::SetOwnerUserId(int32_t ownerUserId) +// { +// ownerUserId_ = ownerUserId; +// } + +// int32_t AbilityRunningRecord::GetOwnerUserId() const +// { +// return ownerUserId_; +// } + +// void AbilityRunningRecord::SetIsSingleUser(bool flag) +// { +// isSingleUser_ = flag; +// } + +// bool AbilityRunningRecord::IsSingleUser() const +// { +// return isSingleUser_; +// } + +// void AbilityRunningRecord::UpdateFocusState(bool isFocus) +// { +// isFocused_ = isFocus; +// } + +// bool AbilityRunningRecord::GetFocusFlag() const +// { +// return isFocused_; +// } + +// void AbilityRunningRecord::SetUIExtensionAbilityId(const int32_t uiExtensionAbilityId) +// { +// uiExtensionAbilityId_ = uiExtensionAbilityId; +// } + +// int32_t AbilityRunningRecord::GetUIExtensionAbilityId() const +// { +// return uiExtensionAbilityId_; +// } + +// void AbilityRunningRecord::SetUserRequestCleaningStatus() +// { +// isUserRequestCleaning_ = true; +// } + +// bool AbilityRunningRecord::IsUserRequestCleaning() const +// { +// return isUserRequestCleaning_; +// } + +// bool AbilityRunningRecord::IsSceneBoard() const +// { +// if (info_ == nullptr) { +// return false; +// } +// return info_->name == SCENEBOARD_ABILITY_NAME && info_->bundleName == BUNDLE_NAME_SCENEBOARD; +// } + +// bool AbilityRunningRecord::IsHook() const +// { +// return want_ && want_->GetBoolParam(IS_HOOK, false); +// } + +// void AbilityRunningRecord::SetUIExtensionBindAbilityId(const int32_t uiExtensionBindAbilityId) +// { +// uiExtensionBindAbilityId_ = uiExtensionBindAbilityId; +// } + +// int32_t AbilityRunningRecord::GetUIExtensionBindAbilityId() const +// { +// return uiExtensionBindAbilityId_; +// } +// } // namespace AppExecFwk +// } // namespace OHOS -- Gitee