From d41828bee2472ea5121ff99d1fe1a300fb514717 Mon Sep 17 00:00:00 2001
From: shilei <shilei91@huawei.com>
Date: Tue, 29 Nov 2022 11:24:09 +0800
Subject: [PATCH] fixed 8ea8ee3 from
 https://gitee.com/shilei91/bundlemanager_bundle_framework_lite/pulls/237 add
 peromission

Signed-off-by: shilei <shilei91@huawei.com>
Change-Id: I2abc02fc6645656a6e573a8b2416b7d4886833b8
---
 services/bundlemgr_lite/BUILD.gn                    | 5 +++++
 services/bundlemgr_lite/src/gt_bundle_installer.cpp | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn
index b57e518..0c5917d 100644
--- a/services/bundlemgr_lite/BUILD.gn
+++ b/services/bundlemgr_lite/BUILD.gn
@@ -19,6 +19,7 @@ config("bundle_config") {
 
 declare_args() {
   enable_ohos_bundle_manager_service = false
+  enable_ohos_bundle_manager_service_permission = false
 }
 
 if (ohos_kernel_type == "liteos_m") {
@@ -40,6 +41,10 @@ if (ohos_kernel_type == "liteos_m") {
       defines += [ "_MINI_BMS_" ]
     }
 
+    if (enable_ohos_bundle_manager_service_permission == true) {
+      defines += [ "_MINI_BMS_PERMISSION_" ]
+    }
+
     deps = [
       "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle",
       "//base/global/resource_management_lite/frameworks/resmgr_lite:global_resmgr",
diff --git a/services/bundlemgr_lite/src/gt_bundle_installer.cpp b/services/bundlemgr_lite/src/gt_bundle_installer.cpp
index 1361b63..2d2e743 100644
--- a/services/bundlemgr_lite/src/gt_bundle_installer.cpp
+++ b/services/bundlemgr_lite/src/gt_bundle_installer.cpp
@@ -590,7 +590,7 @@ uint8_t GtBundleInstaller::Uninstall(const char *bundleName)
     if (sprintf_s(bundleJsonPath, PATH_LENGTH, "%s%s%s", JSON_PATH, bundleName, JSON_SUFFIX) < 0) {
         return ERR_APPEXECFWK_UNINSTALL_FAILED_INTERNAL_ERROR;
     }
-#ifdef _MINI_BMS_
+#ifdef _MINI_BMS_PERMISSION_
     if (DeletePermissions(const_cast<char *>(bundleName)) < 0) {
         return ERR_APPEXECFWK_UNINSTALL_FAILED_DELETE_PERMISSIONS_ERROR;
     }
@@ -747,7 +747,7 @@ uint8_t GtBundleInstaller::StorePermissions(const char *bundleName, PermissionTr
     bool isUpdate)
 {
     if (permNum == 0) {
-#ifdef _MINI_BMS_
+#ifdef _MINI_BMS_PERMISSION_
         if (isUpdate) {
             int32_t ret = DeletePermissions(bundleName);
             HILOG_INFO(HILOG_MODULE_AAFWK, "[BMS] delete permissions, result is %d", ret);
@@ -763,7 +763,7 @@ uint8_t GtBundleInstaller::StorePermissions(const char *bundleName, PermissionTr
     if (!BundleUtil::IsDir(PERMISSIONS_PATH)) {
         BundleUtil::MkDirs(PERMISSIONS_PATH);
     }
-#ifdef _MINI_BMS_
+#ifdef _MINI_BMS_PERMISSION_
     if (SaveOrUpdatePermissions(const_cast<char *>(bundleName), permissions, permNum,
         static_cast<IsUpdate>(isUpdate)) != 0) {
             return ERR_APPEXECFWK_INSTALL_FAILED_STORE_PERMISSIONS_ERROR;
-- 
Gitee