Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1263ac8e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "omx: validate only standard OMX roles" into sc-dev am: af592fb1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15528285

Change-Id: Iacbc4fde46021704ad42ca85564c8444858a27a6
parents 271616f9 af592fb1

media/omx/1.0/vts/functional/store/VtsHalMediaOmxV1_0TargetStoreTest.cpp

+7 −5
Original line number Diff line number Diff line
@@ -264,11 +264,13 @@ TEST_P(StoreHidlTest, ListRoles) { 


        // 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 "

                                        << (role.isEncoder ? "an encoder " : "a decoder ")

                                        << "for mime type \"" << role.type << ".";

        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 media type \""

                    << role.type << ".";

        }



        // Check the nodes for this role

        std::set<const std::string> nodeKeys;