diff options
| author | Wu-cheng Li <> | 2009-03-24 20:39:09 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 20:39:09 -0700 |
| commit | a9f95fbee978e2d134052c2dceea2559b64badb4 (patch) | |
| tree | 75beaac83dc206e176d4c1137c1a2ad4cc30b27a | |
| parent | 403914a108fec85c9677f1588b62088a416d5d1e (diff) | |
| download | frameworks_base-a9f95fbee978e2d134052c2dceea2559b64badb4.zip frameworks_base-a9f95fbee978e2d134052c2dceea2559b64badb4.tar.gz frameworks_base-a9f95fbee978e2d134052c2dceea2559b64badb4.tar.bz2 | |
Automated import from //branches/donutburger/...@141614,141614
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index c5c95b0..6a6a811 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -731,6 +731,11 @@ void CameraService::Client::shutterCallback(void *user) return; } + // Play shutter sound. + if (client->mMediaPlayerClick.get() != NULL) { + client->mMediaPlayerClick->start(); + } + // Screen goes black after the buffer is unregistered. if (client->mSurface != 0 && !client->mUseOverlay) { client->mSurface->unregisterBuffers(); @@ -754,10 +759,6 @@ void CameraService::Client::shutterCallback(void *user) client->mSurface->registerBuffers(buffers); } - - if (client->mMediaPlayerClick.get() != NULL) { - client->mMediaPlayerClick->start(); - } } // picture callback - raw image ready |