From b42f90c247332576033fb638911e46c7c94c9576 Mon Sep 17 00:00:00 2001 From: tonihei Date: Thu, 18 Nov 2021 10:41:49 +0000 Subject: [PATCH] Assign class member in StyledPlayerControlView before using it The local tracks variable was used to assign the initial subtext for the current track selection in the menu, but the new value was only assigned after the subtext has been evaluated. Assign the local variable first, so that the remaining accesses the latest value. Issue: google/ExoPlayer#9698 PiperOrigin-RevId: 410750396 --- .../main/java/androidx/media3/ui/StyledPlayerControlView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerControlView.java b/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerControlView.java index c863b762ae..e0a77226c3 100644 --- a/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerControlView.java +++ b/libraries/ui/src/main/java/androidx/media3/ui/StyledPlayerControlView.java @@ -2077,6 +2077,7 @@ public class StyledPlayerControlView extends FrameLayout { @Override public void init(List trackInformations) { + this.tracks = trackInformations; // Update subtext in settings menu with current audio track selection. TrackSelectionParameters params = checkNotNull(player).getTrackSelectionParameters(); if (trackInformations.isEmpty()) { @@ -2099,7 +2100,6 @@ public class StyledPlayerControlView extends FrameLayout { } } } - this.tracks = trackInformations; } }