diff --git a/services/native/src/usb_device_manager.cpp b/services/native/src/usb_device_manager.cpp index 3e82b24a3821b562163d6ad8d8da72dd1c614b9c..b72efe31590b0410985b424c6d573af2ce48242e 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 834ac4b7ed6d2fd53992b792c28002fdd292e8ef..76fc25cbc0f899c0521aebad280a1cbb1d13e1af 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", UEC_SERVICE_PERMISSION_DENIED, "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", UEC_SERVICE_PERMISSION_DENIED, "CheckDevicePermission failed"); return UEC_SERVICE_PERMISSION_DENIED; } @@ -797,6 +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", UEC_SERVICE_PERMISSION_DENIED, + "CheckDevicePermission failed"); return UEC_SERVICE_PERMISSION_DENIED; } @@ -1674,6 +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 ", UEC_SERVICE_INNER_ERR, "GetCallingInfo false"); return UEC_SERVICE_INNER_ERR; } @@ -1695,6 +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", UEC_SERVICE_GET_TOKEN_INFO_FAILED, "GetCallingInfo false"); return UEC_SERVICE_GET_TOKEN_INFO_FAILED; } @@ -1702,6 +1708,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 +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", UEC_SERVICE_PERMISSION_DENIED, "No permission"); return UEC_SERVICE_PERMISSION_DENIED; } @@ -1937,6 +1945,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 +1984,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) {