diff options
| author | Eric Laurent <elaurent@google.com> | 2014-06-02 10:40:54 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2014-06-02 10:40:54 -0700 |
| commit | 62aaabb3905c61bb7acd6037414c206240a31c32 (patch) | |
| tree | 55b1f59fa16bc0cf762c88a96e5a5f9a5d82d08c /services | |
| parent | e1715a465a29db625da9d0ea365edf371e39e201 (diff) | |
| download | frameworks_av-62aaabb3905c61bb7acd6037414c206240a31c32.zip frameworks_av-62aaabb3905c61bb7acd6037414c206240a31c32.tar.gz frameworks_av-62aaabb3905c61bb7acd6037414c206240a31c32.tar.bz2 | |
audio policy: fix unitialized hw module in audio port
The hw module handle was not initialized when creating
and audio port configuration from an input stream descriptor.
Bug 15376641.
Change-Id: I6c784cded68a5c665fd22c3643765c63f70eb241
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/PatchPanel.cpp | 2 | ||||
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
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 @@ status_t AudioFlinger::PatchPanel::createAudioPatch(const struct audio_patch *pa } // 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; } diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index 318f5e5..8c3af5b 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -4644,6 +4644,9 @@ void AudioPolicyManager::AudioInputDescriptor::toAudioPortConfig( 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( |