Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3d91046 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Don't allow MediaRecorder.setParameter() to be invoked in the following... 

Merge "Don't allow MediaRecorder.setParameter() to be invoked in the following states: error, prepared or recording"
parents 698f4765 e284bac7

media/libmedia/mediarecorder.cpp

+9 −0
Original line number Diff line number Diff line
@@ -365,6 +365,15 @@ status_t MediaRecorder::setParameters(const String8& params) { 
        return INVALID_OPERATION;

    }



    bool isInvalidState = (mCurrentState &

                           (MEDIA_RECORDER_PREPARED |

                            MEDIA_RECORDER_RECORDING |

                            MEDIA_RECORDER_ERROR));

    if (isInvalidState) {

        LOGE("setParameters is called in an invalid state: %d", mCurrentState);

        return INVALID_OPERATION;

    }



    status_t ret = mMediaRecorder->setParameters(params);

    if (OK != ret) {

        LOGE("setParameters(%s) failed: %d", params.string(), ret);