From 065d6646083595971556964ae60361d2e88018c7 Mon Sep 17 00:00:00 2001 From: heguokai Date: Wed, 26 Mar 2025 09:11:46 +0000 Subject: [PATCH 01/10] Signed-off-by:heguokai --- .../bundlemgr/src/base_bundle_installer.cpp | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/services/bundlemgr/src/base_bundle_installer.cpp b/services/bundlemgr/src/base_bundle_installer.cpp index 86f4861ba3..e2c95e45d4 100644 --- a/services/bundlemgr/src/base_bundle_installer.cpp +++ b/services/bundlemgr/src/base_bundle_installer.cpp @@ -451,13 +451,19 @@ ErrCode BaseBundleInstaller::UninstallBundleByUninstallParam(const UninstallPara return ERR_APPEXECFWK_UNINSTALL_SHARE_APP_LIBRARY_IS_NOT_EXIST; } std::string uninstallDir = std::string(Constants::BUNDLE_CODE_DIR) + ServiceConstants::PATH_SEPARATOR + bundleName; + InstallParam installParam; if ((versionCodes.size() > SINGLE_HSP_VERSION && versionCode == Constants::ALL_VERSIONCODE) || versionCodes.size() == SINGLE_HSP_VERSION) { - return UninstallHspBundle(uninstallDir, info.GetBundleName()); + SendBundleSystemEvent(info.GetBundleName(), BundleEventType::UNINSTALL, installParam, + sysEventInfo_.preBundleScene, ret); + return ret; } else { uninstallDir += std::string(ServiceConstants::PATH_SEPARATOR) + HSP_VERSION_PREFIX + std::to_string(versionCode); - return UninstallHspVersion(uninstallDir, versionCode, info); + ret = UninstallHspVersion(uninstallDir, versionCode, info); + SendBundleSystemEvent(info.GetBundleName(), BundleEventType::UNINSTALL, installParam, + sysEventInfo_.preBundleScene, ret); + return ret; } } @@ -485,15 +491,8 @@ ErrCode BaseBundleInstaller::UninstallHspBundle(std::string &uninstallDir, const if (!DelayedSingleton::GetInstance()->DeleteAppProvisionInfo(bundleName)) { LOG_W(BMS_TAG_INSTALLER, "bundleName: %{public}s delete appProvisionInfo failed", bundleName.c_str()); } - InstallParam installParam; versionCode_ = Constants::ALL_VERSIONCODE; userId_ = Constants::ALL_USERID; - SendBundleSystemEvent( - bundleName, - BundleEventType::UNINSTALL, - installParam, - sysEventInfo_.preBundleScene, - errCode); PerfProfile::GetInstance().SetBundleUninstallEndTime(GetTickCount()); /* remove sign profile from code signature for cross-app hsp */ RemoveProfileFromCodeSign(bundleName); @@ -524,16 +523,9 @@ ErrCode BaseBundleInstaller::UninstallHspVersion(std::string &uninstallDir, int3 LOG_E(BMS_TAG_INSTALLER, "update install success failed"); return ERR_APPEXECFWK_UPDATE_BUNDLE_INSTALL_STATUS_ERROR; } - InstallParam installParam; versionCode_ = Constants::ALL_VERSIONCODE; userId_ = Constants::ALL_USERID; std::string bundleName = info.GetBundleName(); - SendBundleSystemEvent( - bundleName, - BundleEventType::UNINSTALL, - installParam, - sysEventInfo_.preBundleScene, - errCode); PerfProfile::GetInstance().SetBundleUninstallEndTime(GetTickCount()); return ERR_OK; } @@ -3702,9 +3694,9 @@ ErrCode BaseBundleInstaller::RemoveBundleDataDir( ErrCode result = InstalldClient::GetInstance()->RemoveBundleDataDir(info.GetBundleName(), userId_, info.GetApplicationBundleType() == BundleType::ATOMIC_SERVICE, async); + InstallParam installParam; if (result == ERR_APPEXECFWK_INSTALLD_REMOVE_DIR_FAILED) { LOG_W(BMS_TAG_INSTALLER, "RemoveBundleDataDir failed %{public}d", result); - InstallParam installParam; SendBundleSystemEvent( info.GetBundleName(), BundleEventType::UNINSTALL, @@ -3719,8 +3711,15 @@ ErrCode BaseBundleInstaller::RemoveBundleDataDir( auto extensionDirs = info.GetAllExtensionDirs(); result = InstalldClient::GetInstance()->RemoveExtensionDir(userId_, extensionDirs); } - if (result != ERR_OK) { + if (result == ERR_APPEXECFWK_INSTALLD_REMOVE_DIR_FAILED) { LOG_E(BMS_TAG_INSTALLER, "fail to remove bundle extension dir, error is %{public}d", result); + InstallParam installParam; + SendBundleSystemEvent( + info.GetBundleName(), + BundleEventType::UNINSTALL, + installParam, + sysEventInfo_.preBundleScene, + result); } return ERR_OK; } -- Gitee From f629e9d4510655c69cb13a88cdb8da1761196b91 Mon Sep 17 00:00:00 2001 From: heguokai Date: Wed, 26 Mar 2025 09:18:01 +0000 Subject: [PATCH 02/10] Signed-off-by:heguokai --- services/bundlemgr/src/base_bundle_installer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/bundlemgr/src/base_bundle_installer.cpp b/services/bundlemgr/src/base_bundle_installer.cpp index e2c95e45d4..ad0e832513 100644 --- a/services/bundlemgr/src/base_bundle_installer.cpp +++ b/services/bundlemgr/src/base_bundle_installer.cpp @@ -454,6 +454,7 @@ ErrCode BaseBundleInstaller::UninstallBundleByUninstallParam(const UninstallPara InstallParam installParam; if ((versionCodes.size() > SINGLE_HSP_VERSION && versionCode == Constants::ALL_VERSIONCODE) || versionCodes.size() == SINGLE_HSP_VERSION) { + ret = UninstallHspBundle(uninstallDir, info.GetBundleName()); SendBundleSystemEvent(info.GetBundleName(), BundleEventType::UNINSTALL, installParam, sysEventInfo_.preBundleScene, ret); return ret; -- Gitee From 8a2c1cd0b1336f0ff1df077471539e3f7f2fea64 Mon Sep 17 00:00:00 2001 From: heguokai Date: Wed, 26 Mar 2025 09:29:27 +0000 Subject: [PATCH 03/10] Signed-off-by:heguokai --- services/bundlemgr/src/base_bundle_installer.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/bundlemgr/src/base_bundle_installer.cpp b/services/bundlemgr/src/base_bundle_installer.cpp index ad0e832513..0c12e1b19f 100644 --- a/services/bundlemgr/src/base_bundle_installer.cpp +++ b/services/bundlemgr/src/base_bundle_installer.cpp @@ -421,7 +421,6 @@ ErrCode BaseBundleInstaller::UninstallBundleByUninstallParam(const UninstallPara LOG_E(BMS_TAG_INSTALLER, "uninstall bundle name or module name empty"); return ERR_APPEXECFWK_UNINSTALL_SHARE_APP_LIBRARY_IS_NOT_EXIST; } - if (!InitDataMgr()) { return ERR_APPEXECFWK_UNINSTALL_BUNDLE_MGR_SERVICE_ERROR; } @@ -459,9 +458,8 @@ ErrCode BaseBundleInstaller::UninstallBundleByUninstallParam(const UninstallPara sysEventInfo_.preBundleScene, ret); return ret; } else { - uninstallDir += std::string(ServiceConstants::PATH_SEPARATOR) + - HSP_VERSION_PREFIX + std::to_string(versionCode); - ret = UninstallHspVersion(uninstallDir, versionCode, info); + uninstallDir += std::string(ServiceConstants::PATH_SEPARATOR) + HSP_VERSION_PREFIX + std::to_string(versionCode); + ret = UninstallHspVersion(uninstallDir, versionCode, info); SendBundleSystemEvent(info.GetBundleName(), BundleEventType::UNINSTALL, installParam, sysEventInfo_.preBundleScene, ret); return ret; -- Gitee From 01a76be2eba074131b910f819b05db7794af3513 Mon Sep 17 00:00:00 2001 From: heguokai Date: Wed, 26 Mar 2025 09:42:20 +0000 Subject: [PATCH 04/10] Signed-off-by:heguokai --- services/bundlemgr/src/base_bundle_installer.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/services/bundlemgr/src/base_bundle_installer.cpp b/services/bundlemgr/src/base_bundle_installer.cpp index 0c12e1b19f..6a7d0d2c02 100644 --- a/services/bundlemgr/src/base_bundle_installer.cpp +++ b/services/bundlemgr/src/base_bundle_installer.cpp @@ -442,7 +442,6 @@ ErrCode BaseBundleInstaller::UninstallBundleByUninstallParam(const UninstallPara LOG_E(BMS_TAG_INSTALLER, "uninstall shared library is relied"); return ERR_APPEXECFWK_UNINSTALL_SHARE_APP_LIBRARY_IS_RELIED; } - // if uninstallParam do not contain versionCode, versionCode is ALL_VERSIONCODE std::vector versionCodes = info.GetAllHspVersion(); if (versionCode != Constants::ALL_VERSIONCODE && std::find(versionCodes.begin(), versionCodes.end(), versionCode) == versionCodes.end()) { @@ -453,16 +452,15 @@ ErrCode BaseBundleInstaller::UninstallBundleByUninstallParam(const UninstallPara InstallParam installParam; if ((versionCodes.size() > SINGLE_HSP_VERSION && versionCode == Constants::ALL_VERSIONCODE) || versionCodes.size() == SINGLE_HSP_VERSION) { - ret = UninstallHspBundle(uninstallDir, info.GetBundleName()); SendBundleSystemEvent(info.GetBundleName(), BundleEventType::UNINSTALL, installParam, - sysEventInfo_.preBundleScene, ret); - return ret; + sysEventInfo_.preBundleScene, UninstallHspBundle(uninstallDir, info.GetBundleName())); + return UninstallHspBundle(uninstallDir, info.GetBundleName()); } else { - uninstallDir += std::string(ServiceConstants::PATH_SEPARATOR) + HSP_VERSION_PREFIX + std::to_string(versionCode); - ret = UninstallHspVersion(uninstallDir, versionCode, info); + uninstallDir += std::string(ServiceConstants::PATH_SEPARATOR) + + HSP_VERSION_PREFIX + std::to_string(versionCode); SendBundleSystemEvent(info.GetBundleName(), BundleEventType::UNINSTALL, installParam, - sysEventInfo_.preBundleScene, ret); - return ret; + sysEventInfo_.preBundleScene, UninstallHspVersion(uninstallDir, versionCode, info)); + return UninstallHspVersion(uninstallDir, versionCode, info); } } -- Gitee From 3f4bf2832b32b3e097bfdf4dfa724a103ae73556 Mon Sep 17 00:00:00 2001 From: heguokai Date: Wed, 26 Mar 2025 10:54:09 +0000 Subject: [PATCH 05/10] Signed-off-by:heguokai --- .vscode/settings.json | 68 +++++++++++++++++++ .../bundlemgr/include/base_bundle_installer.h | 3 + .../bundlemgr/src/base_bundle_installer.cpp | 38 +++++++---- 3 files changed, 96 insertions(+), 13 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..2bb55118ae --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,68 @@ +{ + "files.associations": { + "algorithm": "cpp", + "any": "cpp", + "array": "cpp", + "atomic": "cpp", + "bit": "cpp", + "*.tcc": "cpp", + "bitset": "cpp", + "cctype": "cpp", + "chrono": "cpp", + "cinttypes": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "codecvt": "cpp", + "condition_variable": "cpp", + "csignal": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "deque": "cpp", + "list": "cpp", + "map": "cpp", + "set": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "vector": "cpp", + "exception": "cpp", + "functional": "cpp", + "iterator": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "numeric": "cpp", + "optional": "cpp", + "random": "cpp", + "ratio": "cpp", + "regex": "cpp", + "string": "cpp", + "string_view": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "fstream": "cpp", + "future": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "ostream": "cpp", + "shared_mutex": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "thread": "cpp", + "typeinfo": "cpp" + } +} \ No newline at end of file diff --git a/services/bundlemgr/include/base_bundle_installer.h b/services/bundlemgr/include/base_bundle_installer.h index 2bba99f7eb..d0df357bd6 100644 --- a/services/bundlemgr/include/base_bundle_installer.h +++ b/services/bundlemgr/include/base_bundle_installer.h @@ -191,6 +191,7 @@ protected: ErrCode RollbackHmpCommonInfo(const std::string &bundleName); + bool HasDriverExtensionAbility(const std::string &bundleName); bool IsEnterpriseForAllUser(const InstallParam &installParam, const std::string &bundleName); @@ -812,6 +813,8 @@ private: ErrCode CheckPreAppAllowHdcInstall(const InstallParam &installParam, const std::vector &hapVerifyRes); void CheckPreBundleRecoverResult(ErrCode &result); + ErrCode BaseBundleInstaller::UninstallBundleErrInfo(InnerBundleInfo &info, int32_t &versionCode, + std::string uninstallDir); bool IsAllowEnterPrise(); diff --git a/services/bundlemgr/src/base_bundle_installer.cpp b/services/bundlemgr/src/base_bundle_installer.cpp index 6a7d0d2c02..1838017abf 100644 --- a/services/bundlemgr/src/base_bundle_installer.cpp +++ b/services/bundlemgr/src/base_bundle_installer.cpp @@ -442,6 +442,7 @@ ErrCode BaseBundleInstaller::UninstallBundleByUninstallParam(const UninstallPara LOG_E(BMS_TAG_INSTALLER, "uninstall shared library is relied"); return ERR_APPEXECFWK_UNINSTALL_SHARE_APP_LIBRARY_IS_RELIED; } + // if uninstallParam do not contain versionCode, versionCode is ALL_VERSIONCODE std::vector versionCodes = info.GetAllHspVersion(); if (versionCode != Constants::ALL_VERSIONCODE && std::find(versionCodes.begin(), versionCodes.end(), versionCode) == versionCodes.end()) { @@ -449,19 +450,7 @@ ErrCode BaseBundleInstaller::UninstallBundleByUninstallParam(const UninstallPara return ERR_APPEXECFWK_UNINSTALL_SHARE_APP_LIBRARY_IS_NOT_EXIST; } std::string uninstallDir = std::string(Constants::BUNDLE_CODE_DIR) + ServiceConstants::PATH_SEPARATOR + bundleName; - InstallParam installParam; - if ((versionCodes.size() > SINGLE_HSP_VERSION && versionCode == Constants::ALL_VERSIONCODE) || - versionCodes.size() == SINGLE_HSP_VERSION) { - SendBundleSystemEvent(info.GetBundleName(), BundleEventType::UNINSTALL, installParam, - sysEventInfo_.preBundleScene, UninstallHspBundle(uninstallDir, info.GetBundleName())); - return UninstallHspBundle(uninstallDir, info.GetBundleName()); - } else { - uninstallDir += std::string(ServiceConstants::PATH_SEPARATOR) + - HSP_VERSION_PREFIX + std::to_string(versionCode); - SendBundleSystemEvent(info.GetBundleName(), BundleEventType::UNINSTALL, installParam, - sysEventInfo_.preBundleScene, UninstallHspVersion(uninstallDir, versionCode, info)); - return UninstallHspVersion(uninstallDir, versionCode, info); - } + return UninstallBundleErrInfo(info, versionCode); } ErrCode BaseBundleInstaller::UninstallHspBundle(std::string &uninstallDir, const std::string &bundleName) @@ -6552,6 +6541,29 @@ ErrCode BaseBundleInstaller::RollbackHmpCommonInfo(const std::string &bundleName return ERR_OK; } +ErrCode BaseBundleInstaller::UninstallBundleErrInfo(InnerBundleInfo &info, int32_t &versionCode, + std::string uninstallDir) +{ + std::vector versionCodes = info.GetAllHspVersion(); + InstallParam installParam; + ErrCode ret = ERR_OK; + if ((versionCodes.size() > SINGLE_HSP_VERSION && versionCode == Constants::ALL_VERSIONCODE) || + versionCodes.size() == SINGLE_HSP_VERSION) { + ErrCode ret = UninstallHspBundle(uninstallDir, info.GetBundleName()); + SendBundleSystemEvent(info.GetBundleName(), BundleEventType::UNINSTALL, installParam, + sysEventInfo_.preBundleScene, ret); + return ret; + } else { + uninstallDir += std::string(ServiceConstants::PATH_SEPARATOR) + + HSP_VERSION_PREFIX + std::to_string(versionCode); + ErrCode ret = UninstallHspVersion(uninstallDir, versionCode, info); + SendBundleSystemEvent(info.GetBundleName(), BundleEventType::UNINSTALL, installParam, + sysEventInfo_.preBundleScene, ret); + return ret; + } + return ret; +} + bool BaseBundleInstaller::IsAppInBlocklist(const std::string &bundleName, const int32_t userId) const { BmsExtensionDataMgr bmsExtensionDataMgr; -- Gitee From 51f66ad42d05eb6b4c4f647dfec7ec411fcc69d7 Mon Sep 17 00:00:00 2001 From: heguokai Date: Wed, 26 Mar 2025 10:54:33 +0000 Subject: [PATCH 06/10] Signed-off-by:heguokai --- .vscode/settings.json | 68 ------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 2bb55118ae..0000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "files.associations": { - "algorithm": "cpp", - "any": "cpp", - "array": "cpp", - "atomic": "cpp", - "bit": "cpp", - "*.tcc": "cpp", - "bitset": "cpp", - "cctype": "cpp", - "chrono": "cpp", - "cinttypes": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "codecvt": "cpp", - "condition_variable": "cpp", - "csignal": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cstring": "cpp", - "ctime": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "deque": "cpp", - "list": "cpp", - "map": "cpp", - "set": "cpp", - "unordered_map": "cpp", - "unordered_set": "cpp", - "vector": "cpp", - "exception": "cpp", - "functional": "cpp", - "iterator": "cpp", - "memory": "cpp", - "memory_resource": "cpp", - "numeric": "cpp", - "optional": "cpp", - "random": "cpp", - "ratio": "cpp", - "regex": "cpp", - "string": "cpp", - "string_view": "cpp", - "system_error": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp", - "fstream": "cpp", - "future": "cpp", - "initializer_list": "cpp", - "iomanip": "cpp", - "iosfwd": "cpp", - "iostream": "cpp", - "istream": "cpp", - "limits": "cpp", - "mutex": "cpp", - "new": "cpp", - "ostream": "cpp", - "shared_mutex": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "streambuf": "cpp", - "thread": "cpp", - "typeinfo": "cpp" - } -} \ No newline at end of file -- Gitee From 41b06af9253f520f8fd059b6419c7e025dd2ec2c Mon Sep 17 00:00:00 2001 From: heguokai Date: Wed, 26 Mar 2025 10:59:07 +0000 Subject: [PATCH 07/10] Signed-off-by:heguokai --- services/bundlemgr/src/base_bundle_installer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/bundlemgr/src/base_bundle_installer.cpp b/services/bundlemgr/src/base_bundle_installer.cpp index 1838017abf..4b4caac835 100644 --- a/services/bundlemgr/src/base_bundle_installer.cpp +++ b/services/bundlemgr/src/base_bundle_installer.cpp @@ -450,7 +450,7 @@ ErrCode BaseBundleInstaller::UninstallBundleByUninstallParam(const UninstallPara return ERR_APPEXECFWK_UNINSTALL_SHARE_APP_LIBRARY_IS_NOT_EXIST; } std::string uninstallDir = std::string(Constants::BUNDLE_CODE_DIR) + ServiceConstants::PATH_SEPARATOR + bundleName; - return UninstallBundleErrInfo(info, versionCode); + return UninstallBundleErrInfo(info, versionCode, uninstallDir); } ErrCode BaseBundleInstaller::UninstallHspBundle(std::string &uninstallDir, const std::string &bundleName) -- Gitee From 61682c06347eec5d2abe9ab5cb5af94b7cdf5928 Mon Sep 17 00:00:00 2001 From: heguokai Date: Wed, 26 Mar 2025 10:59:59 +0000 Subject: [PATCH 08/10] Signed-off-by:heguokai --- .vscode/settings.json | 68 +++++++++++++++++++ .../bundlemgr/include/base_bundle_installer.h | 2 +- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..2bb55118ae --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,68 @@ +{ + "files.associations": { + "algorithm": "cpp", + "any": "cpp", + "array": "cpp", + "atomic": "cpp", + "bit": "cpp", + "*.tcc": "cpp", + "bitset": "cpp", + "cctype": "cpp", + "chrono": "cpp", + "cinttypes": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "codecvt": "cpp", + "condition_variable": "cpp", + "csignal": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "deque": "cpp", + "list": "cpp", + "map": "cpp", + "set": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "vector": "cpp", + "exception": "cpp", + "functional": "cpp", + "iterator": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "numeric": "cpp", + "optional": "cpp", + "random": "cpp", + "ratio": "cpp", + "regex": "cpp", + "string": "cpp", + "string_view": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "fstream": "cpp", + "future": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "ostream": "cpp", + "shared_mutex": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "thread": "cpp", + "typeinfo": "cpp" + } +} \ No newline at end of file diff --git a/services/bundlemgr/include/base_bundle_installer.h b/services/bundlemgr/include/base_bundle_installer.h index d0df357bd6..e0000bb915 100644 --- a/services/bundlemgr/include/base_bundle_installer.h +++ b/services/bundlemgr/include/base_bundle_installer.h @@ -814,7 +814,7 @@ private: const std::vector &hapVerifyRes); void CheckPreBundleRecoverResult(ErrCode &result); ErrCode BaseBundleInstaller::UninstallBundleErrInfo(InnerBundleInfo &info, int32_t &versionCode, - std::string uninstallDir); + const std::string &uninstallDir); bool IsAllowEnterPrise(); -- Gitee From 07eb7030835235a51eeffca888ebf7d87424ad33 Mon Sep 17 00:00:00 2001 From: heguokai Date: Wed, 26 Mar 2025 11:16:44 +0000 Subject: [PATCH 09/10] Signed-off-by:heguokai --- services/bundlemgr/include/base_bundle_installer.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/bundlemgr/include/base_bundle_installer.h b/services/bundlemgr/include/base_bundle_installer.h index e0000bb915..551c11c35d 100644 --- a/services/bundlemgr/include/base_bundle_installer.h +++ b/services/bundlemgr/include/base_bundle_installer.h @@ -191,7 +191,6 @@ protected: ErrCode RollbackHmpCommonInfo(const std::string &bundleName); - bool HasDriverExtensionAbility(const std::string &bundleName); bool IsEnterpriseForAllUser(const InstallParam &installParam, const std::string &bundleName); @@ -813,7 +812,7 @@ private: ErrCode CheckPreAppAllowHdcInstall(const InstallParam &installParam, const std::vector &hapVerifyRes); void CheckPreBundleRecoverResult(ErrCode &result); - ErrCode BaseBundleInstaller::UninstallBundleErrInfo(InnerBundleInfo &info, int32_t &versionCode, + ErrCode UninstallBundleErrInfo(InnerBundleInfo &info, int32_t &versionCode, const std::string &uninstallDir); bool IsAllowEnterPrise(); -- Gitee From 8924ce895e263f4eb3c4207f1569d4dbee5fd484 Mon Sep 17 00:00:00 2001 From: heguokai Date: Wed, 26 Mar 2025 11:17:42 +0000 Subject: [PATCH 10/10] Signed-off-by:heguokai --- .vscode/settings.json | 68 ------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 2bb55118ae..0000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "files.associations": { - "algorithm": "cpp", - "any": "cpp", - "array": "cpp", - "atomic": "cpp", - "bit": "cpp", - "*.tcc": "cpp", - "bitset": "cpp", - "cctype": "cpp", - "chrono": "cpp", - "cinttypes": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "codecvt": "cpp", - "condition_variable": "cpp", - "csignal": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cstring": "cpp", - "ctime": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "deque": "cpp", - "list": "cpp", - "map": "cpp", - "set": "cpp", - "unordered_map": "cpp", - "unordered_set": "cpp", - "vector": "cpp", - "exception": "cpp", - "functional": "cpp", - "iterator": "cpp", - "memory": "cpp", - "memory_resource": "cpp", - "numeric": "cpp", - "optional": "cpp", - "random": "cpp", - "ratio": "cpp", - "regex": "cpp", - "string": "cpp", - "string_view": "cpp", - "system_error": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp", - "fstream": "cpp", - "future": "cpp", - "initializer_list": "cpp", - "iomanip": "cpp", - "iosfwd": "cpp", - "iostream": "cpp", - "istream": "cpp", - "limits": "cpp", - "mutex": "cpp", - "new": "cpp", - "ostream": "cpp", - "shared_mutex": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "streambuf": "cpp", - "thread": "cpp", - "typeinfo": "cpp" - } -} \ No newline at end of file -- Gitee