summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-07-06 17:48:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-06 17:48:30 +0000
commit16f0c6b8146b2a993d9fe9c9076c73d39aaee81c (patch)
tree05c9ee447d47c6df958d40ad34b7e70190d8ec56 /services/audiopolicy
parentdfad5454e0caf46f8732f1415d3b9a76f2a1242e (diff)
parent6631424f66253c4bad94618fa078c97715a65fbc (diff)
downloadframeworks_av-16f0c6b8146b2a993d9fe9c9076c73d39aaee81c.zip
frameworks_av-16f0c6b8146b2a993d9fe9c9076c73d39aaee81c.tar.gz
frameworks_av-16f0c6b8146b2a993d9fe9c9076c73d39aaee81c.tar.bz2
Merge "audiopolicy: Update flag enum tables for the new flags" into mnc-dev
Diffstat (limited to 'services/audiopolicy')
-rw-r--r--services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h
index a39006e..036ce20 100644
--- a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h
+++ b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h
@@ -156,11 +156,15 @@ const StringToEnum sOutputFlagNameToEnumTable[] = {
STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_NON_BLOCKING),
STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_HW_AV_SYNC),
STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_TTS),
+ STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_RAW),
+ STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_SYNC),
};
const StringToEnum sInputFlagNameToEnumTable[] = {
STRING_TO_ENUM(AUDIO_INPUT_FLAG_FAST),
STRING_TO_ENUM(AUDIO_INPUT_FLAG_HW_HOTWORD),
+ STRING_TO_ENUM(AUDIO_INPUT_FLAG_RAW),
+ STRING_TO_ENUM(AUDIO_INPUT_FLAG_SYNC),
};
const StringToEnum sFormatNameToEnumTable[] = {