diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaSessionLegacyStub.java b/libraries/session/src/main/java/androidx/media3/session/MediaSessionLegacyStub.java index afc3af1739..90d4eeb1e8 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaSessionLegacyStub.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaSessionLegacyStub.java @@ -1110,12 +1110,11 @@ import org.checkerframework.checker.initialization.qual.Initialized; currentMediaItemForMetadataUpdate = currentMediaItem; durationMsForMetadataUpdate = durationMs; - if (currentMediaItem == null) { - setMetadata(sessionCompat, /* metadataCompat= */ null); - } else { - sessionCompat.setMetadata( - MediaUtils.convertToMediaMetadataCompat(currentMediaItem, durationMs)); - } + setMetadata( + sessionCompat, + currentMediaItem != null + ? MediaUtils.convertToMediaMetadataCompat(currentMediaItem, durationMs) + : null); } }