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

Commit 382bbc8f authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Do not hardcode media - a11y stream aliasing"

parents a447a0f5 99bb2f9a

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+1 −3
Original line number Diff line number Diff line
@@ -4477,9 +4477,7 @@ audio_devices_t AudioPolicyManager::getNewInputDevice(const sp<AudioInputDescrip 


bool AudioPolicyManager::streamsMatchForvolume(audio_stream_type_t stream1,

                                               audio_stream_type_t stream2) {

    return ((stream1 == stream2) ||

            ((stream1 == AUDIO_STREAM_ACCESSIBILITY) && (stream2 == AUDIO_STREAM_MUSIC)) ||

            ((stream1 == AUDIO_STREAM_MUSIC) && (stream2 == AUDIO_STREAM_ACCESSIBILITY)));

    return (stream1 == stream2);

}



uint32_t AudioPolicyManager::getStrategyForStream(audio_stream_type_t stream) {