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

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

am 98e5c814: am 73176865: Merge "audio service fix dock after crash - DO NOT... 

am 98e5c814: am 73176865: Merge "audio service fix dock after crash - DO NOT MERGE" into jb-mr1.1-dev

* commit '98e5c814':
  audio service fix dock after crash - DO NOT MERGE
parents 122dbe96 98e5c814

media/java/android/media/AudioService.java

+7 −0
Original line number Diff line number Diff line
@@ -3324,6 +3324,13 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
                                mBluetoothA2dpEnabled ?

                                        AudioSystem.FORCE_NONE : AudioSystem.FORCE_NO_BT_A2DP);

                    }



                    synchronized (mSettingsLock) {

                        AudioSystem.setForceUse(AudioSystem.FOR_DOCK,

                                mDockAudioMediaEnabled ?

                                        AudioSystem.FORCE_ANALOG_DOCK : AudioSystem.FORCE_NONE);

                    }



                    // indicate the end of reconfiguration phase to audio HAL

                    AudioSystem.setParameters("restarting=false");

                    break;