From 9d86af25557134d3c0f66e0a56dc495ce551b047 Mon Sep 17 00:00:00 2001 From: Ricky Niu Date: Fri, 1 Apr 2022 02:34:28 +0800 Subject: [PATCH] Modified the resetUsbPort command to Asynchronous Because the resetUsbPort API modified to Asynchronous, related function need to be modified. Bug: 217369748 Signed-off-by: Ricky Niu Change-Id: Ieef549736532688ff356b4bb8fa790fb10403300 --- cmds/svc/src/com/android/commands/svc/UsbCommand.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cmds/svc/src/com/android/commands/svc/UsbCommand.java b/cmds/svc/src/com/android/commands/svc/UsbCommand.java index 66e982a9ec1c..7d804938dc38 100644 --- a/cmds/svc/src/com/android/commands/svc/UsbCommand.java +++ b/cmds/svc/src/com/android/commands/svc/UsbCommand.java @@ -26,6 +26,8 @@ import android.os.Looper; import android.os.RemoteException; import android.os.ServiceManager; +import java.util.function.Consumer; +import java.util.concurrent.Executor; import java.util.List; public class UsbCommand extends Svc.Command { @@ -81,6 +83,13 @@ public class UsbCommand extends Svc.Command { IUsbManager usbMgr = IUsbManager.Stub.asInterface(ServiceManager.getService( Context.USB_SERVICE)); + Executor executor = context.getMainExecutor(); + Consumer consumer = new Consumer(){ + public void accept(Integer status){ + System.out.println("Consumer status: " + status); + }; + }; + if ("setFunctions".equals(args[1])) { try { usbMgr.setCurrentFunctions(UsbManager.usbFunctionsFromString( @@ -179,7 +188,7 @@ public class UsbCommand extends Svc.Command { if (port != null && portStatus.isConnected()) { System.err.println( "Reset the USB port: port" + portNum); - port.resetUsbPort(); + port.resetUsbPort(executor, consumer); } else { System.err.println( "There is no available reset USB port");