diff options
| author | 2023-08-01 23:49:43 +0000 | |
|---|---|---|
| committer | 2023-08-01 23:49:43 +0000 | |
| commit | 58cc4434240583ccbfd6ebfd81b25c71064c39c4 (patch) | |
| tree | 24fdf4ce8266c11ccf464eb1b3b756c3ee526458 | |
| parent | d292eec260267cc19c6e726dc165ab9dc93a6af4 (diff) | |
| parent | 711739b4d8e3bb189b0e385dfee6fc3eda5ccc9b (diff) | |
Merge "MIDI: Address API comments for Virtual UMP" into main
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/midi/MidiUmpDeviceService.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index df8f5819718d..f5db57501b9a 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -26453,7 +26453,7 @@ package android.media.midi { method @NonNull public final java.util.List<android.media.midi.MidiReceiver> getOutputPortReceivers(); method @Nullable public android.os.IBinder onBind(@NonNull android.content.Intent); method public void onClose(); - method public void onDeviceStatusChanged(@Nullable android.media.midi.MidiDeviceStatus); + method public void onDeviceStatusChanged(@NonNull android.media.midi.MidiDeviceStatus); method @NonNull public abstract java.util.List<android.media.midi.MidiReceiver> onGetInputPortReceivers(); field public static final String SERVICE_INTERFACE = "android.media.midi.MidiUmpDeviceService"; } diff --git a/media/java/android/media/midi/MidiUmpDeviceService.java b/media/java/android/media/midi/MidiUmpDeviceService.java index 0c6096ecad4d..6e2aaabf4b04 100644 --- a/media/java/android/media/midi/MidiUmpDeviceService.java +++ b/media/java/android/media/midi/MidiUmpDeviceService.java @@ -130,7 +130,7 @@ public abstract class MidiUmpDeviceService extends Service { /** * Returns the {@link MidiDeviceInfo} instance for this service - * @return the MidiDeviceInfo of the virtual MIDI device + * @return the MidiDeviceInfo of the virtual MIDI device if it was successfully created */ public final @Nullable MidiDeviceInfo getDeviceInfo() { return mDeviceInfo; @@ -140,7 +140,7 @@ public abstract class MidiUmpDeviceService extends Service { * Called to notify when the {@link MidiDeviceStatus} has changed * @param status the current status of the MIDI device */ - public void onDeviceStatusChanged(@Nullable MidiDeviceStatus status) { + public void onDeviceStatusChanged(@NonNull MidiDeviceStatus status) { } /** |