diff --git a/services/common/src/bundle_active_service.cpp b/services/common/src/bundle_active_service.cpp index ac6e0920f346167b2a9d15e7a5c04adaf79f3806..74dd4ad3ea4b92f4227d800344aa1c3ccfa59536 100644 --- a/services/common/src/bundle_active_service.cpp +++ b/services/common/src/bundle_active_service.cpp @@ -126,7 +126,6 @@ void BundleActiveService::InitNecessaryState() void BundleActiveService::InitService() { - HiviewDFX::Watchdog::GetInstance().InitFfrtWatchdog(); if (bundleActiveCore_ == nullptr) { bundleActiveCore_ = std::make_shared(); bundleActiveCore_->Init(); diff --git a/services/common/src/bundle_active_usage_database.cpp b/services/common/src/bundle_active_usage_database.cpp index 3da0d5e08477787202da0a3f22959f1bb5a0aafa..e823a93e58bf302670f6232ce3eed3b337c83057 100644 --- a/services/common/src/bundle_active_usage_database.cpp +++ b/services/common/src/bundle_active_usage_database.cpp @@ -1085,7 +1085,7 @@ void BundleActiveUsageDatabase::FlushEventInfo(uint32_t databaseType, BundleActi } int64_t eventTableTime = ParseStartTime(eventTableName_); std::vector valuesBuckets; - for (uint32_t i = 0; i < stats.events_.Size(); i++) { + for (int32_t i = 0; i < stats.events_.Size(); i++) { NativeRdb::ValuesBucket valuesBucket; valuesBucket.PutInt(BUNDLE_ACTIVE_DB_USER_ID, stats.userId_); valuesBucket.PutString(BUNDLE_ACTIVE_DB_BUNDLE_NAME, stats.events_.events_.at(i).bundleName_); diff --git a/services/packagegroup/src/bundle_active_group_controller.cpp b/services/packagegroup/src/bundle_active_group_controller.cpp index 367e8c0279c27ed09bcee0be4791209c64b31eb6..068b06188b4af81ebe368243cfc36ef0fa2832d3 100644 --- a/services/packagegroup/src/bundle_active_group_controller.cpp +++ b/services/packagegroup/src/bundle_active_group_controller.cpp @@ -210,7 +210,6 @@ void BundleActiveGroupController::CheckIdleStatsOneTime() std::make_shared(tmpGroupHandlerObj); auto handlerEvent = AppExecFwk::InnerEvent::Get( BundleActiveGroupHandler::MSG_ONE_TIME_CHECK_BUNDLE_STATE); - auto activeGroupHandler = activeGroupHandler_.lock(); if (!activeGroupHandler_.expired()) { activeGroupHandler_.lock()->SendEvent(BundleActiveGroupHandler::MSG_ONE_TIME_CHECK_BUNDLE_STATE, handlerobjToPtr); diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 8a7f8528ed0cb89162df46fc06e321b1751943e0..0173aac73fe0af6db986b25ebbb37e281b65f230 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -13,8 +13,7 @@ import("//build/test.gni") import("../../device_usage_statistics.gni") -module_output_path = - "device_usage_statistics/device_usage_statistics/deviceusagestatisticstest" +module_output_path = "device_usage_statistics/deviceusagestatisticstest" config("module_private_config") { visibility = [ ":*" ] diff --git a/test/unittest/bundle_active_total_test.cpp b/test/unittest/bundle_active_total_test.cpp index a1fadbfeaf47aa667740d5591052e2c8ca50fd49..47ffbd073466ac5a7329d5de3d0e4f7b1a764509 100644 --- a/test/unittest/bundle_active_total_test.cpp +++ b/test/unittest/bundle_active_total_test.cpp @@ -20,8 +20,8 @@ #include "bundle_active_power_state_callback_service.h" #include "bundle_active_service_stub.h" -#include "bundle_active_core.h" +#include "bundle_active_core.h" #include "bundle_active_continuous_task_observer.h" #include "bundle_active_bundle_mgr_helper.h" #include "bundle_active_app_state_observer.h"