Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c864d952 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

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

* commit '61ebf9cd':
  audio service: make dock audio is off by default
parents f1c62be6 61ebf9cd

media/java/android/media/AudioService.java

+1 −1
Original line number Diff line number Diff line
@@ -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;