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

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

Merge "Fix NullPointerException in MediaPlayer" am: c7c899bb 

am: 15c9c1f8

Change-Id: I313f483e69e098252cf1b753aa5f6b38945d9669
parents 8be80273 15c9c1f8

media/java/android/media/MediaPlayer.java

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



    private void scanInternalSubtitleTracks() {

        if (mSubtitleController == null) {

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

        setSubtitleAnchor();

        }



        populateInbandTracks();