Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf65767b authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

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

am: 100a7a39

Change-Id: I3b3df1d18d93f2114b1a02ad6ca35d62a0ac2999
parents 0e36633b 100a7a39

media/java/android/media/MediaPlayer.java

+5 −1
Original line number Diff line number Diff line
@@ -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));