commit bbcde93f64665bde85af24b205e80b3624699631
author Pawin Vongmasa <pawin@google.com> Fri Aug 10 17:42:08 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 10 17:42:08 2018 -0700
tree 5e20896ce48a4e1905021dc6083b014dc935b548
parent fcc3f18714e54cd1c195d787d064702bffb399be
parent e89211bf574619183cace0fb685895b63cef781e

Merge "Skip unknown mime types instead of failing" into pi-dev am: 5ee81f2c4f am: 8337e72c78
am: e89211bf57

Change-Id: Ia19d3f422abb34e4d8dcf911820dcf90d6e6937d

media/omx/V1_0/host_omxstore/VtsHalMediaOmxStoreV1_0HostTest.py

diff --git a/media/omx/V1_0/host_omxstore/VtsHalMediaOmxStoreV1_0HostTest.py b/media/omx/V1_0/host_omxstore/VtsHalMediaOmxStoreV1_0HostTest.py
index 253d4b7..b54a902 100644
--- a/media/omx/V1_0/host_omxstore/VtsHalMediaOmxStoreV1_0HostTest.py
+++ b/media/omx/V1_0/host_omxstore/VtsHalMediaOmxStoreV1_0HostTest.py
@@ -307,12 +307,14 @@
                 'Role "' + role_name + '" has duplicates.')
 
             queried_role = get_role(is_encoder, mime_type)
-            # type and isEncoder must be known.
-            asserts.assertTrue(
-                queried_role,
-                'Invalid mime type "' + mime_type + '" for ' +
-                ('an encoder.' if is_encoder else 'a decoder.'))
-            # type and isEncoder must be consistent with role.
+            # If mime_type is not recognized, skip it.
+            if queried_role is None:
+                logging.info(
+                    'Unrecognized mime type  "' +
+                    mime_type + '", skipping.')
+                continue
+
+            # Otherwise, type and isEncoder must be consistent with role.
             asserts.assertEqual(
                 role_name, queried_role,
                 'Role "' + role_name + '" does not match ' +