Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I075a54dc,I0a9bc7c3

Browse Source 
* changes:
  Add user visible name for USB peripheral MIDI device
  Add MidiDeviceInfo.getPortList()
This commit is contained in:
Mike Lockwood
2015-04-10 16:54:00 +00:00
committed by Android (Google) Code Review
parent cdd3021936 dee5f1bb6e
commit d4ca39e75c
7 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -16790,9 +16790,8 @@ package android.media.midi {
method public int describeContents();
method public int getId();
method public int getInputPortCount();
method public android.media.midi.MidiDeviceInfo.PortInfo getInputPortInfo(int);
method public int getOutputPortCount();
method public android.media.midi.MidiDeviceInfo.PortInfo getOutputPortInfo(int);
method public android.media.midi.MidiDeviceInfo.PortInfo[] getPortList();
method public android.os.Bundle getProperties();
method public int getType();
method public boolean isPrivate();

3
api/system-current.txt
View File

@@ -18066,9 +18066,8 @@ package android.media.midi {
method public int describeContents();
method public int getId();
method public int getInputPortCount();
method public android.media.midi.MidiDeviceInfo.PortInfo getInputPortInfo(int);
method public int getOutputPortCount();
method public android.media.midi.MidiDeviceInfo.PortInfo getOutputPortInfo(int);
method public android.media.midi.MidiDeviceInfo.PortInfo[] getPortList();
method public android.os.Bundle getProperties();
method public int getType();
method public boolean isPrivate();

6
core/res/res/values/strings.xml
View File

@@ -5235,10 +5235,12 @@
<string name="stk_cc_ss_to_ussd">SS request is modified to USSD request.</string>
<string name="stk_cc_ss_to_ss">SS request is modified to new SS request.</string>
<!-- User visible name for USB MIDI Peripheral port -->
<string name="usb_midi_peripheral_name">Android USB Peripheral Port</string>
<!-- Manufacturer name for USB MIDI Peripheral port -->
<string name="usb_midi_peripheral_manufacturer_name">Android</string>
<!-- Model name for USB MIDI Peripheral port -->
<string name="usb_midi_peripheral_model_name">USB Peripheral Port</string>
<!-- Product name for USB MIDI Peripheral port -->
<string name="usb_midi_peripheral_product_name">USB Peripheral Port</string>
<!-- Floating toolbar strings -->
<!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->

3
core/res/res/values/symbols.xml
View File

@@ -2181,8 +2181,9 @@
<java-symbol type="bool" name="config_LTE_eri_for_network_name" />
<java-symbol type="bool" name="config_defaultInTouchMode" />
<java-symbol type="string" name="usb_midi_peripheral_name" />
<java-symbol type="string" name="usb_midi_peripheral_manufacturer_name" />
<java-symbol type="string" name="usb_midi_peripheral_model_name" />
<java-symbol type="string" name="usb_midi_peripheral_product_name" />
<java-symbol type="bool" name="allow_stacked_button_bar" />
<java-symbol type="id" name="spacer" />

32
media/java/android/media/midi/MidiDeviceInfo.java
View File

@@ -237,29 +237,23 @@ public final class MidiDeviceInfo implements Parcelable {
}
/**
* Returns information about an input port.
* Returns information about the device's ports.
* The ports are in unspecified order.
*
* @param portNumber the number of the input port
* @return the input port's information object
* @return array of {@link PortInfo}
*/
public PortInfo getInputPortInfo(int portNumber) {
if (portNumber < 0 || portNumber >= mInputPortCount) {
throw new IllegalArgumentException("portNumber out of range");
}
return new PortInfo(PortInfo.TYPE_INPUT, portNumber, mInputPortNames[portNumber]);
}
public PortInfo[] getPortList() {
PortInfo[] portInfoList = new PortInfo[mInputPortCount + mOutputPortCount];
/**
* Returns information about an output port.
*
* @param portNumber the number of the output port
* @return the output port's information object
*/
public PortInfo getOutputPortInfo(int portNumber) {
if (portNumber < 0 || portNumber >= mOutputPortCount) {
throw new IllegalArgumentException("portNumber out of range");
int index = 0;
for (int i = 0; i < mInputPortCount; i++) {
portInfoList[index++] = new PortInfo(PortInfo.TYPE_INPUT, i, mInputPortNames[i]);
}
return new PortInfo(PortInfo.TYPE_OUTPUT, portNumber, mOutputPortNames[portNumber]);
for (int i = 0; i < mOutputPortCount; i++) {
portInfoList[index++] = new PortInfo(PortInfo.TYPE_OUTPUT, i, mOutputPortNames[i]);
}
return portInfoList;
}
/**

2
media/java/android/media/midi/MidiDeviceService.java
View File

@@ -91,7 +91,7 @@ abstract public class MidiDeviceService extends Service {
/**
* Returns an array of {@link MidiReceiver} for the device's input ports.
* Subclasses must override this to provide the receivers which will receive
* data sent to the device's input ports. An empty array or null should be returned if
* data sent to the device's input ports. An empty array should be returned if
* the device has no input ports.
* @return array of MidiReceivers
*/

4
services/usb/java/com/android/server/usb/UsbAlsaManager.java
View File

@@ -469,10 +469,12 @@ public final class UsbAlsaManager {
if (enabled && mPeripheralMidiDevice == null) {
Bundle properties = new Bundle();
Resources r = mContext.getResources();
properties.putString(MidiDeviceInfo.PROPERTY_NAME, r.getString(
com.android.internal.R.string.usb_midi_peripheral_name));
properties.putString(MidiDeviceInfo.PROPERTY_MANUFACTURER, r.getString(
com.android.internal.R.string.usb_midi_peripheral_manufacturer_name));
properties.putString(MidiDeviceInfo.PROPERTY_PRODUCT, r.getString(
com.android.internal.R.string.usb_midi_peripheral_model_name));
com.android.internal.R.string.usb_midi_peripheral_product_name));
properties.putInt(MidiDeviceInfo.PROPERTY_ALSA_CARD, card);
properties.putInt(MidiDeviceInfo.PROPERTY_ALSA_DEVICE, device);
mPeripheralMidiDevice = UsbMidiDevice.create(mContext, properties, card, device);