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

Eric Laurent · Android Git Automerger · commit c864d952bcb0 · 2012-10-29T15:24:14.000-07:00
* commit '61ebf9cd8f0b7bfbad6840bb828f2300beef745d':
  audio service: make dock audio is off by default
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
@@ -636,7 +636,7 @@ private void updateStreamVolumeAlias(boolean updateVolumes) {
     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;

Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ private void updateStreamVolumeAlias(boolean updateVolumes) {`
`636`	`636`	`private void readDockAudioSettings(ContentResolver cr)`
`637`	`637`	`{`
`638`	`638`	`mDockAudioMediaEnabled = Settings.Global.getInt(`
`639`		`- cr, Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 1) == 1;`
	`639`	`+ cr, Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0) == 1;`
`640`	`640`
`641`	`641`	`if (mDockAudioMediaEnabled) {`
`642`	`642`	`mBecomingNoisyIntentDevices \|= AudioSystem.DEVICE_OUT_ANLG_DOCK_HEADSET;`