From a8b0bd712aa57c04bea22c5f7262aa5d0ffa14e3 Mon Sep 17 00:00:00 2001 From: bachinger Date: Thu, 19 Oct 2023 03:48:16 -0700 Subject: [PATCH] Do not hide System UI when app rejects connection If an app rejects the connection of the internal media notification manager the session should behave like without the the media notification controller. The legacy System UI controller should not be hidden or even rejected to connect in such a case. #minor-release PiperOrigin-RevId: 574807901 (cherry picked from commit 54d5810fc353a9e7133ef929ab2f822d921070b1) --- .../src/main/java/androidx/media3/session/MediaSessionImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaSessionImpl.java b/libraries/session/src/main/java/androidx/media3/session/MediaSessionImpl.java index c9cb5626af..4fe78f23da 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaSessionImpl.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaSessionImpl.java @@ -599,7 +599,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; checkNotNull( callback.onConnect(instance, controller), "Callback.onConnect must return non-null future"); - if (isMediaNotificationController(controller)) { + if (isMediaNotificationController(controller) && connectionResult.isAccepted) { isMediaNotificationControllerConnected = true; playerWrapper.setCustomLayout( connectionResult.customLayout != null