From 95eb7c3a87f52984de68c7fc9d9fecaacf1d3e40 Mon Sep 17 00:00:00 2001 From: fengliucs Date: Wed, 23 Apr 2025 16:11:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E2=80=9C=E5=8D=97=E5=90=91=E5=A4=96?= =?UTF-8?q?=E8=AE=BE=E7=94=9F=E6=80=81=E8=BF=90=E7=BB=B4=E6=89=93=E7=82=B9?= =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fengliucs --- services/native/src/usb_service.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/native/src/usb_service.cpp b/services/native/src/usb_service.cpp index 834ac4b7..47d5f540 100644 --- a/services/native/src/usb_service.cpp +++ b/services/native/src/usb_service.cpp @@ -448,6 +448,7 @@ bool UsbService::IsCommonEventServiceAbilityExist() int32_t UsbService::OpenDevice(uint8_t busNum, uint8_t devAddr) { if (!UsbService::CheckDevicePermission(busNum, devAddr)) { + ReportUsbOperationFaultSysEvent("OpenDevice", ret, "CheckDevicePermission failed"); return UEC_SERVICE_PERMISSION_DENIED; } @@ -480,6 +481,7 @@ int32_t UsbService::Close(uint8_t busNum, uint8_t devAddr) int32_t UsbService::ResetDevice(uint8_t busNum, uint8_t devAddr) { if (!UsbService::CheckDevicePermission(busNum, devAddr)) { + ReportUsbOperationFaultSysEvent("ResetDevice", ret, "CheckDevicePermission failed"); return UEC_SERVICE_PERMISSION_DENIED; } @@ -797,6 +799,7 @@ int32_t UsbService::GetActiveConfig(uint8_t busNum, uint8_t devAddr, uint8_t &co int32_t UsbService::GetRawDescriptor(uint8_t busNum, uint8_t devAddr, std::vector &bufferData) { if (!UsbService::CheckDevicePermission(busNum, devAddr)) { + ReportUsbOperationFaultSysEvent("GetRawDescriptor", ret, "CheckDevicePermission failed"); return UEC_SERVICE_PERMISSION_DENIED; } @@ -1674,6 +1677,7 @@ int32_t UsbService::GetAccessoryList(std::vector &accessList) int32_t userId = USB_RIGHT_USERID_INVALID; if (!GetCallingInfo(bundleName, tokenId, userId)) { USB_HILOGE(MODULE_USB_SERVICE, "GetCallingInfo false"); + ReportUsbOperationFaultSysEvent("GetAccessoryList ", ret, "GetCallingInfo false"); return UEC_SERVICE_INNER_ERR; } @@ -1695,6 +1699,7 @@ int32_t UsbService::OpenAccessory(const USBAccessory &access, int32_t &fd) int32_t userId = USB_RIGHT_USERID_INVALID; if (!GetCallingInfo(bundleName, tokenId, userId)) { USB_HILOGE(MODULE_USB_SERVICE, "GetCallingInfo false"); + ReportUsbOperationFaultSysEvent("OpenAccessory", ret, "GetCallingInfo false"); return UEC_SERVICE_GET_TOKEN_INFO_FAILED; } @@ -1702,6 +1707,7 @@ int32_t UsbService::OpenAccessory(const USBAccessory &access, int32_t &fd) int32_t ret = usbAccessoryManager_->GetAccessorySerialNumber(access, bundleName, serialNum); if (ret != UEC_OK) { USB_HILOGE(MODULE_USB_SERVICE, "can not find accessory."); + ReportUsbOperationFaultSysEvent("OpenAccessory", ret, "can not find accessory"); return ret; } @@ -1709,6 +1715,7 @@ int32_t UsbService::OpenAccessory(const USBAccessory &access, int32_t &fd) ret = UsbService::HasAccessoryRight(access, result); if (ret != UEC_OK || !result) { USB_HILOGE(MODULE_USB_SERVICE, "No permission"); + ReportUsbOperationFaultSysEvent("OpenAccessory", ret, "No permission"); return UEC_SERVICE_PERMISSION_DENIED; } @@ -1937,6 +1944,7 @@ int32_t UsbService::GetPorts(std::vector &ports) int32_t ret = CheckSysApiPermission(); if (ret != UEC_OK) { USB_HILOGE(MODULE_USB_SERVICE, "%{public}s: CheckSysApiPermission failed ret = %{public}d", __func__, ret); + ReportUsbOperationFaultSysEvent("SetPortRole", ret, "CheckSysApiPermission failed"); return ret; } if (usbPortManager_ == nullptr) { @@ -1975,6 +1983,7 @@ int32_t UsbService::SetPortRole(int32_t portId, int32_t powerRole, int32_t dataR int32_t ret = CheckSysApiPermission(); if (ret != UEC_OK) { USB_HILOGE(MODULE_USB_SERVICE, "%{public}s: CheckSysApiPermission failed ret = %{public}d", __func__, ret); + ReportUsbOperationFaultSysEvent("SetPortRole", ret, "CheckSysApiPermission failed"); return ret; } if (usbPortManager_ == nullptr) { -- Gitee From 1f6b240484e2fcbe0938befe2ffe1d345172daf3 Mon Sep 17 00:00:00 2001 From: fengliucs Date: Wed, 23 Apr 2025 16:43:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E2=80=9C=E5=8D=97=E5=90=91=E5=A4=96?= =?UTF-8?q?=E8=AE=BE=E7=94=9F=E6=80=81=E8=BF=90=E7=BB=B4=E6=89=93=E7=82=B9?= =?UTF-8?q?=E5=A2=9E=E5=BC=BA=EF=BC=88USB=E7=AE=A1=E7=90=86=EF=BC=89?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fengliucs --- services/native/src/usb_service.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/services/native/src/usb_service.cpp b/services/native/src/usb_service.cpp index 47d5f540..3f2f11ee 100644 --- a/services/native/src/usb_service.cpp +++ b/services/native/src/usb_service.cpp @@ -448,7 +448,7 @@ bool UsbService::IsCommonEventServiceAbilityExist() int32_t UsbService::OpenDevice(uint8_t busNum, uint8_t devAddr) { if (!UsbService::CheckDevicePermission(busNum, devAddr)) { - ReportUsbOperationFaultSysEvent("OpenDevice", ret, "CheckDevicePermission failed"); + ReportUsbOperationFaultSysEvent("OpenDevice", UEC_SERVICE_PERMISSION_DENIED, "CheckDevicePermission failed"); return UEC_SERVICE_PERMISSION_DENIED; } @@ -481,7 +481,7 @@ int32_t UsbService::Close(uint8_t busNum, uint8_t devAddr) int32_t UsbService::ResetDevice(uint8_t busNum, uint8_t devAddr) { if (!UsbService::CheckDevicePermission(busNum, devAddr)) { - ReportUsbOperationFaultSysEvent("ResetDevice", ret, "CheckDevicePermission failed"); + ReportUsbOperationFaultSysEvent("ResetDevice", UEC_SERVICE_PERMISSION_DENIED, "CheckDevicePermission failed"); return UEC_SERVICE_PERMISSION_DENIED; } @@ -799,7 +799,8 @@ int32_t UsbService::GetActiveConfig(uint8_t busNum, uint8_t devAddr, uint8_t &co int32_t UsbService::GetRawDescriptor(uint8_t busNum, uint8_t devAddr, std::vector &bufferData) { if (!UsbService::CheckDevicePermission(busNum, devAddr)) { - ReportUsbOperationFaultSysEvent("GetRawDescriptor", ret, "CheckDevicePermission failed"); + ReportUsbOperationFaultSysEvent("GetRawDescriptor", UEC_SERVICE_PERMISSION_DENIED, + "CheckDevicePermission failed"); return UEC_SERVICE_PERMISSION_DENIED; } @@ -1677,7 +1678,7 @@ int32_t UsbService::GetAccessoryList(std::vector &accessList) int32_t userId = USB_RIGHT_USERID_INVALID; if (!GetCallingInfo(bundleName, tokenId, userId)) { USB_HILOGE(MODULE_USB_SERVICE, "GetCallingInfo false"); - ReportUsbOperationFaultSysEvent("GetAccessoryList ", ret, "GetCallingInfo false"); + ReportUsbOperationFaultSysEvent("GetAccessoryList ", UEC_SERVICE_INNER_ERR, "GetCallingInfo false"); return UEC_SERVICE_INNER_ERR; } @@ -1699,7 +1700,7 @@ int32_t UsbService::OpenAccessory(const USBAccessory &access, int32_t &fd) int32_t userId = USB_RIGHT_USERID_INVALID; if (!GetCallingInfo(bundleName, tokenId, userId)) { USB_HILOGE(MODULE_USB_SERVICE, "GetCallingInfo false"); - ReportUsbOperationFaultSysEvent("OpenAccessory", ret, "GetCallingInfo false"); + ReportUsbOperationFaultSysEvent("OpenAccessory", UEC_SERVICE_GET_TOKEN_INFO_FAILED, "GetCallingInfo false"); return UEC_SERVICE_GET_TOKEN_INFO_FAILED; } -- Gitee From 5bc313e946d1d08ff091a5ba1572082cda65610f Mon Sep 17 00:00:00 2001 From: fengliucs Date: Wed, 23 Apr 2025 17:27:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E2=80=9C=E5=8D=97=E5=90=91=E5=A4=96?= =?UTF-8?q?=E8=AE=BE=E7=94=9F=E6=80=81=E8=BF=90=E7=BB=B4=E6=89=93=E7=82=B9?= =?UTF-8?q?=E5=A2=9E=E5=BC=BA=EF=BC=88USB=E7=AE=A1=E7=90=86=EF=BC=89?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fengliucs --- services/native/src/usb_device_manager.cpp | 2 ++ services/native/src/usb_service.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/services/native/src/usb_device_manager.cpp b/services/native/src/usb_device_manager.cpp index 3e82b24a..b72efe31 100644 --- a/services/native/src/usb_device_manager.cpp +++ b/services/native/src/usb_device_manager.cpp @@ -178,6 +178,7 @@ int32_t UsbDeviceManager::SetCurrentFunctions(int32_t funcs) std::lock_guard guard(functionMutex_); if (usbd_->GetCurrentFunctions(lastFunc) != UEC_OK) { USB_HILOGE(MODULE_USB_SERVICE, "UsbDeviceManager::get current functions fail"); + ReportUsbOperationFaultSysEvent("FUNCTION_CHANGED", UEC_SERVICE_INVALID_VALUE, "UsbdfGetFunc is failed"); return UEC_SERVICE_INVALID_VALUE; } if (lastFunc == funcs) { @@ -187,6 +188,7 @@ int32_t UsbDeviceManager::SetCurrentFunctions(int32_t funcs) int32_t ret = usbd_->SetCurrentFunctions(funcs); if (ret != UEC_OK) { USB_HILOGE(MODULE_USB_SERVICE, "UsbDeviceManager::usbd_ set function error"); + ReportUsbOperationFaultSysEvent("FUNCTION_CHANGED", UEC_SERVICE_INVALID_VALUE, "UsbdSetFunc is failed"); if (ret == HDF_ERR_NOT_SUPPORT) { return UEC_SERVICE_FUNCTION_NOT_SUPPORT; } diff --git a/services/native/src/usb_service.cpp b/services/native/src/usb_service.cpp index 3f2f11ee..76fc25cb 100644 --- a/services/native/src/usb_service.cpp +++ b/services/native/src/usb_service.cpp @@ -1716,7 +1716,7 @@ int32_t UsbService::OpenAccessory(const USBAccessory &access, int32_t &fd) ret = UsbService::HasAccessoryRight(access, result); if (ret != UEC_OK || !result) { USB_HILOGE(MODULE_USB_SERVICE, "No permission"); - ReportUsbOperationFaultSysEvent("OpenAccessory", ret, "No permission"); + ReportUsbOperationFaultSysEvent("OpenAccessory", UEC_SERVICE_PERMISSION_DENIED, "No permission"); return UEC_SERVICE_PERMISSION_DENIED; } -- Gitee