From a64d51c909bef853e0f915ae310fc52417a4c188 Mon Sep 17 00:00:00 2001 From: bachinger Date: Wed, 16 Apr 2025 09:04:18 -0700 Subject: [PATCH] Fix NullPointerException in MediaBrowserImplLegacy PiperOrigin-RevId: 748312932 --- RELEASENOTES.md | 3 +++ .../java/androidx/media3/session/MediaBrowserImplLegacy.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index c27b5e75ed..d3b8a1eab4 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -50,6 +50,9 @@ * Fix a bug where a load error in one ad may accidentally invalidate another ad group. * Session: + * Fix a bug where passing null into `getLibraryRoot` of a `MediaBrowser` + connected to a legacy `MediaBrowserServiceCompat` produced a + `NullPointerException`. * UI: * Downloads: * Add partial download support for progressive streams. Apps can prepare a diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaBrowserImplLegacy.java b/libraries/session/src/main/java/androidx/media3/session/MediaBrowserImplLegacy.java index 0cac58bc25..2b329c5777 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaBrowserImplLegacy.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaBrowserImplLegacy.java @@ -132,7 +132,8 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization; // Already connected with the given extras. result.set(LibraryResult.ofItem(createRootMediaItem(browserCompat), null)); } else { - Bundle rootHints = LegacyConversions.convertToRootHints(params); + Bundle rootHints = + params == null ? new Bundle() : LegacyConversions.convertToRootHints(params); rootHints.putInt( androidx.media3.session.legacy.MediaConstants .BROWSER_ROOT_HINTS_KEY_CUSTOM_BROWSER_ACTION_LIMIT,