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

Commit 9486e8ca authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

am 874a4618: Merge "Camera2: Don\'t play shutter sound when doing a video snapshot" into jb-mr1-dev 

* commit '874a4618':
  Camera2: Don't play shutter sound when doing a video snapshot
parents 9568b4cd 874a4618

services/camera/libcameraservice/camera2/CaptureSequencer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -410,7 +410,8 @@ CaptureSequencer::CaptureState CaptureSequencer::manageStandardCapture( 
        return DONE;

    }



    if (l.mParameters.playShutterSound) {

    if (l.mParameters.playShutterSound &&

            l.mParameters.state == Parameters::STILL_CAPTURE) {

        client->getCameraService()->playSound(CameraService::SOUND_SHUTTER);

    }