commit de4e12fbb6200b5ef3db7b3b5127eefa8c6dc150
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 15 09:23:53 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 15 09:23:53 2022 +0000
tree 537f0991d8d4e47d3465ec86116240b1c5875432
parent 33575451e58004c3a43462153716072d456d2e14
parent 3a966e8850e069d65866ada22e446a4d7afcdc51

Merge "Fix code issues in APM found with unit tests" am: 47f6a73cd2 am: d5a6361210 am: 3a966e8850

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2126456

Change-Id: I45f3d58cd8337f00d3716a744d5ecc16e6ad48f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 744609f..8eae84c 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -3141,7 +3141,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);
@@ -3151,7 +3151,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);