diff options
author | Ricky Niu <rickyniu@google.com> | 2023-02-01 19:40:22 +0800 |
---|---|---|
committer | TreeHugger Robot <treehugger-gerrit@google.com> | 2023-02-07 08:55:20 +0000 |
commit | 5c7e338667a7f21c27f5789c16a4781dcbbe8755 (patch) | |
tree | 3c9943921d70554e6dc979e0c26dbd7b86f1156a | |
parent | 1737cfc63dc5f61f58cdb781bce771301792bd59 (diff) | |
download | gs201-5c7e338667a7f21c27f5789c16a4781dcbbe8755.tar.gz |
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
-rw-r--r-- | usb/gadget/UsbGadget.cpp | 4 | ||||
-rw-r--r-- | 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 bccf8a5..040e453 100644 --- a/usb/gadget/UsbGadget.cpp +++ b/usb/gadget/UsbGadget.cpp @@ -550,9 +550,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 bcedcc6..68fd3ae 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 |