commit 63a0662d03791460a6ba882851e95b3e9eaf8b3b
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 09 01:40:28 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 09 01:40:28 2018 +0000
tree 5ec18d834c634eccb9c0ca76564e9be2368a6126
parent afb0d8c57e6a6efca3c413cf28a8e25ee8973a6d
parent 94ec46f82f5813fd5bcdf6c2f562e009dd4eec03

Merge "Handle race between UID state and activty resume" into pi-dev

media/libmedia/include/media/MediaProfiles.h

diff --git a/media/libmedia/include/media/MediaProfiles.h b/media/libmedia/include/media/MediaProfiles.h
index 6975581..0feb4f3 100644
--- a/media/libmedia/include/media/MediaProfiles.h
+++ b/media/libmedia/include/media/MediaProfiles.h
@@ -83,6 +83,7 @@
      * successful only when validation is successful.
      */
     static constexpr char const * const xmlFiles[] = {
+            "odm/etc/media_profiles_V1_0.xml",
             "vendor/etc/media_profiles_V1_0.xml",
             "system/etc/media_profiles.xml"
             };