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

Commit 4359780e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CSD: Remove a2dp for safe volume index devices" into udc-dev am: 9bf70409 

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



Change-Id: I88939cfbe2dc4fd6433ca305af16fabb94c430ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d252a29 9bf70409

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

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

        mSafeMediaVolumeDevices.append(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES,

                SAFE_MEDIA_VOLUME_UNINITIALIZED);

        mSafeMediaVolumeDevices.append(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,

                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);

    }



    float getOutputRs2UpperBound() {