commit 49544b645747ada98448b62aa98b42e6b63f46d5
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 01 01:24:19 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 01 01:24:19 2020 +0000
tree e7709e7dfd5ed8f6cef259ba4135221b26580b4f
parent d4dcaddbf2f02595ab0b4a05f726b280f2f63e6a
parent 1be392b4ca31f5d89e745a2e4f8b51c529142bdb

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

Change-Id: I1d606f6446213351b4795c2e455d79fc99d97169

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,