summaryrefslogtreecommitdiffstats
path: root/media/libmedia/mediarecorder.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-03-18 17:39:46 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-18 17:39:46 -0700
commit1179bc9b0e3d17c984e8f4ad38561c049dd102fa (patch)
tree1fd069efb58601650c80f77da0e2dc7d93641068 /media/libmedia/mediarecorder.cpp
parentc048cae0367db6fbb4fe1127be5011910713d4ad (diff)
downloadframeworks_av-1179bc9b0e3d17c984e8f4ad38561c049dd102fa.zip
frameworks_av-1179bc9b0e3d17c984e8f4ad38561c049dd102fa.tar.gz
frameworks_av-1179bc9b0e3d17c984e8f4ad38561c049dd102fa.tar.bz2
auto import from //branches/cupcake_rel/...@140373
Diffstat (limited to 'media/libmedia/mediarecorder.cpp')
-rw-r--r--media/libmedia/mediarecorder.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp
index 23b3b9d..6b26faf 100644
--- a/media/libmedia/mediarecorder.cpp
+++ b/media/libmedia/mediarecorder.cpp
@@ -367,8 +367,9 @@ status_t MediaRecorder::setParameters(const String8& params) {
status_t ret = mMediaRecorder->setParameters(params);
if (OK != ret) {
LOGE("setParameters(%s) failed: %d", params.string(), ret);
- mCurrentState = MEDIA_RECORDER_ERROR;
- return ret;
+ // Do not change our current state to MEDIA_RECORDER_ERROR, failures
+ // of the only currently supported parameters, "max-duration" and
+ // "max-filesize" are _not_ fatal.
}
return ret;