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

Commit 2eab17bc authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

Merge "Unhide MediaPlayer#MEDIA_INFO_STARTED_AS_NEXT" into pi-dev 

am: b814355d

Change-Id: If15237f7b3b589c8a010cf44011a3a5e4db61248
parents 41a28e7f b814355d

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24012,6 +24012,7 @@ package android.media { 
    field public static final int MEDIA_INFO_BUFFERING_START = 701; // 0x2bd

    field public static final int MEDIA_INFO_METADATA_UPDATE = 802; // 0x322

    field public static final int MEDIA_INFO_NOT_SEEKABLE = 801; // 0x321

    field public static final int MEDIA_INFO_STARTED_AS_NEXT = 2; // 0x2

    field public static final int MEDIA_INFO_SUBTITLE_TIMED_OUT = 902; // 0x386

    field public static final int MEDIA_INFO_UNKNOWN = 1; // 0x1

    field public static final int MEDIA_INFO_UNSUPPORTED_SUBTITLE = 901; // 0x385

media/java/android/media/MediaPlayer.java

+1 −1
Original line number Diff line number Diff line
@@ -4099,8 +4099,8 @@ public class MediaPlayer extends PlayerBase 


    /** The player was started because it was used as the next player for another

     * player, which just completed playback.

     * @see android.media.MediaPlayer#setNextMediaPlayer(MediaPlayer)

     * @see android.media.MediaPlayer.OnInfoListener

     * @hide

     */

    public static final int MEDIA_INFO_STARTED_AS_NEXT = 2;