Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaPlayer: sanity check track before dereferencing" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-23 02:35:15 +00:00
committed by Android (Google) Code Review
parent 0355dd6436 aea5de9410
commit 1ba53717fe
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/MediaPlayer.java
View File

@@ -2848,8 +2848,12 @@ public class MediaPlayer extends PlayerBase
mInbandTrackIndices.set(i);
}
if (tracks[i] == null) {
Log.w(TAG, "unexpected NULL track at index " + i);
}
// newly appeared inband track
if (tracks[i].getTrackType() == TrackInfo.MEDIA_TRACK_TYPE_SUBTITLE) {
if (tracks[i] != null
&& tracks[i].getTrackType() == TrackInfo.MEDIA_TRACK_TYPE_SUBTITLE) {
SubtitleTrack track = mSubtitleController.addTrack(
tracks[i].getFormat());
mIndexTrackPairs.add(Pair.create(i, track));