diff --git a/core/api/current.txt b/core/api/current.txt
index df8f5819718d0..f5db57501b9ab 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 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) {
     }
 
     /**