diff --git a/adapter/uhdf2/manager/src/devsvc_manager_stub.c b/adapter/uhdf2/manager/src/devsvc_manager_stub.c index 42c11b4fa9ffe0e2dd8483c5879b32e374506450..9ed2cd7d94ab40b157de2b10218042bdaac518b4 100644 --- a/adapter/uhdf2/manager/src/devsvc_manager_stub.c +++ b/adapter/uhdf2/manager/src/devsvc_manager_stub.c @@ -353,7 +353,7 @@ static int32_t DevSvcManagerStubGetService(struct IDevSvcManager *super, struct if (remoteService != NULL) { HdfSbufWriteRemoteService(reply, remoteService); ret = HDF_SUCCESS; - HDF_LOGI("StubGetService service %{public}s found", name); + HDF_LOGD("StubGetService service %{public}s found", name); } else { HDF_LOGE("StubGetService %{public}s remoteService is null", name); ret = HDF_FAILURE; @@ -481,7 +481,7 @@ static int32_t DevSvcManagerStubRegisterServListener(struct IDevSvcManager *supe if (ret != HDF_SUCCESS) { ServStatListenerHolderRelease(listenerHolder); } else { - HDF_LOGI("register servstat listener success"); + HDF_LOGI("register servstat listener success, pid = %{public}d", HdfRemoteGetCallingPid()); } return HDF_SUCCESS; diff --git a/adapter/uhdf2/manager/src/servstat_listener_holder.c b/adapter/uhdf2/manager/src/servstat_listener_holder.c index 09662398a148466a38ab143495bcea1a121355dd..616030fbcc8f36eb8341e404730d7f68b3a0721b 100644 --- a/adapter/uhdf2/manager/src/servstat_listener_holder.c +++ b/adapter/uhdf2/manager/src/servstat_listener_holder.c @@ -63,7 +63,7 @@ static void UServStatListenerHolderListListAdd(struct UServStatListenerHolder *h } int32_t UServStatListenerHolderNotifyStatus(struct ServStatListenerHolder *holder, - struct ServiceStatus *status) + struct ServiceStatus *status, bool isPrintLog) { if (holder == NULL || status == NULL) { return HDF_ERR_INVALID_PARAM; @@ -73,7 +73,9 @@ int32_t UServStatListenerHolderNotifyStatus(struct ServStatListenerHolder *holde HDF_LOGE("failed to notify service status, invalid holder"); return HDF_ERR_INVALID_PARAM; } - HDF_LOGI("notify service status %{public}s, %{public}d", status->serviceName, status->status); + if (isPrintLog) { + HDF_LOGI("notify service status %{public}s, %{public}d", status->serviceName, status->status); + } struct HdfSBuf *data = HdfSbufTypedObtain(SBUF_IPC); if (data == NULL) { HDF_LOGE("failed to notify service status, oom"); diff --git a/framework/core/manager/include/devsvc_listener_holder.h b/framework/core/manager/include/devsvc_listener_holder.h index d2557a28380af33597bb87d6598d3f8094593700..9a4d61b4856322fcb66f76fde433242795bb7bab 100644 --- a/framework/core/manager/include/devsvc_listener_holder.h +++ b/framework/core/manager/include/devsvc_listener_holder.h @@ -16,7 +16,7 @@ struct ServStatListenerHolder { uint16_t listenClass; struct DListHead node; uint64_t index; - int32_t (*NotifyStatus)(struct ServStatListenerHolder *holder, struct ServiceStatus *status); + int32_t (*NotifyStatus)(struct ServStatListenerHolder *holder, struct ServiceStatus *status, bool isPrintLog); void (*Recycle)(struct ServStatListenerHolder *holder); }; diff --git a/framework/core/manager/src/devsvc_manager.c b/framework/core/manager/src/devsvc_manager.c index 4d5ec55f1ca9c3b3fe56193c1abebddd65f9a70a..fecd40baa6c203f0fed795b438266523f11e39e5 100644 --- a/framework/core/manager/src/devsvc_manager.c +++ b/framework/core/manager/src/devsvc_manager.c @@ -51,7 +51,7 @@ static void NotifyServiceStatusLocked( }; 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) { + if (holder->NotifyStatus(holder, &svcstat, true) == HDF_FAILURE) { DListRemove(&holder->node); if (holder->Recycle != NULL) { holder->Recycle(holder); @@ -76,7 +76,7 @@ static void NotifyServiceStatusOnRegisterLocked( .info = record->servInfo, }; if (listenerHolder->NotifyStatus != NULL) { - listenerHolder->NotifyStatus(listenerHolder, &svcstat); + listenerHolder->NotifyStatus(listenerHolder, &svcstat, false); } } } diff --git a/framework/core/manager/src/servstat_listener_holder.c b/framework/core/manager/src/servstat_listener_holder.c index b73ebbff5613d586d45356ac6c262ec5072f2c1f..13d861088993057e9d09f73184d0b531764ac3dd 100644 --- a/framework/core/manager/src/servstat_listener_holder.c +++ b/framework/core/manager/src/servstat_listener_holder.c @@ -37,8 +37,9 @@ void ServStatListenerHolderinit(void) } int32_t KServStatListenerHolderNotifyStatus(struct ServStatListenerHolder *holder, - struct ServiceStatus *status) + struct ServiceStatus *status, bool isPrintLog) { + (void)isPrintLog; if (holder == NULL || status == NULL) { return HDF_ERR_INVALID_PARAM; } diff --git a/interfaces/inner_api/core/hdf_device_class.h b/interfaces/inner_api/core/hdf_device_class.h index 46edd3d37dcd822e584c41d0dc0837b80eadecd7..c0f4068dffb542e1018e6b4726b8537ce9ece9b8 100644 --- a/interfaces/inner_api/core/hdf_device_class.h +++ b/interfaces/inner_api/core/hdf_device_class.h @@ -42,7 +42,7 @@ typedef enum { DEVICE_CLASS_CAMERA = 0x1 << 6, /** Camera device */ DEVICE_CLASS_USB = 0x1 << 7, /** USB device */ DEVICE_CLASS_USERAUTH = 0x1 << 8, /** User authentication device */ - DEVICE_CLASS_HIMEDIACOMM = 0X1 << 9, /** Mediacomm device */ + DEVICE_CLASS_HIMEDIACOMM = 0x1 << 9, /** Mediacomm device */ DEVICE_CLASS_MAX = 0x1 << 10, /** Maximum value of the device class */ } DeviceClass;