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

Commit 62a111a6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove usage of abs_volume_index_fix" into main

parents 8e4e582c af5132e0

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+29 −33
Original line number Diff line number Diff line
@@ -8398,7 +8398,6 @@ float AudioPolicyManager::adjustDeviceAttenuationForAbsVolume(IVolumeCurves &cur 
    device_category deviceCategory = Volume::getDeviceCategory({volumeDevice});

    float volumeDb = curves.volIndexToDb(deviceCategory, index);



    if (com_android_media_audio_abs_volume_index_fix()) {

    const auto it = mAbsoluteVolumeDrivingStreams.find(volumeDevice);

    if (it != mAbsoluteVolumeDrivingStreams.end()) {

        audio_attributes_t attributesToDriveAbs = it->second;
@@ -8430,9 +8429,6 @@ float AudioPolicyManager::adjustDeviceAttenuationForAbsVolume(IVolumeCurves &cur 
        }

    }

    return volumeDb;

    } else {

        return volumeDb;

    }

}



float AudioPolicyManager::computeVolume(IVolumeCurves &curves,