commit 5300db670249f1663c6fa90e11c1f9e0a043d4fb
author Oscar Azucena <oscarazu@google.com> Wed Aug 30 18:45:18 2023 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Fri Sep 01 07:32:12 2023 +0000
tree 5f030fb42f89fb50b0599ac28a2205c5eb4c8ac5
parent a91df04b5e3e21c75bb22eb236ce8db7831f524e

Add check to prevent recursive calls to compute the same volume

Added check to prevent unbounded recursive calls to compute music
volume in cases where changing a volume group would lead to
recomputation of the music volume. Also added a similar check for ringer
and accessibility. In both cases the goal is to prevent recomputing the
same volume group.

Bug: 293643676
Bug: 298282137
Test: Tested target with notification and music in the same volume
	group.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:437ded5017947e64dd905444fced0b0b83514034)
Merged-In: I40cea1e7c7a5158b309b4e1a440ae88b238b0566
Change-Id: I40cea1e7c7a5158b309b4e1a440ae88b238b0566

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 8717083..b3c68b5 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -7656,8 +7656,10 @@
     const auto musicVolumeSrc = toVolumeSource(AUDIO_STREAM_MUSIC, false);
     const auto alarmVolumeSrc = toVolumeSource(AUDIO_STREAM_ALARM, false);
     const auto a11yVolumeSrc = toVolumeSource(AUDIO_STREAM_ACCESSIBILITY, false);
-
-    if (volumeSource == a11yVolumeSrc
+    // Verify that the current volume source is not the ringer volume to prevent recursively
+    // calling to compute volume. This could happen in cases where a11y and ringer sounds belong
+    // to the same volume group.
+    if (volumeSource != ringVolumeSrc && volumeSource == a11yVolumeSrc
             && (AUDIO_MODE_RINGTONE == mEngine->getPhoneState()) &&
             mOutputs.isActive(ringVolumeSrc, 0)) {
         auto &ringCurves = getVolumeCurves(AUDIO_STREAM_RING);
@@ -7720,8 +7722,12 @@
         // when the phone is ringing we must consider that music could have been paused just before
         // by the music application and behave as if music was active if the last music track was
         // just stopped
-        if (isStreamActive(AUDIO_STREAM_MUSIC, SONIFICATION_HEADSET_MUSIC_DELAY) ||
-                mLimitRingtoneVolume) {
+        // Verify that the current volume source is not the music volume to prevent recursively
+        // calling to compute volume. This could happen in cases where music and
+        // (alarm, ring, notification, system, etc.) sounds belong to the same volume group.
+        if (volumeSource != musicVolumeSrc &&
+            (isStreamActive(AUDIO_STREAM_MUSIC, SONIFICATION_HEADSET_MUSIC_DELAY)
+                || mLimitRingtoneVolume)) {
             volumeDb += SONIFICATION_HEADSET_VOLUME_FACTOR_DB;
             DeviceTypeSet musicDevice =
                     mEngine->getOutputDevicesForAttributes(attributes_initializer(AUDIO_USAGE_MEDIA),