Merge changes from topic 'svcusb' am: 5e2a2ee39e (35f8d6cf) · Commits · e / os / android_frameworks_base

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);
		}

+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" />