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

Commit ec04b2c7 authored by Tomoharu Kasahara's avatar Tomoharu Kasahara Committed by android-build-merger
Browse files

Merge "The sonification sound is muted during a shutter sound" am: a4c38d6e am: 2b82a9a1 

am: 95c3e899

Change-Id: I73cd7bcf00440c320551f191cb6716ad22b13439
parents dd8d38b2 95c3e899

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1271,6 +1271,11 @@ status_t AudioPolicyManager::startSource(const sp<AudioOutputDescriptor>& output 
        setStrategyMute(STRATEGY_SONIFICATION, true, outputDesc);

    }



    if (stream == AUDIO_STREAM_ENFORCED_AUDIBLE &&

            mEngine->getForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM) == AUDIO_POLICY_FORCE_SYSTEM_ENFORCED) {

        setStrategyMute(STRATEGY_SONIFICATION, true, outputDesc);

    }



    return NO_ERROR;

}