Merge "Fix input/output of MediaShellCommand" (1bbd8eaf) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/media/MediaShellCommand.java

+13 −3

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import android.view.KeyEvent;

		import java.io.BufferedReader;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.InputStreamReader;
		import java.io.PrintWriter;
		import java.util.List;
		@@ -53,11 +54,13 @@ public class MediaShellCommand extends ShellCommand {
		private ISessionManager mSessionService;
		private PrintWriter mWriter;
		private PrintWriter mErrorWriter;
		private InputStream mInput;

		@Override
		public int onCommand(String cmd) {
		mWriter = getOutPrintWriter();
		mErrorWriter = getErrPrintWriter();
		mInput = getRawInputStream();

		if (TextUtils.isEmpty(cmd)) {
		return handleDefaultCommands(cmd);
		@@ -189,6 +192,10 @@ public class MediaShellCommand extends ShellCommand {
		KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, InputDevice.SOURCE_KEYBOARD));
		}

		void log(String code, String msg) {
		mWriter.println(code + " " + msg);
		}

		void showError(String errMsg) {
		onHelp();
		mErrorWriter.println(errMsg);
		@@ -273,11 +280,14 @@ public class MediaShellCommand extends ShellCommand {
		cbThread.start();

		try {
		InputStreamReader converter = new InputStreamReader(System.in);
		InputStreamReader converter = new InputStreamReader(mInput);
		BufferedReader in = new BufferedReader(converter);
		String line;

		while ((line = in.readLine()) != null) {
		while (true) {
		mWriter.flush();
		mErrorWriter.flush();
		if ((line = in.readLine()) == null) break;
		boolean addNewline = true;
		if (line.length() <= 0) {
		addNewline = false;
		@@ -297,7 +307,7 @@ public class MediaShellCommand extends ShellCommand {

		synchronized (this) {
		if (addNewline) {
		System.out.println("");
		mWriter.println("");
		}
		printUsageMessage();
		}

services/core/java/com/android/server/media/VolumeCtrl.java

+10 −18

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@ import com.android.internal.os.BaseCommand;
		public class VolumeCtrl {

		private static final String TAG = "VolumeCtrl";
		private static final String LOG_V = "[V]";
		private static final String LOG_E = "[E]";

		// --stream affects --set, --adj or --get options.
		// --show affects --set and --adj options.
		@@ -80,21 +82,22 @@ public class VolumeCtrl {
		break;
		case "--get":
		doGet = true;
		log(LOG_V, "will get volume");
		cmd.log(LOG_V, "will get volume");
		break;
		case "--stream":
		stream = Integer.decode(cmd.getNextArgRequired()).intValue();
		log(LOG_V, "will control stream=" + stream + " (" + streamName(stream) + ")");
		cmd.log(LOG_V,
		"will control stream=" + stream + " (" + streamName(stream) + ")");
		break;
		case "--set":
		volIndex = Integer.decode(cmd.getNextArgRequired()).intValue();
		mode = VOLUME_CONTROL_MODE_SET;
		log(LOG_V, "will set volume to index=" + volIndex);
		cmd.log(LOG_V, "will set volume to index=" + volIndex);
		break;
		case "--adj":
		mode = VOLUME_CONTROL_MODE_ADJUST;
		adjustment = cmd.getNextArgRequired();
		log(LOG_V, "will adjust volume");
		cmd.log(LOG_V, "will adjust volume");
		break;
		default:
		throw new IllegalArgumentException("Unknown argument " + option);
		@@ -122,11 +125,11 @@ public class VolumeCtrl {

		//----------------------------------------
		// Test initialization
		log(LOG_V, "Connecting to AudioService");
		cmd.log(LOG_V, "Connecting to AudioService");
		IAudioService audioService = IAudioService.Stub.asInterface(ServiceManager.checkService(
		Context.AUDIO_SERVICE));
		if (audioService == null) {
		System.err.println(BaseCommand.NO_SYSTEM_ERROR_CODE);
		cmd.log(LOG_E, BaseCommand.NO_SYSTEM_ERROR_CODE);
		throw new AndroidException(
		"Can't connect to audio service; is the system running?");
		}
		@@ -152,23 +155,12 @@ public class VolumeCtrl {
		audioService.adjustStreamVolume(stream, adjDir, flag, pack);
		}
		if (doGet) {
		log(LOG_V, "volume is " + audioService.getStreamVolume(stream)
		cmd.log(LOG_V, "volume is " + audioService.getStreamVolume(stream)
		+ " in range [" + audioService.getStreamMinVolume(stream)
		+ ".." + audioService.getStreamMaxVolume(stream) + "]");
		}
		}

		//--------------------------------------------
		// Utilities

		static final String LOG_V = "[v]";
		static final String LOG_W = "[w]";
		static final String LOG_OK = "[ok]";

		static void log(String code, String msg) {
		System.out.println(code + " " + msg);
		}

		static String streamName(int stream) {
		try {
		return AudioSystem.STREAM_NAMES[stream];