Automated import from //branches/master/...@141615,141615
This commit is contained in:
committed by
The Android Open Source Project
parent
ba09c04677
commit
f2f758defd
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user