commit bb990f233aa0e0e2becb13f44cc999c99b9a5658
author Mikhail Naganov <mnaganov@google.com> Wed Jun 15 00:46:43 2022 +0000
committer Mikhail Naganov <mnaganov@google.com> Wed Jun 15 00:55:15 2022 +0000
tree 102902d533f076eda5db53f46004c2b244b124bf
parent e2f4f1ce650f6e5d3438e3d23ddf6f0cf509974b

Fix code issues in APM found with unit tests

A couple of issues resulted from refactoring done without
adequate test support. These issues were found with unit
tests being added.

Bug: 215794103
Test: atest audiosystem_tests audiorecord_tests
Change-Id: If6c55a2471ff6f21872ec5fa915592a713f244a5

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 3cfb944..a20e024 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -2920,7 +2920,7 @@
     // stream by the engine.
     DeviceTypeSet deviceTypes = {device};
     if (device == AUDIO_DEVICE_OUT_DEFAULT_FOR_VOLUME) {
-        DeviceTypeSet deviceTypes = mEngine->getOutputDevicesForAttributes(
+        deviceTypes = mEngine->getOutputDevicesForAttributes(
                 attr, nullptr, true /*fromCache*/).types();
     }
     return getVolumeIndex(getVolumeCurves(attr), index, deviceTypes);
@@ -2930,7 +2930,7 @@
                                             int &index,
                                             const DeviceTypeSet& deviceTypes) const
 {
-    if (isSingleDeviceType(deviceTypes, audio_is_output_device)) {
+    if (!isSingleDeviceType(deviceTypes, audio_is_output_device)) {
         return BAD_VALUE;
     }
     index = curves.getVolumeIndex(deviceTypes);