commit 4f1a1aa39be92f9088f9d204a8fffebe1e364c37
author Eric Laurent <elaurent@google.com> Mon Nov 29 08:53:52 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 29 08:53:52 2010 -0800
tree 2edd4187a1aef177b9093f21794926049d55837a
parent ac19268a36d583df2d7ac763b9e3fc6ec6da40cc
parent 214835773f7a11c9262ee1f612a8b2792ea72ea2

Merge "Revert "Temporary workaround for issue 3187563""

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index a0013d0..535f07f 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -277,10 +277,6 @@
 
 void CameraService::playSound(sound_kind kind) {
     LOG1("playSound(%d)", kind);
-    // FIXME: temporarily disable sound while working on audio HAL issues preventing simultaneous
-    // playback and record
-    if (kind == SOUND_RECORDING) return;
-
     Mutex::Autolock lock(mSoundLock);
     sp<MediaPlayer> player = mSoundPlayer[kind];
     if (player != 0) {