commit 5ebb948176e82286107c023d894e4e2c47be6fcd
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 21 17:03:29 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 21 17:03:29 2018 +0000
tree 2e7342620e5b3f58a89902d51428f9acee3a1ba4
parent 45af9cd0cf716426cb29c9ea1ae8df5cfad9e5c5
parent c589a49b2efbb6cb6cbe9221269bdd7953ae6d06

Merge "PatchPanel: Fix typo in patch validation"

services/audioflinger/PatchPanel.cpp

diff --git a/services/audioflinger/PatchPanel.cpp b/services/audioflinger/PatchPanel.cpp
index 1212274..a08da96 100644
--- a/services/audioflinger/PatchPanel.cpp
+++ b/services/audioflinger/PatchPanel.cpp
@@ -179,8 +179,10 @@
             for (unsigned int i = 0; i < patch->num_sinks; i++) {
                 // support only one sink if connection to a mix or across HW modules
                 if ((patch->sinks[i].type == AUDIO_PORT_TYPE_MIX ||
-                        patch->sinks[i].ext.mix.hw_module != srcModule) &&
+                                (patch->sinks[i].type == AUDIO_PORT_TYPE_DEVICE &&
+                                        patch->sinks[i].ext.device.hw_module != srcModule)) &&
                         patch->num_sinks > 1) {
+                    ALOGW("%s() multiple sinks for mix or across modules not supported", __func__);
                     status = INVALID_OPERATION;
                     goto exit;
                 }