commit 53b810ead5b726994fe6a28c6fa955e7b8799aaa
author Eric Laurent <elaurent@google.com> Sun Dec 10 17:25:10 2017 -0800
committer Eric Laurent <elaurent@google.com> Mon Dec 11 14:30:37 2017 -0800
tree 15653882b1b062369bc046d9ef92ccfdffbe1281
parent 5fb93fa294ee05a25f86312e926b5ca4e0d1d3b2

audio policy: fix device address passed when opening HAL  streams

Commit fe231127 caused a regression where the device address is
not passed properly to audio HAL by openInputStream() or
openOutputStream(). The address must be read from available
device descriptors, not supported devices in profiles which do not
have the current device address for removable devices.

Bug: 70321528
Test: audio smoke tests,CTS  AudioRecordTest
Change-Id: I83211a31f86391b80c3c244b436a2e36923ccea0

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index ad24439..46e758e 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -918,7 +918,12 @@
         }
 
         outputDesc = new SwAudioOutputDescriptor(profile, mpClientInterface);
-        status = outputDesc->open(config, device, String8(""), stream, flags, &output);
+
+        DeviceVector outputDevices = mAvailableOutputDevices.getDevicesFromType(device);
+        String8 address = outputDevices.size() > 0 ? outputDevices.itemAt(0)->mAddress
+                : String8("");
+
+        status = outputDesc->open(config, device, address, stream, flags, &output);
 
         // only accept an output with the requested parameters
         if (status != NO_ERROR ||
@@ -1678,6 +1683,12 @@
     lConfig.channel_mask = profileChannelMask;
     lConfig.format = profileFormat;
 
+    if (address == "") {
+        DeviceVector inputDevices = mAvailableInputDevices.getDevicesFromType(device);
+        // the inputs vector must be of size >= 1, but we don't want to crash here
+        address = inputDevices.size() > 0 ? inputDevices.itemAt(0)->mAddress : String8("");
+    }
+
     status_t status = inputDesc->open(&lConfig, device, address,
             halInputSource, profileFlags, &input);
 
@@ -3588,10 +3599,17 @@
             sp<AudioInputDescriptor> inputDesc =
                     new AudioInputDescriptor(inProfile, mpClientInterface);
 
+            DeviceVector inputDevices = mAvailableInputDevices.getDevicesFromType(profileType);
+            //   the inputs vector must be of size >= 1, but we don't want to crash here
+            String8 address = inputDevices.size() > 0 ? inputDevices.itemAt(0)->mAddress
+                    : String8("");
+            ALOGV("  for input device 0x%x using address %s", profileType, address.string());
+            ALOGE_IF(inputDevices.size() == 0, "Input device list is empty!");
+
             audio_io_handle_t input = AUDIO_IO_HANDLE_NONE;
             status_t status = inputDesc->open(nullptr,
                                               profileType,
-                                              String8(""),
+                                              address,
                                               AUDIO_SOURCE_MIC,
                                               AUDIO_INPUT_FLAG_NONE,
                                               &input);