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 | 349250f3b64421f59439355c80a4540fbb34dda5 (patch) | |
| tree | 2f95cea2c082c4035e62cb766d3089a809f6e80c /media/libmediaplayerservice | |
| parent | 0b6d4aed033c774f044691d163040c2e8a115f8a (diff) | |
| parent | c8d2fa704abebdbf0bd8aac185216dc068950217 (diff) | |
| download | frameworks_base-349250f3b64421f59439355c80a4540fbb34dda5.zip frameworks_base-349250f3b64421f59439355c80a4540fbb34dda5.tar.gz frameworks_base-349250f3b64421f59439355c80a4540fbb34dda5.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() { |