From 2a522a0a03a8a33b00695f0fc503df023ee136b6 Mon Sep 17 00:00:00 2001 From: mwx1350003 Date: Tue, 3 Jun 2025 12:43:12 +0800 Subject: [PATCH 1/2] Process when the waveInfo is empty. Signed-off-by:lixiangpeng5 Signed-off-by: mwx1350003 --- services/miscdevice_service/src/miscdevice_service.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index 3263a1d..5ef7354 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -1537,7 +1537,6 @@ bool MiscdeviceService::UpdateVibratorAllInfo(const VibratorIdentifierIPC &ident ret = vibratorHdiConnection_.GetAllWaveInfo(identifier, waveInfo); if (ret != NO_ERROR) { MISC_HILOGE("HDI::GetAllWaveInfo return error"); - return false; } (void)ConvertToServerInfos(baseInfo, vibratorCapacity, waveInfo, info, vibratorAllInfos); devicesManageMap_.insert(std::make_pair(identifier.deviceId, vibratorAllInfos)); @@ -1593,7 +1592,6 @@ void MiscdeviceService::GetLocalVibratorInfo() ret = vibratorHdiConnection_.GetAllWaveInfo(param, waveInfo); if (ret != NO_ERROR) { MISC_HILOGE("Get local waveInfo fail"); - return; } std::vector vibratorIdList; for (auto &value : localInfo) { -- Gitee From 827310f282e077a7837bae31c04ef3ebbb21b51f Mon Sep 17 00:00:00 2001 From: lixiangpeng5 Date: Tue, 3 Jun 2025 07:23:53 +0000 Subject: [PATCH 2/2] update services/miscdevice_service/src/miscdevice_service.cpp. Signed-off-by: lixiangpeng5 --- services/miscdevice_service/src/miscdevice_service.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index 5ef7354..b9a4bc1 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -1536,7 +1536,7 @@ bool MiscdeviceService::UpdateVibratorAllInfo(const VibratorIdentifierIPC &ident std::vector waveInfo; ret = vibratorHdiConnection_.GetAllWaveInfo(identifier, waveInfo); if (ret != NO_ERROR) { - MISC_HILOGE("HDI::GetAllWaveInfo return error"); + MISC_HILOGW("HDI::GetAllWaveInfo return error"); } (void)ConvertToServerInfos(baseInfo, vibratorCapacity, waveInfo, info, vibratorAllInfos); devicesManageMap_.insert(std::make_pair(identifier.deviceId, vibratorAllInfos)); @@ -1591,7 +1591,7 @@ void MiscdeviceService::GetLocalVibratorInfo() std::vector waveInfo; ret = vibratorHdiConnection_.GetAllWaveInfo(param, waveInfo); if (ret != NO_ERROR) { - MISC_HILOGE("Get local waveInfo fail"); + MISC_HILOGW("Get local waveInfo fail"); } std::vector vibratorIdList; for (auto &value : localInfo) { -- Gitee