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

Commit cd3231f5 authored by Eric Laurent's avatar Eric Laurent
Browse files

audio service fix dock after crash - DO NOT MERGE 

merge from master:
"audio service: set dock use on mediaserver restart

Restore forced usage of dock audio for media according to
current setting when media server restarts."

Bug 7485250.

Change-Id: Ie67b80ede1ed92d223dd96de83c1beb985dfba06
parent 1f6cf5fa

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;