Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e2a2ee3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic 'svcusb' 

* changes:
  Add data unlock argument to set function command.
  Allow the shell to set USB functions.
parents 2f21f71d ca1663a0

cmds/svc/src/com/android/commands/svc/UsbCommand.java

+7 −3
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ public class UsbCommand extends Svc.Command { 
    public String longHelp() {

        return shortHelp() + "\n"

                + "\n"

                + "usage: svc usb setFunction [function]\n"

                + "         Set the current usb function.\n\n"

                + "usage: svc usb setFunction [function] [usbDataUnlocked=false]\n"

                + "         Set the current usb function and optionally the data lock state.\n\n"

                + "       svc usb getFunction\n"

                + "          Gets the list of currently enabled functions\n";

    }
@@ -49,8 +49,12 @@ public class UsbCommand extends Svc.Command { 
            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]);

                }

                try {

                    usbMgr.setCurrentFunction((args.length >=3 ? args[2] : null), false);

                    usbMgr.setCurrentFunction((args.length >=3 ? args[2] : null), unlockData);

                } catch (RemoteException e) {

                    System.err.println("Error communicating with UsbManager: " + e);

                }

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />

    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />

    <uses-permission android:name="android.permission.MANAGE_NETWORK_POLICY" />

    <uses-permission android:name="android.permission.MANAGE_USB" />

    <!-- System tool permissions granted to the shell. -->

    <uses-permission android:name="android.permission.REAL_GET_TASKS" />

    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />