Merge "CSD: Remove hearing aid devices for sound dose" into udc-dev am: 1790699a16 am: e5241b447d

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

Change-Id: If28911be774fad520cd999349d9433cd7769d501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-05-03 08:55:02 +00:00
committed by Automerger Merge Worker

View File

@@ -303,8 +303,6 @@ public class SoundDoseHelper {
SAFE_MEDIA_VOLUME_UNINITIALIZED); SAFE_MEDIA_VOLUME_UNINITIALIZED);
mSafeMediaVolumeDevices.append(AudioSystem.DEVICE_OUT_BLE_BROADCAST, mSafeMediaVolumeDevices.append(AudioSystem.DEVICE_OUT_BLE_BROADCAST,
SAFE_MEDIA_VOLUME_UNINITIALIZED); SAFE_MEDIA_VOLUME_UNINITIALIZED);
mSafeMediaVolumeDevices.append(AudioSystem.DEVICE_OUT_HEARING_AID,
SAFE_MEDIA_VOLUME_UNINITIALIZED);
mSafeMediaVolumeDevices.append(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES, mSafeMediaVolumeDevices.append(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES,
SAFE_MEDIA_VOLUME_UNINITIALIZED); SAFE_MEDIA_VOLUME_UNINITIALIZED);
// TODO(b/278265907): enable A2DP when we can distinguish A2DP headsets // TODO(b/278265907): enable A2DP when we can distinguish A2DP headsets