diff options
| author | Hochi Huang <hochi.huang@mediatek.com> | 2014-10-24 03:25:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-24 03:25:50 +0000 |
| commit | 8bfa96c2f7c098550b00b84677088f84e81f4ed4 (patch) | |
| tree | b2303da60f3377846a09bc7adcc5c2bde6670a57 /media/libmediaplayerservice | |
| parent | b8f096c067f94ed0507d828f5cca2ceab9781c18 (diff) | |
| parent | 0f8f4e681b867dd611d2d916453337cb0770d4da (diff) | |
| download | frameworks_av-8bfa96c2f7c098550b00b84677088f84e81f4ed4.zip frameworks_av-8bfa96c2f7c098550b00b84677088f84e81f4ed4.tar.gz frameworks_av-8bfa96c2f7c098550b00b84677088f84e81f4ed4.tar.bz2 | |
am 0f8f4e68: [FM] Fix FM App record fail Buganizer ID: 17975676
* commit '0f8f4e681b867dd611d2d916453337cb0770d4da':
[FM] Fix FM App record fail Buganizer ID: 17975676
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index cadd691..3d093fa 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -111,7 +111,7 @@ sp<IGraphicBufferProducer> StagefrightRecorder::querySurfaceMediaSource() const status_t StagefrightRecorder::setAudioSource(audio_source_t as) { ALOGV("setAudioSource: %d", as); if (as < AUDIO_SOURCE_DEFAULT || - as >= AUDIO_SOURCE_CNT) { + (as >= AUDIO_SOURCE_CNT && as != AUDIO_SOURCE_FM_TUNER)) { ALOGE("Invalid audio source: %d", as); return BAD_VALUE; } @@ -981,7 +981,7 @@ status_t StagefrightRecorder::setupAMRRecording() { } status_t StagefrightRecorder::setupRawAudioRecording() { - if (mAudioSource >= AUDIO_SOURCE_CNT) { + if (mAudioSource >= AUDIO_SOURCE_CNT && mAudioSource != AUDIO_SOURCE_FM_TUNER) { ALOGE("Invalid audio source: %d", mAudioSource); return BAD_VALUE; } |