Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab9687f0 authored by Wu-cheng Li's avatar Wu-cheng Li Committed by The Android Open Source Project
Browse files

Automated import from //branches/cupcake/...@141613,141613

parent 4d45243c

camera/libcameraservice/CameraService.cpp

+5 −4
Original line number Original line Diff line number Diff line
@@ -731,6 +731,11 @@ void CameraService::Client::shutterCallback(void *user) 
        return;

        return;

    }

    }





    // Play shutter sound.

    if (client->mMediaPlayerClick.get() != NULL) {

        client->mMediaPlayerClick->start();

    }



    // Screen goes black after the buffer is unregistered.

    // Screen goes black after the buffer is unregistered.

    if (client->mSurface != 0 && !client->mUseOverlay) {

    if (client->mSurface != 0 && !client->mUseOverlay) {

        client->mSurface->unregisterBuffers();

        client->mSurface->unregisterBuffers();
@@ -754,10 +759,6 @@ void CameraService::Client::shutterCallback(void *user) 




        client->mSurface->registerBuffers(buffers);

        client->mSurface->registerBuffers(buffers);

    }

    }



    if (client->mMediaPlayerClick.get() != NULL) {

        client->mMediaPlayerClick->start();

    }

}

}





// picture callback - raw image ready

// picture callback - raw image ready