diff --git a/services/BUILD.gn b/services/BUILD.gn index 15781b2e6f94a67a07358f29321ae90af91fc84c..43045bf74d1f405df5e20ef86d877db7e7ff706e 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", diff --git a/services/native/src/usb_function_switch_window.cpp b/services/native/src/usb_function_switch_window.cpp index ea2ca732bf424c45a2d272262c271ccfd4a6294e..3c3e08e217b67fc9a08274492c3141a2041344da 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!");