From 711739b4d8e3bb189b0e385dfee6fc3eda5ccc9b Mon Sep 17 00:00:00 2001 From: Robert Wu Date: Mon, 24 Jul 2023 22:48:21 +0000 Subject: [PATCH] MIDI: Address API comments for Virtual UMP Bug: 292589794 Test: presubmit Change-Id: I048f1bce6ceea73361785a84759e5be27e2bff21 --- core/api/current.txt | 2 +- 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 0d736953e3b6a..ba0d1e2a0e77f 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -26397,7 +26397,7 @@ package android.media.midi { method @NonNull public final java.util.List 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 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 0c6096ecad4dc..6e2aaabf4b04c 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) { } /**