diff --git a/adapter/appspawn_adapter.cpp b/adapter/appspawn_adapter.cpp index 74a6e0d6c2d243a4d5589b9fc62b7f476853bb50..2964c2da5dd590f8df2ccb7f04945c1551591723 100644 --- a/adapter/appspawn_adapter.cpp +++ b/adapter/appspawn_adapter.cpp @@ -17,10 +17,10 @@ #include -#include "token_setproc.h" #ifdef WITH_SELINUX #include "hap_restorecon.h" #endif +#include "token_setproc.h" void SetAppAccessToken(struct AppSpawnContent_ *content, AppSpawnClient *client) { diff --git a/adapter/appspawn_log.cpp b/adapter/appspawn_log.cpp index 58eb479447c8b976107ca6de6ee8fbfc0357cf79..33b5f57631edc0f7ccc3b9e26a1c4d5d7cd56c0b 100644 --- a/adapter/appspawn_log.cpp +++ b/adapter/appspawn_log.cpp @@ -15,15 +15,18 @@ #include "appspawn_server.h" -#include -#include -#include #include -#include #include +#include + +#include +#include +#include + #include "hilog/log.h" #include "securec.h" + namespace { AppspawnLogLevel g_logLevel = AppspawnLogLevel::INFO; constexpr int MAX_LOG_SIZE = 1024; diff --git a/adapter/appspawn_nweb.cpp b/adapter/appspawn_nweb.cpp index c76354eed88958382b2937a067fca9d49336579e..6f8a4559d55d6d3cd6e71becf62a2624215bea70 100644 --- a/adapter/appspawn_nweb.cpp +++ b/adapter/appspawn_nweb.cpp @@ -13,14 +13,15 @@ * limitations under the License. */ -#include "appspawn_adapter.h" +#include #include #include -#include #include #include +#include "appspawn_adapter.h" + struct RenderProcessNode { RenderProcessNode(time_t now, int exit):recordTime_(now), exitStatus_(exit) {} time_t recordTime_; diff --git a/adapter/appspawn_sandbox.cpp b/adapter/appspawn_sandbox.cpp index c58d9cbba6fdae37c4901665995a2b4bbfabd7ee..6e9e5849254594f471476384f690d72b0609d299 100644 --- a/adapter/appspawn_sandbox.cpp +++ b/adapter/appspawn_sandbox.cpp @@ -15,13 +15,14 @@ #include "appspawn_adapter.h" -#include #include + +#include #include +#include "hilog/log.h" #include "json_utils.h" #include "sandbox_utils.h" -#include "hilog/log.h" using namespace std; using namespace OHOS; diff --git a/interfaces/innerkits/client/appspawn_socket.cpp b/interfaces/innerkits/client/appspawn_socket.cpp index b1521f0b11227c2a67f8605773de897bd80c367e..af5378639ff0fd46cbd3d8b15b846a95487882e0 100644 --- a/interfaces/innerkits/client/appspawn_socket.cpp +++ b/interfaces/innerkits/client/appspawn_socket.cpp @@ -15,9 +15,10 @@ #include "appspawn_socket.h" +#include + #include #include -#include #include "hilog/log.h" #include "pubdef.h" diff --git a/interfaces/innerkits/client/client_socket.cpp b/interfaces/innerkits/client/client_socket.cpp index 12bea8e12939d841c1041fa4cf23816e9ea68332..bfdbbb1045c2ac27c6a36f97ad6002f11a1261a4 100644 --- a/interfaces/innerkits/client/client_socket.cpp +++ b/interfaces/innerkits/client/client_socket.cpp @@ -15,9 +15,10 @@ #include "client_socket.h" +#include + #include #include -#include #include "hilog/log.h" #include "securec.h" diff --git a/test/moduletest/appspawn_module_test.cpp b/test/moduletest/appspawn_module_test.cpp index 2f232c4667f82a83198392b1563e26b7fd00ea49..6b045f44c054a82b6b606505ff6d2d28388a8d31 100644 --- a/test/moduletest/appspawn_module_test.cpp +++ b/test/moduletest/appspawn_module_test.cpp @@ -15,13 +15,13 @@ #include #include + #include #include "gtest/gtest.h" -#include "securec.h" - #include "app_spawn_client.h" #include "hilog/log.h" +#include "securec.h" using namespace testing::ext; using namespace OHOS; diff --git a/test/unittest/app_spawn_lite_test/app_spawn_lite_test.cpp b/test/unittest/app_spawn_lite_test/app_spawn_lite_test.cpp index 72d54c75a49f15d736a1d2bfa22fe5d9dc135200..2ac8f27314224d0602b3f190758847a1cb1bddc8 100644 --- a/test/unittest/app_spawn_lite_test/app_spawn_lite_test.cpp +++ b/test/unittest/app_spawn_lite_test/app_spawn_lite_test.cpp @@ -12,17 +12,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#include + #include #include #include #include -#include #include #include + #include "gtest/gtest.h" #include "appspawn_message.h" -#include "appspawn_service.h" #include "appspawn_msg.h" +#include "appspawn_service.h" using namespace testing::ext; @@ -390,4 +393,4 @@ HWTEST_F(AppSpawnLiteTest, SetContentFunctionTest_001, TestSize.Level0) free(liteClient); GTEST_LOG_(INFO) << "SetContentFunctionTest_001 end"; } -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/test/unittest/app_spawn_socket_test/app_spawn_socket_test.cpp b/test/unittest/app_spawn_socket_test/app_spawn_socket_test.cpp index 1b14e5d7b06fc95ef670f6c3332d942219a15a83..8be797c85fdfde724758fb321f4b6b1471cbe843 100644 --- a/test/unittest/app_spawn_socket_test/app_spawn_socket_test.cpp +++ b/test/unittest/app_spawn_socket_test/app_spawn_socket_test.cpp @@ -14,8 +14,9 @@ */ #include -#include + #include +#include // redefine private and protected since testcase need to invoke and test private function #define private public diff --git a/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp b/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp index b68093b0fe4329782e21dedd435ca913fbb8a4dc..bea285889df6e26d4d50dd8e1e19f669323b21a5 100644 --- a/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp +++ b/test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp @@ -12,10 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include + #include + #include #include +#include // redefine private and protected since testcase need to invoke and test private function #define private public @@ -24,9 +26,9 @@ #undef private #undef protected -#include "securec.h" #include "appspawn_adapter.h" #include "appspawn_server.h" +#include "securec.h" using namespace testing; using namespace testing::ext; diff --git a/test/unittest/client_socket_test/client_socket_test.cpp b/test/unittest/client_socket_test/client_socket_test.cpp index 450d2f634f3cc600cb93b93d420e7575e979f033..db9741d159d73160507d2320155208384973e42b 100644 --- a/test/unittest/client_socket_test/client_socket_test.cpp +++ b/test/unittest/client_socket_test/client_socket_test.cpp @@ -13,9 +13,10 @@ * limitations under the License. */ -#include #include +#include + // redefine private and protected since testcase need to invoke and test private function #define private public #define protected public diff --git a/util/src/sandbox_utils.cpp b/util/src/sandbox_utils.cpp index 4dc57bcdb57b6a4128e1599997f8cb295f15c115..c53862dc1ecb59bd3cb9afc56e2cb178c0953464 100644 --- a/util/src/sandbox_utils.cpp +++ b/util/src/sandbox_utils.cpp @@ -14,23 +14,26 @@ */ #include "sandbox_utils.h" -#include "json_utils.h" -#include "hilog/log.h" -#include "securec.h" +#include +#include +#include #include -#include + #include #include #include #include -#include +#include + #include -#include -#include #include #include +#include "hilog/log.h" +#include "json_utils.h" +#include "securec.h" + using namespace std; using namespace OHOS; using namespace OHOS::HiviewDFX;