From 7113c79573e67a672c67854584c5629a21a721e3 Mon Sep 17 00:00:00 2001
From: wangdengjia <wangdengjia@huawei.com>
Date: Wed, 19 May 2021 15:34:23 +0800
Subject: [PATCH] IssueNo:#I3RZRB Description:Add log interface Sig:startup
 Feature or Bugfix:Bugfix Binary Source:No

---
 services/bundlemgr_lite/include/bundlems_log.h            | 2 --
 services/bundlemgr_lite/src/bundle_mgr_service.cpp        | 6 ++++--
 services/bundlemgr_lite/src/bundle_util.cpp               | 2 ++
 services/bundlemgr_lite/src/gt_bundle_installer.cpp       | 1 -
 services/bundlemgr_lite/src/gt_bundle_manager_service.cpp | 3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/services/bundlemgr_lite/include/bundlems_log.h b/services/bundlemgr_lite/include/bundlems_log.h
index f981554..933673c 100755
--- a/services/bundlemgr_lite/include/bundlems_log.h
+++ b/services/bundlemgr_lite/include/bundlems_log.h
@@ -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
diff --git a/services/bundlemgr_lite/src/bundle_mgr_service.cpp b/services/bundlemgr_lite/src/bundle_mgr_service.cpp
index 33c1749..728301b 100755
--- a/services/bundlemgr_lite/src/bundle_mgr_service.cpp
+++ b/services/bundlemgr_lite/src/bundle_mgr_service.cpp
@@ -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;
 }
diff --git a/services/bundlemgr_lite/src/bundle_util.cpp b/services/bundlemgr_lite/src/bundle_util.cpp
index 068a8e6..7458161 100755
--- a/services/bundlemgr_lite/src/bundle_util.cpp
+++ b/services/bundlemgr_lite/src/bundle_util.cpp
@@ -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
diff --git a/services/bundlemgr_lite/src/gt_bundle_installer.cpp b/services/bundlemgr_lite/src/gt_bundle_installer.cpp
index 53c4ac8..88beac1 100755
--- a/services/bundlemgr_lite/src/gt_bundle_installer.cpp
+++ b/services/bundlemgr_lite/src/gt_bundle_installer.cpp
@@ -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)) {
diff --git a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp
index 03d27ec..82d589a 100755
--- a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp
+++ b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp
@@ -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;
-- 
Gitee