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

Merge "AudioService: pause music when undocked" into jb-mr1-dev

Browse Source
This commit is contained in:
Eric Laurent
2012-08-30 12:40:39 -07:00
committed by Android (Google) Code Review
parent 7a8b68c432 794da7a054
commit 0c9278d3c8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/AudioService.java
View File

@@ -3294,7 +3294,9 @@ public class AudioService extends IAudioService.Stub implements OnFinished {
// sent if none of these devices is connected. // sent if none of these devices is connected.
int mBecomingNoisyIntentDevices = int mBecomingNoisyIntentDevices =
AudioSystem.DEVICE_OUT_WIRED_HEADSET | AudioSystem.DEVICE_OUT_WIRED_HEADPHONE | AudioSystem.DEVICE_OUT_WIRED_HEADSET | AudioSystem.DEVICE_OUT_WIRED_HEADPHONE |
AudioSystem.DEVICE_OUT_ALL_A2DP; AudioSystem.DEVICE_OUT_ALL_A2DP | AudioSystem.DEVICE_OUT_AUX_DIGITAL |
AudioSystem.DEVICE_OUT_ANLG_DOCK_HEADSET | AudioSystem.DEVICE_OUT_DGTL_DOCK_HEADSET |
AudioSystem.DEVICE_OUT_ALL_USB;
// must be called before removing the device from mConnectedDevices // must be called before removing the device from mConnectedDevices
private int checkSendBecomingNoisyIntent(int device, int state) { private int checkSendBecomingNoisyIntent(int device, int state) {