From 1c5d75b9bdc3ec4c6f65762d34fd9b4d45dfa971 Mon Sep 17 00:00:00 2001 From: bengris32 Date: Thu, 15 Feb 2024 02:40:19 +0000 Subject: [PATCH] rosemary: usb_gadget: Don't error when failing to write saving state Change-Id: If5c7e7b98c4e130d1cb57a4a4168abc05d547e5d Signed-off-by: bengris32 --- usb_gadget/UsbGadget.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/usb_gadget/UsbGadget.cpp b/usb_gadget/UsbGadget.cpp index 61dd971..e1f6323 100644 --- a/usb_gadget/UsbGadget.cpp +++ b/usb_gadget/UsbGadget.cpp @@ -229,11 +229,9 @@ static Status validateAndSetVidPid(int64_t functions) { } if (!saving.empty()) { if (!WriteStringToFile(saving, SAVING_PATH)) { - ALOGE("Failed to update saving state"); - ret = Status::ERROR; + ALOGW("Failed to update saving state"); } } - error: return ret; } @@ -343,10 +341,8 @@ ScopedAStatus UsbGadget::setCurrentUsbFunctions(long functions, if (functions == GadgetFunction::NONE) { // Make sure we reset saving state if there are no functions enabled. - if (!WriteStringToFile("0", SAVING_PATH)) { - ALOGE("Failed to reset saving state"); - status = Status::ERROR; - } + if (!WriteStringToFile("0", SAVING_PATH)) + ALOGW("Failed to reset saving state"); if (callback == NULL) return ScopedAStatus::fromServiceSpecificErrorWithMessage( -1, "callback == NULL");