commit b141c526eac14ad0f92c9ec6aae6a3b3ebc35708
author François Gaffie <francois.gaffie@renault.com> Mon Mar 12 11:47:40 2018 +0100
committer Eric Laurent <elaurent@google.com> Tue Jan 15 11:09:30 2019 -0800
tree 230c5d40ac6c887d5d2b9049a67c615e0c46e6e3
parent 716e1435b2b0af38c801f2bf3872b9edc2ba7c33

audiopolicy: apm: Fix segfault when using bus device without Policy Mix

Test: manual audio smoke tests
Change-Id: Ic9ecd5928931d63d42cecea7283c7282ec43ebc0
Signed-off-by: François Gaffie <francois.gaffie@renault.com>

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index d7cf88e..30b438d 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -4271,12 +4271,13 @@
                     addOutput(output, desc);
                     if (device_distinguishes_on_address(deviceType) && address != "0") {
                         sp<AudioPolicyMix> policyMix;
-                        if (mPolicyMixes.getAudioPolicyMix(address, policyMix) != NO_ERROR) {
-                            ALOGE("checkOutputsForDevice() cannot find policy for address %s",
+                        if (mPolicyMixes.getAudioPolicyMix(address, policyMix) == NO_ERROR) {
+                            policyMix->setOutput(desc);
+                            desc->mPolicyMix = policyMix->getMix();
+                        } else {
+                            ALOGW("checkOutputsForDevice() cannot find policy for address %s",
                                   address.string());
                         }
-                        policyMix->setOutput(desc);
-                        desc->mPolicyMix = policyMix->getMix();
 
                     } else if (((desc->mFlags & AUDIO_OUTPUT_FLAG_DIRECT) == 0) &&
                                     hasPrimaryOutput()) {