commit 0f44db01f8a282e99c4ef0bb2ede5e88a1b6af9a
author Matthias Springer <springerm@google.com> Fri Aug 14 14:32:05 2020 +0900
committer Matthias Springer <springerm@google.com> Fri Aug 14 14:39:51 2020 +0900
tree d2add636da42fc5893b881647b7fd3223643e91a
parent c581f4f5efb6e6f9be16823203cfed1711f465a0

Fix media_profiles.xml fallback path.

This commit fixes various CTS tests and the GCA on ARCVM. This bug was
probably introduced by a typo in ag/10574864.

Test: GCA no longer crashing
Bug: 162375192
Change-Id: I6a82bcd651b4a483051c87f69cce9ba9b48fc5e8

media/libmedia/MediaProfiles.cpp

diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp
index 637322f..1be82d8 100644
--- a/media/libmedia/MediaProfiles.cpp
+++ b/media/libmedia/MediaProfiles.cpp
@@ -63,7 +63,7 @@
                      searchDirs[1] + fileName,
                      searchDirs[2] + fileName,
                      searchDirs[3] + fileName,
-                     "system/etc/media_profiles_V1_0.xml" // System fallback
+                     "system/etc/media_profiles.xml" // System fallback
                    };
         }();
     static std::array<char const*, 5> const cPaths = {