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

Commit 1e851012 authored by Arun Johnson's avatar Arun Johnson
Browse files

Allowing OMX.google* codecs for Devices launching with S 

S AOSP did not remove the OMX.google* codecs, so this cannot be
enforced for devices launching with S

bug: 230582620
Change-Id: I25e8f827645db8e83c8c3142f5e76a912fdf7b22
(cherry picked from commit 6973e79b)
parent 73e015a7

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

+10 −1
Original line number Diff line number Diff line
@@ -399,12 +399,21 @@ TEST_P(StoreHidlTest, OmxCodecAllowedTest) { 
                    ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)

                            << " Component: " << info.mName.c_str() << " Role: " << role.c_str()

                            << " not allowed for devices launching with Android T and above";

                } else {

                    std::string codecName = info.mName;

                    bool isAndroidCodec = (codecName.rfind("OMX.google", 0) != std::string::npos);

                    if (isAndroidCodec && (getFirstApiLevel() <= __ANDROID_API_S__)) {

                        // refer b/230582620

                        // S AOSP build did not remove the OMX.google video codecs

                        // so it is infeasible to require no OMX.google.* video codecs

                        // on S launching devices

                    } else {

                        ASSERT_LT(getFirstApiLevel(), __ANDROID_API_S__)

                            << " Component: " << info.mName.c_str() << " Role: " << role.c_str()

                            << " not allowed for devices launching with Android S and above";

                    }

                }

            }

            if (role.find("audio_decoder") != std::string::npos ||

                role.find("audio_encoder") != std::string::npos) {

                ASSERT_LT(getFirstApiLevel(), __ANDROID_API_T__)