diff options
| author | Eric Laurent <elaurent@google.com> | 2010-11-23 09:11:35 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2010-11-24 13:35:31 -0800 |
| commit | e4db265e478bdac2381d85cf3dd41bbda14271b4 (patch) | |
| tree | 9f99fa66754dea7d1a1d77742ddda06f63b3576b /services | |
| parent | 32cb1ba657a1094bb815f4d39f3e4bf12ce8437e (diff) | |
| download | frameworks_av-e4db265e478bdac2381d85cf3dd41bbda14271b4.zip frameworks_av-e4db265e478bdac2381d85cf3dd41bbda14271b4.tar.gz frameworks_av-e4db265e478bdac2381d85cf3dd41bbda14271b4.tar.bz2 | |
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
Diffstat (limited to 'services')
| -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 a0013d0..535f07f 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) { |