commit a30a31fde57df764d7098a9470974c9323c20e39
author Treehugger Robot <treehugger-gerrit@google.com> Sat Nov 21 02:09:07 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 21 02:09:07 2020 +0000
tree d771db9828f72fa18e36b8d1a516678a8a9bbe18
parent fbc735c531065d15eaea94dc1cad669d0fd59771
parent 9bb689da2356ca109bd098f15ac9798bb9e248de

Merge "omx: validate only standard OMX roles" into android11-tests-dev

media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp

diff --git a/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp b/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp
index 68ee900..2298636 100644
--- a/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp
+++ b/media/omx/1.0/vts/functional/master/VtsHalMediaOmxV1_0TargetMasterTest.cpp
@@ -264,11 +264,13 @@
 
         // Make sure role name follows expected format based on type and
         // isEncoder
-        const std::string role_name(
-                ::android::GetComponentRole(role.isEncoder, role.type.c_str()));
-        EXPECT_EQ(role_name, role.role) << "Role \"" << role.role << "\" does not match "
+        const char *role_name =
+            ::android::GetComponentRole(role.isEncoder, role.type.c_str());
+        if (role_name != nullptr) {
+            EXPECT_EQ(std::string(role_name), role.role) << "Role \"" << role.role << "\" does not match "
                                         << (role.isEncoder ? "an encoder " : "a decoder ")
-                                        << "for mime type \"" << role.type << ".";
+                                        << "for media type \"" << role.type << ".";
+        }
 
         // Check the nodes for this role
         std::set<const std::string> nodeKeys;