summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jakub Pawlowski <jpawlowski@google.com> 2018-03-23 17:16:35 +0000
committer android-build-merger <android-build-merger@google.com> 2018-03-23 17:16:35 +0000
commit6d8442040469085c2cbbfa167c41eb9c60761ed3 (patch)
tree0980125c05dc57d20099db8b7a4060aedce7f3fa
parentaf0962c2d30ac12be8be26b7fb1d4b152ba8e073 (diff)
parent1f5d8f62a4db8d07c83c0204699ec66a979ec949 (diff)
Merge "Trigger ACTION_AUDIO_BECOMING_NOISY when Hearing Aid is disconnected" into pi-dev am: 85e7716a14
am: 1f5d8f62a4 Change-Id: I78d01735a78d25953b888dbcaecf02cd26d061c9
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index d40cfc53e74b..7f8c0a25a805 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -5962,7 +5962,8 @@ public class AudioService extends IAudioService.Stub
AudioSystem.DEVICE_OUT_WIRED_HEADSET | AudioSystem.DEVICE_OUT_WIRED_HEADPHONE |
AudioSystem.DEVICE_OUT_ALL_A2DP | AudioSystem.DEVICE_OUT_HDMI |
AudioSystem.DEVICE_OUT_ANLG_DOCK_HEADSET | AudioSystem.DEVICE_OUT_DGTL_DOCK_HEADSET |
- AudioSystem.DEVICE_OUT_ALL_USB | AudioSystem.DEVICE_OUT_LINE;
+ AudioSystem.DEVICE_OUT_ALL_USB | AudioSystem.DEVICE_OUT_LINE |
+ AudioSystem.DEVICE_OUT_HEARING_AID;
// must be called before removing the device from mConnectedDevices
// Called synchronized on mConnectedDevices