Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'd1559d6b2db1d7e1718a15dc43a82450de2934db' into gingerbread-plus-aosp

* commit 'd1559d6b2db1d7e1718a15dc43a82450de2934db':
  Fix issue 2301630:  Mismatch of state occurs when media server is killed while in-call.
This commit is contained in:
Eric Laurent
2010-06-22 17:11:54 -07:00
committed by Android Git Automerger
parent 9666d3c0e7 d1559d6b2d
commit 7d329785f3
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/java/android/media/AudioService.java
View File

@@ -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: