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

Commit 2b82a9a1 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

Change-Id: Iddd951781a8c9774bcd74823f2d0085777d267de
parents b6d596e2 a4c38d6e

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+11 −0
Original line number Diff line number Diff line
@@ -1339,6 +1339,11 @@ status_t AudioPolicyManager::startSource(const sp<AudioOutputDescriptor>& output 
        }

    }



    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;

}
@@ -1434,6 +1439,12 @@ status_t AudioPolicyManager::stopSource(const sp<AudioOutputDescriptor>& outputD 
            // update the outputs if stopping one with a stream that can affect notification routing

            handleNotificationRoutingForStream(stream);

        }



        if (stream == AUDIO_STREAM_ENFORCED_AUDIBLE &&

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

            setStrategyMute(STRATEGY_SONIFICATION, false, outputDesc);

        }



        if (stream == AUDIO_STREAM_MUSIC) {

            selectOutputForMusicEffects();

        }