diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-09 07:19:43 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-09 07:19:43 -0800 |
| commit | a9821bdd0245c433914cf2379bf7e418270995da (patch) | |
| tree | 8e4d81e35e91c2545385ce7bbc165d2f1503b0b4 /services/audioflinger | |
| parent | 1e8b118a409cbd11e295147b7ceaae3cff9e0920 (diff) | |
| parent | 12f32d66592623e12bf89c7cb21bf2e7f64bfe78 (diff) | |
| download | frameworks_base-a9821bdd0245c433914cf2379bf7e418270995da.zip frameworks_base-a9821bdd0245c433914cf2379bf7e418270995da.tar.gz frameworks_base-a9821bdd0245c433914cf2379bf7e418270995da.tar.bz2 | |
Merge "Don't ask policy manager about invalid stream type"
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index fd7418c..f9b033b 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1621,7 +1621,7 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTra uint32_t strategy = AudioSystem::getStrategyForStream(streamType); for (size_t i = 0; i < mTracks.size(); ++i) { sp<Track> t = mTracks[i]; - if (t != 0) { + if (t != 0 && !t->isOutputTrack()) { uint32_t actual = AudioSystem::getStrategyForStream(t->streamType()); if (sessionId == t->sessionId() && strategy != actual) { ALOGE("createTrack_l() mismatched strategy; expected %u but found %u", |