diff options
| author | Eric Laurent <elaurent@google.com> | 2012-03-20 19:35:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-20 19:35:53 -0700 |
| commit | 9a5f413a21b320fea0607e653bc75b1a4f0e7a2e (patch) | |
| tree | 4e423f1d508eb65b0df732ba6776316c0597e299 /services | |
| parent | 65b5a46b4387e064d1bfb2ae9e8a1aa523b20f41 (diff) | |
| parent | f607e2e488ad0438bf6d4a4cd841ba1f902206c7 (diff) | |
| download | frameworks_av-9a5f413a21b320fea0607e653bc75b1a4f0e7a2e.zip frameworks_av-9a5f413a21b320fea0607e653bc75b1a4f0e7a2e.tar.gz frameworks_av-9a5f413a21b320fea0607e653bc75b1a4f0e7a2e.tar.bz2 | |
am a48285c4: am 165ee4c5: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit 'a48285c4f22ffc43f1771ebd1ff35dcec48db2c7':
audioflinger: fix issue with camcorder and A2DP
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index d83d19a..c0b18fa 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -894,7 +894,8 @@ status_t AudioFlinger::setParameters(audio_io_handle_t ioHandle, const String8& // indicate output device change to all input threads for pre processing AudioParameter param = AudioParameter(keyValuePairs); int value; - if (param.getInt(String8(AudioParameter::keyRouting), value) == NO_ERROR) { + if ((param.getInt(String8(AudioParameter::keyRouting), value) == NO_ERROR) && + (value != 0)) { for (size_t i = 0; i < mRecordThreads.size(); i++) { mRecordThreads.valueAt(i)->setParameters(keyValuePairs); } |