commit 1c838c481692c45b96786dcdd520296b73a71809
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 23 17:17:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 23 17:17:34 2018 +0000
tree 654d3e1aa9989216316d2d6eba385e5f72e8a17e
parent c42670b837dc6e0d63dad891f66735fd7cb3d969
parent 3d4d19e61b593909f1e1bcc2e04172d215f7990d

Merge "Fix incall music flag entry in type converter"

media/libmedia/TypeConverter.cpp

diff --git a/media/libmedia/TypeConverter.cpp b/media/libmedia/TypeConverter.cpp
index ae232b5..4cadeb1 100644
--- a/media/libmedia/TypeConverter.cpp
+++ b/media/libmedia/TypeConverter.cpp
@@ -117,7 +117,7 @@
     MAKE_STRING_FROM_ENUM(AUDIO_OUTPUT_FLAG_VOIP_RX),
     // FIXME: this cast will be removed when the flag will be
     // declared in types.hal for audio HAL V4.0 and auto imported to audio-base.h
-    MAKE_STRING_FROM_ENUM((audio_output_flags_t)AUDIO_OUTPUT_FLAG_INCALL_MUSIC),
+    {"AUDIO_OUTPUT_FLAG_INCALL_MUSIC", static_cast<audio_output_flags_t>(AUDIO_OUTPUT_FLAG_INCALL_MUSIC)},
     TERMINATOR
 };