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

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

Browse Source
This commit is contained in:
James Dong
2012-08-08 11:38:05 -07:00
committed by Android (Google) Code Review
parent 2caec6c682 a35379ae98
commit aef4af4cd1
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -11512,6 +11512,7 @@ package android.media {
method public void setVideoSource(int) throws java.lang.IllegalStateException; method public void setVideoSource(int) throws java.lang.IllegalStateException;
method public void start() throws java.lang.IllegalStateException; method public void start() throws java.lang.IllegalStateException;
method public void stop() 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_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_DURATION_REACHED = 800; // 0x320
field public static final int MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED = 801; // 0x321 field public static final int MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED = 801; // 0x321

8
media/java/android/media/MediaRecorder.java
View File

@@ -721,12 +721,17 @@ public class MediaRecorder
public native int getMaxAmplitude() throws IllegalStateException; public native int getMaxAmplitude() throws IllegalStateException;
/* Do not change this value without updating its counterpart /* 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. /** Unspecified media recorder error.
* @see android.media.MediaRecorder.OnErrorListener * @see android.media.MediaRecorder.OnErrorListener
*/ */
public static final int MEDIA_RECORDER_ERROR_UNKNOWN = 1; 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 * 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: * @param what the type of error that has occurred:
* <ul> * <ul>
* <li>{@link #MEDIA_RECORDER_ERROR_UNKNOWN} * <li>{@link #MEDIA_RECORDER_ERROR_UNKNOWN}
* <li>{@link #MEDIA_ERROR_SERVER_DIED}
* </ul> * </ul>
* @param extra an extra code, specific to the error type * @param extra an extra code, specific to the error type
*/ */