From 535b36ad0644c8e09dbc955b68f548e23bb72ffb Mon Sep 17 00:00:00 2001 From: wanchengzhen Date: Sat, 26 Feb 2022 14:23:34 +0800 Subject: [PATCH] codex Signed-off-by: wanchengzhen --- frameworks/kits/appkit/BUILD.gn | 1 + .../appkit/native/app/src/main_thread.cpp | 62 +- interfaces/innerkits/app_manager/BUILD.gn | 2 - .../include/appmgr/ams_mgr_interface.h | 10 +- .../include/appmgr/ams_mgr_proxy.h | 9 +- .../include/appmgr/app_mgr_client.h | 46 +- .../include/appmgr/app_mgr_interface.h | 53 +- .../include/appmgr/app_mgr_proxy.h | 48 +- .../app_manager/include/appmgr/app_mgr_stub.h | 7 +- .../include/appmgr/irender_scheduler.h | 45 -- .../include/appmgr/render_scheduler_host.h | 51 -- .../include/appmgr/render_scheduler_proxy.h | 50 -- .../app_manager/src/appmgr/ams_mgr_proxy.cpp | 23 +- .../app_manager/src/appmgr/ams_mgr_stub.cpp | 10 +- .../app_manager/src/appmgr/app_mgr_client.cpp | 67 +- .../app_manager/src/appmgr/app_mgr_proxy.cpp | 138 ++-- .../app_manager/src/appmgr/app_mgr_stub.cpp | 62 +- .../src/appmgr/render_scheduler_host.cpp | 63 -- .../src/appmgr/render_scheduler_proxy.cpp | 66 -- .../form_manager/src/form_provider_data.cpp | 35 +- .../runtime/include/js_runtime_utils.h | 8 +- ohos.build | 4 +- services/BUILD.gn | 1 - services/abilitymgr/BUILD.gn | 1 - services/abilitymgr/abilitymgr.gni | 1 + .../include/ability_connect_manager.h | 10 +- .../include/ability_manager_service.h | 9 +- .../abilitymgr/include/data_ability_manager.h | 4 +- .../include/kernal_system_app_manager.h | 168 +++++ .../abilitymgr/include/mission_list_manager.h | 4 +- .../src/ability_connect_manager.cpp | 118 ++-- .../src/ability_manager_service.cpp | 288 ++++---- .../abilitymgr/src/data_ability_manager.cpp | 27 +- .../src/kernal_system_app_manager.cpp | 408 ++++++++++++ .../abilitymgr/src/mission_list_manager.cpp | 28 +- services/abilitymgr/test/BUILD.gn | 2 + .../src/appmgr/app_mgr_client.cpp | 17 +- .../BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../ability_connect_manage_test/BUILD.gn | 3 +- .../unittest/phone/ability_dump_test/BUILD.gn | 3 +- .../ability_dump_test/ability_dump_test.cpp | 2 + .../phone/ability_manager_proxy_test/BUILD.gn | 3 +- .../ability_manager_service_test/BUILD.gn | 3 +- .../ability_manager_service_test.cpp | 204 ++++++ .../phone/ability_manager_stub_test/BUILD.gn | 3 +- .../phone/ability_record_test/BUILD.gn | 3 +- .../ability_scheduler_proxy_test/BUILD.gn | 3 +- .../ability_scheduler_stub_test/BUILD.gn | 3 +- .../phone/ability_service_start_test/BUILD.gn | 3 +- .../phone/ability_stack_manager_test/BUILD.gn | 3 +- .../ability_stack_manager_test.cpp | 2 + .../phone/ability_token_proxy_test/BUILD.gn | 3 +- .../phone/ability_token_stub_test/BUILD.gn | 3 +- .../ability_with_applications_test/BUILD.gn | 3 +- .../ability_with_applications_test.cpp | 2 + .../phone/abilityms_appms_test/BUILD.gn | 3 +- .../abilityms_appms_test.cpp | 2 + .../phone/app_scheduler_test/BUILD.gn | 3 +- .../phone/configuration_test/BUILD.gn | 3 +- .../phone/connection_record_test/BUILD.gn | 3 +- .../phone/data_ability_manager_test/BUILD.gn | 3 +- .../phone/data_ability_record_test/BUILD.gn | 3 +- .../test/unittest/phone/info_test/BUILD.gn | 3 +- .../kernal_system_app_manager_test/BUILD.gn | 72 ++ .../kernal_system_app_manager_test.cpp | 614 ++++++++++++++++++ .../phone/lifecycle_deal_test/BUILD.gn | 3 +- .../unittest/phone/lifecycle_test/BUILD.gn | 3 +- .../phone/lifecycle_test/lifecycle_test.cpp | 2 + .../lock_screen_white_list_test/BUILD.gn | 3 +- .../unittest/phone/mission_list_test/BUILD.gn | 3 +- .../phone/mission_record_test/BUILD.gn | 3 +- .../phone/mission_stack_test/BUILD.gn | 3 +- .../test/unittest/phone/mission_test/BUILD.gn | 3 +- .../phone/pending_want_key_test/BUILD.gn | 3 +- .../phone/pending_want_manager_test/BUILD.gn | 3 +- .../phone/pending_want_record_test/BUILD.gn | 3 +- .../resume_mission_container_test/BUILD.gn | 3 +- .../phone/screenshot_handler_test/BUILD.gn | 3 +- .../unittest/phone/sender_info_test/BUILD.gn | 3 +- .../phone/terminate_ability_test/BUILD.gn | 3 +- .../terminate_ability_test.cpp | 2 + .../phone/want_receiver_proxy_test/BUILD.gn | 3 +- .../phone/want_receiver_stub_test/BUILD.gn | 3 +- .../phone/want_sender_info_test/BUILD.gn | 3 +- .../phone/want_sender_proxy_test/BUILD.gn | 3 +- .../phone/want_sender_stub_test/BUILD.gn | 3 +- .../unittest/phone/wants_info_test/BUILD.gn | 3 +- .../unittest/phone/window_info_test/BUILD.gn | 3 +- services/appmgr/BUILD.gn | 2 - services/appmgr/include/ams_mgr_scheduler.h | 9 +- services/appmgr/include/app_death_recipient.h | 3 - services/appmgr/include/app_mgr_service.h | 34 +- .../appmgr/include/app_mgr_service_inner.h | 55 +- services/appmgr/include/app_running_manager.h | 2 - services/appmgr/include/app_running_record.h | 50 -- services/appmgr/include/app_spawn_client.h | 2 +- .../appmgr/include/app_spawn_msg_wrapper.h | 1 - services/appmgr/include/app_spawn_socket.h | 2 +- services/appmgr/include/process_optimizer.h | 4 +- .../appmgr/include/process_optimizer_uba.h | 4 +- .../appmgr/include/remote_client_manager.h | 3 - services/appmgr/src/ams_mgr_scheduler.cpp | 11 +- services/appmgr/src/app_death_recipient.cpp | 7 +- services/appmgr/src/app_mgr_service.cpp | 55 +- services/appmgr/src/app_mgr_service_inner.cpp | 389 ++--------- services/appmgr/src/app_running_manager.cpp | 45 +- services/appmgr/src/app_running_record.cpp | 107 +-- services/appmgr/src/app_spawn_client.cpp | 4 +- services/appmgr/src/app_spawn_socket.cpp | 10 +- services/appmgr/src/lmks/lmks_utils.cpp | 10 +- services/appmgr/src/process_optimizer.cpp | 25 +- services/appmgr/src/process_optimizer_uba.cpp | 22 +- services/appmgr/src/remote_client_manager.cpp | 8 +- services/appmgr/test/BUILD.gn | 2 - .../test/mock/include/mock_app_mgr_service.h | 2 - .../test/mock/include/mock_app_spawn_socket.h | 2 +- .../ams_ability_running_record_test/BUILD.gn | 2 - .../ams_app_death_recipient_test/BUILD.gn | 1 - .../unittest/ams_app_life_cycle_test/BUILD.gn | 2 - .../ams_app_life_cycle_test.cpp | 17 +- .../unittest/ams_app_mgr_client_test/BUILD.gn | 3 +- .../ams_app_running_record_test/BUILD.gn | 2 - .../unittest/ams_app_workflow_test/BUILD.gn | 2 - .../ams_ipc_appmgr_interface_test.cpp | 29 +- .../ams_mgr_scheduler_test.cpp | 28 +- .../ams_recent_app_list_test/BUILD.gn | 2 - .../BUILD.gn | 1 - .../ams_service_event_drive_test/BUILD.gn | 1 - .../ams_service_event_drive_test.cpp | 70 +- .../BUILD.gn | 2 - .../ams_service_startup_test/BUILD.gn | 1 - .../BUILD.gn | 1 - services/common/BUILD.gn | 28 +- .../common/include/permission_constants.h | 32 - .../common/include/permission_verification.h | 42 -- .../common/src/permission_verification.cpp | 72 -- services/formmgr/BUILD.gn | 2 - services/formmgr/include/form_info_mgr.h | 2 - services/formmgr/include/form_mgr_service.h | 12 + services/formmgr/include/form_timer.h | 12 +- services/formmgr/src/form_info_mgr.cpp | 62 +- services/formmgr/src/form_mgr_adapter.cpp | 13 +- services/formmgr/src/form_mgr_service.cpp | 33 +- services/formmgr/src/form_provider_mgr.cpp | 2 +- services/formmgr/src/form_timer_mgr.cpp | 2 +- .../ability_mgr_service_test/BUILD.gn | 2 +- .../ability_mgr_module_test.cpp | 2 + .../moduletest/ability_record_test/BUILD.gn | 2 +- .../moduletest/ability_stack_test/BUILD.gn | 2 +- .../ability_stack_module_test.cpp | 2 + .../ams/ability_running_record_test/BUILD.gn | 7 +- .../common/ams/app_life_cycle_test/BUILD.gn | 7 +- .../ams_app_life_cycle_module_test.cpp | 8 + .../common/ams/app_mgr_service_test/BUILD.gn | 3 +- .../ams_app_mgr_service_module_test.cpp | 36 + .../common/ams/app_recent_list_test/BUILD.gn | 7 +- .../ams/app_running_record_test/BUILD.gn | 7 +- .../common/ams/app_service_flow_test/BUILD.gn | 7 +- .../common/ams/ipc_ams_mgr_test/BUILD.gn | 3 +- .../common/ams/ipc_app_mgr_test/BUILD.gn | 7 +- .../ams_ipc_app_mgr_module_test.cpp | 31 + .../ams/ipc_app_scheduler_test/BUILD.gn | 7 +- .../ams/process_optimizer_uba_test/BUILD.gn | 5 +- .../service_app_spawn_client_test/BUILD.gn | 3 +- .../ams/service_event_drive_test/BUILD.gn | 3 +- .../ams/service_start_process_test/BUILD.gn | 3 +- .../test/moduletest/dump_module_test/BUILD.gn | 3 +- .../dump_module_test/dump_module_test.cpp | 2 + .../ipc_ability_connect_test/BUILD.gn | 3 +- .../moduletest/ipc_ability_mgr_test/BUILD.gn | 3 +- .../ipc_ability_scheduler_test/BUILD.gn | 3 +- .../panding_want_manager_test/BUILD.gn | 1 - .../abilitySrc/amsStDataAbility/BUILD.gn | 2 +- .../include/verify_act_data_ability.h | 9 +- .../src/verify_act_data_ability.cpp | 439 ++++++++++++- zidl/bundle.json | 37 -- zidl/test/native/BUILD.gn | 69 -- zidl/test/native/include/izidl_test_service.h | 36 - zidl/test/native/include/test_client.h | 34 - zidl/test/native/include/test_service.h | 36 - .../native/include/zidl_test_service_proxy.h | 49 -- .../native/include/zidl_test_service_stub.h | 38 -- zidl/test/native/src/main_client.cpp | 75 --- zidl/test/native/src/main_server.cpp | 31 - zidl/test/native/src/test_client.cpp | 65 -- zidl/test/native/src/test_service.cpp | 64 -- .../native/src/zidl_test_service_proxy.cpp | 64 -- .../native/src/zidl_test_service_stub.cpp | 48 -- zidl/test/zidlgen/IZidlTestService.zidl | 19 - zidl/test/zidlgen/zidl | Bin 216360 -> 0 bytes 191 files changed, 3103 insertions(+), 2506 deletions(-) delete mode 100644 interfaces/innerkits/app_manager/include/appmgr/irender_scheduler.h delete mode 100644 interfaces/innerkits/app_manager/include/appmgr/render_scheduler_host.h delete mode 100644 interfaces/innerkits/app_manager/include/appmgr/render_scheduler_proxy.h delete mode 100644 interfaces/innerkits/app_manager/src/appmgr/render_scheduler_host.cpp delete mode 100644 interfaces/innerkits/app_manager/src/appmgr/render_scheduler_proxy.cpp create mode 100644 services/abilitymgr/include/kernal_system_app_manager.h create mode 100644 services/abilitymgr/src/kernal_system_app_manager.cpp create mode 100755 services/abilitymgr/test/unittest/phone/kernal_system_app_manager_test/BUILD.gn create mode 100644 services/abilitymgr/test/unittest/phone/kernal_system_app_manager_test/kernal_system_app_manager_test.cpp delete mode 100644 services/common/include/permission_constants.h delete mode 100644 services/common/include/permission_verification.h delete mode 100644 services/common/src/permission_verification.cpp delete mode 100644 zidl/bundle.json delete mode 100644 zidl/test/native/BUILD.gn delete mode 100644 zidl/test/native/include/izidl_test_service.h delete mode 100644 zidl/test/native/include/test_client.h delete mode 100644 zidl/test/native/include/test_service.h delete mode 100644 zidl/test/native/include/zidl_test_service_proxy.h delete mode 100644 zidl/test/native/include/zidl_test_service_stub.h delete mode 100644 zidl/test/native/src/main_client.cpp delete mode 100644 zidl/test/native/src/main_server.cpp delete mode 100644 zidl/test/native/src/test_client.cpp delete mode 100644 zidl/test/native/src/test_service.cpp delete mode 100644 zidl/test/native/src/zidl_test_service_proxy.cpp delete mode 100644 zidl/test/native/src/zidl_test_service_stub.cpp delete mode 100644 zidl/test/zidlgen/IZidlTestService.zidl delete mode 100644 zidl/test/zidlgen/zidl diff --git a/frameworks/kits/appkit/BUILD.gn b/frameworks/kits/appkit/BUILD.gn index 43cb6d0433d..969611ed98a 100644 --- a/frameworks/kits/appkit/BUILD.gn +++ b/frameworks/kits/appkit/BUILD.gn @@ -170,6 +170,7 @@ ohos_shared_library("appkit_native") { "bytrace_standard:bytrace_core", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", + "hisysevent_native:libhisysevent", "ipc:ipc_core", "napi:ace_napi", ] diff --git a/frameworks/kits/appkit/native/app/src/main_thread.cpp b/frameworks/kits/appkit/native/app/src/main_thread.cpp index faace598f7c..be52ac2a8bc 100644 --- a/frameworks/kits/appkit/native/app/src/main_thread.cpp +++ b/frameworks/kits/appkit/native/app/src/main_thread.cpp @@ -46,6 +46,8 @@ #include "task_handler_client.h" #include "faultloggerd_client.h" #include "dfx_dump_catcher.h" +#include "hisysevent.h" +#include "js_runtime_utils.h" #if defined(ABILITY_LIBRARY_LOADER) || defined(APPLICATION_LIBRARY_LOADER) #include @@ -60,6 +62,13 @@ namespace { constexpr int32_t DELIVERY_TIME = 200; constexpr int32_t DISTRIBUTE_TIME = 100; constexpr int32_t UNSPECIFIED_USERID = -2; + +constexpr char EVENT_KEY_UID[] = "UID"; +constexpr char EVENT_KEY_PID[] = "PID"; +constexpr char EVENT_KEY_MESSAGE[] = "MSG"; +constexpr char EVENT_KEY_PACKAGE_NAME[] = "PACKAGE_NAME"; +constexpr char EVENT_KEY_PROCESS_NAME[] = "PROCESS_NAME"; +constexpr uint8_t CAP_MAX_SIZE = 64; } #define ACEABILITY_LIBRARY_LOADER @@ -870,7 +879,58 @@ void MainThread::HandleLaunchApplication(const AppLaunchData &appLaunchData, con APP_LOGE("OHOSApplication::OHOSApplication: Failed to create runtime"); return; } - + auto& jsEngine = (static_cast(*runtime)).GetNativeEngine(); + auto bundleName = appInfo.bundleName; + auto uid = appInfo.uid; + auto processName = processInfo.GetProcessName(); + auto processPid = processInfo.GetPid(); + wptr weak = this; + auto uncaughtTask = [weak, uid, processPid, bundleName, processName](NativeValue* v) { + APP_LOGI("RegisterUncaughtExceptionHandler Begin"); + NativeObject* obj = AbilityRuntime::ConvertNativeValueTo(v); + NativeValue* message = obj->GetProperty("message"); + NativeString* messageStr = AbilityRuntime::ConvertNativeValueTo(message); + if (messageStr == nullptr) { + APP_LOGE("messageStr Convert failed"); + return; + } + size_t messagebufferLen = messageStr->GetLength(); + size_t messagestrLen = 0; + char messagecap[CAP_MAX_SIZE] = { 0 }; + messageStr->GetCString(messagecap, messagebufferLen + 1, &messagestrLen); + APP_LOGI("messagecap = %{public}s", messagecap); + NativeValue* stack = obj->GetProperty("stack"); + NativeString* stackStr = AbilityRuntime::ConvertNativeValueTo(stack); + if (stackStr == nullptr) { + APP_LOGE("stackStr Convert failed"); + return; + } + size_t stackbufferLen = stackStr->GetLength(); + size_t stackstrLen = 0; + char stackcap[CAP_MAX_SIZE] = { 0 }; + messageStr->GetCString(stackcap, stackbufferLen + 1, &stackstrLen); + APP_LOGI("stackcap = %{public}s", stackcap); + auto appThread = weak.promote(); + if (appThread == nullptr) { + APP_LOGE("appThread is nullptr, HandleLaunchApplication failed."); + return; + } + std::string eventType = "JS_EXCEPTION"; + std::string msgContent; + std::string tempMessageStr(messagecap); + std::string tempStackStr(stackcap); + msgContent = "message:" + tempMessageStr + "tempStack:" + tempStackStr; + auto ret = OHOS::HiviewDFX::HiSysEvent::Write(OHOS::HiviewDFX::HiSysEvent::Domain::AAFWK, eventType, + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + EVENT_KEY_UID, std::to_string(uid), + EVENT_KEY_PID, std::to_string(processPid), + EVENT_KEY_PACKAGE_NAME, bundleName, + EVENT_KEY_PROCESS_NAME, processName, + EVENT_KEY_MESSAGE, msgContent); + appThread->ScheduleProcessSecurityExit(); + APP_LOGI("RegisterUncaughtExceptionHandler End ret = %{public}d", ret); + }; + jsEngine.RegisterUncaughtExceptionHandler(uncaughtTask); application_->SetRuntime(std::move(runtime)); auto usertestInfo = appLaunchData.GetUserTestInfo(); if (usertestInfo.observer) { diff --git a/interfaces/innerkits/app_manager/BUILD.gn b/interfaces/innerkits/app_manager/BUILD.gn index 19ae968ddfd..ac8817a19cf 100644 --- a/interfaces/innerkits/app_manager/BUILD.gn +++ b/interfaces/innerkits/app_manager/BUILD.gn @@ -59,8 +59,6 @@ ohos_shared_library("app_manager") { "src/appmgr/process_data.cpp", "src/appmgr/process_info.cpp", "src/appmgr/profile.cpp", - "src/appmgr/render_scheduler_host.cpp", - "src/appmgr/render_scheduler_proxy.cpp", "src/appmgr/running_process_info.cpp", "src/appmgr/start_specified_ability_response_proxy.cpp", "src/appmgr/start_specified_ability_response_stub.cpp", diff --git a/interfaces/innerkits/app_manager/include/appmgr/ams_mgr_interface.h b/interfaces/innerkits/app_manager/include/appmgr/ams_mgr_interface.h index 28d20995083..0656a1b6243 100644 --- a/interfaces/innerkits/app_manager/include/appmgr/ams_mgr_interface.h +++ b/interfaces/innerkits/app_manager/include/appmgr/ams_mgr_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -80,6 +80,13 @@ public: */ virtual void RegisterAppStateCallback(const sptr &callback) = 0; + /** + * Reset,call Reset() through the proxy object, reset DFX of AppMgr. + * + * @return + */ + virtual void Reset() = 0; + /** * AbilityBehaviorAnalysis,call AbilityBehaviorAnalysis() through the proxy object, * ability behavior analysis assistant process optimization. @@ -178,6 +185,7 @@ public: UPDATE_ABILITY_STATE, UPDATE_EXTENSION_STATE, REGISTER_APP_STATE_CALLBACK, + RESET, ABILITY_BEHAVIOR_ANALYSIS, KILL_PEOCESS_BY_ABILITY_TOKEN, KILL_PROCESSES_BY_USERID, diff --git a/interfaces/innerkits/app_manager/include/appmgr/ams_mgr_proxy.h b/interfaces/innerkits/app_manager/include/appmgr/ams_mgr_proxy.h index 4be57ed5e91..ef95912b1a2 100644 --- a/interfaces/innerkits/app_manager/include/appmgr/ams_mgr_proxy.h +++ b/interfaces/innerkits/app_manager/include/appmgr/ams_mgr_proxy.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -74,6 +74,13 @@ public: */ virtual void RegisterAppStateCallback(const sptr &callback) override; + /** + * Reset,call Reset() through the proxy object, reset DFX of AppMgr. + * + * @return + */ + virtual void Reset() override; + /** * AbilityBehaviorAnalysis,call AbilityBehaviorAnalysis() through the proxy object, * ability behavior analysis assistant process optimization. diff --git a/interfaces/innerkits/app_manager/include/appmgr/app_mgr_client.h b/interfaces/innerkits/app_manager/include/appmgr/app_mgr_client.h index 432cf349e9e..c392772e6d4 100644 --- a/interfaces/innerkits/app_manager/include/appmgr/app_mgr_client.h +++ b/interfaces/innerkits/app_manager/include/appmgr/app_mgr_client.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -25,7 +25,6 @@ #include "app_mgr_constants.h" #include "bundle_info.h" #include "iapp_state_callback.h" -#include "irender_scheduler.h" #include "running_process_info.h" #include "system_memory_attr.h" #include "istart_specified_ability_response.h" @@ -84,6 +83,13 @@ public: */ virtual AppMgrResultCode ConnectAppMgrService(); + /** + * Ability manager resst. + * + * @return Returns RESULT_OK on success, others on failure. + */ + virtual AppMgrResultCode Reset(); + /** * AbilityBehaviorAnalysis, ability behavior analysis assistant process optimization. * @@ -169,6 +175,23 @@ public: */ virtual AppMgrResultCode GetConfiguration(Configuration& config); + /** + * SetAppSuspendTimes, Setting the Freezing Time of APP Background. + * + * @param time, The timeout recorded when the application enters the background . + * + * @return Success or Failure . + */ + virtual AppMgrResultCode SetAppFreezingTime(int time); + + /** + * GetAppFreezingTime, Getting the Freezing Time of APP Background. + * + * @param time, The timeout recorded when the application enters the background . + * + * @return Success or Failure . + */ + virtual AppMgrResultCode GetAppFreezingTime(int &time); virtual void AbilityAttachTimeOut(const sptr &token); virtual void PrepareTerminate(const sptr &token); @@ -233,25 +256,6 @@ public: */ virtual int GetAbilityRecordsByProcessID(const int pid, std::vector> &tokens); - /** - * Start webview render process, called by webview host. - * - * @param renderParam, params passed to renderprocess. - * @param ipcFd, ipc file descriptior for web browser and render process. - * @param sharedFd, shared memory file descriptior. - * @param renderPid, created render pid. - * @return Returns ERR_OK on success, others on failure. - */ - virtual int StartRenderProcess(const std::string &renderParam, int32_t ipcFd, - int32_t sharedFd, pid_t &renderPid); - - /** - * Render process call this to attach app manager service. - * - * @param renderScheduler, scheduler of render process. - */ - virtual void AttachRenderProcess(const sptr &renderScheduler); - private: void SetServiceManager(std::unique_ptr serviceMgr); diff --git a/interfaces/innerkits/app_manager/include/appmgr/app_mgr_interface.h b/interfaces/innerkits/app_manager/include/appmgr/app_mgr_interface.h index 4a34d7ab390..26302e4fd87 100644 --- a/interfaces/innerkits/app_manager/include/appmgr/app_mgr_interface.h +++ b/interfaces/innerkits/app_manager/include/appmgr/app_mgr_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -105,6 +105,15 @@ public: */ virtual int32_t ClearUpApplicationData(const std::string &bundleName) = 0; + /** + * IsBackgroundRunningRestricted, call IsBackgroundRunningRestricted() through proxy project, + * Checks whether the process of this application is forbidden to run in the background. + * + * @param bundleName, bundle name in Application record. + * @return ERR_OK, return back success, others fail. + */ + virtual int IsBackgroundRunningRestricted(const std::string &bundleName) = 0; + /** * GetAllRunningProcesses, call GetAllRunningProcesses() through proxy project. * Obtains information about application processes that are running on the device. @@ -124,6 +133,24 @@ public: */ virtual int GetProcessRunningInfosByUserId(std::vector &info, int32_t userId) = 0; + /** + * SetAppSuspendTimes, Setting the Freezing Time of APP Background. + * + * @param time, The timeout recorded when the application enters the background . + * + * @return Success or Failure . + */ + virtual void SetAppFreezingTime(int time) = 0; + + /** + * GetAppFreezingTime, Getting the Freezing Time of APP Background. + * + * @param time, The timeout recorded when the application enters the background . + * + * @return Success or Failure . + */ + virtual void GetAppFreezingTime(int &time) = 0; + /** * Get system memory information. * @param SystemMemoryAttr, memory information. @@ -183,25 +210,6 @@ public: */ virtual int GetAbilityRecordsByProcessID(const int pid, std::vector> &tokens) = 0; - /** - * Start webview render process, called by webview host. - * - * @param renderParam, params passed to renderprocess. - * @param ipcFd, ipc file descriptior for web browser and render process. - * @param sharedFd, shared memory file descriptior. - * @param renderPid, created render pid. - * @return Returns ERR_OK on success, others on failure. - */ - virtual int StartRenderProcess(const std::string &renderParam, int32_t ipcFd, - int32_t sharedFd, pid_t &renderPid) = 0; - - /** - * Render process call this to attach app manager service. - * - * @param renderScheduler, scheduler of render process. - */ - virtual void AttachRenderProcess(const sptr &renderScheduler) = 0; - enum class Message { APP_ATTACH_APPLICATION = 0, APP_APPLICATION_FOREGROUNDED, @@ -211,8 +219,11 @@ public: APP_ABILITY_CLEANED, APP_GET_MGR_INSTANCE, APP_CLEAR_UP_APPLICATION_DATA, + APP_IS_BACKGROUND_RUNNING_RESTRICTED, APP_GET_ALL_RUNNING_PROCESSES, APP_GET_RUNNING_PROCESSES_BY_USER_ID, + APP_SET_APP_FREEZING_TIME, + APP_GET_APP_FREEZING_TIME, APP_GET_SYSTEM_MEMORY_ATTR, APP_ADD_ABILITY_STAGE_INFO_DONE, STARTUP_RESIDENT_PROCESS, @@ -222,8 +233,6 @@ public: START_USER_TEST_PROCESS, SCHEDULE_ACCEPT_WANT_DONE, APP_GET_ABILITY_RECORDS_BY_PROCESS_ID, - START_RENDER_PROCESS, - ATTACH_RENDER_PROCESS, }; }; } // namespace AppExecFwk diff --git a/interfaces/innerkits/app_manager/include/appmgr/app_mgr_proxy.h b/interfaces/innerkits/app_manager/include/appmgr/app_mgr_proxy.h index 0a2b53f4384..20f1cb3eddf 100644 --- a/interfaces/innerkits/app_manager/include/appmgr/app_mgr_proxy.h +++ b/interfaces/innerkits/app_manager/include/appmgr/app_mgr_proxy.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -98,6 +98,15 @@ public: */ virtual int32_t ClearUpApplicationData(const std::string &bundleName) override; + /** + * IsBackgroundRunningRestricted, call IsBackgroundRunningRestricted() through proxy project, + * Checks whether the process of this application is forbidden to run in the background. + * + * @param bundleName, bundle name in Application record. + * @return ERR_OK, return back success, others fail. + */ + virtual int32_t IsBackgroundRunningRestricted(const std::string &bundleName) override; + /** * GetAllRunningProcesses, call GetAllRunningProcesses() through proxy project. * Obtains information about application processes that are running on the device. @@ -116,6 +125,24 @@ public: */ virtual int32_t GetProcessRunningInfosByUserId(std::vector &info, int32_t userId) override; + /** + * SetAppSuspendTimes, Setting the Freezing Time of APP Background. + * + * @param time, The timeout recorded when the application enters the background . + * + * @return Success or Failure . + */ + virtual void SetAppFreezingTime(int time) override; + + /** + * GetAppFreezingTime, Getting the Freezing Time of APP Background. + * + * @param time, The timeout recorded when the application enters the background . + * + * @return Success or Failure . + */ + virtual void GetAppFreezingTime(int &time) override; + /** * Get system memory information. * @param SystemMemoryAttr, memory information. @@ -176,25 +203,6 @@ public: */ virtual int GetAbilityRecordsByProcessID(const int pid, std::vector> &tokens) override; - /** - * Start webview render process, called by webview host. - * - * @param renderParam, params passed to renderprocess. - * @param ipcFd, ipc file descriptior for web browser and render process. - * @param sharedFd, shared memory file descriptior. - * @param renderPid, created render pid. - * @return Returns ERR_OK on success, others on failure. - */ - virtual int StartRenderProcess(const std::string &renderParam, int32_t ipcFd, - int32_t sharedFd, pid_t &renderPid) override; - - /** - * Render process call this to attach app manager service. - * - * @param renderApp, information needed to start the Application. - */ - virtual void AttachRenderProcess(const sptr &renderApp) override; - private: bool SendTransactCmd(IAppMgr::Message code, MessageParcel &data, MessageParcel &reply); bool WriteInterfaceToken(MessageParcel &data); diff --git a/interfaces/innerkits/app_manager/include/appmgr/app_mgr_stub.h b/interfaces/innerkits/app_manager/include/appmgr/app_mgr_stub.h index 0de454b1fb2..396f34aa2f5 100644 --- a/interfaces/innerkits/app_manager/include/appmgr/app_mgr_stub.h +++ b/interfaces/innerkits/app_manager/include/appmgr/app_mgr_stub.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -63,8 +63,11 @@ private: int32_t HandleAbilityCleaned(MessageParcel &data, MessageParcel &reply); int32_t HandleGetAmsMgr(MessageParcel &data, MessageParcel &reply); int32_t HandleClearUpApplicationData(MessageParcel &data, MessageParcel &reply); + int32_t HandleIsBackgroundRunningRestricted(MessageParcel &data, MessageParcel &reply); int32_t HandleGetAllRunningProcesses(MessageParcel &data, MessageParcel &reply); int32_t HandleGetProcessRunningInfosByUserId(MessageParcel &data, MessageParcel &reply); + int32_t HandleSetAppFreezingTime(MessageParcel &data, MessageParcel &reply); + int32_t HandleGetAppFreezingTime(MessageParcel &data, MessageParcel &reply); int32_t HandleGetSystemMemoryAttr(MessageParcel &data, MessageParcel &reply); int32_t HandleAddAbilityStageDone(MessageParcel &data, MessageParcel &reply); int32_t HandleStartupResidentProcess(MessageParcel &data, MessageParcel &reply); @@ -74,8 +77,6 @@ private: int32_t HandleStartUserTestProcess(MessageParcel &data, MessageParcel &reply); int32_t HandleScheduleAcceptWantDone(MessageParcel &data, MessageParcel &reply); int32_t HandleGetAbilityRecordsByProcessID(MessageParcel &data, MessageParcel &reply); - int32_t HandleStartRenderProcess(MessageParcel &data, MessageParcel &reply); - int32_t HandleAttachRenderProcess(MessageParcel &data, MessageParcel &reply); using AppMgrFunc = int32_t (AppMgrStub::*)(MessageParcel &data, MessageParcel &reply); std::map memberFuncMap_; diff --git a/interfaces/innerkits/app_manager/include/appmgr/irender_scheduler.h b/interfaces/innerkits/app_manager/include/appmgr/irender_scheduler.h deleted file mode 100644 index d4d7cba7c0d..00000000000 --- a/interfaces/innerkits/app_manager/include/appmgr/irender_scheduler.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_IRENDER_SCHEDULER_H -#define FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_IRENDER_SCHEDULER_H - -#include "iremote_broker.h" - -namespace OHOS { -namespace AppExecFwk { -/** - * @class IRenderScheduler - * Ipc interface of render process to app mgr service. - */ -class IRenderScheduler : public IRemoteBroker { -public: - DECLARE_INTERFACE_DESCRIPTOR(u"ohos.appexecfwk.RenderScheduler"); - - /** - * Notify Browser's fd to render process. - * - * @param ipcFd, ipc file descriptior for web browser and render process. - * @param sharedFd, shared memory file descriptior. - */ - virtual void NotifyBrowserFd(int32_t ipcFd, int32_t sharedFd) = 0; - - enum class Message { - NOTIFY_BROWSER_FD = 1, - }; -}; -} // namespace AppExecFwk -} // namespace OHOS -#endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_IRENDER_SCHEDULER_H diff --git a/interfaces/innerkits/app_manager/include/appmgr/render_scheduler_host.h b/interfaces/innerkits/app_manager/include/appmgr/render_scheduler_host.h deleted file mode 100644 index 5b13f250e8a..00000000000 --- a/interfaces/innerkits/app_manager/include/appmgr/render_scheduler_host.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_RENDER_SCHEDULER_HOST_H -#define FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_RENDER_SCHEDULER_HOST_H - -#include - -#include "irender_scheduler.h" -#include "iremote_object.h" -#include "iremote_stub.h" -#include "nocopyable.h" - -namespace OHOS { -namespace AppExecFwk { -/** - * @class RenderSchedulerHost - * RenderScheduler stub. - */ -class RenderSchedulerHost : public IRemoteStub { -public: - RenderSchedulerHost(); - virtual ~RenderSchedulerHost(); - - virtual int OnRemoteRequest( - uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; - -private: - int32_t HandleNotifyBrowserFd(MessageParcel &data, MessageParcel &reply); - - using RenderSchedulerFunc = int32_t (RenderSchedulerHost::*)(MessageParcel &data, MessageParcel &reply); - std::map memberFuncMap_; - - DISALLOW_COPY_AND_MOVE(RenderSchedulerHost); -}; -} // namespace AppExecFwk -} // namespace OHOS - -#endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_RENDER_SCHEDULER_HOST_H diff --git a/interfaces/innerkits/app_manager/include/appmgr/render_scheduler_proxy.h b/interfaces/innerkits/app_manager/include/appmgr/render_scheduler_proxy.h deleted file mode 100644 index 196fe3d9d06..00000000000 --- a/interfaces/innerkits/app_manager/include/appmgr/render_scheduler_proxy.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_RENDER_SCHEDULER_PROXY_H -#define FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_RENDER_SCHEDULER_PROXY_H - -#include "irender_scheduler.h" - -#include "iremote_proxy.h" - -namespace OHOS { -namespace AppExecFwk { -/** - * @class RenderSchedulerProxy - * RenderScheduler proxy. - */ -class RenderSchedulerProxy : public IRemoteProxy { -public: - explicit RenderSchedulerProxy(const sptr &impl); - - virtual ~RenderSchedulerProxy() = default; - - /** - * Notify Browser's fd to render process. - * - * @param ipcFd, ipc file descriptior for web browser and render process. - * @param sharedFd, shared memory file descriptior. - */ - virtual void NotifyBrowserFd(int32_t ipcFd, int32_t sharedFd) override; - -private: - bool WriteInterfaceToken(MessageParcel &data); - static inline BrokerDelegator delegator_; -}; -} // namespace AppExecFwk -} // namespace OHOS - -#endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_RENDER_SCHEDULER_PROXY_H diff --git a/interfaces/innerkits/app_manager/src/appmgr/ams_mgr_proxy.cpp b/interfaces/innerkits/app_manager/src/appmgr/ams_mgr_proxy.cpp index f0801563e30..d1b349653f5 100644 --- a/interfaces/innerkits/app_manager/src/appmgr/ams_mgr_proxy.cpp +++ b/interfaces/innerkits/app_manager/src/appmgr/ams_mgr_proxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -170,6 +170,27 @@ void AmsMgrProxy::RegisterAppStateCallback(const sptr &callba APP_LOGD("end"); } +void AmsMgrProxy::Reset() +{ + APP_LOGD("start"); + MessageParcel data; + MessageParcel reply; + MessageOption option(MessageOption::TF_SYNC); + if (!WriteInterfaceToken(data)) { + return; + } + sptr remote = Remote(); + if (remote == nullptr) { + APP_LOGE("Remote() is NULL"); + return; + } + int32_t ret = remote->SendRequest(static_cast(IAmsMgr::Message::RESET), data, reply, option); + if (ret != NO_ERROR) { + APP_LOGW("SendRequest is failed, error code: %{public}d", ret); + } + APP_LOGD("end"); +} + void AmsMgrProxy::AbilityBehaviorAnalysis(const sptr &token, const sptr &preToken, const int32_t visibility, const int32_t perceptibility, const int32_t connectionState) { diff --git a/interfaces/innerkits/app_manager/src/appmgr/ams_mgr_stub.cpp b/interfaces/innerkits/app_manager/src/appmgr/ams_mgr_stub.cpp index ec7cc1ef193..eb7e502a844 100644 --- a/interfaces/innerkits/app_manager/src/appmgr/ams_mgr_stub.cpp +++ b/interfaces/innerkits/app_manager/src/appmgr/ams_mgr_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -40,6 +40,7 @@ AmsMgrStub::AmsMgrStub() &AmsMgrStub::HandleUpdateExtensionState; memberFuncMap_[static_cast(IAmsMgr::Message::REGISTER_APP_STATE_CALLBACK)] = &AmsMgrStub::HandleRegisterAppStateCallback; + memberFuncMap_[static_cast(IAmsMgr::Message::RESET)] = &AmsMgrStub::HandleReset; memberFuncMap_[static_cast(IAmsMgr::Message::ABILITY_BEHAVIOR_ANALYSIS)] = &AmsMgrStub::HandleAbilityBehaviorAnalysis; memberFuncMap_[static_cast(IAmsMgr::Message::KILL_PEOCESS_BY_ABILITY_TOKEN)] = @@ -155,6 +156,13 @@ ErrCode AmsMgrStub::HandleRegisterAppStateCallback(MessageParcel &data, MessageP return NO_ERROR; } +ErrCode AmsMgrStub::HandleReset(MessageParcel &data, MessageParcel &reply) +{ + BYTRACE(BYTRACE_TAG_APP); + Reset(); + return NO_ERROR; +} + ErrCode AmsMgrStub::HandleAbilityBehaviorAnalysis(MessageParcel &data, MessageParcel &reply) { BYTRACE(BYTRACE_TAG_APP); diff --git a/interfaces/innerkits/app_manager/src/appmgr/app_mgr_client.cpp b/interfaces/innerkits/app_manager/src/appmgr/app_mgr_client.cpp index a3f7aeb8326..1591d40106c 100644 --- a/interfaces/innerkits/app_manager/src/appmgr/app_mgr_client.cpp +++ b/interfaces/innerkits/app_manager/src/appmgr/app_mgr_client.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -106,6 +106,19 @@ AppMgrResultCode AppMgrClient::RegisterAppStateCallback(const sptr service = iface_cast(remote_); + if (service != nullptr) { + sptr amsService = service->GetAmsMgr(); + if (amsService != nullptr) { + amsService->Reset(); + return AppMgrResultCode::RESULT_OK; + } + } + return AppMgrResultCode::ERROR_SERVICE_NOT_CONNECTED; +} + AppMgrResultCode AppMgrClient::AbilityBehaviorAnalysis(const sptr &token, const sptr &preToken, const int32_t visibility, const int32_t perceptibility, const int32_t connectionState) @@ -234,6 +247,26 @@ AppMgrResultCode AppMgrClient::GetConfiguration(Configuration& config) return AppMgrResultCode::ERROR_SERVICE_NOT_CONNECTED; } +AppMgrResultCode AppMgrClient::SetAppFreezingTime(int time) +{ + sptr service = iface_cast(remote_); + if (service != nullptr) { + service->SetAppFreezingTime(time); + return AppMgrResultCode::RESULT_OK; + } + return AppMgrResultCode::ERROR_SERVICE_NOT_CONNECTED; +} + +AppMgrResultCode AppMgrClient::GetAppFreezingTime(int &time) +{ + sptr service = iface_cast(remote_); + if (service != nullptr) { + service->GetAppFreezingTime(time); + return AppMgrResultCode::RESULT_OK; + } + return AppMgrResultCode::ERROR_SERVICE_NOT_CONNECTED; +} + AppMgrResultCode AppMgrClient::ConnectAppMgrService() { if (!serviceManager_) { @@ -414,37 +447,5 @@ int AppMgrClient::GetAbilityRecordsByProcessID(const int pid, std::vectorGetAbilityRecordsByProcessID(pid, tokens); } - -int AppMgrClient::StartRenderProcess(const std::string &renderParam, int32_t ipcFd, - int32_t sharedFd, pid_t &renderPid) -{ - if (!remote_) { - ConnectAppMgrService(); - } - - sptr service = iface_cast(remote_); - if (service != nullptr) { - return service->StartRenderProcess(renderParam, ipcFd, sharedFd, renderPid); - } - return AppMgrResultCode::ERROR_SERVICE_NOT_CONNECTED; -} - -void AppMgrClient::AttachRenderProcess(const sptr &renderScheduler) -{ - if (!renderScheduler) { - APP_LOGI("renderScheduler is nullptr"); - return; - } - - if (!remote_) { - ConnectAppMgrService(); - } - - sptr service = iface_cast(remote_); - if (service != nullptr) { - APP_LOGI("AttachRenderProcess"); - service->AttachRenderProcess(renderScheduler->AsObject()); - } -} } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/app_manager/src/appmgr/app_mgr_proxy.cpp b/interfaces/innerkits/app_manager/src/appmgr/app_mgr_proxy.cpp index 6b36e57d4fc..a5528332597 100644 --- a/interfaces/innerkits/app_manager/src/appmgr/app_mgr_proxy.cpp +++ b/interfaces/innerkits/app_manager/src/appmgr/app_mgr_proxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -226,6 +226,34 @@ int32_t AppMgrProxy::ClearUpApplicationData(const std::string &bundleName) return reply.ReadInt32(); } +int32_t AppMgrProxy::IsBackgroundRunningRestricted(const std::string &bundleName) +{ + APP_LOGD("start"); + MessageParcel data; + MessageParcel reply; + MessageOption option(MessageOption::TF_SYNC); + if (!WriteInterfaceToken(data)) { + return ERR_FLATTEN_OBJECT; + } + sptr remote = Remote(); + if (remote == nullptr) { + APP_LOGE("Remote() is NULL"); + return ERR_NULL_OBJECT; + } + if (!data.WriteString(bundleName)) { + APP_LOGE("parcel WriteString failed"); + return ERR_FLATTEN_OBJECT; + } + int32_t ret = remote->SendRequest( + static_cast(IAppMgr::Message::APP_IS_BACKGROUND_RUNNING_RESTRICTED), data, reply, option); + if (ret != NO_ERROR) { + APP_LOGW("SendRequest is failed, error code: %{public}d", ret); + return ret; + } + APP_LOGD("end"); + return reply.ReadInt32(); +} + int32_t AppMgrProxy::GetAllRunningProcesses(std::vector &info) { APP_LOGD("start"); @@ -298,6 +326,46 @@ bool AppMgrProxy::SendTransactCmd(IAppMgr::Message code, MessageParcel &data, Me return true; } +void AppMgrProxy::SetAppFreezingTime(int time) +{ + APP_LOGD("start"); + MessageParcel data; + MessageParcel reply; + MessageOption option(MessageOption::TF_SYNC); + if (!WriteInterfaceToken(data)) { + return; + } + + if (!data.WriteInt32(time)) { + APP_LOGE("parcel WriteInt32 failed"); + return; + } + if (!SendTransactCmd(IAppMgr::Message::APP_SET_APP_FREEZING_TIME, data, reply)) { + APP_LOGE("SendTransactCmd faild"); + return; + } + APP_LOGD("end"); +} + +void AppMgrProxy::GetAppFreezingTime(int &time) +{ + APP_LOGD("start"); + MessageParcel data; + MessageParcel reply; + MessageOption option(MessageOption::TF_SYNC); + if (!WriteInterfaceToken(data)) { + APP_LOGE("WriteInterfaceToken faild"); + return; + } + + if (!SendTransactCmd(IAppMgr::Message::APP_GET_APP_FREEZING_TIME, data, reply)) { + APP_LOGE("SendTransactCmd faild"); + return; + } + time = reply.ReadInt32(); + APP_LOGE("get freeze time : %{public}d ", time); +} + /** * Get system memory information. * @param SystemMemoryAttr, memory information. @@ -537,73 +605,5 @@ int AppMgrProxy::GetAbilityRecordsByProcessID(const int pid, std::vectorSendRequest(static_cast(IAppMgr::Message::START_RENDER_PROCESS), data, reply, option); - if (ret != NO_ERROR) { - APP_LOGW("StartRenderProcess SendRequest is failed, error code: %{public}d", ret); - return ret; - } - - auto result = reply.ReadInt32(); - renderPid = reply.ReadInt32(); - if (result != 0) { - APP_LOGW("StartRenderProcess failed, result: %{public}d", ret); - return ret; - } - return 0; -} - -void AppMgrProxy::AttachRenderProcess(const sptr &renderScheduler) -{ - if (!renderScheduler) { - APP_LOGE("renderScheduler is null"); - return; - } - - APP_LOGD("AttachRenderProcess start"); - MessageParcel data; - MessageParcel reply; - MessageOption option; - if (!WriteInterfaceToken(data)) { - return; - } - if (!data.WriteParcelable(renderScheduler)) { - APP_LOGE("renderScheduler write failed."); - return; - } - - if (!SendTransactCmd(IAppMgr::Message::ATTACH_RENDER_PROCESS, data, reply)) { - APP_LOGE("SendTransactCmd ATTACH_RENDER_PROCESS faild"); - return; - } -} } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/app_manager/src/appmgr/app_mgr_stub.cpp b/interfaces/innerkits/app_manager/src/appmgr/app_mgr_stub.cpp index 12bc8d566b0..e5ba070ede8 100644 --- a/interfaces/innerkits/app_manager/src/appmgr/app_mgr_stub.cpp +++ b/interfaces/innerkits/app_manager/src/appmgr/app_mgr_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -48,10 +48,16 @@ AppMgrStub::AppMgrStub() memberFuncMap_[static_cast(IAppMgr::Message::APP_GET_MGR_INSTANCE)] = &AppMgrStub::HandleGetAmsMgr; memberFuncMap_[static_cast(IAppMgr::Message::APP_CLEAR_UP_APPLICATION_DATA)] = &AppMgrStub::HandleClearUpApplicationData; + memberFuncMap_[static_cast(IAppMgr::Message::APP_IS_BACKGROUND_RUNNING_RESTRICTED)] = + &AppMgrStub::HandleIsBackgroundRunningRestricted; memberFuncMap_[static_cast(IAppMgr::Message::APP_GET_ALL_RUNNING_PROCESSES)] = &AppMgrStub::HandleGetAllRunningProcesses; memberFuncMap_[static_cast(IAppMgr::Message::APP_GET_RUNNING_PROCESSES_BY_USER_ID)] = &AppMgrStub::HandleGetProcessRunningInfosByUserId; + memberFuncMap_[static_cast(IAppMgr::Message::APP_SET_APP_FREEZING_TIME)] = + &AppMgrStub::HandleSetAppFreezingTime; + memberFuncMap_[static_cast(IAppMgr::Message::APP_GET_APP_FREEZING_TIME)] = + &AppMgrStub::HandleGetAppFreezingTime; memberFuncMap_[static_cast(IAppMgr::Message::APP_GET_SYSTEM_MEMORY_ATTR)] = &AppMgrStub::HandleGetSystemMemoryAttr; memberFuncMap_[static_cast(IAppMgr::Message::APP_ADD_ABILITY_STAGE_INFO_DONE)] = @@ -70,10 +76,6 @@ AppMgrStub::AppMgrStub() &AppMgrStub::HandleScheduleAcceptWantDone; memberFuncMap_[static_cast(IAppMgr::Message::APP_GET_ABILITY_RECORDS_BY_PROCESS_ID)] = &AppMgrStub::HandleGetAbilityRecordsByProcessID; - memberFuncMap_[static_cast(IAppMgr::Message::START_RENDER_PROCESS)] = - &AppMgrStub::HandleStartRenderProcess; - memberFuncMap_[static_cast(IAppMgr::Message::ATTACH_RENDER_PROCESS)] = - &AppMgrStub::HandleAttachRenderProcess; } AppMgrStub::~AppMgrStub() @@ -175,6 +177,15 @@ int32_t AppMgrStub::HandleClearUpApplicationData(MessageParcel &data, MessagePar return NO_ERROR; } +int32_t AppMgrStub::HandleIsBackgroundRunningRestricted(MessageParcel &data, MessageParcel &reply) +{ + BYTRACE(BYTRACE_TAG_APP); + std::string bundleName = data.ReadString(); + int32_t result = IsBackgroundRunningRestricted(bundleName); + reply.WriteInt32(result); + return NO_ERROR; +} + int32_t AppMgrStub::HandleGetAllRunningProcesses(MessageParcel &data, MessageParcel &reply) { BYTRACE(BYTRACE_TAG_APP); @@ -210,6 +221,22 @@ int32_t AppMgrStub::HandleGetProcessRunningInfosByUserId(MessageParcel &data, Me return NO_ERROR; } +int32_t AppMgrStub::HandleSetAppFreezingTime(MessageParcel &data, MessageParcel &reply) +{ + BYTRACE(BYTRACE_TAG_APP); + SetAppFreezingTime(data.ReadInt32()); + return NO_ERROR; +} + +int32_t AppMgrStub::HandleGetAppFreezingTime(MessageParcel &data, MessageParcel &reply) +{ + BYTRACE(BYTRACE_TAG_APP); + int time = 0; + GetAppFreezingTime(time); + reply.WriteInt32(time); + return NO_ERROR; +} + int32_t AppMgrStub::HandleGetSystemMemoryAttr(MessageParcel &data, MessageParcel &reply) { BYTRACE(BYTRACE_TAG_APP); @@ -336,30 +363,5 @@ int32_t AppMgrStub::HandleGetAbilityRecordsByProcessID(MessageParcel &data, Mess } return NO_ERROR; } - -int32_t AppMgrStub::HandleStartRenderProcess(MessageParcel &data, MessageParcel &reply) -{ - std::string renderParam = data.ReadString(); - int32_t ipcFd = data.ReadFileDescriptor(); - int32_t sharedFd = data.ReadFileDescriptor(); - int32_t renderPid = 0; - int32_t result = StartRenderProcess(renderParam, ipcFd, sharedFd, renderPid); - if (!reply.WriteInt32(result)) { - APP_LOGE("write result error."); - return ERR_INVALID_VALUE; - } - if (!reply.WriteInt32(renderPid)) { - APP_LOGE("write renderPid error."); - return ERR_INVALID_VALUE; - } - return result; -} - -int32_t AppMgrStub::HandleAttachRenderProcess(MessageParcel &data, MessageParcel &reply) -{ - sptr scheduler = data.ReadParcelable(); - AttachRenderProcess(scheduler); - return NO_ERROR; -} } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/app_manager/src/appmgr/render_scheduler_host.cpp b/interfaces/innerkits/app_manager/src/appmgr/render_scheduler_host.cpp deleted file mode 100644 index 91a2db26d84..00000000000 --- a/interfaces/innerkits/app_manager/src/appmgr/render_scheduler_host.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "render_scheduler_host.h" - -#include "app_log_wrapper.h" -#include "ipc_types.h" - -namespace OHOS { -namespace AppExecFwk { -RenderSchedulerHost::RenderSchedulerHost() -{ - memberFuncMap_[static_cast(IRenderScheduler::Message::NOTIFY_BROWSER_FD)] = - &RenderSchedulerHost::HandleNotifyBrowserFd; -} - -RenderSchedulerHost::~RenderSchedulerHost() -{ - memberFuncMap_.clear(); -} - -int RenderSchedulerHost::OnRemoteRequest(uint32_t code, MessageParcel &data, - MessageParcel &reply, MessageOption &option) -{ - APP_LOGI("RenderSchedulerHost::OnReceived, code = %{public}d, flags= %{public}d.", code, option.GetFlags()); - std::u16string descriptor = RenderSchedulerHost::GetDescriptor(); - std::u16string remoteDescriptor = data.ReadInterfaceToken(); - if (descriptor != remoteDescriptor) { - APP_LOGE("local descriptor is not equal to remote"); - return ERR_INVALID_STATE; - } - - auto itFunc = memberFuncMap_.find(code); - if (itFunc != memberFuncMap_.end()) { - auto memberFunc = itFunc->second; - if (memberFunc != nullptr) { - return (this->*memberFunc)(data, reply); - } - } - return IPCObjectStub::OnRemoteRequest(code, data, reply, option); -} - -int RenderSchedulerHost::HandleNotifyBrowserFd(MessageParcel &data, MessageParcel &reply) -{ - int32_t ipcFd = data.ReadFileDescriptor(); - int32_t sharedFd = data.ReadFileDescriptor(); - NotifyBrowserFd(ipcFd, sharedFd); - return 0; -} -} // namespace AppExecFwk -} // namespace OHOS diff --git a/interfaces/innerkits/app_manager/src/appmgr/render_scheduler_proxy.cpp b/interfaces/innerkits/app_manager/src/appmgr/render_scheduler_proxy.cpp deleted file mode 100644 index e409655b648..00000000000 --- a/interfaces/innerkits/app_manager/src/appmgr/render_scheduler_proxy.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "render_scheduler_proxy.h" - -#include "ipc_types.h" - -#include "app_log_wrapper.h" - -namespace OHOS { -namespace AppExecFwk { -RenderSchedulerProxy::RenderSchedulerProxy( - const sptr &impl) : IRemoteProxy(impl) -{} - -bool RenderSchedulerProxy::WriteInterfaceToken(MessageParcel &data) -{ - if (!data.WriteInterfaceToken(RenderSchedulerProxy::GetDescriptor())) { - APP_LOGE("write interface token failed"); - return false; - } - return true; -} - -void RenderSchedulerProxy::NotifyBrowserFd(int32_t ipcFd, int32_t sharedFd) -{ - APP_LOGD("NotifyBrowserFd start"); - MessageParcel data; - MessageParcel reply; - MessageOption option(MessageOption::TF_ASYNC); - if (!WriteInterfaceToken(data)) { - return; - } - - if (!data.WriteFileDescriptor(ipcFd) || !data.WriteFileDescriptor(sharedFd)) { - APP_LOGE("want fd failed, ipcFd:%{public}d, sharedFd:%{public}d", ipcFd, sharedFd); - return; - } - - sptr remote = Remote(); - if (remote == nullptr) { - APP_LOGE("Remote() is NULL"); - return; - } - int32_t ret = remote->SendRequest( - static_cast(IRenderScheduler::Message::NOTIFY_BROWSER_FD), - data, reply, option); - if (ret != NO_ERROR) { - APP_LOGW("SendRequest is failed, error code: %{public}d", ret); - } - APP_LOGD("NotifyBrowserFd end"); -} -} // namespace AppExecFwk -} // namespace OHOS diff --git a/interfaces/innerkits/form_manager/src/form_provider_data.cpp b/interfaces/innerkits/form_manager/src/form_provider_data.cpp index da96cab7fa9..66072d55240 100755 --- a/interfaces/innerkits/form_manager/src/form_provider_data.cpp +++ b/interfaces/innerkits/form_manager/src/form_provider_data.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include "form_provider_data.h" @@ -106,10 +105,6 @@ void FormProviderData::AddImageData(std::string picName, char *data, int32_t siz return; } - auto iterator = rawImageBytesMap_.find(picName); - if (iterator != rawImageBytesMap_.end()) { - delete[] iterator->second.first; - } rawImageBytesMap_[picName] = std::make_pair(data, size); imageDataState_ = IMAGE_DATA_STATE_ADDED; @@ -123,24 +118,34 @@ void FormProviderData::AddImageData(std::string picName, char *data, int32_t siz void FormProviderData::AddImageData(std::string picName, int fd) { HILOG_INFO("%{public}s called", __func__); - if (fd < 0) { + if (fd <= 0) { return; } - - int32_t size = lseek(fd, 0L, SEEK_END); - if (size <= 0) { - HILOG_ERROR("Get file size failed, errno is %{public}d", errno); + std::string fdPath = "/proc/self/fd/" + std::to_string(fd); + char fileName[PATH_MAX + 1] = {0}; + int ret = readlink(fdPath.c_str(), fileName, PATH_MAX); + if (ret < 0 || ret > PATH_MAX) { + HILOG_ERROR("Get fileName failed, ret is: %{public}d!", ret); return; } - HILOG_INFO("File size is %{public}d", size); - if (lseek(fd, 0L, SEEK_SET) == -1) { + fileName[ret] = '\0'; + + std::ifstream file(fileName, std::ios::in | std::ios::binary | std::ios::ate); + if (!file.is_open()) { + HILOG_INFO("open failed"); return; } - char *data = new char[size]; - if (read(fd, data, size) < 0) { - HILOG_ERROR("Read failed, errno is %{public}d", errno); + + file.seekg(0, std::ios::end); + int32_t size = file.tellg(); + HILOG_INFO("File size %{public}d", size); + if (size < 0) { return; } + file.seekg(0, std::ios::beg); + char *data = new char[size]; + file.read(data, size); + file.close(); AddImageData(picName, data, size); HILOG_INFO("%{public}s called end.", __func__); } diff --git a/interfaces/innerkits/runtime/include/js_runtime_utils.h b/interfaces/innerkits/runtime/include/js_runtime_utils.h index 85fb368679d..047fe42ea45 100644 --- a/interfaces/innerkits/runtime/include/js_runtime_utils.h +++ b/interfaces/innerkits/runtime/include/js_runtime_utils.h @@ -81,11 +81,9 @@ inline bool ConvertFromJsValue(NativeEngine& engine, NativeValue* jsValue, T& va if (stringValue == nullptr) { return false; } - size_t len = stringValue->GetLength() + 1; - auto buffer = std::make_unique(len); - size_t strLength = 0; - stringValue->GetCString(buffer.get(), len, &strLength); - value = buffer.get(); + size_t len = stringValue->GetLength(); + value.resize(len); + stringValue->GetCString(value.data(), len, &len); return true; } else if constexpr (std::is_enum_v) { auto numberValue = ConvertNativeValueTo(jsValue); diff --git a/ohos.build b/ohos.build index 210459f71cf..b40f83d76ae 100644 --- a/ohos.build +++ b/ohos.build @@ -82,9 +82,7 @@ "appmgr/iapp_state_callback.h", "appmgr/app_state_callback_host.h", "appmgr/app_mgr_constants.h", - "appmgr/app_process_data.h", - "appmgr/irender_scheduler.h", - "appmgr/render_scheduler_host.h" + "appmgr/app_process_data.h" ] }, "name": "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager" diff --git a/services/BUILD.gn b/services/BUILD.gn index 5770614a362..c11ef1cb046 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -15,7 +15,6 @@ group("services_target") { deps = [ "abilitymgr:abilityms_target", "appmgr:ams_target", - "common:perm_verification", "dataobsmgr:dataobsms", "uripermmgr:upms_target", ] diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index 99e4e269f86..15cce174228 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -80,7 +80,6 @@ ohos_shared_library("abilityms") { "${innerkits_path}/base:base", "${innerkits_path}/uri_permission:uri_permission_mgr", "${innerkits_path}/want:want", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//base/global/i18n_standard/frameworks/intl:intl_util", "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility", diff --git a/services/abilitymgr/abilitymgr.gni b/services/abilitymgr/abilitymgr.gni index 286ba3d4b74..c23b483029c 100644 --- a/services/abilitymgr/abilitymgr.gni +++ b/services/abilitymgr/abilitymgr.gni @@ -46,6 +46,7 @@ abilityms_files = [ "${services_path}/abilitymgr/src/ability_mission_info.cpp", "${services_path}/abilitymgr/src/mission_description_info.cpp", "${services_path}/abilitymgr/src/mission_snapshot.cpp", + "${services_path}/abilitymgr/src/kernal_system_app_manager.cpp", "${services_path}/abilitymgr/src/caller_info.cpp", "${services_path}/abilitymgr/src/sender_info.cpp", "${services_path}/abilitymgr/src/wants_info.cpp", diff --git a/services/abilitymgr/include/ability_connect_manager.h b/services/abilitymgr/include/ability_connect_manager.h index 99fa6b0c8f4..09313891463 100644 --- a/services/abilitymgr/include/ability_connect_manager.h +++ b/services/abilitymgr/include/ability_connect_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -183,13 +183,9 @@ public: ConnectListType GetConnectRecordListByCallback(sptr callback); void RemoveAll(); - void GetExtensionRunningInfos(int upperLimit, std::vector &info, - const int32_t userId, bool isPerm); + void GetExtensionRunningInfos(int upperLimit, std::vector &info, const int32_t userId); - void GetAbilityRunningInfos(std::vector &info, bool isPerm); - - void GetExtensionRunningInfo(std::shared_ptr &abilityRecord, const int32_t userId, - std::vector &info); + void GetAbilityRunningInfos(std::vector &info); /** * SetEventHandler. diff --git a/services/abilitymgr/include/ability_manager_service.h b/services/abilitymgr/include/ability_manager_service.h index 705e9ea224d..e413cb5de48 100644 --- a/services/abilitymgr/include/ability_manager_service.h +++ b/services/abilitymgr/include/ability_manager_service.h @@ -32,6 +32,7 @@ #include "data_ability_manager.h" #include "hilog_wrapper.h" #include "iremote_object.h" +#include "kernal_system_app_manager.h" #include "mission_list_manager.h" #include "system_ability.h" #include "uri.h" @@ -746,9 +747,6 @@ public: virtual int GetExtensionRunningInfos(int upperLimit, std::vector &info) override; virtual int GetProcessRunningInfos(std::vector &info) override; int GetProcessRunningInfosByUserId(std::vector &info, int32_t userId); - void GetAbilityRunningInfo(std::vector &info, std::shared_ptr &abilityRecord); - void GetExtensionRunningInfo(std::shared_ptr &abilityRecord, const int32_t userId, - std::vector &info); int GetMissionSaveTime() const; @@ -1141,10 +1139,6 @@ private: bool IsNeedTimeoutForTest(const std::string &abilityName, const std::string &state) const; void StartupResidentProcess(); - int VerifyMissionPermission(); - - int VerifyAccountPermission(int32_t userId); - using DumpFuncType = void (AbilityManagerService::*)(const std::string &args, std::vector &info); std::map dumpFuncMap_; @@ -1175,6 +1169,7 @@ private: std::shared_ptr systemDataAbilityManager_; std::unordered_map> pendingWantManagers_; std::shared_ptr pendingWantManager_; + std::shared_ptr systemAppManager_; std::shared_ptr amsConfigResolver_; const static std::map dumpMap; const static std::map dumpsysMap; diff --git a/services/abilitymgr/include/data_ability_manager.h b/services/abilitymgr/include/data_ability_manager.h index f1ac566670d..a3561ea6511 100644 --- a/services/abilitymgr/include/data_ability_manager.h +++ b/services/abilitymgr/include/data_ability_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -48,8 +48,8 @@ public: void Dump(const char *func, int line); void DumpState(std::vector &info, const std::string &args = "") const; void DumpSysState(std::vector &info, bool isClient = false, const std::string &args = "") const; + void GetAbilityRunningInfos(std::vector &info); bool ContainsDataAbility(const sptr &scheduler); - void GetAbilityRunningInfos(std::vector &info, bool isPerm); private: using DataAbilityRecordPtr = std::shared_ptr; diff --git a/services/abilitymgr/include/kernal_system_app_manager.h b/services/abilitymgr/include/kernal_system_app_manager.h new file mode 100644 index 00000000000..eb30240281a --- /dev/null +++ b/services/abilitymgr/include/kernal_system_app_manager.h @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_AAFWK_KERNAL_SYSTEM_APP_MANAGER_H +#define OHOS_AAFWK_KERNAL_SYSTEM_APP_MANAGER_H + +#include +#include + +#include "mission_record.h" +#include "mission_stack.h" +#include "want.h" + +namespace OHOS { +namespace AAFwk { +/** + * @class KernalSystemAppManager + * KernalSystemAppManager provides a facility for managing systerm ability life cycle. + */ +class KernalSystemAppManager : public std::enable_shared_from_this { +public: + explicit KernalSystemAppManager(int userId); + ~KernalSystemAppManager(); + + /** + * init kernal system app manager. + * + */ + void Init(); + /** + * StartAbility with request. + * + * @param abilityRequest, the request of the ability to start. + * @return Returns ERR_OK on success, others on failure. + */ + int StartAbility(const AbilityRequest &abilityRequest); + /** + * attach ability thread ipc object. + * + * @param scheduler, ability thread ipc object. + * @param token, the token of ability. + * @return Returns ERR_OK on success, others on failure. + */ + int AttachAbilityThread(const sptr &scheduler, const sptr &token); + /** + * AbilityTransitionDone, ability call this interface after lift cycle was changed. + * + * @param token,.ability's token. + * @param state,.the state of ability lift cycle. + * @return Returns ERR_OK on success, others on failure. + */ + int AbilityTransitionDone(const sptr &token, int state); + /** + * OnAbilityRequestDone, app manager service call this interface after ability request done. + * + * @param token,ability's token. + * @param state,the state of ability lift cycle. + */ + void OnAbilityRequestDone(const sptr &token, const int32_t state); + + void OnAppStateChanged(const AppInfo &info); + + /** + * get manager's user id. + */ + int GetManagerUserId() const; + + void DumpState(std::vector &info); + + void DumpSysState(std::vector &info, bool isClient = false); + + void OnAbilityDied(std::shared_ptr abilityRecord); + + void OnTimeOut(uint32_t msgId, int64_t eventId); + + /** + * get the ability record by token. + * + * @return abilityRecord, target ability. + */ + std::shared_ptr GetAbilityRecordByToken(const sptr &token); + + void RestartAbility(const std::shared_ptr abilityRecord); + +private: + /** + * StartAbilityLocked. + * + * @param abilityRequest the request of the ability to start. + * @return Returns ERR_OK on success, others on failure. + */ + int StartAbilityLocked(const AbilityRequest &abilityRequest); + /** + * push waitting ability to queue. + * + * @param abilityRequest, the request of ability. + */ + void EnqueueWaittingAbility(const AbilityRequest &abilityRequest); + /** + * pop waitting ability. + * + */ + void DequeueWaittingAbility(); + /** + * get current top ability of stack. + * + * @return top ability record. + */ + std::shared_ptr GetCurrentTopAbility() const; + /** + * get or create the target ability record of system app. + * + * @param abilityRequest, the request of ability. + * @param targetAbility, target ability record. + */ + void GetOrCreateAbilityRecord(const AbilityRequest &abilityRequest, std::shared_ptr &targetAbility); + /** + * get the flag of the target ability record. + * + * @param bundleName, target bundleName. + * @param abilityName, target ability name. + */ + static std::string GetFlagOfAbility(const std::string &bundleName, const std::string &abilityName); + /** + * get the ability record by eventId. + * + * @return abilityRecord, target ability. + */ + std::shared_ptr GetAbilityRecordByEventId(const int64_t eventId) const; + /** + * dispatch ability life cycle . + * + * @param abilityRecord. + * @param state. + */ + int DispatchActive(const std::shared_ptr &abilityRecord, int state); + int DispatchInactive(const std::shared_ptr &abilityRecord, int state); + /** + * complete ability life cycle . + * + * @param abilityRecord. + */ + void CompleteActive(const std::shared_ptr &abilityRecord); + void CompleteInactive(const std::shared_ptr &abilityRecord); + + bool RemoveAbilityRecord(std::shared_ptr ability); + +private: + std::recursive_mutex stackLock_; + std::list> abilities_; + std::queue waittingAbilityQueue_; + int userId_; +}; +} // namespace AAFwk +} // namespace OHOS +#endif // OHOS_AAFWK_KERNAL_SYSTEM_APP_MANAGER_H diff --git a/services/abilitymgr/include/mission_list_manager.h b/services/abilitymgr/include/mission_list_manager.h index 00e9b20baee..632cfb5dfe7 100644 --- a/services/abilitymgr/include/mission_list_manager.h +++ b/services/abilitymgr/include/mission_list_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -322,7 +322,7 @@ public: */ bool GetMissionSnapshot(int32_t missionId, const sptr& abilityToken, MissionSnapshot& missionSnapshot); - void GetAbilityRunningInfos(std::vector &info, bool isPerm); + void GetAbilityRunningInfos(std::vector &info); /** * @brief get current top ability by bundle name diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index e09a1150e17..1fe56f890a1 100755 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -990,94 +990,80 @@ void AbilityConnectManager::DumpState(std::vector &info, bool isCli } void AbilityConnectManager::GetExtensionRunningInfos(int upperLimit, std::vector &info, - const int32_t userId, bool isPerm) + const int32_t userId) { HILOG_INFO("Get extension running info."); std::lock_guard guard(Lock_); - auto mgr = shared_from_this(); - auto queryInfo = [&info, upperLimit, userId, isPerm, mgr](ServiceMapType::reference service) { + auto queryInfo = [&info, upperLimit, userId](ServiceMapType::reference service) { if (static_cast(info.size()) >= upperLimit) { return; } auto abilityRecord = service.second; CHECK_POINTER(abilityRecord); - - if (isPerm) { - mgr->GetExtensionRunningInfo(abilityRecord, userId, info); - } else { - auto callingTokenId = IPCSkeleton::GetCallingTokenID(); - auto tokenID = abilityRecord->GetApplicationInfo().accessTokenId; - if (callingTokenId == tokenID) { - mgr->GetExtensionRunningInfo(abilityRecord, userId, info); + ExtensionRunningInfo extensionInfo; + AppExecFwk::RunningProcessInfo processInfo; + extensionInfo.extension = abilityRecord->GetWant().GetElement(); + auto bms = AbilityUtil::GetBundleManager(); + CHECK_POINTER(bms); + std::vector extensionInfos; + bool queryResult = bms->QueryExtensionAbilityInfos(abilityRecord->GetWant(), + AppExecFwk::AbilityInfoFlag::GET_ABILITY_INFO_WITH_APPLICATION, userId, extensionInfos); + if (queryResult) { + HILOG_INFO("Query Extension Ability Infos Success."); + auto abilityInfo = abilityRecord->GetAbilityInfo(); + auto isExist = [&abilityInfo](const AppExecFwk::ExtensionAbilityInfo &extensionInfo) { + HILOG_INFO("%{public}s, %{public}s", extensionInfo.bundleName.c_str(), extensionInfo.name.c_str()); + return extensionInfo.bundleName == abilityInfo.bundleName && extensionInfo.name == abilityInfo.name + && extensionInfo.applicationInfo.uid == abilityInfo.applicationInfo.uid; + }; + auto infoIter = std::find_if(extensionInfos.begin(), extensionInfos.end(), isExist); + if (infoIter != extensionInfos.end()) { + HILOG_INFO("Get target success."); + extensionInfo.type = (*infoIter).type; } } + DelayedSingleton::GetInstance()-> + GetRunningProcessInfoByToken(abilityRecord->GetToken(), processInfo); + extensionInfo.pid = processInfo.pid_; + extensionInfo.uid = processInfo.uid_; + extensionInfo.processName = processInfo.processName_; + extensionInfo.startTime = abilityRecord->GetStartTime(); + ConnectListType connectRecordList = abilityRecord->GetConnectRecordList(); + for (auto &connectRecord : connectRecordList) { + CHECK_POINTER(connectRecord); + auto callerAbilityRecord = Token::GetAbilityRecordByToken(connectRecord->GetToken()); + CHECK_POINTER(callerAbilityRecord); + std::string package = callerAbilityRecord->GetAbilityInfo().bundleName; + extensionInfo.clientPackage.emplace_back(package); + } + info.emplace_back(extensionInfo); + // extension type }; std::for_each(serviceMap_.begin(), serviceMap_.end(), queryInfo); } -void AbilityConnectManager::GetAbilityRunningInfos(std::vector &info, bool isPerm) +void AbilityConnectManager::GetAbilityRunningInfos(std::vector &info) { HILOG_INFO("Query running ability infos."); std::lock_guard guard(Lock_); - auto queryInfo = [&info, isPerm](ServiceMapType::reference service) { + auto queryInfo = [&info](ServiceMapType::reference service) { auto abilityRecord = service.second; CHECK_POINTER(abilityRecord); - - if (isPerm) { - DelayedSingleton::GetInstance()->GetAbilityRunningInfo(info, abilityRecord); - } else { - auto callingTokenId = IPCSkeleton::GetCallingTokenID(); - auto tokenID = abilityRecord->GetApplicationInfo().accessTokenId; - if (callingTokenId == tokenID) { - DelayedSingleton::GetInstance()->GetAbilityRunningInfo(info, abilityRecord); - } - } + AbilityRunningInfo runningInfo; + AppExecFwk::RunningProcessInfo processInfo; + runningInfo.ability = abilityRecord->GetWant().GetElement(); + DelayedSingleton::GetInstance()-> + GetRunningProcessInfoByToken(abilityRecord->GetToken(), processInfo); + runningInfo.pid = processInfo.pid_; + runningInfo.uid = processInfo.uid_; + runningInfo.processName = processInfo.processName_; + runningInfo.startTime = abilityRecord->GetStartTime(); + runningInfo.abilityState = static_cast(abilityRecord->GetAbilityState()); + info.emplace_back(runningInfo); }; std::for_each(serviceMap_.begin(), serviceMap_.end(), queryInfo); } - -void AbilityConnectManager::GetExtensionRunningInfo(std::shared_ptr &abilityRecord, const int32_t userId, - std::vector &info) -{ - ExtensionRunningInfo extensionInfo; - AppExecFwk::RunningProcessInfo processInfo; - extensionInfo.extension = abilityRecord->GetWant().GetElement(); - auto bms = AbilityUtil::GetBundleManager(); - CHECK_POINTER(bms); - std::vector extensionInfos; - bool queryResult = bms->QueryExtensionAbilityInfos(abilityRecord->GetWant(), - AppExecFwk::AbilityInfoFlag::GET_ABILITY_INFO_WITH_APPLICATION, userId, extensionInfos); - if (queryResult) { - HILOG_INFO("Query Extension Ability Infos Success."); - auto abilityInfo = abilityRecord->GetAbilityInfo(); - auto isExist = [&abilityInfo](const AppExecFwk::ExtensionAbilityInfo &extensionInfo) { - HILOG_INFO("%{public}s, %{public}s", extensionInfo.bundleName.c_str(), extensionInfo.name.c_str()); - return extensionInfo.bundleName == abilityInfo.bundleName && extensionInfo.name == abilityInfo.name - && extensionInfo.applicationInfo.uid == abilityInfo.applicationInfo.uid; - }; - auto infoIter = std::find_if(extensionInfos.begin(), extensionInfos.end(), isExist); - if (infoIter != extensionInfos.end()) { - HILOG_INFO("Get target success."); - extensionInfo.type = (*infoIter).type; - } - } - DelayedSingleton::GetInstance()-> - GetRunningProcessInfoByToken(abilityRecord->GetToken(), processInfo); - extensionInfo.pid = processInfo.pid_; - extensionInfo.uid = processInfo.uid_; - extensionInfo.processName = processInfo.processName_; - extensionInfo.startTime = abilityRecord->GetStartTime(); - ConnectListType connectRecordList = abilityRecord->GetConnectRecordList(); - for (auto &connectRecord : connectRecordList) { - CHECK_POINTER(connectRecord); - auto callerAbilityRecord = Token::GetAbilityRecordByToken(connectRecord->GetToken()); - CHECK_POINTER(callerAbilityRecord); - std::string package = callerAbilityRecord->GetAbilityInfo().bundleName; - extensionInfo.clientPackage.emplace_back(package); - } - info.emplace_back(extensionInfo); -} } // namespace AAFwk } // namespace OHOS diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 5ea8d0a8ede..f41c9e1bd3f 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -41,8 +41,6 @@ #include "lock_screen_white_list.h" #include "mission/mission_info_converter.h" #include "mission_info_mgr.h" -#include "permission_constants.h" -#include "permission_verification.h" #include "sa_mgr_client.h" #include "softbus_bus_center.h" #include "string_ex.h" @@ -191,6 +189,8 @@ bool AbilityManagerService::Init() useNewMission_ = amsConfigResolver_->IsUseNewMission(); SetStackManager(userId, true); + systemAppManager_ = std::make_shared(0); + CHECK_POINTER_RETURN_BOOL(systemAppManager_); InitMissionListManager(userId, true); @@ -264,9 +264,9 @@ int AbilityManagerService::StartAbilityInner(const Want &want, const sptrStartAbility(abilityRequest); } else { + if (IsSystemUiApp(abilityRequest.abilityInfo)) { + HILOG_DEBUG("%{public}s OldMission Start SystemUiApp", __func__); + return systemAppManager_->StartAbility(abilityRequest); + } + auto stackManager = GetStackManagerByUserId(validUserId); if (!stackManager) { HILOG_ERROR("stackManager is nullptr. userId=%{public}d", validUserId); @@ -360,9 +365,9 @@ int AbilityManagerService::StartAbility(const Want &want, const AbilityStartSett BYTRACE_NAME(BYTRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); HILOG_DEBUG("Start ability setting."); - if (VerifyAccountPermission(userId) == CHECK_PERMISSION_FAILED) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; + if (userId != INVALID_USER_ID && !CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not systemApp"); + return CALLER_ISNOT_SYSTEMAPP; } if (callerToken != nullptr && !VerificationAllToken(callerToken)) { @@ -430,6 +435,10 @@ int AbilityManagerService::StartAbility(const Want &want, const AbilityStartSett } return missionListManager->StartAbility(abilityRequest); } else { + if (IsSystemUiApp(abilityRequest.abilityInfo)) { + return systemAppManager_->StartAbility(abilityRequest); + } + auto stackManager = GetStackManagerByUserId(validUserId); if (!stackManager) { HILOG_ERROR("stackManager is nullptr. userId=%{public}d", validUserId); @@ -445,9 +454,9 @@ int AbilityManagerService::StartAbility(const Want &want, const StartOptions &st BYTRACE_NAME(BYTRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); HILOG_DEBUG("Start ability options."); - if (VerifyAccountPermission(userId) == CHECK_PERMISSION_FAILED) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; + if (userId != INVALID_USER_ID && !CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not systemApp"); + return CALLER_ISNOT_SYSTEMAPP; } if (callerToken != nullptr && !VerificationAllToken(callerToken)) { @@ -632,7 +641,7 @@ int AbilityManagerService::TerminateAbilityWithFlag(const sptr &t if ((resultWant != nullptr) && AbilityUtil::IsSystemDialogAbility( - abilityRecord->GetAbilityInfo().bundleName, abilityRecord->GetAbilityInfo().name) && + abilityRecord->GetAbilityInfo().bundleName, abilityRecord->GetAbilityInfo().name) && resultWant->HasParameter(AbilityConfig::SYSTEM_DIALOG_KEY) && resultWant->HasParameter(AbilityConfig::SYSTEM_DIALOG_CALLER_BUNDLENAME) && resultWant->HasParameter(AbilityConfig::SYSTEM_DIALOG_REQUEST_PERMISSIONS)) { @@ -972,9 +981,9 @@ int AbilityManagerService::ConnectAbility( CHECK_POINTER_AND_RETURN(connect, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(connect->AsObject(), ERR_INVALID_VALUE); - if (VerifyAccountPermission(userId) == CHECK_PERMISSION_FAILED) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; + if (userId != INVALID_USER_ID && !CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not systemApp"); + return CALLER_ISNOT_SYSTEMAPP; } if (CheckIfOperateRemote(want)) { @@ -1372,10 +1381,11 @@ int AbilityManagerService::LockMissionForCleanup(int32_t missionId) HILOG_INFO("request unlock mission for clean up all, id :%{public}d", missionId); CHECK_POINTER_AND_RETURN(currentStackManager_, ERR_NO_INIT); - if (VerifyMissionPermission() == CHECK_PERMISSION_FAILED) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; + if (!CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not system app"); + return CALLER_ISNOT_SYSTEMAPP; } + return currentMissionListManager_->SetMissionLockedState(missionId, true); } @@ -1384,10 +1394,11 @@ int AbilityManagerService::UnlockMissionForCleanup(int32_t missionId) HILOG_INFO("request unlock mission for clean up all, id :%{public}d", missionId); CHECK_POINTER_AND_RETURN(currentStackManager_, ERR_NO_INIT); - if (VerifyMissionPermission() == CHECK_PERMISSION_FAILED) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; + if (!CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not system app"); + return CALLER_ISNOT_SYSTEMAPP; } + return currentMissionListManager_->SetMissionLockedState(missionId, false); } @@ -1395,11 +1406,13 @@ int AbilityManagerService::RegisterMissionListener(const sptr { HILOG_INFO("request RegisterMissionListener "); CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + CHECK_POINTER_AND_RETURN(iBundleManager_, ERR_NO_INIT); - if (VerifyMissionPermission() == CHECK_PERMISSION_FAILED) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; + if (!CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not system app"); + return CALLER_ISNOT_SYSTEMAPP; } + return currentMissionListManager_->RegisterMissionListener(listener); } @@ -1407,11 +1420,13 @@ int AbilityManagerService::UnRegisterMissionListener(const sptrUnRegisterMissionListener(listener); } @@ -1420,10 +1435,11 @@ int AbilityManagerService::GetMissionInfos(const std::string& deviceId, int32_t { HILOG_INFO("request GetMissionInfos."); CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + CHECK_POINTER_AND_RETURN(iBundleManager_, ERR_NO_INIT); - if (VerifyMissionPermission() == CHECK_PERMISSION_FAILED) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; + if (!CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not system app"); + return CALLER_ISNOT_SYSTEMAPP; } if (CheckIsRemote(deviceId)) { @@ -1451,10 +1467,11 @@ int AbilityManagerService::GetMissionInfo(const std::string& deviceId, int32_t m { HILOG_INFO("request GetMissionInfo, missionId:%{public}d", missionId); CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + CHECK_POINTER_AND_RETURN(iBundleManager_, ERR_NO_INIT); - if (VerifyMissionPermission() == CHECK_PERMISSION_FAILED) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; + if (!CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not system app"); + return CALLER_ISNOT_SYSTEMAPP; } if (CheckIsRemote(deviceId)) { @@ -1487,10 +1504,11 @@ int AbilityManagerService::CleanMission(int32_t missionId) { HILOG_INFO("request CleanMission, missionId:%{public}d", missionId); CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + CHECK_POINTER_AND_RETURN(iBundleManager_, ERR_NO_INIT); - if (VerifyMissionPermission() == CHECK_PERMISSION_FAILED) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; + if (!CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not system app"); + return CALLER_ISNOT_SYSTEMAPP; } return currentMissionListManager_->ClearMission(missionId); @@ -1500,10 +1518,11 @@ int AbilityManagerService::CleanAllMissions() { HILOG_INFO("request CleanAllMissions "); CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + CHECK_POINTER_AND_RETURN(iBundleManager_, ERR_NO_INIT); - if (VerifyMissionPermission() == CHECK_PERMISSION_FAILED) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; + if (!CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not system app"); + return CALLER_ISNOT_SYSTEMAPP; } return currentMissionListManager_->ClearAllMissions(); @@ -1513,10 +1532,11 @@ int AbilityManagerService::MoveMissionToFront(int32_t missionId) { HILOG_INFO("request MoveMissionToFront, missionId:%{public}d", missionId); CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + CHECK_POINTER_AND_RETURN(iBundleManager_, ERR_NO_INIT); - if (VerifyMissionPermission() == CHECK_PERMISSION_FAILED) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; + if (!CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not system app"); + return CALLER_ISNOT_SYSTEMAPP; } return currentMissionListManager_->MoveMissionToFront(missionId); @@ -1526,10 +1546,11 @@ int AbilityManagerService::MoveMissionToFront(int32_t missionId, const StartOpti { HILOG_INFO("request MoveMissionToFront, missionId:%{public}d", missionId); CHECK_POINTER_AND_RETURN(currentMissionListManager_, ERR_NO_INIT); + CHECK_POINTER_AND_RETURN(iBundleManager_, ERR_NO_INIT); - if (VerifyMissionPermission() == CHECK_PERMISSION_FAILED) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; + if (!CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not system app"); + return CALLER_ISNOT_SYSTEMAPP; } auto options = std::make_shared(startOptions); @@ -1954,6 +1975,7 @@ void AbilityManagerService::DataDumpSysStateInner( void AbilityManagerService::SystemDumpSysStateInner( const std::string& args, std::vector& info, bool isClient, bool isUserID, int userId) { + systemAppManager_->DumpSysState(info, isClient); } void AbilityManagerService::DumpInner(const std::string &args, std::vector &info) @@ -2094,6 +2116,7 @@ void AbilityManagerService::DataDumpStateInner(const std::string &args, std::vec void AbilityManagerService::SystemDumpStateInner(const std::string &args, std::vector &info) { + systemAppManager_->DumpState(info); } void AbilityManagerService::DumpState(const std::string &args, std::vector &info) @@ -2189,6 +2212,9 @@ int AbilityManagerService::AbilityTransitionDone(const sptr &toke } return missionListManager->AbilityTransactionDone(token, state, saveData); } else { + if (IsSystemUiApp(abilityInfo)) { + return systemAppManager_->AbilityTransitionDone(token, state); + } auto stackManager = GetStackManagerByUserId(userId); if (!stackManager) { HILOG_ERROR("stackManager is nullptr. userId=%{public}d", userId); @@ -2329,6 +2355,10 @@ void AbilityManagerService::OnAbilityRequestDone(const sptr &toke } missionListManager->OnAbilityRequestDone(token, state); } else { + if (IsSystemUiApp(abilityRecord->GetAbilityInfo())) { + systemAppManager_->OnAbilityRequestDone(token, state); + break; + } auto stackManager = GetStackManagerByUserId(userId); if (!stackManager) { HILOG_ERROR("stackManager is nullptr. userId=%{public}d", userId); @@ -2349,6 +2379,7 @@ void AbilityManagerService::OnAppStateChanged(const AppInfo &info) currentMissionListManager_->OnAppStateChanged(info); } else { currentStackManager_->OnAppStateChanged(info); + systemAppManager_->OnAppStateChanged(info); } dataAbilityManager_->OnAppStateChanged(info); } @@ -2661,6 +2692,11 @@ void AbilityManagerService::OnAbilityDied(std::shared_ptr ability return; } } else { + if (systemAppManager_ && abilityRecord->IsKernalSystemAbility()) { + systemAppManager_->OnAbilityDied(abilityRecord); + return; + } + auto manager = GetStackManagerByToken(abilityRecord->GetToken()); if (manager) { manager->OnAbilityDied(abilityRecord); @@ -2703,6 +2739,11 @@ bool AbilityManagerService::IsUseNewMission() int AbilityManagerService::KillProcess(const std::string &bundleName) { HILOG_DEBUG("Kill process, bundleName: %{public}s", bundleName.c_str()); + if (!CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not systemApp"); + return CALLER_ISNOT_SYSTEMAPP; + } + auto bms = GetBundleManager(); CHECK_POINTER_AND_RETURN(bms, KILL_PROCESS_FAILED); int32_t userId = GetUserId(); @@ -2727,6 +2768,10 @@ int AbilityManagerService::KillProcess(const std::string &bundleName) int AbilityManagerService::ClearUpApplicationData(const std::string &bundleName) { HILOG_DEBUG("ClearUpApplicationData, bundleName: %{public}s", bundleName.c_str()); + if (!CheckCallerIsSystemAppByIpc()) { + HILOG_ERROR("caller is not systemApp"); + return CALLER_ISNOT_SYSTEMAPP; + } int ret = DelayedSingleton::GetInstance()->ClearUpApplicationData(bundleName); if (ret != ERR_OK) { return CLEAR_APPLICATION_DATA_FAIL; @@ -2737,13 +2782,6 @@ int AbilityManagerService::ClearUpApplicationData(const std::string &bundleName) int AbilityManagerService::UninstallApp(const std::string &bundleName) { HILOG_DEBUG("Uninstall app, bundleName: %{public}s", bundleName.c_str()); - pid_t callingPid = IPCSkeleton::GetCallingPid(); - pid_t pid = getpid(); - if (callingPid != pid) { - HILOG_ERROR("%{public}s: Not bundleMgr call.", __func__); - return CHECK_PERMISSION_FAILED; - } - CHECK_POINTER_AND_RETURN(currentStackManager_, ERR_NO_INIT); currentStackManager_->UninstallApp(bundleName); CHECK_POINTER_AND_RETURN(pendingWantManager_, ERR_NO_INIT); @@ -2847,6 +2885,9 @@ void AbilityManagerService::HandleLoadTimeOut(int64_t eventId) } } } else { + if (systemAppManager_) { + systemAppManager_->OnTimeOut(AbilityManagerService::LOAD_TIMEOUT_MSG, eventId); + } for (auto& item : stackManagers_) { if (item.second) { item.second->OnTimeOut(AbilityManagerService::LOAD_TIMEOUT_MSG, eventId); @@ -2866,6 +2907,9 @@ void AbilityManagerService::HandleActiveTimeOut(int64_t eventId) } } } else { + if (systemAppManager_) { + systemAppManager_->OnTimeOut(AbilityManagerService::ACTIVE_TIMEOUT_MSG, eventId); + } for (auto& item : stackManagers_) { if (item.second) { item.second->OnTimeOut(AbilityManagerService::ACTIVE_TIMEOUT_MSG, eventId); @@ -2902,6 +2946,9 @@ void AbilityManagerService::HandleForegroundNewTimeOut(int64_t eventId) } } } else { + if (systemAppManager_) { + systemAppManager_->OnTimeOut(AbilityManagerService::FOREGROUNDNEW_TIMEOUT_MSG, eventId); + } for (auto& item : stackManagers_) { if (item.second) { item.second->OnTimeOut(AbilityManagerService::FOREGROUNDNEW_TIMEOUT_MSG, eventId); @@ -2920,6 +2967,9 @@ void AbilityManagerService::HandleBackgroundNewTimeOut(int64_t eventId) } } } else { + if (systemAppManager_) { + systemAppManager_->OnTimeOut(AbilityManagerService::BACKGROUNDNEW_TIMEOUT_MSG, eventId); + } for (auto& item : stackManagers_) { if (item.second) { item.second->OnTimeOut(AbilityManagerService::BACKGROUNDNEW_TIMEOUT_MSG, eventId); @@ -2934,6 +2984,7 @@ bool AbilityManagerService::VerificationToken(const sptr &token) CHECK_POINTER_RETURN_BOOL(dataAbilityManager_); CHECK_POINTER_RETURN_BOOL(connectManager_); CHECK_POINTER_RETURN_BOOL(currentStackManager_); + CHECK_POINTER_RETURN_BOOL(systemAppManager_); CHECK_POINTER_RETURN_BOOL(currentMissionListManager_); if (useNewMission_) { @@ -2961,6 +3012,12 @@ bool AbilityManagerService::VerificationToken(const sptr &token) return true; } + if (!useNewMission_) { + if (systemAppManager_->GetAbilityRecordByToken(token)) { + return true; + } + } + HILOG_ERROR("Failed to verify token."); return false; } @@ -3003,6 +3060,12 @@ bool AbilityManagerService::VerificationAllToken(const sptr &toke } } + if (!useNewMission_) { + if (systemAppManager_->GetAbilityRecordByToken(token)) { + return true; + } + } + HILOG_ERROR("Failed to verify all token."); return false; } @@ -3257,6 +3320,7 @@ void AbilityManagerService::RestartAbility(const sptr &token) { HILOG_INFO("%{public}s called", __func__); CHECK_POINTER(currentStackManager_); + CHECK_POINTER(systemAppManager_); if (!VerificationAllToken(token)) { return; } @@ -3613,12 +3677,6 @@ int AbilityManagerService::SetMissionLabel(const sptr &token, con int AbilityManagerService::StartUser(int userId) { HILOG_DEBUG("%{public}s, userId:%{public}d", __func__, userId); - auto isSaCall = AAFwk::PermissionVerification::GetInstance()->IsSACall(); - if (!isSaCall) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; - } - if (userController_) { return userController_->StartUser(userId, true); } @@ -3628,12 +3686,6 @@ int AbilityManagerService::StartUser(int userId) int AbilityManagerService::StopUser(int userId, const sptr &callback) { HILOG_DEBUG("%{public}s", __func__); - auto isSaCall = AAFwk::PermissionVerification::GetInstance()->IsSACall(); - if (!isSaCall) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; - } - auto ret = -1; if (userController_) { ret = userController_->StopUser(userId); @@ -3659,15 +3711,27 @@ void AbilityManagerService::OnStartSpecifiedAbilityTimeoutResponse(const AAFwk:: { return; } - int AbilityManagerService::GetAbilityRunningInfos(std::vector &info) { HILOG_DEBUG("Get running ability infos."); - auto isPerm = AAFwk::PermissionVerification::GetInstance()->VerifyRunningInfoPerm(); + auto bundleMgr = GetBundleManager(); + if (!bundleMgr) { + HILOG_ERROR("bundleMgr is nullptr."); + return INNER_ERR; + } - currentMissionListManager_->GetAbilityRunningInfos(info, isPerm); - connectManager_->GetAbilityRunningInfos(info, isPerm); - dataAbilityManager_->GetAbilityRunningInfos(info, isPerm); + auto callerUid = IPCSkeleton::GetCallingUid(); + auto isSystem = bundleMgr->CheckIsSystemAppByUid(callerUid); + HILOG_DEBUG("callerUid : %{public}d, isSystem : %{public}d", callerUid, static_cast(isSystem)); + + if (!isSystem) { + HILOG_ERROR("callar is not system app."); + return INNER_ERR; + } + + currentMissionListManager_->GetAbilityRunningInfos(info); + connectManager_->GetAbilityRunningInfos(info); + dataAbilityManager_->GetAbilityRunningInfos(info); return ERR_OK; } @@ -3675,9 +3739,22 @@ int AbilityManagerService::GetAbilityRunningInfos(std::vector &info) { HILOG_DEBUG("Get extension infos, upperLimit : %{public}d", upperLimit); - auto isPerm = AAFwk::PermissionVerification::GetInstance()->VerifyRunningInfoPerm(); + auto bundleMgr = GetBundleManager(); + if (!bundleMgr) { + HILOG_ERROR("bundleMgr is nullptr."); + return INNER_ERR; + } + + auto callerUid = IPCSkeleton::GetCallingUid(); + auto isSystem = bundleMgr->CheckIsSystemAppByUid(callerUid); + HILOG_DEBUG("callerUid : %{public}d, isSystem : %{public}d", callerUid, static_cast(isSystem)); + + if (!isSystem) { + HILOG_ERROR("callar is not system app."); + return INNER_ERR; + } - connectManager_->GetExtensionRunningInfos(upperLimit, info, GetUserId(), isPerm); + connectManager_->GetExtensionRunningInfos(upperLimit, info, GetUserId()); return ERR_OK; } @@ -3703,12 +3780,6 @@ void AbilityManagerService::ClearUserData(int32_t userId) int AbilityManagerService::RegisterSnapshotHandler(const sptr& handler) { - auto isSaCall = AAFwk::PermissionVerification::GetInstance()->IsSACall(); - if (!isSaCall) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return 0; - } - if (!currentMissionListManager_) { HILOG_ERROR("snapshot: currentMissionListManager_ is nullptr."); return INNER_ERR; @@ -3721,11 +3792,6 @@ int AbilityManagerService::RegisterSnapshotHandler(const sptr& int32_t AbilityManagerService::GetMissionSnapshot(const std::string& deviceId, int32_t missionId, MissionSnapshot& missionSnapshot) { - if (VerifyMissionPermission() == CHECK_PERMISSION_FAILED) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; - } - if (CheckIsRemote(deviceId)) { HILOG_INFO("get remote mission snapshot."); return GetRemoteMissionSnapshotInfo(deviceId, missionId, missionSnapshot); @@ -3987,12 +4053,6 @@ int AbilityManagerService::SetAbilityController(const sptr & int AbilityManagerService::SendANRProcessID(int pid) { - auto isSaCall = AAFwk::PermissionVerification::GetInstance()->IsSACall(); - if (!isSaCall) { - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; - } - int anrTimeOut = amsConfigResolver_->GetANRTimeOutTime(); auto timeoutTask = [pid]() { if (kill(pid, SIGKILL) != ERR_OK) { @@ -4502,57 +4562,5 @@ void AbilityManagerService::StartupResidentProcess() DelayedSingleton::GetInstance()->StartupResidentProcess(); } - -int AbilityManagerService::VerifyMissionPermission() -{ - auto isSaCall = AAFwk::PermissionVerification::GetInstance()->IsSACall(); - if (isSaCall) { - return ERR_OK; - } - auto isCallingPerm = AAFwk::PermissionVerification::GetInstance()->VerifyCallingPermission( - PermissionConstants::PERMISSION_MANAGE_MISSION); - if (isCallingPerm) { - HILOG_DEBUG("%{public}s: Permission verification succeeded.", __func__); - return ERR_OK; - } - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; -} - -void AbilityManagerService::GetAbilityRunningInfo(std::vector &info, - std::shared_ptr &abilityRecord) -{ - AbilityRunningInfo runningInfo; - AppExecFwk::RunningProcessInfo processInfo; - - runningInfo.ability = abilityRecord->GetWant().GetElement(); - runningInfo.startTime = abilityRecord->GetStartTime(); - runningInfo.abilityState = static_cast(abilityRecord->GetAbilityState()); - - DelayedSingleton::GetInstance()-> - GetRunningProcessInfoByToken(abilityRecord->GetToken(), processInfo); - runningInfo.pid = processInfo.pid_; - runningInfo.uid = processInfo.uid_; - runningInfo.processName = processInfo.processName_; - info.emplace_back(runningInfo); -} - -int AbilityManagerService::VerifyAccountPermission(int32_t userId) -{ - if ((userId < 0) || (userController_ && (userController_->GetCurrentUserId() == userId))) { - return ERR_OK; - } - auto isSaCall = AAFwk::PermissionVerification::GetInstance()->IsSACall(); - if (isSaCall) { - return ERR_OK; - } - auto isCallingPerm = AAFwk::PermissionVerification::GetInstance()->VerifyCallingPermission( - PermissionConstants::PERMISSION_INTERACT_ACROSS_LOCAL_ACCOUNTS); - if (isCallingPerm) { - return ERR_OK; - } - HILOG_ERROR("%{public}s: Permission verification failed", __func__); - return CHECK_PERMISSION_FAILED; -} } // namespace AAFwk } // namespace OHOS diff --git a/services/abilitymgr/src/data_ability_manager.cpp b/services/abilitymgr/src/data_ability_manager.cpp index 42df78a47da..898ecdb4269 100644 --- a/services/abilitymgr/src/data_ability_manager.cpp +++ b/services/abilitymgr/src/data_ability_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,7 +18,6 @@ #include #include -#include "ability_manager_service.h" #include "ability_util.h" #include "hilog_wrapper.h" @@ -556,12 +555,12 @@ void DataAbilityManager::DumpSysState(std::vector &info, bool isCli return; } -void DataAbilityManager::GetAbilityRunningInfos(std::vector &info, bool isPerm) +void DataAbilityManager::GetAbilityRunningInfos(std::vector &info) { HILOG_INFO("Get ability running infos"); std::lock_guard locker(mutex_); - auto queryInfo = [&info, isPerm](DataAbilityRecordPtrMap::reference data) { + auto queryInfo = [&info](DataAbilityRecordPtrMap::reference data) { auto dataAbilityRecord = data.second; if (!dataAbilityRecord) { return; @@ -572,15 +571,17 @@ void DataAbilityManager::GetAbilityRunningInfos(std::vector return; } - if (isPerm) { - DelayedSingleton::GetInstance()->GetAbilityRunningInfo(info, abilityRecord); - } else { - auto callingTokenId = IPCSkeleton::GetCallingTokenID(); - auto tokenID = abilityRecord->GetApplicationInfo().accessTokenId; - if (callingTokenId == tokenID) { - DelayedSingleton::GetInstance()->GetAbilityRunningInfo(info, abilityRecord); - } - } + AbilityRunningInfo runningInfo; + AppExecFwk::RunningProcessInfo processInfo; + runningInfo.ability = abilityRecord->GetWant().GetElement(); + DelayedSingleton::GetInstance()-> + GetRunningProcessInfoByToken(abilityRecord->GetToken(), processInfo); + runningInfo.pid = processInfo.pid_; + runningInfo.uid = processInfo.uid_; + runningInfo.processName = processInfo.processName_; + runningInfo.startTime = abilityRecord->GetStartTime(); + runningInfo.abilityState = static_cast(abilityRecord->GetAbilityState()); + info.emplace_back(runningInfo); }; std::for_each(dataAbilityRecordsLoading_.begin(), dataAbilityRecordsLoading_.end(), queryInfo); diff --git a/services/abilitymgr/src/kernal_system_app_manager.cpp b/services/abilitymgr/src/kernal_system_app_manager.cpp new file mode 100644 index 00000000000..76ab01a7c45 --- /dev/null +++ b/services/abilitymgr/src/kernal_system_app_manager.cpp @@ -0,0 +1,408 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "kernal_system_app_manager.h" + +#include "ability_manager_errors.h" +#include "ability_manager_service.h" +#include "ability_util.h" +#include "app_scheduler.h" +#include "bytrace.h" +#include "hilog_wrapper.h" + +namespace OHOS { +namespace AAFwk { +KernalSystemAppManager::KernalSystemAppManager(int userId) : userId_(userId) +{} + +KernalSystemAppManager::~KernalSystemAppManager() +{} + +int KernalSystemAppManager::StartAbility(const AbilityRequest &abilityRequest) +{ + BYTRACE_NAME(BYTRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); + HILOG_INFO("start kernal systerm ability."); + std::lock_guard guard(stackLock_); + if (!waittingAbilityQueue_.empty()) { + HILOG_INFO("waiting queue is not empty, so enqueue systerm ui ability for waiting."); + EnqueueWaittingAbility(abilityRequest); + return START_ABILITY_WAITING; + } + + std::shared_ptr topAbilityRecord = GetCurrentTopAbility(); + auto requestFlag = GetFlagOfAbility(abilityRequest.abilityInfo.bundleName, abilityRequest.abilityInfo.name); + if (topAbilityRecord != nullptr) { + auto topFlag = + GetFlagOfAbility(topAbilityRecord->GetAbilityInfo().bundleName, topAbilityRecord->GetAbilityInfo().name); + if (topFlag == requestFlag && topAbilityRecord->GetAbilityState() == INITIAL) { + HILOG_INFO("top systerm ui ability need to restart."); + } + if (topAbilityRecord->GetAbilityState() == ACTIVATING) { + HILOG_INFO("top systerm ui ability is not active, so enqueue ability for waiting."); + EnqueueWaittingAbility(abilityRequest); + return START_ABILITY_WAITING; + } + } + + return StartAbilityLocked(abilityRequest); +} + +int KernalSystemAppManager::StartAbilityLocked(const AbilityRequest &abilityRequest) +{ + std::shared_ptr targetAbility; + GetOrCreateAbilityRecord(abilityRequest, targetAbility); + CHECK_POINTER_AND_RETURN(targetAbility, ERR_INVALID_VALUE); + targetAbility->SetKernalSystemAbility(); + + HILOG_INFO("Load kernal system ability, bundleName:%{public}s , abilityName:%{public}s", + abilityRequest.abilityInfo.bundleName.c_str(), + abilityRequest.abilityInfo.name.c_str()); + + if (targetAbility->IsAbilityState(AbilityState::ACTIVE) || + targetAbility->IsAbilityState(AbilityState::ACTIVATING)) { + HILOG_INFO("kernal system ability is already activing or activated."); + targetAbility->Activate(); + return ERR_OK; + } + return targetAbility->LoadAbility(); +} + +int KernalSystemAppManager::AttachAbilityThread( + const sptr &scheduler, const sptr &token) +{ + HILOG_INFO("Attach ability thread."); + std::lock_guard guard(stackLock_); + auto abilityRecord = GetAbilityRecordByToken(token); + CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); + + std::string flag = KernalSystemAppManager::GetFlagOfAbility( + abilityRecord->GetAbilityInfo().bundleName, abilityRecord->GetAbilityInfo().name); + HILOG_INFO("ability: %{public}s", flag.c_str()); + + auto handler = DelayedSingleton::GetInstance()->GetEventHandler(); + CHECK_POINTER_AND_RETURN(handler, ERR_INVALID_VALUE); + + handler->RemoveEvent(AbilityManagerService::LOAD_TIMEOUT_MSG, abilityRecord->GetEventId()); + + abilityRecord->SetScheduler(scheduler); + DelayedSingleton::GetInstance()->MoveToForground(token); + + return ERR_OK; +} + +void KernalSystemAppManager::OnAbilityRequestDone(const sptr &token, const int32_t state) +{ + HILOG_INFO("On ability request done."); + std::lock_guard guard(stackLock_); + AppAbilityState abilitState = DelayedSingleton::GetInstance()->ConvertToAppAbilityState(state); + if (abilitState == AppAbilityState::ABILITY_STATE_FOREGROUND) { + auto abilityRecord = GetAbilityRecordByToken(token); + CHECK_POINTER(abilityRecord); + abilityRecord->Activate(); + } +} + +void KernalSystemAppManager::OnAppStateChanged(const AppInfo &info) +{ + std::lock_guard guard(stackLock_); + for (auto ability : abilities_) { + if (ability && (info.processName == ability->GetAbilityInfo().process || + info.processName == ability->GetApplicationInfo().bundleName)) { + auto appName = ability->GetApplicationInfo().name; + auto isExist = [&appName](const AppData &appData) { + return appData.appName == appName; + }; + auto iter = std::find_if(info.appData.begin(), info.appData.end(), isExist); + if (iter != info.appData.end()) { + ability->SetAppState(info.state); + } + } + } +} + +int KernalSystemAppManager::AbilityTransitionDone(const sptr &token, int state) +{ + HILOG_INFO("Ability transition done."); + std::lock_guard guard(stackLock_); + auto abilityRecord = GetAbilityRecordByToken(token); + CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); + + std::string flag = KernalSystemAppManager::GetFlagOfAbility( + abilityRecord->GetAbilityInfo().bundleName, abilityRecord->GetAbilityInfo().name); + int targetState = AbilityRecord::ConvertLifeCycleToAbilityState(static_cast(state)); + std::string abilityState = AbilityRecord::ConvertAbilityState(static_cast(targetState)); + HILOG_INFO("ability: %{public}s, state: %{public}s", flag.c_str(), abilityState.c_str()); + + switch (targetState) { + case AbilityState::ACTIVE: { + return DispatchActive(abilityRecord, targetState); + } + default: { + HILOG_WARN("don't support transiting state: %d", targetState); + return ERR_INVALID_VALUE; + } + } +} + +int KernalSystemAppManager::DispatchActive(const std::shared_ptr &abilityRecord, int state) +{ + auto handler = DelayedSingleton::GetInstance()->GetEventHandler(); + CHECK_POINTER_AND_RETURN(handler, ERR_INVALID_VALUE); + CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); + + if (!abilityRecord->IsAbilityState(AbilityState::ACTIVATING)) { + HILOG_ERROR("kernal ability transition life state error. start:%{public}d", state); + return ERR_INVALID_VALUE; + } + handler->RemoveEvent(AbilityManagerService::ACTIVE_TIMEOUT_MSG, abilityRecord->GetEventId()); + + auto task = [weak = weak_from_this(), abilityRecord]() { + auto kernalManager = weak.lock(); + if (kernalManager == nullptr) { + HILOG_ERROR("kernalManager is null, CompleteActive failed"); + return; + } + kernalManager->CompleteActive(abilityRecord); + }; + handler->PostTask(task); + return ERR_OK; +} + +void KernalSystemAppManager::CompleteActive(const std::shared_ptr &abilityRecord) +{ + HILOG_INFO("Complete active."); + std::lock_guard guard(stackLock_); + abilityRecord->SetAbilityState(AbilityState::ACTIVE); + + auto handler = DelayedSingleton::GetInstance()->GetEventHandler(); + CHECK_POINTER(handler); + + auto task = [weak = weak_from_this()]() { + auto kernalManager = weak.lock(); + if (kernalManager == nullptr) { + HILOG_ERROR("kernalManager is null, DequeueWaittingAbility failed"); + return; + } + kernalManager->DequeueWaittingAbility(); + }; + handler->PostTask(task, "DequeueWaittingAbility"); +} + +void KernalSystemAppManager::GetOrCreateAbilityRecord( + const AbilityRequest &abilityRequest, std::shared_ptr &targetAbility) +{ + std::string abilityFlag = KernalSystemAppManager::GetFlagOfAbility( + abilityRequest.abilityInfo.bundleName, abilityRequest.abilityInfo.name); + auto isExist = [targetFlag = abilityFlag](const std::shared_ptr &ability) { + if (ability == nullptr) { + return false; + } + return KernalSystemAppManager::GetFlagOfAbility( + ability->GetAbilityInfo().bundleName, + ability->GetAbilityInfo().name) == targetFlag; + }; + auto iter = std::find_if(abilities_.begin(), abilities_.end(), isExist); + if (iter != abilities_.end()) { + targetAbility = *iter; + targetAbility->SetWant(abilityRequest.want); + targetAbility->SetIsNewWant(true); + return; + } + targetAbility = AbilityRecord::CreateAbilityRecord(abilityRequest); + abilities_.push_front(targetAbility); +} + +std::string KernalSystemAppManager::GetFlagOfAbility(const std::string &bundleName, const std::string &abilityName) +{ + return bundleName + ":" + abilityName; +} + +int KernalSystemAppManager::GetManagerUserId() const +{ + return userId_; +} + +std::shared_ptr KernalSystemAppManager::GetCurrentTopAbility() const +{ + if (abilities_.empty()) { + return nullptr; + } + return abilities_.front(); +} + +std::shared_ptr KernalSystemAppManager::GetAbilityRecordByToken(const sptr &token) +{ + std::lock_guard guard(stackLock_); + auto abilityToFind = Token::GetAbilityRecordByToken(token); + CHECK_POINTER_AND_RETURN(abilityToFind, nullptr); + + auto isExist = [targetAbility = abilityToFind](const std::shared_ptr &ability) { + if (ability == nullptr) { + return false; + } + return targetAbility == ability; + }; + auto iter = std::find_if(abilities_.begin(), abilities_.end(), isExist); + if (iter != abilities_.end()) { + return *iter; + } + + return nullptr; +} + +std::shared_ptr KernalSystemAppManager::GetAbilityRecordByEventId(const int64_t eventId) const +{ + auto isExist = [targetEventId = eventId](const std::shared_ptr &ability) { + if (ability == nullptr) { + return false; + } + return (ability->GetEventId() == targetEventId); + }; + auto iter = std::find_if(abilities_.begin(), abilities_.end(), isExist); + if (iter != abilities_.end()) { + return *iter; + } + return nullptr; +} + +bool KernalSystemAppManager::RemoveAbilityRecord(std::shared_ptr ability) +{ + CHECK_POINTER_RETURN_BOOL(ability); + for (auto iter = abilities_.begin(); iter != abilities_.end(); iter++) { + if ((*iter) == ability) { + abilities_.erase(iter); + return true; + } + } + HILOG_ERROR("can not find ability"); + return false; +} + +void KernalSystemAppManager::EnqueueWaittingAbility(const AbilityRequest &abilityRequest) +{ + waittingAbilityQueue_.push(abilityRequest); + return; +} + +void KernalSystemAppManager::DequeueWaittingAbility() +{ + std::lock_guard guard(stackLock_); + std::shared_ptr topAbility = GetCurrentTopAbility(); + if (topAbility != nullptr && topAbility->GetAbilityState() != ACTIVE) { + HILOG_INFO("top ability is not active, must return for waiting again"); + return; + } + if (!waittingAbilityQueue_.empty()) { + AbilityRequest abilityRequest = waittingAbilityQueue_.front(); + waittingAbilityQueue_.pop(); + HILOG_INFO("bundleName: %{public}s, abilityName: %{public}s", + abilityRequest.abilityInfo.bundleName.c_str(), + abilityRequest.abilityInfo.name.c_str()); + + StartAbilityLocked(abilityRequest); + } +} +void KernalSystemAppManager::DumpState(std::vector &info) +{ + info.emplace_back("SystemUIRecords:"); + for (auto &ability : abilities_) { + ability->Dump(info); + } +} +void KernalSystemAppManager::DumpSysState(std::vector &info, bool isClient) +{ + info.emplace_back("SystemUIRecords:"); + for (auto &ability : abilities_) { + ability->DumpSys(info, isClient); + } +} + +void KernalSystemAppManager::OnAbilityDied(std::shared_ptr abilityRecord) +{ + std::lock_guard guard(stackLock_); + CHECK_POINTER(abilityRecord); + if (!abilityRecord->IsKernalSystemAbility()) { + HILOG_ERROR("System UI on scheduler died, ability type is not system ui"); + return; + } + + if (GetAbilityRecordByToken(abilityRecord->GetToken()) == nullptr) { + HILOG_ERROR("System UI on scheduler died, record is not exist."); + return; + } + auto abilityms = DelayedSingleton::GetInstance(); + CHECK_POINTER(abilityms); + + auto handler = abilityms->GetEventHandler(); + CHECK_POINTER(handler); + + HILOG_INFO("System UI on scheduler died: '%{public}s'", abilityRecord->GetAbilityInfo().name.c_str()); + std::string name = abilityRecord->GetAbilityInfo().name; + abilityRecord->SetAbilityState(AbilityState::INITIAL); + auto timeoutTask = [abilityms, abilityRecord]() { + if (abilityRecord) { + abilityms->StartingSystemUiAbility(); + } + }; + handler->PostTask(timeoutTask, "SystemUi_Die_" + name, AbilityManagerService::RESTART_TIMEOUT); +} +void KernalSystemAppManager::OnTimeOut(uint32_t msgId, int64_t eventId) +{ + std::lock_guard guard(stackLock_); + if (abilities_.empty()) { + HILOG_ERROR("System UI on time out event: ability stack is empty."); + return; + } + + auto abilityRecord = GetAbilityRecordByEventId(eventId); + CHECK_POINTER(abilityRecord); + + auto abilityMS = DelayedSingleton::GetInstance(); + CHECK_POINTER(abilityMS); + + auto handler = abilityMS->GetEventHandler(); + CHECK_POINTER(handler); + + switch (msgId) { + case AbilityManagerService::LOAD_TIMEOUT_MSG: + case AbilityManagerService::ACTIVE_TIMEOUT_MSG: { + std::string bundleName = abilityRecord->GetAbilityInfo().bundleName; + std::string name = abilityRecord->GetAbilityInfo().name; + RemoveAbilityRecord(abilityRecord); + auto task = [abilityMS, bundleName]() { + abilityMS->KillProcess(bundleName); + HILOG_ERROR("System UI on time out event: KillProcess:%{public}s", bundleName.c_str()); + }; + handler->PostTask(task); + auto timeoutTask = [abilityMS, name]() { + abilityMS->StartingSystemUiAbility(); + HILOG_ERROR("System UI on time out event: restart:%{public}s", name.c_str()); + }; + handler->PostTask(timeoutTask, "SystemUi_Timeout_" + name, AbilityManagerService::RESTART_TIMEOUT); + break; + } + default: + break; + } +} + +void KernalSystemAppManager::RestartAbility(const std::shared_ptr abilityRecord) +{ + CHECK_POINTER(abilityRecord); + HILOG_DEBUG("Restart ability system ui. %{public}s", abilityRecord->GetAbilityInfo().name.c_str()); + return; +} +} // namespace AAFwk +} // namespace OHOS \ No newline at end of file diff --git a/services/abilitymgr/src/mission_list_manager.cpp b/services/abilitymgr/src/mission_list_manager.cpp index 0883b317598..bbfb8d8c588 100644 --- a/services/abilitymgr/src/mission_list_manager.cpp +++ b/services/abilitymgr/src/mission_list_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -2130,11 +2130,11 @@ bool MissionListManager::GetMissionSnapshot(int32_t missionId, const sptr &info, bool isPerm) +void MissionListManager::GetAbilityRunningInfos(std::vector &info) { std::lock_guard guard(managerLock_); - auto func = [&info, isPerm](const std::shared_ptr &mission) { + auto func = [&info](const std::shared_ptr &mission) { if (!mission) { return; } @@ -2144,15 +2144,19 @@ void MissionListManager::GetAbilityRunningInfos(std::vector return; } - if (isPerm) { - DelayedSingleton::GetInstance()->GetAbilityRunningInfo(info, ability); - } else { - auto callingTokenId = IPCSkeleton::GetCallingTokenID(); - auto tokenID = ability->GetApplicationInfo().accessTokenId; - if (callingTokenId == tokenID) { - DelayedSingleton::GetInstance()->GetAbilityRunningInfo(info, ability); - } - } + AbilityRunningInfo runningInfo; + AppExecFwk::RunningProcessInfo processInfo; + + runningInfo.ability = ability->GetWant().GetElement(); + runningInfo.startTime = ability->GetStartTime(); + runningInfo.abilityState = static_cast(ability->GetAbilityState()); + + DelayedSingleton::GetInstance()-> + GetRunningProcessInfoByToken(ability->GetToken(), processInfo); + runningInfo.pid = processInfo.pid_; + runningInfo.uid = processInfo.uid_; + runningInfo.processName = processInfo.processName_; + info.emplace_back(runningInfo); }; if (!(defaultStandardList_->GetAllMissions().empty())) { auto list = defaultStandardList_->GetAllMissions(); diff --git a/services/abilitymgr/test/BUILD.gn b/services/abilitymgr/test/BUILD.gn index f434c2e1399..62275bf0ba3 100644 --- a/services/abilitymgr/test/BUILD.gn +++ b/services/abilitymgr/test/BUILD.gn @@ -43,6 +43,7 @@ ohos_source_set("abilityms_test_source") { "${services_path}/abilitymgr/src/data_ability_record.cpp", "${services_path}/abilitymgr/src/image_info.cpp", "${services_path}/abilitymgr/src/inner_mission_info.cpp", + "${services_path}/abilitymgr/src/kernal_system_app_manager.cpp", "${services_path}/abilitymgr/src/launch_param.cpp", "${services_path}/abilitymgr/src/lifecycle_deal.cpp", "${services_path}/abilitymgr/src/lifecycle_state_info.cpp", @@ -186,6 +187,7 @@ group("unittest") { "unittest/phone/data_ability_manager_test:unittest", "unittest/phone/data_ability_record_test:unittest", "unittest/phone/info_test:unittest", + "unittest/phone/kernal_system_app_manager_test:unittest", "unittest/phone/lifecycle_deal_test:unittest", "unittest/phone/lifecycle_test:unittest", "unittest/phone/lock_screen_white_list_test:unittest", diff --git a/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/app_mgr_client.cpp b/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/app_mgr_client.cpp index 8b67084fd6b..5166af58d6f 100644 --- a/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/app_mgr_client.cpp +++ b/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/app_mgr_client.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -55,6 +55,11 @@ AppMgrResultCode AppMgrClient::RegisterAppStateCallback(const sptr &token, const sptr &preToken, const int32_t visibility, const int32_t perceptibility, const int32_t connectionState) @@ -87,6 +92,16 @@ AppMgrResultCode AppMgrClient::GetAllRunningProcesses(std::vectorSetStackManager(userId, true); EXPECT_TRUE(g_abilityMs->GetStackManager()); g_abilityMs->stackManagers_.emplace(0, g_abilityMs->GetStackManager()); + g_abilityMs->systemAppManager_ = std::make_shared(userId); + EXPECT_TRUE(g_abilityMs->systemAppManager_); g_abilityMs->eventLoop_->Run(); diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn index bc4eb8244c2..f52e46e79d2 100755 --- a/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -44,7 +44,6 @@ ohos_unittest("ability_manager_proxy_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_service_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_manager_service_test/BUILD.gn index ab7a3c736d9..e57df554d35 100755 --- a/services/abilitymgr/test/unittest/phone/ability_manager_service_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_manager_service_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -44,7 +44,6 @@ ohos_unittest("ability_manager_service_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_service_test/ability_manager_service_test.cpp b/services/abilitymgr/test/unittest/phone/ability_manager_service_test/ability_manager_service_test.cpp index c75b01ef44c..6a0eb76d93e 100644 --- a/services/abilitymgr/test/unittest/phone/ability_manager_service_test/ability_manager_service_test.cpp +++ b/services/abilitymgr/test/unittest/phone/ability_manager_service_test/ability_manager_service_test.cpp @@ -149,6 +149,8 @@ void AbilityManagerServiceTest::OnStartAms() abilityMs_->SetStackManager(userId, true); EXPECT_TRUE(abilityMs_->GetStackManager()); abilityMs_->stackManagers_.emplace(0, abilityMs_->GetStackManager()); + abilityMs_->systemAppManager_ = std::make_shared(userId); + EXPECT_TRUE(abilityMs_->systemAppManager_); abilityMs_->eventLoop_->Run(); return; } @@ -1982,6 +1984,208 @@ HWTEST_F(AbilityManagerServiceTest, systemDialog_002, TestSize.Level1) EXPECT_EQ(MusicAbility->GetAbilityInfo().bundleName, "com.ix.hiMusic"); } +/* + * Feature: AbilityManagerService + * Function: HandleLoadTimeOut + * SubFunction: NA + * FunctionPoints: AbilityManagerService HandleLoadTimeOut + * EnvConditions: NA + * CaseDescription: Verify function HandleLoadTimeOut + * When you start systemui, when HandleLoadTimeOut called, restart systemui + */ +HWTEST_F(AbilityManagerServiceTest, handleloadtimeout_001, TestSize.Level1) +{ + // start SYSTEM_UI_STATUS_BAR when device get up + Want want; + ElementName elementbar("device", AbilityConfig::SYSTEM_UI_BUNDLE_NAME, AbilityConfig::SYSTEM_UI_STATUS_BAR); + want.SetElement(elementbar); + auto result = StartAbility(want); + EXPECT_EQ(OHOS::ERR_OK, result); + + auto stackManager = abilityMs_->systemAppManager_; + auto barAbility = stackManager->GetCurrentTopAbility(); + AbilityRecordInfo barAbilityInfo; + barAbility->GetAbilityRecordInfo(barAbilityInfo); + auto dialogtoken = barAbility->GetToken(); + + OHOS::sptr scheduler = new AbilityScheduler(); + EXPECT_EQ(abilityMs_->AttachAbilityThread(scheduler, dialogtoken), OHOS::ERR_OK); + EXPECT_TRUE(barAbility->GetAbilityInfo().bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + + abilityMs_->HandleLoadTimeOut(barAbility->GetEventId()); + + auto newStackManager = abilityMs_->systemAppManager_; + auto newBarAbility = newStackManager->GetCurrentTopAbility(); + + // Remove Ability Record + EXPECT_FALSE(newBarAbility); +} + +/* + * Feature: AbilityManagerService + * Function: HandleLoadTimeOut + * SubFunction: NA + * FunctionPoints: AbilityManagerService HandleLoadTimeOut + * EnvConditions: NA + * CaseDescription: Verify function HandleLoadTimeOut + * When you start systemui, when HandleLoadTimeOut called, restart systemui + */ +HWTEST_F(AbilityManagerServiceTest, handleloadtimeout_002, TestSize.Level1) +{ + // start SYSTEM_UI_NAVIGATION_BAR when device get up + Want want; + ElementName elementdialog("device", AbilityConfig::SYSTEM_UI_BUNDLE_NAME, AbilityConfig::SYSTEM_UI_NAVIGATION_BAR); + want.SetElement(elementdialog); + auto result = StartAbility(want); + WaitUntilTaskFinished(); + EXPECT_EQ(OHOS::ERR_OK, result); + + auto stackManager = abilityMs_->systemAppManager_; + auto navigationAbility = stackManager->GetCurrentTopAbility(); + auto dialogtoken = navigationAbility->GetToken(); + + OHOS::sptr scheduler = new AbilityScheduler(); + EXPECT_EQ(abilityMs_->AttachAbilityThread(scheduler, dialogtoken), OHOS::ERR_OK); + EXPECT_TRUE(navigationAbility->GetAbilityInfo().bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + + abilityMs_->HandleLoadTimeOut(navigationAbility->GetEventId()); + WaitUntilTaskFinishedByTimer(); + + auto newStackManager = abilityMs_->systemAppManager_; + auto newNavigationAbility = newStackManager->GetCurrentTopAbility(); + EXPECT_TRUE(newNavigationAbility->GetAbilityInfo().bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + EXPECT_NE(navigationAbility, newNavigationAbility); +} + +/* + * Feature: AbilityManagerService + * Function: HandleLoadTimeOut + * SubFunction: NA + * FunctionPoints: AbilityManagerService HandleLoadTimeOut + * EnvConditions: NA + * CaseDescription: Verify function HandleLoadTimeOut + * When you start systemui, when timeout ,the HandleLoadTimeOut called, restart systemui + */ +HWTEST_F(AbilityManagerServiceTest, handleloadtimeout_003, TestSize.Level1) +{ + // start SYSTEM_UI_STATUS_BAR when device get up + Want want; + ElementName elementbar("device", AbilityConfig::SYSTEM_UI_BUNDLE_NAME, AbilityConfig::SYSTEM_UI_STATUS_BAR); + want.SetElement(elementbar); + auto result = StartAbility(want); + EXPECT_EQ(OHOS::ERR_OK, result); + + auto stackManager = abilityMs_->systemAppManager_; + auto barAbility = stackManager->GetCurrentTopAbility(); + AbilityRecordInfo barAbilityInfo; + barAbility->GetAbilityRecordInfo(barAbilityInfo); + EXPECT_TRUE(barAbility->GetAbilityInfo().bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + + abilityMs_->HandleLoadTimeOut(barAbility->GetEventId()); + WaitUntilTaskFinishedByTimer(); + + auto newStackManager = abilityMs_->systemAppManager_; + auto newBarAbility = newStackManager->GetCurrentTopAbility(); + AbilityRecordInfo newAbilityInfo; + newBarAbility->GetAbilityRecordInfo(newAbilityInfo); + EXPECT_TRUE(newBarAbility->GetAbilityInfo().bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + EXPECT_NE(barAbilityInfo.id, newAbilityInfo.id); +} + +/* + * Feature: AbilityManagerService + * Function: HandleLoadTimeOut + * SubFunction: NA + * FunctionPoints: AbilityManagerService HandleLoadTimeOut + * EnvConditions: NA + * CaseDescription: Verify function HandleLoadTimeOut + * When you start systemui, when timeout ,the HandleLoadTimeOut called, restart systemui + */ +HWTEST_F(AbilityManagerServiceTest, handleloadtimeout_004, TestSize.Level1) +{ + // start SYSTEM_UI_NAVIGATION_BAR when device get up + Want want; + ElementName elementbar("device", AbilityConfig::SYSTEM_UI_BUNDLE_NAME, AbilityConfig::SYSTEM_UI_NAVIGATION_BAR); + want.SetElement(elementbar); + auto result = StartAbility(want); + EXPECT_EQ(OHOS::ERR_OK, result); + + auto stackManager = abilityMs_->systemAppManager_; + auto navigationAbility = stackManager->GetCurrentTopAbility(); + EXPECT_TRUE(navigationAbility->GetAbilityInfo().bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + + abilityMs_->HandleLoadTimeOut(navigationAbility->GetEventId()); + WaitUntilTaskFinishedByTimer(); + + auto newStackManager = abilityMs_->systemAppManager_; + auto newNavigationAbility = newStackManager->GetCurrentTopAbility(); + EXPECT_TRUE(newNavigationAbility->GetAbilityInfo().bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + EXPECT_NE(navigationAbility, newNavigationAbility); +} + +/* + * Feature: AbilityManagerService + * Function: HandleLoadTimeOut + * SubFunction: NA + * FunctionPoints: AbilityManagerService HandleLoadTimeOut + * EnvConditions: NA + * CaseDescription: Verify function HandleLoadTimeOut + * When you start systemui, when HandleLoadTimeOut called, restart systemui + */ +HWTEST_F(AbilityManagerServiceTest, handleloadtimeout_005, TestSize.Level1) +{ + // start SYSTEM_UI_STATUS_BAR when device get up + Want want; + ElementName elementbar("device", AbilityConfig::SYSTEM_UI_BUNDLE_NAME, AbilityConfig::SYSTEM_UI_STATUS_BAR); + want.SetElement(elementbar); + auto result = StartAbility(want); + EXPECT_EQ(OHOS::ERR_OK, result); + + auto stackManager = abilityMs_->systemAppManager_; + auto barAbility = stackManager->GetCurrentTopAbility(); + auto bartoken = barAbility->GetToken(); + OHOS::sptr scheduler = new AbilityScheduler(); + EXPECT_EQ(abilityMs_->AttachAbilityThread(scheduler, bartoken), OHOS::ERR_OK); + EXPECT_TRUE(barAbility->GetAbilityInfo().bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + + auto newStackManager = abilityMs_->systemAppManager_; + auto newBarAbility = newStackManager->GetCurrentTopAbility(); + EXPECT_TRUE(newBarAbility->GetAbilityInfo().bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + EXPECT_EQ(barAbility, newBarAbility); +} + +/* + * Feature: AbilityManagerService + * Function: HandleLoadTimeOut + * SubFunction: NA + * FunctionPoints: AbilityManagerService HandleLoadTimeOut + * EnvConditions: NA + * CaseDescription: Verify function HandleLoadTimeOut + * When you start systemui, when HandleLoadTimeOut called, restart systemui + */ +HWTEST_F(AbilityManagerServiceTest, handleloadtimeout_006, TestSize.Level1) +{ + // start SYSTEM_UI_NAVIGATION_BAR when device get up + Want want; + ElementName elementbar("device", AbilityConfig::SYSTEM_UI_BUNDLE_NAME, AbilityConfig::SYSTEM_UI_NAVIGATION_BAR); + want.SetElement(elementbar); + auto result = StartAbility(want); + EXPECT_EQ(OHOS::ERR_OK, result); + + auto stackManager = abilityMs_->systemAppManager_; + auto navigationAbility = stackManager->GetCurrentTopAbility(); + auto navigationtoken = navigationAbility->GetToken(); + OHOS::sptr scheduler = new AbilityScheduler(); + + EXPECT_EQ(abilityMs_->AttachAbilityThread(scheduler, navigationtoken), OHOS::ERR_OK); + EXPECT_TRUE(navigationAbility->GetAbilityInfo().bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + + auto newStackManager = abilityMs_->systemAppManager_; + auto newNavigationAbility = newStackManager->GetCurrentTopAbility(); + EXPECT_TRUE(newNavigationAbility->GetAbilityInfo().bundleName == AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + EXPECT_EQ(navigationAbility, newNavigationAbility); +} + /* * Feature: AbilityManagerService * Function: HandleLoadTimeOut diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn index f4ecbd64c5e..92fbd890229 100755 --- a/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -45,7 +45,6 @@ ohos_unittest("ability_manager_stub_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn index 36e84040fda..0e35f783aa0 100755 --- a/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -43,7 +43,6 @@ ohos_unittest("ability_record_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn index b4c07ed6ccd..02d680eff9a 100755 --- a/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -44,7 +44,6 @@ ohos_unittest("ability_scheduler_proxy_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn index 74b0042fa29..99516fcda77 100755 --- a/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -43,7 +43,6 @@ ohos_unittest("ability_scheduler_stub_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn index a6d878c6301..3448571be2f 100755 --- a/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -44,7 +44,6 @@ ohos_unittest("ability_service_start_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/BUILD.gn index 2df340911a2..8237b903542 100755 --- a/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -45,7 +45,6 @@ ohos_unittest("ability_stack_manager_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", diff --git a/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp b/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp index cc177c0234a..d4a48a6cb73 100644 --- a/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp +++ b/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp @@ -102,6 +102,8 @@ void AbilityStackManagerTest::OnStartabilityMs() int userId = abilityMs_->GetUserId(); abilityMs_->SetStackManager(userId, true); + abilityMs_->systemAppManager_ = std::make_shared(userId); + EXPECT_TRUE(abilityMs_->systemAppManager_); abilityMs_->eventLoop_->Run(); diff --git a/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn index cae5d4e5979..d494af6662b 100755 --- a/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -43,7 +43,6 @@ ohos_unittest("ability_token_proxy_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn index 39f371c0d49..0938daba97e 100755 --- a/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -43,7 +43,6 @@ ohos_unittest("ability_token_stub_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/ability_with_applications_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_with_applications_test/BUILD.gn index 323939e7dfb..960e6bc85b4 100755 --- a/services/abilitymgr/test/unittest/phone/ability_with_applications_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/ability_with_applications_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -45,7 +45,6 @@ ohos_unittest("ability_with_applications_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", diff --git a/services/abilitymgr/test/unittest/phone/ability_with_applications_test/ability_with_applications_test.cpp b/services/abilitymgr/test/unittest/phone/ability_with_applications_test/ability_with_applications_test.cpp index 3832cc4892c..8f43d105079 100644 --- a/services/abilitymgr/test/unittest/phone/ability_with_applications_test/ability_with_applications_test.cpp +++ b/services/abilitymgr/test/unittest/phone/ability_with_applications_test/ability_with_applications_test.cpp @@ -116,6 +116,8 @@ void AbilityWithApplicationsTest::OnStartabilityAms() int userId = abilityMs_->GetUserId(); abilityMs_->SetStackManager(userId, true); + abilityMs_->systemAppManager_ = std::make_shared(userId); + EXPECT_TRUE(abilityMs_->systemAppManager_); abilityMs_->eventLoop_->Run(); diff --git a/services/abilitymgr/test/unittest/phone/abilityms_appms_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/abilityms_appms_test/BUILD.gn index 0e61c748a6c..404a2f9920b 100755 --- a/services/abilitymgr/test/unittest/phone/abilityms_appms_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/abilityms_appms_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -45,7 +45,6 @@ ohos_unittest("abilityms_appms_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", diff --git a/services/abilitymgr/test/unittest/phone/abilityms_appms_test/abilityms_appms_test.cpp b/services/abilitymgr/test/unittest/phone/abilityms_appms_test/abilityms_appms_test.cpp index 920430901c3..a529e853178 100644 --- a/services/abilitymgr/test/unittest/phone/abilityms_appms_test/abilityms_appms_test.cpp +++ b/services/abilitymgr/test/unittest/phone/abilityms_appms_test/abilityms_appms_test.cpp @@ -122,6 +122,8 @@ void AbilityMsAppmsTest::OnStartabilityAms() int userId = abilityMs_->GetUserId(); abilityMs_->SetStackManager(userId, true); + abilityMs_->systemAppManager_ = std::make_shared(userId); + EXPECT_TRUE(abilityMs_->systemAppManager_); abilityMs_->eventLoop_->Run(); diff --git a/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn index 1389f55322e..1c807996239 100755 --- a/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -45,7 +45,6 @@ ohos_unittest("app_scheduler_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", diff --git a/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn index 3ca2e5d755a..5550f0a415d 100755 --- a/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -45,7 +45,6 @@ ohos_unittest("configuration_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/interfaces/innerkits/base:base", diff --git a/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn index 1f24c5e8acc..5d93f1f55a2 100755 --- a/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -43,7 +43,6 @@ ohos_unittest("connection_record_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn index 795322688f7..2d2f88add92 100755 --- a/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -52,7 +52,6 @@ ohos_unittest("data_ability_manager_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", diff --git a/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn index 343f99b46dd..e9a738877fb 100755 --- a/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -49,7 +49,6 @@ ohos_unittest("data_ability_record_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/info_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/info_test/BUILD.gn index 6a0d2bd51d4..41e10660eec 100755 --- a/services/abilitymgr/test/unittest/phone/info_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/info_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -43,7 +43,6 @@ ohos_unittest("info_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/kernal_system_app_manager_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/kernal_system_app_manager_test/BUILD.gn new file mode 100755 index 00000000000..50f8c4b2e43 --- /dev/null +++ b/services/abilitymgr/test/unittest/phone/kernal_system_app_manager_test/BUILD.gn @@ -0,0 +1,72 @@ +# Copyright (c) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") + +module_output_path = "ability_runtime/abilitymgr" + +ohos_unittest("kernal_system_app_mgr_test") { + module_out_path = module_output_path + + include_dirs = [ + "${services_path}/abilitymgr/test/mock/libs/system_ability_mock", + "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", + "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", + "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/ability_scheduler_mock", + "//foundation/aafwk/standard/services/abilitymgr/include/", + "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/include", + "//foundation/aafwk/standard/services/abilitymgr/test/mock/include", + "//foundation/aafwk/standard/services/abilitymgr/include", + ] + + sources = [ + "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp", + "kernal_system_app_manager_test.cpp", # add mock file + ] + + configs = [ "${services_path}/abilitymgr:abilityms_config" ] + cflags = [] + if (target_cpu == "arm") { + cflags += [ "-DBINDER_IPC_32BIT" ] + } + deps = [ + "${innerkits_path}/want:want", + "${services_path}/abilitymgr/test:abilityms_test_source", + "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", + "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", + "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", + "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", + "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", + "//foundation/aafwk/standard/services/abilitymgr:abilityms", + "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", + "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", + "//third_party/libpng:libpng", + "//utils/native/base:utils", + ] + external_deps = [ + "access_token:libaccesstoken_sdk", + "device_manager_base:devicemanagersdk", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + ] +} + +group("unittest") { + testonly = true + + deps = [ ":kernal_system_app_mgr_test" ] +} diff --git a/services/abilitymgr/test/unittest/phone/kernal_system_app_manager_test/kernal_system_app_manager_test.cpp b/services/abilitymgr/test/unittest/phone/kernal_system_app_manager_test/kernal_system_app_manager_test.cpp new file mode 100644 index 00000000000..73f7fdbb841 --- /dev/null +++ b/services/abilitymgr/test/unittest/phone/kernal_system_app_manager_test/kernal_system_app_manager_test.cpp @@ -0,0 +1,614 @@ +/* + * Copyright (c) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#if 1 +#include + +#define private public +#include "sa_mgr_client.h" +#include "kernal_system_app_manager.h" +#include "app_scheduler.h" +#undef private + +#include "ability_config.h" +#include "ability_manager_service.h" +#include "ability_manager_errors.h" +#include "ability_scheduler_mock.h" +#include "bundlemgr/mock_bundle_manager.h" +#include "mock_app_manager_client.h" + +using namespace testing; +using namespace testing::ext; + +namespace OHOS { +namespace AAFwk { + +static void WaitUntilTaskFinished() +{ + const uint32_t maxRetryCount = 1000; + const uint32_t sleepTime = 1000; + uint32_t count = 0; + auto handler = OHOS::DelayedSingleton::GetInstance()->GetEventHandler(); + std::atomic taskCalled(false); + auto f = [&taskCalled]() { taskCalled.store(true); }; + if (handler->PostTask(f)) { + while (!taskCalled.load()) { + ++count; + if (count >= maxRetryCount) { + break; + } + usleep(sleepTime); + } + } +} + +class KernalSystemAppManagerTest : public testing::Test { +public: + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); + void StartSystemUI(); + +public: + std::shared_ptr kernalSystemMgr_ {nullptr}; + int usrId_ = 10; + Want want_ {}; + AppExecFwk::AbilityInfo abilityInfo_ {}; + AppExecFwk::ApplicationInfo appInfo_ {}; +}; + +void KernalSystemAppManagerTest::SetUpTestCase() +{ + int systemAbilityId = 401; + OHOS::DelayedSingleton::GetInstance()->RegisterSystemAbility( + systemAbilityId, new (std::nothrow) AppExecFwk::BundleMgrService()); + DelayedSingleton::GetInstance()->OnStart(); +} + +void KernalSystemAppManagerTest::TearDownTestCase() +{ + OHOS::DelayedSingleton::GetInstance()->OnStop(); + OHOS::DelayedSingleton::DestroyInstance(); +} + +void KernalSystemAppManagerTest::SetUp() +{ + kernalSystemMgr_ = std::make_shared(usrId_); + kernalSystemMgr_->abilities_.clear(); + std::queue().swap(kernalSystemMgr_->waittingAbilityQueue_); +} + +void KernalSystemAppManagerTest::TearDown() +{ + kernalSystemMgr_.reset(); +} + +void KernalSystemAppManagerTest::StartSystemUI() +{ + Want want; + want.SetElementName(AbilityConfig::SYSTEM_UI_BUNDLE_NAME, AbilityConfig::SYSTEM_UI_STATUS_BAR); + + AbilityRequest request; + request.want = want; + request.requestCode = -1; + request.callerToken = nullptr; + request.abilityInfo.name = AbilityConfig::SYSTEM_UI_STATUS_BAR; + request.abilityInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + request.appInfo.isLauncherApp = true; + request.appInfo.name = AbilityConfig::SYSTEM_UI_STATUS_BAR; + request.appInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + + EXPECT_TRUE(kernalSystemMgr_); + + auto ref = kernalSystemMgr_->StartAbility(request); + WaitUntilTaskFinished(); + EXPECT_EQ(ERR_OK, ref); +} + +/* + * Feature: KernalSystemAppManager + * Function: StartAbility，StartAbilityLocked + * SubFunction: Processing preconditions + * FunctionPoints: KernalSystemAppManager StartAbility + * EnvConditions:Is Kernal System Ability + * CaseDescription: Start a system level aa + */ +HWTEST_F(KernalSystemAppManagerTest, StartAbility_001, TestSize.Level1) +{ + // start a system ui + Want want; + want.SetElementName(AbilityConfig::SYSTEM_UI_BUNDLE_NAME, AbilityConfig::SYSTEM_UI_STATUS_BAR); + + AbilityRequest request; + request.want = want; + request.requestCode = -1; + request.callerToken = nullptr; + request.abilityInfo.name = AbilityConfig::SYSTEM_UI_STATUS_BAR; + request.abilityInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + request.appInfo.isLauncherApp = true; + request.appInfo.name = "syetemUi"; + request.appInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + EXPECT_TRUE(kernalSystemMgr_); + + auto ref = kernalSystemMgr_->StartAbility(request); + WaitUntilTaskFinished(); + EXPECT_EQ(ERR_OK, ref); + EXPECT_EQ(static_cast(kernalSystemMgr_->abilities_.size()), 1); + + auto topAbilityRecord = kernalSystemMgr_->GetCurrentTopAbility(); + EXPECT_TRUE(topAbilityRecord); + EXPECT_TRUE(topAbilityRecord->IsKernalSystemAbility()); + topAbilityRecord->SetAbilityState(AbilityState::INITIAL); + + // start agin + auto refBegin = kernalSystemMgr_->StartAbility(request); + WaitUntilTaskFinished(); + EXPECT_EQ(ERR_OK, refBegin); + // same aa, so size is 1. Just update not push + EXPECT_EQ(static_cast(kernalSystemMgr_->abilities_.size()), 1); + EXPECT_TRUE(topAbilityRecord->IsNewWant()); +} + +/* + * Feature: KernalSystemAppManager + * Function: StartAbility，StartAbilityLocked + * SubFunction: Processing preconditions + * FunctionPoints: KernalSystemAppManager StartAbility + * EnvConditions:Is Kernal System Ability + * CaseDescription: Start a system level aa + */ +HWTEST_F(KernalSystemAppManagerTest, StartAbility_002, TestSize.Level1) +{ + // start a system ui + Want want; + want.SetElementName(AbilityConfig::SYSTEM_UI_BUNDLE_NAME, AbilityConfig::SYSTEM_UI_STATUS_BAR); + AbilityRequest request; + request.want = want; + request.requestCode = -1; + request.callerToken = nullptr; + request.abilityInfo.name = AbilityConfig::SYSTEM_UI_STATUS_BAR; + request.abilityInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + request.appInfo.isLauncherApp = true; + request.appInfo.name = "syetemUi"; + request.appInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + + Want wantBar; + wantBar.SetElementName(AbilityConfig::SYSTEM_UI_BUNDLE_NAME, AbilityConfig::SYSTEM_UI_NAVIGATION_BAR); + AbilityRequest requestBar; + requestBar.want = wantBar; + requestBar.requestCode = -1; + requestBar.callerToken = nullptr; + requestBar.abilityInfo.name = AbilityConfig::SYSTEM_UI_STATUS_BAR; + requestBar.abilityInfo.bundleName = AbilityConfig::SYSTEM_UI_NAVIGATION_BAR; + requestBar.appInfo.isLauncherApp = true; + requestBar.appInfo.name = "syetemUi"; + requestBar.appInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + + // nullptr name and bundlename + Want wantPage; + AbilityRequest requestPage; + requestPage.want = wantPage; + requestPage.requestCode = -1; + requestPage.callerToken = nullptr; + EXPECT_TRUE(kernalSystemMgr_); + + int firstStartRef = kernalSystemMgr_->StartAbility(request); + WaitUntilTaskFinished(); + auto topAbilityRecord = kernalSystemMgr_->GetCurrentTopAbility(); + EXPECT_TRUE(topAbilityRecord); + topAbilityRecord->SetAbilityState(AbilityState::ACTIVATING); + + int secondStartRef = kernalSystemMgr_->StartAbility(requestBar); + int thirdStartRef = kernalSystemMgr_->StartAbility(requestPage); + + EXPECT_EQ(static_cast(kernalSystemMgr_->abilities_.size()), 1); + EXPECT_EQ(static_cast(kernalSystemMgr_->waittingAbilityQueue_.size()), 2); + EXPECT_EQ(ERR_OK, firstStartRef); + EXPECT_EQ(START_ABILITY_WAITING, secondStartRef); + EXPECT_EQ(START_ABILITY_WAITING, thirdStartRef); +} + +/* + * Feature: KernalSystemAppManager + * Function: AttachAbilityThread + * SubFunction: binding app + * FunctionPoints: bingding app and move to forground + * EnvConditions:Is Kernal System Ability + * CaseDescription: have a ability to attach + */ +HWTEST_F(KernalSystemAppManagerTest, AttachAbilityThread_001, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + sptr scheduler = nullptr; + sptr token = nullptr; + + int ref = kernalSystemMgr_->AttachAbilityThread(scheduler, token); + EXPECT_EQ(ERR_INVALID_VALUE, ref); + + StartSystemUI(); + auto topAbilityRecord = kernalSystemMgr_->GetCurrentTopAbility(); + EXPECT_TRUE(topAbilityRecord); + // scheduler judge null is on the upper level, in ams, so is return ok + ref = kernalSystemMgr_->AttachAbilityThread(scheduler, topAbilityRecord->GetToken()); + EXPECT_EQ(ERR_OK, ref); + + sptr mokecheduler = new AbilitySchedulerMock(); + ref = kernalSystemMgr_->AttachAbilityThread(mokecheduler, topAbilityRecord->GetToken()); + EXPECT_EQ(ERR_OK, ref); +} + +/* + * Feature: KernalSystemAppManager + * Function: AbilityTransitionDone + * SubFunction: Processing preconditions + * FunctionPoints: KernalSystemAppManager StartAbility + * EnvConditions:Is Kernal System Ability + * CaseDescription: Notification status + */ +HWTEST_F(KernalSystemAppManagerTest, AbilityTransitionDone_001, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + sptr token = nullptr; + + int ref = kernalSystemMgr_->AbilityTransitionDone(token, -1); + EXPECT_EQ(ERR_INVALID_VALUE, ref); + + StartSystemUI(); + auto topAbilityRecord = kernalSystemMgr_->GetCurrentTopAbility(); + EXPECT_TRUE(topAbilityRecord); + ref = kernalSystemMgr_->AbilityTransitionDone(topAbilityRecord->GetToken(), -1); + EXPECT_EQ(ERR_INVALID_VALUE, ref); + + // The right example + topAbilityRecord->SetAbilityState(AbilityState::ACTIVATING); + ref = kernalSystemMgr_->AbilityTransitionDone(topAbilityRecord->GetToken(), AbilityState::ACTIVE); + EXPECT_EQ(ERR_OK, ref); + WaitUntilTaskFinished(); + + ref = kernalSystemMgr_->AbilityTransitionDone(topAbilityRecord->GetToken(), AbilityState::INITIAL); + EXPECT_EQ(ERR_INVALID_VALUE, ref); +} + +/* + * Feature: KernalSystemAppManagerssssssssssssssss + * Function: OnAbilityRequestDone + * SubFunction: Processing preconditions + * FunctionPoints: KernalSystemAppManager OnAbilityRequestDone + * EnvConditions:Is Kernal System Ability + * CaseDescription: Notification status + */ +HWTEST_F(KernalSystemAppManagerTest, OnAbilityRequestDone_001, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + StartSystemUI(); + auto topAbilityRecord = kernalSystemMgr_->GetCurrentTopAbility(); + EXPECT_TRUE(topAbilityRecord); + kernalSystemMgr_->OnAbilityRequestDone(topAbilityRecord->GetToken(), -1); + EXPECT_NE(topAbilityRecord->GetAbilityState(), AbilityState::ACTIVATING); + + kernalSystemMgr_->OnAbilityRequestDone( + topAbilityRecord->GetToken(), static_cast(AppExecFwk::AbilityState::ABILITY_STATE_FOREGROUND)); + EXPECT_EQ(topAbilityRecord->GetAbilityState(), AbilityState::ACTIVATING); +} + +/* + * Feature: KernalSystemAppManager + * Function: OnAbilityRequestDone + * SubFunction: Processing preconditions + * FunctionPoints: KernalSystemAppManager OnAbilityRequestDone + * EnvConditions:Is Kernal System Ability + * CaseDescription: Notification status + */ +HWTEST_F(KernalSystemAppManagerTest, GetManagerUserId_001, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + StartSystemUI(); + int testUserID = kernalSystemMgr_->GetManagerUserId(); + EXPECT_EQ(10, testUserID); +} + +/* + * Feature: KernalSystemAppManager + * Function: DumpState + * SubFunction: Processing preconditions + * FunctionPoints: + * EnvConditions:Is Kernal System Ability + * CaseDescription: Notification status + */ +HWTEST_F(KernalSystemAppManagerTest, DumpState_001, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + StartSystemUI(); + std::vector info; + kernalSystemMgr_->DumpState(info); + + auto isFindAbilityInfo = [](std::string &abilityInfo) { + return std::string::npos != abilityInfo.find(AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + }; + // find the SYSTEM_UI_BUNDLE_NAME + EXPECT_NE(info.end(), std::find_if(info.begin(), info.end(), isFindAbilityInfo)); +} + +/* + * Feature: KernalSystemAppManager + * Function: OnAbilityDied + * SubFunction: Processing preconditions + * FunctionPoints: + * EnvConditions:Is Kernal System Ability + * CaseDescription: Notification ability died + */ +HWTEST_F(KernalSystemAppManagerTest, OnAbilityDied_001, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + StartSystemUI(); + auto topAbilityRecord = kernalSystemMgr_->GetCurrentTopAbility(); + EXPECT_TRUE(topAbilityRecord); + kernalSystemMgr_->OnAbilityDied(topAbilityRecord); + EXPECT_EQ(topAbilityRecord->GetAbilityState(), AbilityState::INITIAL); +} + +/* + * Feature: KernalSystemAppManager + * Function: OnAbilityDied + * SubFunction: Processing preconditions + * FunctionPoints: + * EnvConditions:Is Kernal System Ability + * CaseDescription: Notification status + */ +HWTEST_F(KernalSystemAppManagerTest, OnAbilityDied_002, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + StartSystemUI(); + auto topAbilityRecord = kernalSystemMgr_->GetCurrentTopAbility(); + EXPECT_TRUE(topAbilityRecord); + kernalSystemMgr_->OnAbilityDied(topAbilityRecord); + EXPECT_EQ(topAbilityRecord->GetAbilityState(), AbilityState::INITIAL); +} + +/* + * Feature: KernalSystemAppManager + * Function: OnAbilityDied + * SubFunction: Processing preconditions + * FunctionPoints: + * EnvConditions:Is Kernal System Ability + * CaseDescription: Notification status + */ +HWTEST_F(KernalSystemAppManagerTest, OnTimeOut_001, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + StartSystemUI(); + auto topAbilityRecord = kernalSystemMgr_->GetCurrentTopAbility(); + EXPECT_TRUE(topAbilityRecord); + std::vector info; + kernalSystemMgr_->DumpState(info); + auto isFindAbilityInfo = [](std::string &abilityInfo) { + return std::string::npos != abilityInfo.find(AbilityConfig::SYSTEM_UI_BUNDLE_NAME); + }; + EXPECT_NE(info.end(), std::find_if(info.begin(), info.end(), isFindAbilityInfo)); + + // remove form vector + kernalSystemMgr_->OnTimeOut(AbilityManagerService::LOAD_TIMEOUT_MSG, topAbilityRecord->GetEventId()); + + info.clear(); + kernalSystemMgr_->DumpState(info); + // topAbilityRecord must be delete + EXPECT_EQ(info.end(), std::find_if(info.begin(), info.end(), isFindAbilityInfo)); +} +/* + * Feature: KernalSystemAppManager + * Function: DequeueWaittingAbility + * SubFunction: Processing preconditions + * FunctionPoints: + * EnvConditions:Is Kernal System Ability + * CaseDescription: Notification status + */ +HWTEST_F(KernalSystemAppManagerTest, DequeueWaittingAbility_001, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + StartSystemUI(); + auto topAbilityRecord = kernalSystemMgr_->GetCurrentTopAbility(); + EXPECT_TRUE(topAbilityRecord); + topAbilityRecord->SetAbilityState(AbilityState::ACTIVATING); + + Want want; + AbilityRequest request; + request.want = want; + request.requestCode = -1; + request.callerToken = nullptr; + request.abilityInfo.name = AbilityConfig::SYSTEM_UI_STATUS_BAR; + request.abilityInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + request.appInfo.isLauncherApp = true; + request.appInfo.name = "syetemUi"; + request.appInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + + // push in waiting queue + kernalSystemMgr_->StartAbility(request); + EXPECT_EQ(static_cast(kernalSystemMgr_->waittingAbilityQueue_.size()), 1); + + topAbilityRecord->SetAbilityState(AbilityState::ACTIVE); + kernalSystemMgr_->DequeueWaittingAbility(); + EXPECT_EQ(static_cast(kernalSystemMgr_->waittingAbilityQueue_.size()), 0); +} + +/* + * Feature: KernalSystemAppManager + * Function: DequeueWaittingAbility + * SubFunction: Processing preconditions + * FunctionPoints: + * EnvConditions:Is Kernal System Ability + * CaseDescription: Notification status + */ +HWTEST_F(KernalSystemAppManagerTest, GetOrCreateAbilityRecord_001, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + + Want want; + AbilityRequest request; + request.want = want; + request.requestCode = -1; + request.callerToken = nullptr; + request.abilityInfo.name = AbilityConfig::SYSTEM_UI_STATUS_BAR; + request.abilityInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + request.appInfo.isLauncherApp = true; + request.appInfo.name = "syetemUi"; + request.appInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + + std::shared_ptr targetAbility; + EXPECT_FALSE(targetAbility); + kernalSystemMgr_->GetOrCreateAbilityRecord(request, targetAbility); + + EXPECT_EQ(static_cast(kernalSystemMgr_->abilities_.size()), 1); + EXPECT_TRUE(targetAbility); + EXPECT_FALSE(targetAbility->IsNewWant()); + + // again + kernalSystemMgr_->GetOrCreateAbilityRecord(request, targetAbility); + EXPECT_TRUE(targetAbility->IsNewWant()); +} + +/* + * Feature: KernalSystemAppManager + * Function: DequeueWaittingAbility + * SubFunction: Processing preconditions + * FunctionPoints: + * EnvConditions:Is Kernal System Ability + * CaseDescription: Notification status + */ +HWTEST_F(KernalSystemAppManagerTest, GetOrCreateAbilityRecord_002, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + + Want want; + AbilityRequest request; + request.want = want; + request.requestCode = -1; + request.callerToken = nullptr; + request.abilityInfo.name = AbilityConfig::SYSTEM_UI_STATUS_BAR; + request.abilityInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + request.appInfo.isLauncherApp = true; + request.appInfo.name = "syetemUi"; + request.appInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + + std::shared_ptr targetAbility; + EXPECT_FALSE(targetAbility); + kernalSystemMgr_->GetOrCreateAbilityRecord(request, targetAbility); + + EXPECT_EQ(static_cast(kernalSystemMgr_->abilities_.size()), 1); + EXPECT_TRUE(targetAbility); + EXPECT_FALSE(targetAbility->IsNewWant()); + + // again + kernalSystemMgr_->GetOrCreateAbilityRecord(request, targetAbility); + EXPECT_TRUE(targetAbility->IsNewWant()); + EXPECT_EQ(static_cast(kernalSystemMgr_->abilities_.size()), 1); + + std::string abilityNameInfo = AbilityConfig::SYSTEM_UI_BUNDLE_NAME + ":" + AbilityConfig::SYSTEM_UI_STATUS_BAR; + auto abilityFlag = + kernalSystemMgr_->GetFlagOfAbility(AbilityConfig::SYSTEM_UI_BUNDLE_NAME, AbilityConfig::SYSTEM_UI_STATUS_BAR); + EXPECT_TRUE(abilityNameInfo == abilityFlag); +} + +/* + * Feature: KernalSystemAppManager + * Function: DequeueWaittingAbility + * SubFunction: Processing preconditions + * FunctionPoints: + * EnvConditions:Is Kernal System Ability + * CaseDescription: Notification status + */ +HWTEST_F(KernalSystemAppManagerTest, GetAbilityRecordByToken_001, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + + StartSystemUI(); + auto topAbilityRecord = kernalSystemMgr_->GetCurrentTopAbility(); + EXPECT_TRUE(topAbilityRecord); + auto testRecord = kernalSystemMgr_->GetAbilityRecordByToken(topAbilityRecord->GetToken()); + EXPECT_TRUE(testRecord == topAbilityRecord); + + sptr token; + auto testRecord1 = kernalSystemMgr_->GetAbilityRecordByToken(token); + EXPECT_TRUE(testRecord1 == nullptr); + + auto testRecord2 = kernalSystemMgr_->GetAbilityRecordByEventId(topAbilityRecord->GetEventId()); + EXPECT_TRUE(testRecord2 == topAbilityRecord); + + auto testRecord3 = kernalSystemMgr_->GetAbilityRecordByEventId(-1); + EXPECT_TRUE(testRecord3 == nullptr); +} + +/* + * Feature: KernalSystemAppManager + * Function: DispatchActive + * SubFunction: Processing preconditions + * FunctionPoints: + * EnvConditions:Is Kernal System Ability + * CaseDescription: Notification status + */ +HWTEST_F(KernalSystemAppManagerTest, DispatchActive_001, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + + StartSystemUI(); + auto topAbilityRecord = kernalSystemMgr_->GetCurrentTopAbility(); + EXPECT_TRUE(topAbilityRecord); + topAbilityRecord->SetAbilityState(AbilityState::ACTIVATING); + + Want want; + AbilityRequest request; + request.want = want; + request.requestCode = -1; + request.callerToken = nullptr; + request.abilityInfo.name = AbilityConfig::SYSTEM_UI_STATUS_BAR; + request.abilityInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + request.appInfo.isLauncherApp = true; + request.appInfo.name = "syetemUi"; + request.appInfo.bundleName = AbilityConfig::SYSTEM_UI_BUNDLE_NAME; + + kernalSystemMgr_->EnqueueWaittingAbility(request); + EXPECT_EQ(static_cast(kernalSystemMgr_->waittingAbilityQueue_.size()), 1); + + int ref = kernalSystemMgr_->DispatchActive(topAbilityRecord, AbilityState::ACTIVE); + WaitUntilTaskFinished(); + EXPECT_EQ(ERR_OK, ref); +} + +/* + * Feature: KernalSystemAppManager + * Function: RemoveAbilityRecord + * SubFunction: Processing preconditions + * FunctionPoints: + * EnvConditions:Is Kernal System Ability + * CaseDescription: Notification status + */ +HWTEST_F(KernalSystemAppManagerTest, DispatchActive_002, TestSize.Level1) +{ + EXPECT_TRUE(kernalSystemMgr_); + StartSystemUI(); + auto topAbilityRecord = kernalSystemMgr_->GetCurrentTopAbility(); + EXPECT_TRUE(topAbilityRecord); + + EXPECT_EQ(static_cast(kernalSystemMgr_->abilities_.size()), 1); + bool isRemove = kernalSystemMgr_->RemoveAbilityRecord(topAbilityRecord); + EXPECT_TRUE(isRemove); + + isRemove = kernalSystemMgr_->RemoveAbilityRecord(nullptr); + EXPECT_FALSE(isRemove); +} + +} // namespace AAFwk +} // namespace OHOS + +#endif diff --git a/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn index 9b5bbe37abc..cfc5daf2eb8 100755 --- a/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -44,7 +44,6 @@ ohos_unittest("lifecycle_deal_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn index 34037869d7e..f7d87c2c354 100755 --- a/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -44,7 +44,6 @@ ohos_unittest("lifecycle_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/lifecycle_test/lifecycle_test.cpp b/services/abilitymgr/test/unittest/phone/lifecycle_test/lifecycle_test.cpp index 6b5ae0920f0..caba94dd3fd 100644 --- a/services/abilitymgr/test/unittest/phone/lifecycle_test/lifecycle_test.cpp +++ b/services/abilitymgr/test/unittest/phone/lifecycle_test/lifecycle_test.cpp @@ -120,6 +120,8 @@ void LifecycleTest::OnStartabilityAms() abilityMs_->SetStackManager(userId, true); EXPECT_TRUE(abilityMs_->GetStackManager()); abilityMs_->stackManagers_.emplace(0, abilityMs_->GetStackManager()); + abilityMs_->systemAppManager_ = std::make_shared(userId); + EXPECT_TRUE(abilityMs_->systemAppManager_); abilityMs_->eventLoop_->Run(); return; } diff --git a/services/abilitymgr/test/unittest/phone/lock_screen_white_list_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/lock_screen_white_list_test/BUILD.gn index 41196f58b53..2b8b768ba88 100755 --- a/services/abilitymgr/test/unittest/phone/lock_screen_white_list_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/lock_screen_white_list_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -46,7 +46,6 @@ ohos_unittest("lock_screen_white_list_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", diff --git a/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn index 501e6cb30c8..edcc5c6c6c0 100755 --- a/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -43,7 +43,6 @@ ohos_unittest("mission_list_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/mission_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/mission_record_test/BUILD.gn index 83bb54d7996..32fe28154ff 100755 --- a/services/abilitymgr/test/unittest/phone/mission_record_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/mission_record_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -43,7 +43,6 @@ ohos_unittest("mission_record_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/mission_stack_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/mission_stack_test/BUILD.gn index 8ed7ffa2963..e593f79c704 100755 --- a/services/abilitymgr/test/unittest/phone/mission_stack_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/mission_stack_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -43,7 +43,6 @@ ohos_unittest("mission_stack_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn index b10cf3ff3fa..1016e3b220b 100755 --- a/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -43,7 +43,6 @@ ohos_unittest("mission_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn index 57f608cbbba..3e0e13e260b 100755 --- a/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -37,7 +37,6 @@ ohos_unittest("pending_want_key_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn index 553196a5e53..e721a1d5bce 100755 --- a/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -41,7 +41,6 @@ ohos_unittest("pending_want_manager_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn index d8144184708..3923e207737 100755 --- a/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -41,7 +41,6 @@ ohos_unittest("pending_want_record_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/resume_mission_container_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/resume_mission_container_test/BUILD.gn index 2a67e2b4f72..c50b7e90963 100755 --- a/services/abilitymgr/test/unittest/phone/resume_mission_container_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/resume_mission_container_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -41,7 +41,6 @@ ohos_unittest("resume_mission_container_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn index 8eb26542183..e0d5bbbf1f9 100755 --- a/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -46,7 +46,6 @@ ohos_unittest("ability_screenshot_handler_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", diff --git a/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn index a32ff3cced1..e6fda6bebe4 100755 --- a/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -41,7 +41,6 @@ ohos_unittest("sender_info_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/terminate_ability_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/terminate_ability_test/BUILD.gn index 613e21d71d5..b96dcc15759 100755 --- a/services/abilitymgr/test/unittest/phone/terminate_ability_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/terminate_ability_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -46,7 +46,6 @@ ohos_unittest("terminate_ability_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/terminate_ability_test/terminate_ability_test.cpp b/services/abilitymgr/test/unittest/phone/terminate_ability_test/terminate_ability_test.cpp index cb23413e4c7..cbfeec4338f 100644 --- a/services/abilitymgr/test/unittest/phone/terminate_ability_test/terminate_ability_test.cpp +++ b/services/abilitymgr/test/unittest/phone/terminate_ability_test/terminate_ability_test.cpp @@ -160,6 +160,8 @@ void TerminateAbilityTest::OnStartAms() int userId = g_aams->GetUserId(); g_aams->SetStackManager(userId, true); + g_aams->systemAppManager_ = std::make_shared(userId); + EXPECT_TRUE(g_aams->systemAppManager_); g_aams->eventLoop_->Run(); diff --git a/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn index 7f086e86c11..ef69a506a6c 100755 --- a/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -42,7 +42,6 @@ ohos_unittest("want_receiver_proxy_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn index 36fbb48a4fb..5a2d38e81a6 100755 --- a/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -43,7 +43,6 @@ ohos_unittest("want_receiver_stub_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn index bde67718101..e55ba85c80d 100755 --- a/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -41,7 +41,6 @@ ohos_unittest("want_sender_info_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn index 2568f4a7e6b..3c9d898325b 100755 --- a/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -42,7 +42,6 @@ ohos_unittest("want_sender_proxy_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn index ab2095d8d70..59a0a0489ac 100755 --- a/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -43,7 +43,6 @@ ohos_unittest("want_sender_stub_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn index d69aeb94ad3..28e7e5b1894 100755 --- a/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -42,7 +42,6 @@ ohos_unittest("wants_info_test") { "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/abilitymgr/test/unittest/phone/window_info_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/window_info_test/BUILD.gn index f3a17d0b33d..75d7230e7d7 100755 --- a/services/abilitymgr/test/unittest/phone/window_info_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/window_info_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -37,7 +37,6 @@ ohos_unittest("window_info_test") { "${innerkits_path}/want:want", "${services_path}/abilitymgr/test:abilityms_test_source", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/services/abilitymgr:abilityms", diff --git a/services/appmgr/BUILD.gn b/services/appmgr/BUILD.gn index 0ef3e87b239..4647bde21cc 100644 --- a/services/appmgr/BUILD.gn +++ b/services/appmgr/BUILD.gn @@ -17,7 +17,6 @@ import("//foundation/aafwk/standard/aafwk.gni") config("appmgr_config") { include_dirs = [ "include", - "${services_path}/common/include", "//base/startup/appspawn_standard/interfaces/innerkits/include", "//utils/system/safwk/native/include", "//base/account/os_account/interfaces/innerkits/osaccount/native/include", @@ -116,7 +115,6 @@ ohos_shared_library("libams") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//base/global/i18n_standard/frameworks/intl:intl_util", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", diff --git a/services/appmgr/include/ams_mgr_scheduler.h b/services/appmgr/include/ams_mgr_scheduler.h index 990f6c59776..a148acf9c8f 100644 --- a/services/appmgr/include/ams_mgr_scheduler.h +++ b/services/appmgr/include/ams_mgr_scheduler.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -88,6 +88,13 @@ public: */ virtual void RegisterAppStateCallback(const sptr &callback) override; + /** + * Reset,call Reset() through the proxy object, reset DFX of AppMgr. + * + * @return + */ + virtual void Reset() override; + /** * AbilityBehaviorAnalysis, ability behavior analysis assistant process optimization. * diff --git a/services/appmgr/include/app_death_recipient.h b/services/appmgr/include/app_death_recipient.h index 0bd39e48c3a..39179e0b3a0 100644 --- a/services/appmgr/include/app_death_recipient.h +++ b/services/appmgr/include/app_death_recipient.h @@ -42,10 +42,7 @@ public: */ void SetAppMgrServiceInner(const std::shared_ptr &serviceInner); - void SetIsRenderProcess(bool isRenderProcess); - private: - bool isRenderProcess_ = false; std::weak_ptr handler_; std::weak_ptr appMgrServiceInner_; }; diff --git a/services/appmgr/include/app_mgr_service.h b/services/appmgr/include/app_mgr_service.h index 47eaf0b1062..a623851bfad 100644 --- a/services/appmgr/include/app_mgr_service.h +++ b/services/appmgr/include/app_mgr_service.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -113,6 +113,15 @@ public: */ virtual int32_t ClearUpApplicationData(const std::string &bundleName) override; + /** + * IsBackgroundRunningRestricted, call IsBackgroundRunningRestricted() through proxy project, + * Checks whether the process of this application is forbidden to run in the background. + * + * @param bundleName, bundle name in Application record. + * @return ERR_OK, return back success, others fail. + */ + virtual int32_t IsBackgroundRunningRestricted(const std::string &bundleName) override; + /** * GetAllRunningProcesses, call GetAllRunningProcesses() through proxy project. * Obtains information about application processes that are running on the device. @@ -158,6 +167,24 @@ public: */ virtual sptr GetAmsMgr() override; + /** + * SetAppSuspendTimes, Setting the Freezing Time of APP Background. + * + * @param time, The timeout recorded when the application enters the background . + * + * @return Success or Failure . + */ + virtual void SetAppFreezingTime(int time) override; + + /** + * GetAppFreezingTime, Getting the Freezing Time of APP Background. + * + * @param time, The timeout recorded when the application enters the background . + * + * @return Success or Failure . + */ + virtual void GetAppFreezingTime(int &time) override; + /** * Get system memory information. * @param SystemMemoryAttr, memory information. @@ -197,11 +224,6 @@ public: */ int GetAbilityRecordsByProcessID(const int pid, std::vector> &tokens) override; - virtual int StartRenderProcess(const std::string &renderParam, int32_t ipcFd, - int32_t sharedFd, pid_t &renderPid) override; - - virtual void AttachRenderProcess(const sptr &shceduler) override; - private: /** * Init, Initialize application services. diff --git a/services/appmgr/include/app_mgr_service_inner.h b/services/appmgr/include/app_mgr_service_inner.h index d498c3b1a23..646b7562b71 100644 --- a/services/appmgr/include/app_mgr_service_inner.h +++ b/services/appmgr/include/app_mgr_service_inner.h @@ -121,6 +121,13 @@ public: */ virtual void RegisterAppStateCallback(const sptr &callback); + /** + * StopAllProcess, Terminate all processes. + * + * @return + */ + virtual void StopAllProcess(); + /** * AbilityBehaviorAnalysis, ability behavior analysis assistant process optimization. * @@ -235,6 +242,16 @@ public: */ virtual void ClearUpApplicationData(const std::string &bundleName, const int32_t callerUid, const pid_t callerPid); + /** + * IsBackgroundRunningRestricted, Checks whether the process of this application is forbidden + * to run in the background. + * + * @param bundleName, bundle name in Application record. + * + * @return ERR_OK, return back success, others fail. + */ + virtual int32_t IsBackgroundRunningRestricted(const std::string &bundleName); + /** * GetAllRunningProcesses, Obtains information about application processes that are running on the device. * @@ -391,10 +408,9 @@ public: * OnRemoteDied, Equipment death notification. * * @param remote, Death client. - * @param isRenderProcess is render process died. * @return */ - void OnRemoteDied(const wptr &remote, bool isRenderProcess = false); + void OnRemoteDied(const wptr &remote); /** * AddAppDeathRecipient, Add monitoring death application record. @@ -435,6 +451,23 @@ public: virtual void OptimizerAppStateChanged( const std::shared_ptr &appRecord, const ApplicationState state); + /** + * SetAppSuspendTimes, Setting the Freezing Time of APP Background. + * + * @param time, The timeout(second) recorded when the application enters the background . + * + * @return Success or Failure . + */ + void SetAppFreezingTime(int time); + + /** + * GetAppFreezingTime, Getting the Freezing Time of APP Background. + * + * @param time, The timeout(second) recorded when the application enters the background . + * + * @return Success or Failure . + */ + void GetAppFreezingTime(int &time); void HandleTimeOut(const InnerEvent::Pointer &event); void SetEventHandler(const std::shared_ptr &handler); @@ -528,11 +561,6 @@ public: */ int GetAbilityRecordsByProcessID(const int pid, std::vector> &tokens); - virtual int32_t StartRenderProcess(const pid_t hostPid, const std::string &renderParam, - int32_t ipcFd, int32_t sharedFd, pid_t &renderPid); - - virtual void AttachRenderProcess(const pid_t pid, const sptr &scheduler); - private: void StartEmptyResidentProcess(const BundleInfo &info, const std::string &processName, int restartCount); @@ -757,13 +785,6 @@ private: void GetGlobalConfiguration(); - void GetRunningProcesses(const std::shared_ptr &appRecord, std::vector &info); - - int StartRenderProcessImpl(const std::shared_ptr &renderRecord, - const std::shared_ptr appRecord, pid_t &renderPid); - - void OnRenderRemoteDied(const wptr &remote); - private: /** * ClearUpApplicationData, clear the application data. @@ -778,12 +799,6 @@ private: void ClearUpApplicationDataByUserId(const std::string &bundleName, int32_t callerUid, pid_t callerPid, const int userId); - int VerifyProcessPermission(); - - int VerifyAccountPermission(const std::string &permissionName, const int userId); - - int VerifyObserverPermission(); - private: /** * Notify application status. diff --git a/services/appmgr/include/app_running_manager.h b/services/appmgr/include/app_running_manager.h index 480fb095df4..8d38a1c0b23 100644 --- a/services/appmgr/include/app_running_manager.h +++ b/services/appmgr/include/app_running_manager.h @@ -148,8 +148,6 @@ public: void ClipStringContent(const std::regex &re, const std::string &sorce, std::string &afferCutStr); void HandleAddAbilityStageTimeOut(const int64_t eventId); void HandleStartSpecifiedAbilityTimeOut(const int64_t eventId); - std::shared_ptr GetAppRunningRecordByRenderPid(const pid_t pid); - void OnRemoteRenderDied(const wptr &remote); private: std::shared_ptr GetAbilityRunningRecord(const int64_t eventId); diff --git a/services/appmgr/include/app_running_record.h b/services/appmgr/include/app_running_record.h index 759010ff9bf..3eadad2e2da 100644 --- a/services/appmgr/include/app_running_record.h +++ b/services/appmgr/include/app_running_record.h @@ -21,7 +21,6 @@ #include #include #include "iremote_object.h" -#include "irender_scheduler.h" #include "ability_running_record.h" #include "ability_state_data.h" #include "application_info.h" @@ -34,7 +33,6 @@ #include "priority_object.h" #include "app_lifecycle_deal.h" #include "module_running_record.h" -#include "app_spawn_msg_wrapper.h" namespace OHOS { namespace AppExecFwk { @@ -43,45 +41,6 @@ const int RESTART_RESIDENT_PROCESS_MAX_TIMES = 15; } class AbilityRunningRecord; class AppMgrServiceInner; -class AppRunningRecord; - -/** - * @class RenderRecord - * Record webview render process info. - */ -class RenderRecord { -public: - RenderRecord(pid_t hostPid, const std::string& renderParam, - int32_t ipcFd, int32_t sharedFd, const std::shared_ptr &host); - - virtual ~RenderRecord(); - - static std::shared_ptr CreateRenderRecord(pid_t hostPid, const std::string& renderParam, - int32_t ipcFd, int32_t sharedFd, const std::shared_ptr &host); - - void SetPid(pid_t pid); - pid_t GetPid(); - pid_t GetHostPid(); - std::string GetRenderParam(); - int32_t GetIpcFd(); - int32_t GetSharedFd(); - std::shared_ptr GetHostRecord(); - sptr GetScheduler(); - void SetScheduler(const sptr &scheduler); - void SetDeathRecipient(const sptr recipient); - void RegisterDeathRecipient(); - -private: - pid_t pid_ = 0; - pid_t hostPid_ = 0; - std::string renderParam_; - int32_t ipcFd_ = 0; - int32_t sharedFd_ = 0; - std::weak_ptr host_; // webview host - sptr renderScheduler_; - sptr deathRecipient_ = nullptr; -}; - class AppRunningRecord : public std::enable_shared_from_this { public: static int64_t appEventId_; @@ -486,11 +445,6 @@ public: void ScheduleAcceptWantDone(); const AAFwk::Want &GetSpecifiedWant() const; - void SetRenderRecord(const std::shared_ptr &record); - std::shared_ptr GetRenderRecord(); - void SetStartMsg(const AppSpawnStartMsg &msg); - AppSpawnStartMsg GetStartMsg(); - private: /** * SearchTheModuleInfoNeedToUpdated, Get an uninitialized abilitystage data. @@ -569,10 +523,6 @@ private: std::string moduleName_; UserTestRecord userTestRecord_; - - // render record - std::shared_ptr renderRecord_ = nullptr; - AppSpawnStartMsg startMsg_; }; } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/include/app_spawn_client.h b/services/appmgr/include/app_spawn_client.h index 96c6cbdba27..862e8034557 100644 --- a/services/appmgr/include/app_spawn_client.h +++ b/services/appmgr/include/app_spawn_client.h @@ -29,7 +29,7 @@ public: /** * Constructor. */ - explicit AppSpawnClient(bool isWebViewSpawn = false); + AppSpawnClient(); /** * Destructor diff --git a/services/appmgr/include/app_spawn_msg_wrapper.h b/services/appmgr/include/app_spawn_msg_wrapper.h index acbaeef24d9..5415b6385be 100644 --- a/services/appmgr/include/app_spawn_msg_wrapper.h +++ b/services/appmgr/include/app_spawn_msg_wrapper.h @@ -34,7 +34,6 @@ struct AppSpawnStartMsg { uint32_t accessTokenId; std::string apl; std::string bundleName; - std::string renderParam; // only webview spawn need this param. }; using AppSpawnMsg = AppSpawn::ClientSocket::AppProperty; diff --git a/services/appmgr/include/app_spawn_socket.h b/services/appmgr/include/app_spawn_socket.h index a4c60afa08f..ef133c455ab 100644 --- a/services/appmgr/include/app_spawn_socket.h +++ b/services/appmgr/include/app_spawn_socket.h @@ -29,7 +29,7 @@ public: /** * Constructor. */ - explicit AppSpawnSocket(bool isWebViewSpawn = false); + AppSpawnSocket(); /** * Destructor diff --git a/services/appmgr/include/process_optimizer.h b/services/appmgr/include/process_optimizer.h index 6e336b5b17a..10b4028bcff 100644 --- a/services/appmgr/include/process_optimizer.h +++ b/services/appmgr/include/process_optimizer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -66,6 +66,8 @@ public: virtual void OnAbilityVisibleChanged(const AbilityPtr &ability); virtual void OnAbilityPerceptibleChanged(const AbilityPtr &ability); virtual void OnAbilityRemoved(const AbilityPtr &ability); + virtual void SetAppFreezingTime(int time); + virtual void GetAppFreezingTime(int &time); protected: bool SetAppOomAdj(const AppPtr &app, int oomAdj); diff --git a/services/appmgr/include/process_optimizer_uba.h b/services/appmgr/include/process_optimizer_uba.h index 6d34c93c99f..89c0440afd1 100644 --- a/services/appmgr/include/process_optimizer_uba.h +++ b/services/appmgr/include/process_optimizer_uba.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -55,6 +55,8 @@ public: void OnAbilityVisibleChanged(const AbilityPtr &ability) override; void OnAbilityPerceptibleChanged(const AbilityPtr &ability) override; void OnAbilityRemoved(const AbilityPtr &ability) override; + void SetAppFreezingTime(int time) override; + void GetAppFreezingTime(int &time) override; protected: void OnLowMemoryAlert(const CgroupManager::LowMemoryLevel level) override; diff --git a/services/appmgr/include/remote_client_manager.h b/services/appmgr/include/remote_client_manager.h index 1ab9ff83445..35656ea5563 100644 --- a/services/appmgr/include/remote_client_manager.h +++ b/services/appmgr/include/remote_client_manager.h @@ -57,12 +57,9 @@ public: */ void SetBundleManager(sptr bundleManager); - std::shared_ptr GetWebviewSpawnClient(); - private: std::shared_ptr appSpawnClient_; sptr bundleManager_; - std::shared_ptr webviewSpawnClient_; }; } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/src/ams_mgr_scheduler.cpp b/services/appmgr/src/ams_mgr_scheduler.cpp index 44a9928623f..5a91e41d370 100644 --- a/services/appmgr/src/ams_mgr_scheduler.cpp +++ b/services/appmgr/src/ams_mgr_scheduler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -110,6 +110,15 @@ void AmsMgrScheduler::RegisterAppStateCallback(const sptr &ca amsHandler_->PostTask(registerAppStateCallbackFunc, TASK_REGISTER_APP_STATE_CALLBACK); } +void AmsMgrScheduler::Reset() +{ + if (!IsReady()) { + return; + } + std::function resetFunc = std::bind(&AppMgrServiceInner::StopAllProcess, amsMgrServiceInner_); + amsHandler_->PostTask(resetFunc, TASK_STOP_ALL_PROCESS); +} + void AmsMgrScheduler::AbilityBehaviorAnalysis(const sptr &token, const sptr &preToken, const int32_t visibility, const int32_t perceptibility, const int32_t connectionState) { diff --git a/services/appmgr/src/app_death_recipient.cpp b/services/appmgr/src/app_death_recipient.cpp index 6ccba58de7f..9c841c0310a 100644 --- a/services/appmgr/src/app_death_recipient.cpp +++ b/services/appmgr/src/app_death_recipient.cpp @@ -42,7 +42,7 @@ void AppDeathRecipient::OnRemoteDied(const wptr &remote) return; } - auto onRemoteDiedFunc = std::bind(&AppMgrServiceInner::OnRemoteDied, serviceInner, remote, isRenderProcess_); + std::function onRemoteDiedFunc = std::bind(&AppMgrServiceInner::OnRemoteDied, serviceInner, remote); handler->PostTask(onRemoteDiedFunc, TASK_ON_REMOTE_DIED); } @@ -55,10 +55,5 @@ void AppDeathRecipient::SetAppMgrServiceInner(const std::shared_ptrIsBackgroundRunningRestricted(bundleName); +} + int32_t AppMgrService::GetAllRunningProcesses(std::vector &info) { if (!IsReady()) { @@ -285,6 +292,24 @@ int32_t AppMgrService::GetProcessRunningInfosByUserId(std::vectorGetProcessRunningInfosByUserId(info, userId); } +void AppMgrService::SetAppFreezingTime(int time) +{ + APP_LOGI("set app freeze time %{public}d", time); + if (!IsReady()) { + return; + } + appMgrServiceInner_->SetAppFreezingTime(time); +} + +void AppMgrService::GetAppFreezingTime(int &time) +{ + if (!IsReady()) { + return; + } + appMgrServiceInner_->GetAppFreezingTime(time); + APP_LOGE("get app freeze time %{public}d ", time); +} + /** * Get system memory information. * @param SystemMemoryAttr, memory information. @@ -382,31 +407,5 @@ int AppMgrService::GetAbilityRecordsByProcessID(const int pid, std::vectorGetAbilityRecordsByProcessID(pid, tokens); } - -int32_t AppMgrService::StartRenderProcess(const std::string &renderParam, int32_t ipcFd, - int32_t sharedFd, pid_t &renderPid) -{ - if (!IsReady()) { - APP_LOGE("StartRenderProcess failed, AppMgrService not ready."); - return ERR_INVALID_OPERATION; - } - - return appMgrServiceInner_->StartRenderProcess(IPCSkeleton::GetCallingPid(), - renderParam, ipcFd, sharedFd, renderPid); -} - -void AppMgrService::AttachRenderProcess(const sptr &scheduler) -{ - APP_LOGD("AttachRenderProcess called."); - if (!IsReady()) { - APP_LOGE("AttachRenderProcess failed, not ready."); - return; - } - - auto pid = IPCSkeleton::GetCallingPid(); - auto fun = std::bind(&AppMgrServiceInner::AttachRenderProcess, - appMgrServiceInner_, pid, iface_cast(scheduler)); - handler_->PostTask(fun, TASK_ATTACH_RENDER_PROCESS); -} } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/src/app_mgr_service_inner.cpp b/services/appmgr/src/app_mgr_service_inner.cpp index 61b4b47c902..00efa107c10 100644 --- a/services/appmgr/src/app_mgr_service_inner.cpp +++ b/services/appmgr/src/app_mgr_service_inner.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include "app_log_wrapper.h" #include "application_state_observer_stub.h" @@ -36,8 +35,6 @@ #include "ipc_skeleton.h" #include "os_account_manager.h" #include "permission/permission_kit.h" -#include "permission_constants.h" -#include "permission_verification.h" #include "system_ability_definition.h" #include "locale_config.h" #include "uri_permission_manager_client.h" @@ -58,7 +55,6 @@ constexpr int KILL_PROCESS_DELAYTIME_MICRO_SECONDS = 200; const std::string CLASS_NAME = "ohos.app.MainThread"; const std::string FUNC_NAME = "main"; const std::string SO_PATH = "system/lib64/libmapleappkit.z.so"; -const std::string RENDER_PARAM = "invalidparam"; const int32_t SIGNAL_KILL = 9; const std::string REQ_PERMISSION = "ohos.permission.LOCATION_IN_BACKGROUND"; constexpr int32_t SYSTEM_UID = 1000; @@ -67,9 +63,6 @@ constexpr int32_t USER_SCALE = 200000; constexpr int32_t BASE_USER_RANGE = 200000; -constexpr ErrCode APPMGR_ERR_OFFSET = ErrCodeOffset(SUBSYS_APPEXECFWK, 0x01); -constexpr ErrCode ERR_ALREADY_EXIST_RENDER = APPMGR_ERR_OFFSET + 100; // error code for already exist render. - int32_t GetUserIdByUid(int32_t uid) { return uid / BASE_USER_RANGE; @@ -365,11 +358,6 @@ int32_t AppMgrServiceInner::KillApplication(const std::string &bundleName) return ERR_NO_INIT; } - if (VerifyProcessPermission() == ERR_PERMISSION_DENIED) { - APP_LOGE("%{public}s: Permission verification failed", __func__); - return ERR_PERMISSION_DENIED; - } - int result = ERR_OK; int64_t startTime = SystemTimeMillis(); std::list pids; @@ -400,12 +388,6 @@ int32_t AppMgrServiceInner::KillApplicationByUid(const std::string &bundleName, APP_LOGE("appRunningManager_ is nullptr"); return ERR_NO_INIT; } - - if (VerifyProcessPermission() == ERR_PERMISSION_DENIED) { - APP_LOGE("%{public}s: Permission verification failed", __func__); - return ERR_PERMISSION_DENIED; - } - int result = ERR_OK; int64_t startTime = SystemTimeMillis(); std::list pids; @@ -443,13 +425,6 @@ int32_t AppMgrServiceInner::KillApplicationByUserId(const std::string &bundleNam APP_LOGE("appRunningManager_ is nullptr"); return ERR_NO_INIT; } - - if (VerifyAccountPermission(AAFwk::PermissionConstants::PERMISSION_CLEAN_BACKGROUND_PROCESSES, userId) == - ERR_PERMISSION_DENIED) { - APP_LOGE("%{public}s: Permission verification failed", __func__); - return ERR_PERMISSION_DENIED; - } - int result = ERR_OK; int64_t startTime = SystemTimeMillis(); std::list pids; @@ -493,16 +468,6 @@ int32_t AppMgrServiceInner::KillApplicationByUserId(const std::string &bundleNam void AppMgrServiceInner::ClearUpApplicationData(const std::string &bundleName, int32_t callerUid, pid_t callerPid) { BYTRACE_NAME(BYTRACE_TAG_APP, __PRETTY_FUNCTION__); - auto isSaCall = AAFwk::PermissionVerification::GetInstance()->IsSACall(); - if (!isSaCall) { - auto isCallingPerm = AAFwk::PermissionVerification::GetInstance()->VerifyCallingPermission( - AAFwk::PermissionConstants::PERMISSION_CLEAN_APPLICATION_DATA); - if (!isCallingPerm) { - APP_LOGE("%{public}s: Permission verification failed", __func__); - return; - } - } - auto userId = GetUserIdByUid(callerUid); APP_LOGI("userId:%{public}d", userId); ClearUpApplicationDataByUserId(bundleName, callerUid, callerPid, userId); @@ -547,30 +512,41 @@ void AppMgrServiceInner::ClearUpApplicationDataByUserId( NotifyAppStatus(bundleName, EventFwk::CommonEventSupport::COMMON_EVENT_PACKAGE_DATA_CLEARED); } -int32_t AppMgrServiceInner::GetAllRunningProcesses(std::vector &info) +int32_t AppMgrServiceInner::IsBackgroundRunningRestricted(const std::string &bundleName) { - auto isPerm = AAFwk::PermissionVerification::GetInstance()->VerifyRunningInfoPerm(); + auto bundleMgr_ = remoteClientManager_->GetBundleManager(); + if (bundleMgr_ == nullptr) { + APP_LOGE("GetBundleManager fail"); + return ERR_DEAD_OBJECT; + } + return bundleMgr_->CheckPermission(bundleName, REQ_PERMISSION); +} +int32_t AppMgrServiceInner::GetAllRunningProcesses(std::vector &info) +{ + auto bundleMgr_ = remoteClientManager_->GetBundleManager(); + if (bundleMgr_ == nullptr) { + APP_LOGE("GetBundleManager fail"); + return ERR_DEAD_OBJECT; + } // check permission for (const auto &item : appRunningManager_->GetAppRunningRecordMap()) { const auto &appRecord = item.second; + if (USER_SCALE == 0) { + APP_LOGE("USER_SCALE is not zero"); + return ERR_WOULD_BLOCK; + } int32_t userId = static_cast(appRecord->GetUid() / USER_SCALE); bool isExist = false; auto errCode = AccountSA::OsAccountManager::IsOsAccountActived(userId, isExist); if ((errCode == ERR_OK) && isExist) { - if (isPerm) { - GetRunningProcesses(appRecord, info); - } else { - auto applicationInfo = appRecord->GetApplicationInfo(); - if (!applicationInfo) { - continue; - } - auto callingTokenId = IPCSkeleton::GetCallingTokenID(); - auto tokenId = applicationInfo->accessTokenId; - if (callingTokenId == tokenId) { - GetRunningProcesses(appRecord, info); - } - } + RunningProcessInfo runningProcessInfo; + runningProcessInfo.processName_ = appRecord->GetProcessName(); + runningProcessInfo.pid_ = appRecord->GetPriorityObject()->GetPid(); + runningProcessInfo.uid_ = appRecord->GetUid(); + runningProcessInfo.state_ = static_cast(appRecord->GetState()); + appRecord->GetBundleNames(runningProcessInfo.bundleNames); + info.emplace_back(runningProcessInfo); } } return ERR_OK; @@ -578,34 +554,32 @@ int32_t AppMgrServiceInner::GetAllRunningProcesses(std::vector &info, int32_t userId) { - if (VerifyAccountPermission(AAFwk::PermissionConstants::PERMISSION_GET_RUNNING_INFO, userId) == - ERR_PERMISSION_DENIED) { - APP_LOGE("%{public}s: Permission verification failed", __func__); - return ERR_PERMISSION_DENIED; + auto bundleMgr_ = remoteClientManager_->GetBundleManager(); + if (bundleMgr_ == nullptr) { + APP_LOGE("GetBundleManager fail"); + return ERR_DEAD_OBJECT; } for (const auto &item : appRunningManager_->GetAppRunningRecordMap()) { const auto &appRecord = item.second; + if (USER_SCALE == 0) { + APP_LOGE("USER_SCALE is not zero"); + return ERR_WOULD_BLOCK; + } int32_t userIdTemp = static_cast(appRecord->GetUid() / USER_SCALE); if (userIdTemp == userId) { - GetRunningProcesses(appRecord, info); + RunningProcessInfo runningProcessInfo; + runningProcessInfo.processName_ = appRecord->GetProcessName(); + runningProcessInfo.pid_ = appRecord->GetPriorityObject()->GetPid(); + runningProcessInfo.uid_ = appRecord->GetUid(); + runningProcessInfo.state_ = static_cast(appRecord->GetState()); + appRecord->GetBundleNames(runningProcessInfo.bundleNames); + info.emplace_back(runningProcessInfo); } } return ERR_OK; } -void AppMgrServiceInner::GetRunningProcesses(const std::shared_ptr &appRecord, - std::vector &info) -{ - RunningProcessInfo runningProcessInfo; - runningProcessInfo.processName_ = appRecord->GetProcessName(); - runningProcessInfo.pid_ = appRecord->GetPriorityObject()->GetPid(); - runningProcessInfo.uid_ = appRecord->GetUid(); - runningProcessInfo.state_ = static_cast(appRecord->GetState()); - appRecord->GetBundleNames(runningProcessInfo.bundleNames); - info.emplace_back(runningProcessInfo); -} - int32_t AppMgrServiceInner::KillProcessByPid(const pid_t pid) const { int32_t ret = -1; @@ -847,18 +821,19 @@ void AppMgrServiceInner::SetBundleManager(sptr bundleManager) void AppMgrServiceInner::RegisterAppStateCallback(const sptr &callback) { - pid_t callingPid = IPCSkeleton::GetCallingPid(); - pid_t pid = getpid(); - if (callingPid != pid) { - APP_LOGE("%{public}s: Not abilityMgr call.", __func__); - return; - } BYTRACE_NAME(BYTRACE_TAG_APP, __PRETTY_FUNCTION__); if (callback != nullptr) { appStateCallbacks_.push_back(callback); } } +void AppMgrServiceInner::StopAllProcess() +{ + BYTRACE_NAME(BYTRACE_TAG_APP, __PRETTY_FUNCTION__); + ClearRecentAppList(); + appRunningManager_->ClearAppRunningRecordMap(); +} + void AppMgrServiceInner::AbilityBehaviorAnalysis(const sptr &token, const sptr &preToken, const int32_t visibility, // 0:false,1:true const int32_t perceptibility, // 0:false,1:true @@ -911,11 +886,6 @@ void AppMgrServiceInner::KillProcessByAbilityToken(const sptr &to return; } - if (VerifyProcessPermission() == ERR_PERMISSION_DENIED) { - APP_LOGE("%{public}s: Permission verification failed", __func__); - return; - } - // befor exec ScheduleProcessSecurityExit return // The resident process won't let him die if (appRecord->IsKeepAliveApp()) { @@ -944,12 +914,6 @@ void AppMgrServiceInner::KillProcessesByUserId(int32_t userId) return; } - if (VerifyAccountPermission(AAFwk::PermissionConstants::PERMISSION_CLEAN_BACKGROUND_PROCESSES, userId) == - ERR_PERMISSION_DENIED) { - APP_LOGE("%{public}s: Permission verification failed", __func__); - return; - } - int64_t startTime = SystemTimeMillis(); std::list pids; if (!appRunningManager_->GetPidsByUserId(userId, pids)) { @@ -1319,7 +1283,6 @@ void AppMgrServiceInner::StartProcess(const std::string &appName, const std::str startMsg.accessTokenId = (*bundleInfoIter).applicationInfo.accessTokenId; startMsg.apl = (*bundleInfoIter).applicationInfo.appPrivilegeLevel; startMsg.bundleName = bundleName; - startMsg.renderParam = RENDER_PARAM; APP_LOGD("StartProcess come, accessTokenId: %{public}d, apl: %{public}s, bundleName: %{public}s", startMsg.accessTokenId, startMsg.apl.c_str(), bundleName.c_str()); @@ -1342,7 +1305,6 @@ void AppMgrServiceInner::StartProcess(const std::string &appName, const std::str APP_LOGI("newPid:%{public}d uid:%{public}d", pid, startMsg.uid); appRecord->GetPriorityObject()->SetPid(pid); appRecord->SetUid(startMsg.uid); - appRecord->SetStartMsg(startMsg); OptimizerAppStateChanged(appRecord, ApplicationState::APP_STATE_CREATE); appRecord->SetAppMgrServiceInner(weak_from_this()); OnAppStateChanged(appRecord, ApplicationState::APP_STATE_CREATE); @@ -1411,14 +1373,9 @@ void AppMgrServiceInner::ClearRecentAppList() appProcessManager_->ClearRecentAppList(); } -void AppMgrServiceInner::OnRemoteDied(const wptr &remote, bool isRenderProcess) +void AppMgrServiceInner::OnRemoteDied(const wptr &remote) { APP_LOGE("On remote died."); - if (isRenderProcess) { - OnRenderRemoteDied(remote); - return; - } - auto appRecord = appRunningManager_->OnRemoteDied(remote); if (appRecord) { // clear uri permission @@ -1437,13 +1394,6 @@ void AppMgrServiceInner::OnRemoteDied(const wptr &remote, bool is OptimizerAppStateChanged(appRecord, ApplicationState::APP_STATE_TERMINATED); RemoveAppFromRecentListById(appRecord->GetRecordId()); OnProcessDied(appRecord); - - // kill render if exist. - auto renderRecord = appRecord->GetRenderRecord(); - if (renderRecord && renderRecord->GetPid() > 0) { - APP_LOGD("Kill render process when webviehost died."); - KillProcessByPid(renderRecord->GetPid()); - } } if (appRecord && appRecord->IsKeepAliveApp()) { @@ -1590,6 +1540,27 @@ void AppMgrServiceInner::OptimizerAppStateChanged( } } +void AppMgrServiceInner::SetAppFreezingTime(int time) +{ + if (!processOptimizerUBA_) { + APP_LOGE("process optimizer is not init"); + return; + } + + std::lock_guard setFreezeTimeLock(serviceLock_); + processOptimizerUBA_->SetAppFreezingTime(time); +} + +void AppMgrServiceInner::GetAppFreezingTime(int &time) +{ + if (!processOptimizerUBA_) { + APP_LOGE("process optimizer is not init"); + return; + } + std::lock_guard getFreezeTimeLock(serviceLock_); + processOptimizerUBA_->GetAppFreezingTime(time); +} + void AppMgrServiceInner::HandleTimeOut(const InnerEvent::Pointer &event) { APP_LOGI("handle time out"); @@ -1753,26 +1724,12 @@ void AppMgrServiceInner::GetRunningProcessInfoByToken( APP_LOGE("appRunningManager_ is nullptr"); return; } - - auto isPerm = AAFwk::PermissionVerification::GetInstance()->VerifyRunningInfoPerm(); - if (!isPerm) { - APP_LOGE("%{public}s: Permission verification failed", __func__); - return; - } - appRunningManager_->GetRunningProcessInfoByToken(token, info); } void AppMgrServiceInner::LoadResidentProcess() { APP_LOGI("%{public}s called", __func__); - pid_t callingPid = IPCSkeleton::GetCallingPid(); - pid_t pid = getpid(); - if (callingPid != pid) { - APP_LOGE("%{public}s: Not SA call.", __func__); - return; - } - if (!CheckRemoteClient()) { APP_LOGE("GetBundleManager fail"); return; @@ -1929,10 +1886,6 @@ void AppMgrServiceInner::NotifyAppStatus(const std::string &bundleName, const st int32_t AppMgrServiceInner::RegisterApplicationStateObserver(const sptr &observer) { APP_LOGI("%{public}s begin", __func__); - if (VerifyObserverPermission() == ERR_PERMISSION_DENIED) { - APP_LOGE("%{public}s: Permission verification failed", __func__); - return ERR_PERMISSION_DENIED; - } std::lock_guard lockRegister(observerLock_); if (observer == nullptr) { APP_LOGE("Observer nullptr"); @@ -1951,10 +1904,6 @@ int32_t AppMgrServiceInner::RegisterApplicationStateObserver(const sptr &observer) { APP_LOGI("%{public}s begin", __func__); - if (VerifyObserverPermission() == ERR_PERMISSION_DENIED) { - APP_LOGE("%{public}s: Permission verification failed", __func__); - return ERR_PERMISSION_DENIED; - } std::lock_guard lockUnregister(observerLock_); if (observer == nullptr) { APP_LOGE("Observer nullptr"); @@ -2049,12 +1998,6 @@ void AppMgrServiceInner::HandleObserverDiedTask(const sptr &obser int32_t AppMgrServiceInner::GetForegroundApplications(std::vector &list) { APP_LOGI("%{public}s, begin.", __func__); - auto isPerm = AAFwk::PermissionVerification::GetInstance()->VerifyRunningInfoPerm(); - if (!isPerm) { - APP_LOGE("%{public}s: Permission verification failed", __func__); - return ERR_PERMISSION_DENIED; - } - appRunningManager_->GetForegroundApplications(list); return ERR_OK; } @@ -2185,13 +2128,6 @@ void AppMgrServiceInner::RegisterStartSpecifiedAbilityResponse(const sptrIsSACall(); - if (!isSaCall) { - auto isCallingPerm = AAFwk::PermissionVerification::GetInstance()->VerifyCallingPermission( - AAFwk::PermissionConstants::PERMISSION_UPDATE_CONFIGURATION); - if (!isCallingPerm) { - APP_LOGE("%{public}s: Permission verification failed", __func__); - return; - } - } - if (!appRunningManager_) { APP_LOGE("appRunningManager_ is null"); return; @@ -2274,181 +2200,8 @@ int AppMgrServiceInner::GetAbilityRecordsByProcessID(const int pid, std::vector< for (auto &item : appRecord->GetAbilities()) { tokens.emplace_back(item.first); } - return ERR_OK; -} - -int AppMgrServiceInner::VerifyProcessPermission() -{ - auto isSaCall = AAFwk::PermissionVerification::GetInstance()->IsSACall(); - if (isSaCall) { - return ERR_OK; - } - auto isCallingPerm = AAFwk::PermissionVerification::GetInstance()->VerifyCallingPermission( - AAFwk::PermissionConstants::PERMISSION_CLEAN_BACKGROUND_PROCESSES); - if (isCallingPerm) { - APP_LOGE("%{public}s: Permission verification succeeded", __func__); - return ERR_OK; - } - APP_LOGE("%{public}s: Permission verification failed", __func__); - return ERR_PERMISSION_DENIED; -} - -int AppMgrServiceInner::VerifyAccountPermission(const std::string &permissionName, const int userId) -{ - auto isSaCall = AAFwk::PermissionVerification::GetInstance()->IsSACall(); - if (isSaCall) { - return ERR_OK; - } - const int currentUserId = getuid() / Constants::BASE_USER_RANGE; - if (userId != currentUserId) { - auto isCallingPermAccount = AAFwk::PermissionVerification::GetInstance()->VerifyCallingPermission( - AAFwk::PermissionConstants::PERMISSION_INTERACT_ACROSS_LOCAL_ACCOUNTS); - if (!isCallingPermAccount) { - APP_LOGE("%{public}s: Permission accounts verification failed", __func__); - return ERR_PERMISSION_DENIED; - } - } - auto isCallingPerm = AAFwk::PermissionVerification::GetInstance()->VerifyCallingPermission(permissionName); - if (isCallingPerm) { - APP_LOGD("%{public}s: Permission verification succeeded", __func__); - return ERR_OK; - } - APP_LOGE("%{public}s: Permission verification failed", __func__); - return ERR_PERMISSION_DENIED; -} - -int AppMgrServiceInner::VerifyObserverPermission() -{ - auto isSaCall = AAFwk::PermissionVerification::GetInstance()->IsSACall(); - if (isSaCall) { - return ERR_OK; - } - auto isCallingPerm = AAFwk::PermissionVerification::GetInstance()->VerifyCallingPermission( - AAFwk::PermissionConstants::PERMISSION_RUNNING_STATE_OBSERVER); - if (isCallingPerm) { - APP_LOGE("%{public}s: Permission verification succeeded", __func__); - return ERR_OK; - } - APP_LOGE("%{public}s: Permission verification failed", __func__); - return ERR_PERMISSION_DENIED; -} - -int AppMgrServiceInner::StartRenderProcess(const pid_t hostPid, const std::string &renderParam, - int32_t ipcFd, int32_t sharedFd, pid_t &renderPid) -{ - APP_LOGI("start render process, webview hostpid:%{public}d", hostPid); - if (hostPid <= 0 || renderParam.empty() || ipcFd <= 0 || sharedFd <= 0) { - APP_LOGE("invalid param, hostPid:%{public}d, renderParam:%{public}s, ipcFd:%{public}d, sharedFd:%{public}d", - hostPid, renderParam.c_str(), ipcFd, sharedFd); - return ERR_INVALID_VALUE; - } - - if (!appRunningManager_) { - APP_LOGE("appRunningManager_ is , not start render process"); - return ERR_INVALID_VALUE; - } - - auto appRecord = GetAppRunningRecordByPid(hostPid); - if (!appRecord) { - APP_LOGE("no such appRecord, hostpid:%{public}d", hostPid); - return ERR_INVALID_VALUE; - } - - auto renderRecord = appRecord->GetRenderRecord(); - if (renderRecord) { - APP_LOGW("already exit render process,do not request again, renderPid:%{public}d", renderRecord->GetPid()); - renderPid = renderRecord->GetPid(); - return ERR_ALREADY_EXIST_RENDER; - } - - renderRecord = RenderRecord::CreateRenderRecord(hostPid, renderParam, ipcFd, sharedFd, appRecord); - if (!renderRecord) { - APP_LOGE("create render record failed, hostpid:%{public}d", hostPid); - return ERR_INVALID_VALUE; - } - - return StartRenderProcessImpl(renderRecord, appRecord, renderPid); -} - -void AppMgrServiceInner::AttachRenderProcess(const pid_t pid, const sptr &scheduler) -{ - APP_LOGD("attach render process start"); - if (pid <= 0) { - APP_LOGE("invalid render process pid:%{public}d", pid); - return; - } - if (!scheduler) { - APP_LOGE("render scheduler is null"); - return; - } - - if (!appRunningManager_) { - APP_LOGE("appRunningManager_ is null"); - return; - } - - APP_LOGI("attach render process pid:%{public}d", pid); - auto appRecord = appRunningManager_->GetAppRunningRecordByRenderPid(pid); - if (!appRecord) { - APP_LOGE("no such app Record, pid:%{public}d", pid); - return; - } - - auto renderRecord = appRecord->GetRenderRecord(); - if (!renderRecord) { - APP_LOGE("no such render Record, pid:%{public}d", pid); - return; - } - - sptr appDeathRecipient = new AppDeathRecipient(); - appDeathRecipient->SetEventHandler(eventHandler_); - appDeathRecipient->SetAppMgrServiceInner(shared_from_this()); - appDeathRecipient->SetIsRenderProcess(true); - renderRecord->SetScheduler(scheduler); - renderRecord->SetDeathRecipient(appDeathRecipient); - renderRecord->RegisterDeathRecipient(); - - // notify fd to render process - scheduler->NotifyBrowserFd(renderRecord->GetIpcFd(), renderRecord->GetSharedFd()); -} - -int AppMgrServiceInner::StartRenderProcessImpl(const std::shared_ptr &renderRecord, - const std::shared_ptr appRecord, pid_t &renderPid) -{ - if (!renderRecord || !appRecord) { - APP_LOGE("renderRecord or appRecord is nullptr."); - return ERR_INVALID_VALUE; - } - - auto webviewSpawnClient = remoteClientManager_->GetWebviewSpawnClient(); - if (!webviewSpawnClient) { - APP_LOGE("webviewSpawnClient is null"); - return ERR_INVALID_VALUE; - } - - AppSpawnStartMsg startMsg = appRecord->GetStartMsg(); - startMsg.renderParam = renderRecord->GetRenderParam(); - pid_t pid = 0; - ErrCode errCode = webviewSpawnClient->StartProcess(startMsg, pid); - if (FAILED(errCode)) { - APP_LOGE("failed to spawn new render process, errCode %{public}08x", errCode); - return ERR_INVALID_VALUE; - } - renderPid = pid; - appRecord->SetRenderRecord(renderRecord); - renderRecord->SetPid(pid); - APP_LOGI("start render process successed, hostPid:%{public}d, pid:%{public}d uid:%{public}d", - renderRecord->GetHostPid(), pid, startMsg.uid); - return 0; -} - -void AppMgrServiceInner::OnRenderRemoteDied(const wptr &remote) -{ - APP_LOGE("On render remote died."); - if (appRunningManager_) { - appRunningManager_->OnRemoteRenderDied(remote); - } + return ERR_OK; } } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/src/app_running_manager.cpp b/services/appmgr/src/app_running_manager.cpp index 3b0bc1dd4cc..3b3c210475a 100644 --- a/services/appmgr/src/app_running_manager.cpp +++ b/services/appmgr/src/app_running_manager.cpp @@ -462,48 +462,5 @@ void AppRunningManager::UpdateConfiguration(const Configuration &config) } } } - -std::shared_ptr AppRunningManager::GetAppRunningRecordByRenderPid(const pid_t pid) -{ - std::lock_guard guard(lock_); - auto iter = std::find_if(appRunningRecordMap_.begin(), appRunningRecordMap_.end(), [&pid](const auto &pair) { - auto renderRecord = pair.second->GetRenderRecord(); - return renderRecord && renderRecord->GetPid() == pid; - }); - return ((iter == appRunningRecordMap_.end()) ? nullptr : iter->second); -} - -void AppRunningManager::OnRemoteRenderDied(const wptr &remote) -{ - std::lock_guard guard(lock_); - if (remote == nullptr) { - APP_LOGE("remote is null"); - return; - } - sptr object = remote.promote(); - if (!object) { - APP_LOGE("promote failed."); - return; - } - - const auto &it = - std::find_if(appRunningRecordMap_.begin(), appRunningRecordMap_.end(), [&object](const auto &pair) { - if (!pair.second) { - return false; - } - - auto renderRecord = pair.second->GetRenderRecord(); - if (!renderRecord) { - return false; - } - - auto scheduler = renderRecord->GetScheduler(); - return scheduler && scheduler->AsObject() == object; - }); - if (it != appRunningRecordMap_.end()) { - auto appRecord = it->second; - appRecord->SetRenderRecord(nullptr); - } -} } // namespace AppExecFwk -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/appmgr/src/app_running_record.cpp b/services/appmgr/src/app_running_record.cpp index fceaaec9b47..827235eb1c8 100644 --- a/services/appmgr/src/app_running_record.cpp +++ b/services/appmgr/src/app_running_record.cpp @@ -21,91 +21,6 @@ namespace OHOS { namespace AppExecFwk { int64_t AppRunningRecord::appEventId_ = 0; - -RenderRecord::RenderRecord(pid_t hostPid, const std::string& renderParam, - int32_t ipcFd, int32_t sharedFd, const std::shared_ptr &host) - : hostPid_(hostPid), renderParam_(renderParam), ipcFd_(ipcFd), sharedFd_(sharedFd), host_(host) -{} - -RenderRecord::~RenderRecord() -{} - -std::shared_ptr RenderRecord::CreateRenderRecord(pid_t hostPid, const std::string& renderParam, - int32_t ipcFd, int32_t sharedFd, const std::shared_ptr &host) -{ - if (hostPid <= 0 || renderParam.empty() || ipcFd <= 0 || sharedFd <= 0 || !host) { - return nullptr; - } - - auto renderRecord = std::make_shared(hostPid, renderParam, ipcFd, sharedFd, host); - if (!renderRecord) { - APP_LOGE("create render record failed, hostPid:%{public}d.", hostPid); - return nullptr; - } - - return renderRecord; -} - -void RenderRecord::SetPid(pid_t pid) -{ - pid_ = pid; -} - -pid_t RenderRecord::GetPid() -{ - return pid_; -} - -pid_t RenderRecord::GetHostPid() -{ - return hostPid_; -} - -std::string RenderRecord::GetRenderParam() -{ - return renderParam_; -} - -int32_t RenderRecord::GetIpcFd() -{ - return ipcFd_; -} - -int32_t RenderRecord::GetSharedFd() -{ - return sharedFd_; -} - -std::shared_ptr RenderRecord::GetHostRecord() -{ - return host_.lock(); -} - -sptr RenderRecord::GetScheduler() -{ - return renderScheduler_; -} - -void RenderRecord::SetScheduler(const sptr &scheduler) -{ - renderScheduler_ = scheduler; -} - -void RenderRecord::SetDeathRecipient(const sptr recipient) -{ - deathRecipient_ = recipient; -} - -void RenderRecord::RegisterDeathRecipient() -{ - if (renderScheduler_ && deathRecipient_) { - auto obj = renderScheduler_->AsObject(); - if (obj) { - obj->AddDeathRecipient(deathRecipient_); - } - } -} - AppRunningRecord::AppRunningRecord( const std::shared_ptr &info, const int32_t recordId, const std::string &processName) : appRecordId_(recordId), processName_(processName) @@ -994,25 +909,5 @@ void AppRunningRecord::UpdateConfiguration(const Configuration &config) } appLifeCycleDeal_->UpdateConfiguration(config); } - -void AppRunningRecord::SetRenderRecord(const std::shared_ptr &record) -{ - renderRecord_ = record; -} - -std::shared_ptr AppRunningRecord::GetRenderRecord() -{ - return renderRecord_; -} - -void AppRunningRecord::SetStartMsg(const AppSpawnStartMsg &msg) -{ - startMsg_ = msg; -} - -AppSpawnStartMsg AppRunningRecord::GetStartMsg() -{ - return startMsg_; -} } // namespace AppExecFwk -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/appmgr/src/app_spawn_client.cpp b/services/appmgr/src/app_spawn_client.cpp index 521653972ab..2229827afac 100644 --- a/services/appmgr/src/app_spawn_client.cpp +++ b/services/appmgr/src/app_spawn_client.cpp @@ -25,9 +25,9 @@ const int32_t CONNECT_RETRY_DELAY = 200 * 1000; // 200ms const int32_t CONNECT_RETRY_MAX_TIMES = 15; } // namespace -AppSpawnClient::AppSpawnClient(bool isWebViewSpawn) +AppSpawnClient::AppSpawnClient() { - socket_ = std::make_shared(isWebViewSpawn); + socket_ = std::make_shared(); state_ = SpawnConnectionState::STATE_NOT_CONNECT; } diff --git a/services/appmgr/src/app_spawn_socket.cpp b/services/appmgr/src/app_spawn_socket.cpp index 4714dd47d1e..327b5255cee 100644 --- a/services/appmgr/src/app_spawn_socket.cpp +++ b/services/appmgr/src/app_spawn_socket.cpp @@ -19,15 +19,11 @@ namespace OHOS { namespace AppExecFwk { -// arg "AppSpawn" or "WebViewSpawn" cannot be defined as string object since REGISTER_SYSTEM_ABILITY will +// arg "AppSpawn" cannot be defined as string object since REGISTER_SYSTEM_ABILITY will // firstly start without init this string object, which leads to error. -AppSpawnSocket::AppSpawnSocket(bool isWebViewSpawn) -{ - clientSocket_ = isWebViewSpawn ? - std::make_unique("/dev/unix/socket/WebViewSpawn") : - std::make_unique("AppSpawn"); -} +AppSpawnSocket::AppSpawnSocket() : clientSocket_(std::make_unique("AppSpawn")) +{} AppSpawnSocket::~AppSpawnSocket() {} diff --git a/services/appmgr/src/lmks/lmks_utils.cpp b/services/appmgr/src/lmks/lmks_utils.cpp index c3280f09ac8..8a1833a30f7 100644 --- a/services/appmgr/src/lmks/lmks_utils.cpp +++ b/services/appmgr/src/lmks/lmks_utils.cpp @@ -54,8 +54,14 @@ int LmksUtils::RemoveProcess(pid_t pid) } // kill process - HiLog::Info(LABEL, "kill pid %{public}d success, name %{public}s size %{public}d", - pid, procName.c_str(), procSize); + int ret = kill(pid, SIGKILL); + if (ret) { + HiLog::Warn(LABEL, "kill pid %{public}d err %{public}s", pid, strerror(errno)); + return (-errno); + } else { + HiLog::Info( + LABEL, "kill pid %{public}d success, name %{public}s size %{public}d", pid, procName.c_str(), procSize); + } return 0; } diff --git a/services/appmgr/src/process_optimizer.cpp b/services/appmgr/src/process_optimizer.cpp index f03e0a4e149..534f4cd5df5 100644 --- a/services/appmgr/src/process_optimizer.cpp +++ b/services/appmgr/src/process_optimizer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -61,6 +61,8 @@ constexpr int APP_OOM_ADJ_UNKNOWN_VALUE = 64 * 1024; constexpr std::string_view SYSTEM_UI_BUNDLE_NAME = "com.ohos.systemui"; +constexpr int TIME_ADVANCE_RATE = 1000; + // pressure level low constexpr int LMKS_OOM_ADJ_LOW = 800; // pressure level medium @@ -684,5 +686,26 @@ std::string ProcessOptimizer::GetAppSuspendTimerName(const AppPtr &app) return ret; } + +void ProcessOptimizer::SetAppFreezingTime(int time) +{ + APP_LOGE("input second time:[%{public}d]", time); + + if (time > APP_SUSPEND_TIMEOUT_MAX && time < 0) { + APP_LOGE("input time error."); + return; + } + + suspendTimeout_ = time; + // convert seconds to milliseconds + suspendTimeout_ *= TIME_ADVANCE_RATE; +} + +void ProcessOptimizer::GetAppFreezingTime(int &time) +{ + time = suspendTimeout_ / TIME_ADVANCE_RATE; + APP_LOGE("current freez time:[%{public}d]", time); + return; +} } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/src/process_optimizer_uba.cpp b/services/appmgr/src/process_optimizer_uba.cpp index 1dfe17b118d..679243386a9 100644 --- a/services/appmgr/src/process_optimizer_uba.cpp +++ b/services/appmgr/src/process_optimizer_uba.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -384,5 +384,25 @@ UbaServicePtr ProcessOptimizerUBA::GetUbaService() // try to get uba service here. return nullptr; } + +void ProcessOptimizerUBA::SetAppFreezingTime(int time) +{ + auto ubaService = GetUbaService(); + if (ubaService) { + APP_LOGI("ubaService implement."); + } else { + ProcessOptimizer::SetAppFreezingTime(time); + } +} + +void ProcessOptimizerUBA::GetAppFreezingTime(int &time) +{ + auto ubaService = GetUbaService(); + if (ubaService) { + APP_LOGI("ubaService implement."); + } else { + ProcessOptimizer::GetAppFreezingTime(time); + } +} } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/src/remote_client_manager.cpp b/services/appmgr/src/remote_client_manager.cpp index 8184aa67b9f..711b395c0d5 100644 --- a/services/appmgr/src/remote_client_manager.cpp +++ b/services/appmgr/src/remote_client_manager.cpp @@ -22,8 +22,7 @@ namespace OHOS { namespace AppExecFwk { -RemoteClientManager::RemoteClientManager() - : appSpawnClient_(std::make_shared()), webviewSpawnClient_(std::make_shared(true)) +RemoteClientManager::RemoteClientManager() : appSpawnClient_(std::make_shared()) {} RemoteClientManager::~RemoteClientManager() @@ -60,10 +59,5 @@ void RemoteClientManager::SetBundleManager(sptr bundleManager) { bundleManager_ = bundleManager; } - -std::shared_ptr RemoteClientManager::GetWebviewSpawnClient() -{ - return webviewSpawnClient_; -} } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/services/appmgr/test/BUILD.gn b/services/appmgr/test/BUILD.gn index 845e14df8fd..372b896a424 100644 --- a/services/appmgr/test/BUILD.gn +++ b/services/appmgr/test/BUILD.gn @@ -49,8 +49,6 @@ ohos_source_set("appmgr_test_source") { "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp", "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp", "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/profile.cpp", - "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/render_scheduler_host.cpp", - "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/render_scheduler_proxy.cpp", "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/running_process_info.cpp", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/src/ability_info.cpp", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/src/application_info.cpp", diff --git a/services/appmgr/test/mock/include/mock_app_mgr_service.h b/services/appmgr/test/mock/include/mock_app_mgr_service.h index dbd56b7565b..7c6908a5041 100644 --- a/services/appmgr/test/mock/include/mock_app_mgr_service.h +++ b/services/appmgr/test/mock/include/mock_app_mgr_service.h @@ -48,8 +48,6 @@ public: MOCK_METHOD2(GetSystemMemoryAttr, void(SystemMemoryAttr &memoryInfo, std::string &strConfig)); MOCK_METHOD0(StartupResidentProcess, void()); MOCK_METHOD1(AddAbilityStageDone, void(const int32_t recordId)); - MOCK_METHOD4(StartRenderProcess, int(const std::string&, int32_t, int32_t, pid_t&)); - MOCK_METHOD1(AttachRenderProcess, void(const sptr &renderScheduler)); MOCK_METHOD1(RegisterApplicationStateObserver, int32_t(const sptr &observer)); MOCK_METHOD1(UnregisterApplicationStateObserver, int32_t(const sptr &observer)); MOCK_METHOD3(ScheduleAcceptWantDone, diff --git a/services/appmgr/test/mock/include/mock_app_spawn_socket.h b/services/appmgr/test/mock/include/mock_app_spawn_socket.h index ea102b63e8e..4a14ec5ee10 100644 --- a/services/appmgr/test/mock/include/mock_app_spawn_socket.h +++ b/services/appmgr/test/mock/include/mock_app_spawn_socket.h @@ -26,7 +26,7 @@ namespace OHOS { namespace AppExecFwk { class MockAppSpawnSocket : public AppSpawnSocket { public: - MockAppSpawnSocket() : AppSpawnSocket(false) {} + MockAppSpawnSocket() = default; virtual ~MockAppSpawnSocket() = default; MOCK_METHOD0(OpenAppSpawnConnection, ErrCode()); diff --git a/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn b/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn index da2dfe6863f..cd40ee74bbb 100644 --- a/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn @@ -34,7 +34,6 @@ ohos_unittest("AmsAbilityRunningRecordTest") { sources = [ "${services_path}/appmgr/src/ability_running_record.cpp", - "${services_path}/appmgr/src/app_death_recipient.cpp", "${services_path}/appmgr/src/app_mgr_service_inner.cpp", "${services_path}/appmgr/src/app_running_record.cpp", "${services_path}/appmgr/src/app_spawn_client.cpp", @@ -56,7 +55,6 @@ ohos_unittest("AmsAbilityRunningRecordTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/services/appmgr:libams", diff --git a/services/appmgr/test/unittest/ams_app_death_recipient_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_death_recipient_test/BUILD.gn index dc221c935c3..d405e30a4a4 100644 --- a/services/appmgr/test/unittest/ams_app_death_recipient_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_death_recipient_test/BUILD.gn @@ -59,7 +59,6 @@ ohos_unittest("AppDeathRecipientTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/interfaces/innerkits/base:base", diff --git a/services/appmgr/test/unittest/ams_app_life_cycle_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_life_cycle_test/BUILD.gn index 1554bc6a973..1d45a37a3d2 100644 --- a/services/appmgr/test/unittest/ams_app_life_cycle_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_life_cycle_test/BUILD.gn @@ -28,7 +28,6 @@ ohos_unittest("AmsAppLifeCycleTest") { sources = [ "${services_path}/appmgr/src/ability_running_record.cpp", - "${services_path}/appmgr/src/app_death_recipient.cpp", "${services_path}/appmgr/src/app_lifecycle_deal.cpp", "${services_path}/appmgr/src/app_mgr_service_event_handler.cpp", "${services_path}/appmgr/src/app_mgr_service_inner.cpp", @@ -59,7 +58,6 @@ ohos_unittest("AmsAppLifeCycleTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/interfaces/innerkits/base:base", diff --git a/services/appmgr/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp b/services/appmgr/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp index 37a4c51cb24..cafc0b13ea6 100644 --- a/services/appmgr/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp +++ b/services/appmgr/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -1898,6 +1898,21 @@ HWTEST_F(AmsAppLifeCycleTest, ClearUpApplicationData_001, TestSize.Level1) serviceInner_->ClearUpApplicationData(appRecord->GetBundleName(), appRecord->GetUid(), NEW_PID); } +/* + * Feature: AMS + * Function: AppLifeCycle::IsBackgroundRunningRestricted + * SubFunction: bundleMgr CheckPermission + * FunctionPoints: UnsuspendApplication + * CaseDescription: Check if there is background operation permission + */ +HWTEST_F(AmsAppLifeCycleTest, IsBackgroundRunningRestricted_001, TestSize.Level1) +{ + sptr bundleMgr = new BundleMgrService(); + serviceInner_->SetBundleManager(bundleMgr); + EXPECT_CALL(*bundleMgr, CheckPermission(_, _)).Times(1).WillOnce(Return(ERR_OK)); + EXPECT_EQ(ERR_OK, serviceInner_->IsBackgroundRunningRestricted("bundle")); +} + /* * Feature: AMS * Function: AppLifeCycle::CreateAppRunningRecord diff --git a/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn index 370e73e780d..3f49da62496 100644 --- a/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -47,7 +47,6 @@ ohos_unittest("AmsAppMgrClientTest") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/appmgr/test:appmgr_test_source", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", diff --git a/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn index 82442b11ca1..77f587aadce 100644 --- a/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn @@ -33,7 +33,6 @@ ohos_unittest("AmsAppRunningRecordTest") { sources = [ "${services_path}/appmgr/src/ability_running_record.cpp", - "${services_path}/appmgr/src/app_death_recipient.cpp", "${services_path}/appmgr/src/app_mgr_service_inner.cpp", "${services_path}/appmgr/src/app_running_record.cpp", "${services_path}/appmgr/src/app_spawn_client.cpp", @@ -54,7 +53,6 @@ ohos_unittest("AmsAppRunningRecordTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/services/appmgr:libams", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", diff --git a/services/appmgr/test/unittest/ams_app_workflow_test/BUILD.gn b/services/appmgr/test/unittest/ams_app_workflow_test/BUILD.gn index 254ac523d03..694353fa851 100644 --- a/services/appmgr/test/unittest/ams_app_workflow_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_app_workflow_test/BUILD.gn @@ -29,7 +29,6 @@ ohos_unittest("AmsWorkFlowTest") { sources = [ "${services_path}/appmgr/src/ability_running_record.cpp", - "${services_path}/appmgr/src/app_death_recipient.cpp", "${services_path}/appmgr/src/app_lifecycle_deal.cpp", "${services_path}/appmgr/src/app_mgr_service_event_handler.cpp", "${services_path}/appmgr/src/app_mgr_service_inner.cpp", @@ -57,7 +56,6 @@ ohos_unittest("AmsWorkFlowTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", diff --git a/services/appmgr/test/unittest/ams_ipc_interface_test/ams_ipc_appmgr_interface_test.cpp b/services/appmgr/test/unittest/ams_ipc_interface_test/ams_ipc_appmgr_interface_test.cpp index 9bfd1a4b3ea..4b7f1e95471 100644 --- a/services/appmgr/test/unittest/ams_ipc_interface_test/ams_ipc_appmgr_interface_test.cpp +++ b/services/appmgr/test/unittest/ams_ipc_interface_test/ams_ipc_appmgr_interface_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -213,6 +213,33 @@ HWTEST_F(AmsIpcAppMgrInterfaceTest, ClearUpApplicationData_008, TestSize.Level1) APP_LOGD("ClearUpApplicationData_008 end"); } +/* + * Feature: AMS + * Function: IPC IsBackgroundRunningRestricted + * SubFunction: appmgr interface + * FunctionPoints: Check background operation + * CaseDescription: test IPC can transact data + */ +HWTEST_F(AmsIpcAppMgrInterfaceTest, IsBackgroundRunningRestricted_009, TestSize.Level1) +{ + APP_LOGD("IsBackgroundRunningRestricted_009 start"); + + sptr mockAppMgr(new MockAppMgrService()); + sptr appMgrClient = iface_cast(mockAppMgr); + + EXPECT_CALL(*mockAppMgr, IsBackgroundRunningRestricted(_)).Times(1).WillOnce(Return(OHOS::NO_ERROR)); + + int32_t ret = appMgrClient->IsBackgroundRunningRestricted("PROCESS"); + + EXPECT_EQ(ret, OHOS::NO_ERROR); + // Returns 32 when the bundle name is empty + EXPECT_CALL(*mockAppMgr, IsBackgroundRunningRestricted(_)).Times(1).WillOnce(Return(32)); + ret = appMgrClient->IsBackgroundRunningRestricted(""); + + EXPECT_EQ(ret, 32); + APP_LOGD("IsBackgroundRunningRestricted_009 end"); +} + /* * Feature: AMS * Function: IPC diff --git a/services/appmgr/test/unittest/ams_mgr_scheduler_test/ams_mgr_scheduler_test.cpp b/services/appmgr/test/unittest/ams_mgr_scheduler_test/ams_mgr_scheduler_test.cpp index 0a99396ef84..85f35cacbda 100644 --- a/services/appmgr/test/unittest/ams_mgr_scheduler_test/ams_mgr_scheduler_test.cpp +++ b/services/appmgr/test/unittest/ams_mgr_scheduler_test/ams_mgr_scheduler_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -238,6 +238,32 @@ HWTEST_F(AmsMgrSchedulerTest, AmsMgrScheduler_005, TestSize.Level1) APP_LOGD("AmsMgrScheduler_005 end."); } +/* + * Feature: AMS + * Function: AmsMgrScheduler + * SubFunction: Reset + * FunctionPoints: Act normal + * EnvConditions: Mobile that can run ohos test framework. + * CaseDescription: Verify the function Reset can works. + */ +HWTEST_F(AmsMgrSchedulerTest, AmsMgrScheduler_006, TestSize.Level1) +{ + APP_LOGD("AmsMgrScheduler_006 start."); + + auto mockAppMgrServiceInner = GetMockAppMgrServiceInner(); + auto amsEventHandler = GetAmsEventHandler(); + std::unique_ptr amsMgrScheduler = + std::make_unique(mockAppMgrServiceInner, amsEventHandler); + + sptr appStateCallbackHost = new AppStateCallbackHost(); + EXPECT_CALL(*mockAppMgrServiceInner, StopAllProcess()) + .WillOnce(InvokeWithoutArgs(mockAppMgrServiceInner.get(), &MockAppMgrServiceInner::Post)); + amsMgrScheduler->Reset(); + mockAppMgrServiceInner->Wait(); + + APP_LOGD("AmsMgrScheduler_006 end."); +} + /* * Feature: AMS * Function: AmsMgrScheduler diff --git a/services/appmgr/test/unittest/ams_recent_app_list_test/BUILD.gn b/services/appmgr/test/unittest/ams_recent_app_list_test/BUILD.gn index 49ef60e977f..10d50345d28 100644 --- a/services/appmgr/test/unittest/ams_recent_app_list_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_recent_app_list_test/BUILD.gn @@ -27,7 +27,6 @@ ohos_unittest("AmsRecentAppListTest") { sources = [ "${services_path}/appmgr/src/ability_running_record.cpp", - "${services_path}/appmgr/src/app_death_recipient.cpp", "${services_path}/appmgr/src/app_lifecycle_deal.cpp", "${services_path}/appmgr/src/app_mgr_service_inner.cpp", "${services_path}/appmgr/src/app_process_manager.cpp", @@ -57,7 +56,6 @@ ohos_unittest("AmsRecentAppListTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/interfaces/innerkits/base:base", diff --git a/services/appmgr/test/unittest/ams_service_app_spawn_client_test/BUILD.gn b/services/appmgr/test/unittest/ams_service_app_spawn_client_test/BUILD.gn index 477e6e2c17c..c09f3a61dce 100644 --- a/services/appmgr/test/unittest/ams_service_app_spawn_client_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_service_app_spawn_client_test/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("AmsServiceAppSpawnClientTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", diff --git a/services/appmgr/test/unittest/ams_service_event_drive_test/BUILD.gn b/services/appmgr/test/unittest/ams_service_event_drive_test/BUILD.gn index 4c7f3d6470d..48fba9708ff 100644 --- a/services/appmgr/test/unittest/ams_service_event_drive_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_service_event_drive_test/BUILD.gn @@ -56,7 +56,6 @@ ohos_unittest("AmsServiceEventDriveTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", diff --git a/services/appmgr/test/unittest/ams_service_event_drive_test/ams_service_event_drive_test.cpp b/services/appmgr/test/unittest/ams_service_event_drive_test/ams_service_event_drive_test.cpp index 576239b3274..f17bbdbe689 100644 --- a/services/appmgr/test/unittest/ams_service_event_drive_test/ams_service_event_drive_test.cpp +++ b/services/appmgr/test/unittest/ams_service_event_drive_test/ams_service_event_drive_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -226,6 +226,30 @@ HWTEST_F(AmsServiceEventDriveTest, EventDrive_006, TestSize.Level1) APP_LOGI("ams_service_event_drive_test_006 end"); } +/* + * Feature: AppMgrService + * Function: Service + * SubFunction: EventDrive + * FunctionPoints: AppMgrService event drive program model + * EnvConditions: Mobile that can run ohos test framework + * CaseDescription: Verify if post IsBackgroundRunningRestricted task success + */ +HWTEST_F(AmsServiceEventDriveTest, EventDrive_007, TestSize.Level1) +{ + APP_LOGI("ams_service_event_drive_test_007 start"); + + std::shared_ptr innerService = std::make_shared(); + appMgrService_->SetInnerService(innerService); + appMgrService_->OnStart(); + + EXPECT_CALL(*innerService, IsBackgroundRunningRestricted(_)).WillOnce(Return(0)); + + std::string appName = "appName"; + EXPECT_EQ(0, appMgrService_->IsBackgroundRunningRestricted(appName)); + + APP_LOGI("ams_service_event_drive_test_007 end"); +} + /* * Feature: AppMgrService * Function: Service @@ -394,6 +418,28 @@ HWTEST_F(AmsServiceEventDriveTest, EventDrive_014, TestSize.Level1) APP_LOGI("ams_service_event_drive_test_014 end"); } +/* + * Feature: AppMgrService + * Function: Service + * SubFunction: EventDrive + * FunctionPoints: AppMgrService event drive program model + * EnvConditions: Mobile that can run ohos test framework + * CaseDescription: Verify if IsBackgroundRunningRestricted act normal after AppMgrService stopped + */ +HWTEST_F(AmsServiceEventDriveTest, EventDrive_015, TestSize.Level1) +{ + APP_LOGI("ams_service_event_drive_test_015 start"); + + appMgrService_->OnStop(); + std::shared_ptr innerService = std::make_shared(); + appMgrService_->SetInnerService(innerService); + + std::string appName = "appName"; + EXPECT_EQ(OHOS::ERR_INVALID_OPERATION, appMgrService_->IsBackgroundRunningRestricted(appName)); + + APP_LOGI("ams_service_event_drive_test_015 end"); +} + /* * Feature: AppMgrService * Function: Service @@ -564,6 +610,28 @@ HWTEST_F(AmsServiceEventDriveTest, EventDrive_022, TestSize.Level1) APP_LOGI("ams_service_event_drive_test_022 end"); } +/* + * Feature: AppMgrService + * Function: Service + * SubFunction: EventDrive + * FunctionPoints: AppMgrService event drive program model + * EnvConditions: Mobile that can run ohos test framework + * CaseDescription: Verify if IsBackgroundRunningRestricted act normal after AppMgrService stopped + */ +HWTEST_F(AmsServiceEventDriveTest, EventDrive_023, TestSize.Level1) +{ + APP_LOGI("ams_service_event_drive_test_023 start"); + std::shared_ptr innerService = std::make_shared(); + appMgrService_->SetInnerService(innerService); + appMgrService_->OnStart(); + appMgrService_->OnStop(); + + std::string appName = "appName"; + EXPECT_EQ(OHOS::ERR_INVALID_OPERATION, appMgrService_->IsBackgroundRunningRestricted(appName)); + + APP_LOGI("ams_service_event_drive_test_023 end"); +} + /* * Feature: AppMgrService * Function: Service diff --git a/services/appmgr/test/unittest/ams_service_load_ability_process_test/BUILD.gn b/services/appmgr/test/unittest/ams_service_load_ability_process_test/BUILD.gn index 18c0cf797af..367663fa6a5 100644 --- a/services/appmgr/test/unittest/ams_service_load_ability_process_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_service_load_ability_process_test/BUILD.gn @@ -27,7 +27,6 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") { sources = [ "${services_path}/appmgr/src/ability_running_record.cpp", - "${services_path}/appmgr/src/app_death_recipient.cpp", "${services_path}/appmgr/src/app_lifecycle_deal.cpp", "${services_path}/appmgr/src/app_mgr_service_inner.cpp", "${services_path}/appmgr/src/app_process_manager.cpp", @@ -61,7 +60,6 @@ ohos_unittest("AmsServiceLoadAbilityProcessTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", diff --git a/services/appmgr/test/unittest/ams_service_startup_test/BUILD.gn b/services/appmgr/test/unittest/ams_service_startup_test/BUILD.gn index d34b4169490..fc65f97e04a 100644 --- a/services/appmgr/test/unittest/ams_service_startup_test/BUILD.gn +++ b/services/appmgr/test/unittest/ams_service_startup_test/BUILD.gn @@ -51,7 +51,6 @@ ohos_unittest("AmsServiceStartupTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/interfaces/innerkits/base:base", diff --git a/services/appmgr/test/unittest/app_mgr_service_event_handler_test/BUILD.gn b/services/appmgr/test/unittest/app_mgr_service_event_handler_test/BUILD.gn index 635e47a975f..914c579d618 100644 --- a/services/appmgr/test/unittest/app_mgr_service_event_handler_test/BUILD.gn +++ b/services/appmgr/test/unittest/app_mgr_service_event_handler_test/BUILD.gn @@ -59,7 +59,6 @@ ohos_unittest("AMSEventHandlerTest") { "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${innerkits_path}/uri_permission:uri_permission_mgr", "${services_path}/appmgr/test:appmgr_test_source", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", "//foundation/aafwk/standard/interfaces/innerkits/base:base", diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn index 60e148c9e31..28587377112 100644 --- a/services/common/BUILD.gn +++ b/services/common/BUILD.gn @@ -1,5 +1,5 @@ # -# Copyright (c) 2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -29,29 +29,3 @@ ohos_source_set("abilitymgr_common") { external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } - -config("perm_verification_config") { - visibility = [ ":*" ] - include_dirs = [ "include" ] - cflags = [] - if (target_cpu == "arm") { - cflags += [ "-DBINDER_IPC_32BIT" ] - } -} - -#build so -ohos_shared_library("perm_verification") { - public_configs = [ ":perm_verification_config" ] - - sources = [ "src/permission_verification.cpp" ] - - external_deps = [ - "access_token:libaccesstoken_sdk", - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", - "utils_base:utils", - ] - - subsystem_name = "aafwk" - part_name = "ability_runtime" -} diff --git a/services/common/include/permission_constants.h b/services/common/include/permission_constants.h deleted file mode 100644 index fce13bd70ba..00000000000 --- a/services/common/include/permission_constants.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_AAFWK_PERMISSION_CONSTANTS_H -#define OHOS_AAFWK_PERMISSION_CONSTANTS_H - -namespace OHOS { -namespace AAFwk { -namespace PermissionConstants { -const std::string PERMISSION_CLEAN_BACKGROUND_PROCESSES = "ohos.permission.CLEAN_BACKGROUND_PROCESSES"; -const std::string PERMISSION_INTERACT_ACROSS_LOCAL_ACCOUNTS = "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS"; -const std::string PERMISSION_GET_RUNNING_INFO = "ohos.permission.GET_RUNNING_INFO"; -const std::string PERMISSION_UPDATE_CONFIGURATION = "ohos.permission.UPDATE_CONFIGURATION"; -const std::string PERMISSION_CLEAN_APPLICATION_DATA = "ohos.permission.CLEAN_APPLICATION_DATA"; -const std::string PERMISSION_RUNNING_STATE_OBSERVER = "ohos.permission.RUNNING_STATE_OBSERVER"; -const std::string PERMISSION_MANAGE_MISSION = "ohos.permission.MANAGE_MISSIONS"; -} // namespace PermissionConstants -} // namespace AAFwk -} // namespace OHOS -#endif // OHOS_AAFWK_PERMISSION_CONSTANTS_H \ No newline at end of file diff --git a/services/common/include/permission_verification.h b/services/common/include/permission_verification.h deleted file mode 100644 index 89e6fd773ae..00000000000 --- a/services/common/include/permission_verification.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_AAFWK_PERMISSION_VERIFICATION_H -#define OHOS_AAFWK_PERMISSION_VERIFICATION_H - -#include - -#include "singleton.h" - -namespace OHOS { -namespace AAFwk { -class PermissionVerification : public DelayedSingleton { -public: - PermissionVerification() = default; - ~PermissionVerification() = default; - - bool VerifyCallingPermission(const std::string &permissionName); - - bool IsSACall(); - - bool VerifyRunningInfoPerm(); - -private: - DISALLOW_COPY_AND_MOVE(PermissionVerification); - unsigned int GetCallingTokenID(); -}; -} // namespace AAFwk -} // namespace OHOS -#endif // OHOS_AAFWK_PERMISSION_VERIFICATION_H \ No newline at end of file diff --git a/services/common/src/permission_verification.cpp b/services/common/src/permission_verification.cpp deleted file mode 100644 index 10d186be7c3..00000000000 --- a/services/common/src/permission_verification.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "permission_verification.h" - -#include "accesstoken_kit.h" -#include "hilog_wrapper.h" -#include "ipc_skeleton.h" -#include "permission_constants.h" - -namespace OHOS { -namespace AAFwk { -bool PermissionVerification::VerifyCallingPermission(const std::string &permissionName) -{ - HILOG_DEBUG("VerifyCallingPermission permission %{public}s", permissionName.c_str()); - auto callerToken = GetCallingTokenID(); - int32_t ret = Security::AccessToken::AccessTokenKit::VerifyAccessToken(callerToken, permissionName); - if (ret == Security::AccessToken::PermissionState::PERMISSION_DENIED) { - HILOG_ERROR("permission %{public}s: PERMISSION_DENIED", permissionName.c_str()); - return false; - } - HILOG_DEBUG("verify AccessToken success"); - return true; -} - -bool PermissionVerification::IsSACall() -{ - HILOG_DEBUG("AmsMgrScheduler::IsSACall is called."); - auto callerToken = GetCallingTokenID(); - auto tokenType = Security::AccessToken::AccessTokenKit::GetTokenTypeFlag(callerToken); - if (tokenType == Security::AccessToken::ATokenTypeEnum::TOKEN_NATIVE) { - HILOG_DEBUG("caller tokenType is native, verify success"); - return true; - } - HILOG_DEBUG("Not SA called."); - return false; -} - -bool PermissionVerification::VerifyRunningInfoPerm() -{ - if (IsSACall()) { - HILOG_DEBUG("%{public}s: the interface called by SA.", __func__); - return true; - } - if (VerifyCallingPermission(PermissionConstants::PERMISSION_GET_RUNNING_INFO)) { - HILOG_DEBUG("%{public}s: Permission verification succeeded.", __func__); - return true; - } - HILOG_ERROR("%{public}s: Permission verification failed.", __func__); - return false; -} - -unsigned int PermissionVerification::GetCallingTokenID() -{ - auto callerToken = IPCSkeleton::GetCallingTokenID(); - HILOG_DEBUG("callerToken : %{public}u", callerToken); - return callerToken; -} -} // namespace AAFwk -} // namespace OHOS \ No newline at end of file diff --git a/services/formmgr/BUILD.gn b/services/formmgr/BUILD.gn index 1df7b815b4e..cc0963ffc1e 100644 --- a/services/formmgr/BUILD.gn +++ b/services/formmgr/BUILD.gn @@ -30,7 +30,6 @@ group("fms_target") { ohos_shared_library("libfms") { include_dirs = [ - "${services_path}/common:perm_verification", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk/main/cpp/include", @@ -91,7 +90,6 @@ ohos_shared_library("libfms") { deps = [ "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", - "${services_path}/common:perm_verification", "//base/miscservices/time/services:time_service", "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits", diff --git a/services/formmgr/include/form_info_mgr.h b/services/formmgr/include/form_info_mgr.h index 74bdb8db553..42bfdb441b6 100644 --- a/services/formmgr/include/form_info_mgr.h +++ b/services/formmgr/include/form_info_mgr.h @@ -79,8 +79,6 @@ public: private: std::shared_ptr GetOrCreateBundleFromInfo(const std::string &bundleName); - bool IsCaller(std::string bundleName); - bool CheckBundlePermission(); mutable std::shared_timed_mutex bundleFormInfoMapMutex_ {}; std::unordered_map> bundleFormInfoMap_ {}; diff --git a/services/formmgr/include/form_mgr_service.h b/services/formmgr/include/form_mgr_service.h index 400a368f640..ffb36aa484b 100644 --- a/services/formmgr/include/form_mgr_service.h +++ b/services/formmgr/include/form_mgr_service.h @@ -233,7 +233,19 @@ private: */ ErrCode Init(); + /** + * @brief Permission check by callingUid. + * @param formId the id of the form. + * @return Returns true on success, false on failure. + */ bool CheckFormPermission(); + + /** + * @brief Permission check. + * @param bundleName bundleName. + * @return Returns true on success, false on failure. + */ + bool CheckFormPermission(const std::string &bundleName) const; private: ServiceRunningState state_; diff --git a/services/formmgr/include/form_timer.h b/services/formmgr/include/form_timer.h index db681db10f6..e52bac2530c 100644 --- a/services/formmgr/include/form_timer.h +++ b/services/formmgr/include/form_timer.h @@ -42,7 +42,7 @@ public: bool isUpdateAt; int64_t refreshTime; bool isEnable = true; - bool isCountTimer; + bool isCountTimer = false; UpdateType type = UpdateType::TYPE_INTERVAL_CHANGE; FormTimer() @@ -54,7 +54,7 @@ public: min = -1; isUpdateAt = false; isCountTimer = false; - refreshTime = LONG_MAX; + refreshTime = 0; type = UpdateType::TYPE_INTERVAL_CHANGE; } @@ -67,7 +67,7 @@ public: min = -1; isUpdateAt = false; isCountTimer = countTimer; - refreshTime = LONG_MAX; + refreshTime = 0; type = UpdateType::TYPE_INTERVAL_CHANGE; } @@ -80,7 +80,7 @@ public: min = -1; isUpdateAt = false; isCountTimer = true; - refreshTime = LONG_MAX; + refreshTime = 0; type = UpdateType::TYPE_INTERVAL_CHANGE; } @@ -93,7 +93,7 @@ public: period = -1; isUpdateAt = true; isCountTimer = false; - refreshTime = LONG_MAX; + refreshTime = 0; type = UpdateType::TYPE_INTERVAL_CHANGE; } ~FormTimer(void){ @@ -105,7 +105,7 @@ public: */ class UpdateAtItem { public: - long updateAtTime = -1; + int updateAtTime = -1; FormTimer refreshTask; }; /** diff --git a/services/formmgr/src/form_info_mgr.cpp b/services/formmgr/src/form_info_mgr.cpp index d4a988f3c38..370e25f7951 100644 --- a/services/formmgr/src/form_info_mgr.cpp +++ b/services/formmgr/src/form_info_mgr.cpp @@ -23,9 +23,7 @@ #include "form_bms_helper.h" #include "form_info_storage_mgr.h" #include "form_util.h" -#include "ipc_skeleton.h" #include "json_serializer.h" -#include "permission_verification.h" namespace OHOS { namespace AppExecFwk { @@ -276,22 +274,10 @@ ErrCode FormInfoMgr::Remove(const std::string &bundleName) ErrCode FormInfoMgr::GetAllFormsInfo(std::vector &formInfos) { - bool hasPermission = CheckBundlePermission(); std::shared_lock guard(bundleFormInfoMapMutex_); - if (hasPermission) { - for (const auto &bundleFormInfo: bundleFormInfoMap_) { - if (bundleFormInfo.second != nullptr) { - bundleFormInfo.second->GetAllFormsInfo(formInfos); - } - } - } else { - for (const auto &bundleFormInfo: bundleFormInfoMap_) { - if (IsCaller(bundleFormInfo.first)) { - if (bundleFormInfo.second != nullptr) { - bundleFormInfo.second->GetAllFormsInfo(formInfos); - } - return ERR_OK; - } + for (const auto &bundleFormInfo: bundleFormInfoMap_) { + if (bundleFormInfo.second != nullptr) { + bundleFormInfo.second->GetAllFormsInfo(formInfos); } } return ERR_OK; @@ -304,10 +290,6 @@ ErrCode FormInfoMgr::GetFormsInfoByBundle(const std::string &bundleName, std::ve return ERR_APPEXECFWK_FORM_INVALID_PARAM; } - if (!CheckBundlePermission() && !IsCaller(bundleName)) { - return ERR_APPEXECFWK_FORM_PERMISSION_DENY; - } - std::shared_lock guard(bundleFormInfoMapMutex_); auto bundleFormInfoIter = bundleFormInfoMap_.find(bundleName); if (bundleFormInfoIter == bundleFormInfoMap_.end()) { @@ -329,10 +311,6 @@ ErrCode FormInfoMgr::GetFormsInfoByModule(const std::string &bundleName, const s return ERR_APPEXECFWK_FORM_INVALID_PARAM; } - if (!CheckBundlePermission() && !IsCaller(bundleName)) { - return ERR_APPEXECFWK_FORM_PERMISSION_DENY; - } - std::shared_lock guard(bundleFormInfoMapMutex_); auto bundleFormInfoIter = bundleFormInfoMap_.find(bundleName); if (bundleFormInfoIter == bundleFormInfoMap_.end()) { @@ -369,39 +347,5 @@ std::shared_ptr FormInfoMgr::GetOrCreateBundleFromInfo(const std bundleFormInfoMap_[bundleName] = bundleFormInfoPtr; return bundleFormInfoPtr; } - -bool FormInfoMgr::IsCaller(std::string bundleName) -{ - auto bms = FormBmsHelper::GetInstance().GetBundleMgr(); - if (!bms) { - return false; - } - AppExecFwk::BundleInfo bundleInfo; - bool ret = bms->GetBundleInfo(bundleName, GET_BUNDLE_DEFAULT, bundleInfo, FormUtil::GetCurrentAccountId()); - if (!ret) { - APP_LOGE("Failed to get bundle info."); - return false; - } - auto callerToken = IPCSkeleton::GetCallingTokenID(); - if (bundleInfo.applicationInfo.accessTokenId == callerToken) { - return true; - } - return false; -} - -bool FormInfoMgr::CheckBundlePermission() -{ - auto isSaCall = AAFwk::PermissionVerification::GetInstance()->IsSACall(); - if (isSaCall) { - return true; - } - auto isCallingPerm = AAFwk::PermissionVerification::GetInstance()->VerifyCallingPermission( - AppExecFwk::Constants::PERMISSION_GET_BUNDLE_INFO_PRIVILEGED); - if (isCallingPerm) { - return true; - } - APP_LOGE("Permission verification failed"); - return false; -} } // namespace AppExecFwk } // namespace OHOS diff --git a/services/formmgr/src/form_mgr_adapter.cpp b/services/formmgr/src/form_mgr_adapter.cpp index df70f1d0768..1534979cd21 100644 --- a/services/formmgr/src/form_mgr_adapter.cpp +++ b/services/formmgr/src/form_mgr_adapter.cpp @@ -14,6 +14,7 @@ */ #include +#include #include "appexecfwk_errors.h" #include "app_log_wrapper.h" @@ -585,12 +586,10 @@ int FormMgrAdapter::CastTempForm(const int64_t formId, const sptr APP_LOGE("%{public}s fail, add form user uid error, formId:%{public}" PRId64 ".", __func__, matchedFormId); return ERR_APPEXECFWK_FORM_NOT_EXIST_ID; } - - if (!FormDataMgr::GetInstance().GetFormRecord(matchedFormId, formRecord)) { - APP_LOGE("%{public}s fail, not exist such form:%{public}" PRId64 ".", __func__, matchedFormId); - return ERR_APPEXECFWK_FORM_NOT_EXIST_ID; + if (std::find(formRecord.formUserUids.begin(), formRecord.formUserUids.end(), + callingUid) == formRecord.formUserUids.end()) { + formRecord.formUserUids.emplace_back(callingUid); } - if (ErrCode errorCode = FormDbCache::GetInstance().UpdateDBRecord(matchedFormId, formRecord); errorCode != ERR_OK) { APP_LOGE("%{public}s fail, update db record error, formId:%{public}" PRId64 ".", __func__, matchedFormId); return errorCode; @@ -1211,7 +1210,9 @@ ErrCode FormMgrAdapter::CreateFormItemInfo(const BundleInfo &bundleInfo, if (formInfo.moduleName == item.moduleName) { itemInfo.AddHapSourceDirs(item.moduleSourceDir); } - itemInfo.AddModuleInfo(item.moduleName, item.moduleSourceDir); + auto moduleSourceDir = std::regex_replace(item.moduleSourceDir, std::regex(Constants::ABS_CODE_PATH), + Constants::LOCAL_BUNDLES); + itemInfo.AddModuleInfo(item.moduleName, moduleSourceDir); } return ERR_OK; } diff --git a/services/formmgr/src/form_mgr_service.cpp b/services/formmgr/src/form_mgr_service.cpp index cf1ed09d0d2..e61d0f15ae9 100644 --- a/services/formmgr/src/form_mgr_service.cpp +++ b/services/formmgr/src/form_mgr_service.cpp @@ -37,7 +37,6 @@ #include "iservice_registry.h" #include "permission/permission.h" #include "permission/permission_kit.h" -#include "permission_verification.h" #include "string_ex.h" #include "system_ability_definition.h" @@ -142,6 +141,10 @@ int FormMgrService::ReleaseForm(const int64_t formId, const sptr int FormMgrService::UpdateForm(const int64_t formId, const std::string &bundleName, const FormProviderData &formBindingData) { + if (!CheckFormPermission()) { + APP_LOGE("%{public}s fail, update form permission denied", __func__); + return ERR_APPEXECFWK_FORM_PERMISSION_DENY; + } return FormMgrAdapter::GetInstance().UpdateForm(formId, bundleName, formBindingData); } @@ -391,20 +394,28 @@ ErrCode FormMgrService::Init() APP_LOGI("init success"); return ERR_OK; } - +/** + * @brief Permission check by callingUid. + * @param formId the id of the form. + * @return Returns true on success, false on failure. + */ bool FormMgrService::CheckFormPermission() { - auto isSaCall = AAFwk::PermissionVerification::GetInstance()->IsSACall(); - if (isSaCall) { - return true; + return true; +} + +bool FormMgrService::CheckFormPermission(const std::string &bundleName) const +{ + if (bundleName.empty()) { + APP_LOGE("%{public}s fail, bundleName can not be empty", __func__); + return false; } - auto isCallingPerm = AAFwk::PermissionVerification::GetInstance()->VerifyCallingPermission( - AppExecFwk::Constants::PERMISSION_REQUIRE_FORM); - if (isCallingPerm) { - return true; + int result = PermissionKit::VerifyPermission(bundleName, Constants::PERMISSION_REQUIRE_FORM, 0); + if (result != PermissionState::PERMISSION_GRANTED) { + APP_LOGW("permission = %{public}s, bundleName = %{public}s, result = %{public}d", + Constants::PERMISSION_REQUIRE_FORM.c_str(), bundleName.c_str(), result); } - APP_LOGE("Permission verification failed"); - return false; + return result == PermissionState::PERMISSION_GRANTED; } /** diff --git a/services/formmgr/src/form_provider_mgr.cpp b/services/formmgr/src/form_provider_mgr.cpp index e0e786ff7bf..b58231bc150 100644 --- a/services/formmgr/src/form_provider_mgr.cpp +++ b/services/formmgr/src/form_provider_mgr.cpp @@ -370,7 +370,7 @@ int FormProviderMgr::MessageEvent(const int64_t formId, const FormRecord &record void FormProviderMgr::IncreaseTimerRefreshCount(const int64_t formId) { FormRecord record; - if (!FormDataMgr::GetInstance().GetFormRecord(formId, record)) { + if (FormDataMgr::GetInstance().GetFormRecord(formId, record)) { APP_LOGE("%{public}s failed, not exist such form:%{public}" PRId64 ".", __func__, formId); return; } diff --git a/services/formmgr/src/form_timer_mgr.cpp b/services/formmgr/src/form_timer_mgr.cpp index 509a0528976..036190e9492 100644 --- a/services/formmgr/src/form_timer_mgr.cpp +++ b/services/formmgr/src/form_timer_mgr.cpp @@ -829,7 +829,7 @@ bool FormTimerMgr::UpdateAtTimerAlarm() return true; } - long nextWakeUpTime = findedItem.updateAtTime; + int nextWakeUpTime = findedItem.updateAtTime; tmAtTime.tm_sec = 0; tmAtTime.tm_hour = findedItem.refreshTask.hour; tmAtTime.tm_min = findedItem.refreshTask.min; diff --git a/services/test/moduletest/ability_mgr_service_test/BUILD.gn b/services/test/moduletest/ability_mgr_service_test/BUILD.gn index 62b4ad566d4..7114e02f0f5 100644 --- a/services/test/moduletest/ability_mgr_service_test/BUILD.gn +++ b/services/test/moduletest/ability_mgr_service_test/BUILD.gn @@ -48,6 +48,7 @@ ohos_moduletest("ability_mgr_module_test") { "//foundation/aafwk/standard/services/abilitymgr/src/connection_record.cpp", "//foundation/aafwk/standard/services/abilitymgr/src/data_ability_manager.cpp", "//foundation/aafwk/standard/services/abilitymgr/src/data_ability_record.cpp", + "//foundation/aafwk/standard/services/abilitymgr/src/kernal_system_app_manager.cpp", "//foundation/aafwk/standard/services/abilitymgr/src/launch_param.cpp", "//foundation/aafwk/standard/services/abilitymgr/src/lifecycle_deal.cpp", "//foundation/aafwk/standard/services/abilitymgr/src/lifecycle_state_info.cpp", @@ -88,7 +89,6 @@ ohos_moduletest("ability_mgr_module_test") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${innerkits_path}/uri_permission:uri_permission_mgr", "${innerkits_path}/want:want", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//base/global/i18n_standard/frameworks/intl:intl_util", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", diff --git a/services/test/moduletest/ability_mgr_service_test/ability_mgr_module_test.cpp b/services/test/moduletest/ability_mgr_service_test/ability_mgr_module_test.cpp index 12e14d6aecf..c6e97ec5551 100644 --- a/services/test/moduletest/ability_mgr_service_test/ability_mgr_module_test.cpp +++ b/services/test/moduletest/ability_mgr_service_test/ability_mgr_module_test.cpp @@ -195,6 +195,8 @@ static void OnStartAms() AbilityMgrModuleTest::abilityMgrServ_->SetStackManager(userId, true); AbilityMgrModuleTest::abilityMgrServ_->stackManagers_.emplace(0, AbilityMgrModuleTest::abilityMgrServ_->GetStackManager()); + AbilityMgrModuleTest::abilityMgrServ_->systemAppManager_ = std::make_shared(userId); + EXPECT_TRUE(AbilityMgrModuleTest::abilityMgrServ_->systemAppManager_); AbilityMgrModuleTest::abilityMgrServ_->eventLoop_->Run(); diff --git a/services/test/moduletest/ability_record_test/BUILD.gn b/services/test/moduletest/ability_record_test/BUILD.gn index e59b1ed2936..7c35ff46dcb 100644 --- a/services/test/moduletest/ability_record_test/BUILD.gn +++ b/services/test/moduletest/ability_record_test/BUILD.gn @@ -50,6 +50,7 @@ ohos_moduletest("AbilityRecordModuleTest") { "${services_path}/abilitymgr/src/connection_record.cpp", "${services_path}/abilitymgr/src/data_ability_manager.cpp", "${services_path}/abilitymgr/src/data_ability_record.cpp", + "${services_path}/abilitymgr/src/kernal_system_app_manager.cpp", "${services_path}/abilitymgr/src/launch_param.cpp", "${services_path}/abilitymgr/src/lifecycle_deal.cpp", "${services_path}/abilitymgr/src/lifecycle_state_info.cpp", @@ -91,7 +92,6 @@ ohos_moduletest("AbilityRecordModuleTest") { "${innerkits_path}/base:base", "${innerkits_path}/uri_permission:uri_permission_mgr", "${innerkits_path}/want:want", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//base/global/i18n_standard/frameworks/intl:intl_util", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", diff --git a/services/test/moduletest/ability_stack_test/BUILD.gn b/services/test/moduletest/ability_stack_test/BUILD.gn index d90794db209..59960e6fc51 100644 --- a/services/test/moduletest/ability_stack_test/BUILD.gn +++ b/services/test/moduletest/ability_stack_test/BUILD.gn @@ -48,6 +48,7 @@ ohos_moduletest("ability_stack_module_test") { "//foundation/aafwk/standard/services/abilitymgr/src/connection_record.cpp", "//foundation/aafwk/standard/services/abilitymgr/src/data_ability_manager.cpp", "//foundation/aafwk/standard/services/abilitymgr/src/data_ability_record.cpp", + "//foundation/aafwk/standard/services/abilitymgr/src/kernal_system_app_manager.cpp", "//foundation/aafwk/standard/services/abilitymgr/src/launch_param.cpp", "//foundation/aafwk/standard/services/abilitymgr/src/lifecycle_deal.cpp", "//foundation/aafwk/standard/services/abilitymgr/src/lifecycle_state_info.cpp", @@ -90,7 +91,6 @@ ohos_moduletest("ability_stack_module_test") { "${innerkits_path}/base:base", "${innerkits_path}/uri_permission:uri_permission_mgr", "${innerkits_path}/want:want", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//base/global/i18n_standard/frameworks/intl:intl_util", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", diff --git a/services/test/moduletest/ability_stack_test/ability_stack_module_test.cpp b/services/test/moduletest/ability_stack_test/ability_stack_module_test.cpp index d6ba767c0a7..666c937d822 100644 --- a/services/test/moduletest/ability_stack_test/ability_stack_module_test.cpp +++ b/services/test/moduletest/ability_stack_test/ability_stack_module_test.cpp @@ -97,6 +97,8 @@ void AbilityStackModuleTest::OnStartabilityMs(std::shared_ptrGetUserId(); abilityMs->SetStackManager(userId, true); abilityMs->stackManagers_.emplace(0, abilityMs->GetStackManager()); + abilityMs->systemAppManager_ = std::make_shared(userId); + EXPECT_TRUE(abilityMs->systemAppManager_); abilityMs->eventLoop_->Run(); return; } diff --git a/services/test/moduletest/common/ams/ability_running_record_test/BUILD.gn b/services/test/moduletest/common/ams/ability_running_record_test/BUILD.gn index d7c077e9022..16ca5ba126c 100755 --- a/services/test/moduletest/common/ams/ability_running_record_test/BUILD.gn +++ b/services/test/moduletest/common/ams/ability_running_record_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -24,10 +24,7 @@ ohos_moduletest("AmsAbilityRunningRecordModuleTest") { ] sources = [ "ams_ability_running_record_module_test.cpp" ] - deps = [ - "${services_path}/common:perm_verification", - "${services_path}/test/moduletest/common/ams:appmgr_mst_source", - ] + deps = [ "${services_path}/test/moduletest/common/ams:appmgr_mst_source" ] external_deps = [ "ipc:ipc_core" ] } diff --git a/services/test/moduletest/common/ams/app_life_cycle_test/BUILD.gn b/services/test/moduletest/common/ams/app_life_cycle_test/BUILD.gn index 690a1c2feda..0a03ebe4df9 100755 --- a/services/test/moduletest/common/ams/app_life_cycle_test/BUILD.gn +++ b/services/test/moduletest/common/ams/app_life_cycle_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -25,10 +25,7 @@ ohos_moduletest("AmsAppLifeCycleModuleTest") { ] sources = [ "ams_app_life_cycle_module_test.cpp" ] - deps = [ - "${services_path}/common:perm_verification", - "${services_path}/test/moduletest/common/ams:appmgr_mst_source", - ] + deps = [ "${services_path}/test/moduletest/common/ams:appmgr_mst_source" ] external_deps = [ "ipc:ipc_core" ] } 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 745b7d82bfe..d6b39eb5764 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 @@ -920,6 +920,14 @@ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_010, TestSize.Level3) std::vector allRunningProcessInfo; serviceInner_->GetAllRunningProcesses(allRunningProcessInfo); EXPECT_EQ(allRunningProcessInfo.size(), size_t(APPLICATION_NUM)); + + serviceInner_->StopAllProcess(); + + for (int i = 0; i < APPLICATION_NUM; i++) { + serviceInner_->OnRemoteDied(mockAppScheduler[i]); // A faked death recipient. + auto record = serviceInner_->GetAppRunningRecordByAppRecordId(recordId[i]); + EXPECT_EQ(nullptr, record); + } } /* diff --git a/services/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn b/services/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn index 6d701509807..d14fc2bb5af 100755 --- a/services/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn +++ b/services/test/moduletest/common/ams/app_mgr_service_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -28,7 +28,6 @@ ohos_moduletest("AmsAppMgrServiceModuleTest") { ] deps = [ - "${services_path}/common:perm_verification", "${services_path}/test/moduletest/common/ams:appmgr_mst_source", "//base/global/i18n_standard/frameworks/intl:intl_util", ] diff --git a/services/test/moduletest/common/ams/app_mgr_service_test/ams_app_mgr_service_module_test.cpp b/services/test/moduletest/common/ams/app_mgr_service_test/ams_app_mgr_service_module_test.cpp index c590912c289..abb68fa83aa 100644 --- a/services/test/moduletest/common/ams/app_mgr_service_test/ams_app_mgr_service_module_test.cpp +++ b/services/test/moduletest/common/ams/app_mgr_service_test/ams_app_mgr_service_module_test.cpp @@ -327,6 +327,42 @@ HWTEST_F(AppMgrServiceModuleTest, ClearUpApplicationData_001, TestSize.Level1) } } +/* + * Feature: AppMgrService + * Function: IsBackgroundRunningRestricted + * SubFunction: NA + * FunctionPoints: AppMgrService => AppMgrServiceInner: IsBackgroundRunningRestricted + * CaseDescription: Check IsBackgroundRunningRestricted. + */ +HWTEST_F(AppMgrServiceModuleTest, IsBackgroundRunningRestricted_001, TestSize.Level1) +{ + EXPECT_TRUE(appMgrService_); + EXPECT_TRUE(mockAppMgrServiceInner_); + + std::string testAppName("testApp"); + bool testResult = false; + Semaphore sem(0); + + auto mockHandler = [&testResult, testAppName, &sem](const std::string &appName) { + testResult = (appName == testAppName); + sem.Post(); + return ERR_OK; + }; + + for (int i = 0; i < COUNT; ++i) { + testResult = false; + + EXPECT_CALL(*mockAppMgrServiceInner_, IsBackgroundRunningRestricted(_)).Times(1).WillOnce(Invoke(mockHandler)); + + auto result = appMgrService_->IsBackgroundRunningRestricted(testAppName); + + sem.Wait(); + + EXPECT_TRUE(testResult); + EXPECT_EQ(result, ERR_OK); + } +} + /* * Feature: AppMgrService * Function: GetAllRunningProcesses diff --git a/services/test/moduletest/common/ams/app_recent_list_test/BUILD.gn b/services/test/moduletest/common/ams/app_recent_list_test/BUILD.gn index b174fb58595..fc6c4758cf3 100755 --- a/services/test/moduletest/common/ams/app_recent_list_test/BUILD.gn +++ b/services/test/moduletest/common/ams/app_recent_list_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -24,10 +24,7 @@ ohos_moduletest("AmsAppRecentListModuleTest") { ] sources = [ "ams_app_recent_list_module_test.cpp" ] - deps = [ - "${services_path}/common:perm_verification", - "${services_path}/test/moduletest/common/ams:appmgr_mst_source", - ] + deps = [ "${services_path}/test/moduletest/common/ams:appmgr_mst_source" ] external_deps = [ "ipc:ipc_core" ] } diff --git a/services/test/moduletest/common/ams/app_running_record_test/BUILD.gn b/services/test/moduletest/common/ams/app_running_record_test/BUILD.gn index a300e9b5f69..5a949c9b30c 100755 --- a/services/test/moduletest/common/ams/app_running_record_test/BUILD.gn +++ b/services/test/moduletest/common/ams/app_running_record_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -25,10 +25,7 @@ ohos_moduletest("AmsAppRunningRecordModuleTest") { ] sources = [ "ams_app_running_record_module_test.cpp" ] - deps = [ - "${services_path}/common:perm_verification", - "${services_path}/test/moduletest/common/ams:appmgr_mst_source", - ] + deps = [ "${services_path}/test/moduletest/common/ams:appmgr_mst_source" ] external_deps = [ "ipc:ipc_core" ] } diff --git a/services/test/moduletest/common/ams/app_service_flow_test/BUILD.gn b/services/test/moduletest/common/ams/app_service_flow_test/BUILD.gn index c88dc7bf73b..71c4adaef32 100755 --- a/services/test/moduletest/common/ams/app_service_flow_test/BUILD.gn +++ b/services/test/moduletest/common/ams/app_service_flow_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -23,10 +23,7 @@ ohos_moduletest("AmsAppServiceFlowModuleTest") { [ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include/" ] sources = [ "ams_app_service_flow_module_test.cpp" ] - deps = [ - "${services_path}/common:perm_verification", - "${services_path}/test/moduletest/common/ams:appmgr_mst_source", - ] + deps = [ "${services_path}/test/moduletest/common/ams:appmgr_mst_source" ] external_deps = [ "ipc:ipc_core" ] } diff --git a/services/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn b/services/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn index 2f17712cfc4..81dff48201c 100755 --- a/services/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn +++ b/services/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -33,7 +33,6 @@ ohos_moduletest("AmsIpcAmsmgrModuleTest") { deps = [ "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${services_path}/appmgr/test:appmgr_test_source", - "${services_path}/common:perm_verification", "${services_path}/test/moduletest/common/ams:appmgr_mst_source", ] diff --git a/services/test/moduletest/common/ams/ipc_app_mgr_test/BUILD.gn b/services/test/moduletest/common/ams/ipc_app_mgr_test/BUILD.gn index d177076a30c..7e8d7036999 100755 --- a/services/test/moduletest/common/ams/ipc_app_mgr_test/BUILD.gn +++ b/services/test/moduletest/common/ams/ipc_app_mgr_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -23,10 +23,7 @@ ohos_moduletest("AmsIpcAppmgrModuleTest") { sources = [ "ams_ipc_app_mgr_module_test.cpp" ] - deps = [ - "${services_path}/common:perm_verification", - "${services_path}/test/moduletest/common/ams:appmgr_mst_source", - ] + deps = [ "${services_path}/test/moduletest/common/ams:appmgr_mst_source" ] external_deps = [ "ipc:ipc_core" ] } diff --git a/services/test/moduletest/common/ams/ipc_app_mgr_test/ams_ipc_app_mgr_module_test.cpp b/services/test/moduletest/common/ams/ipc_app_mgr_test/ams_ipc_app_mgr_module_test.cpp index d161ac57593..caf863ae46c 100644 --- a/services/test/moduletest/common/ams/ipc_app_mgr_test/ams_ipc_app_mgr_module_test.cpp +++ b/services/test/moduletest/common/ams/ipc_app_mgr_test/ams_ipc_app_mgr_module_test.cpp @@ -231,6 +231,37 @@ HWTEST_F(AmsIpcAppmgrModuleTest, ExcuteAppmgrIPCInterface_007, TestSize.Level3) } } +/* + * Feature: ApplicationFramework + * Function: AppManagerService + * SubFunction: AppmgrIPCInterface + * FunctionPoints: test IsBackgroundRunningRestricted API,then check the function whether is good or not + * EnvConditions: system running normally + * CaseDescription: excute IsBackgroundRunningRestricted API 10000 times + */ +HWTEST_F(AmsIpcAppmgrModuleTest, ExcuteAppmgrIPCInterface_008, TestSize.Level3) +{ + for (int i = 0; i < COUNT; i++) { + sptr mockMockAppMgr(new MockMockAppMgrService()); + sptr appMgrClient = iface_cast(mockMockAppMgr); + std::string testBundleName("testApp"); + bool testResult = false; + + auto mockHandler = [&](const std::string &name) { + testResult = (name == testBundleName); + mockMockAppMgr->Post(); + return 0; + }; + + EXPECT_CALL(*mockMockAppMgr, IsBackgroundRunningRestricted(_)).WillOnce(Invoke(mockHandler)); + + appMgrClient->IsBackgroundRunningRestricted(testBundleName); + mockMockAppMgr->Wait(); + + EXPECT_TRUE(testResult); + } +} + /* * Feature: ApplicationFramework * Function: AppManagerService diff --git a/services/test/moduletest/common/ams/ipc_app_scheduler_test/BUILD.gn b/services/test/moduletest/common/ams/ipc_app_scheduler_test/BUILD.gn index f7a3e7f6f67..2f51d57cbe1 100755 --- a/services/test/moduletest/common/ams/ipc_app_scheduler_test/BUILD.gn +++ b/services/test/moduletest/common/ams/ipc_app_scheduler_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -22,10 +22,7 @@ ohos_moduletest("AmsIpcAppSchedulerModuleTest") { include_dirs = [] sources = [ "ams_ipc_app_scheduler_module_test.cpp" ] - deps = [ - "${services_path}/common:perm_verification", - "${services_path}/test/moduletest/common/ams:appmgr_mst_source", - ] + deps = [ "${services_path}/test/moduletest/common/ams:appmgr_mst_source" ] external_deps = [ "ipc:ipc_core" ] } diff --git a/services/test/moduletest/common/ams/process_optimizer_uba_test/BUILD.gn b/services/test/moduletest/common/ams/process_optimizer_uba_test/BUILD.gn index 4274b41385e..8277f2720da 100644 --- a/services/test/moduletest/common/ams/process_optimizer_uba_test/BUILD.gn +++ b/services/test/moduletest/common/ams/process_optimizer_uba_test/BUILD.gn @@ -29,10 +29,7 @@ ohos_moduletest("AmsProcessOptimizerModuleTest") { sources = [ "ams_process_optimizer_uba_module_test.cpp" ] - deps = [ - "${services_path}/common:perm_verification", - "${services_path}/test/moduletest/common/ams:appmgr_mst_source", - ] + deps = [ "${services_path}/test/moduletest/common/ams:appmgr_mst_source" ] external_deps = [ "hiviewdfx_hilog_native:libhilog", diff --git a/services/test/moduletest/common/ams/service_app_spawn_client_test/BUILD.gn b/services/test/moduletest/common/ams/service_app_spawn_client_test/BUILD.gn index 6240f1cf721..b81874150a2 100755 --- a/services/test/moduletest/common/ams/service_app_spawn_client_test/BUILD.gn +++ b/services/test/moduletest/common/ams/service_app_spawn_client_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -29,7 +29,6 @@ ohos_moduletest("AmsServiceAppSpawnClientModuleTest") { ] deps = [ - "${services_path}/common:perm_verification", "${services_path}/test/moduletest/common/ams:appmgr_mst_source", "//base/global/i18n_standard/frameworks/intl:intl_util", ] diff --git a/services/test/moduletest/common/ams/service_event_drive_test/BUILD.gn b/services/test/moduletest/common/ams/service_event_drive_test/BUILD.gn index 46b188d1397..42b2dec3580 100755 --- a/services/test/moduletest/common/ams/service_event_drive_test/BUILD.gn +++ b/services/test/moduletest/common/ams/service_event_drive_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -30,7 +30,6 @@ ohos_moduletest("AmsServiceEventDriveModuleTest") { ] deps = [ - "${services_path}/common:perm_verification", "${services_path}/test/moduletest/common/ams:appmgr_mst_source", "//base/global/i18n_standard/frameworks/intl:intl_util", ] diff --git a/services/test/moduletest/common/ams/service_start_process_test/BUILD.gn b/services/test/moduletest/common/ams/service_start_process_test/BUILD.gn index 8074d13a603..b66d65a9261 100755 --- a/services/test/moduletest/common/ams/service_start_process_test/BUILD.gn +++ b/services/test/moduletest/common/ams/service_start_process_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -27,7 +27,6 @@ ohos_moduletest("AmsServiceStartModuleTest") { ] deps = [ - "${services_path}/common:perm_verification", "${services_path}/test/moduletest/common/ams:appmgr_mst_source", "//base/global/i18n_standard/frameworks/intl:intl_util", ] diff --git a/services/test/moduletest/dump_module_test/BUILD.gn b/services/test/moduletest/dump_module_test/BUILD.gn index 39647a0f3cf..3dda95945a9 100755 --- a/services/test/moduletest/dump_module_test/BUILD.gn +++ b/services/test/moduletest/dump_module_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -48,7 +48,6 @@ ohos_moduletest("dump_module_test") { "${services_path}/abilitymgr/test/mock/appmgr_test_service:appmgr_test_service", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_appmgr_mock", "${services_path}/abilitymgr/test/mock/libs/appexecfwk_core:appexecfwk_bundlemgr_mock", - "${services_path}/common:perm_verification", "//base/global/i18n_standard/frameworks/intl:intl_util", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", diff --git a/services/test/moduletest/dump_module_test/dump_module_test.cpp b/services/test/moduletest/dump_module_test/dump_module_test.cpp index 4f106f4a9f3..85d1448ceed 100644 --- a/services/test/moduletest/dump_module_test/dump_module_test.cpp +++ b/services/test/moduletest/dump_module_test/dump_module_test.cpp @@ -144,6 +144,8 @@ void DumpModuleTest::OnStartAms() int userId = g_abilityMs->GetUserId(); g_abilityMs->SetStackManager(userId, true); g_abilityMs->stackManagers_.emplace(0, g_abilityMs->GetStackManager()); + g_abilityMs->systemAppManager_ = std::make_shared(userId); + EXPECT_TRUE(g_abilityMs->systemAppManager_); g_abilityMs->eventLoop_->Run(); GTEST_LOG_(INFO) << "OnStart success"; return; diff --git a/services/test/moduletest/ipc_ability_connect_test/BUILD.gn b/services/test/moduletest/ipc_ability_connect_test/BUILD.gn index 487dc498f07..639d6687c5d 100644 --- a/services/test/moduletest/ipc_ability_connect_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_connect_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -31,7 +31,6 @@ ohos_moduletest("IpcAbilityConnectModuleTest") { } deps = [ "${innerkits_path}/want:want", - "${services_path}/common:perm_verification", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn b/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn index 9341420fdc0..56cbc739203 100644 --- a/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -33,7 +33,6 @@ ohos_moduletest("IpcAbilityMgrServiceModuleTest") { deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${innerkits_path}/want:want", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", diff --git a/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn b/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn index 9c07fbc05ca..4d0ca27ff79 100644 --- a/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. +# Copyright (c) 2021 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -46,7 +46,6 @@ ohos_moduletest("IpcAbilitySchedulerModuleTest") { } deps = [ "${innerkits_path}/want:want", - "${services_path}/common:perm_verification", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager", diff --git a/services/test/moduletest/panding_want_manager_test/BUILD.gn b/services/test/moduletest/panding_want_manager_test/BUILD.gn index 4a483a0f12e..ff50fe35533 100755 --- a/services/test/moduletest/panding_want_manager_test/BUILD.gn +++ b/services/test/moduletest/panding_want_manager_test/BUILD.gn @@ -51,7 +51,6 @@ ohos_moduletest("PandingWantMgrTest") { "${innerkits_path}/base:base", "${innerkits_path}/uri_permission:uri_permission_mgr", "${innerkits_path}/want:want", - "${services_path}/common:perm_verification", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//base/global/i18n_standard/frameworks/intl:intl_util", "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility", diff --git a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn index 1e0fab8598d..4631a17f0de 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") import("//foundation/aafwk/standard/aafwk.gni") -SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsStDataAbility" +SUBDEMOSYSTEM_DIR = "${system_test_app_path}/amsStDataAbility" EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("verify_act_ability_config") { diff --git a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/include/verify_act_data_ability.h b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/include/verify_act_data_ability.h index b8967ce1f7b..9f87dcda97c 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/include/verify_act_data_ability.h +++ b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/include/verify_act_data_ability.h @@ -41,13 +41,10 @@ public: virtual int BatchInsert(const Uri &uri, const std::vector &values) override; std::vector> sharedList_; -}; -class InsertTestOpenCallback : public NativeRdb::RdbOpenCallback { -public: - int OnCreate(NativeRdb::RdbStore &rdbStore) override; - int OnUpgrade(NativeRdb::RdbStore &rdbStore, int oldVersion, int newVersion) override; - static const std::string CREATE_TABLE_TEST; + virtual std::vector GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter) override; + virtual Uri NormalizeUri(const Uri &uri) override; + virtual Uri DenormalizeUri(const Uri &uri) override; }; } // namespace AppExecFwk } // namespace OHOS diff --git a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/src/verify_act_data_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/src/verify_act_data_ability.cpp index b5bcbb9676e..f5887fce9d1 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/src/verify_act_data_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/src/verify_act_data_ability.cpp @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSERETURN_ERROR2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,11 +14,13 @@ */ #include "abs_shared_result_set.h" +#include "ability_loader.h" +#include "app_log_wrapper.h" +#include "data_ability_helper.h" #include "data_ability_predicates.h" +#include "rdb_helper.h" +#include "rdb_open_callback.h" #include "values_bucket.h" - -#include "app_log_wrapper.h" -#include "ability_loader.h" #include "verify_act_data_ability.h" namespace OHOS { @@ -28,8 +30,25 @@ static std::shared_ptr testStore; static const std::string RDB_TEST_PATH = "/data/test/"; static const std::string DATABASE_FILE_NAME = "insert_test.db"; static const std::string DATABASE_NAME = RDB_TEST_PATH + "insert_test.db"; -static const int defaultReturn = 1; -} +static int defaultReturn = 1; +static const double ageI = 24; +static const double salaryI = 2024.20; +static const int returnError = 0; +static const int returnError1 = -1; +static const int returnError2 = -2; +static const int returnError3 = -3; +static const int value1 = 0; +static const int value2 = 1; +static const int value3 = 2; +static const int value4 = 3; +} // namespace + +class InsertTestOpenCallback : public NativeRdb::RdbOpenCallback { +public: + int OnCreate(NativeRdb::RdbStore &rdbStore) override; + int OnUpgrade(NativeRdb::RdbStore &rdbStore, int oldVersion, int newVersion) override; + static const std::string CREATE_TABLE_TEST; +}; const std::string InsertTestOpenCallback::CREATE_TABLE_TEST = std::string("CREATE TABLE IF NOT EXISTS test ") + std::string("(id INTEGER PRIMARY KEY AUTOINCREMENT, " @@ -38,12 +57,14 @@ const std::string InsertTestOpenCallback::CREATE_TABLE_TEST = int InsertTestOpenCallback::OnCreate(NativeRdb::RdbStore &store) { + APP_LOGI("VerifyActDataAbility OnCreate"); return store.ExecuteSql(CREATE_TABLE_TEST); } int InsertTestOpenCallback::OnUpgrade(NativeRdb::RdbStore &store, int oldVersion, int newVersion) { - return 0; + APP_LOGI("VerifyActDataAbility OnUpgrade"); + return returnError; } void VerifyActDataAbility::OnStart(const Want &want) @@ -56,48 +77,149 @@ void VerifyActDataAbility::OnStart(const Want &want) int VerifyActDataAbility::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) { APP_LOGI("VerifyActDataAbility <<<>>>"); + std::shared_ptr dataUri = std::make_shared("dataability:///com.ix.VerifyActDataAbility"); + auto notify = DataAbilityHelper::Creator(GetContext(), dataUri); + if (notify == nullptr) { + APP_LOGE("VerifyActDataAbility <<<>>>"); + return returnError; + } + notify->NotifyChange(*dataUri); + + APP_LOGI("VerifyActDataAbility Insert uri.ToString = %{public}s", uri.ToString().c_str()); + APP_LOGI("VerifyActDataAbility Insert dataUri.ToString = %{public}s", dataUri->ToString().c_str()); + APP_LOGI("VerifyActDataAbility uri.Equals = %{public}d", uri.Equals(*dataUri)); + if (uri.Equals(*dataUri) != 1) { + return returnError1; + } + + defaultReturn = 1; + std::map valuesMap; + value.GetAll(valuesMap); + int valuesMapSize = valuesMap.size(); + APP_LOGI("VerifyActDataAbility value = %{public}d", valuesMapSize); + if (!valuesMapSize) + return returnError2; + for (auto item = valuesMap.begin(); item != valuesMap.end(); item++) { + auto valueFirst = item->first; + auto valueSecond = item->second; + int iEOK = 0; + APP_LOGI("VerifyActDataAbility valueSecond.GetType[%{public}d]]", valueSecond.GetType()); + if (valueFirst.compare("name") == 0) { + std::string val; + iEOK = valueSecond.GetString(val); + APP_LOGI("VerifyActDataAbility it iEOK[%{public}d]]", iEOK); + APP_LOGI("VerifyActDataAbility it[%{public}s],[%{public}s]", valueFirst.c_str(), val.c_str()); + if (val.compare("ActsDataAbilityHelperTest")) { + return returnError2; + break; + } + } else if (valueFirst.compare("age") == 0) { + double age; + iEOK = valueSecond.GetDouble(age); + APP_LOGI("VerifyActDataAbility it iEOK[%{public}d]", iEOK); + APP_LOGI("VerifyActDataAbility it[%{public}s],[%{public}f]", valueFirst.c_str(), age); + if (age != ageI) { + return returnError2; + break; + } + } else if (valueFirst.compare("salary") == 0) { + double salary; + iEOK = valueSecond.GetDouble(salary); + APP_LOGI("VerifyActDataAbility it iEOK[%{public}d]]", iEOK); + APP_LOGI("VerifyActDataAbility it[%{public}s],[%{public}f]", valueFirst.c_str(), salary); + if (salary != salaryI) { + return returnError2; + break; + } + } else { + APP_LOGI("VerifyActDataAbility it default[%{public}s]", valueFirst.c_str()); + break; + } + } + + int errCode = 0; + std::string dbDir = GetDatabaseDir(); + NativeRdb::RdbStoreConfig config(dbDir + "/" + DATABASE_FILE_NAME); + InsertTestOpenCallback helper; + testStore = NativeRdb::RdbHelper::GetRdbStore(config, 1, helper, errCode); + APP_LOGI("VerifyActDataAbility Insert Patch %{public}s", (dbDir + "/" + DATABASE_FILE_NAME).c_str()); + + if (testStore == nullptr) { + APP_LOGI("VerifyActDataAbility <<<>>> testStore is nullptr, data will be empty"); + return returnError3; + } + + int64_t id; + int insertError; + if ((insertError = testStore->Insert(id, "test", value)) != 0) { + APP_LOGE("VerifyActDataAbility <<<>>> store->Insert Error %{public}d", insertError); + return insertError; + } + return defaultReturn; } std::shared_ptr VerifyActDataAbility::Query( const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) { + APP_LOGI("VerifyActDataAbility <<<>>>"); + std::shared_ptr dataUri = std::make_shared("dataability:///com.ix.VerifyActDataAbility"); + + APP_LOGI("VerifyActDataAbility Query uri.ToString = %{public}s", uri.ToString().c_str()); + APP_LOGI("VerifyActDataAbility Query dataUri.ToString = %{public}s", dataUri->ToString().c_str()); + APP_LOGI("VerifyActDataAbility uri.Equals = %{public}d", uri.Equals(*dataUri)); + if (uri.Equals(*dataUri) != 1) { + return nullptr; + } + int indexI = 0; + for (const auto &item : columns) { + switch (indexI++) { + case value1: + if (item.compare("value1") != 0) + return nullptr; + break; + case value2: + if (item.compare("value2") != 0) + return nullptr; + break; + case value3: + if (item.compare("value3") != 0) + return nullptr; + break; + case value4: + if (item.compare("value4") != 0) + return nullptr; + break; + default: + APP_LOGI("VerifyActDataAbility indexI = [%{public}d]]", indexI); + } + } + + APP_LOGI("VerifyActDataAbility Query predicates"); + APP_LOGI("VerifyActDataAbility Query predicates.Is = %{public}d", predicates.IsRawSelection()); + APP_LOGI("VerifyActDataAbility Query predicates.Get = %{public}d", predicates.GetJudgeSource()); + int errCode = 0; std::string dbDir = GetDatabaseDir(); NativeRdb::RdbStoreConfig config(dbDir + "/" + DATABASE_FILE_NAME); InsertTestOpenCallback helper; testStore = NativeRdb::RdbHelper::GetRdbStore(config, 1, helper, errCode); - APP_LOGI("VerifyActDataAbility <<<>>> Patch %{public}s", (dbDir + "/" + DATABASE_FILE_NAME).c_str()); - - int64_t id; - NativeRdb::ValuesBucket values; - int idValue = 1; - int age = 18; - double salary = 100.5; - - values.PutInt("id", idValue); - values.PutString("name", std::string("zhangsan")); - values.PutInt("age", age); - values.PutDouble("salary", salary); - values.PutBlob("blobType", std::vector {1, 2, 3}); + APP_LOGI("VerifyActDataAbility Query Patch %{public}s", (dbDir + "/" + DATABASE_FILE_NAME).c_str()); if (testStore == nullptr) { APP_LOGI("VerifyActDataAbility <<<>>> testStore is nullptr, data will be empty"); return nullptr; } - if (testStore->Replace(id, "test", values) != 0) { - APP_LOGE("VerifyActDataAbility <<<>>> store->Replace Error"); - return nullptr; - } - std::unique_ptr rresultSet = - testStore->QuerySql("SELECT * FROM test WHERE name = ?", std::vector {"zhangsan"}); + testStore->QuerySql("SELECT * FROM test WHERE name = ?" , + std::vector {"ActsDataAbilityHelperTest"}); if (rresultSet == nullptr) { APP_LOGE("VerifyActDataAbility <<<>>> rresultSet is nullptr"); return nullptr; } + APP_LOGE("VerifyActDataAbility <<<>>> ret(rresultSet.release()"); std::shared_ptr ret(rresultSet.release()); sharedList_.push_back(ret); return ret; @@ -107,30 +229,291 @@ int VerifyActDataAbility::Update( const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("VerifyActDataAbility <<<>>>"); + std::shared_ptr dataUri = std::make_shared("dataability:///com.ix.VerifyActDataAbility"); + auto notify = DataAbilityHelper::Creator(GetContext(), dataUri); + if (notify == nullptr) { + APP_LOGE("VerifyActDataAbility <<<>>>"); + return returnError; + } + notify->NotifyChange(*dataUri); + + APP_LOGI("VerifyActDataAbility Update uri.ToString = %{public}s", uri.ToString().c_str()); + APP_LOGI("VerifyActDataAbility Update dataUri.ToString = %{public}s", dataUri->ToString().c_str()); + APP_LOGI("VerifyActDataAbility uri.Equals = %{public}d", uri.Equals(*dataUri)); + if (uri.Equals(*dataUri) != 1) { + return returnError1; + } + + defaultReturn = 1; + std::map valuesMap; + value.GetAll(valuesMap); + int valuesMapSize = valuesMap.size(); + APP_LOGI("VerifyActDataAbility value = %{public}d", valuesMapSize); + if (!valuesMapSize) + return returnError2; + for (auto item = valuesMap.begin(); item != valuesMap.end(); item++) { + auto valueFirst = item->first; + auto valueSecond = item->second; + APP_LOGI("VerifyActDataAbility valueSecond.GetType[%{public}d]]", valueSecond.GetType()); + if (valueFirst.compare("name") == 0) { + std::string val; + valueSecond.GetString(val); + APP_LOGI("VerifyActDataAbility it[%{public}s],[%{public}s]", valueFirst.c_str(), val.c_str()); + if (val.compare("ActsDataAbilityHelperTest")) { + return returnError2; + break; + } + } else if (valueFirst.compare("age") == 0) { + double age; + valueSecond.GetDouble(age); + APP_LOGI("VerifyActDataAbility it[%{public}s],[%{public}f]", valueFirst.c_str(), age); + if (age != ageI) { + return returnError2; + break; + } + } else if (valueFirst.compare("salary") == 0) { + double salary; + valueSecond.GetDouble(salary); + APP_LOGI("VerifyActDataAbility it[%{public}s],[%{public}f]", valueFirst.c_str(), salary); + if (salary != salaryI) { + return returnError2; + break; + } + } else { + APP_LOGI("VerifyActDataAbility it default[%{public}s]", valueFirst.c_str()); + break; + } + } + APP_LOGI("VerifyActDataAbility Update predicates = %{public}d", predicates.IsRawSelection()); + APP_LOGI("VerifyActDataAbility Update predicates.Get = %{public}d", predicates.GetJudgeSource()); + + int errCode = 0; + std::string dbDir = GetDatabaseDir(); + NativeRdb::RdbStoreConfig config(dbDir + "/" + DATABASE_FILE_NAME); + InsertTestOpenCallback helper; + testStore = NativeRdb::RdbHelper::GetRdbStore(config, 1, helper, errCode); + APP_LOGI("VerifyActDataAbility Update Patch %{public}s", (dbDir + "/" + DATABASE_FILE_NAME).c_str()); + + if (testStore == nullptr) { + APP_LOGI("VerifyActDataAbility <<<>>> testStore is nullptr, data will be empty"); + return returnError3; + } + + int changedRows; + int updatError; + if ((updatError = testStore->Update(changedRows, "test", value)) != 0) { + APP_LOGE("VerifyActDataAbility <<<>>> store->Replace changedRows %{public}d Error %{public}d", + changedRows, + updatError); + return updatError; + } return defaultReturn; } int VerifyActDataAbility::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("VerifyActDataAbility <<<>>>"); + std::shared_ptr dataUri = std::make_shared("dataability:///com.ix.VerifyActDataAbility"); + auto notify = DataAbilityHelper::Creator(GetContext(), dataUri); + if (notify == nullptr) { + APP_LOGE("VerifyActDataAbility <<<>>>"); + return returnError; + } + notify->NotifyChange(*dataUri); + + defaultReturn = 1; + APP_LOGI("VerifyActDataAbility Delete uri.ToString = %{public}s", uri.ToString().c_str()); + APP_LOGI("VerifyActDataAbility Delete dataUri.ToString = %{public}s", dataUri->ToString().c_str()); + APP_LOGI("VerifyActDataAbility uri.Equals is = %{public}d", uri.Equals(*dataUri)); + if (uri.Equals(*dataUri) != 1) { + return returnError; + } + APP_LOGI("VerifyActDataAbility Delete predicates.Is = %{public}d", predicates.IsRawSelection()); + APP_LOGI("VerifyActDataAbility Delete predicates.Get = %{public}d", predicates.GetJudgeSource()); + + int errCode = 0; + std::string dbDir = GetDatabaseDir(); + NativeRdb::RdbStoreConfig config(dbDir + "/" + DATABASE_FILE_NAME); + InsertTestOpenCallback helper; + testStore = NativeRdb::RdbHelper::GetRdbStore(config, 1, helper, errCode); + APP_LOGI("VerifyActDataAbility Delete Patch %{public}s", (dbDir + "/" + DATABASE_FILE_NAME).c_str()); + + if (testStore == nullptr) { + APP_LOGI("VerifyActDataAbility <<<>>> testStore is nullptr, data will be empty"); + return returnError3; + } + + int changedRows; + int deleteError; + if ((deleteError = testStore->Delete(changedRows, "test")) != 0) { + APP_LOGE("VerifyActDataAbility <<<>>> store->Delete changedRows %{public}d Error %{public}d", + changedRows, + deleteError); + return deleteError; + } return defaultReturn; } std::string VerifyActDataAbility::GetType(const Uri &uri) { APP_LOGI("VerifyActDataAbility <<<>>>"); + APP_LOGI("VerifyActDataAbility GetType uri = %{public}s", uri.ToString().c_str()); + std::shared_ptr dataUri = std::make_shared("dataability:///com.ix.VerifyActDataAbility3"); + APP_LOGI("VerifyActDataAbility GetType dataUri.ToString = %{public}s", dataUri->ToString().c_str()); + APP_LOGI("VerifyActDataAbility uri.Equals = %{public}d", uri.Equals(*dataUri)); + if (uri.Equals(*dataUri) == 1) { + return nullptr; + } std::string retval(uri.ToString()); return retval; } int VerifyActDataAbility::OpenFile(const Uri &uri, const std::string &mode) { APP_LOGI("VerifyActDataAbility <<<>>>"); - return 0; + std::shared_ptr dataUri = std::make_shared("dataability:///com.ix.VerifyActDataAbility"); + defaultReturn = 1; + APP_LOGI("VerifyActDataAbility Delete uri.ToString = %{public}s", uri.ToString().c_str()); + APP_LOGI("VerifyActDataAbility Delete dataUri.ToString = %{public}s", dataUri->ToString().c_str()); + APP_LOGI("VerifyActDataAbility uri.Equals = %{public}d", uri.Equals(*dataUri)); + if (uri.Equals(*dataUri) != 1) { + return returnError1; + } + APP_LOGI("VerifyActDataAbility OpenFile mode = %{public}s", mode.c_str()); + if (!(mode.compare("r") == 0 || mode.compare("w") == 0 || mode.compare("wt") == 0 || mode.compare("wa") == 0 || + mode.compare("rw") == 0 || mode.compare("rwt") == 0)) { + if (mode.compare("A1@k#4%$,.<>)(oioiu*((*&(&*giIGT^%&^Ug;sdfk;losd*7873iug8%&^$&%]ERFUy&^%&&R7") == 0) { + defaultReturn = returnError2; + } else + defaultReturn = returnError3; + } + APP_LOGI("VerifyActDataAbility OpenFile defaultReturn = %{public}d", defaultReturn); + return defaultReturn; } int VerifyActDataAbility::BatchInsert(const Uri &uri, const std::vector &values) { APP_LOGI("VerifyActDataAbility <<<>>>"); - return Ability::BatchInsert(uri, values); + std::shared_ptr dataUri = std::make_shared("dataability:///com.ix.VerifyActDataAbility"); + defaultReturn = 1; + APP_LOGI("VerifyActDataAbility BatchInsert uri.ToString = %{public}s", uri.ToString().c_str()); + APP_LOGI("VerifyActDataAbility BatchInsert dataUri.ToString = %{public}s", dataUri->ToString().c_str()); + APP_LOGI("VerifyActDataAbility uri.Equals = %{public}d", uri.Equals(*dataUri)); + if (uri.Equals(*dataUri) != 1) { + return returnError1; + } + + defaultReturn = 1; + std::map valuesMap; + for (auto it = values.begin(); it != values.end(); it++) { + it->GetAll(valuesMap); + int valuesMapSize = values.size(); + APP_LOGI("VerifyActDataAbility value = %{public}d", valuesMapSize); + if (!valuesMapSize) + return returnError2; + for (auto item = valuesMap.begin(); item != valuesMap.end(); item++) { + auto valueFirst = item->first; + auto valueSecond = item->second; + APP_LOGI("VerifyActDataAbility valueSecond.GetType[%{public}d]]", valueSecond.GetType()); + if (valueFirst.compare("name") == 0) { + std::string val; + valueSecond.GetString(val); + APP_LOGI("VerifyActDataAbility it[%{public}s],[%{public}s]", valueFirst.c_str(), val.c_str()); + if (val.compare("ActsDataAbilityHelperTest")) { + return returnError2; + break; + } + } else if (valueFirst.compare("age") == 0) { + double age; + valueSecond.GetDouble(age); + APP_LOGI("VerifyActDataAbility it[%{public}s],[%{public}f]", valueFirst.c_str(), age); + if (age != ageI) { + return returnError2; + break; + } + } else if (valueFirst.compare("salary") == 0) { + double salary; + valueSecond.GetDouble(salary); + APP_LOGI("VerifyActDataAbility it[%{public}s],[%{public}f]", valueFirst.c_str(), salary); + if (salary != salaryI) { + return returnError2; + break; + } + } else { + APP_LOGI("VerifyActDataAbility it default[%{public}s]", valueFirst.c_str()); + break; + } + } + } + + int retAbilityBatchInsert = Ability::BatchInsert(uri, values); + APP_LOGI("VerifyActDataAbility BatchInsert retAbility = %{public}d", retAbilityBatchInsert); + return retAbilityBatchInsert; +} +std::vector VerifyActDataAbility::GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter) +{ + APP_LOGI("VerifyActDataAbility <<<>>>"); + std::shared_ptr dataUri = std::make_shared("dataability:///com.ix.VerifyActDataAbility"); + defaultReturn = 1; + APP_LOGI("VerifyActDataAbility Delete uri.ToString = %{public}s", uri.ToString().c_str()); + APP_LOGI("VerifyActDataAbility Delete dataUri.ToString = %{public}s", dataUri->ToString().c_str()); + APP_LOGI("VerifyActDataAbility uri.Equals = %{public}d", uri.Equals(*dataUri)); + std::vector vectorFileTypes; + if (uri.Equals(*dataUri) != 1) { + APP_LOGE("VerifyActDataAbility uri.Equals(*dataUri) != 1"); + vectorFileTypes.push_back("Uri error"); + return vectorFileTypes; + } + + if (mimeTypeFilter.compare("*/*") == 0) { + vectorFileTypes.push_back("hap"); + vectorFileTypes.push_back("jpg"); + vectorFileTypes.push_back("image/png"); + } else if (mimeTypeFilter.compare("image/*") == 0) { + vectorFileTypes.push_back("image/png"); + } else if (mimeTypeFilter.compare("*/jpg") == 0) { + vectorFileTypes.push_back("jpg"); + } else if (mimeTypeFilter.compare("returnUndefined") == 0) { + return {}; + } + + return vectorFileTypes; } +Uri VerifyActDataAbility::NormalizeUri(const Uri &uri) +{ + APP_LOGI("VerifyActDataAbility <<<>>>"); + APP_LOGI("VerifyActDataAbility NormalizeUri uri = %{public}s", uri.ToString().c_str()); + std::shared_ptr dataUri = std::make_shared("dataability:///com.ix.VerifyActDataAbility"); + std::shared_ptr dataUri3 = std::make_shared("dataability:///com.ix.VerifyActDataAbility3"); + Uri dataUriNull(""); + Uri dataUriError("errorUri"); + APP_LOGI("VerifyActDataAbility NormalizeUri dataUri.ToString = %{public}s", dataUri->ToString().c_str()); + APP_LOGI("VerifyActDataAbility uri.Equals = %{public}d", uri.Equals(*dataUri)); + if (uri.Equals(*dataUri) != 1) { + if (uri.Equals(*dataUri3) == 1) { + return dataUriNull; + } + return dataUriError; + } + return uri; +} + +Uri VerifyActDataAbility::DenormalizeUri(const Uri &uri) +{ + APP_LOGI("VerifyActDataAbility <<<>>>"); + APP_LOGI("VerifyActDataAbility DenormalizeUri uri = %{public}s", uri.ToString().c_str()); + std::shared_ptr dataUri = std::make_shared("dataability:///com.ix.VerifyActDataAbility"); + std::shared_ptr dataUri3 = std::make_shared("dataability:///com.ix.VerifyActDataAbility3"); + Uri dataUriNull(""); + Uri dataUriError("errorUri"); + APP_LOGI("VerifyActDataAbility DenormalizeUri dataUri.ToString = %{public}s", dataUri->ToString().c_str()); + APP_LOGI("VerifyActDataAbility uri.Equals = %{public}d", uri.Equals(*dataUri)); + + if (uri.Equals(*dataUri) != 1) { + if (uri.Equals(*dataUri3) == 1) { + return dataUriNull; + } + return dataUriError; + } + return uri; +} REGISTER_AA(VerifyActDataAbility); } // namespace AppExecFwk } // namespace OHOS diff --git a/zidl/bundle.json b/zidl/bundle.json deleted file mode 100644 index 5127a051270..00000000000 --- a/zidl/bundle.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "@ohos/zidl", - "description": "提供自动生成Extension 服务端及客户端接口文件的能力", - "version": "3.1", - "license": "Apache License 2.0", - "publishAs": "code-segment", - "segment": { - "destPath": "foundation/aafwk/standard/zidl" - }, - "dirs": {}, - "scripts": {}, - "component": { - "name": "zidl", - "subsystem": "aafwk", - "syscap": [], - "features": [], - "adapted_system_type": [ - "standard" - ], - "rom": "", - "ram": "", - "deps": { - "components": [ - "hiviewdfx_hilog_native", - "ipc", - "samgr_standard", - "utils_base" - ], - "third_party": [] - }, - "build": { - "sub_component": [], - "inner_kits": [], - "test": [] - } - } -} \ No newline at end of file diff --git a/zidl/test/native/BUILD.gn b/zidl/test/native/BUILD.gn deleted file mode 100644 index 8dc9839a534..00000000000 --- a/zidl/test/native/BUILD.gn +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/ohos.gni") - -IPC_SUBSYSTEM_DIR = "//foundation/communication/ipc" -ZIDL_TEST_DIR = "//foundation/aafwk/standard/zidl/test/native" - -config("ipc_test_config") { - include_dirs = [ - "//utils/native/base/include", - "$ZIDL_TEST_DIR/include", - "$IPC_SUBSYSTEM_DIR/utils/include", - "$IPC_SUBSYSTEM_DIR/ipc/native/src/mock/include", - "//utils/system/safwk/native/include", - ] -} - -ohos_executable("zidl_server_test") { - sources = [ - "./src/main_server.cpp", - "./src/test_service.cpp", - "./src/zidl_test_service_stub.cpp", - ] - - configs = [ ":ipc_test_config" ] - - deps = [ "//utils/native/base:utils" ] - - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", - "samgr_standard:samgr_proxy", - ] - - subsystem_name = "aafwk" - part_name = "zidl" -} - -ohos_executable("zidl_client_test") { - sources = [ - "./src/main_client.cpp", - "./src/test_client.cpp", - "./src/zidl_test_service_proxy.cpp", - ] - - configs = [ ":ipc_test_config" ] - - deps = [ "//utils/native/base:utils" ] - - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", - "samgr_standard:samgr_proxy", - ] - - subsystem_name = "aafwk" - part_name = "zidl" -} diff --git a/zidl/test/native/include/izidl_test_service.h b/zidl/test/native/include/izidl_test_service.h deleted file mode 100644 index 3f6308363a8..00000000000 --- a/zidl/test/native/include/izidl_test_service.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_IZIDLTESTSERVICE_H -#define OHOS_IZIDLTESTSERVICE_H - -#include -#include - -namespace OHOS { -class IZidlTestService : public IRemoteBroker { -public: - DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.IZidlTestService"); - - virtual ErrCode TestIntTransaction( - /* [in] */ int _data, - /* [out] */ int& result) = 0; - - virtual ErrCode TestStringTransaction( - /* [in] */ const std::string& _data) = 0; -}; -} // namespace OHOS -#endif // OHOS_IZIDLTESTSERVICE_H - diff --git a/zidl/test/native/include/test_client.h b/zidl/test/native/include/test_client.h deleted file mode 100644 index 4d54213003b..00000000000 --- a/zidl/test/native/include/test_client.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_IPC_TEST_SERVICE_CLIENT_H -#define OHOS_IPC_TEST_SERVICE_CLIENT_H - -#include "ipc_debug.h" -#include "log_tags.h" -#include "zidl_test_service_proxy.h" - -namespace OHOS { -class TestClient { -public: - int ConnectService(); - void StartIntTransaction(); - void StartStringTransaction(); -private: - static constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, LOG_ID_IPC, "TestClient" }; - sptr testService_; -}; -} // namespace OHOS -#endif // OHOS_IPC_TEST_SERVICE_CLIENT_H diff --git a/zidl/test/native/include/test_service.h b/zidl/test/native/include/test_service.h deleted file mode 100644 index 2c29658c761..00000000000 --- a/zidl/test/native/include/test_service.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_IPC_TEST_SERVICE_H -#define OHOS_IPC_TEST_SERVICE_H - -#include "hilog/log.h" -#include "log_tags.h" -#include "zidl_test_service_stub.h" - -namespace OHOS { -class TestService : public ZidlTestServiceStub { -public: - TestService(); - ~TestService(); - static int Instantiate(); - ErrCode TestIntTransaction(int data, int &rep) override; - ErrCode TestStringTransaction(const std::string& data) override; -private: - static constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, LOG_ID_IPC, "TestService" }; -}; -} // namespace OHOS -#endif // OHOS_IPC_TEST_SERVICE_H - diff --git a/zidl/test/native/include/zidl_test_service_proxy.h b/zidl/test/native/include/zidl_test_service_proxy.h deleted file mode 100644 index 56a6dcef68c..00000000000 --- a/zidl/test/native/include/zidl_test_service_proxy.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_ZIDLTESTSERVICEPROXY_H -#define OHOS_ZIDLTESTSERVICEPROXY_H - -#include - -#include "izidl_test_service.h" - -namespace OHOS { -class ZidlTestServiceProxy : public IRemoteProxy { -public: - explicit ZidlTestServiceProxy( - /* [in] */ const sptr& remote) - : IRemoteProxy(remote) - {} - - virtual ~ZidlTestServiceProxy() - {} - - ErrCode TestIntTransaction( - /* [in] */ int _data, - /* [out] */ int& result) override; - - ErrCode TestStringTransaction( - /* [in] */ const std::string& _data) override; - -private: - static constexpr int COMMAND_TEST_INT_TRANSACTION = MIN_TRANSACTION_ID + 0; - static constexpr int COMMAND_TEST_STRING_TRANSACTION = MIN_TRANSACTION_ID + 1; - - static inline BrokerDelegator delegator_; -}; -} // namespace OHOS -#endif // OHOS_ZIDLTESTSERVICEPROXY_H - diff --git a/zidl/test/native/include/zidl_test_service_stub.h b/zidl/test/native/include/zidl_test_service_stub.h deleted file mode 100644 index eed5cd8875a..00000000000 --- a/zidl/test/native/include/zidl_test_service_stub.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_ZIDLTESTSERVICESTUB_H -#define OHOS_ZIDLTESTSERVICESTUB_H - -#include - -#include "izidl_test_service.h" - -namespace OHOS { -class ZidlTestServiceStub : public IRemoteStub { -public: - int OnRemoteRequest( - /* [in] */ uint32_t code, - /* [in] */ MessageParcel& data, - /* [out] */ MessageParcel& reply, - /* [in] */ MessageOption& option) override; - -private: - static constexpr int COMMAND_TEST_INT_TRANSACTION = MIN_TRANSACTION_ID + 0; - static constexpr int COMMAND_TEST_STRING_TRANSACTION = MIN_TRANSACTION_ID + 1; -}; -} // namespace OHOS -#endif // OHOS_ZIDLTESTSERVICESTUB_H - diff --git a/zidl/test/native/src/main_client.cpp b/zidl/test/native/src/main_client.cpp deleted file mode 100644 index 7238b197b76..00000000000 --- a/zidl/test/native/src/main_client.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -#include "ipc_debug.h" -#include "ipc_skeleton.h" -#include "log_tags.h" -#include "test_client.h" - -using namespace OHOS; -using namespace OHOS::HiviewDFX; -static constexpr HiLogLabel LABEL = { LOG_CORE, LOG_ID_IPC, "IPCTestClient" }; - -enum TestCommand { - TEST_CMD_NONE = 0, - TEST_CMD_INT_TRANS = 1, - TEST_CMD_STRING_TRANS = 2 -}; - -namespace { -std::vector GetArgvOptions(int argc, char **argv) -{ - std::vector argvOptions; - for (int i = 1; i < argc; i++) { - argvOptions.emplace_back(std::string(argv[i])); - } - return argvOptions; -} -} - -int main(int argc, char *argv[]) -{ - TestCommand commandId = TestCommand::TEST_CMD_INT_TRANS; - if (argc > 1) { - commandId = TestCommand(atoi(argv[1])); - } else { - ZLOGE(LABEL, "unknown command"); - } - std::vector argvOptions; - argvOptions = GetArgvOptions(argc, argv); - std::unique_ptr testClient = std::make_unique(); - if (testClient->ConnectService()) { - return -1; - } - - ZLOGE(LABEL, "commandId= : %{public}d", commandId); - switch (commandId) { - case TestCommand::TEST_CMD_INT_TRANS: - testClient->StartIntTransaction(); - break; - case TestCommand::TEST_CMD_STRING_TRANS: - testClient->StartStringTransaction(); - break; - default: - ZLOGI(LABEL, "main arg error"); - break; - } - - IPCSkeleton::JoinWorkThread(); - return 0; -} diff --git a/zidl/test/native/src/main_server.cpp b/zidl/test/native/src/main_server.cpp deleted file mode 100644 index 0765721662f..00000000000 --- a/zidl/test/native/src/main_server.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "ipc_debug.h" -#include "ipc_skeleton.h" -#include "log_tags.h" -#include "test_service.h" - -using namespace OHOS; -using namespace OHOS::HiviewDFX; - -[[maybe_unused]]static constexpr HiLogLabel LABEL = { LOG_CORE, LOG_ID_IPC, "IPCTestServer" }; - -int main(int argc __attribute__((unused)), char **argv __attribute__((unused))) -{ - TestService::Instantiate(); - ZLOGI(LABEL, "call StartThreadPool"); - IPCSkeleton::JoinWorkThread(); -} diff --git a/zidl/test/native/src/test_client.cpp b/zidl/test/native/src/test_client.cpp deleted file mode 100644 index b2e7abd8e58..00000000000 --- a/zidl/test/native/src/test_client.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "test_client.h" - -#include "if_system_ability_manager.h" -#include "ipc_debug.h" -#include "ipc_skeleton.h" -#include "iservice_registry.h" -#include "system_ability_definition.h" - -namespace OHOS { -int TestClient::ConnectService() -{ - auto saMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (saMgr == nullptr) { - ZLOGE(LABEL, "get registry fail"); - return -1; - } - - sptr object = saMgr->GetSystemAbility(IPC_TEST_SERVICE); - - if (object != nullptr) { - ZLOGE(LABEL, "Got test Service object"); - testService_ = (new (std::nothrow) ZidlTestServiceProxy(object)); - } - - if (testService_ == nullptr) { - ZLOGE(LABEL, "Could not find Test Service!"); - return -1; - } - - return 0; -} - -void TestClient::StartIntTransaction() -{ - if (testService_ != nullptr) { - ZLOGE(LABEL, "StartIntTransaction"); - [[maybe_unused]] int result = 0; - testService_->TestIntTransaction(1234, result); // 1234 : test number - ZLOGE(LABEL, "Rec result from server %{public}d.", result); - } -} - -void TestClient::StartStringTransaction() -{ - if (testService_ != nullptr) { - ZLOGI(LABEL, "StartIntTransaction"); - testService_->TestStringTransaction("ZIDL Test"); - } -} -} // namespace OHOS diff --git a/zidl/test/native/src/test_service.cpp b/zidl/test/native/src/test_service.cpp deleted file mode 100644 index acf2f6346c1..00000000000 --- a/zidl/test/native/src/test_service.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "test_service.h" - -#include - -#include "if_system_ability_manager.h" -#include "ipc_debug.h" -#include "ipc_skeleton.h" -#include "iservice_registry.h" -#include "system_ability_definition.h" - -namespace OHOS { -using namespace OHOS::HiviewDFX; - -int TestService::Instantiate() -{ - ZLOGI(LABEL, "%{public}s call in", __func__); - auto saMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (saMgr == nullptr) { - ZLOGE(LABEL, "%{public}s:fail to get Registry", __func__); - return -ENODEV; - } - - sptr newInstance = new TestService(); - int result = saMgr->AddSystemAbility(IPC_TEST_SERVICE, newInstance); - ZLOGI(LABEL, "%{public}s: IPC_TEST_SERVICE result = %{public}d", __func__, result); - return result; -} - -TestService::TestService() -{ -} - -TestService::~TestService() -{ -} - -ErrCode TestService::TestIntTransaction(int data, int &rep) -{ - ZLOGE(LABEL, " TestService:read from client data = %{public}d", data); - rep = data + data; - return ERR_NONE; -} - -ErrCode TestService::TestStringTransaction(const std::string &data) -{ - ZLOGE(LABEL, "TestService:read string from client data = %{public}s", data.c_str()); - return data.size(); -} -} // namespace OHOS diff --git a/zidl/test/native/src/zidl_test_service_proxy.cpp b/zidl/test/native/src/zidl_test_service_proxy.cpp deleted file mode 100644 index 314cadb6a24..00000000000 --- a/zidl/test/native/src/zidl_test_service_proxy.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "zidl_test_service_proxy.h" - -namespace OHOS { -ErrCode ZidlTestServiceProxy::TestIntTransaction( - /* [in] */ int _data, - /* [out] */ int& result) -{ - MessageParcel data; - MessageParcel reply; - MessageOption option(MessageOption::TF_SYNC); - - data.WriteInt32(_data); - - int32_t st = Remote()->SendRequest(COMMAND_TEST_INT_TRANSACTION, data, reply, option); - if (st != ERR_NONE) { - return st; - } - - ErrCode ec = reply.ReadInt32(); - if (FAILED(ec)) { - return ec; - } - - result = reply.ReadInt32(); - return ERR_OK; -} - -ErrCode ZidlTestServiceProxy::TestStringTransaction( - /* [in] */ const std::string& _data) -{ - MessageParcel data; - MessageParcel reply; - MessageOption option(MessageOption::TF_SYNC); - - data.WriteString16(Str8ToStr16(_data)); - - int32_t st = Remote()->SendRequest(COMMAND_TEST_STRING_TRANSACTION, data, reply, option); - if (st != ERR_NONE) { - return st; - } - - ErrCode ec = reply.ReadInt32(); - if (FAILED(ec)) { - return ec; - } - - return ERR_OK; -} -} // namespace OHOS diff --git a/zidl/test/native/src/zidl_test_service_stub.cpp b/zidl/test/native/src/zidl_test_service_stub.cpp deleted file mode 100644 index adf63cd1dec..00000000000 --- a/zidl/test/native/src/zidl_test_service_stub.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "zidl_test_service_stub.h" - -namespace OHOS { -int ZidlTestServiceStub::OnRemoteRequest( - /* [in] */ uint32_t code, - /* [in] */ MessageParcel& data, - /* [out] */ MessageParcel& reply, - /* [in] */ MessageOption& option) -{ - switch (code) { - case COMMAND_TEST_INT_TRANSACTION: { - int _data = data.ReadInt32(); - int result; - ErrCode ec = TestIntTransaction(_data, result); - reply.WriteInt32(ec); - if (SUCCEEDED(ec)) { - reply.WriteInt32(result); - } - return ERR_NONE; - } - case COMMAND_TEST_STRING_TRANSACTION: { - std::string _data = Str16ToStr8(data.ReadString16()); - ErrCode ec = TestStringTransaction(_data); - reply.WriteInt32(ec); - return ERR_NONE; - } - default: - return IPCObjectStub::OnRemoteRequest(code, data, reply, option); - } - - return ERR_TRANSACTION_FAILED; -} -} // namespace OHOS diff --git a/zidl/test/zidlgen/IZidlTestService.zidl b/zidl/test/zidlgen/IZidlTestService.zidl deleted file mode 100644 index 8d2fa0b91c5..00000000000 --- a/zidl/test/zidlgen/IZidlTestService.zidl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -interface OHOS.IZidlTestService { - int TestIntTransaction([in] int data); - void TestStringTransaction([in] String data); -} \ No newline at end of file diff --git a/zidl/test/zidlgen/zidl b/zidl/test/zidlgen/zidl deleted file mode 100644 index c3bde7295221617c5bdc4e7a695702a580ac0c22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216360 zcmeFa34ByV);?Sb0Ru*D6&;k!cnOOELP$b@u!s#wkU)S)0wRl@Ch3rdPSSRFASh~N zP*G7MqB4pamr+zkqoSfB#u*oMP&2N`fD?Db=)@fz)bFXPQ{DGg_f0@?-uM6g-U}zE z`>AtJovJ!@YPm~akY6}4J}!=_qYE3y_&4JMi8(1Dbz&DK!kjFJ9ge@rtT*chGy&wK zRGnAG%LK&}Nsepd=WU>LohOr=;>tqK`FVCn&l)MIICDrzj&=nZl&;FBcuTW9PjT~k zyo~KbW%=8uTX|zosb6vZyoNj}-w@KcJdHKUY?(TbR|n6p)G6glORc~t6q!lAM)qVw)Zk%-O{lB9f?%dhNooX71v*n`{1=^1KwojXaP;;OBO`n(H9 zWDoU~5Ak`cYwL#8<%}3IB0D`;lb$8?@n+^FIBnWYp@G*LWf4y27*BVe(LME{As@8d z_+}_`#hBqCae~dC(|{inBdr3M5d*)_2EWM$e-wC13_Yt*@L2dwz+>6-DI6gde#X(U z@d3SK<1qZ19h5@a@&H_3X95zp}x52|JHu z&3k0D96=@gz~K6iWc3fqabY~+g9l37@tnkOCHxN=68C>0@g~B*BK<|5Nd4Og|LfsW zzVtFFkMJUnRTxiszD?Ikd?ewmLnPkZQ|d7Ye{rnDi*`u)T}oc`uOnH*GATcp@HrR+ zxPHgu63>>Wu`d%P-oDCePgkSr34bYH;?8u5 zPa%8-DvH~0WJr7^;rEwGy!l0m-;8-1KW?ie`MnZ|i{j23miK}wep?`6I^It0K zCy(U+e7e+AR4wKE5q=B#dGqZO-$eMSbEJIx9TGo+@FP)C!hX%3Lh=XWI9YG#&f+jo z4ldvRvD9-S;rWKdn>I;1FD861)dPD<$~O?cjPh-u@?x4Kj^S0Zyv`mnU*$iyK`qa> z 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 RRvC1y@^N=W+OHdE`#(nTh9Lj| -- Gitee