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

Commit 68e5e9a6 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio: add call assistant usage"

parents 21a5e40c 21777f87

media/libmediahelper/TypeConverter.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -358,6 +358,7 @@ const UsageTypeConverter::Table UsageTypeConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_GAME),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_GAME),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_VIRTUAL_SOURCE),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_VIRTUAL_SOURCE),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_ASSISTANT),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_ASSISTANT),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_CALL_ASSISTANT),

    TERMINATOR

    TERMINATOR

};

};

services/audiopolicy/engine/common/src/EngineDefaultConfig.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -107,6 +107,13 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
         }

         }

     },

     },

    },

    },

    {"STRATEGY_CALL_ASSISTANT",

     {

         {"", AUDIO_STREAM_PATCH, "AUDIO_STREAM_PATCH",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_CALL_ASSISTANT, AUDIO_SOURCE_DEFAULT, 0, ""}}

         }

     },

    },

    {"STRATEGY_TRANSMITTED_THROUGH_SPEAKER",

    {"STRATEGY_TRANSMITTED_THROUGH_SPEAKER",

     {

     {

         {"", AUDIO_STREAM_TTS, "AUDIO_STREAM_TTS",

         {"", AUDIO_STREAM_TTS, "AUDIO_STREAM_TTS",

services/audiopolicy/enginedefault/src/Engine.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ static const std::vector<legacy_strategy_map> gLegacyStrategy = { 
    { "STRATEGY_ACCESSIBILITY", STRATEGY_ACCESSIBILITY },

    { "STRATEGY_ACCESSIBILITY", STRATEGY_ACCESSIBILITY },

    { "STRATEGY_REROUTING", STRATEGY_REROUTING },

    { "STRATEGY_REROUTING", STRATEGY_REROUTING },

    { "STRATEGY_PATCH", STRATEGY_REROUTING }, // boiler to manage stream patch volume

    { "STRATEGY_PATCH", STRATEGY_REROUTING }, // boiler to manage stream patch volume

    { "STRATEGY_CALL_ASSISTANT", STRATEGY_CALL_ASSISTANT },

};

};





Engine::Engine()

Engine::Engine()
@@ -443,6 +444,10 @@ DeviceVector Engine::getDevicesForStrategyInt(legacy_strategy strategy, 
        }

        }

        } break;

        } break;





    case STRATEGY_CALL_ASSISTANT:

        devices = availableOutputDevices.getDevicesFromType(AUDIO_DEVICE_OUT_TELEPHONY_TX);

        break;



    default:

    default:

        ALOGW("getDevicesForStrategy() unknown strategy: %d", strategy);

        ALOGW("getDevicesForStrategy() unknown strategy: %d", strategy);

        break;

        break;

services/audiopolicy/enginedefault/src/Engine.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ enum legacy_strategy { 
    STRATEGY_TRANSMITTED_THROUGH_SPEAKER,

    STRATEGY_TRANSMITTED_THROUGH_SPEAKER,

    STRATEGY_ACCESSIBILITY,

    STRATEGY_ACCESSIBILITY,

    STRATEGY_REROUTING,

    STRATEGY_REROUTING,

    STRATEGY_CALL_ASSISTANT,

};

};





class Engine : public EngineBase

class Engine : public EngineBase

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -6113,6 +6113,7 @@ bool AudioPolicyManager::isValidAttributes(const audio_attributes_t *paa) 
    case AUDIO_USAGE_GAME:

    case AUDIO_USAGE_GAME:

    case AUDIO_USAGE_VIRTUAL_SOURCE:

    case AUDIO_USAGE_VIRTUAL_SOURCE:

    case AUDIO_USAGE_ASSISTANT:

    case AUDIO_USAGE_ASSISTANT:

    case AUDIO_USAGE_CALL_ASSISTANT:

        break;

        break;

    default:

    default:

        return false;

        return false;