loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return null if media notification controller Future is not done

Browse Source 
When the media notification controller is requested for a session
with `getConnectedControllerForSession` and the `Future` is not null
but not yet completed, the `Future` was returned either way. This was
reported as creating a race condition between the notification
being requested for update the very first time, and the media
notification controller having completed connecting to the session.

Returning null from `getConnectedControllerForSession` when the
`Future` is available but not yet done fixes the problem. This is
safe because for the case when a notification update is dropped,
the media notification controller will trigger the update as soon
as the connection completes.

Issue: androidx/media#917
#minor-release
PiperOrigin-RevId: 595699929
This commit is contained in:
bachinger 2024-01-04 07:31:42 -08:00 committed by Copybara-Service
parent 1cb6865884
commit 5c50b27e8f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASENOTES.md
View File

@ -123,6 +123,9 @@
* Fix a bug where setting a negative time for a disabled `setWhen` timer
of the notification caused a crash on some devices
([#903](https://github.com/androidx/media/issues/903)).
* Fix `IllegalStateException` when the media notification controller
hasn't completed connecting when the first notification update is
requested ([#917](https://github.com/androidx/media/issues/917)).
* UI:
* Fix issue where forward and rewind buttons are not visible when used
with Material Design in a BottomSheetDialogFragment

2
libraries/session/src/main/java/androidx/media3/session/MediaNotificationManager.java
View File

@ -260,7 +260,7 @@ import java.util.concurrent.TimeoutException;
@Nullable
private MediaController getConnectedControllerForSession(MediaSession session) {
ListenableFuture<MediaController> controller = controllerMap.get(session);
if (controller == null) {
if (controller == null || !controller.isDone()) {
return null;
}
try {