From 2b4ad8bb6bed22aa6ac0eca8586f304fbe7dd044 Mon Sep 17 00:00:00 2001 From: linxiangzhi <2350608530@qq.com> Date: Wed, 22 Dec 2021 07:01:35 +0000 Subject: [PATCH] =?UTF-8?q?=E9=9D=99=E6=80=81=E5=91=8A=E8=AD=A6=5F?= =?UTF-8?q?=E7=A9=BA=E8=A1=8C=E5=92=8C=E6=97=A0=E7=94=A8=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: linxiangzhi <2350608530@qq.com> Change-Id: I94115bea77aa88515da10c775e571ea87df9cacc --- common/log/src/app_log_wrapper.cpp | 1 - .../appexecfwk_base/include/launcher_ability_info.h | 1 - .../include/bundlemgr/bundle_mgr_host.h | 1 - .../include/bundlemgr/bundle_mgr_interface.h | 1 - .../include/bundlemgr/bundle_mgr_proxy.h | 1 - .../appexecfwk_core/src/appmgr/app_mgr_client.cpp | 6 ------ .../appexecfwk_core/src/appmgr/app_record_id.cpp | 2 -- .../appexecfwk_core/src/bundlemgr/bundle_mgr_host.cpp | 1 - .../appexecfwk_core/src/bundlemgr/bundle_mgr_proxy.cpp | 1 - interfaces/innerkits/fmskit/native/src/form_mgr.cpp | 1 - .../innerkits/libeventhandler/include/event_handler.h | 1 - .../innerkits/libeventhandler/include/event_queue.h | 4 ---- .../innerkits/libeventhandler/include/event_runner.h | 3 --- .../include/dispatcher/parallel_task_dispatcher_base.h | 1 - .../task_dispatcher/include/task/task_listener.h | 2 -- .../task_dispatcher/include/threading/runnable.h | 2 -- .../task_dispatcher/include/threading/thread_factory.h | 4 ---- .../innerkits/task_dispatcher/src/task/sync_task.cpp | 1 - kits/appkit/native/app/include/app_loader.h | 3 --- .../test/Mock/include/mock_ability_mgr_service.h | 1 - services/appmgr/include/process_optimizer_uba.h | 4 ---- .../ams_service_load_ability_process_test.cpp | 1 - services/bundlemgr/include/base_bundle_installer.h | 1 - services/bundlemgr/include/bundle_data_mgr.h | 1 - services/bundlemgr/include/bundle_installer.h | 1 - services/bundlemgr/include/bundle_mgr_host_impl.h | 2 -- services/bundlemgr/include/bundle_mgr_service.h | 10 +++++----- services/bundlemgr/include/inner_bundle_info.h | 1 - services/bundlemgr/src/base_bundle_installer.cpp | 3 --- services/bundlemgr/src/base_extractor.cpp | 4 ---- services/bundlemgr/src/bundle_data_mgr.cpp | 2 -- services/bundlemgr/src/bundle_data_storage.cpp | 4 ---- .../bundlemgr/src/bundle_data_storage_database.cpp | 1 - services/bundlemgr/src/bundle_mgr_host_impl.cpp | 5 ----- services/bundlemgr/src/bundle_mgr_service.cpp | 1 - .../bundlemgr/src/bundle_mgr_service_event_handler.cpp | 3 --- services/bundlemgr/src/bundle_parser.cpp | 3 --- services/bundlemgr/src/bundle_profile.cpp | 6 ------ services/bundlemgr/src/bundle_scanner.cpp | 5 ----- services/bundlemgr/src/inner_bundle_info.cpp | 2 -- services/bundlemgr/src/installd/installd_host_impl.cpp | 10 ---------- services/bundlemgr/src/module_usage_data_storage.cpp | 1 - .../bundlemgr/test/mock/src/system_ability_helper.cpp | 3 --- .../bms_bundle_kit_service_test.cpp | 3 --- services/formmgr/include/form_item_info.h | 1 - services/formmgr/include/form_refresh_limiter.h | 5 ----- services/test/mock/src/system_ability_helper.cpp | 3 --- .../ams_app_life_cycle_module_test.cpp | 1 - .../amsAbilityAppendTestA/src/test_utils.cpp | 4 ---- .../amsAbilityAppendTestB/src/test_utils.cpp | 5 +---- .../amsConfigurationUpdatedTest/src/test_utils.cpp | 4 ---- .../src/ams_st_data_ability_data_a.cpp | 6 ------ .../src/kit_test_ability_manager_second.cpp | 3 --- .../include/kit_test_ability_manager.h | 1 - .../src/kit_test_ability_manager.cpp | 3 --- .../amsKitSTAbilityManagerFirst/src/test_utils.cpp | 4 ---- .../amsKitSystemTest/src/kit_test_ability_manager.cpp | 3 --- .../abilitySrc/amsKitSystemTest/src/test_utils.cpp | 5 +---- .../abilitySrc/amsKitSystemTest/src/third_ability.cpp | 3 --- .../abilitySrc/amsKitSystemTestA/src/test_utils.cpp | 5 +---- .../abilitySrc/amsKitSystemTestB/src/test_utils.cpp | 5 +---- .../amsKitSystemTestPageA/src/test_utils.cpp | 3 --- .../amsKitSystemTestService/src/test_utils.cpp | 4 +--- .../abilitySrc/amsMissionStackTest/src/test_utils.cpp | 4 ---- .../amsMissionStackTestSubsidiary/src/test_utils.cpp | 5 +---- .../abilitySrc/fwkAbilityState/src/test_utils.cpp | 1 - .../taskDispatcherTestA/src/main_ability.cpp | 6 ------ .../abilitySrc/taskDispatcherTestA/src/test_utils.cpp | 4 ---- .../abilitySrc/taskDispatcherTestB/src/test_utils.cpp | 4 ---- .../abilitySrc/tools/include/event.h | 3 --- .../abilitySrc/tools/include/stoperator.h | 3 --- .../common/ams/tool/include/module_test_dump_util.h | 3 --- test/systemtest/common/ams/tool/include/stoperator.h | 2 -- 73 files changed, 11 insertions(+), 207 deletions(-) diff --git a/common/log/src/app_log_wrapper.cpp b/common/log/src/app_log_wrapper.cpp index d9706b9460..88f3e27631 100644 --- a/common/log/src/app_log_wrapper.cpp +++ b/common/log/src/app_log_wrapper.cpp @@ -14,7 +14,6 @@ */ #include "app_log_wrapper.h" -#include namespace OHOS { namespace AppExecFwk { diff --git a/interfaces/innerkits/appexecfwk_base/include/launcher_ability_info.h b/interfaces/innerkits/appexecfwk_base/include/launcher_ability_info.h index cc4fca2bf5..ccd75808ec 100644 --- a/interfaces/innerkits/appexecfwk_base/include/launcher_ability_info.h +++ b/interfaces/innerkits/appexecfwk_base/include/launcher_ability_info.h @@ -23,7 +23,6 @@ namespace OHOS { namespace AppExecFwk { - struct LauncherAbilityInfo { public: std::string name; // ability name, only the main class name diff --git a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_host.h b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_host.h index 689a9e00c9..5ed482fc1a 100644 --- a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_host.h +++ b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_host.h @@ -457,7 +457,6 @@ private: DISALLOW_COPY_AND_MOVE(BundleMgrHost); }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_BUNDLEMGR_BUNDLE_MGR_HOST_H \ No newline at end of file diff --git a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h index 42ebdaa339..8d2bb1a831 100644 --- a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h +++ b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h @@ -542,7 +542,6 @@ public: CHECK_BUNDLE_NAME_IN_ALLOWLIST }; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_BUNDLEMGR_BUNDLE_MGR_INTERFACE_H diff --git a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_proxy.h b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_proxy.h index 3c889fe005..3701701f9e 100644 --- a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_proxy.h +++ b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_proxy.h @@ -499,7 +499,6 @@ private: bool GetParcelableInfos(IBundleMgr::Message code, MessageParcel &data, std::vector &parcelableInfos); static inline BrokerDelegator delegator_; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_BUNDLEMGR_BUNDLE_MGR_PROXY_H \ No newline at end of file diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_client.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_client.cpp index f6a1b22d35..337f2f3b9b 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_client.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_client.cpp @@ -14,14 +14,8 @@ */ #include "app_mgr_client.h" - -#include -#include -#include - #include "if_system_ability_manager.h" #include "ipc_skeleton.h" - #include "app_mgr_interface.h" #include "app_service_manager.h" #include "app_log_wrapper.h" diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_record_id.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_record_id.cpp index c1b5ab5705..fd57c8535f 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_record_id.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_record_id.cpp @@ -13,8 +13,6 @@ * limitations under the License. */ -#include - #include "app_record_id.h" namespace OHOS { namespace AppExecFwk { diff --git a/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_host.cpp b/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_host.cpp index 47804ce3e0..9d60635587 100755 --- a/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_host.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_host.cpp @@ -1275,6 +1275,5 @@ bool BundleMgrHost::WriteParcelableVector(std::vector &parcelableVector, Parc } return true; } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_proxy.cpp b/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_proxy.cpp index 57a81f577f..a1ba834268 100644 --- a/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_proxy.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_proxy.cpp @@ -1651,6 +1651,5 @@ bool BundleMgrProxy::SendTransactCmd(IBundleMgr::Message code, MessageParcel &da } return true; } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/interfaces/innerkits/fmskit/native/src/form_mgr.cpp b/interfaces/innerkits/fmskit/native/src/form_mgr.cpp index b70daef0f4..b8deb82d8e 100644 --- a/interfaces/innerkits/fmskit/native/src/form_mgr.cpp +++ b/interfaces/innerkits/fmskit/native/src/form_mgr.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ -#include #include "appexecfwk_errors.h" #include "app_log_wrapper.h" #include "form_errors.h" diff --git a/interfaces/innerkits/libeventhandler/include/event_handler.h b/interfaces/innerkits/libeventhandler/include/event_handler.h index d232a1a195..c68db0285b 100644 --- a/interfaces/innerkits/libeventhandler/include/event_handler.h +++ b/interfaces/innerkits/libeventhandler/include/event_handler.h @@ -17,7 +17,6 @@ #define FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_LIBEVENTHANDLER_INCLUDE_EVENT_HANDLER_H #include "event_runner.h" -#include "dumper.h" namespace OHOS { namespace AppExecFwk { diff --git a/interfaces/innerkits/libeventhandler/include/event_queue.h b/interfaces/innerkits/libeventhandler/include/event_queue.h index 0315975a11..0caaf0fadc 100644 --- a/interfaces/innerkits/libeventhandler/include/event_queue.h +++ b/interfaces/innerkits/libeventhandler/include/event_queue.h @@ -19,13 +19,9 @@ #include #include #include -#include - #include "inner_event.h" #include "event_handler_errors.h" #include "file_descriptor_listener.h" -#include "dumper.h" -#include "logger.h" namespace OHOS { namespace AppExecFwk { diff --git a/interfaces/innerkits/libeventhandler/include/event_runner.h b/interfaces/innerkits/libeventhandler/include/event_runner.h index 4d648085c6..ba60f56911 100644 --- a/interfaces/innerkits/libeventhandler/include/event_runner.h +++ b/interfaces/innerkits/libeventhandler/include/event_runner.h @@ -17,10 +17,7 @@ #define FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_LIBEVENTHANDLER_INCLUDE_EVENT_RUNNER_H #include - #include "event_queue.h" -#include "dumper.h" -#include "logger.h" namespace OHOS { namespace AppExecFwk { diff --git a/interfaces/innerkits/task_dispatcher/include/dispatcher/parallel_task_dispatcher_base.h b/interfaces/innerkits/task_dispatcher/include/dispatcher/parallel_task_dispatcher_base.h index 22b248f0df..34d9d566de 100644 --- a/interfaces/innerkits/task_dispatcher/include/dispatcher/parallel_task_dispatcher_base.h +++ b/interfaces/innerkits/task_dispatcher/include/dispatcher/parallel_task_dispatcher_base.h @@ -115,7 +115,6 @@ private: } }; }; - } // namespace AppExecFwk } // namespace OHOS #endif \ No newline at end of file diff --git a/interfaces/innerkits/task_dispatcher/include/task/task_listener.h b/interfaces/innerkits/task_dispatcher/include/task/task_listener.h index b189189951..6a6fb101d6 100644 --- a/interfaces/innerkits/task_dispatcher/include/task/task_listener.h +++ b/interfaces/innerkits/task_dispatcher/include/task/task_listener.h @@ -15,8 +15,6 @@ #ifndef OHOS_APP_DISPATCHER_TASK_TASK_LISTENER_H #define OHOS_APP_DISPATCHER_TASK_TASK_LISTENER_H -#include "task_stage.h" - namespace OHOS { namespace AppExecFwk { /** diff --git a/interfaces/innerkits/task_dispatcher/include/threading/runnable.h b/interfaces/innerkits/task_dispatcher/include/threading/runnable.h index af541d17ca..176af9bc1e 100644 --- a/interfaces/innerkits/task_dispatcher/include/threading/runnable.h +++ b/interfaces/innerkits/task_dispatcher/include/threading/runnable.h @@ -16,8 +16,6 @@ #ifndef OHOS_APP_DISPATCHER_THREADING_RUNNABLE_H #define OHOS_APP_DISPATCHER_THREADING_RUNNABLE_H -#include - namespace OHOS { namespace AppExecFwk { using Runnable = std::function; diff --git a/interfaces/innerkits/task_dispatcher/include/threading/thread_factory.h b/interfaces/innerkits/task_dispatcher/include/threading/thread_factory.h index f1d685ed0f..8fe1be8b64 100644 --- a/interfaces/innerkits/task_dispatcher/include/threading/thread_factory.h +++ b/interfaces/innerkits/task_dispatcher/include/threading/thread_factory.h @@ -16,10 +16,6 @@ #ifndef OHOS_APP_DISPATCHER_THREADING_THREAD_FACTORY_H #define OHOS_APP_DISPATCHER_THREADING_THREAD_FACTORY_H -#include "runnable.h" -#include -#include - namespace OHOS { namespace AppExecFwk { class Thread { diff --git a/interfaces/innerkits/task_dispatcher/src/task/sync_task.cpp b/interfaces/innerkits/task_dispatcher/src/task/sync_task.cpp index a551df0e43..e37e61e1a0 100644 --- a/interfaces/innerkits/task_dispatcher/src/task/sync_task.cpp +++ b/interfaces/innerkits/task_dispatcher/src/task/sync_task.cpp @@ -58,6 +58,5 @@ void SyncTask::WaitTask() APP_LOGI("SyncTask::WaitTask end thread=%{public}zu", CalculateHashCode(threadId)); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/kits/appkit/native/app/include/app_loader.h b/kits/appkit/native/app/include/app_loader.h index b38c156103..0ce175ecd7 100644 --- a/kits/appkit/native/app/include/app_loader.h +++ b/kits/appkit/native/app/include/app_loader.h @@ -17,10 +17,7 @@ #define FOUNDATION_APPEXECFWK_OHOS_APPLICATION_LOADER_H #include "ohos_application.h" - -#include #include -#include namespace OHOS { namespace AppExecFwk { diff --git a/kits/appkit/test/Mock/include/mock_ability_mgr_service.h b/kits/appkit/test/Mock/include/mock_ability_mgr_service.h index 0b239e2e73..c2758930c1 100644 --- a/kits/appkit/test/Mock/include/mock_ability_mgr_service.h +++ b/kits/appkit/test/Mock/include/mock_ability_mgr_service.h @@ -83,7 +83,6 @@ private: bool DumpStateCalled_ = false; Semaphore sem_; }; - } // namespace AAFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_KITS_APPKIT_TEST_MOCK_ABILITY_MGR_SERVICE_H \ No newline at end of file diff --git a/services/appmgr/include/process_optimizer_uba.h b/services/appmgr/include/process_optimizer_uba.h index 89c0440afd..5970c4f6aa 100644 --- a/services/appmgr/include/process_optimizer_uba.h +++ b/services/appmgr/include/process_optimizer_uba.h @@ -17,11 +17,7 @@ #define FOUNDATION_APPEXECFWK_SERVICES_APPMGR_INCLUDE_PROCESS_OPTIMIZER_UBA_H #include -#include #include -#include -#include - #include "process_optimizer.h" namespace OHOS { diff --git a/services/appmgr/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp b/services/appmgr/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp index be3048ca3f..7f6b900c07 100644 --- a/services/appmgr/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp +++ b/services/appmgr/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp @@ -1132,6 +1132,5 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartProcess004, TestSize.Level1) EXPECT_EQ(record1, nullptr); APP_LOGI("AmsServiceLoadAbilityProcessTest StartProcess004 end"); } - } // namespace AppExecFwk } // namespace OHOS \ 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 033dc7a5ee..45a94aff31 100644 --- a/services/bundlemgr/include/base_bundle_installer.h +++ b/services/bundlemgr/include/base_bundle_installer.h @@ -263,7 +263,6 @@ private: DISALLOW_COPY_AND_MOVE(BaseBundleInstaller); }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_SERVICES_BUNDLEMGR_INCLUDE_BASE_BUNDLE_INSTALLER_H \ No newline at end of file diff --git a/services/bundlemgr/include/bundle_data_mgr.h b/services/bundlemgr/include/bundle_data_mgr.h index 4be16d6a22..29d92664d9 100755 --- a/services/bundlemgr/include/bundle_data_mgr.h +++ b/services/bundlemgr/include/bundle_data_mgr.h @@ -587,7 +587,6 @@ private: // map. std::map>> permissionsCallbacks_; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_SERVICES_BUNDLEMGR_INCLUDE_BUNDLE_DATA_MGR_H diff --git a/services/bundlemgr/include/bundle_installer.h b/services/bundlemgr/include/bundle_installer.h index 896ade5c74..4e653ab05c 100644 --- a/services/bundlemgr/include/bundle_installer.h +++ b/services/bundlemgr/include/bundle_installer.h @@ -83,7 +83,6 @@ private: const sptr statusReceiver_; DISALLOW_COPY_AND_MOVE(BundleInstaller); }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_SERVICES_BUNDLEMGR_INCLUDE_BUNDLE_INSTALLER_H \ No newline at end of file diff --git a/services/bundlemgr/include/bundle_mgr_host_impl.h b/services/bundlemgr/include/bundle_mgr_host_impl.h index d6ec4e92bd..ef3c0ca29b 100644 --- a/services/bundlemgr/include/bundle_mgr_host_impl.h +++ b/services/bundlemgr/include/bundle_mgr_host_impl.h @@ -22,7 +22,6 @@ namespace OHOS { namespace AppExecFwk { - class BundleMgrHostImpl : public BundleMgrHost { public: /** @@ -448,7 +447,6 @@ private: const std::shared_ptr GetCloneMgrFromService(); const std::shared_ptr GetDataMgrFromService(); }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_SERVICES_BUNDLEMGR_INCLUDE_BUNDLE_MGR_HOST_IMPL_H diff --git a/services/bundlemgr/include/bundle_mgr_service.h b/services/bundlemgr/include/bundle_mgr_service.h index 7969f3cd89..39645e2528 100644 --- a/services/bundlemgr/include/bundle_mgr_service.h +++ b/services/bundlemgr/include/bundle_mgr_service.h @@ -49,14 +49,15 @@ public: * @return Returns true if the bundle manager service is ready; returns false otherwise. */ bool IsServiceReady() const; + /** + * @brief Get a shared pointer to the BundleCloneMgr object. + * @return Returns the pointer of BundleCloneMgr object. + */ + const std::shared_ptr GetCloneMgr() const; /** * @brief Get a shared pointer to the BundleDataMgr object. * @return Returns the pointer of BundleDataMgr object. */ - const std::shared_ptr GetCloneMgr() const; - - - const std::shared_ptr GetDataMgr() const; /** * @brief Get a IBundleInstaller object for IPC @@ -90,7 +91,6 @@ private: DISALLOW_COPY_AND_MOVE(BundleMgrService); }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_SERVICES_BUNDLEMGR_INCLUDE_BUNDLE_MGR_SERVICE_H diff --git a/services/bundlemgr/include/inner_bundle_info.h b/services/bundlemgr/include/inner_bundle_info.h index a320c6709c..afdcfdff9c 100644 --- a/services/bundlemgr/include/inner_bundle_info.h +++ b/services/bundlemgr/include/inner_bundle_info.h @@ -1105,7 +1105,6 @@ public: */ void GetCommonEvents(const std::string &eventKey, std::vector &commonEvents) const; - std::optional GetInnerModuleInfoByModuleName(const std::string &moduleName) const; void GetModuleNames(std::vector &moduleNames) const; diff --git a/services/bundlemgr/src/base_bundle_installer.cpp b/services/bundlemgr/src/base_bundle_installer.cpp index 5dc8382785..4172814fa8 100755 --- a/services/bundlemgr/src/base_bundle_installer.cpp +++ b/services/bundlemgr/src/base_bundle_installer.cpp @@ -39,7 +39,6 @@ namespace OHOS { namespace AppExecFwk { namespace { - bool UninstallApplicationProcesses(const std::string &bundleName, const int uid) { APP_LOGI("uninstall kill running processes, app name is %{public}s", bundleName.c_str()); @@ -55,7 +54,6 @@ bool UninstallApplicationProcesses(const std::string &bundleName, const int uid) } return true; } - } // namespace BaseBundleInstaller::BaseBundleInstaller() @@ -683,6 +681,5 @@ bool BaseBundleInstaller::UpdateBundlePaths(InnerBundleInfo &info, const std::st info.SetAppCacheDir(baseDataPath + Constants::PATH_SEPARATOR + Constants::CACHE_DIR); return true; } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/services/bundlemgr/src/base_extractor.cpp b/services/bundlemgr/src/base_extractor.cpp index 0303824fd1..84c5d1644d 100644 --- a/services/bundlemgr/src/base_extractor.cpp +++ b/services/bundlemgr/src/base_extractor.cpp @@ -14,10 +14,6 @@ */ #include "base_extractor.h" - -#include -#include - #include "string_ex.h" #include "app_log_wrapper.h" #include "bundle_constants.h" diff --git a/services/bundlemgr/src/bundle_data_mgr.cpp b/services/bundlemgr/src/bundle_data_mgr.cpp index b357441569..c7761bfdd1 100755 --- a/services/bundlemgr/src/bundle_data_mgr.cpp +++ b/services/bundlemgr/src/bundle_data_mgr.cpp @@ -33,7 +33,6 @@ namespace OHOS { namespace AppExecFwk { - BundleDataMgr::BundleDataMgr() { InitStateTransferMap(); @@ -1993,6 +1992,5 @@ bool BundleDataMgr::GetClonedBundleName(const std::string &bundleName, std::stri return false; APP_LOGI("GetCloneBundleName finish"); } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/services/bundlemgr/src/bundle_data_storage.cpp b/services/bundlemgr/src/bundle_data_storage.cpp index 56cc84bcc0..12752da635 100644 --- a/services/bundlemgr/src/bundle_data_storage.cpp +++ b/services/bundlemgr/src/bundle_data_storage.cpp @@ -14,10 +14,6 @@ */ #include "bundle_data_storage.h" - -#include -#include - #include "string_ex.h" #include "app_log_wrapper.h" #include "bundle_constants.h" diff --git a/services/bundlemgr/src/bundle_data_storage_database.cpp b/services/bundlemgr/src/bundle_data_storage_database.cpp index 176abafc23..b740a3cd56 100644 --- a/services/bundlemgr/src/bundle_data_storage_database.cpp +++ b/services/bundlemgr/src/bundle_data_storage_database.cpp @@ -292,6 +292,5 @@ bool BundleDataStorageDatabase::ResetKvStore() APP_LOGW("failed"); return false; } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/services/bundlemgr/src/bundle_mgr_host_impl.cpp b/services/bundlemgr/src/bundle_mgr_host_impl.cpp index 98955c46e2..3929026c61 100755 --- a/services/bundlemgr/src/bundle_mgr_host_impl.cpp +++ b/services/bundlemgr/src/bundle_mgr_host_impl.cpp @@ -14,9 +14,6 @@ */ #include "bundle_mgr_host_impl.h" - -#include - #include "json_serializer.h" #include "app_log_wrapper.h" #include "bundle_mgr_service.h" @@ -28,7 +25,6 @@ namespace OHOS { namespace AppExecFwk { - bool BundleMgrHostImpl::GetApplicationInfo( const std::string &appName, const ApplicationFlag flag, const int userId, ApplicationInfo &appInfo) { @@ -719,6 +715,5 @@ const std::shared_ptr BundleMgrHostImpl::GetDataMgrFromService() { return DelayedSingleton::GetInstance()->GetDataMgr(); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/bundlemgr/src/bundle_mgr_service.cpp b/services/bundlemgr/src/bundle_mgr_service.cpp index 3222f5a32a..6a6d47b4c7 100644 --- a/services/bundlemgr/src/bundle_mgr_service.cpp +++ b/services/bundlemgr/src/bundle_mgr_service.cpp @@ -195,6 +195,5 @@ void BundleMgrService::SelfClean() } } } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/bundlemgr/src/bundle_mgr_service_event_handler.cpp b/services/bundlemgr/src/bundle_mgr_service_event_handler.cpp index 9255e2459e..17ce40196d 100755 --- a/services/bundlemgr/src/bundle_mgr_service_event_handler.cpp +++ b/services/bundlemgr/src/bundle_mgr_service_event_handler.cpp @@ -14,9 +14,6 @@ */ #include "bundle_mgr_service_event_handler.h" - -#include - #include "app_log_wrapper.h" #include "bundle_mgr_service.h" #include "bundle_scanner.h" diff --git a/services/bundlemgr/src/bundle_parser.cpp b/services/bundlemgr/src/bundle_parser.cpp index 52353bec6f..01fa9637d8 100644 --- a/services/bundlemgr/src/bundle_parser.cpp +++ b/services/bundlemgr/src/bundle_parser.cpp @@ -14,9 +14,6 @@ */ #include "bundle_parser.h" - -#include - #include "app_log_wrapper.h" #include "bundle_constants.h" #include "bundle_extractor.h" diff --git a/services/bundlemgr/src/bundle_profile.cpp b/services/bundlemgr/src/bundle_profile.cpp index f29e758be8..7d44df56a8 100644 --- a/services/bundlemgr/src/bundle_profile.cpp +++ b/services/bundlemgr/src/bundle_profile.cpp @@ -14,10 +14,6 @@ */ #include "bundle_profile.h" - -#include -#include - #include "permission/permission_kit.h" #include "app_log_wrapper.h" #include "bundle_constants.h" @@ -2168,7 +2164,6 @@ bool TransformToInfo(ProfileReader::ConfigJson &configJson, InnerBundleInfo &inn innerBundleInfo.InsertInnerModuleInfo(configJson.module.package, innerModuleInfo); return true; } - } // namespace ErrCode BundleProfile::TransformTo(const std::ostringstream &source, InnerBundleInfo &innerBundleInfo) const @@ -2193,6 +2188,5 @@ ErrCode BundleProfile::TransformTo(const std::ostringstream &source, InnerBundle } return ERR_OK; } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/bundlemgr/src/bundle_scanner.cpp b/services/bundlemgr/src/bundle_scanner.cpp index f160bf4e72..41e8b71463 100755 --- a/services/bundlemgr/src/bundle_scanner.cpp +++ b/services/bundlemgr/src/bundle_scanner.cpp @@ -14,11 +14,6 @@ */ #include "bundle_scanner.h" - -#include -#include -#include - #include "datetime_ex.h" #include "string_ex.h" #include "app_log_wrapper.h" diff --git a/services/bundlemgr/src/inner_bundle_info.cpp b/services/bundlemgr/src/inner_bundle_info.cpp index e9e1cf71a7..3f25695ed8 100644 --- a/services/bundlemgr/src/inner_bundle_info.cpp +++ b/services/bundlemgr/src/inner_bundle_info.cpp @@ -61,7 +61,6 @@ const std::string MODULE_SHORTCUT = "shortcutInfos"; const std::string MODULE_COMMON_EVENT = "commonEvents"; const std::string MODULE_MAIN_ABILITY = "mainAbility"; const std::string NEW_BUNDLE_NAME = "newBundleName"; - } // namespace InnerBundleInfo::InnerBundleInfo() @@ -1149,6 +1148,5 @@ void InnerBundleInfo::GetModuleNames(std::vector &moduleNames) cons moduleNames.emplace_back(innerModuleInfo.second.moduleName); } } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/services/bundlemgr/src/installd/installd_host_impl.cpp b/services/bundlemgr/src/installd/installd_host_impl.cpp index bb3cb325ab..f928e76a79 100644 --- a/services/bundlemgr/src/installd/installd_host_impl.cpp +++ b/services/bundlemgr/src/installd/installd_host_impl.cpp @@ -14,16 +14,6 @@ */ #include "installd/installd_host_impl.h" - -#include -#include -#include -#include -#include -#include -#include -#include - #include "directory_ex.h" #include "bundle_constants.h" #include "app_log_wrapper.h" diff --git a/services/bundlemgr/src/module_usage_data_storage.cpp b/services/bundlemgr/src/module_usage_data_storage.cpp index 1a0e63a0ff..e160458c99 100644 --- a/services/bundlemgr/src/module_usage_data_storage.cpp +++ b/services/bundlemgr/src/module_usage_data_storage.cpp @@ -372,6 +372,5 @@ bool ModuleUsageRecordStorage::ResetKvStore() APP_LOGW("usage reset failed"); return false; } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/bundlemgr/test/mock/src/system_ability_helper.cpp b/services/bundlemgr/test/mock/src/system_ability_helper.cpp index 87df614aea..b8b455f501 100644 --- a/services/bundlemgr/test/mock/src/system_ability_helper.cpp +++ b/services/bundlemgr/test/mock/src/system_ability_helper.cpp @@ -14,9 +14,6 @@ */ #include "system_ability_helper.h" - -#include - #include "system_ability_definition.h" #include "app_log_wrapper.h" #include "mock_ability_mgr_host.h" diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp index 3557e746a8..4ab02d7e74 100755 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp @@ -38,7 +38,6 @@ using namespace OHOS::AppExecFwk; using OHOS::AAFwk::Want; namespace { - const std::string BUNDLE_NAME_TEST = "com.example.bundlekit.test"; const std::string MODULE_NAME_TEST = "com.example.bundlekit.test.entry"; const std::string ABILITY_NAME_TEST1 = ".Reading1"; @@ -146,7 +145,6 @@ const std::string COMMON_EVENT_EVENT = "usual.event.PACKAGE_ADDED"; const std::string COMMON_EVENT_EVENT_ERROR_KEY = "usual.event.PACKAGE_ADDED_D"; const std::string COMMON_EVENT_EVENT_NOT_EXISTS_KEY = "usual.event.PACKAGE_REMOVED"; const int FORMINFO_DESCRIPTIONID = 123; - } // namespace class BmsBundleKitServiceTest : public testing::Test { @@ -865,7 +863,6 @@ void BmsBundleKitServiceTest::CheckShortcutInfoTest(std::vector &s void BmsBundleKitServiceTest::CheckCommonEventInfoTest(std::vector &commonEventInfos) const { for (const auto &commonEventInfo : commonEventInfos) { - EXPECT_EQ(commonEventInfo.name, COMMON_EVENT_NAME); EXPECT_EQ(commonEventInfo.bundleName, BUNDLE_NAME_TEST); EXPECT_EQ(commonEventInfo.uid, TEST_UID); diff --git a/services/formmgr/include/form_item_info.h b/services/formmgr/include/form_item_info.h index 3106ed83c8..c33df4e354 100644 --- a/services/formmgr/include/form_item_info.h +++ b/services/formmgr/include/form_item_info.h @@ -19,7 +19,6 @@ #include #include #include -#include #include "form_record.h" namespace OHOS { diff --git a/services/formmgr/include/form_refresh_limiter.h b/services/formmgr/include/form_refresh_limiter.h index e4202b169b..1a947bfb08 100644 --- a/services/formmgr/include/form_refresh_limiter.h +++ b/services/formmgr/include/form_refresh_limiter.h @@ -16,11 +16,6 @@ #ifndef FOUNDATION_APPEXECFWK_SERVICES_FORMMGR_INCLUDE_FORM_TIMER_REFRESH_LIMITER_H #define FOUNDATION_APPEXECFWK_SERVICES_FORMMGR_INCLUDE_FORM_TIMER_REFRESH_LIMITER_H -#include -#include -#include -#include "form_timer.h" - namespace OHOS { namespace AppExecFwk { /** diff --git a/services/test/mock/src/system_ability_helper.cpp b/services/test/mock/src/system_ability_helper.cpp index 00c4654a81..431568e321 100644 --- a/services/test/mock/src/system_ability_helper.cpp +++ b/services/test/mock/src/system_ability_helper.cpp @@ -14,9 +14,6 @@ */ #include "system_ability_helper.h" - -#include - #include "system_ability_definition.h" #include "app_log_wrapper.h" #include "mock_ability_mgr_host.h" diff --git a/services/test/moduletest/common/ams/app_life_cycle_test/ams_app_life_cycle_module_test.cpp b/services/test/moduletest/common/ams/app_life_cycle_test/ams_app_life_cycle_module_test.cpp index 46b9091ede..846325edf5 100755 --- a/services/test/moduletest/common/ams/app_life_cycle_test/ams_app_life_cycle_module_test.cpp +++ b/services/test/moduletest/common/ams/app_life_cycle_test/ams_app_life_cycle_module_test.cpp @@ -1011,7 +1011,6 @@ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_013, TestSize.Level3) */ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_014, TestSize.Level1) { - pid_t pid = 1000; sptr token = GetAbilityToken(); auto abilityInfo = GetAbilityInfo("0", "MainAbility", "p1", "com.ohos.test.special"); diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp index 3e75bdf815..2ec484b7ef 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp @@ -13,10 +13,6 @@ * limitations under the License. */ #include "test_utils.h" -#include -#include -#include -#include #include "common_event_data.h" #include "common_event_manager.h" namespace OHOS { diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp index 3e75bdf815..cbc97a19a5 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp @@ -13,12 +13,9 @@ * limitations under the License. */ #include "test_utils.h" -#include -#include -#include -#include #include "common_event_data.h" #include "common_event_manager.h" + namespace OHOS { namespace AppExecFwk { using namespace OHOS::EventFwk; diff --git a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/src/test_utils.cpp index 3e75bdf815..2ec484b7ef 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/src/test_utils.cpp @@ -13,10 +13,6 @@ * limitations under the License. */ #include "test_utils.h" -#include -#include -#include -#include #include "common_event_data.h" #include "common_event_manager.h" namespace OHOS { diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp index d259b18fe1..08b07980f4 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp @@ -13,12 +13,6 @@ * limitations under the License. */ #include "ams_st_data_ability_data_a.h" - -#include -#include -#include -#include - #include "app_log_wrapper.h" #include "data_ability_helper.h" #include "file_ex.h" diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp index 901cc5f8f0..691c213304 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp @@ -14,9 +14,6 @@ */ #include "kit_test_ability_manager_second.h" -#include -#include -#include #include "app_log_wrapper.h" namespace OHOS { diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/kit_test_ability_manager.h b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/kit_test_ability_manager.h index 1bc3c529ed..8719201374 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/kit_test_ability_manager.h +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/kit_test_ability_manager.h @@ -189,7 +189,6 @@ private: std::unordered_map> mapTestFunc_; KitTestAbilityManager *kitTestAbility_; }; - } // namespace AppExecFwk } // namespace OHOS #endif //_KIT_TEST_ABILITY_MANAGER_H_ diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/kit_test_ability_manager.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/kit_test_ability_manager.cpp index 50307f3f9e..5e9868e1cf 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/kit_test_ability_manager.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/kit_test_ability_manager.cpp @@ -14,9 +14,6 @@ */ #include "kit_test_ability_manager.h" -#include -#include -#include #include "app_log_wrapper.h" namespace OHOS { diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/test_utils.cpp index 1f7fa55673..c49f54a87f 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/test_utils.cpp @@ -13,10 +13,6 @@ * limitations under the License. */ #include "test_utils.h" -#include -#include -#include -#include #include "common_event_data.h" #include "common_event_manager.h" namespace OHOS { diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/kit_test_ability_manager.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/kit_test_ability_manager.cpp index 844f12ec94..6e83693678 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/kit_test_ability_manager.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/kit_test_ability_manager.cpp @@ -14,9 +14,6 @@ */ #include "kit_test_ability_manager.h" -#include -#include -#include #include "app_log_wrapper.h" namespace OHOS { diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/test_utils.cpp index 1f7fa55673..d9920480c6 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/test_utils.cpp @@ -13,12 +13,9 @@ * limitations under the License. */ #include "test_utils.h" -#include -#include -#include -#include #include "common_event_data.h" #include "common_event_manager.h" + namespace OHOS { namespace AppExecFwk { using namespace OHOS::EventFwk; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/third_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/third_ability.cpp index f3cf209df3..2c92735eed 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/third_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/third_ability.cpp @@ -14,9 +14,6 @@ */ #include "third_ability.h" -#include -#include -#include #include "app_log_wrapper.h" #include "test_utils.h" diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/src/test_utils.cpp index 3e75bdf815..cbc97a19a5 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/src/test_utils.cpp @@ -13,12 +13,9 @@ * limitations under the License. */ #include "test_utils.h" -#include -#include -#include -#include #include "common_event_data.h" #include "common_event_manager.h" + namespace OHOS { namespace AppExecFwk { using namespace OHOS::EventFwk; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/src/test_utils.cpp index 3e75bdf815..cbc97a19a5 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/src/test_utils.cpp @@ -13,12 +13,9 @@ * limitations under the License. */ #include "test_utils.h" -#include -#include -#include -#include #include "common_event_data.h" #include "common_event_manager.h" + namespace OHOS { namespace AppExecFwk { using namespace OHOS::EventFwk; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/test_utils.cpp index c6a74ab78d..e7bafde26d 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/test_utils.cpp @@ -14,9 +14,6 @@ */ #include "test_utils.h" -#include -#include -#include #include "common_event_data.h" #include "common_event_manager.h" namespace OHOS { diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/test_utils.cpp index c6a74ab78d..9a826fea30 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/test_utils.cpp @@ -14,11 +14,9 @@ */ #include "test_utils.h" -#include -#include -#include #include "common_event_data.h" #include "common_event_manager.h" + namespace OHOS { namespace AppExecFwk { using namespace OHOS::EventFwk; diff --git a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/src/test_utils.cpp index 3e75bdf815..2ec484b7ef 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/src/test_utils.cpp @@ -13,10 +13,6 @@ * limitations under the License. */ #include "test_utils.h" -#include -#include -#include -#include #include "common_event_data.h" #include "common_event_manager.h" namespace OHOS { diff --git a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/src/test_utils.cpp index 3e75bdf815..cbc97a19a5 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/src/test_utils.cpp @@ -13,12 +13,9 @@ * limitations under the License. */ #include "test_utils.h" -#include -#include -#include -#include #include "common_event_data.h" #include "common_event_manager.h" + namespace OHOS { namespace AppExecFwk { using namespace OHOS::EventFwk; diff --git a/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/src/test_utils.cpp index 7b565fcd78..e321399dbe 100755 --- a/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/src/test_utils.cpp @@ -12,7 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include #include "common_event_data.h" #include "common_event_manager.h" #include "test_utils.h" diff --git a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/main_ability.cpp b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/main_ability.cpp index 8ce8b83fe2..288498eec2 100644 --- a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/main_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/main_ability.cpp @@ -16,12 +16,6 @@ #include "main_ability.h" #include "app_log_wrapper.h" #include "test_utils.h" -#include -#include -#include -#include -#include -#include namespace OHOS { namespace AppExecFwk { diff --git a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/test_utils.cpp index 3e75bdf815..2ec484b7ef 100644 --- a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/test_utils.cpp @@ -13,10 +13,6 @@ * limitations under the License. */ #include "test_utils.h" -#include -#include -#include -#include #include "common_event_data.h" #include "common_event_manager.h" namespace OHOS { diff --git a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/src/test_utils.cpp index 3e75bdf815..2ec484b7ef 100644 --- a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/src/test_utils.cpp @@ -13,10 +13,6 @@ * limitations under the License. */ #include "test_utils.h" -#include -#include -#include -#include #include "common_event_data.h" #include "common_event_manager.h" namespace OHOS { diff --git a/test/resource/amssystemtestability/abilitySrc/tools/include/event.h b/test/resource/amssystemtestability/abilitySrc/tools/include/event.h index 4e659a7bd7..b06cbef790 100644 --- a/test/resource/amssystemtestability/abilitySrc/tools/include/event.h +++ b/test/resource/amssystemtestability/abilitySrc/tools/include/event.h @@ -13,9 +13,6 @@ * limitations under the License. */ #pragma once -#include -#include -#include namespace STtools { class Event { diff --git a/test/resource/amssystemtestability/abilitySrc/tools/include/stoperator.h b/test/resource/amssystemtestability/abilitySrc/tools/include/stoperator.h index f7a8f367f0..c124b7187f 100644 --- a/test/resource/amssystemtestability/abilitySrc/tools/include/stoperator.h +++ b/test/resource/amssystemtestability/abilitySrc/tools/include/stoperator.h @@ -13,9 +13,6 @@ * limitations under the License. */ #pragma once -#include -#include -#include namespace STtools { using std::string; diff --git a/test/systemtest/common/ams/tool/include/module_test_dump_util.h b/test/systemtest/common/ams/tool/include/module_test_dump_util.h index 8fb77bf90b..a72800febb 100644 --- a/test/systemtest/common/ams/tool/include/module_test_dump_util.h +++ b/test/systemtest/common/ams/tool/include/module_test_dump_util.h @@ -16,11 +16,8 @@ #ifndef OHOS_MODULE_TEST_DUMP_UTIL_H #define OHOS_MODULE_TEST_DUMP_UTIL_H -#include #include #include -#include -#include #include #include diff --git a/test/systemtest/common/ams/tool/include/stoperator.h b/test/systemtest/common/ams/tool/include/stoperator.h index 3cf9b14874..d32968ec86 100644 --- a/test/systemtest/common/ams/tool/include/stoperator.h +++ b/test/systemtest/common/ams/tool/include/stoperator.h @@ -17,8 +17,6 @@ #include #include -#include -#include namespace OHOS { namespace STtools { -- Gitee