From 201bcd1afa3baaa6fedab71438d74e43068ac197 Mon Sep 17 00:00:00 2001 From: zhangzezhong Date: Mon, 30 Jun 2025 09:47:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81UIExtensionAbility=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E8=BF=9B=E7=A8=8B=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzezhong --- .../src/uri_permission_manager_client.cpp | 2 +- .../include/utils/request_id_util.h | 7 +++++-- .../src/ability_connect_manager.cpp | 5 ----- services/appmgr/src/app_mgr_service_inner.cpp | 7 ++----- services/appmgr/src/app_running_manager.cpp | 21 ------------------- 5 files changed, 8 insertions(+), 34 deletions(-) diff --git a/interfaces/inner_api/uri_permission/src/uri_permission_manager_client.cpp b/interfaces/inner_api/uri_permission/src/uri_permission_manager_client.cpp index c4682874d8d..a0de30377a5 100644 --- a/interfaces/inner_api/uri_permission/src/uri_permission_manager_client.cpp +++ b/interfaces/inner_api/uri_permission/src/uri_permission_manager_client.cpp @@ -30,7 +30,7 @@ const int LOAD_SA_TIMEOUT_MS = 4 * 1000; const int MAX_URI_COUNT = 200000; constexpr size_t MAX_IPC_RAW_DATA_SIZE = 128 * 1024 * 1024; // 128M -bool CheckUseRawData(const std::vector& uriVec) +bool CheckUseRawData(const std::vector &uriVec) { // broker can't use raw data return getuid() != AppUtils::GetInstance().GetCollaboratorBrokerUID(); diff --git a/services/abilitymgr/include/utils/request_id_util.h b/services/abilitymgr/include/utils/request_id_util.h index 11aa0428872..05e89f188a5 100644 --- a/services/abilitymgr/include/utils/request_id_util.h +++ b/services/abilitymgr/include/utils/request_id_util.h @@ -13,7 +13,9 @@ * limitations under the License. */ -#pragma once +#ifndef OHOS_ABILITY_RUNTIME_REQUEST_ID_UTIL_H +#define OHOS_ABILITY_RUNTIME_REQUEST_ID_UTIL_H + #include #include @@ -27,4 +29,5 @@ private: static std::atomic requestId_; }; } // namespace AbilityRuntime -} // namespace OHOS \ No newline at end of file +} // namespace OHOS +#endif // OHOS_ABILITY_RUNTIME_REQUEST_ID_UTIL_H \ No newline at end of file diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index c8942fd7dbf..2fbb8120596 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -1677,11 +1677,6 @@ void AbilityConnectManager::OnStartSpecifiedProcessTimeoutResponse(int32_t reque std::lock_guard guard(loadAbilityQueueLock_); TAG_LOGI(AAFwkTag::ABILITYMGR, "OnStartSpecifiedProcessTimeoutResponse requestId: %{public}d", requestId); - if (!loadAbilityQueue_.empty()) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "OnStartSpecifiedProcessTimeout pop_front"); - loadAbilityQueue_.pop_front(); - } - if (!loadAbilityQueue_.empty()) { auto &front = loadAbilityQueue_.front(); DelayedSingleton::GetInstance()->LoadAbility(*(front[requestId].loadParam), diff --git a/services/appmgr/src/app_mgr_service_inner.cpp b/services/appmgr/src/app_mgr_service_inner.cpp index ac2218535fa..b0e186ff8d3 100644 --- a/services/appmgr/src/app_mgr_service_inner.cpp +++ b/services/appmgr/src/app_mgr_service_inner.cpp @@ -498,14 +498,11 @@ void AppMgrServiceInner::StartSpecifiedProcess(const AAFwk::Want &want, const Ap masterAppRecord->ScheduleNewProcessRequest(want, hapModuleInfo.moduleName); return; } - std::shared_ptr appRecord = nullptr; TAG_LOGI(AAFwkTag::APPMGR, "main process do not exists."); + std::shared_ptr appRecord = nullptr; if (abilityInfo.type == AppExecFwk::AbilityType::PAGE) { - appRecord = !AAFwk::AppUtils::GetInstance().InOnNewProcessEnableList(bundleInfo.name) ? nullptr : - appRunningManager_->CheckAppRunningRecordForSpecifiedProcess(appInfo->uid, instanceKey, customProcessFlag); - } else { appRecord = - appRunningManager_->CheckAppRunningRecordForUIExtension(appInfo->uid, instanceKey, customProcessFlag); + appRunningManager_->CheckAppRunningRecordForSpecifiedProcess(appInfo->uid, instanceKey, customProcessFlag); } if (appRecord != nullptr) { TAG_LOGI(AAFwkTag::APPMGR, "starting process [%{public}s]", processName.c_str()); diff --git a/services/appmgr/src/app_running_manager.cpp b/services/appmgr/src/app_running_manager.cpp index a3a46976865..68a31a8a3f5 100644 --- a/services/appmgr/src/app_running_manager.cpp +++ b/services/appmgr/src/app_running_manager.cpp @@ -207,27 +207,6 @@ std::shared_ptr AppRunningManager::CheckAppRunningRecordForSpe return nullptr; } -std::shared_ptr AppRunningManager::CheckAppRunningRecordForUIExtension( - int32_t uid, const std::string &instanceKey, const std::string &customProcessFlag) -{ - HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::APPMGR, "uid: %{public}d: customProcessFlag: %{public}s", uid, customProcessFlag.c_str()); - auto appRunningMap = GetAppRunningRecordMap(); - for (const auto &item : appRunningMap) { - const auto &appRecord = item.second; - if (appRecord != nullptr && appRecord->GetInstanceKey() == instanceKey && appRecord->GetUid() == uid && - appRecord->GetExtensionType() == AppExecFwk::ExtensionAbilityType::SYS_COMMON_UI && - (appRecord->GetCustomProcessFlag() == customProcessFlag) && - !(appRecord->IsTerminating()) && !(appRecord->IsKilling()) && !(appRecord->GetRestartAppFlag()) && - !(appRecord->IsUserRequestCleaning()) && - !(appRecord->IsCaching() && appRecord->GetProcessCacheBlocked()) && - appRecord->GetKillReason() != AbilityRuntime::GlobalConstant::LOW_MEMORY_KILL) { - return appRecord; - } - } - return nullptr; -} - #ifdef APP_NO_RESPONSE_DIALOG bool AppRunningManager::CheckAppRunningRecordIsExist(const std::string &bundleName, const std::string &abilityName) { -- Gitee