From 704316d8ba4e310cc9bf73cd11748df0d7ca025b Mon Sep 17 00:00:00 2001 From: Ricky Niu Date: Wed, 1 Feb 2023 19:40:22 +0800 Subject: [PATCH] Fix up open bugs from gs201 AIDL migration 1. Remove unused group "wakelock". 2. Correct the right return value on setCurrentUsbFunctions. Bug: 266694076 Test: Boot to home and function work Change-Id: If0925a61e481e4deca560dc8dfc1be80a76c148f (cherry picked from commit 5c7e338667a7f21c27f5789c16a4781dcbbe8755) --- usb/gadget/UsbGadget.cpp | 4 +--- usb/gadget/android.hardware.usb.gadget-service.rc | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/usb/gadget/UsbGadget.cpp b/usb/gadget/UsbGadget.cpp index 04dcd932..0be2fb9e 100644 --- a/usb/gadget/UsbGadget.cpp +++ b/usb/gadget/UsbGadget.cpp @@ -530,9 +530,7 @@ ScopedAStatus UsbGadget::setCurrentUsbFunctions(long functions, } ALOGI("Usb Gadget setcurrent functions called successfully"); - return ScopedAStatus::fromServiceSpecificErrorWithMessage( - -1, "Usb Gadget setcurrent functions called successfully"); - + return ScopedAStatus::ok(); error: ALOGI("Usb Gadget setcurrent functions failed"); diff --git a/usb/gadget/android.hardware.usb.gadget-service.rc b/usb/gadget/android.hardware.usb.gadget-service.rc index bcedcc6d..68fd3ae7 100644 --- a/usb/gadget/android.hardware.usb.gadget-service.rc +++ b/usb/gadget/android.hardware.usb.gadget-service.rc @@ -1,8 +1,7 @@ service vendor.usb-gadget-hal /vendor/bin/hw/android.hardware.usb.gadget-service class hal user system - group system shell mtp wakelock - capabilities WAKE_ALARM BLOCK_SUSPEND + group system shell mtp on post-fs chown root system /sys/class/typec/port0/power_role