commit 43466a133984182b250453cea244eb146e83c010
author Eric Laurent <elaurent@google.com> Mon Jun 02 17:57:13 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 02 17:57:13 2014 +0000
tree f886c3055b17c1f4b95fae4e7dc85d4520a83336
parent cc19c8b58a48a0d090ea9d9897664f9817e7bac1
parent 62aaabb3905c61bb7acd6037414c206240a31c32

am 62aaabb3: audio policy: fix unitialized hw module in audio port

* commit '62aaabb3905c61bb7acd6037414c206240a31c32':
  audio policy: fix unitialized hw module in audio port

services/audioflinger/PatchPanel.cpp

diff --git a/services/audioflinger/PatchPanel.cpp b/services/audioflinger/PatchPanel.cpp
index 96a8127..02b5094 100644
--- a/services/audioflinger/PatchPanel.cpp
+++ b/services/audioflinger/PatchPanel.cpp
@@ -188,7 +188,7 @@
                 }
                 // limit to connections between sinks and sources on same HW module
                 if (patch->sinks[i].ext.mix.hw_module != src_module) {
-                    ALOGW("createAudioPatch() cannot connect source on module %d to"
+                    ALOGW("createAudioPatch() cannot connect source on module %d to "
                             "sink on module %d", src_module, patch->sinks[i].ext.mix.hw_module);
                     return BAD_VALUE;
                 }

services/audiopolicy/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp
index bf5b9a8..7f3bdef 100644
--- a/services/audiopolicy/AudioPolicyManager.cpp
+++ b/services/audiopolicy/AudioPolicyManager.cpp
@@ -4643,6 +4643,9 @@
             dstConfig->config_mask |= AUDIO_PORT_CONFIG_GAIN;
         }
     }
+    dstConfig->ext.mix.hw_module = mProfile->mModule->mHandle;
+    dstConfig->ext.mix.handle = mIoHandle;
+    dstConfig->ext.mix.usecase.source = mInputSource;
 }
 
 void AudioPolicyManager::AudioInputDescriptor::toAudioPort(