From 14f34cdda4e2482ed3bba0d99902bbe168e9847b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Tue, 21 Jan 2025 07:50:52 +0000 Subject: [PATCH 1/2] update services/native/src/usb_function_switch_window.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- services/native/src/usb_function_switch_window.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/services/native/src/usb_function_switch_window.cpp b/services/native/src/usb_function_switch_window.cpp index ea2ca732..3c3e08e2 100644 --- a/services/native/src/usb_function_switch_window.cpp +++ b/services/native/src/usb_function_switch_window.cpp @@ -125,10 +125,6 @@ bool UsbFunctionSwitchWindow::PopUpFunctionSwitchWindow() } return false; } - if (ShouldRejectShowWindow()) { - USB_HILOGE(MODULE_USB_SERVICE, "OOBE is not ready!"); - return false; - } return ShowFunctionSwitchWindow(); } @@ -337,10 +333,6 @@ void UsbFunctionSwitchWindow::BootCompletedEventCallback(const char *key, const return; } - if (eventSwitchWindow->ShouldRejectShowWindow()) { - USB_HILOGE(MODULE_USB_SERVICE, "%{public}s: OOBE is not ready!", __func__); - return; - } bool ret = eventSwitchWindow->ShowFunctionSwitchWindow(); if (!ret) { USB_HILOGE(MODULE_USB_SERVICE, "watchParameter to ShowFunctionSwitchWindow is failed!"); -- Gitee From 450f6e4d29263732191595bb5e96265175cd7c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Tue, 21 Jan 2025 07:51:40 +0000 Subject: [PATCH 2/2] update services/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- services/BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/BUILD.gn b/services/BUILD.gn index 15781b2e..43045bf7 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -39,7 +39,8 @@ ohos_shared_library("usbservice") { install_enable = true sources = [ "${usb_manager_path}/services/zidl/src/usb_srv_stub.cpp", - "${utils_path}/native/src/usb_settings_datashare.cpp", + + # "${utils_path}/native/src/usb_settings_datashare.cpp", "native/src/usb_report_sys_event.cpp", "native/src/usb_right_database.cpp", "native/src/usb_right_db_helper.cpp", -- Gitee