diff options
| author | James Dong <jdong@google.com> | 2010-08-21 09:43:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-21 09:43:41 -0700 |
| commit | 263ebfd8a17266eedc84eb879edb6a6a3395f760 (patch) | |
| tree | 581c9e9b89f9b76e86d6186310d66c3aa588e654 /media/libmediaplayerservice | |
| parent | 9934d0cf66861d331adcad28dc4713874e607a76 (diff) | |
| parent | aa14af4897f556276b0835407ab867c8898ed2f5 (diff) | |
| download | frameworks_av-263ebfd8a17266eedc84eb879edb6a6a3395f760.zip frameworks_av-263ebfd8a17266eedc84eb879edb6a6a3395f760.tar.gz frameworks_av-263ebfd8a17266eedc84eb879edb6a6a3395f760.tar.bz2 | |
am c8d2fa70: am cbd038fe: Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
Merge commit 'c8d2fa704abebdbf0bd8aac185216dc068950217'
* commit 'c8d2fa704abebdbf0bd8aac185216dc068950217':
Make MediaWriter stop and pause return errors if necessary
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index a616aae..59a544c 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -1141,8 +1141,9 @@ status_t StagefrightRecorder::pause() { status_t StagefrightRecorder::stop() { LOGV("stop"); + status_t err = OK; if (mWriter != NULL) { - mWriter->stop(); + err = mWriter->stop(); mWriter.clear(); } @@ -1164,7 +1165,7 @@ status_t StagefrightRecorder::stop() { mOutputFd = -1; } - return OK; + return err; } status_t StagefrightRecorder::close() { |