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

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

Merge "MediaSession2: Add reset() to the MediaPlayerBase"

parents 4462da83 de2bbb32

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -24346,7 +24346,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);
@@ -24511,6 +24510,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);

media/java/android/media/MediaPlayer2.java

+1 −0
Original line number Diff line number Diff line
@@ -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();



    /**

media/java/android/media/MediaPlayerBase.java

+5 −0
Original line number Diff line number Diff line
@@ -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();



    /**

     *

     */