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

Commit 5569aa50 authored Jan 30, 2015 by Mike Lockwood Committed by Android (Google) Code Review Jan 30, 2015

Merge "MidiManager: minor Javadoc tweaks"

parents 8bc2d056 a7e348eb

core/java/android/midi/MidiDevice.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,7 @@ import java.util.ArrayList;
	* This class is used for sending and receiving data to and from an MIDI device		* This class is used for sending and receiving data to and from an MIDI device
	* Instances of this class are created by {@link MidiManager#openDevice}.		* Instances of this class are created by {@link MidiManager#openDevice}.
	*		*
			* CANDIDATE FOR PUBLIC API
	* @hide		* @hide
	*/		*/
	public final class MidiDevice {		public final class MidiDevice {

core/java/android/midi/MidiDeviceInfo.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ import android.os.Parcelable;
	* This class is just an immutable object to encapsulate the MIDI device description.		* This class is just an immutable object to encapsulate the MIDI device description.
	* Use the MidiDevice class to actually communicate with devices.		* Use the MidiDevice class to actually communicate with devices.
	*		*
			* CANDIDATE FOR PUBLIC API
	* @hide		* @hide
	*/		*/
	public class MidiDeviceInfo implements Parcelable {		public class MidiDeviceInfo implements Parcelable {

core/java/android/midi/MidiDeviceServer.java

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,14 @@ import java.io.Closeable;
	import java.io.IOException;		import java.io.IOException;
	import java.util.ArrayList;		import java.util.ArrayList;

	/** @hide */		/**
			* This class is used to provide the implemention of MIDI device.
			* Applications may call {@link MidiManager#createDeviceServer}
			* to create an instance of this class to implement a virtual MIDI device.
			*
			* CANDIDATE FOR PUBLIC API
			* @hide
			*/
	public final class MidiDeviceServer implements Closeable {		public final class MidiDeviceServer implements Closeable {
	private static final String TAG = "MidiDeviceServer";		private static final String TAG = "MidiDeviceServer";

core/java/android/midi/MidiInputPort.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@ import java.io.IOException;
	/**		/**
	* This class is used for sending data to a port on a MIDI device		* This class is used for sending data to a port on a MIDI device
	*		*
			* CANDIDATE FOR PUBLIC API
	* @hide		* @hide
	*/		*/
	public class MidiInputPort extends MidiPort implements MidiReceiver {		public class MidiInputPort extends MidiPort implements MidiReceiver {

core/java/android/midi/MidiManager.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ import java.util.HashMap;
	* {@samplecode		* {@samplecode
	* MidiManager manager = (MidiManager) getSystemService(Context.MIDI_SERVICE);}		* MidiManager manager = (MidiManager) getSystemService(Context.MIDI_SERVICE);}
	*		*
			* CANDIDATE FOR PUBLIC API
	* @hide		* @hide
	*/		*/
	public class MidiManager {		public class MidiManager {
	@@ -184,7 +185,7 @@ public class MidiManager {
	* @param properties a {@link android.os.Bundle} containing properties describing the device		* @param properties a {@link android.os.Bundle} containing properties describing the device
	* @param isPrivate true if this device should only be visible and accessible to apps		* @param isPrivate true if this device should only be visible and accessible to apps
	* with the same UID as the caller		* with the same UID as the caller
	* @return a {@link MidiVirtualDevice} object to locally represent the device		* @return a {@link MidiDeviceServer} object to locally represent the device
	*/		*/
	public MidiDeviceServer createDeviceServer(int numInputPorts, int numOutputPorts,		public MidiDeviceServer createDeviceServer(int numInputPorts, int numOutputPorts,
	Bundle properties, boolean isPrivate) {		Bundle properties, boolean isPrivate) {