From 4c4ff8cf94406b2b855b9b7f5e4d548485a8683a Mon Sep 17 00:00:00 2001 From: huyx Date: Tue, 13 Aug 2024 20:08:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- adapter/uhdf2/manager/src/servstat_listener_holder.c | 5 ----- framework/core/manager/src/devsvc_manager.c | 3 ++- interfaces/inner_api/core/hdf_service_status.h | 2 -- interfaces/inner_api/hdi/iservstat_listener_hdi.h | 2 -- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/adapter/uhdf2/manager/src/servstat_listener_holder.c b/adapter/uhdf2/manager/src/servstat_listener_holder.c index 570d872fd..f21d1d27b 100644 --- a/adapter/uhdf2/manager/src/servstat_listener_holder.c +++ b/adapter/uhdf2/manager/src/servstat_listener_holder.c @@ -73,11 +73,6 @@ int32_t UServStatListenerHolderNotifyStatus(struct ServStatListenerHolder *holde HDF_LOGE("failed to notify service status, invalid holder"); return HDF_ERR_INVALID_PARAM; } - if (status->status == SERVIE_STATUS_REGISTER) { - status->status = SERVIE_STATUS_START; - } else { - HDF_LOGI("notify service status %{public}s, %{public}d", status->serviceName, status->status); - } struct HdfSBuf *data = HdfSbufTypedObtain(SBUF_IPC); if (data == NULL) { diff --git a/framework/core/manager/src/devsvc_manager.c b/framework/core/manager/src/devsvc_manager.c index f423a39f9..eee7cfd2f 100644 --- a/framework/core/manager/src/devsvc_manager.c +++ b/framework/core/manager/src/devsvc_manager.c @@ -49,6 +49,7 @@ static void NotifyServiceStatusLocked( .status = status, .info = record->servInfo, }; + HDF_LOGI("notify service status %{public}s, %{public}d", svcstat.serviceName, svcstat.status); DLIST_FOR_EACH_ENTRY_SAFE(holder, tmp, &devSvcManager->svcstatListeners, struct ServStatListenerHolder, node) { if ((holder->listenClass & record->devClass) && holder->NotifyStatus != NULL) { if (holder->NotifyStatus(holder, &svcstat) == HDF_FAILURE) { @@ -72,7 +73,7 @@ static void NotifyServiceStatusOnRegisterLocked( struct ServiceStatus svcstat = { .deviceClass = record->devClass, .serviceName = record->servName, - .status = SERVIE_STATUS_REGISTER, + .status = SERVIE_STATUS_START, .info = record->servInfo, }; if (listenerHolder->NotifyStatus != NULL) { diff --git a/interfaces/inner_api/core/hdf_service_status.h b/interfaces/inner_api/core/hdf_service_status.h index b07cfd309..68dc4ec5e 100644 --- a/interfaces/inner_api/core/hdf_service_status.h +++ b/interfaces/inner_api/core/hdf_service_status.h @@ -47,8 +47,6 @@ enum ServiceStatusType { SERVIE_STATUS_CHANGE, /** The service is stopped. */ SERVIE_STATUS_STOP, - /** register service listener status. */ - SERVIE_STATUS_REGISTER, /** Maximum value of the service status. */ SERVIE_STATUS_MAX, }; diff --git a/interfaces/inner_api/hdi/iservstat_listener_hdi.h b/interfaces/inner_api/hdi/iservstat_listener_hdi.h index 01c58259d..0f03898dc 100644 --- a/interfaces/inner_api/hdi/iservstat_listener_hdi.h +++ b/interfaces/inner_api/hdi/iservstat_listener_hdi.h @@ -56,8 +56,6 @@ enum ServiceStatusType { SERVIE_STATUS_CHANGE, /** The service is stopped. */ SERVIE_STATUS_STOP, - /** register service listener status. */ - SERVIE_STATUS_REGISTER, /** Maximum value of the service status. */ SERVIE_STATUS_MAX, }; -- Gitee