diff options
| author | 2017-02-17 04:41:32 +0000 | |
|---|---|---|
| committer | 2017-02-17 04:41:32 +0000 | |
| commit | 9c78253b75c926ef28dbdd7b2d1dc618da98d2df (patch) | |
| tree | 3dcde33a350bc34cd26aa6b7f336c2415bcd224a | |
| parent | 535ee425c19631b8663697e823ddb201f8901477 (diff) | |
| parent | fba74d6c61c3e3afc092d34d07b066ec0293a399 (diff) | |
Merge changes from topic 'svcusb' am: 5e2a2ee39e am: 6f44072d03 am: 35f8d6cfd0
am: fba74d6c61
Change-Id: I190467cba81aca56f32a0a6ff6d8e798e1e7ac30
| -rw-r--r-- | cmds/svc/src/com/android/commands/svc/UsbCommand.java | 10 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/cmds/svc/src/com/android/commands/svc/UsbCommand.java b/cmds/svc/src/com/android/commands/svc/UsbCommand.java index 4dcb05e4f85d..adbe9d015626 100644 --- a/cmds/svc/src/com/android/commands/svc/UsbCommand.java +++ b/cmds/svc/src/com/android/commands/svc/UsbCommand.java @@ -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); } diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 2e115abaf67d..34164b16a557 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -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" /> |