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

Clarify threading requirement for MediaController.releaseFuture

Browse Source 
And remove unnecessary check for isDone.

Issue: androidx/media#345
PiperOrigin-RevId: 525999615
This commit is contained in:
tonihei 2023-04-21 12:39:10 +01:00 committed by Rohit Singh
parent 79fab6783e
commit 186f3d5c77
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/session/src/main/java/androidx/media3/session/MediaController.java
View File

@ -505,16 +505,19 @@ public class MediaController implements Player {
/** /**
* Releases the future controller returned by {@link Builder#buildAsync()}. It makes sure that the * Releases the future controller returned by {@link Builder#buildAsync()}. It makes sure that the
* controller is released by canceling the future if the future is not yet done. * controller is released by canceling the future if the future is not yet done.
*
* <p>Must be called on the {@linkplain #getApplicationLooper() application thread} of the media
* controller.
*/ */
public static void releaseFuture(Future<? extends MediaController> controllerFuture) { public static void releaseFuture(Future<? extends MediaController> controllerFuture) {
if (!controllerFuture.isDone()) { if (controllerFuture.cancel(/* mayInterruptIfRunning= */ true)) {
controllerFuture.cancel(/* mayInterruptIfRunning= */ true); // Successfully canceled the Future. The controller will be released by MediaControllerHolder.
return; return;
} }
MediaController controller; MediaController controller;
try { try {
controller = controllerFuture.get(); controller = Futures.getDone(controllerFuture);
} catch (CancellationException | ExecutionException | InterruptedException e) { } catch (CancellationException | ExecutionException e) {
return; return;
} }
controller.release(); controller.release();