commit a9821bdd0245c433914cf2379bf7e418270995da
author Glenn Kasten <gkasten@google.com> Fri Mar 09 07:19:43 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 09 07:19:43 2012 -0800
tree 8e4d81e35e91c2545385ce7bbc165d2f1503b0b4
parent 1e8b118a409cbd11e295147b7ceaae3cff9e0920
parent 12f32d66592623e12bf89c7cb21bf2e7f64bfe78

Merge "Don't ask policy manager about invalid stream type"

services/audioflinger/AudioFlinger.cpp

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 @@
         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",