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

Commit e79081ae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev

parents 6f36255a ae3e7067

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -22857,6 +22857,7 @@ package android.media { 
    field public static final int MEDIA_ERROR_TIMED_OUT = -110; // 0xffffff92

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

    field public static final int MEDIA_ERROR_UNSUPPORTED = -1010; // 0xfffffc0e

    field public static final int MEDIA_INFO_AUDIO_NOT_PLAYING = 804; // 0x324

    field public static final int MEDIA_INFO_BAD_INTERLEAVING = 800; // 0x320

    field public static final int MEDIA_INFO_BUFFERING_END = 702; // 0x2be

    field public static final int MEDIA_INFO_BUFFERING_START = 701; // 0x2bd
@@ -22865,6 +22866,7 @@ package android.media { 
    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

    field public static final int MEDIA_INFO_VIDEO_NOT_PLAYING = 805; // 0x325

    field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3

    field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc

    field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip";

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -24682,6 +24682,7 @@ package android.media { 
    field public static final int MEDIA_ERROR_TIMED_OUT = -110; // 0xffffff92

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

    field public static final int MEDIA_ERROR_UNSUPPORTED = -1010; // 0xfffffc0e

    field public static final int MEDIA_INFO_AUDIO_NOT_PLAYING = 804; // 0x324

    field public static final int MEDIA_INFO_BAD_INTERLEAVING = 800; // 0x320

    field public static final int MEDIA_INFO_BUFFERING_END = 702; // 0x2be

    field public static final int MEDIA_INFO_BUFFERING_START = 701; // 0x2bd
@@ -24690,6 +24691,7 @@ package android.media { 
    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

    field public static final int MEDIA_INFO_VIDEO_NOT_PLAYING = 805; // 0x325

    field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3

    field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc

    field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip";

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -22970,6 +22970,7 @@ package android.media { 
    field public static final int MEDIA_ERROR_TIMED_OUT = -110; // 0xffffff92

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

    field public static final int MEDIA_ERROR_UNSUPPORTED = -1010; // 0xfffffc0e

    field public static final int MEDIA_INFO_AUDIO_NOT_PLAYING = 804; // 0x324

    field public static final int MEDIA_INFO_BAD_INTERLEAVING = 800; // 0x320

    field public static final int MEDIA_INFO_BUFFERING_END = 702; // 0x2be

    field public static final int MEDIA_INFO_BUFFERING_START = 701; // 0x2bd
@@ -22978,6 +22979,7 @@ package android.media { 
    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

    field public static final int MEDIA_INFO_VIDEO_NOT_PLAYING = 805; // 0x325

    field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3

    field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc

    field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip";

media/java/android/media/MediaPlayer.java

+12 −0
Original line number Diff line number Diff line
@@ -3822,6 +3822,18 @@ public class MediaPlayer extends PlayerBase 
     */

    public static final int MEDIA_INFO_EXTERNAL_METADATA_UPDATE = 803;



    /** Informs that audio is not playing. Note that playback of the video

     * is not interrupted.

     * @see android.media.MediaPlayer.OnInfoListener

     */

    public static final int MEDIA_INFO_AUDIO_NOT_PLAYING = 804;



    /** Informs that video is not playing. Note that playback of the audio

     * is not interrupted.

     * @see android.media.MediaPlayer.OnInfoListener

     */

    public static final int MEDIA_INFO_VIDEO_NOT_PLAYING = 805;



    /** Failed to handle timed text track properly.

     * @see android.media.MediaPlayer.OnInfoListener

     *