Snap for 4945494 from 5ee81f2c4f8f71db63566f61b1a84215ed480708 to pi-qpr1-releaseandroid-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-release

Change-Id: Ica9c14a7a9a70216c1280538eef147c6c69e2d3b

1 files changed, 8 insertions, 6 deletions

diff --git a/media/omx/V1_0/host_omxstore/VtsHalMediaOmxStoreV1_0HostTest.py b/media/omx/V1_0/host_omxstore/VtsHalMediaOmxStoreV1_0HostTest.py
index 253d4b7b..b54a9020 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 @@ class VtsHalMediaOmxStoreV1_0Host(hal_hidl_host_test.HalHidlHostTest):
                 '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 ' +