openharmony/appexecfwk_standard
1
0
Fork 0
mirror of https://github.com/openharmony/appexecfwk_standard.git synced 2026-07-19 14:06:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

!1239 去除冗余的handle对象

Browse Source 
Merge pull request !1239 from dy/handle
This commit is contained in:
openharmony_ci
2022-04-18 02:34:17 +00:00
committed by Gitee
parent 9fd8a68176 1c1ee69967
commit 91eb29dfd7
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/innerkits/appexecfwk_base/include/free_install/free_install_params.h
-2
View File
@@ -18,7 +18,6 @@
#include <string>
#include "event_handler.h"
#include "iremote_object.h"
#include "service_center_code.h"
#include "want.h"
@@ -30,7 +29,6 @@ struct FreeInstallParams : public virtual RefBase {
OHOS::AAFwk::Want want;
int32_t userId;
ServiceCenterFunction serviceCenterFunction;
std::shared_ptr<AppExecFwk::EventHandler> handler;
};
} // namespace AppExecFwk
} // namespace OHOS
services/bundlemgr/src/free_install/bundle_connect_ability_mgr.cpp
+2 -12
View File
@@ -287,9 +287,6 @@ void BundleConnectAbilityMgr::OnServiceCenterCall(std::string installResultStr)
return;
}
freeInstallParams = node->second;
if (freeInstallParams.handler != nullptr) {
freeInstallParams.handler.reset();
}
if (installResult.result.retCode == ServiceCenterResultCode::FREE_INSTALL_DOWNLOADING) {
APP_LOGI("ServiceCenter is downloading, downloadSize = %{public}d, totalSize = %{public}d",
installResult.progress.downloadSize, installResult.progress.totalSize);
@@ -311,8 +308,7 @@ void BundleConnectAbilityMgr::OutTimeMonitor(std::string transactId)
return;
}
freeInstallParams = node->second;
std::shared_ptr<AppExecFwk::EventHandler> handler = freeInstallParams.handler;
if (handler == nullptr) {
if (handler_ == nullptr) {
APP_LOGE("OutTimeMonitor, handler is nullptr");
return;
}
@@ -321,7 +317,7 @@ void BundleConnectAbilityMgr::OutTimeMonitor(std::string transactId)
freeInstallParams.want, freeInstallParams.userId, transactId);
APP_LOGI("RegisterEventListenerFunc");
};
handler->PostTask(RegisterEventListenerFunc, OUT_TIME, AppExecFwk::EventQueue::Priority::LOW);
handler_->PostTask(RegisterEventListenerFunc, OUT_TIME, AppExecFwk::EventQueue::Priority::LOW);
}
void BundleConnectAbilityMgr::SendRequest(
@@ -481,8 +477,6 @@ bool BundleConnectAbilityMgr::CheckIsModuleNeedUpdate(
freeInstallParams->want = want;
freeInstallParams->userId = userId;
freeInstallParams->serviceCenterFunction = ServiceCenterFunction::SERVICE_CENTER_CONNECT_UPGRADE_INSTALL;
auto runner = EventRunner::Create(true);
freeInstallParams->handler = std::make_shared<AppExecFwk::EventHandler>(runner);
auto ret = freeInstallParamsMap_.emplace(targetInfo->transactId, *freeInstallParams);
if (!ret.second) {
APP_LOGE("BundleConnectAbilityMgr::QueryAbilityInfo map emplace error");
@@ -548,8 +542,6 @@ bool BundleConnectAbilityMgr::QueryAbilityInfo(const Want &want, int32_t flags,
return false;
}
GetTargetAbilityInfo(want, innerBundleInfo, targetAbilityInfo, targetInfo);
auto runner = EventRunner::Create(true);
freeInstallParams->handler = std::make_shared<AppExecFwk::EventHandler>(runner);
freeInstallParams->serviceCenterFunction = ServiceCenterFunction::SERVICE_CENTER_CONNECT_SILENT_INSTALL;
auto ret = freeInstallParamsMap_.emplace(targetInfo->transactId, *freeInstallParams);
if (!ret.second) {
@@ -589,8 +581,6 @@ void BundleConnectAbilityMgr::UpgradeAtomicService(const Want &want, int32_t use
freeInstallParams->want = want;
freeInstallParams->userId = userId;
freeInstallParams->serviceCenterFunction = ServiceCenterFunction::SERVICE_CENTER_CONNECT_UPGRADE_CHECK;
auto runner = EventRunner::Create(true);
freeInstallParams->handler = std::make_shared<AppExecFwk::EventHandler>(runner);
auto ret = freeInstallParamsMap_.emplace(targetInfo->transactId, *freeInstallParams);
if (!ret.second) {
APP_LOGE("BundleConnectAbilityMgr::QueryAbilityInfo map emplace error");