commit 765c492f0d488ccb97046d1e99e67890b0196b83
author Mikhail Naganov <mnaganov@google.com> Fri Mar 09 05:13:55 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 09 05:13:55 2018 +0000
tree 98faf5b1aa7c8987c23e77a855cfbbeb1f354891
parent cac76070ee7311d8aa1f931f75fc0d4881a56d68
parent 4706f6af73e485e4fbcb5ff76509fbd517223ad9

Merge "Add AUDIO_FORMAT_AAC_XHE to type converter" into pi-dev
am: 4706f6af73

Change-Id: I586efe7359d03211dd98652e293cbbf624649ec6

media/libmedia/TypeConverter.cpp

diff --git a/media/libmedia/TypeConverter.cpp b/media/libmedia/TypeConverter.cpp
index 96dd004..9323d6d 100644
--- a/media/libmedia/TypeConverter.cpp
+++ b/media/libmedia/TypeConverter.cpp
@@ -158,6 +158,7 @@
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LD),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_HE_V2),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ELD),
+    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_XHE),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_MAIN),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_LC),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_SSR),