summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortsubus <tsubus@ilwt.org>2015-03-14 23:47:03 +0100
committerMichael Bestas <mikeioannina@cyanogenmod.org>2016-02-12 13:32:02 -0800
commit291b391472a88af9d285b9e5b01e250c6436624b (patch)
tree7469f32efbe1f0c6bd4b23c9c4cdb66f26dff899
parentffcfe4c5ea45f69e99711f7953ba91cc839c617d (diff)
downloadframeworks_base-291b391472a88af9d285b9e5b01e250c6436624b.zip
frameworks_base-291b391472a88af9d285b9e5b01e250c6436624b.tar.gz
frameworks_base-291b391472a88af9d285b9e5b01e250c6436624b.tar.bz2
Do not start music app when headset is unplugged
Change-Id: Ic56ba6c30a72deaf119da40e65ca83a9dcc35c43
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 2db03ba..fa35b17 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -5083,14 +5083,18 @@ public class AudioService extends IAudioService.Stub {
connType = AudioRoutesInfo.MAIN_HEADSET;
intent.setAction(Intent.ACTION_HEADSET_PLUG);
intent.putExtra("microphone", 1);
- startMusicPlayer();
+ if (state == 1) {
+ startMusicPlayer();
+ }
} else if (device == AudioSystem.DEVICE_OUT_WIRED_HEADPHONE ||
device == AudioSystem.DEVICE_OUT_LINE) {
/*do apps care about line-out vs headphones?*/
connType = AudioRoutesInfo.MAIN_HEADPHONES;
intent.setAction(Intent.ACTION_HEADSET_PLUG);
intent.putExtra("microphone", 0);
- startMusicPlayer();
+ if (state == 1) {
+ startMusicPlayer();
+ }
} else if (device == AudioSystem.DEVICE_OUT_HDMI ||
device == AudioSystem.DEVICE_OUT_HDMI_ARC) {
connType = AudioRoutesInfo.MAIN_HDMI;