Refactor and clean up USB, add tests

Change UsbManager apis to use long instead of string, to match
usb hal. Change UsbDeviceManager internals to match as well.

Remove isFunctionEnabled and add getEnabledFunctions. Callers
would often call isFunctionEnabled for every possible function
to get the list of functions, so getEnabledFunctions reduces the
number of aidl calls.

Separate out dependencies between UsbHandler and UsbDeviceManager
and staticize the UsbHandler classes. Add unit tests with
mocked out dependencies to test state transitions for UsbHandler.

Bug: 62876645
Test: atest UsbTests
Change-Id: I785c4c24121a70e725de9742c6af50a6bf1baea0

1 files changed, 21 insertions, 22 deletions

diff --git a/cmds/svc/src/com/android/commands/svc/UsbCommand.java b/cmds/svc/src/com/android/commands/svc/UsbCommand.java
index 34f6d7de0cc9..3893be49e739 100644
--- a/cmds/svc/src/com/android/commands/svc/UsbCommand.java
+++ b/cmds/svc/src/com/android/commands/svc/UsbCommand.java
@@ -21,7 +21,6 @@ import android.hardware.usb.IUsbManager;
 import android.hardware.usb.UsbManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.os.SystemProperties;
 
 public class UsbCommand extends Svc.Command {
     public UsbCommand() {
@@ -37,41 +36,41 @@ public class UsbCommand extends Svc.Command {
     public String longHelp() {
         return shortHelp() + "\n"
                 + "\n"
-                + "usage: svc usb setFunction [function] [usbDataUnlocked=false]\n"
-                + "         Set the current usb function and optionally the data lock state.\n\n"
+                + "usage: svc usb setFunctions [function]\n"
+                + "         Set the current usb function. If function is blank, sets to charging.\n"
                 + "       svc usb setScreenUnlockedFunctions [function]\n"
-                + "         Sets the functions which, if the device was charging,"
-                    + " become current on screen unlock.\n"
-                + "       svc usb getFunction\n"
-                + "          Gets the list of currently enabled functions\n";
+                + "         Sets the functions which, if the device was charging, become current on"
+                    + "screen unlock. If function is blank, turn off this feature.\n"
+                + "       svc usb getFunctions\n"
+                + "          Gets the list of currently enabled functions\n\n"
+                + "possible values of [function] are any of 'mtp', 'ptp', 'rndis', 'midi'\n";
     }
 
     @Override
     public void run(String[] args) {
-        boolean validCommand = false;
         if (args.length >= 2) {
-            if ("setFunction".equals(args[1])) {
-                IUsbManager usbMgr = IUsbManager.Stub.asInterface(ServiceManager.getService(
-                        Context.USB_SERVICE));
-                boolean unlockData = false;
-                if (args.length >= 4) {
-                    unlockData = Boolean.valueOf(args[3]);
-                }
+            IUsbManager usbMgr = IUsbManager.Stub.asInterface(ServiceManager.getService(
+                    Context.USB_SERVICE));
+            if ("setFunctions".equals(args[1])) {
                 try {
-                    usbMgr.setCurrentFunction((args.length >=3 ? args[2] : null), unlockData);
+                    usbMgr.setCurrentFunctions(UsbManager.usbFunctionsFromString(
+                            args.length >= 3 ? args[2] : ""));
                 } catch (RemoteException e) {
                     System.err.println("Error communicating with UsbManager: " + e);
                 }
                 return;
-            } else if ("getFunction".equals(args[1])) {
-                System.err.println(SystemProperties.get("sys.usb.config"));
+            } else if ("getFunctions".equals(args[1])) {
+                try {
+                    System.err.println(
+                            UsbManager.usbFunctionsToString(usbMgr.getCurrentFunctions()));
+                } catch (RemoteException e) {
+                    System.err.println("Error communicating with UsbManager: " + e);
+                }
                 return;
             } else if ("setScreenUnlockedFunctions".equals(args[1])) {
-                IUsbManager usbMgr = IUsbManager.Stub.asInterface(ServiceManager.getService(
-                        Context.USB_SERVICE));
                 try {
-                    usbMgr.setScreenUnlockedFunctions((args.length >= 3 ? args[2] :
-                            UsbManager.USB_FUNCTION_NONE));
+                    usbMgr.setScreenUnlockedFunctions(UsbManager.usbFunctionsFromString(
+                            args.length >= 3 ? args[2] : ""));
                 } catch (RemoteException e) {
                     System.err.println("Error communicating with UsbManager: " + e);
                 }