From 5c51bb9919b524306e37025e1fbf2b27f64cd731 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 23 Jun 2017 11:04:19 -0700 Subject: [PATCH] AudioSystem: Add missing DEVICE_USB_HEADSET to DEVICE_USB_ALL Bug: 36220140 Test: verify AUDIO_BECOMING_NOISY intent is broacast when a USB_HEADSET device is disconnected. Change-Id: I6bfafc0174d5a02cc64862074f60e073407337d3 --- media/java/android/media/AudioSystem.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 6ef3091dcc700..29fe275777b03 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -424,7 +424,8 @@ public class AudioSystem DEVICE_OUT_BLUETOOTH_SCO_HEADSET | DEVICE_OUT_BLUETOOTH_SCO_CARKIT); public static final int DEVICE_OUT_ALL_USB = (DEVICE_OUT_USB_ACCESSORY | - DEVICE_OUT_USB_DEVICE); + DEVICE_OUT_USB_DEVICE | + DEVICE_OUT_USB_HEADSET); public static final int DEVICE_OUT_ALL_HDMI_SYSTEM_AUDIO = (DEVICE_OUT_AUX_LINE | DEVICE_OUT_HDMI_ARC | DEVICE_OUT_SPDIF); @@ -486,7 +487,8 @@ public class AudioSystem DEVICE_IN_DEFAULT); public static final int DEVICE_IN_ALL_SCO = DEVICE_IN_BLUETOOTH_SCO_HEADSET; public static final int DEVICE_IN_ALL_USB = (DEVICE_IN_USB_ACCESSORY | - DEVICE_IN_USB_DEVICE); + DEVICE_IN_USB_DEVICE | + DEVICE_IN_USB_HEADSET); // device states, must match AudioSystem::device_connection_state public static final int DEVICE_STATE_UNAVAILABLE = 0;