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

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

am 7d329785: am d1559d6b: Merge "Fix issue 2301630: Mismatch of state occurs... 

am 7d329785: am d1559d6b: Merge "Fix issue 2301630:  Mismatch of state occurs when media server is killed while in-call." into gingerbread

Merge commit '7d329785'

* commit '7d329785':
  Fix issue 2301630:  Mismatch of state occurs when media server is killed while in-call.
parents bb9524b6 7d329785

media/java/android/media/AudioService.java

+9 −0
Original line number Diff line number Diff line
@@ -1627,6 +1627,12 @@ public class AudioService extends IAudioService.Stub { 


                case MSG_MEDIA_SERVER_STARTED:

                    Log.e(TAG, "Media server started.");

                    // indicate to audio HAL that we start the reconfiguration phase after a media

                    // server crash

                    // Note that MSG_MEDIA_SERVER_STARTED message is only received when the media server

                    // process restarts after a crash, not the first time it is started.

                    AudioSystem.setParameters("restarting=true");



                    // Restore device connection states

                    Set set = mConnectedDevices.entrySet();

                    Iterator i = set.iterator();
@@ -1660,6 +1666,9 @@ public class AudioService extends IAudioService.Stub { 


                    // Restore ringer mode

                    setRingerModeInt(getRingerMode(), false);



                    // indicate the end of reconfiguration phase to audio HAL

                    AudioSystem.setParameters("restarting=false");

                    break;



                case MSG_PLAY_SOUND_EFFECT: