From a35379ae984ddb8fe067c4b115fffc5a21e565e1 Mon Sep 17 00:00:00 2001 From: James Dong Date: Tue, 7 Aug 2012 18:03:36 -0700 Subject: [PATCH] Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class o As a result, applications can listen for death notification from MediaRecorder onError callbacks Change-Id: I49896c4ae8130bd67b52deff6eb97a22b43d3f32 --- api/current.txt | 1 + media/java/android/media/MediaRecorder.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index f594205716663..7e34c2e341dc4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11505,6 +11505,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 diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 9af201dba60fb..ca2df47799421 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: * * @param extra an extra code, specific to the error type */