commit a536eb3eaad9e5b86bf16e4a83216456d42d783b
author Vlad Popa <pvlad@google.com> Thu Jul 18 16:00:35 2024 -0700
committer Vlad Popa <pvlad@google.com> Thu Jul 18 16:00:35 2024 -0700
tree b8dd23e5f79b3edff1eae9680a21fa82879be488
parent a8e0b582dd5bb04344fb67be5262ba340228569d

Improve robustness when deleting abs volume device

Flag: com.android.media.audio.abs_volume_index_fix
Test: manual
Bug: 350103953
Change-Id: I9673b05aac488bd43803e5c88059ef71eaefb1ea

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index e5fe2d2..e456e89 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -3508,6 +3508,11 @@
                                                             bool enabled,
                                                             audio_stream_type_t streamToDriveAbs)
 {
+    if (!enabled) {
+        mAbsoluteVolumeDrivingStreams.erase(deviceType);
+        return NO_ERROR;
+    }
+
     audio_attributes_t attributesToDriveAbs = mEngine->getAttributesForStreamType(streamToDriveAbs);
     if (attributesToDriveAbs == AUDIO_ATTRIBUTES_INITIALIZER) {
         ALOGW("%s: no attributes for stream %s, bailing out", __func__,
@@ -3515,12 +3520,7 @@
         return BAD_VALUE;
     }
 
-    if (enabled) {
-        mAbsoluteVolumeDrivingStreams[deviceType] = attributesToDriveAbs;
-    } else {
-        mAbsoluteVolumeDrivingStreams.erase(deviceType);
-    }
-
+    mAbsoluteVolumeDrivingStreams[deviceType] = attributesToDriveAbs;
     return NO_ERROR;
 }