am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev

* commit '61ebf9cd8f0b7bfbad6840bb828f2300beef745d':
  audio service: make dock audio is off by default
This commit is contained in:
Eric Laurent
2012-10-29 15:25:29 -07:00
committed by Android Git Automerger

View File

@@ -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;