From b77191c0fa296fc4994955e0918004accd618ea4 Mon Sep 17 00:00:00 2001
From: Ricky Niu <rickyniu@google.com>
Date: Wed, 1 Feb 2023 19:40:22 +0800
Subject: [PATCH] Fix up open bugs from gs101 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
---
 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 2000445d..d0e16ee5 100644
--- a/usb/gadget/UsbGadget.cpp
+++ b/usb/gadget/UsbGadget.cpp
@@ -546,9 +546,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 3c9c1cce..ba7d5f69 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.gs101
     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