From 32c44d45336b64b9acaebde584be6fbf12cf16c4 Mon Sep 17 00:00:00 2001 From: huangshiwei Date: Tue, 9 Jan 2024 11:10:18 +0800 Subject: [PATCH] huangshiwei4@huawei.com Signed-off-by: huangshiwei --- .../ability/ability_runtime/ability_context_impl.cpp | 5 ++++- frameworks/native/runtime/js_runtime.cpp | 1 - .../inner_api/src/service_router_mgr_helper.cpp | 4 +++- services/abilitymgr/src/ability_manager_service.cpp | 2 -- services/abilitymgr/src/ability_manager_stub.cpp | 2 +- services/appmgr/src/app_mgr_service.cpp | 4 ++-- services/appmgr/src/app_running_record.cpp | 2 -- services/quickfixmgr/src/quick_fix_manager_apply_task.cpp | 1 - .../uripermmgr/src/uri_permission_manager_stub_impl.cpp | 4 ++-- .../include/mock_ability_impl.h | 3 +-- .../mock_reverse_continuation_scheduler_replica_stub.h | 3 ++- .../ability_manager_service_third_test.cpp | 2 -- test/unittest/app_recovery_test/app_recovery_test.cpp | 1 - .../unittest/application_context_test/mock_context_impl.h | 1 - .../remote_register_service_proxy_test.cpp | 3 --- .../remote_register_service_stub_test.cpp | 3 --- .../continuation_test.cpp | 8 ++++---- .../data_ability_operation_test.cpp | 3 +-- .../data_uri_utils_test.cpp | 3 +-- .../quick_fix_manager_apply_task_test.cpp | 4 ++-- tools/aa/include/shell_command_config_loader.h | 3 +-- 21 files changed, 24 insertions(+), 38 deletions(-) diff --git a/frameworks/native/ability/ability_runtime/ability_context_impl.cpp b/frameworks/native/ability/ability_runtime/ability_context_impl.cpp index 2c6e7ebf56..cb72de7d0a 100644 --- a/frameworks/native/ability/ability_runtime/ability_context_impl.cpp +++ b/frameworks/native/ability/ability_runtime/ability_context_impl.cpp @@ -607,7 +607,10 @@ void AbilityContextImpl::RegisterAbilityCallback(std::weak_ptr JsRuntime::Create(const Options& options) if (!options.preload && options.isStageModel) { auto preloadedInstance = Runtime::GetPreloaded(); - #ifdef SUPPORT_GRAPHICS // reload ace if compatible mode changes if (Ace::AceForwardCompatibility::PipelineChanged() && preloadedInstance) { diff --git a/service_router_framework/interfaces/inner_api/src/service_router_mgr_helper.cpp b/service_router_framework/interfaces/inner_api/src/service_router_mgr_helper.cpp index 8d88ef918d..ed13ee22bf 100755 --- a/service_router_framework/interfaces/inner_api/src/service_router_mgr_helper.cpp +++ b/service_router_framework/interfaces/inner_api/src/service_router_mgr_helper.cpp @@ -118,7 +118,9 @@ sptr ServiceRouterMgrHelper::GetServiceRouterMgr() { std::unique_lock lock(cvLock_); auto waitState = mgrConn_.wait_for(lock, std::chrono::milliseconds(LOAD_SA_TIMEOUT_MS), - [this](){ return isReady; }); + [this]() { + return isReady; + }); if (!waitState) { return nullptr; } diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index a0f721297c..d598f111d1 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -552,7 +552,6 @@ int32_t AbilityManagerService::StartAbilityByInsightIntent(const Want &want, con return ERR_INVALID_VALUE; } std::string bundleNameFromAbilityRecord = abilityRecord->GetAbilityInfo().bundleName; - if (!bundleNameFromWant.empty() && bundleNameFromWant == bundleNameFromIntentMgr && bundleNameFromWant == bundleNameFromAbilityRecord) { HILOG_INFO("bundleName match"); @@ -6517,7 +6516,6 @@ void AbilityManagerService::EnableRecoverAbility(const sptr& toke } missionListMgr->EnableRecoverAbility(record->GetMissionId()); } - } void AbilityManagerService::RecoverAbilityRestart(const Want& want) diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp index 1c63ff2d37..f2209bd538 100644 --- a/services/abilitymgr/src/ability_manager_stub.cpp +++ b/services/abilitymgr/src/ability_manager_stub.cpp @@ -621,7 +621,7 @@ int AbilityManagerStub::ScheduleCommandAbilityWindowDoneInner(MessageParcel &dat int AbilityManagerStub::AcquireDataAbilityInner(MessageParcel &data, MessageParcel &reply) { - std::unique_ptr uri(new Uri(data.ReadString())); + std::unique_ptr uri = std::make_unique(data.ReadString()); bool tryBind = data.ReadBool(); sptr callerToken = data.ReadRemoteObject(); sptr result = AcquireDataAbility(*uri, tryBind, callerToken); diff --git a/services/appmgr/src/app_mgr_service.cpp b/services/appmgr/src/app_mgr_service.cpp index ccb355e4aa..91835782aa 100644 --- a/services/appmgr/src/app_mgr_service.cpp +++ b/services/appmgr/src/app_mgr_service.cpp @@ -154,8 +154,8 @@ ErrCode AppMgrService::Init() return ERR_OK; } -int32_t AppMgrService::CheckPermission( - [[maybe_unused]] const int32_t recordId, [[maybe_unused]] const std::string &permission) +int32_t AppMgrService::CheckPermission([[maybe_unused]] + const int32_t recordId, [[maybe_unused]] const std::string &permission) { HILOG_INFO("check application's permission"); diff --git a/services/appmgr/src/app_running_record.cpp b/services/appmgr/src/app_running_record.cpp index c86bd72bbe..ba8f15a5f3 100644 --- a/services/appmgr/src/app_running_record.cpp +++ b/services/appmgr/src/app_running_record.cpp @@ -944,8 +944,6 @@ void AppRunningRecord::AbilityBackground(const std::shared_ptrGetRunningState()) { applyTask->HandleRevokeQuickFixAppRunning(); return; diff --git a/services/uripermmgr/src/uri_permission_manager_stub_impl.cpp b/services/uripermmgr/src/uri_permission_manager_stub_impl.cpp index c361485d43..bd4016f7f8 100644 --- a/services/uripermmgr/src/uri_permission_manager_stub_impl.cpp +++ b/services/uripermmgr/src/uri_permission_manager_stub_impl.cpp @@ -734,8 +734,8 @@ uint32_t UriPermissionManagerStubImpl::GetTokenIdByBundleName(const std::string return bundleInfo.applicationInfo.accessTokenId; } -void UriPermissionManagerStubImpl::ProxyDeathRecipient::OnRemoteDied( - [[maybe_unused]] const wptr& remote) +void UriPermissionManagerStubImpl::ProxyDeathRecipient::OnRemoteDied([[maybe_unused]] + const wptr& remote) { if (proxy_) { HILOG_DEBUG("mgr stub died."); diff --git a/test/mock/frameworks_kits_ability_native_test/include/mock_ability_impl.h b/test/mock/frameworks_kits_ability_native_test/include/mock_ability_impl.h index 968af31935..0016eff6df 100644 --- a/test/mock/frameworks_kits_ability_native_test/include/mock_ability_impl.h +++ b/test/mock/frameworks_kits_ability_native_test/include/mock_ability_impl.h @@ -56,8 +56,7 @@ public: int MockGetCurrentState() { - int value; - value = GetCurrentState(); + int value = GetCurrentState(); return value; } diff --git a/test/mock/frameworks_kits_ability_native_test/include/mock_reverse_continuation_scheduler_replica_stub.h b/test/mock/frameworks_kits_ability_native_test/include/mock_reverse_continuation_scheduler_replica_stub.h index a9093a5534..f53f6a5967 100644 --- a/test/mock/frameworks_kits_ability_native_test/include/mock_reverse_continuation_scheduler_replica_stub.h +++ b/test/mock/frameworks_kits_ability_native_test/include/mock_reverse_continuation_scheduler_replica_stub.h @@ -25,7 +25,8 @@ public: MOCK_METHOD1(PassPrimary, void(const sptr &primary)); MOCK_METHOD0(ReverseContinuation, bool()); MOCK_METHOD1(NotifyReverseResult, void(int reverseResult)); - int SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { + int SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) + { SendRequest_called = true; return 0; } diff --git a/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp b/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp index 154f1415d0..dc705bf2c2 100644 --- a/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp +++ b/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp @@ -653,8 +653,6 @@ HWTEST_F(AbilityManagerServiceThirdTest, ForceTimeoutForTest_001, TestSize.Level } #endif - - /* * Feature: AbilityManagerService * Function: JudgeMultiUserConcurrency diff --git a/test/unittest/app_recovery_test/app_recovery_test.cpp b/test/unittest/app_recovery_test/app_recovery_test.cpp index 6e00630daf..54bb600cd9 100644 --- a/test/unittest/app_recovery_test/app_recovery_test.cpp +++ b/test/unittest/app_recovery_test/app_recovery_test.cpp @@ -330,7 +330,6 @@ HWTEST_F(AppRecoveryUnitTest, ScheduleSaveAppState_003, TestSize.Level1) EXPECT_TRUE(ret); }); watchdog.join(); - } /** diff --git a/test/unittest/application_context_test/mock_context_impl.h b/test/unittest/application_context_test/mock_context_impl.h index 5ebc519aa7..a0b3081540 100644 --- a/test/unittest/application_context_test/mock_context_impl.h +++ b/test/unittest/application_context_test/mock_context_impl.h @@ -67,7 +67,6 @@ public: void SetApplicationInfo(const std::shared_ptr &info); - void SetParentContext(const std::shared_ptr &context); std::string GetBundleCodePath() const override; diff --git a/test/unittest/continuation_test/remote_register_service_test/remote_register_service_proxy_test/remote_register_service_proxy_test.cpp b/test/unittest/continuation_test/remote_register_service_test/remote_register_service_proxy_test/remote_register_service_proxy_test.cpp index 2a90c906ab..71d11d014c 100644 --- a/test/unittest/continuation_test/remote_register_service_test/remote_register_service_proxy_test/remote_register_service_proxy_test.cpp +++ b/test/unittest/continuation_test/remote_register_service_test/remote_register_service_proxy_test/remote_register_service_proxy_test.cpp @@ -37,9 +37,6 @@ public: static void TearDownTestCase(void); void SetUp(); void TearDown(); - -protected: - }; void RemoteRegisterServiceProxyTest::SetUpTestCase(void) diff --git a/test/unittest/continuation_test/remote_register_service_test/remote_register_service_stub_test/remote_register_service_stub_test.cpp b/test/unittest/continuation_test/remote_register_service_test/remote_register_service_stub_test/remote_register_service_stub_test.cpp index 38c5c9d3e0..df97a8992c 100644 --- a/test/unittest/continuation_test/remote_register_service_test/remote_register_service_stub_test/remote_register_service_stub_test.cpp +++ b/test/unittest/continuation_test/remote_register_service_test/remote_register_service_stub_test/remote_register_service_stub_test.cpp @@ -36,9 +36,6 @@ public: static void TearDownTestCase(void); void SetUp(); void TearDown(); - -protected: - }; void RemoteRegisterServiceStubTest::SetUpTestCase(void) diff --git a/test/unittest/frameworks_kits_ability_native_test/continuation_test.cpp b/test/unittest/frameworks_kits_ability_native_test/continuation_test.cpp index a132abd638..26e1289bbe 100644 --- a/test/unittest/frameworks_kits_ability_native_test/continuation_test.cpp +++ b/test/unittest/frameworks_kits_ability_native_test/continuation_test.cpp @@ -74,8 +74,8 @@ public: class MockReverseContinuationSchedulerPrimaryProxy : public IRemoteProxy { public: - explicit MockReverseContinuationSchedulerPrimaryProxy(const sptr &remoteObject) : - IRemoteProxy(remoteObject) {} + explicit MockReverseContinuationSchedulerPrimaryProxy(const sptr &remoteObject) + : IRemoteProxy(remoteObject) {} virtual ~MockReverseContinuationSchedulerPrimaryProxy() = default; MOCK_METHOD0(NotifyReplicaTerminated, void()); MOCK_METHOD1(ContinuationBack, bool(const AAFwk::Want &want)); @@ -83,8 +83,8 @@ public: class MockReverseContinuationSchedulerReplicaProxy : public IRemoteProxy { public: - explicit MockReverseContinuationSchedulerReplicaProxy(const sptr &remoteObject) : - IRemoteProxy(remoteObject) {} + explicit MockReverseContinuationSchedulerReplicaProxy(const sptr &remoteObject) + : IRemoteProxy(remoteObject) {} virtual ~MockReverseContinuationSchedulerReplicaProxy() = default; MOCK_METHOD1(PassPrimary, void(const sptr &primary)); MOCK_METHOD0(ReverseContinuation, bool()); diff --git a/test/unittest/frameworks_kits_ability_native_test/data_ability_operation_test.cpp b/test/unittest/frameworks_kits_ability_native_test/data_ability_operation_test.cpp index 81e90d6908..48313aef66 100644 --- a/test/unittest/frameworks_kits_ability_native_test/data_ability_operation_test.cpp +++ b/test/unittest/frameworks_kits_ability_native_test/data_ability_operation_test.cpp @@ -30,8 +30,7 @@ using namespace testing::ext; using namespace OHOS; using namespace OHOS::AppExecFwk; static const std::string URI = "dataability://ohos.demo.TestDataAbilityOperation"; -namespace -{ +namespace { const int32_t ZERO = 0; const int32_t ONE = 1; const int32_t TWO = 2; diff --git a/test/unittest/frameworks_kits_ability_native_test/data_uri_utils_test.cpp b/test/unittest/frameworks_kits_ability_native_test/data_uri_utils_test.cpp index e1dba3f459..b1c61cf0ea 100644 --- a/test/unittest/frameworks_kits_ability_native_test/data_uri_utils_test.cpp +++ b/test/unittest/frameworks_kits_ability_native_test/data_uri_utils_test.cpp @@ -25,8 +25,7 @@ namespace OHOS { namespace AppExecFwk { using namespace testing::ext; using namespace OHOS::AppExecFwk; -namespace -{ +namespace { const int32_t THOUSAND = 1000; const int32_t NEGATIVE = -1; } diff --git a/test/unittest/quick_fix/quick_fix_manager_service_test/quick_fix_manager_apply_task_test.cpp b/test/unittest/quick_fix/quick_fix_manager_service_test/quick_fix_manager_apply_task_test.cpp index 04f7e9114c..6f88731bdd 100644 --- a/test/unittest/quick_fix/quick_fix_manager_service_test/quick_fix_manager_apply_task_test.cpp +++ b/test/unittest/quick_fix/quick_fix_manager_service_test/quick_fix_manager_apply_task_test.cpp @@ -239,7 +239,7 @@ HWTEST_F(QuickFixManagerApplyTaskTest, NotifyApplyStatus_0100, TestSize.Level1) HWTEST_F(QuickFixManagerApplyTaskTest, RemoveTimeoutTask_0100, TestSize.Level1) { HILOG_INFO("%{public}s start.", __func__); - auto applyTask = std::make_shared(bundleQfMgr_, appMgr_, + auto applyTask = std::make_shared(bundleQfMgr_, appMgr_, nullptr, quickFixMs_); ASSERT_NE(applyTask, nullptr); applyTask->RemoveTimeoutTask(); @@ -255,7 +255,7 @@ HWTEST_F(QuickFixManagerApplyTaskTest, RemoveTimeoutTask_0100, TestSize.Level1) HWTEST_F(QuickFixManagerApplyTaskTest, RemoveTimeoutTask_0200, TestSize.Level1) { HILOG_INFO("%{public}s start.", __func__); - auto applyTask = std::make_shared(bundleQfMgr_, appMgr_, + auto applyTask = std::make_shared(bundleQfMgr_, appMgr_, quickFixMs_->eventHandler_, quickFixMs_); ASSERT_NE(applyTask, nullptr); applyTask->RemoveTimeoutTask(); diff --git a/tools/aa/include/shell_command_config_loader.h b/tools/aa/include/shell_command_config_loader.h index 84d4815a83..19f3fc7313 100644 --- a/tools/aa/include/shell_command_config_loader.h +++ b/tools/aa/include/shell_command_config_loader.h @@ -21,8 +21,7 @@ namespace OHOS { namespace AAFwk { -class ShellCommandConfigLoder final -{ +class ShellCommandConfigLoder final { public: ShellCommandConfigLoder() = default; ~ShellCommandConfigLoder() = default;