diff --git a/frameworks/src/bundle_state_common.cpp b/frameworks/src/bundle_state_common.cpp index 67e69c0d189026591a24d1d640d3924b5ed230d9..26ba1cbfaed579e7df18f18afa70b35c9a940296 100644 --- a/frameworks/src/bundle_state_common.cpp +++ b/frameworks/src/bundle_state_common.cpp @@ -285,4 +285,5 @@ void BundleStateCommon::MergePackageStats(BundleActivePackageStats &left, const left.bundleStartedCount_ += right.bundleStartedCount_; } } // namespace DeviceUsageStats -} // namespace OHOS \ No newline at end of file +} // namespace OHOS + diff --git a/frameworks/src/bundle_state_init.cpp b/frameworks/src/bundle_state_init.cpp index acffa11a1da52df399260b3f68671efcf2c86595..3e7955d3e92ca6c163316b354fcb183f694daeb9 100644 --- a/frameworks/src/bundle_state_init.cpp +++ b/frameworks/src/bundle_state_init.cpp @@ -108,4 +108,5 @@ __attribute__((constructor)) void RegisterModule(void) } EXTERN_C_END } // namespace DeviceUsageStats -} // namespace OHOS \ No newline at end of file +} // namespace OHOS + diff --git a/frameworks/src/bundle_state_query.cpp b/frameworks/src/bundle_state_query.cpp index 59bf313bfae65768e8f25575c31fc1ac2782d07d..35ae3d88944ade1ea09aa9564ddde60b60b7113c 100644 --- a/frameworks/src/bundle_state_query.cpp +++ b/frameworks/src/bundle_state_query.cpp @@ -646,4 +646,5 @@ napi_value QueryBundleStateInfos(napi_env env, napi_callback_info info) } } } // namespace DeviceUsageStats -} // namespace OHOS \ No newline at end of file +} // namespace OHOS + diff --git a/interfaces/innerkits/include/bundle_active_client.h b/interfaces/innerkits/include/bundle_active_client.h index d14ef815f8262f9b43c7c05598eb2a3687565578..5bf1e97b65e236324beb3ab15a5f2b01c169d18a 100644 --- a/interfaces/innerkits/include/bundle_active_client.h +++ b/interfaces/innerkits/include/bundle_active_client.h @@ -37,12 +37,13 @@ public: int QueryPackageGroup(); static BundleActiveClient& GetInstance(); BundleActiveClient() {} - ~BundleActiveClient() {}; + ~BundleActiveClient() {} private: bool GetBundleActiveProxy(); sptr bundleActiveProxy_; }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_CLIENT_H + diff --git a/interfaces/innerkits/include/bundle_active_proxy.h b/interfaces/innerkits/include/bundle_active_proxy.h index 2508e26439b1bedaa8899d26cd3037e624bb1003..e5fe92ee9c2be47825f8fee03fec6da6f531ec19 100644 --- a/interfaces/innerkits/include/bundle_active_proxy.h +++ b/interfaces/innerkits/include/bundle_active_proxy.h @@ -42,6 +42,7 @@ public: private: static inline BrokerDelegator delegator_; }; -} -} -#endif +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_PROXY_H + diff --git a/interfaces/innerkits/src/bundle_active_client.cpp b/interfaces/innerkits/src/bundle_active_client.cpp index 32fbbeadc30d2fb2f73bfe219d4e38f2b3066f50..be85a66622bfc6e231a8109501889c614ee5e7b3 100644 --- a/interfaces/innerkits/src/bundle_active_client.cpp +++ b/interfaces/innerkits/src/bundle_active_client.cpp @@ -115,5 +115,7 @@ int BundleActiveClient::QueryPackageGroup() } return bundleActiveProxy_->QueryPackageGroup(); } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_PROXY_H + diff --git a/interfaces/innerkits/src/bundle_active_proxy.cpp b/interfaces/innerkits/src/bundle_active_proxy.cpp index 21aef49baf0ecab67003bd01309a7fa6d89ea0ac..0010086213c944ae0b19e2a661686f17db1fa00a 100644 --- a/interfaces/innerkits/src/bundle_active_proxy.cpp +++ b/interfaces/innerkits/src/bundle_active_proxy.cpp @@ -210,5 +210,7 @@ int BundleActiveProxy::QueryPackageGroup() BUNDLE_ACTIVE_LOGI("QueryPackageGroup result is %{public}d", packageGroup); return packageGroup; } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_PROXY_H + diff --git a/interfaces/kits/bundlestats/js/@ohos.bundleState.d.ts b/interfaces/kits/bundlestats/js/@ohos.bundleState.d.ts index 0ca19c67b0a4e114d1beb1a7767106579e7b8549..897f4914dae4ff64b2d5ac8316af8c624c63f1b7 100644 --- a/interfaces/kits/bundlestats/js/@ohos.bundleState.d.ts +++ b/interfaces/kits/bundlestats/js/@ohos.bundleState.d.ts @@ -246,4 +246,5 @@ declare namespace bundleState { function queryCurrentBundleActiveStates(begin: number, end: number): Promise>; } -export default bundleState; \ No newline at end of file +export default bundleState; + diff --git a/interfaces/kits/bundlestats/napi/include/bundle_state_common.h b/interfaces/kits/bundlestats/napi/include/bundle_state_common.h index f8c784493f7cf7967d0fb5c6136b501a35a1c300..481f3b8aa54c8d38bea4a2563ffd0aed62e39ad2 100644 --- a/interfaces/kits/bundlestats/napi/include/bundle_state_common.h +++ b/interfaces/kits/bundlestats/napi/include/bundle_state_common.h @@ -71,4 +71,5 @@ public: }; } // namespace DeviceUsageStats } // namespace OHOS -#endif // FOUNDATION_RESOURCESCHEDULE_DEVICE_USAGE_STATISTICS_BUNDLE_STATE_COMMON_H \ No newline at end of file +#endif // FOUNDATION_RESOURCESCHEDULE_DEVICE_USAGE_STATISTICS_BUNDLE_STATE_COMMON_H + diff --git a/interfaces/kits/bundlestats/napi/include/bundle_state_condition.h b/interfaces/kits/bundlestats/napi/include/bundle_state_condition.h index 9edd86e3c793a7226215024378a5ba9fa3ee5374..eb4dc7aee7ccb83f126ca1375943e8776af288ef 100644 --- a/interfaces/kits/bundlestats/napi/include/bundle_state_condition.h +++ b/interfaces/kits/bundlestats/napi/include/bundle_state_condition.h @@ -33,4 +33,5 @@ public: }; } // namespace DeviceUsageStats } // namespace OHOS -#endif // FOUNDATION_RESOURCESCHEDULE_DEVICE_USAGE_STATISTICS_BUNDLE_STATE_CONDITION_H \ No newline at end of file +#endif // FOUNDATION_RESOURCESCHEDULE_DEVICE_USAGE_STATISTICS_BUNDLE_STATE_CONDITION_H + diff --git a/interfaces/kits/bundlestats/napi/include/bundle_state_data.h b/interfaces/kits/bundlestats/napi/include/bundle_state_data.h index 5d4f5652b1f3c6e9ae96871eaabc9736e7b7dfb6..428c4ed42d94be8d8c4d235b96012b470f9120fe 100644 --- a/interfaces/kits/bundlestats/napi/include/bundle_state_data.h +++ b/interfaces/kits/bundlestats/napi/include/bundle_state_data.h @@ -128,3 +128,4 @@ struct AppUsageParamsInfo { } // namespace DeviceUsageStats } // namespace OHOS #endif // FOUNDATION_RESOURCESCHEDULE_DEVICE_USAGE_STATISTICS_BUNDLE_STATE_DATA_H + diff --git a/interfaces/kits/bundlestats/napi/include/bundle_state_init.h b/interfaces/kits/bundlestats/napi/include/bundle_state_init.h index 432c2ab31174be5cee21acd09015ae4ce1acc1d6..7ac5260b0e8a45035b36464000ebeabc005e3012 100644 --- a/interfaces/kits/bundlestats/napi/include/bundle_state_init.h +++ b/interfaces/kits/bundlestats/napi/include/bundle_state_init.h @@ -48,4 +48,5 @@ napi_module _module = { }; } // namespace DeviceUsageStats } // namespace OHOS -#endif // FOUNDATION_RESOURCESCHEDULE_DEVICE_USAGE_STATISTICS_BUNDLE_STATE_INIT_H \ No newline at end of file +#endif // FOUNDATION_RESOURCESCHEDULE_DEVICE_USAGE_STATISTICS_BUNDLE_STATE_INIT_H + diff --git a/interfaces/kits/bundlestats/napi/include/bundle_state_inner_errors.h b/interfaces/kits/bundlestats/napi/include/bundle_state_inner_errors.h index 6d568f2cb41dc561ef04a3d588ef8188e91a4b9f..e4de78208ee932825fecceb76a2e28ab2efbe8e3 100644 --- a/interfaces/kits/bundlestats/napi/include/bundle_state_inner_errors.h +++ b/interfaces/kits/bundlestats/napi/include/bundle_state_inner_errors.h @@ -52,4 +52,5 @@ enum : int { }; } // namespace DeviceUsageStats } // namespace OHOS -#endif // FOUNDATION_RESOURCESCHEDULE_DEVICE_USAGE_STATISTICS_BUNDLE_STATE_INNER_ERRORS_H \ No newline at end of file +#endif // FOUNDATION_RESOURCESCHEDULE_DEVICE_USAGE_STATISTICS_BUNDLE_STATE_INNER_ERRORS_H + diff --git a/interfaces/kits/bundlestats/napi/include/bundle_state_query.h b/interfaces/kits/bundlestats/napi/include/bundle_state_query.h index 589ebbec076e32dae59ab05a741ac17f6809156e..f893d7cf728a91b216e090ad46d1d78599ed02b5 100644 --- a/interfaces/kits/bundlestats/napi/include/bundle_state_query.h +++ b/interfaces/kits/bundlestats/napi/include/bundle_state_query.h @@ -29,4 +29,5 @@ namespace DeviceUsageStats { napi_value QueryBundleStateInfos(napi_env env, napi_callback_info info); } // namespace DeviceUsageStats } // namespace OHOS -#endif // FOUNDATION_RESOURCESCHEDULE_DEVICE_USAGE_STATISTICS_BUNDLE_STATE_QUERY_H \ No newline at end of file +#endif // FOUNDATION_RESOURCESCHEDULE_DEVICE_USAGE_STATISTICS_BUNDLE_STATE_QUERY_H + diff --git a/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js b/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js index 2b3c15cab8a7a6c856b85c3b61fa728697430139..daf50ba50b7cb6de748050e4a7e1ad545130bbb8 100644 --- a/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js +++ b/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js @@ -24,21 +24,21 @@ describe("DeviceUsageStatisticsJsTest", function () { */ console.info('beforeAll called') }) - + afterAll(function() { /* * @tc.teardown: teardown invoked after all testcases */ console.info('afterAll called') }) - + beforeEach(function() { /* * @tc.setup: setup invoked before each testcases */ console.info('beforeEach called') }) - + afterEach(function() { /* * @tc.teardown: teardown invoked after each testcases @@ -329,4 +329,5 @@ describe("DeviceUsageStatisticsJsTest", function () { done(); }, 500); }) -}) \ No newline at end of file +}) + diff --git a/services/common/include/bundle_active_app_state_observer.h b/services/common/include/bundle_active_app_state_observer.h index 5e6d18310c56d3e0aa2cd60d217575ca846fd9b2..97131a78b589ad77b622d2675c18dafa7c21e6a9 100644 --- a/services/common/include/bundle_active_app_state_observer.h +++ b/services/common/include/bundle_active_app_state_observer.h @@ -56,6 +56,7 @@ private: } std::shared_ptr reportHandler_; }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_APP_STATE_OBSERVER_H + diff --git a/services/common/include/bundle_active_binary_search.h b/services/common/include/bundle_active_binary_search.h index 62bcfdc16007be2a7ac251c74db0a54203e0c603..c75e5693ec0274475a714215adf5d7a3238b5502 100644 --- a/services/common/include/bundle_active_binary_search.h +++ b/services/common/include/bundle_active_binary_search.h @@ -27,6 +27,7 @@ public: int32_t BinarySearch(const std::vector &tableNameArray, int64_t targetValue); DECLARE_DELAYED_SINGLETON(BundleActiveBinarySearch); }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_BINARY_SEARCH_H + diff --git a/services/common/include/bundle_active_common_event_subscriber.h b/services/common/include/bundle_active_common_event_subscriber.h index ffbf6e9224f00ad0a7119caad061bbd3a1723015..5ffc4030da50b5a03a1a85fb6c7a1a3c73641131 100644 --- a/services/common/include/bundle_active_common_event_subscriber.h +++ b/services/common/include/bundle_active_common_event_subscriber.h @@ -43,7 +43,7 @@ public: const std::weak_ptr bundleActiveReportHandler) : CommonEventSubscriber(subscriberInfo), activeGroupController_(activeGroupController), - bundleActiveReportHandler_(bundleActiveReportHandler) {}; + bundleActiveReportHandler_(bundleActiveReportHandler) {} ~BundleActiveCommonEventSubscriber() = default; void OnReceiveEvent(const CommonEventData &data) override; @@ -52,6 +52,7 @@ private: std::weak_ptr activeGroupController_; std::weak_ptr bundleActiveReportHandler_; }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_COMMON_EVENT_SUBSCRIBER_H + diff --git a/services/common/include/bundle_active_constant.h b/services/common/include/bundle_active_constant.h index e1a53eb86d965ce67dd3c61d668960912d23da2e..77fd19118f20090345ee60ce64a615709c95ef28 100644 --- a/services/common/include/bundle_active_constant.h +++ b/services/common/include/bundle_active_constant.h @@ -108,4 +108,5 @@ const std::string DATABASE_TYPE[] = {"daily", "weekly", "monthly", "yearly", "ev const std::string SUFFIX_TYPE[] = {".db", ".db-shm", ".db-wal"}; } // namespace DeviceUsageStats } // namespace OHOS -#endif // BUNDLE_ACTIVE_CONSTANT_H \ No newline at end of file +#endif // BUNDLE_ACTIVE_CONSTANT_H + diff --git a/services/common/include/bundle_active_continuous_task_observer.h b/services/common/include/bundle_active_continuous_task_observer.h index 9db6267f74d12228efd6faf37154286032d3b703..3586b1fd54df3d06209440209772e6162f5f80ea 100644 --- a/services/common/include/bundle_active_continuous_task_observer.h +++ b/services/common/include/bundle_active_continuous_task_observer.h @@ -45,6 +45,7 @@ private: void ReportContinuousTaskEvent(const std::shared_ptr& continuousTaskCallbackInfo, const bool isStart); }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_CONTINUOUS_TASK_OBSERVER_H + diff --git a/services/common/include/bundle_active_core.h b/services/common/include/bundle_active_core.h index c5949d2f538adfa5cb194b50d5e30ad653ac3cc0..e2037b1cc3611b3958ac4684c133339b4d613bfa 100644 --- a/services/common/include/bundle_active_core.h +++ b/services/common/include/bundle_active_core.h @@ -40,7 +40,7 @@ public: BundleActiveReportHandlerObject(); BundleActiveReportHandlerObject(const int userId, const std::string bundleName); BundleActiveReportHandlerObject(const BundleActiveReportHandlerObject& orig); - ~BundleActiveReportHandlerObject() {}; + ~BundleActiveReportHandlerObject() {} }; class BundleActiveReportHandler; @@ -146,6 +146,7 @@ private: void RestoreAllData(); bool debugCore_; }; -} -} -#endif +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_CORE_H + diff --git a/services/common/include/bundle_active_debug_mode.h b/services/common/include/bundle_active_debug_mode.h index 94786dd396e9e69cf1f9645f3235e14aa3293ba6..667113a42450d563286c3310f99006d402952599 100644 --- a/services/common/include/bundle_active_debug_mode.h +++ b/services/common/include/bundle_active_debug_mode.h @@ -19,6 +19,7 @@ namespace OHOS { namespace DeviceUsageStats { extern const bool DEBUG_ON; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_DEBUG_MODE_H + diff --git a/services/common/include/bundle_active_log.h b/services/common/include/bundle_active_log.h index d4bc93a37ad4c9949d94b738d40bb8e5d4c225c7..0dae499429053ba09c28100bea212a8274618293 100644 --- a/services/common/include/bundle_active_log.h +++ b/services/common/include/bundle_active_log.h @@ -76,5 +76,5 @@ private: #define BUNDLE_ACTIVE_LOGF(fmt, ...) PRINT_LOG(FATAL, Fatal, fmt, ##__VA_ARGS__) } // namespace DeviceUsageStats } // namespace OHOS +#endif // BUNDLE_ACTIVE_LOG_H -#endif // BUNDLE_ACTIVE_LOG_H \ No newline at end of file diff --git a/services/common/include/bundle_active_open_callback.h b/services/common/include/bundle_active_open_callback.h index 235c8d488384df48fef11184e320c3a66bc33b10..7bd1a7d03965e35cd10380c3537ec34939f95d3b 100644 --- a/services/common/include/bundle_active_open_callback.h +++ b/services/common/include/bundle_active_open_callback.h @@ -30,6 +30,7 @@ public: int32_t OnCreate(NativeRdb::RdbStore &rdbStore) override; int32_t OnUpgrade(NativeRdb::RdbStore &rdbStore, int oldVersion, int newVersion) override; }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_OPEN_CALLBACK_H + diff --git a/services/common/include/bundle_active_service.h b/services/common/include/bundle_active_service.h index 3c93f0ad3e065bd2941aab28a875149d95995675..ff28fc2b0caadf26ced29958b6b2695ea014f740 100644 --- a/services/common/include/bundle_active_service.h +++ b/services/common/include/bundle_active_service.h @@ -76,6 +76,7 @@ private: bool SubscribeContinuousTask(); OHOS::sptr GetAppManagerInstance(); }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_SERVICE_H + diff --git a/services/common/include/bundle_active_shutdown_callback_proxy.h b/services/common/include/bundle_active_shutdown_callback_proxy.h index b62c001ff1afe424cf02cda32595021ec94388bc..e53fe5e96768074c1993b14cf201075cc684a376 100644 --- a/services/common/include/bundle_active_shutdown_callback_proxy.h +++ b/services/common/include/bundle_active_shutdown_callback_proxy.h @@ -33,6 +33,7 @@ public: private: static inline BrokerDelegator delegator_; }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_SHUTDOWN_CALLBACK_PROXY_H + diff --git a/services/common/include/bundle_active_shutdown_callback_service.h b/services/common/include/bundle_active_shutdown_callback_service.h index b31387302c3d726e1ae338568439f6628f6cd094..95b3648a2a29ec43afaf0734409b6bd46e79dddb 100644 --- a/services/common/include/bundle_active_shutdown_callback_service.h +++ b/services/common/include/bundle_active_shutdown_callback_service.h @@ -24,11 +24,12 @@ namespace DeviceUsageStats { class BundleActiveShutdownCallbackService : public BundleActiveShutdownCallbackStub { public: BundleActiveShutdownCallbackService(std::shared_ptr bundleActiveCore); - virtual ~BundleActiveShutdownCallbackService() {}; + virtual ~BundleActiveShutdownCallbackService() {} void ShutdownCallback() override; private: std::shared_ptr bundleActiveCore_; }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_SHUTDOWN_CALLBACK_SERVICE_H + diff --git a/services/common/include/bundle_active_shutdown_callback_stub.h b/services/common/include/bundle_active_shutdown_callback_stub.h index e0c110fea242dd9f2b7a43fc94a837f4923424da..bef14c8870d6deb5fa2e6312a9e2f9574bad30b8 100644 --- a/services/common/include/bundle_active_shutdown_callback_stub.h +++ b/services/common/include/bundle_active_shutdown_callback_stub.h @@ -33,7 +33,7 @@ public: private: void ShutdownStub(); }; -} -} +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_SHUTDOWN_CALLBACK_STUB_H -#endif \ No newline at end of file diff --git a/services/common/include/bundle_active_stub.h b/services/common/include/bundle_active_stub.h index 596fb3cb1c95ee01b320fcfc5742c9abf551b800..51164a1e66d6b404c1211605961c769d7e2635aa 100644 --- a/services/common/include/bundle_active_stub.h +++ b/services/common/include/bundle_active_stub.h @@ -22,11 +22,12 @@ namespace OHOS { namespace DeviceUsageStats { class BundleActiveStub : public IRemoteStub { public: - virtual int32_t OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel &reply, + int32_t OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel &reply, MessageOption &option) override; - BundleActiveStub() {}; - ~BundleActiveStub() {}; + BundleActiveStub() {} + ~BundleActiveStub() {} }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_STUB_H + diff --git a/services/common/include/bundle_active_usage_database.h b/services/common/include/bundle_active_usage_database.h index 6ad950d60179085e5cefc2e9fee33db3e01ee4ec..d858749611d3d87efe46786615e50d39ed258cba 100644 --- a/services/common/include/bundle_active_usage_database.h +++ b/services/common/include/bundle_active_usage_database.h @@ -100,6 +100,7 @@ private: std::int64_t eventBeginTime_; bool debugDatabase_; }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_USAGE_DATABASE_H + diff --git a/services/common/include/ibundle_active_service.h b/services/common/include/ibundle_active_service.h index 3740ca1d8e0c0b4faff252bce4df45c1d0eaee49..401584ea340ab07bfc9b57ef6ba98a4e9c2bb2f5 100644 --- a/services/common/include/ibundle_active_service.h +++ b/services/common/include/ibundle_active_service.h @@ -69,6 +69,7 @@ public: public: DECLARE_INTERFACE_DESCRIPTOR(u"Resourceschedule.IBundleActiveService"); }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_ISERVICE_H + diff --git a/services/common/src/bundle_active_app_state_obsever.cpp b/services/common/src/bundle_active_app_state_obsever.cpp index d598923812e6b41907ebed7e8802ce08db0bb175..5f3a951fd46550b9475b0c7d51610666915154e4 100644 --- a/services/common/src/bundle_active_app_state_obsever.cpp +++ b/services/common/src/bundle_active_app_state_obsever.cpp @@ -81,5 +81,6 @@ void BundleActiveAppStateObserver::OnAbilityStateChanged(const AbilityStateData } return; } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/common/src/bundle_active_binary_search.cpp b/services/common/src/bundle_active_binary_search.cpp index 28ce0202dfafcef10071dd58de3b860e0dfafd72..b79b88586f79139f4d0ced7bb21c592e51b00cb5 100644 --- a/services/common/src/bundle_active_binary_search.cpp +++ b/services/common/src/bundle_active_binary_search.cpp @@ -44,5 +44,6 @@ int32_t BundleActiveBinarySearch::BinarySearch(const std::vector &table } return -1; } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/common/src/bundle_active_continuous_task_observer.cpp b/services/common/src/bundle_active_continuous_task_observer.cpp index 6a0df6812098d6be5a3a1d1cecaf765242d725ab..5492acee143f5b71b9199e836b05a1e4c2b34c88 100644 --- a/services/common/src/bundle_active_continuous_task_observer.cpp +++ b/services/common/src/bundle_active_continuous_task_observer.cpp @@ -114,5 +114,6 @@ void BundleActiveContinuousTaskObserver::ReportContinuousTaskEvent( } } } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/common/src/bundle_active_core.cpp b/services/common/src/bundle_active_core.cpp index 295538231c4fb1507a5c3ad7c3cd9645ab194f23..01f0293a7b73840af847325695285af9ad877be2 100644 --- a/services/common/src/bundle_active_core.cpp +++ b/services/common/src/bundle_active_core.cpp @@ -567,5 +567,6 @@ int64_t BundleActiveCore::GetSystemTimeMs() } return static_cast(tarDate); } -} -} +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/common/src/bundle_active_debug_mode.cpp b/services/common/src/bundle_active_debug_mode.cpp index 19f1fe1ffeae745d9d19949e17206f09547710fb..5863fc6766cb77858e0f16833ba913d459c7ebff 100644 --- a/services/common/src/bundle_active_debug_mode.cpp +++ b/services/common/src/bundle_active_debug_mode.cpp @@ -26,5 +26,6 @@ namespace DeviceUsageStats { constexpr int DEBUG_ON_DEFAULT = false; std::string DEBUG_MODE = "persist.sys.device_usage_debug_on"; const bool DEBUG_ON = static_cast(GetIntParameter(DEBUG_MODE, DEBUG_ON_DEFAULT)); -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/common/src/bundle_active_log.cpp b/services/common/src/bundle_active_log.cpp index ddd88396ae277f3dc994e8192364ac3416ed1d05..2f875b4fb2297d6c92ae17f90a7aa0e9279be3d8 100644 --- a/services/common/src/bundle_active_log.cpp +++ b/services/common/src/bundle_active_log.cpp @@ -41,3 +41,4 @@ std::string BundleActiveLog::GetCurrFileName(const char *str) } } // namespace DeviceUsageStats } // namespace OHOS + diff --git a/services/common/src/bundle_active_open_callback.cpp b/services/common/src/bundle_active_open_callback.cpp index edb47740cc9872e5f3b82f40f7481e4bfff0e8e5..c11410228e2b0e6ccb9d63c5c19658b1c8c012ac 100644 --- a/services/common/src/bundle_active_open_callback.cpp +++ b/services/common/src/bundle_active_open_callback.cpp @@ -42,4 +42,5 @@ int32_t BundleActiveOpenCallback::OnUpgrade(NativeRdb::RdbStore &rdbStore, int o return NativeRdb::E_OK; }; } // namespace DeviceUsageStats -} // namespace OHOS \ No newline at end of file +} // namespace OHOS + diff --git a/services/common/src/bundle_active_service.cpp b/services/common/src/bundle_active_service.cpp index d5dc82d6842f64ab6a1bcf667d0734a3abbc6c7f..f9170fa51f607e90adc10dc756c5f2de97c4d8fa 100644 --- a/services/common/src/bundle_active_service.cpp +++ b/services/common/src/bundle_active_service.cpp @@ -429,5 +429,6 @@ bool BundleActiveService::CheckBundleIsSystemAppAndHasPermission(const int uid, return true; } } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/common/src/bundle_active_shutdown_callback_proxy.cpp b/services/common/src/bundle_active_shutdown_callback_proxy.cpp index 7ef9740adf25e1b4c3c9db89cd3cf97a027bd7c6..565e54e2bd72ef6673872bdec44cd4517b060df0 100644 --- a/services/common/src/bundle_active_shutdown_callback_proxy.cpp +++ b/services/common/src/bundle_active_shutdown_callback_proxy.cpp @@ -34,5 +34,6 @@ void BundleActiveShutdownCallbackProxy::ShutdownCallback() BUNDLE_ACTIVE_LOGE("BundleActiveShutdownCallbackProxy::ShutdownCallback failed!"); } } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/common/src/bundle_active_shutdown_callback_service.cpp b/services/common/src/bundle_active_shutdown_callback_service.cpp index 4832a465607e83636f58a0d9a6cdcf71e6096f44..3d9813ef3bf80695818e1e8ed56e86ee592b7fd4 100644 --- a/services/common/src/bundle_active_shutdown_callback_service.cpp +++ b/services/common/src/bundle_active_shutdown_callback_service.cpp @@ -29,5 +29,7 @@ void BundleActiveShutdownCallbackService::ShutdownCallback() { bundleActiveCore_->ShutDown(); } -} -} +} // namespace DeviceUsageStats +} // namespace OHOS + + diff --git a/services/common/src/bundle_active_shutdown_callback_stub.cpp b/services/common/src/bundle_active_shutdown_callback_stub.cpp index f4cac49b152fea8c7224262b318622dedf966e75..f4550d51293c812ae6346ae6bd761a2a3c0db785 100644 --- a/services/common/src/bundle_active_shutdown_callback_stub.cpp +++ b/services/common/src/bundle_active_shutdown_callback_stub.cpp @@ -40,5 +40,6 @@ void BundleActiveShutdownCallbackStub::ShutdownStub() { ShutdownCallback(); } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/common/src/bundle_active_stub.cpp b/services/common/src/bundle_active_stub.cpp index f24e1a25940afd7caf9fedce05b78f69985f9eef..d22118718cfd9550617726b413797fe4dd6146ef 100644 --- a/services/common/src/bundle_active_stub.cpp +++ b/services/common/src/bundle_active_stub.cpp @@ -134,5 +134,6 @@ int32_t BundleActiveStub::OnRemoteRequest(uint32_t code, MessageParcel& data, Me return IPCObjectStub::OnRemoteRequest(code, data, reply, option); } } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/common/src/bundle_active_usage_database.cpp b/services/common/src/bundle_active_usage_database.cpp index c791314ddaebd0e4c3f32d963156c730d2ac938f..729b7ffe7daa696fb4068964a3fdd4cfe495672f 100644 --- a/services/common/src/bundle_active_usage_database.cpp +++ b/services/common/src/bundle_active_usage_database.cpp @@ -1255,5 +1255,6 @@ int64_t BundleActiveUsageDatabase::GetSystemTimeMs() } return static_cast(tarDate); } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/packagegroup/include/bundle_active_group_common.h b/services/packagegroup/include/bundle_active_group_common.h index 4d8fe0ba0f16393f3c7836638621ee567715bc46..48208acfc275c9ad26be21334ac6423fa7e6f3f4 100644 --- a/services/packagegroup/include/bundle_active_group_common.h +++ b/services/packagegroup/include/bundle_active_group_common.h @@ -61,6 +61,7 @@ const uint32_t GROUP_EVENT_REASON_LONG_TIME_TASK_STARTTED = 0x0007; const uint32_t GROUP_EVENT_REASON_CALCULATED_RESTORED = 0x0008; const uint32_t GROUP_EVENT_REASON_ALIVE_NOT_TIMEOUT = 0x0009; } -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_GROUP_COMMON_H + diff --git a/services/packagegroup/include/bundle_active_group_controller.h b/services/packagegroup/include/bundle_active_group_controller.h index 9d0c2717d46b42c504dd159571f077a6ed964f7f..4bfb845c82c3eb4deeeeaf55ab44ca54fab785b0 100644 --- a/services/packagegroup/include/bundle_active_group_controller.h +++ b/services/packagegroup/include/bundle_active_group_controller.h @@ -52,7 +52,7 @@ public: std::vector screenTimeLevel_ = {0, 0, 0, 0}; std::vector bootTimeLevel_ = {0, 0, 0, 0}; BundleActiveGroupController(const bool debug); - ~BundleActiveGroupController() {}; + ~BundleActiveGroupController() {} std::shared_ptr bundleUserHistory_; void SetHandlerAndCreateUserHistory(const std::shared_ptr& groupHandler, const int64_t bootFromTimeStamp); @@ -89,7 +89,7 @@ private: const int64_t bootBasedTimeStamp); int GetNewGroup(const std::string& bundleName, const int userId, const int64_t bootBasedTimeStamp); }; -} -} +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_GROUP_CONTROLLER_H -#endif \ No newline at end of file diff --git a/services/packagegroup/include/bundle_active_group_handler.h b/services/packagegroup/include/bundle_active_group_handler.h index 06c801ba47e3ba2a30267670d52c3aead9697bb9..cea2d1764b7172d3cf3dd81da3a886cbe6c0c84b 100644 --- a/services/packagegroup/include/bundle_active_group_handler.h +++ b/services/packagegroup/include/bundle_active_group_handler.h @@ -31,7 +31,7 @@ public: int userId_; BundleActiveGroupHandlerObject(); BundleActiveGroupHandlerObject(const BundleActiveGroupHandlerObject& orig); - ~BundleActiveGroupHandlerObject() {}; + ~BundleActiveGroupHandlerObject() {} }; class BundleActiveGroupHandler : public AppExecFwk::EventHandler { @@ -53,6 +53,7 @@ public: private: std::shared_ptr bundleActiveGroupController_; }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_GROUP_HANDLER_H + diff --git a/services/packagegroup/include/bundle_active_package_history.h b/services/packagegroup/include/bundle_active_package_history.h index bfced5544d64252cdde0e666702413a16f2f3ad4..3a1af0d34853e167e064e2867bf1fb52755453a1 100644 --- a/services/packagegroup/include/bundle_active_package_history.h +++ b/services/packagegroup/include/bundle_active_package_history.h @@ -32,8 +32,9 @@ public: int64_t bundleDailyTimeoutTimeStamp_; bool isChanged_; BundleActivePackageHistory(); - ~BundleActivePackageHistory() {}; + ~BundleActivePackageHistory() {} }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_USAGE_HISTORY_H + diff --git a/services/packagegroup/include/bundle_active_user_history.h b/services/packagegroup/include/bundle_active_user_history.h index c86a5456c9ad5feff5456bb67711f2da14a35b31..4b9e3c3aad24700968e4da1f5521b813375acf7f 100644 --- a/services/packagegroup/include/bundle_active_user_history.h +++ b/services/packagegroup/include/bundle_active_user_history.h @@ -61,6 +61,7 @@ public: private: bool isScreenOn_; }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_USER_HISTORY_H + diff --git a/services/packagegroup/src/bundle_active_group_controller.cpp b/services/packagegroup/src/bundle_active_group_controller.cpp index a837554cab5f37564280dc190ba57d725a7fcdd2..e11ec5d80bd19e7b4cb6dfe5717bf7364818b7b2 100644 --- a/services/packagegroup/src/bundle_active_group_controller.cpp +++ b/services/packagegroup/src/bundle_active_group_controller.cpp @@ -404,5 +404,6 @@ bool BundleActiveGroupController::IsScreenOn() BUNDLE_ACTIVE_LOGI("IsScreenOn() is %{public}d", result); return result; } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/packagegroup/src/bundle_active_group_handler.cpp b/services/packagegroup/src/bundle_active_group_handler.cpp index f7315c7f4827526fc7224f9e44e23531fe7ac7ce..b6040242eb8eb95395d78f5c64fafb6f4e1053d0 100644 --- a/services/packagegroup/src/bundle_active_group_handler.cpp +++ b/services/packagegroup/src/bundle_active_group_handler.cpp @@ -99,5 +99,6 @@ void BundleActiveGroupHandler::ProcessEvent(const AppExecFwk::InnerEvent::Pointe } } } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/packagegroup/src/bundle_active_user_history.cpp b/services/packagegroup/src/bundle_active_user_history.cpp index 6479e6d76e53a3799b415d8ab0a3112c7bfa82d3..b06c8bc6c608b3f81c18e0c00a56c6ad10a1eabf 100644 --- a/services/packagegroup/src/bundle_active_user_history.cpp +++ b/services/packagegroup/src/bundle_active_user_history.cpp @@ -245,5 +245,6 @@ void BundleActiveUserHistory::printdata(int userId) oneBundleUsage.second->bundleDailyTimeoutTimeStamp_, oneBundleUsage.second->bundleAliveTimeoutTimeStamp_); } } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/packageusage/include/bundle_active_calendar.h b/services/packageusage/include/bundle_active_calendar.h index b8c166cd1b19258710df08028c910bb8567cfb51..4bde454babe42e332a0710d7a196bc20ecc810be 100644 --- a/services/packageusage/include/bundle_active_calendar.h +++ b/services/packageusage/include/bundle_active_calendar.h @@ -54,6 +54,7 @@ public: private: int64_t time_; }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_CALENDER_H + diff --git a/services/packageusage/include/bundle_active_event.h b/services/packageusage/include/bundle_active_event.h index 4e66b230df12a8d0f2fafab7375dae3fdd46bcd7..dc26307bc7d5f3ab602bfeadbc5dc80485cebe58 100644 --- a/services/packageusage/include/bundle_active_event.h +++ b/services/packageusage/include/bundle_active_event.h @@ -60,6 +60,7 @@ public: virtual bool Marshalling(Parcel &parcel) const override; std::shared_ptr Unmarshalling(Parcel &parcel); }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_EVENT_H + diff --git a/services/packageusage/include/bundle_active_event_list.h b/services/packageusage/include/bundle_active_event_list.h index 7fff6f6270d39924509f0b45da264b3729329152..4a0a02dcfe4f4a3eded5a507939b4988dd67d038 100644 --- a/services/packageusage/include/bundle_active_event_list.h +++ b/services/packageusage/include/bundle_active_event_list.h @@ -24,7 +24,7 @@ namespace DeviceUsageStats { class BundleActiveEventList { public: BundleActiveEventList(); - ~BundleActiveEventList() {}; + ~BundleActiveEventList() {} int Size(); void Clear(); void Insert(BundleActiveEvent event); @@ -32,6 +32,7 @@ public: void Merge(const BundleActiveEventList& right); std::vector events_; }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_EVENT_LIST_H + diff --git a/services/packageusage/include/bundle_active_event_stats.h b/services/packageusage/include/bundle_active_event_stats.h index 77d9e2daaf32fa49342bfac0f33717572cecae3a..b15af31f9f7c9c6d35b943ea6f6f3b43a4494b2d 100644 --- a/services/packageusage/include/bundle_active_event_stats.h +++ b/services/packageusage/include/bundle_active_event_stats.h @@ -38,6 +38,7 @@ public: int GetCount(); void add(const BundleActiveEventStats& right); }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_EVENT_STATS_H + diff --git a/services/packageusage/include/bundle_active_event_tracker.h b/services/packageusage/include/bundle_active_event_tracker.h index 26d13a070c562a332eef2650973026ad186ba9b3..7e8757b08b4bcbd13c0737c3dd3f43e3d0c137bb 100644 --- a/services/packageusage/include/bundle_active_event_tracker.h +++ b/services/packageusage/include/bundle_active_event_tracker.h @@ -33,6 +33,7 @@ public: int64_t endTime); BundleActiveEventTracker(); }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_EVENT_TRACKER_H + diff --git a/services/packageusage/include/bundle_active_package_stats.h b/services/packageusage/include/bundle_active_package_stats.h index 379e0a8087fdfa04c39ff175146ca6d416cefa09..6e648a8d915b2a923049928730751bac0d7e3825 100644 --- a/services/packageusage/include/bundle_active_package_stats.h +++ b/services/packageusage/include/bundle_active_package_stats.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef BUNDLE_ACTIVE_USAGE_STATS_H -#define BUNDLE_ACTIVE_USAGE_STATS_H +#ifndef BUNDLE_ACTIVE_PACKAGE_STATS_H +#define BUNDLE_ACTIVE_PACKAGE_STATS_H #include "ibundle_active_service.h" #include "bundle_active_event.h" @@ -38,7 +38,7 @@ public: // key is name of continuous task, value is last event of this last continuous task. std::map longTimeTasks_; BundleActivePackageStats(); - ~BundleActivePackageStats() {}; + ~BundleActivePackageStats() {} BundleActivePackageStats(const BundleActivePackageStats& orig); std::string GetBundleName(); int64_t GetBeginTimeStamp(); @@ -64,6 +64,7 @@ private: void UpdateAbility(const int64_t timeStamp, const int eventId, const std::string& abilityId); void UpdateLongTimeTask(const std::string& longTimeTaskName, const int64_t timeStamp, const int eventId); }; -} -} -#endif +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_PACKAGE_STATS_H + diff --git a/services/packageusage/include/bundle_active_period_stats.h b/services/packageusage/include/bundle_active_period_stats.h index 1c7106161a07b2686bbe5b34a54ce1fa60de0c44..3a7a31781da04611fb95bc50e4ec7075b2c7b47e 100644 --- a/services/packageusage/include/bundle_active_period_stats.h +++ b/services/packageusage/include/bundle_active_period_stats.h @@ -60,6 +60,7 @@ public: void AddEventStatsTo(std::vector& eventStatsList); std::string GetCachedString(std::string str); }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_PERIOD_STATS_H + diff --git a/services/packageusage/include/bundle_active_report_handler.h b/services/packageusage/include/bundle_active_report_handler.h index f0fcdaa7349a379b56d23c8659f815d64ea689f2..dd44984378683db0ce4225cc5818d4ef6c705652 100644 --- a/services/packageusage/include/bundle_active_report_handler.h +++ b/services/packageusage/include/bundle_active_report_handler.h @@ -44,6 +44,7 @@ public: private: std::shared_ptr bundleActiveCore_; }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_REPORT_HANDLER_H + diff --git a/services/packageusage/include/bundle_active_stats_combiner.h b/services/packageusage/include/bundle_active_stats_combiner.h index 710abc52a0db6736dbfb1fb4ca4ebf3d0e6bd3d8..1299cb01cc900c53646e75a2250d6d50d692f55a 100644 --- a/services/packageusage/include/bundle_active_stats_combiner.h +++ b/services/packageusage/include/bundle_active_stats_combiner.h @@ -40,6 +40,7 @@ public: void combine(const std::shared_ptr& stats, std::vector& accumulatedResult, int64_t beginTime = 0); }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_STATS_COMBINER_H + diff --git a/services/packageusage/include/bundle_active_stats_update_listener.h b/services/packageusage/include/bundle_active_stats_update_listener.h index 6968b6cec6be60fe586a735c89c9d913e93d2365..b5de8d2382a30cf3666b1d5dd9e2b26211594ddb 100644 --- a/services/packageusage/include/bundle_active_stats_update_listener.h +++ b/services/packageusage/include/bundle_active_stats_update_listener.h @@ -23,6 +23,7 @@ class BundleActiveStatsUpdateListener { virtual void OnStatsReload() = 0; virtual void OnSystemUpdate(int userId) = 0; }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_STATS_UPDATE_LISTENER_H + diff --git a/services/packageusage/include/bundle_active_user_service.h b/services/packageusage/include/bundle_active_user_service.h index 8bf0fed665ed340ccd6114ec5652e4932558c2d4..dffb022dc029faa403c1d9824f1961268b9f4826 100644 --- a/services/packageusage/include/bundle_active_user_service.h +++ b/services/packageusage/include/bundle_active_user_service.h @@ -53,7 +53,7 @@ public: } } void Init(const int64_t timeStamp); - ~BundleActiveUserService() {}; + ~BundleActiveUserService() {} void ReportForShutdown(const BundleActiveEvent& event); void ReportEvent(const BundleActiveEvent& event); void RestoreStats(bool forced); @@ -83,6 +83,7 @@ private: void PrintInMemPackageStats(const int idx); void PrintInMemEventStats(); }; -} -} -#endif \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS +#endif // BUNDLE_ACTIVE_USER_SERVICE_H + diff --git a/services/packageusage/src/bundle_active_calendar.cpp b/services/packageusage/src/bundle_active_calendar.cpp index 70c88f12cc0792aa32b3f96410dcb7a349c9f4b4..270742ac41d59fcf3ef1258c40261f6074ea9421 100644 --- a/services/packageusage/src/bundle_active_calendar.cpp +++ b/services/packageusage/src/bundle_active_calendar.cpp @@ -104,5 +104,6 @@ void BundleActiveCalendar::TruncateTo(int intervalType) break; } } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/packageusage/src/bundle_active_event.cpp b/services/packageusage/src/bundle_active_event.cpp index bc6c81ffbf1675aaef844fe1d002d8a69f04ae93..e07abd48aea4f2a8435d6b64b938677ceb543cc5 100644 --- a/services/packageusage/src/bundle_active_event.cpp +++ b/services/packageusage/src/bundle_active_event.cpp @@ -88,5 +88,6 @@ std::shared_ptr BundleActiveEvent::Unmarshalling(Parcel &parc result->timeStamp_ = parcel.ReadInt64(); return result; } -} -} +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/packageusage/src/bundle_active_event_list.cpp b/services/packageusage/src/bundle_active_event_list.cpp index 51c081b3aa94bcdde9aaa21620948ee76b094ad3..66d47e3f79517a0c8adadf660fb7dd05b29f43a0 100644 --- a/services/packageusage/src/bundle_active_event_list.cpp +++ b/services/packageusage/src/bundle_active_event_list.cpp @@ -68,5 +68,6 @@ void BundleActiveEventList::Merge(const BundleActiveEventList& right) Insert(right.events_[i]); } } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/packageusage/src/bundle_active_event_stats.cpp b/services/packageusage/src/bundle_active_event_stats.cpp index 3bb55e0e93c99d38715f263ca575abdf1d4f79db..988c09b8d2224bd91e35b144e4812991335b5a1c 100644 --- a/services/packageusage/src/bundle_active_event_stats.cpp +++ b/services/packageusage/src/bundle_active_event_stats.cpp @@ -81,5 +81,6 @@ void BundleActiveEventStats::add(const BundleActiveEventStats& right) totalTime_ += right.totalTime_; count_ += right.count_; } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/packageusage/src/bundle_active_event_tracker.cpp b/services/packageusage/src/bundle_active_event_tracker.cpp index caea54dd95861f0c6cab241d415119f6950f993d..a1165bde860384f646275f874427bc80a58bfe00 100644 --- a/services/packageusage/src/bundle_active_event_tracker.cpp +++ b/services/packageusage/src/bundle_active_event_tracker.cpp @@ -57,5 +57,6 @@ void BundleActiveEventTracker::AddToEventStats(std::vector BundleActivePackageStats::Unmarshallin result->totalContiniousTaskUsedTime_ = parcel.ReadInt64(); return result; } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/packageusage/src/bundle_active_period_stats.cpp b/services/packageusage/src/bundle_active_period_stats.cpp index e9f0b71438341d108b880aa82ee92f659dea36fc..22f1eee996a80312e477313e1c8d76a8ecbcd176 100644 --- a/services/packageusage/src/bundle_active_period_stats.cpp +++ b/services/packageusage/src/bundle_active_period_stats.cpp @@ -137,5 +137,6 @@ std::string BundleActivePeriodStats::GetCachedString(std::string str) } return *it; } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/packageusage/src/bundle_active_report_handler.cpp b/services/packageusage/src/bundle_active_report_handler.cpp index e11680911999efc7e87570fbf612aebc2b479156..40b90fceff958950b93e7304a1e1f93db814fea5 100644 --- a/services/packageusage/src/bundle_active_report_handler.cpp +++ b/services/packageusage/src/bundle_active_report_handler.cpp @@ -79,5 +79,6 @@ void BundleActiveReportHandler::ProcessEvent(const AppExecFwk::InnerEvent::Point } } } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/packageusage/src/bundle_active_stats_combiner.cpp b/services/packageusage/src/bundle_active_stats_combiner.cpp index 4e63f90e1c87a6937cef850ca976d091f16d0f71..e704baf139326ad81eed4c0c48cee2adb8db1e8a 100644 --- a/services/packageusage/src/bundle_active_stats_combiner.cpp +++ b/services/packageusage/src/bundle_active_stats_combiner.cpp @@ -40,5 +40,6 @@ void BundleActiveStatsCombiner::combine(const std::shared_ptr accumulatedResult.push_back(stats->events_.events_[i]); } } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/services/packageusage/src/bundle_active_user_service.cpp b/services/packageusage/src/bundle_active_user_service.cpp index 57f017c9668c9caa0bde3b30fbf4434170208c5d..cf60faeeaaf7eefb3a026a304957327379756f82 100644 --- a/services/packageusage/src/bundle_active_user_service.cpp +++ b/services/packageusage/src/bundle_active_user_service.cpp @@ -406,5 +406,6 @@ void BundleActiveUserService::PrintInMemEventStats() abilityId.c_str(), abilityname.c_str(), bundlename.c_str(), eventid, timestamp); } } -} -} \ No newline at end of file +} // namespace DeviceUsageStats +} // namespace OHOS + diff --git a/test/unittest/device_usage_statistics_test.cpp b/test/unittest/device_usage_statistics_test.cpp index 277df46b48e36cead9a477d9ba27f8e6bd10cb47..bade74218609c68293f97c8f157d7a2e9654e920 100644 --- a/test/unittest/device_usage_statistics_test.cpp +++ b/test/unittest/device_usage_statistics_test.cpp @@ -155,5 +155,6 @@ HWTEST_F(DeviceUsageStatisticsTest, DeviceUsageStatisticsTest_QueryPackageGroup_ int result = BundleActiveClient::GetInstance().QueryPackageGroup(); EXPECT_EQ(result, -1); } -} -} +} // namespace DeviceUsageStats +} // namespace OHOS +