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

Commit d659aedb authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "AudioService: reduce EU volume warning thresdhold for USB headsets"...

Merge "AudioService: reduce EU volume warning thresdhold for USB headsets" into oc-mr1-dev am: 64254ff6
am: 60392a5f

Change-Id: Iaa976b7b8e719595202ee12f33368debcd3cdf47
parents 085dc469 60392a5f
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -6134,12 +6134,12 @@ public class AudioService extends IAudioService.Stub
    private int mSafeMediaVolumeIndex;
    // mSafeUsbMediaVolumeIndex is used for USB Headsets and is the music volume UI index
    // corresponding to a gain of -30 dBFS in audio flinger mixer.
    // We remove -15 dBs from the theoretical -15dB to account for the EQ boost when bands are set
    // to max gain.
    // We remove -22 dBs from the theoretical -15dB to account for the EQ + bass boost
    // amplification when both effects are on with all band gains at maximum.
    // This level corresponds to a loudness of 85 dB SPL for the warning to be displayed when
    // the headset is compliant to EN 60950 with a max loudness of 100dB SPL.
    private int mSafeUsbMediaVolumeIndex;
    private static final float SAFE_VOLUME_GAIN_DBFS = -30.0f;
    private static final float SAFE_VOLUME_GAIN_DBFS = -37.0f;
    // mSafeMediaVolumeDevices lists the devices for which safe media volume is enforced,
    private final int mSafeMediaVolumeDevices = AudioSystem.DEVICE_OUT_WIRED_HEADSET |
                                                AudioSystem.DEVICE_OUT_WIRED_HEADPHONE |