Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c9278d3 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

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

parents 7a8b68c4 794da7a0

media/java/android/media/AudioService.java

+3 −1
Original line number Diff line number Diff line
@@ -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) {