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 | 54f5501a61bfc13930f9f8d08cbd71a69924d4cc (patch) | |
| tree | dca29d3dfbed373df749c80cf2e5085abf8da53f /services | |
| parent | a628f89503e024e2b3f4dad88edd326845e058b9 (diff) | |
| parent | e3aac34f9e0d825aaad597f70e2b3dcb615ef313 (diff) | |
| download | frameworks_av-54f5501a61bfc13930f9f8d08cbd71a69924d4cc.zip frameworks_av-54f5501a61bfc13930f9f8d08cbd71a69924d4cc.tar.gz frameworks_av-54f5501a61bfc13930f9f8d08cbd71a69924d4cc.tar.bz2 | |
Merge "Temporary workaround for issue 3187563"
Diffstat (limited to 'services')
| -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) { |