MidiManager: Address API Council feedback:

Rename MidiDeviceInfo.getPortList() to getPorts()

Rename MidiManager.getDeviceList() to getDevices()

Rename MidiReceiver.onReceive() to onSend()

Replace MidiManager.DeviceOpenCallback and BluetoothOpenCallback
with new interface MidiManager.OnDeviceOpenedListener

Add MidiSender.onConnect() and onDisconnect()

Add MidiReceiver.onFlush()

Ensure that MidiReceiver max message size is immutable

Bug: 21044677
Change-Id: I7711734a45e831e9744849a6f569e906feff9f80

3 files changed, 17 insertions, 25 deletions

diff --git a/core/java/com/android/internal/midi/MidiDispatcher.java b/core/java/com/android/internal/midi/MidiDispatcher.java
index 70e699a..1a3c37c 100644
--- a/core/java/com/android/internal/midi/MidiDispatcher.java
+++ b/core/java/com/android/internal/midi/MidiDispatcher.java
@@ -27,7 +27,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * This class subclasses {@link android.media.midi.MidiReceiver} and dispatches any data it receives
  * to its receiver list. Any receivers that throw an exception upon receiving data will
  * be automatically removed from the receiver list, but no IOException will be returned
- * from the dispatcher's {@link android.media.midi.MidiReceiver#onReceive} in that case.
+ * from the dispatcher's {@link android.media.midi.MidiReceiver#onSend} in that case.
  */
 public final class MidiDispatcher extends MidiReceiver {
 
@@ -35,21 +35,13 @@ public final class MidiDispatcher extends MidiReceiver {
             = new CopyOnWriteArrayList<MidiReceiver>();
 
     private final MidiSender mSender = new MidiSender() {
-        /**
-         * Called to connect a {@link android.media.midi.MidiReceiver} to the sender
-         *
-         * @param receiver the receiver to connect
-         */
-        public void connect(MidiReceiver receiver) {
+        @Override
+        public void onConnect(MidiReceiver receiver) {
             mReceivers.add(receiver);
         }
 
-        /**
-         * Called to disconnect a {@link android.media.midi.MidiReceiver} from the sender
-         *
-         * @param receiver the receiver to disconnect
-         */
-        public void disconnect(MidiReceiver receiver) {
+        @Override
+        public void onDisconnect(MidiReceiver receiver) {
             mReceivers.remove(receiver);
         }
     };
@@ -73,10 +65,10 @@ public final class MidiDispatcher extends MidiReceiver {
     }
 
     @Override
-    public void onReceive(byte[] msg, int offset, int count, long timestamp) throws IOException {
+    public void onSend(byte[] msg, int offset, int count, long timestamp) throws IOException {
        for (MidiReceiver receiver : mReceivers) {
             try {
-                receiver.sendWithTimestamp(msg, offset, count, timestamp);
+                receiver.send(msg, offset, count, timestamp);
             } catch (IOException e) {
                 // if the receiver fails we remove the receiver but do not propagate the exception
                 mReceivers.remove(receiver);
@@ -85,7 +77,7 @@ public final class MidiDispatcher extends MidiReceiver {
     }
 
     @Override
-    public void flush() throws IOException {
+    public void onFlush() throws IOException {
        for (MidiReceiver receiver : mReceivers) {
             receiver.flush();
        }
diff --git a/core/java/com/android/internal/midi/MidiEventScheduler.java b/core/java/com/android/internal/midi/MidiEventScheduler.java
index 4dc5838..7b01904 100644
--- a/core/java/com/android/internal/midi/MidiEventScheduler.java
+++ b/core/java/com/android/internal/midi/MidiEventScheduler.java
@@ -36,7 +36,7 @@ public class MidiEventScheduler extends EventScheduler {
          * time.
          */
         @Override
-        public void onReceive(byte[] msg, int offset, int count, long timestamp)
+        public void onSend(byte[] msg, int offset, int count, long timestamp)
                 throws IOException {
             MidiEvent event = createScheduledEvent(msg, offset, count, timestamp);
             if (event != null) {
@@ -45,7 +45,7 @@ public class MidiEventScheduler extends EventScheduler {
         }
 
         @Override
-        public void flush() {
+        public void onFlush() {
             MidiEventScheduler.this.flush();
         }
     }
diff --git a/core/java/com/android/internal/midi/MidiFramer.java b/core/java/com/android/internal/midi/MidiFramer.java
index 8ed5b5a..058f57c 100644
--- a/core/java/com/android/internal/midi/MidiFramer.java
+++ b/core/java/com/android/internal/midi/MidiFramer.java
@@ -54,10 +54,10 @@ public class MidiFramer extends MidiReceiver {
     }
 
     /*
-     * @see android.midi.MidiReceiver#onReceive(byte[], int, int, long)
+     * @see android.midi.MidiReceiver#onSend(byte[], int, int, long)
      */
     @Override
-    public void onReceive(byte[] data, int offset, int count, long timestamp)
+    public void onSend(byte[] data, int offset, int count, long timestamp)
             throws IOException {
         // Log.i(TAG, formatMidiData(data, offset, count));
         int sysExStartOffset = (mInSysEx ? offset : -1);
@@ -77,7 +77,7 @@ public class MidiFramer extends MidiReceiver {
                     } else if (b == 0xF7 /* SysEx End */) {
                         // Log.i(TAG, "SysEx End");
                         if (mInSysEx) {
-                            mReceiver.sendWithTimestamp(data, sysExStartOffset,
+                            mReceiver.send(data, sysExStartOffset,
                                 offset - sysExStartOffset + 1, timestamp);
                             mInSysEx = false;
                             sysExStartOffset = -1;
@@ -91,11 +91,11 @@ public class MidiFramer extends MidiReceiver {
                 } else { // real-time?
                     // Single byte message interleaved with other data.
                     if (mInSysEx) {
-                        mReceiver.sendWithTimestamp(data, sysExStartOffset,
+                        mReceiver.send(data, sysExStartOffset,
                                 offset - sysExStartOffset, timestamp);
                         sysExStartOffset = offset + 1;
                     }
-                    mReceiver.sendWithTimestamp(data, offset, 1, timestamp);
+                    mReceiver.send(data, offset, 1, timestamp);
                 }
             } else { // data byte
                 // Save SysEx data for SysEx End marker or end of buffer.
@@ -105,7 +105,7 @@ public class MidiFramer extends MidiReceiver {
                         if (mRunningStatus != 0) {
                             mBuffer[0] = (byte) mRunningStatus;
                         }
-                        mReceiver.sendWithTimestamp(mBuffer, 0, mCount, timestamp);
+                        mReceiver.send(mBuffer, 0, mCount, timestamp);
                         mNeeded = MidiConstants.getBytesPerMessage(mBuffer[0]) - 1;
                         mCount = 1;
                     }
@@ -116,7 +116,7 @@ public class MidiFramer extends MidiReceiver {
 
         // send any accumulatedSysEx data
         if (sysExStartOffset >= 0 && sysExStartOffset < offset) {
-            mReceiver.sendWithTimestamp(data, sysExStartOffset,
+            mReceiver.send(data, sysExStartOffset,
                     offset - sysExStartOffset, timestamp);
         }
     }