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 am: 1ba53717fe

Browse Source 
am: 100a7a3907

Change-Id: I3b3df1d18d93f2114b1a02ad6ca35d62a0ac2999
This commit is contained in:
Wei Jia
2018-05-23 13:11:29 -07:00
committed by android-build-merger
parent 0e36633bc8 100a7a3907
commit bf65767b40
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));