diff options
| author | Eric Laurent <elaurent@google.com> | 2010-11-11 17:24:27 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-11 17:24:27 -0800 |
| commit | fc1bbf1b7df9967a7804b1025eb451d90f6bf94d (patch) | |
| tree | 0d669ea6f34136a56e1278e237da5c00d2291395 | |
| parent | 237e5fba3241348980b9bcc2b4a75e0310ca5019 (diff) | |
| parent | 065299b58d1c00cd24e442fa192561decf7b1fec (diff) | |
| download | frameworks_base-fc1bbf1b7df9967a7804b1025eb451d90f6bf94d.zip frameworks_base-fc1bbf1b7df9967a7804b1025eb451d90f6bf94d.tar.gz frameworks_base-fc1bbf1b7df9967a7804b1025eb451d90f6bf94d.tar.bz2 | |
Merge "Temporary workaround for issue 3187563"
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 535f07f..a0013d0 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -277,6 +277,10 @@ 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) { |