diff options
| author | Eric Laurent <elaurent@google.com> | 2012-08-30 11:30:16 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-08-30 11:30:16 -0700 |
| commit | 794da7a0543cbecffefb73794aa68d1a93e41adf (patch) | |
| tree | fa983b2b581676ba20f889a74167d128079454dc /media/java | |
| parent | 694121c4004e80deec71736481cfb03bd50e38f5 (diff) | |
| download | frameworks_base-794da7a0543cbecffefb73794aa68d1a93e41adf.zip frameworks_base-794da7a0543cbecffefb73794aa68d1a93e41adf.tar.gz frameworks_base-794da7a0543cbecffefb73794aa68d1a93e41adf.tar.bz2 | |
AudioService: pause music when undocked
Send becomming noisy event also when disconnecting a dock
(analog, digital or USB) or HDMI.
Bug 6760590.
Change-Id: I497df35a3c6817d2b300f532d4cc3f12e3ce9ace
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 84fb0dd..c98fcd3 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -3294,7 +3294,9 @@ public class AudioService extends IAudioService.Stub implements OnFinished { // sent if none of these devices is connected. int mBecomingNoisyIntentDevices = 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 private int checkSendBecomingNoisyIntent(int device, int state) { |