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

am 46c5fdf6: am 3f56d21b: Merge change I89e74ba1 into eclair

Browse Source 
Merge commit '46c5fdf60be5ba31ed7f31da42afdee639cddf15'

* commit '46c5fdf60be5ba31ed7f31da42afdee639cddf15':
  Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
This commit is contained in:
Eric Laurent
2009-10-01 13:43:31 -07:00
committed by Android Git Automerger
parent 6387d99479 46c5fdf60b
commit 554d35ccbd
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,12 +178,14 @@ public class AudioService extends IAudioService.Stub {
if (mMediaServerOk) {
sendMsg(mAudioHandler, MSG_MEDIA_SERVER_DIED, SHARED_MSG, SENDMSG_NOOP, 0, 0,
null, 1500);
mMediaServerOk = false;
}
break;
case AudioSystem.AUDIO_STATUS_OK:
if (!mMediaServerOk) {
sendMsg(mAudioHandler, MSG_MEDIA_SERVER_STARTED, SHARED_MSG, SENDMSG_NOOP, 0, 0,
null, 0);
mMediaServerOk = true;
}
break;
default:
@@ -1282,10 +1284,13 @@ public class AudioService extends IAudioService.Stub {
break;
case MSG_MEDIA_SERVER_DIED:
Log.e(TAG, "Media server died.");
// Force creation of new IAudioflinger interface
mMediaServerOk = false;
AudioSystem.isMusicActive();
if (!mMediaServerOk) {
Log.e(TAG, "Media server died.");
AudioSystem.isMusicActive();
sendMsg(mAudioHandler, MSG_MEDIA_SERVER_DIED, SHARED_MSG, SENDMSG_NOOP, 0, 0,
null, 500);
}
break;
case MSG_MEDIA_SERVER_STARTED:
@@ -1323,8 +1328,6 @@ public class AudioService extends IAudioService.Stub {
// Restore ringer mode
setRingerModeInt(getRingerMode(), false);
mMediaServerOk = true;
break;
case MSG_PLAY_SOUND_EFFECT: