From 1f78aa5b2a71e468338b489980c5a1375f4dff80 Mon Sep 17 00:00:00 2001
From: siroberts <siroberts@google.com>
Date: Tue, 23 Jan 2024 08:44:29 -0800
Subject: [PATCH] Change type of setCustomLayout in MediaSession.resultBuilder
 to List

PiperOrigin-RevId: 600801528
---
 .../src/main/java/androidx/media3/session/MediaSession.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaSession.java b/libraries/session/src/main/java/androidx/media3/session/MediaSession.java
index 2d883a9417..013c3c5c34 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaSession.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaSession.java
@@ -1651,9 +1651,8 @@ public class MediaSession {
        * session commands}.
        */
       @CanIgnoreReturnValue
-      public AcceptedResultBuilder setCustomLayout(
-          @Nullable ImmutableList<CommandButton> customLayout) {
-        this.customLayout = customLayout;
+      public AcceptedResultBuilder setCustomLayout(@Nullable List<CommandButton> customLayout) {
+        this.customLayout = customLayout == null ? null : ImmutableList.copyOf(customLayout);
         return this;
       }