summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2011-02-04 16:33:43 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-02-04 16:33:43 -0800
commit5f3e9e69a16f5a7bc70f3f010c8aae91f287e941 (patch)
treeae42a9474984964d3f96f8c620ef53217cae3d18
parent6465889ecbf4c04bb4bb6f4e8d4306727f7ca837 (diff)
parentd4b88c8829cdababbf16aaf903ba25a1669310e7 (diff)
am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb
* commit 'd4b88c8829cdababbf16aaf903ba25a1669310e7': Issue 3395734: fix media server restart detection
-rw-r--r--media/java/android/media/AudioService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index ba6f5489bd12..6c85490bb1c5 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -1948,7 +1948,7 @@ public class AudioService extends IAudioService.Stub {
// Force creation of new IAudioflinger interface
if (!mMediaServerOk) {
Log.e(TAG, "Media server died.");
- AudioSystem.isStreamActive(AudioSystem.STREAM_MUSIC, 0);
+ AudioSystem.isMicrophoneMuted();
sendMsg(mAudioHandler, MSG_MEDIA_SERVER_DIED, SHARED_MSG, SENDMSG_NOOP, 0, 0,
null, 500);
}