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
commite3aac34f9e0d825aaad597f70e2b3dcb615ef313 (patch)
tree0f7f64c156d4690c9e86768ef19920ba7e422a41 /services/camera/libcameraservice/CameraService.cpp
parentb50a8033f1c7c2b58913212825f9200f1a9e5652 (diff)
downloadframeworks_av-e3aac34f9e0d825aaad597f70e2b3dcb615ef313.zip
frameworks_av-e3aac34f9e0d825aaad597f70e2b3dcb615ef313.tar.gz
frameworks_av-e3aac34f9e0d825aaad597f70e2b3dcb615ef313.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) {