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

Commit d4ca39e7 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge changes I075a54dc,I0a9bc7c3 

* changes:
  Add user visible name for USB peripheral MIDI device
  Add MidiDeviceInfo.getPortList()
parents cdd30219 dee5f1bb

api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -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();

api/system-current.txt

+1 −2
Original line number Diff line number Diff line
@@ -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();

core/res/res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -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] -->

core/res/res/values/symbols.xml

+2 −1
Original line number Diff line number Diff line
@@ -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" />

media/java/android/media/midi/MidiDeviceInfo.java

+13 −19
Original line number Diff line number Diff line
@@ -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");

    public PortInfo[] getPortList() {

        PortInfo[] portInfoList = new PortInfo[mInputPortCount + mOutputPortCount];



        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_INPUT, portNumber, mInputPortNames[portNumber]);

        for (int i = 0; i < mOutputPortCount; i++) {

            portInfoList[index++] = new PortInfo(PortInfo.TYPE_OUTPUT, i, mOutputPortNames[i]);

        }



    /**

     * 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");

        }

        return new PortInfo(PortInfo.TYPE_OUTPUT, portNumber, mOutputPortNames[portNumber]);

        return portInfoList;

    }



    /**