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 c4682874d8d1c2940d085cb687a55b3376eaf3eb..a0de30377a5808805996176c79519dca4a860375 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 11aa0428872ca2abe14a5fb6a223a959d882567b..05e89f188a5e4359e68a542f908b48ddfaa3d05b 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 c8942fd7dbf98368d121d9a51ba2695e537b94f0..2fbb8120596b76ffed8ee32d6e6237f801d05f10 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 ac2218535fa3480f39046593fa1b1581094fc6c7..b0e186ff8d384b2b9b61cbaf1dbe2d30bb9f50c5 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 a3a4697686570a4b1e8f16a54d4047c689518163..68a31a8a3f5b5cc892c77a22b3727be35f67d298 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) {