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

Commit 6e0d12cc authored by Wonsik Kim's avatar Wonsik Kim Committed by Android (Google) Code Review
Browse files

Merge "media: unhide MediaRecorder.pause()/resume()"

parents 0b9e35ab df2908f9

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -20792,9 +20792,11 @@ package android.media { 
    method public static final int getAudioSourceMax();

    method public int getMaxAmplitude() throws java.lang.IllegalStateException;

    method public android.view.Surface getSurface();

    method public void pause() throws java.lang.IllegalStateException;

    method public void prepare() throws java.io.IOException, java.lang.IllegalStateException;

    method public void release();

    method public void reset();

    method public void resume() throws java.lang.IllegalStateException;

    method public void setAudioChannels(int);

    method public void setAudioEncoder(int) throws java.lang.IllegalStateException;

    method public void setAudioEncodingBitRate(int);

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -22142,9 +22142,11 @@ package android.media { 
    method public static final int getAudioSourceMax();

    method public int getMaxAmplitude() throws java.lang.IllegalStateException;

    method public android.view.Surface getSurface();

    method public void pause() throws java.lang.IllegalStateException;

    method public void prepare() throws java.io.IOException, java.lang.IllegalStateException;

    method public void release();

    method public void reset();

    method public void resume() throws java.lang.IllegalStateException;

    method public void setAudioChannels(int);

    method public void setAudioEncoder(int) throws java.lang.IllegalStateException;

    method public void setAudioEncodingBitRate(int);

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -20800,9 +20800,11 @@ package android.media { 
    method public static final int getAudioSourceMax();

    method public int getMaxAmplitude() throws java.lang.IllegalStateException;

    method public android.view.Surface getSurface();

    method public void pause() throws java.lang.IllegalStateException;

    method public void prepare() throws java.io.IOException, java.lang.IllegalStateException;

    method public void release();

    method public void reset();

    method public void resume() throws java.lang.IllegalStateException;

    method public void setAudioChannels(int);

    method public void setAudioEncoder(int) throws java.lang.IllegalStateException;

    method public void setAudioEncodingBitRate(int);

media/java/android/media/MediaRecorder.java

+0 −2
Original line number Diff line number Diff line
@@ -822,7 +822,6 @@ public class MediaRecorder 
     *

     * @throws IllegalStateException if it is called before start() or after

     * stop()

     * {@hide}

     */

    public native void pause() throws IllegalStateException;
@@ -833,7 +832,6 @@ public class MediaRecorder 
     * @throws IllegalStateException if it is called before start() or after

     * stop()

     * @see android.media.MediaRecorder#pause

     * {@hide}

     */

    public native void resume() throws IllegalStateException;