From b52a51dd07c3ac9c14acb4d3f1fbc96eef70795e Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 14 Jul 2022 16:16:24 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- frameworks/src/bundle_state_common.cpp | 25 +++++++++++++++++++++++++ frameworks/src/bundle_state_init.cpp | 8 +++++++- frameworks/src/bundle_state_query.cpp | 17 ++++++++++++++++- 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/frameworks/src/bundle_state_common.cpp b/frameworks/src/bundle_state_common.cpp index 9bcc0a8..2f5fe50 100644 --- a/frameworks/src/bundle_state_common.cpp +++ b/frameworks/src/bundle_state_common.cpp @@ -15,8 +15,33 @@ #include "securec.h" +#include +#include + +#include "__functional_base" +#include "algorithm" +#include "bundle_active_client.h" +#include "bundle_active_event.h" +#include "bundle_active_event_stats.h" +#include "bundle_active_form_record.h" #include "bundle_active_log.h" +#include "bundle_active_module_record.h" +#include "bundle_active_package_stats.h" #include "bundle_state_common.h" +#include "bundle_state_data.h" +#include "bundle_state_inner_errors.h" +#include "errors.h" +#include "iosfwd" +#include "js_native_api.h" +#include "js_native_api_types.h" +#include "map" +#include "memory" +#include "napi/native_api.h" +#include "napi/native_common.h" +#include "new" +#include "string" +#include "utility" +#include "vector" namespace OHOS { namespace DeviceUsageStats { diff --git a/frameworks/src/bundle_state_init.cpp b/frameworks/src/bundle_state_init.cpp index 99dddd2..a49e6bb 100644 --- a/frameworks/src/bundle_state_init.cpp +++ b/frameworks/src/bundle_state_init.cpp @@ -14,9 +14,15 @@ */ #include "bundle_state_condition.h" -#include "bundle_state_query.h" +#include +#include #include "bundle_active_group_observer.h" #include "bundle_state_init.h" +#include "bundle_state_query.h" +#include "js_native_api.h" +#include "js_native_api_types.h" +#include "napi/native_api.h" +#include "napi/native_common.h" namespace OHOS { namespace DeviceUsageStats { diff --git a/frameworks/src/bundle_state_query.cpp b/frameworks/src/bundle_state_query.cpp index ab28cbc..d42eeef 100644 --- a/frameworks/src/bundle_state_query.cpp +++ b/frameworks/src/bundle_state_query.cpp @@ -14,13 +14,28 @@ */ #include +#include +#include #include "securec.h" +#include "bundle_active_client.h" +#include "bundle_active_event.h" #include "bundle_active_log.h" +#include "bundle_active_package_stats.h" #include "bundle_state_common.h" #include "bundle_state_data.h" -#include "bundle_active_group_observer.h" #include "bundle_state_inner_errors.h" +#include "bundle_state_query.h" +#include "cstdint" +#include "errors.h" +#include "iosfwd" +#include "js_native_api.h" +#include "js_native_api_types.h" +#include "memory" +#include "napi/native_api.h" +#include "napi/native_common.h" +#include "new" +#include "vector" namespace OHOS { namespace DeviceUsageStats { -- Gitee From dbd9864ab1f0ed264d03fc8ad7c90fce09a04991 Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 14 Jul 2022 16:17:53 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- interfaces/innerkits/include/bundle_active_client.h | 12 +++++++++++- .../include/bundle_active_group_callback_info.h | 3 ++- .../include/bundle_active_group_callback_proxy.h | 9 ++++++++- .../include/bundle_active_group_callback_stub.h | 9 ++++++++- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/interfaces/innerkits/include/bundle_active_client.h b/interfaces/innerkits/include/bundle_active_client.h index a21e779..7d11ede 100644 --- a/interfaces/innerkits/include/bundle_active_client.h +++ b/interfaces/innerkits/include/bundle_active_client.h @@ -16,19 +16,29 @@ #ifndef BUNDLE_ACTIVE_CLIENT_H #define BUNDLE_ACTIVE_CLIENT_H +#include #include +#include "ibundle_active_group_callback.h" #include "ibundle_active_service.h" -#include "bundle_active_package_stats.h" #include "bundle_active_event.h" #include "bundle_active_event_stats.h" #include "bundle_active_package_stats.h" #include "bundle_active_module_record.h" #include "event_handler.h" #include "event_runner.h" +#include "iosfwd" +#include "iremote_object.h" +#include "memory" +#include "refbase.h" +#include "vector" namespace OHOS { namespace DeviceUsageStats { +class BundleActiveEvent; +class BundleActiveEventStats; +class BundleActiveModuleRecord; +class BundleActivePackageStats; class BundleActiveClient { public: // max number of query modules result. diff --git a/interfaces/innerkits/include/bundle_active_group_callback_info.h b/interfaces/innerkits/include/bundle_active_group_callback_info.h index b774fcf..732eae4 100644 --- a/interfaces/innerkits/include/bundle_active_group_callback_info.h +++ b/interfaces/innerkits/include/bundle_active_group_callback_info.h @@ -16,9 +16,10 @@ #ifndef BUNDLE_ACTIVE_GROUP_CALLBACK_INFO_H #define BUNDLE_ACTIVE_GROUP_CALLBACK_INFO_H +#include #include -#include +#include "iosfwd" #include "parcel.h" namespace OHOS { diff --git a/interfaces/innerkits/include/bundle_active_group_callback_proxy.h b/interfaces/innerkits/include/bundle_active_group_callback_proxy.h index a3b29e7..c1f519c 100644 --- a/interfaces/innerkits/include/bundle_active_group_callback_proxy.h +++ b/interfaces/innerkits/include/bundle_active_group_callback_proxy.h @@ -16,11 +16,18 @@ #ifndef BUNDLE_ACTIVE_GROUP_CALLBACK_PROXY_H #define BUNDLE_ACTIVE_GROUP_CALLBACK_PROXY_H -#include "iremote_proxy.h" +#include "functional" #include "ibundle_active_group_callback.h" +#include "iremote_broker.h" +#include "iremote_proxy.h" +#include "nocopyable.h" +#include "refbase.h" namespace OHOS { +class IRemoteObject; namespace DeviceUsageStats { +class BundleActiveGroupCallbackInfo; +class IBundleActiveGroupCallback; class BundleActiveGroupCallbackProxy : public IRemoteProxy { public: explicit BundleActiveGroupCallbackProxy(const sptr& impl); diff --git a/interfaces/innerkits/include/bundle_active_group_callback_stub.h b/interfaces/innerkits/include/bundle_active_group_callback_stub.h index a748c87..7696000 100644 --- a/interfaces/innerkits/include/bundle_active_group_callback_stub.h +++ b/interfaces/innerkits/include/bundle_active_group_callback_stub.h @@ -16,11 +16,18 @@ #ifndef BUNDLE_ACTIVE_GROUP_CALLBACK_STUB_H #define BUNDLE_ACTIVE_GROUP_CALLBACK_STUB_H -#include "iremote_stub.h" +#include #include "ibundle_active_group_callback.h" +#include "iremote_stub.h" +#include "nocopyable.h" +#include "refbase.h" namespace OHOS { +class MessageOption; +class MessageParcel; namespace DeviceUsageStats { +class bundleActiveGroupCallbackInfo; +class IBundleActiveGroupCallback; class BundleActiveGroupCallbackStub : public IRemoteStub { public: BundleActiveGroupCallbackStub()=default; -- Gitee From b4465f101016846098f7e729c4a1ec81ac0310c4 Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 14 Jul 2022 16:18:28 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- interfaces/innerkits/src/bundle_active_client.cpp | 14 ++++++++++++++ .../src/bundle_active_group_callback_info.cpp | 2 ++ .../src/bundle_active_group_callback_proxy.cpp | 9 +++++++-- .../src/bundle_active_group_callback_stub.cpp | 10 ++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/src/bundle_active_client.cpp b/interfaces/innerkits/src/bundle_active_client.cpp index 0cd2f54..e3f6620 100644 --- a/interfaces/innerkits/src/bundle_active_client.cpp +++ b/interfaces/innerkits/src/bundle_active_client.cpp @@ -15,8 +15,22 @@ #include "bundle_active_client.h" +#include "bundle_active_event.h" +#include "bundle_active_log.h" +#include "errors.h" +#include "event_runner.h" +#include "functional" +#include "if_system_ability_manager.h" +#include "iremote_broker.h" +#include "iservice_registry.h" +#include "new" +#include "string" +#include "system_ability_definition.h" + namespace OHOS { namespace DeviceUsageStats { +class BundleActiveEventStats; +class BundleActiveModuleRecord; namespace { const std::string BUNDLE_ACTIVE_CLIENT_NAME = "bundleActiveName"; static const int32_t DELAY_TIME = 5000; diff --git a/interfaces/innerkits/src/bundle_active_group_callback_info.cpp b/interfaces/innerkits/src/bundle_active_group_callback_info.cpp index 9e21f4c..1a781b2 100644 --- a/interfaces/innerkits/src/bundle_active_group_callback_info.cpp +++ b/interfaces/innerkits/src/bundle_active_group_callback_info.cpp @@ -15,6 +15,8 @@ #include "bundle_active_log.h" #include "bundle_active_group_callback_info.h" +#include "new" +#include "string" namespace OHOS { namespace DeviceUsageStats { diff --git a/interfaces/innerkits/src/bundle_active_group_callback_proxy.cpp b/interfaces/innerkits/src/bundle_active_group_callback_proxy.cpp index 768d809..b6d7c94 100644 --- a/interfaces/innerkits/src/bundle_active_group_callback_proxy.cpp +++ b/interfaces/innerkits/src/bundle_active_group_callback_proxy.cpp @@ -13,9 +13,14 @@ * limitations under the License. */ #include -#include "errors.h" -#include "bundle_active_log.h" #include "bundle_active_group_callback_proxy.h" +#include +#include "bundle_active_group_callback_info.h" +#include "bundle_active_log.h" +#include "errors.h" +#include "ibundle_active_group_callback.h" +#include "iremote_object.h" +#include "message_option.h" namespace OHOS { namespace DeviceUsageStats { diff --git a/interfaces/innerkits/src/bundle_active_group_callback_stub.cpp b/interfaces/innerkits/src/bundle_active_group_callback_stub.cpp index 266ff17..61cee22 100644 --- a/interfaces/innerkits/src/bundle_active_group_callback_stub.cpp +++ b/interfaces/innerkits/src/bundle_active_group_callback_stub.cpp @@ -15,7 +15,17 @@ #include "bundle_active_group_callback_stub.h" +#include +#include "bundle_active_group_callback_info.h" +#include "bundle_active_log.h" +#include "ibundle_active_group_callback.h" +#include "ipc_object_stub.h" +#include "memory" +#include "message_parcel.h" +#include "string" + namespace OHOS { +class MessageOption; namespace DeviceUsageStats { int32_t BundleActiveGroupCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel &reply, MessageOption &option) -- Gitee From 48fc8e37449fd0ca443c2d249c88f79d99443dfb Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 14 Jul 2022 16:20:24 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- services/common/include/bundle_active_account_helper.h | 3 +-- services/common/include/bundle_active_binary_search.h | 2 ++ services/common/include/bundle_active_log.h | 6 ++++-- services/common/include/bundle_active_open_callback.h | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/services/common/include/bundle_active_account_helper.h b/services/common/include/bundle_active_account_helper.h index cf7d311..1f5938f 100644 --- a/services/common/include/bundle_active_account_helper.h +++ b/services/common/include/bundle_active_account_helper.h @@ -16,11 +16,10 @@ #ifndef BUNDLE_ACTIVE_ACCOUNT_HELPER_H #define BUNDLE_ACTIVE_ACCOUNT_HELPER_H -#include +#include #include "errors.h" #ifdef OS_ACCOUNT_PART_ENABLED -#include "os_account_manager.h" #endif // OS_ACCOUNT_PART_ENABLED namespace OHOS { diff --git a/services/common/include/bundle_active_binary_search.h b/services/common/include/bundle_active_binary_search.h index c75e569..e1b0f80 100644 --- a/services/common/include/bundle_active_binary_search.h +++ b/services/common/include/bundle_active_binary_search.h @@ -16,6 +16,8 @@ #ifndef BUNDLE_ACTIVE_BINARY_SEARCH_H #define BUNDLE_ACTIVE_BINARY_SEARCH_H +#include + #include #include "singleton.h" diff --git a/services/common/include/bundle_active_log.h b/services/common/include/bundle_active_log.h index 68f5282..ec09247 100644 --- a/services/common/include/bundle_active_log.h +++ b/services/common/include/bundle_active_log.h @@ -16,8 +16,10 @@ #ifndef BUNDLE_ACTIVE_LOG_H #define BUNDLE_ACTIVE_LOG_H -#include -#include "hilog/log.h" +#include +#include "hilog/log_c.h" +#include "hilog/log_cpp.h" +#include "iosfwd" namespace OHOS { namespace DeviceUsageStats { diff --git a/services/common/include/bundle_active_open_callback.h b/services/common/include/bundle_active_open_callback.h index f2f3ba3..5e7a927 100644 --- a/services/common/include/bundle_active_open_callback.h +++ b/services/common/include/bundle_active_open_callback.h @@ -16,13 +16,13 @@ #ifndef BUNDLE_ACTIVE_OPEN_CALLBACK_H #define BUNDLE_ACTIVE_OPEN_CALLBACK_H -#include +#include #include "rdb_open_callback.h" -#include "rdb_errno.h" namespace OHOS { namespace DeviceUsageStats { +class RdbStore; class BundleActiveOpenCallback : public NativeRdb::RdbOpenCallback { public: BundleActiveOpenCallback(); -- Gitee From f2afa972d25a4853f55d1aa380ed81c8227cfbfe Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 14 Jul 2022 16:20:38 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- services/common/src/bundle_active_account_helper.cpp | 1 + services/common/src/bundle_active_binary_search.cpp | 4 +++- services/common/src/bundle_active_debug_mode.cpp | 5 +++-- services/common/src/bundle_active_log.cpp | 3 +++ services/common/src/bundle_active_open_callback.cpp | 3 ++- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/services/common/src/bundle_active_account_helper.cpp b/services/common/src/bundle_active_account_helper.cpp index 3886931..c1f3bfc 100644 --- a/services/common/src/bundle_active_account_helper.cpp +++ b/services/common/src/bundle_active_account_helper.cpp @@ -14,6 +14,7 @@ */ #include "bundle_active_account_helper.h" +#include "os_account_manager.h" namespace OHOS { namespace DeviceUsageStats { diff --git a/services/common/src/bundle_active_binary_search.cpp b/services/common/src/bundle_active_binary_search.cpp index b79b885..3e54ea8 100644 --- a/services/common/src/bundle_active_binary_search.cpp +++ b/services/common/src/bundle_active_binary_search.cpp @@ -14,7 +14,9 @@ */ #include "bundle_active_binary_search.h" -#include "bundle_active_log.h" + +#include "cstdint" +#include "vector" namespace OHOS { namespace DeviceUsageStats { diff --git a/services/common/src/bundle_active_debug_mode.cpp b/services/common/src/bundle_active_debug_mode.cpp index 7aa894c..ff94a7f 100644 --- a/services/common/src/bundle_active_debug_mode.cpp +++ b/services/common/src/bundle_active_debug_mode.cpp @@ -14,9 +14,10 @@ */ #include -#include - #include "bundle_active_debug_mode.h" +#include +#include "iosfwd" +#include "string" using OHOS::system::GetIntParameter; using OHOS::system::GetParameter; diff --git a/services/common/src/bundle_active_log.cpp b/services/common/src/bundle_active_log.cpp index 2f875b4..b58c52c 100644 --- a/services/common/src/bundle_active_log.cpp +++ b/services/common/src/bundle_active_log.cpp @@ -15,6 +15,9 @@ #include "bundle_active_log.h" +#include +#include "string" + namespace OHOS { namespace DeviceUsageStats { BundleActiveLogLevel BundleActiveLog::logLevel_ = {BundleActiveLogLevel::DEBUG}; diff --git a/services/common/src/bundle_active_open_callback.cpp b/services/common/src/bundle_active_open_callback.cpp index 81e35cf..8e09976 100644 --- a/services/common/src/bundle_active_open_callback.cpp +++ b/services/common/src/bundle_active_open_callback.cpp @@ -15,10 +15,11 @@ #include "bundle_active_open_callback.h" #include "bundle_active_log.h" -#include "bundle_active_constant.h" +#include "rdb_errno.h" namespace OHOS { namespace DeviceUsageStats { +class RdbStore; BundleActiveOpenCallback::BundleActiveOpenCallback() : NativeRdb::RdbOpenCallback() { }; -- Gitee From 2f8d9f0967271b0520f1034d8398eaf1c2c42528 Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 14 Jul 2022 19:09:06 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- frameworks/src/bundle_state_common.cpp | 4 ++-- frameworks/src/bundle_state_init.cpp | 7 ++++--- frameworks/src/bundle_state_query.cpp | 7 ++++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/frameworks/src/bundle_state_common.cpp b/frameworks/src/bundle_state_common.cpp index 2f5fe50..2ce0596 100644 --- a/frameworks/src/bundle_state_common.cpp +++ b/frameworks/src/bundle_state_common.cpp @@ -15,8 +15,8 @@ #include "securec.h" -#include -#include +#include +#include #include "__functional_base" #include "algorithm" diff --git a/frameworks/src/bundle_state_init.cpp b/frameworks/src/bundle_state_init.cpp index a49e6bb..2528d35 100644 --- a/frameworks/src/bundle_state_init.cpp +++ b/frameworks/src/bundle_state_init.cpp @@ -13,9 +13,8 @@ * limitations under the License. */ -#include "bundle_state_condition.h" -#include -#include +#include +#include #include "bundle_active_group_observer.h" #include "bundle_state_init.h" #include "bundle_state_query.h" @@ -24,6 +23,8 @@ #include "napi/native_api.h" #include "napi/native_common.h" +#include "bundle_state_condition.h" + namespace OHOS { namespace DeviceUsageStats { EXTERN_C_START diff --git a/frameworks/src/bundle_state_query.cpp b/frameworks/src/bundle_state_query.cpp index d42eeef..f614d21 100644 --- a/frameworks/src/bundle_state_query.cpp +++ b/frameworks/src/bundle_state_query.cpp @@ -13,9 +13,11 @@ * limitations under the License. */ +#include "bundle_state_query.h" + #include -#include -#include +#include +#include #include "securec.h" #include "bundle_active_client.h" @@ -25,7 +27,6 @@ #include "bundle_state_common.h" #include "bundle_state_data.h" #include "bundle_state_inner_errors.h" -#include "bundle_state_query.h" #include "cstdint" #include "errors.h" #include "iosfwd" -- Gitee From 98de8cd42ef89a124c9d4d0a452df9e7091de772 Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 14 Jul 2022 19:09:25 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- interfaces/innerkits/include/bundle_active_client.h | 2 +- .../innerkits/include/bundle_active_group_callback_info.h | 2 +- .../innerkits/include/bundle_active_group_callback_stub.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/innerkits/include/bundle_active_client.h b/interfaces/innerkits/include/bundle_active_client.h index 7d11ede..946e952 100644 --- a/interfaces/innerkits/include/bundle_active_client.h +++ b/interfaces/innerkits/include/bundle_active_client.h @@ -16,7 +16,7 @@ #ifndef BUNDLE_ACTIVE_CLIENT_H #define BUNDLE_ACTIVE_CLIENT_H -#include +#include #include #include "ibundle_active_group_callback.h" diff --git a/interfaces/innerkits/include/bundle_active_group_callback_info.h b/interfaces/innerkits/include/bundle_active_group_callback_info.h index 732eae4..4e542c3 100644 --- a/interfaces/innerkits/include/bundle_active_group_callback_info.h +++ b/interfaces/innerkits/include/bundle_active_group_callback_info.h @@ -16,7 +16,7 @@ #ifndef BUNDLE_ACTIVE_GROUP_CALLBACK_INFO_H #define BUNDLE_ACTIVE_GROUP_CALLBACK_INFO_H -#include +#include #include #include "iosfwd" diff --git a/interfaces/innerkits/include/bundle_active_group_callback_stub.h b/interfaces/innerkits/include/bundle_active_group_callback_stub.h index 7696000..da72444 100644 --- a/interfaces/innerkits/include/bundle_active_group_callback_stub.h +++ b/interfaces/innerkits/include/bundle_active_group_callback_stub.h @@ -16,7 +16,7 @@ #ifndef BUNDLE_ACTIVE_GROUP_CALLBACK_STUB_H #define BUNDLE_ACTIVE_GROUP_CALLBACK_STUB_H -#include +#include #include "ibundle_active_group_callback.h" #include "iremote_stub.h" #include "nocopyable.h" -- Gitee From 4fa474c7d84e3ce60619acff12a34fa0465f3d59 Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 14 Jul 2022 19:09:35 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- .../innerkits/src/bundle_active_group_callback_info.cpp | 3 ++- .../innerkits/src/bundle_active_group_callback_proxy.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/interfaces/innerkits/src/bundle_active_group_callback_info.cpp b/interfaces/innerkits/src/bundle_active_group_callback_info.cpp index 1a781b2..1d885fc 100644 --- a/interfaces/innerkits/src/bundle_active_group_callback_info.cpp +++ b/interfaces/innerkits/src/bundle_active_group_callback_info.cpp @@ -13,8 +13,9 @@ * limitations under the License. */ -#include "bundle_active_log.h" #include "bundle_active_group_callback_info.h" + +#include "bundle_active_log.h" #include "new" #include "string" diff --git a/interfaces/innerkits/src/bundle_active_group_callback_proxy.cpp b/interfaces/innerkits/src/bundle_active_group_callback_proxy.cpp index b6d7c94..8e5af6a 100644 --- a/interfaces/innerkits/src/bundle_active_group_callback_proxy.cpp +++ b/interfaces/innerkits/src/bundle_active_group_callback_proxy.cpp @@ -12,9 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include + #include "bundle_active_group_callback_proxy.h" -#include + +#include +#include #include "bundle_active_group_callback_info.h" #include "bundle_active_log.h" #include "errors.h" -- Gitee From 02c93c6097ab448fbc120a8e82de86eaa3821477 Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 14 Jul 2022 19:09:49 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- services/common/include/bundle_active_account_helper.h | 2 +- services/common/include/bundle_active_binary_search.h | 2 +- services/common/include/bundle_active_log.h | 2 +- services/common/include/bundle_active_open_callback.h | 2 +- services/common/include/ibundle_active_service.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/common/include/bundle_active_account_helper.h b/services/common/include/bundle_active_account_helper.h index 1f5938f..384dcf6 100644 --- a/services/common/include/bundle_active_account_helper.h +++ b/services/common/include/bundle_active_account_helper.h @@ -16,7 +16,7 @@ #ifndef BUNDLE_ACTIVE_ACCOUNT_HELPER_H #define BUNDLE_ACTIVE_ACCOUNT_HELPER_H -#include +#include #include "errors.h" #ifdef OS_ACCOUNT_PART_ENABLED diff --git a/services/common/include/bundle_active_binary_search.h b/services/common/include/bundle_active_binary_search.h index e1b0f80..4604a1d 100644 --- a/services/common/include/bundle_active_binary_search.h +++ b/services/common/include/bundle_active_binary_search.h @@ -16,7 +16,7 @@ #ifndef BUNDLE_ACTIVE_BINARY_SEARCH_H #define BUNDLE_ACTIVE_BINARY_SEARCH_H -#include +#include #include diff --git a/services/common/include/bundle_active_log.h b/services/common/include/bundle_active_log.h index ec09247..f7d21d7 100644 --- a/services/common/include/bundle_active_log.h +++ b/services/common/include/bundle_active_log.h @@ -16,7 +16,7 @@ #ifndef BUNDLE_ACTIVE_LOG_H #define BUNDLE_ACTIVE_LOG_H -#include +#include #include "hilog/log_c.h" #include "hilog/log_cpp.h" #include "iosfwd" diff --git a/services/common/include/bundle_active_open_callback.h b/services/common/include/bundle_active_open_callback.h index 5e7a927..c8aea2a 100644 --- a/services/common/include/bundle_active_open_callback.h +++ b/services/common/include/bundle_active_open_callback.h @@ -16,7 +16,7 @@ #ifndef BUNDLE_ACTIVE_OPEN_CALLBACK_H #define BUNDLE_ACTIVE_OPEN_CALLBACK_H -#include +#include #include "rdb_open_callback.h" diff --git a/services/common/include/ibundle_active_service.h b/services/common/include/ibundle_active_service.h index 4935160..7bb2431 100644 --- a/services/common/include/ibundle_active_service.h +++ b/services/common/include/ibundle_active_service.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "iremote_broker.h" #include "iremote_stub.h" -- Gitee From 1e6fb79a0c99d0a2601222ad18037849e7d183cd Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 14 Jul 2022 19:10:03 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- services/common/src/bundle_active_log.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/common/src/bundle_active_log.cpp b/services/common/src/bundle_active_log.cpp index b58c52c..66a6b9c 100644 --- a/services/common/src/bundle_active_log.cpp +++ b/services/common/src/bundle_active_log.cpp @@ -15,7 +15,7 @@ #include "bundle_active_log.h" -#include +#include #include "string" namespace OHOS { -- Gitee From c7bbb3b0abdf7375b7b1c96358c53aa917048acd Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 14 Jul 2022 19:10:18 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- services/packageusage/include/bundle_active_calendar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/packageusage/include/bundle_active_calendar.h b/services/packageusage/include/bundle_active_calendar.h index 41230b1..5f9aefe 100644 --- a/services/packageusage/include/bundle_active_calendar.h +++ b/services/packageusage/include/bundle_active_calendar.h @@ -16,7 +16,7 @@ #ifndef BUNDLE_ACTIVE_CALENDER_H #define BUNDLE_ACTIVE_CALENDER_H -#include +#include #include "bundle_active_constant.h" -- Gitee From 294b56ac45379c8e2e8744143945a31071b68d27 Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 14 Jul 2022 20:09:55 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- frameworks/src/bundle_state_common.cpp | 3 ++- frameworks/src/bundle_state_init.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frameworks/src/bundle_state_common.cpp b/frameworks/src/bundle_state_common.cpp index 2ce0596..4c003a6 100644 --- a/frameworks/src/bundle_state_common.cpp +++ b/frameworks/src/bundle_state_common.cpp @@ -27,7 +27,6 @@ #include "bundle_active_log.h" #include "bundle_active_module_record.h" #include "bundle_active_package_stats.h" -#include "bundle_state_common.h" #include "bundle_state_data.h" #include "bundle_state_inner_errors.h" #include "errors.h" @@ -43,6 +42,8 @@ #include "utility" #include "vector" +#include "bundle_state_common.h" + namespace OHOS { namespace DeviceUsageStats { AsyncWorkData::AsyncWorkData(napi_env napiEnv) diff --git a/frameworks/src/bundle_state_init.cpp b/frameworks/src/bundle_state_init.cpp index 2528d35..5f886fb 100644 --- a/frameworks/src/bundle_state_init.cpp +++ b/frameworks/src/bundle_state_init.cpp @@ -13,10 +13,11 @@ * limitations under the License. */ +#include "bundle_state_init.h" + #include #include #include "bundle_active_group_observer.h" -#include "bundle_state_init.h" #include "bundle_state_query.h" #include "js_native_api.h" #include "js_native_api_types.h" -- Gitee From 5d0bf1a5cc07badefc74aec7eebdd5136ff95d6c Mon Sep 17 00:00:00 2001 From: nobbo Date: Thu, 14 Jul 2022 20:10:17 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- services/common/src/bundle_active_debug_mode.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/common/src/bundle_active_debug_mode.cpp b/services/common/src/bundle_active_debug_mode.cpp index ff94a7f..14dad7a 100644 --- a/services/common/src/bundle_active_debug_mode.cpp +++ b/services/common/src/bundle_active_debug_mode.cpp @@ -13,8 +13,9 @@ * limitations under the License. */ -#include #include "bundle_active_debug_mode.h" + +#include #include #include "iosfwd" #include "string" -- Gitee From 81fec582aa1d94e52582efcd3ace0f7676068970 Mon Sep 17 00:00:00 2001 From: nobbo Date: Fri, 15 Jul 2022 15:56:59 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- frameworks/src/bundle_active_group_observer.cpp | 16 +++++++++++++++- frameworks/src/bundle_state_init.cpp | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/frameworks/src/bundle_active_group_observer.cpp b/frameworks/src/bundle_active_group_observer.cpp index 15aefc4..fcc3508 100644 --- a/frameworks/src/bundle_active_group_observer.cpp +++ b/frameworks/src/bundle_active_group_observer.cpp @@ -14,15 +14,29 @@ */ #include +#include +#include #include #include "securec.h" +#include "bundle_active_client.h" +#include "bundle_active_group_callback_info.h" #include "bundle_active_log.h" #include "bundle_state_common.h" #include "bundle_state_data.h" #include "bundle_state_inner_errors.h" -#include "bundle_active_group_callback_info.h" +#include "errors.h" +#include "ibundle_active_group_callback.h" +#include "iosfwd" +#include "js_native_api.h" +#include "js_native_api_types.h" +#include "memory" +#include "message_parcel.h" +#include "napi/native_api.h" +#include "napi/native_common.h" +#include "new" +#include "refbase.h" #include "bundle_active_group_observer.h" diff --git a/frameworks/src/bundle_state_init.cpp b/frameworks/src/bundle_state_init.cpp index 5f886fb..33c2f53 100644 --- a/frameworks/src/bundle_state_init.cpp +++ b/frameworks/src/bundle_state_init.cpp @@ -18,6 +18,7 @@ #include #include #include "bundle_active_group_observer.h" +#include "bundle_state_init.h" #include "bundle_state_query.h" #include "js_native_api.h" #include "js_native_api_types.h" -- Gitee From 8b8498fb6d715acc2f565c4cef2d599b4b4e6071 Mon Sep 17 00:00:00 2001 From: nobbo Date: Fri, 15 Jul 2022 15:57:16 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- .../innerkits/include/bundle_active_group_callback_proxy.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/interfaces/innerkits/include/bundle_active_group_callback_proxy.h b/interfaces/innerkits/include/bundle_active_group_callback_proxy.h index c1f519c..af36dd1 100644 --- a/interfaces/innerkits/include/bundle_active_group_callback_proxy.h +++ b/interfaces/innerkits/include/bundle_active_group_callback_proxy.h @@ -16,9 +16,12 @@ #ifndef BUNDLE_ACTIVE_GROUP_CALLBACK_PROXY_H #define BUNDLE_ACTIVE_GROUP_CALLBACK_PROXY_H +#include "bundle_active_group_callback_info.h" + #include "functional" #include "ibundle_active_group_callback.h" #include "iremote_broker.h" +#include "iremote_object.h" #include "iremote_proxy.h" #include "nocopyable.h" #include "refbase.h" -- Gitee From 79ea4978d0c122fd0f0f6174133298b7392cd64f Mon Sep 17 00:00:00 2001 From: nobbo Date: Fri, 15 Jul 2022 15:57:31 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- .../innerkits/src/bundle_active_group_callback_proxy.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/interfaces/innerkits/src/bundle_active_group_callback_proxy.cpp b/interfaces/innerkits/src/bundle_active_group_callback_proxy.cpp index 8e5af6a..5922ca2 100644 --- a/interfaces/innerkits/src/bundle_active_group_callback_proxy.cpp +++ b/interfaces/innerkits/src/bundle_active_group_callback_proxy.cpp @@ -17,11 +17,8 @@ #include #include -#include "bundle_active_group_callback_info.h" #include "bundle_active_log.h" #include "errors.h" -#include "ibundle_active_group_callback.h" -#include "iremote_object.h" #include "message_option.h" namespace OHOS { -- Gitee From 7cfecef336b8b090b24629ab7d7697308103daee Mon Sep 17 00:00:00 2001 From: nobbo Date: Fri, 15 Jul 2022 15:57:49 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- services/common/include/bundle_active_open_callback.h | 1 + .../include/bundle_active_power_state_callback_proxy.h | 6 ++++++ .../common/include/bundle_active_shutdown_callback_proxy.h | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/services/common/include/bundle_active_open_callback.h b/services/common/include/bundle_active_open_callback.h index c8aea2a..784e1dc 100644 --- a/services/common/include/bundle_active_open_callback.h +++ b/services/common/include/bundle_active_open_callback.h @@ -19,6 +19,7 @@ #include #include "rdb_open_callback.h" +#include "rdb_store.h" namespace OHOS { namespace DeviceUsageStats { diff --git a/services/common/include/bundle_active_power_state_callback_proxy.h b/services/common/include/bundle_active_power_state_callback_proxy.h index c0a158a..642e528 100644 --- a/services/common/include/bundle_active_power_state_callback_proxy.h +++ b/services/common/include/bundle_active_power_state_callback_proxy.h @@ -16,9 +16,15 @@ #ifndef BUNDLE_ACTIVE_POWER_STATE_CALLBACK_PROXY_H #define BUNDLE_ACTIVE_POWER_STATE_CALLBACK_PROXY_H +#include "functional" #include "ibundle_active_service.h" #include "ipower_state_callback.h" +#include "iremote_broker.h" +#include "iremote_object.h" +#include "iremote_proxy.h" #include "nocopyable.h" +#include "power_state_machine_info.h" +#include "refbase.h" namespace OHOS { namespace DeviceUsageStats { diff --git a/services/common/include/bundle_active_shutdown_callback_proxy.h b/services/common/include/bundle_active_shutdown_callback_proxy.h index e53fe5e..6a9bbf7 100644 --- a/services/common/include/bundle_active_shutdown_callback_proxy.h +++ b/services/common/include/bundle_active_shutdown_callback_proxy.h @@ -16,9 +16,14 @@ #ifndef BUNDLE_ACTIVE_SHUTDOWN_CALLBACK_PROXY_H #define BUNDLE_ACTIVE_SHUTDOWN_CALLBACK_PROXY_H +#include "functional" #include "ibundle_active_service.h" +#include "iremote_broker.h" +#include "iremote_object.h" +#include "iremote_proxy.h" #include "ishutdown_callback.h" #include "nocopyable.h" +#include "refbase.h" namespace OHOS { namespace DeviceUsageStats { -- Gitee From 3b67f68f95ee2ce5742a442d3d7d050ac4db9252 Mon Sep 17 00:00:00 2001 From: nobbo Date: Fri, 15 Jul 2022 15:58:02 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nobbo --- services/common/src/bundle_active_debug_mode.cpp | 2 +- .../common/src/bundle_active_power_state_callback_proxy.cpp | 5 +++++ .../common/src/bundle_active_power_state_callback_stub.cpp | 5 +++++ .../common/src/bundle_active_shutdown_callback_proxy.cpp | 6 ++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/services/common/src/bundle_active_debug_mode.cpp b/services/common/src/bundle_active_debug_mode.cpp index 14dad7a..c6f275a 100644 --- a/services/common/src/bundle_active_debug_mode.cpp +++ b/services/common/src/bundle_active_debug_mode.cpp @@ -16,7 +16,7 @@ #include "bundle_active_debug_mode.h" #include -#include +#include #include "iosfwd" #include "string" diff --git a/services/common/src/bundle_active_power_state_callback_proxy.cpp b/services/common/src/bundle_active_power_state_callback_proxy.cpp index 356183f..61ac605 100644 --- a/services/common/src/bundle_active_power_state_callback_proxy.cpp +++ b/services/common/src/bundle_active_power_state_callback_proxy.cpp @@ -14,6 +14,11 @@ */ #include "bundle_active_power_state_callback_proxy.h" +#include +#include "bundle_active_log.h" +#include "errors.h" +#include "message_option.h" +#include "message_parcel.h" #include "power_state_machine_info.h" namespace OHOS { diff --git a/services/common/src/bundle_active_power_state_callback_stub.cpp b/services/common/src/bundle_active_power_state_callback_stub.cpp index 6ec2ff1..b05caeb 100644 --- a/services/common/src/bundle_active_power_state_callback_stub.cpp +++ b/services/common/src/bundle_active_power_state_callback_stub.cpp @@ -14,7 +14,12 @@ */ #include "bundle_active_power_state_callback_stub.h" +#include +#include "bundle_active_log.h" #include "bundle_active_event.h" +#include "errors.h" +#include "ipc_object_stub.h" +#include "string" namespace OHOS { namespace DeviceUsageStats { diff --git a/services/common/src/bundle_active_shutdown_callback_proxy.cpp b/services/common/src/bundle_active_shutdown_callback_proxy.cpp index a8c60c3..541e33e 100644 --- a/services/common/src/bundle_active_shutdown_callback_proxy.cpp +++ b/services/common/src/bundle_active_shutdown_callback_proxy.cpp @@ -15,6 +15,12 @@ #include "bundle_active_shutdown_callback_proxy.h" +#include +#include "bundle_active_log.h" +#include "errors.h" +#include "message_option.h" +#include "message_parcel.h" + namespace OHOS { namespace DeviceUsageStats { void BundleActiveShutdownCallbackProxy::ShutdownCallback() -- Gitee