commit 8bfa96c2f7c098550b00b84677088f84e81f4ed4
author Hochi Huang <hochi.huang@mediatek.com> Fri Oct 24 03:25:50 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 24 03:25:50 2014 +0000
tree b2303da60f3377846a09bc7adcc5c2bde6670a57
parent b8f096c067f94ed0507d828f5cca2ceab9781c18
parent 0f8f4e681b867dd611d2d916453337cb0770d4da

am 0f8f4e68:     [FM] Fix  FM App record fail Buganizer ID: 17975676

* commit '0f8f4e681b867dd611d2d916453337cb0770d4da':
  [FM] Fix  FM App record fail Buganizer ID: 17975676

media/libmediaplayerservice/StagefrightRecorder.cpp

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 @@
 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::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;
     }