loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent text tracks with no language being selected by default

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=154421706
This commit is contained in:
aquilescanta 2017-04-27 07:49:14 -07:00 committed by Oliver Woodman
parent 7761cdcd1e
commit 5c723f4d3d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
View File

@ -867,7 +867,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
}
protected static boolean formatHasLanguage(Format format, String language) {
return TextUtils.equals(language, Util.normalizeLanguageCode(format.language));
return language != null
&& TextUtils.equals(language, Util.normalizeLanguageCode(format.language));
}
// Viewport size util methods.