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

Check whether a session is still managed before removing

Browse Source 
When the controller of the `MediaNotificationManager` is disconnected,
the session is removed from the service without checking whether the
session hasn't already been removed. This caused flakiness in `MediaSessionServiceTest.addSession()`.

Because there is a public API `MediaSessionService.removeSession()`,
the controller can't make an assumption whether the session is still
contained in the service when being disconnected.

#minor-release

PiperOrigin-RevId: 572568350
This commit is contained in:
bachinger 2023-10-11 07:25:07 -07:00 committed by Copybara-Service
parent cef85be40f
commit 7fdc5b22ba
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,7 +392,9 @@ import java.util.concurrent.TimeoutException;
@Override @Override
public void onDisconnected(MediaController controller) { public void onDisconnected(MediaController controller) {
mediaSessionService.removeSession(session); if (mediaSessionService.isSessionAdded(session)) {
mediaSessionService.removeSession(session);
}
// We may need to hide the notification. // We may need to hide the notification.
mediaSessionService.onUpdateNotificationInternal( mediaSessionService.onUpdateNotificationInternal(
session, /* startInForegroundWhenPaused= */ false); session, /* startInForegroundWhenPaused= */ false);