From 4a38b2cade27af4a1e942fa17f598442a478ed69 Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 18 Mar 2016 10:08:09 -0700 Subject: [PATCH] Fully reset state when displaying track selections. When showing a track selection for a renderer, the override variable could end up being retained from some previous call to show a track selection for some other renderer. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=117557994 --- .../exoplayer/demo/ui/TrackSelectionHelper.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/ui/TrackSelectionHelper.java b/demo/src/main/java/com/google/android/exoplayer/demo/ui/TrackSelectionHelper.java index fe1c1609cb..978a68cb56 100644 --- a/demo/src/main/java/com/google/android/exoplayer/demo/ui/TrackSelectionHelper.java +++ b/demo/src/main/java/com/google/android/exoplayer/demo/ui/TrackSelectionHelper.java @@ -46,18 +46,17 @@ public class TrackSelectionHelper implements View.OnClickListener, DialogInterfa private final DefaultTrackSelector selector; - private CheckedTextView disableView; - private CheckedTextView defaultView; - private CheckedTextView[][] trackViews; - private TrackInfo trackInfo; private int rendererIndex; private TrackGroupArray trackGroups; private boolean[] trackGroupsAdaptive; - private boolean isDisabled; private TrackSelection override; + private CheckedTextView disableView; + private CheckedTextView defaultView; + private CheckedTextView[][] trackViews; + /** * @param selector The track selector. */ @@ -85,9 +84,8 @@ public class TrackSelectionHelper implements View.OnClickListener, DialogInterfa != TrackRenderer.ADAPTIVE_NOT_SUPPORTED; } isDisabled = selector.getRendererDisabled(rendererIndex); - if (selector.hasSelectionOverride(rendererIndex, trackGroups)) { - override = trackInfo.getTrackSelection(rendererIndex); - } + override = selector.hasSelectionOverride(rendererIndex, trackGroups) + ? trackInfo.getTrackSelection(rendererIndex) : null; AlertDialog.Builder builder = new AlertDialog.Builder(activity); builder.setTitle(titleId)