diff options
| author | Eric Laurent <elaurent@google.com> | 2015-06-18 18:47:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-18 18:47:56 +0000 |
| commit | fa907d4ee326c7bb9cbb4882ab7c0ec42bbceee3 (patch) | |
| tree | 51f9abafbb46f41145e721449010232479dfa63a /services/audiopolicy | |
| parent | 3fc792fe36b0b9100f74185665221b37f650ff65 (diff) | |
| parent | e8d55a5d1f6b08cfdabea7628e956063a47fa160 (diff) | |
| download | frameworks_av-fa907d4ee326c7bb9cbb4882ab7c0ec42bbceee3.zip frameworks_av-fa907d4ee326c7bb9cbb4882ab7c0ec42bbceee3.tar.gz frameworks_av-fa907d4ee326c7bb9cbb4882ab7c0ec42bbceee3.tar.bz2 | |
Merge "audiopolicy: Add AUDIO_OUTPUT_FLAG_TTS to flags enum table" into mnc-dev
Diffstat (limited to 'services/audiopolicy')
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h index 0b08430..a39006e 100644 --- a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h +++ b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h @@ -155,6 +155,7 @@ const StringToEnum sOutputFlagNameToEnumTable[] = { STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD), STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_NON_BLOCKING), STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_HW_AV_SYNC), + STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_TTS), }; const StringToEnum sInputFlagNameToEnumTable[] = { |