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

Commit 15f486da authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Give consistent names to properties controlling camera shutter sound... 

Merge "Give consistent names to properties controlling camera shutter sound (framework part)." into gingerbread
parents 533f93bd f62a0e8b

services/camera/libcameraservice/CameraService.cpp

+5 −3
Original line number Diff line number Diff line
@@ -350,10 +350,12 @@ void CameraService::loadSound() { 
    if (mSoundRef++) return;



    char value[PROPERTY_VALUE_MAX];

    property_get("persist.camera.shutter.disable", value, "0");

    int disableSound = atoi(value);

    property_get("ro.camera.sound.disabled", value, "0");

    int systemMute = atoi(value);

    property_get("persist.sys.camera-mute", value, "0");

    int userMute = atoi(value);



    if(!disableSound) {

    if(!systemMute && !userMute) {

        mSoundPlayer[SOUND_SHUTTER] = newMediaPlayer("/system/media/audio/ui/camera_click.ogg");

        mSoundPlayer[SOUND_RECORDING] = newMediaPlayer("/system/media/audio/ui/VideoRecord.ogg");

    }