commit bc7b03159b6d776c14919ef1d80194da6e340fa4
author Vlad Popa <pvlad@google.com> Tue Sep 12 14:30:16 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 12 14:30:16 2023 +0000
tree 7830a8527bb4b9d843a985870c47663a4e92d60d
parent 327000cfd13937a973dabe413c40ab5c04692015
parent 58c13bb88685c767e4e076a75b7c141c09beb851

Merge "CSD: enable CSD for BT devices" into udc-qpr-dev

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

diff --git a/services/core/java/com/android/server/audio/SoundDoseHelper.java b/services/core/java/com/android/server/audio/SoundDoseHelper.java
index 5ebc1c0..95b6c2c 100644
--- a/services/core/java/com/android/server/audio/SoundDoseHelper.java
+++ b/services/core/java/com/android/server/audio/SoundDoseHelper.java
@@ -334,9 +334,8 @@
                 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() {