diff options
| author | James Dong <jdong@google.com> | 2012-08-08 11:38:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-08 11:38:05 -0700 |
| commit | aef4af4cd122ca5713110ccc7539828ce6e2f642 (patch) | |
| tree | 38b9b17092602b0bb8df543827b91c665335eba9 /media/java | |
| parent | 2caec6c682853ccbfe73ef5ae15c1d03ea043e8a (diff) | |
| parent | a35379ae984ddb8fe067c4b115fffc5a21e565e1 (diff) | |
| download | frameworks_base-aef4af4cd122ca5713110ccc7539828ce6e2f642.zip frameworks_base-aef4af4cd122ca5713110ccc7539828ce6e2f642.tar.gz frameworks_base-aef4af4cd122ca5713110ccc7539828ce6e2f642.tar.bz2 | |
Merge "Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class" into jb-mr1-dev
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaRecorder.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 9af201d..ca2df47 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -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 */ |