diff options
| author | 2010-11-23 09:11:35 -0800 | |
|---|---|---|
| committer | 2010-11-24 13:35:31 -0800 | |
| commit | 214835773f7a11c9262ee1f612a8b2792ea72ea2 (patch) | |
| tree | 144878c1b1e184ff2424e6f806af167a3d258e21 | |
| parent | a9639b97f47ede69b96c5588e468fdf4dd22ddc8 (diff) | |
Revert "Temporary workaround for issue 3187563"
This reverts commit 065299b58d1c00cd24e442fa192561decf7b1fec.
The work around for issue 3187563 is not needed any more since the new kernel
DMA driver implementation (commit 7953250be7c9a1c3417e21b20032b571d495d218)
fixes the root cause.
Change-Id: Ibaac2826b63c8e5825ae2e5cab2fb2f0e51ab7b4
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index a0013d08e36f..535f07fa136e 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -277,10 +277,6 @@ void CameraService::releaseSound() { 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) { |