commit 2f8e453957a5bc845b7ceb2f02c735cc6d77bb8c
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 01 00:58:18 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 01 00:58:18 2020 +0000
tree 0cb0664fc1e1ba3c9b645f8506f6f8486104869c
parent 847b5677920882eca80f1554bfb1ffd782410fb9
parent 36c77d400c1e86b0aab5d529f061c158a674a122

Merge "audio policy: fix crash if output for DAP is not opened" into rvc-dev am: 36c77d400c

Change-Id: Idec9a236fcd361e14ef80e023e1312da364d93d2

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 13e2093..bcf6f38 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -954,7 +954,8 @@
                                                   primaryMix->mDeviceAddress,
                                                   AUDIO_FORMAT_DEFAULT);
         sp<SwAudioOutputDescriptor> policyDesc = primaryMix->getOutput();
-        if (policyDesc == nullptr || (policyDesc->mFlags & AUDIO_OUTPUT_FLAG_DIRECT)) {
+        if (deviceDesc != nullptr
+                && (policyDesc == nullptr || (policyDesc->mFlags & AUDIO_OUTPUT_FLAG_DIRECT))) {
             audio_io_handle_t newOutput;
             status = openDirectOutput(
                     *stream, session, config,