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

Commit 3e6a7681 authored by Vlad Popa's avatar Vlad Popa Committed by Android (Google) Code Review
Browse files

Merge "CSD: enable CSD for BT devices" into main

parents d8c226da 6ffeacb2

services/core/java/com/android/server/audio/SoundDoseHelper.java

+2 −3
Original line number Diff line number Diff line
@@ -334,9 +334,8 @@ public class SoundDoseHelper { 
                SAFE_MEDIA_VOLUME_UNINITIALIZED);

        mSafeMediaVolumeDevices.append(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES,

                SAFE_MEDIA_VOLUME_UNINITIALIZED);

        // TODO(b/278265907): enable A2DP when we can distinguish A2DP headsets

        // mSafeMediaVolumeDevices.append(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,

        //        SAFE_MEDIA_VOLUME_UNINITIALIZED);

        mSafeMediaVolumeDevices.append(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,

                SAFE_MEDIA_VOLUME_UNINITIALIZED);

    }



    float getOutputRs2UpperBound() {