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

Commit 36867767 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

USAGE_ASSISTANT/ACCESSIBILITY in audio policy manager 

Add support for USAGE_ASSISTANT.
Fix stream type for USAGE_ACCESSIBILITY.

Test: enable Talkback, check volume; make
Bug: 30947943

Change-Id: Ie35adf0115dce1fac6d3deddc1e57e36b36913f6
parent af86dcee

include/media/AudioPolicyHelper.h

+3 −1
Original line number Diff line number Diff line
@@ -32,9 +32,11 @@ static audio_stream_type_t audio_attributes_to_stream_type(const audio_attribute 
    switch (attr->usage) {

    case AUDIO_USAGE_MEDIA:

    case AUDIO_USAGE_GAME:

    case AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY:

    case AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE:

    case AUDIO_USAGE_ASSISTANT:

        return AUDIO_STREAM_MUSIC;

    case AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY:

        return AUDIO_STREAM_ACCESSIBILITY;

    case AUDIO_USAGE_ASSISTANCE_SONIFICATION:

        return AUDIO_STREAM_SYSTEM;

    case AUDIO_USAGE_VOICE_COMMUNICATION:

services/audiopolicy/enginedefault/src/Engine.cpp

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ routing_strategy Engine::getStrategyForUsage(audio_usage_t usage) 


    case AUDIO_USAGE_MEDIA:

    case AUDIO_USAGE_GAME:

    case AUDIO_USAGE_ASSISTANT:

    case AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE:

    case AUDIO_USAGE_ASSISTANCE_SONIFICATION:

        return STRATEGY_MEDIA;

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −0
Original line number Diff line number Diff line
@@ -5336,6 +5336,7 @@ audio_stream_type_t AudioPolicyManager::streamTypefromAttributesInt(const audio_ 
    switch (attr->usage) {

    case AUDIO_USAGE_MEDIA:

    case AUDIO_USAGE_GAME:

    case AUDIO_USAGE_ASSISTANT:

    case AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE:

        return AUDIO_STREAM_MUSIC;

    case AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY:
@@ -5391,6 +5392,7 @@ bool AudioPolicyManager::isValidAttributes(const audio_attributes_t *paa) 
    case AUDIO_USAGE_ASSISTANCE_SONIFICATION:

    case AUDIO_USAGE_GAME:

    case AUDIO_USAGE_VIRTUAL_SOURCE:

    case AUDIO_USAGE_ASSISTANT:

        break;

    default:

        return false;