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

2012-10-29 15:21:33 -07:00
parent 643e337258 5ba0ffa023
commit 61ebf9cd8f
1 changed files with 1 additions and 1 deletions
--- 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;