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

Commit 95d2c542 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allowing OMX.google* codecs for Devices launching with S" into tm-dev... 

Merge "Allowing OMX.google* codecs for Devices launching with S" into tm-dev am: a2d4aee3 am: 206fbcae

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



Change-Id: I58c28b101d9e13ffe1acd464494ab71ec67962d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21fe10ef 206fbcae

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__)