diff --git a/frameworks/bundle_lite/src/slite/bundlems_slite_client.cpp b/frameworks/bundle_lite/src/slite/bundlems_slite_client.cpp index 5aa81a67c15e36ab32a01710ceb19b471576008d..add659c3fd883f1ca9d4bf0477aef75d0be16e53 100755 --- a/frameworks/bundle_lite/src/slite/bundlems_slite_client.cpp +++ b/frameworks/bundle_lite/src/slite/bundlems_slite_client.cpp @@ -27,6 +27,7 @@ #include "want_utils.h" namespace OHOS { +const unsigned int BMS_INSTALL_MSG = 100; const unsigned int ERROR_SLEEP_TIMES = 300; const unsigned int RETRY_TIMES = 10; Bmsbuff *g_bmsbuff = nullptr; diff --git a/services/bundlemgr_lite/include/bundle_mgr_service.h b/services/bundlemgr_lite/include/bundle_mgr_service.h index 7bbcc5a8e2f4fbc965b34de6ed67d6ebaadbab4a..fcddf8e9daf984b2b76b90e92b756bf38714ed65 100755 --- a/services/bundlemgr_lite/include/bundle_mgr_service.h +++ b/services/bundlemgr_lite/include/bundle_mgr_service.h @@ -21,7 +21,6 @@ #include "nocopyable.h" namespace OHOS { -const unsigned int BMS_INSTALL_MSG = 100; const unsigned int BMS_UNINSTALL_MSG = 101; const unsigned int BMS_SCAN_PACKAGE_MSG = 102; const unsigned int BMS_REGISTER_CALLBACK_MSG = 103; diff --git a/services/bundlemgr_lite/include/bundle_mgr_slite_feature.h b/services/bundlemgr_lite/include/bundle_mgr_slite_feature.h index d9ff3bc24c743538f34fe5609057778583985ef2..7e940473b601bb16e1873560ff9eea8c7958d344 100755 --- a/services/bundlemgr_lite/include/bundle_mgr_slite_feature.h +++ b/services/bundlemgr_lite/include/bundle_mgr_slite_feature.h @@ -40,6 +40,7 @@ public: static bool RegisterInstallerCallback(InstallerCallback installerCallback); static void UpdateBundleInfoList(); static uint8_t GetBundleInfosNoReplication(const int flags, BundleInfo **bundleInfos, int32_t *len); + static void Init(); static BundleMgrSliteFeature *GetInstance() { diff --git a/services/bundlemgr_lite/src/bundle_mgr_service.cpp b/services/bundlemgr_lite/src/bundle_mgr_service.cpp index 72c967622eb2dc06180309ffb4ace8b6c0ce821a..475a288fd6f36ac7cefe52299ad33cbed4aa967f 100755 --- a/services/bundlemgr_lite/src/bundle_mgr_service.cpp +++ b/services/bundlemgr_lite/src/bundle_mgr_service.cpp @@ -17,6 +17,7 @@ #include "bundle_service_interface.h" #include "bundlems_log.h" +#include "bundle_mgr_slite_feature.h" #include "gt_bundle_manager_service.h" #include "ohos_init.h" #include "samgr_lite.h" @@ -40,6 +41,7 @@ static void Init() CHECK_NULLPTR_RETURN(sm, "BundleManagerService", "get samgr error"); #ifdef __LITEOS_M__ sm->RegisterService(BundleMgrService::GetInstance()); + BundleMgrSliteFeature::Init(); #else BOOL result = sm->RegisterService(BundleMgrService::GetInstance()); PRINTI("BundleManagerService", "bms starts %{public}s", result ? "successfully" : "unsuccessfully"); diff --git a/services/bundlemgr_lite/src/bundle_mgr_slite_feature.cpp b/services/bundlemgr_lite/src/bundle_mgr_slite_feature.cpp index 2e1d201e66901abd8c6206c6724eb2c7574b5efb..c76e1a0564180ef8c91a505e252802b6b9d85794 100755 --- a/services/bundlemgr_lite/src/bundle_mgr_slite_feature.cpp +++ b/services/bundlemgr_lite/src/bundle_mgr_slite_feature.cpp @@ -39,7 +39,7 @@ BundleMgrSliteFeatureImpl g_bmsSliteImpl = { DEFAULT_IUNKNOWN_ENTRY_END }; -static void Init() +void BundleMgrSliteFeature::Init() { SamgrLite *samgrLite = SAMGR_GetInstance(); CHECK_NULLPTR_RETURN(samgrLite, "BundleMgrSliteFeature", "get samgr error"); @@ -54,7 +54,6 @@ static void Init() BOOL apiResult = samgrLite->RegisterFeatureApi(BMS_SERVICE, BMS_SLITE_FEATURE, publicApi); PRINTI("BundleMgrSliteFeature", "bms feature init %{public}s", apiResult ? "success" : "failure"); } -SYSEX_FEATURE_INIT(Init); BundleMgrSliteFeature::BundleMgrSliteFeature() : Feature(), identity_() {