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

Commit cec9c424 authored by qinzhichao's avatar qinzhichao Committed by android-build-merger
Browse files

Merge "Fix NullPointerException in MediaPlayer" am: c7c899bb am: 15c9c1f8 

am: 80713e98

Change-Id: Idbc93cea10adc0077341015ecd479baa76ae2c76
parents a1a96763 80713e98

media/java/android/media/MediaPlayer.java

+1 −4
Original line number Original line Diff line number Diff line
@@ -2336,10 +2336,7 @@ public class MediaPlayer extends PlayerBase 
    }

    }





    private void scanInternalSubtitleTracks() {

    private void scanInternalSubtitleTracks() {

        if (mSubtitleController == null) {

            Log.d(TAG, "setSubtitleAnchor in MediaPlayer");

        setSubtitleAnchor();

        setSubtitleAnchor();

        }





        populateInbandTracks();

        populateInbandTracks();