From aaef984f019b1099d137d853981d3fcbaaad9a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AF=95=E5=B2=A9?= Date: Mon, 20 Feb 2023 08:07:57 +0000 Subject: [PATCH 1/3] =?UTF-8?q?update=20services/aams/src/accessible=5Fabi?= =?UTF-8?q?lity=5Fmanager=5Fservice.cpp.=20=E4=BF=AE=E6=94=B9OH=E7=BA=A2?= =?UTF-8?q?=E5=86=9B=E8=A7=81=E8=AF=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 毕岩 --- services/aams/src/accessible_ability_manager_service.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/services/aams/src/accessible_ability_manager_service.cpp b/services/aams/src/accessible_ability_manager_service.cpp index 63d455e24..11be6f6de 100644 --- a/services/aams/src/accessible_ability_manager_service.cpp +++ b/services/aams/src/accessible_ability_manager_service.cpp @@ -315,7 +315,7 @@ uint32_t AccessibleAbilityManagerService::RegisterCaptionObserver( { HILOG_DEBUG(); if (!callback || !handler_) { - HILOG_ERROR("Parameters check failed! callback:%{public}p, handler:%{public}p", + HILOG_ERROR("Parameters check failed!", callback.GetRefPtr(), handler_.get()); return ERR_INVALID_VALUE; } @@ -396,7 +396,7 @@ RetError AccessibleAbilityManagerService::GetAbilityList(const uint32_t abilityT { HILOG_DEBUG("abilityTypes(%{public}d) stateType(%{public}d)", abilityTypes, stateType); if (!handler_ || (stateType > ABILITY_STATE_INSTALLED) || (stateType < ABILITY_STATE_ENABLE)) { - HILOG_ERROR("Parameters check failed! stateType:%{public}d, handler:%{public}p", stateType, handler_.get()); + HILOG_ERROR("Parameters check failed! stateType:%{public}d, ", stateType); return RET_ERR_INVALID_PARAM; } @@ -1949,8 +1949,7 @@ uint32_t AccessibleAbilityManagerService::RegisterConfigObserver( { HILOG_DEBUG(); if (!callback || !handler_) { - HILOG_ERROR("Parameters check failed! callback:%{public}p, handler:%{public}p", - callback.GetRefPtr(), handler_.get()); + HILOG_ERROR("Parameters check failed!"); return ERR_INVALID_VALUE; } From 34a622fbb29ce83bec748a4c96f7afdca332fed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AF=95=E5=B2=A9?= Date: Mon, 20 Feb 2023 08:31:01 +0000 Subject: [PATCH 2/3] update services/aams/src/accessible_ability_manager_service.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 毕岩 --- services/aams/src/accessible_ability_manager_service.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/aams/src/accessible_ability_manager_service.cpp b/services/aams/src/accessible_ability_manager_service.cpp index 11be6f6de..385003043 100644 --- a/services/aams/src/accessible_ability_manager_service.cpp +++ b/services/aams/src/accessible_ability_manager_service.cpp @@ -315,8 +315,7 @@ uint32_t AccessibleAbilityManagerService::RegisterCaptionObserver( { HILOG_DEBUG(); if (!callback || !handler_) { - HILOG_ERROR("Parameters check failed!", - callback.GetRefPtr(), handler_.get()); + HILOG_ERROR("Parameters check failed!"); return ERR_INVALID_VALUE; } From 4ef363e334c4d6b794139589444e9d85ed24c9c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AF=95=E5=B2=A9?= Date: Mon, 20 Feb 2023 08:32:32 +0000 Subject: [PATCH 3/3] update services/aams/src/accessible_ability_manager_service.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 毕岩 --- services/aams/src/accessible_ability_manager_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/aams/src/accessible_ability_manager_service.cpp b/services/aams/src/accessible_ability_manager_service.cpp index 385003043..b83c16b2b 100644 --- a/services/aams/src/accessible_ability_manager_service.cpp +++ b/services/aams/src/accessible_ability_manager_service.cpp @@ -395,7 +395,7 @@ RetError AccessibleAbilityManagerService::GetAbilityList(const uint32_t abilityT { HILOG_DEBUG("abilityTypes(%{public}d) stateType(%{public}d)", abilityTypes, stateType); if (!handler_ || (stateType > ABILITY_STATE_INSTALLED) || (stateType < ABILITY_STATE_ENABLE)) { - HILOG_ERROR("Parameters check failed! stateType:%{public}d, ", stateType); + HILOG_ERROR("Parameters check failed! stateType:%{public}d", stateType); return RET_ERR_INVALID_PARAM; }