summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/CameraService.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-11-11 16:47:38 -0800
committerEric Laurent <elaurent@google.com>2010-11-11 16:47:38 -0800
commit065299b58d1c00cd24e442fa192561decf7b1fec (patch)
tree7e3abaf094a23902a19904a3b47c1ffa5cc942dd /services/camera/libcameraservice/CameraService.cpp
parentd781089731127bd9199d47f53b170895868b8750 (diff)
downloadframeworks_base-065299b58d1c00cd24e442fa192561decf7b1fec.zip
frameworks_base-065299b58d1c00cd24e442fa192561decf7b1fec.tar.gz
frameworks_base-065299b58d1c00cd24e442fa192561decf7b1fec.tar.bz2
Temporary workaround for issue 3187563
The audio HAL does not always handle properly simultaneous input and output stream state changes. This happens in particular when starting video record because output stream starts and stops while input is active. Temporary disable the video record jingle the time the audio HAL issues are solved. Change-Id: I3b923d81af543a335deae9e22d7f396bb5791d91
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
-rw-r--r--services/camera/libcameraservice/CameraService.cpp4
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) {