diff --git a/api/current.txt b/api/current.txt index e9902b14d34d2..a3561154bd5b9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24345,7 +24345,6 @@ package android.media { method public abstract void prepareDrm(java.util.UUID) throws android.media.MediaPlayer2.ProvisioningNetworkErrorException, android.media.MediaPlayer2.ProvisioningServerErrorException, android.media.ResourceBusyException, android.media.UnsupportedSchemeException; method public abstract byte[] provideDrmKeyResponse(byte[], byte[]) throws android.media.DeniedByServerException, android.media.MediaPlayer2.NoDrmSchemeException; method public abstract void releaseDrm() throws android.media.MediaPlayer2.NoDrmSchemeException; - method public abstract void reset(); method public abstract void restoreDrmKeys(byte[]) throws android.media.MediaPlayer2.NoDrmSchemeException; method public void seekTo(long); method public abstract void seekTo(long, int); @@ -24510,6 +24509,7 @@ package android.media { method public abstract void play(); method public abstract void prepare(); method public abstract void registerPlayerEventCallback(java.util.concurrent.Executor, android.media.MediaPlayerBase.PlayerEventCallback); + method public abstract void reset(); method public abstract void seekTo(long); method public abstract void setAudioAttributes(android.media.AudioAttributes); method public abstract void setDataSource(android.media.DataSourceDesc); diff --git a/media/java/android/media/MediaPlayer2.java b/media/java/android/media/MediaPlayer2.java index e0047d61af77b..0d472abe9f9cc 100644 --- a/media/java/android/media/MediaPlayer2.java +++ b/media/java/android/media/MediaPlayer2.java @@ -1339,6 +1339,7 @@ public abstract class MediaPlayer2 extends MediaPlayerBase * this method, you will have to initialize it again by setting the * data source and calling prepare(). */ + @Override public abstract void reset(); /** diff --git a/media/java/android/media/MediaPlayerBase.java b/media/java/android/media/MediaPlayerBase.java index 3739847457937..24274f1356e32 100644 --- a/media/java/android/media/MediaPlayerBase.java +++ b/media/java/android/media/MediaPlayerBase.java @@ -113,6 +113,11 @@ public abstract class MediaPlayerBase implements AutoCloseable { */ public abstract void pause(); + /** + * Resets the MediaPlayerBase to its uninitialized state. + */ + public abstract void reset(); + /** * */