commit 1be392b4ca31f5d89e745a2e4f8b51c529142bdb
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 01 01:09:51 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 01 01:09:51 2020 +0000
tree e7709e7dfd5ed8f6cef259ba4135221b26580b4f
parent c1e756e5fd347d843f3b363e13d3d67a955bd972
parent 2f8e453957a5bc845b7ceb2f02c735cc6d77bb8c

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

Change-Id: Ic6fd60b3f7217c2c14247332e64a1ae871a6d29c

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,