diff options
| author | Eric Laurent <elaurent@google.com> | 2012-10-29 15:21:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-29 15:21:33 -0700 |
| commit | 61ebf9cd8f0b7bfbad6840bb828f2300beef745d (patch) | |
| tree | b9dc98414c24116b3c68a5790a77a64cd15d3e0b /media | |
| parent | 643e33725866f76402ae147f5b585f7dafdc6d17 (diff) | |
| parent | 5ba0ffa0237a5c300545e4c72591613c6e5b2ed9 (diff) | |
| download | frameworks_base-61ebf9cd8f0b7bfbad6840bb828f2300beef745d.zip frameworks_base-61ebf9cd8f0b7bfbad6840bb828f2300beef745d.tar.gz frameworks_base-61ebf9cd8f0b7bfbad6840bb828f2300beef745d.tar.bz2 | |
Merge "audio service: make dock audio is off by default" into jb-mr1-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index acd3eab..315196e 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -636,7 +636,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { private void readDockAudioSettings(ContentResolver cr) { mDockAudioMediaEnabled = Settings.Global.getInt( - cr, Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 1) == 1; + cr, Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0) == 1; if (mDockAudioMediaEnabled) { mBecomingNoisyIntentDevices |= AudioSystem.DEVICE_OUT_ANLG_DOCK_HEADSET; |