Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9de5ec5 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "audio policy: fix wrong ring volume after music stops." into sc-dev am: fddb5604 

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

Change-Id: I5ef1747de8e6b908c7af41e0f2831e702664aca3
parents 2a7f4d63 fddb5604

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+3 −2
Original line number Diff line number Diff line
@@ -6439,7 +6439,8 @@ float AudioPolicyManager::computeVolume(IVolumeCurves &curves, 
                volumeDb = minVolDb;

                ALOGV("computeVolume limiting volume to %f musicVol %f", minVolDb, musicVolDb);

            }

            if (!Intersection(deviceTypes, {AUDIO_DEVICE_OUT_BLUETOOTH_A2DP,

            if (Volume::getDeviceForVolume(deviceTypes) != AUDIO_DEVICE_OUT_SPEAKER

                    &&  !Intersection(deviceTypes, {AUDIO_DEVICE_OUT_BLUETOOTH_A2DP,

                        AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES}).empty()) {

                // on A2DP, also ensure notification volume is not too low compared to media when

                // intended to be played