openharmony/bundlemanager_bundle_framework_lite
1
0
Fork 0
mirror of https://github.com/openharmony/bundlemanager_bundle_framework_lite.git synced 2026-07-20 23:55:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

!15 【OpenHarmony】【轻量级应用程序框架子系统】BMS添加日志接口

Browse Source 
Merge pull request !15 from wangdengjia/issue_#I3RZRB
This commit is contained in:
openharmony_ci
2021-05-20 10:55:16 +08:00
committed by Gitee
parent 631f790cd4 7113c79573
commit 1393848a22
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/bundlemgr_lite/include/bundlems_log.h
-2
View File
@@ -16,9 +16,7 @@
#ifndef OHOS_LOGGING_H
#define OHOS_LOGGING_H
#ifndef APP_PLATFORM_WATCHGT
#include "log.h"
#endif
namespace OHOS {
#undef LOG_TAG
services/bundlemgr_lite/src/bundle_mgr_service.cpp
+4 -2
View File
@@ -76,14 +76,16 @@ BOOL BundleMgrService::ServiceMessageHandle(Service *service, Request *request)
if (request == nullptr) {
return FALSE;
}
if (request->msgId == BMS_INSTALL_MSG) {
if (request->msgId == BMS_INSTALL_MSG && g_bmsbuff != nullptr) {
OHOS::GtManagerService::GetInstance().Install(g_bmsbuff->bundleParameter, nullptr,
g_bmsbuff->bundleInstallerCallback);
} else if (request->msgId == BMS_UNINSTALL_MSG) {
} else if (request->msgId == BMS_UNINSTALL_MSG && g_bmsbuff != nullptr) {
OHOS::GtManagerService::GetInstance().Uninstall(g_bmsbuff->bundleParameter, nullptr,
g_bmsbuff->bundleInstallerCallback);
} else if (request->msgId == BMS_SCAN_PACKAGE_MSG) {
OHOS::GtManagerService::GetInstance().ScanPackages();
} else {
return FALSE;
}
return TRUE;
}
services/bundlemgr_lite/src/bundle_util.cpp
+2
View File
@@ -754,9 +754,11 @@ bool BundleUtil::RemoveDir(const char *path)
AdapterFree(curPath);
}
}
#ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER
for (auto node = list->Begin(); node != list->End(); node = node->next_) {
AdapterFree(node->value_);
}
#endif
if (!list->IsEmpty()) {
delete list;
#ifdef APP_PLATFORM_WATCHGT
services/bundlemgr_lite/src/gt_bundle_installer.cpp
-1
View File
@@ -197,7 +197,6 @@ uint8_t GtBundleInstaller::Install(const char *path, char* &resultBundleName)
if (errorCode != ERR_OK) {
return errorCode;
}
resultBundleName = Utils::Strdup(installRecord.bundleName);
// rename bundle.json
if (!RenameJsonFile(installRecord.bundleName, randStr)) {
services/bundlemgr_lite/src/gt_bundle_manager_service.cpp
+2 -1
View File
@@ -106,6 +106,7 @@ bool GtManagerService::Install(const char *hapPath, const InstallParam *installP
return false;
}
char *resultMessage = Utils::Strdup(name);
char *retMessage = Utils::Strdup(name);
if (installerCallback != nullptr) {
(*installerCallback)(OPERATION_DOING, resultMessage + 1);
}
@@ -114,7 +115,7 @@ bool GtManagerService::Install(const char *hapPath, const InstallParam *installP
uint8_t ret = installer_->Install(path, resultBundleName);
EnableServiceWdg();
if (installerCallback != nullptr) {
(*installerCallback)(ret, resultBundleName);
(*installerCallback)(ret, retMessage + 1);
}
AdapterFree(path);
return true;