Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AudioSystem: Add missing DEVICE_USB_HEADSET to DEVICE_USB_ALL" into oc-dr1-dev

Browse Source 
am: e2e01f7795

Change-Id: Ie80f463b6f84c2a5d543c3afd2f3fe5f3bc6c57c
This commit is contained in:
Eric Laurent
2017-06-24 05:11:51 +00:00
committed by android-build-merger
parent 44e6126079 e2e01f7795
commit 1c22f1d77f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/AudioSystem.java
View File

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