Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide MediaPlayer#MEDIA_INFO_STARTED_AS_NEXT" into pi-dev

Browse Source 
am: b814355d17

Change-Id: If15237f7b3b589c8a010cf44011a3a5e4db61248
This commit is contained in:
Dongwon Kang
2018-03-30 14:38:22 +00:00
committed by android-build-merger
parent 41a28e7fe6 b814355d17
commit 2eab17bc73
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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

2
media/java/android/media/MediaPlayer.java
View File

@@ -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;