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

Commit ca5a689d authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am da1007d1: am aef4af4c: Merge "Add MEDIA_ERROR_SERVER_DIED error constant to... 

am da1007d1: am aef4af4c: Merge "Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class" into jb-mr1-dev

* commit 'da1007d1':
  Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class
parents af0d0aae da1007d1

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11512,6 +11512,7 @@ package android.media { 
    method public void setVideoSource(int) throws java.lang.IllegalStateException;

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

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

    field public static final int MEDIA_ERROR_SERVER_DIED = 100; // 0x64

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

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

    field public static final int MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED = 801; // 0x321

media/java/android/media/MediaRecorder.java

+7 −1
Original line number Diff line number Diff line
@@ -721,12 +721,17 @@ public class MediaRecorder 
    public native int getMaxAmplitude() throws IllegalStateException;



    /* Do not change this value without updating its counterpart

     * in include/media/mediarecorder.h!

     * in include/media/mediarecorder.h or mediaplayer.h!

     */

    /** Unspecified media recorder error.

     * @see android.media.MediaRecorder.OnErrorListener

     */

    public static final int MEDIA_RECORDER_ERROR_UNKNOWN = 1;

    /** Media server died. In this case, the application must release the

     * MediaRecorder object and instantiate a new one.

     * @see android.media.MediaRecorder.OnErrorListener

     */

    public static final int MEDIA_ERROR_SERVER_DIED = 100;



    /**

     * Interface definition for a callback to be invoked when an error
@@ -741,6 +746,7 @@ public class MediaRecorder 
         * @param what    the type of error that has occurred:

         * <ul>

         * <li>{@link #MEDIA_RECORDER_ERROR_UNKNOWN}

         * <li>{@link #MEDIA_ERROR_SERVER_DIED}

         * </ul>

         * @param extra   an extra code, specific to the error type

         */