Automated import from //branches/donutburger/...@141614,141614
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 @@
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 @@
client->mSurface->registerBuffers(buffers);
}
-
- if (client->mMediaPlayerClick.get() != NULL) {
- client->mMediaPlayerClick->start();
- }
}
// picture callback - raw image ready