From 7254f5aca502ddf938b8756e2bf94bc462fb46a3 Mon Sep 17 00:00:00 2001 From: tonihei Date: Tue, 10 Oct 2023 08:34:13 -0700 Subject: [PATCH] Do not interrupt controller thread without a good reason Interrupting the main thread in particular may be dangerous as the flag is not cleared after handling the current message. #minor-release PiperOrigin-RevId: 572259422 (cherry picked from commit 846117399ff87dc025c355639444de2e54430b18) --- .../src/main/java/androidx/media3/session/MediaController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaController.java b/libraries/session/src/main/java/androidx/media3/session/MediaController.java index 69297ed9c7..a94c518790 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaController.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaController.java @@ -538,7 +538,7 @@ public class MediaController implements Player { * controller. */ public static void releaseFuture(Future controllerFuture) { - if (controllerFuture.cancel(/* mayInterruptIfRunning= */ true)) { + if (controllerFuture.cancel(/* mayInterruptIfRunning= */ false)) { // Successfully canceled the Future. The controller will be released by MediaControllerHolder. return; }